update

.idea/httpRequests/2020-07-10T043131.200.json

@@ -0,0 +1,6 @@
+{
+  "status": false,
+  "msg": "Full authentication is required to access this resource",
+  "data": null,
+  "code": 403
+}

.idea/httpRequests/http-requests-log.http

@@ -0,0 +1,6 @@
+POST http://localhost:8005/examReview/update
+
+<> 2020-07-10T043131.200.json
+
+###
+

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamManualLedgerController.java

@@ -1,5 +1,7 @@
 package com.keao.edu.user.controller;
 
+import com.keao.edu.auth.api.client.SysUserFeignService;
+import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
@@ -25,6 +27,8 @@ public class ExamManualLedgerController extends BaseController {
 
     @Autowired
     private ExamManualLedgerService examManualLedgerService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
 
     @ApiOperation("分页查询")
     @GetMapping(value = "/list")
@@ -35,8 +39,10 @@ public class ExamManualLedgerController extends BaseController {
     @ApiOperation("新增支出记录")
     @PostMapping(value = "/add")
     public HttpResponseResult add(@RequestBody ExamManualLedger examManualLedger) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
         examManualLedger.setTransDirection(TransDirectionEnum.EXPENDITURE);
         examManualLedger.setTenantId(TenantContextHolder.getTenantId());
+        examManualLedger.setOperatorUserId(sysUser.getId());
         examManualLedgerService.addExamManualLedger(examManualLedger);
         return succeed();
     }
@@ -50,7 +56,7 @@ public class ExamManualLedgerController extends BaseController {
 
     @ApiOperation("删除支出记录")
     @PostMapping(value = "/del")
-    public HttpResponseResult add(Long id) {
+    public HttpResponseResult del(Long id) {
         return succeed(examManualLedgerService.delete(id));
     }
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRoomController.java

@@ -93,8 +93,8 @@ public class ExamRoomController extends BaseController {
 
     @ApiOperation("获取教室")
     @GetMapping(value = "/get")
-    public ExamRoom getExamRoom(Long id){
-        return examRoomService.get(id);
+    public HttpResponseResult<ExamRoom> getExamRoom(Long id){
+        return succeed(examRoomService.get(id));
     }
 
     @ApiOperation("获取考场统计信息")

edu-user/edu-user-server/src/main/java/com/keao/edu/user/page/StudentExamResultQueryInfo.java

@@ -1,8 +1,11 @@
 package com.keao.edu.user.page;
 
 import com.keao.edu.common.page.QueryInfo;
+import com.keao.edu.user.enums.ExamEvaluationResultEnum;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Date;
+
 /**
  * @Author Joburgess
  * @Date 2020.06.30
@@ -24,6 +27,27 @@ public class StudentExamResultQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "级别")
     private Integer level;
 
+    @ApiModelProperty(value = "学员姓名")
+    private String studentName;
+
+    @ApiModelProperty(value = "考级项目名称")
+    private String examName;
+
+    @ApiModelProperty(value = "考试开始时间")
+    private Date examStartTime;
+
+    @ApiModelProperty(value = "考试结束时间")
+    private Date examEndTime;
+
+    @ApiModelProperty(value = "是否参与考试")
+    private Integer isFinishedExam;
+
+    @ApiModelProperty(value = "考试结果")
+    private ExamEvaluationResultEnum result;
+
+    @ApiModelProperty(value = "考级项目状态")
+    private Integer resultConfirm;
+
     public Integer getOrganId() {
         return organId;
     }
@@ -63,4 +87,60 @@ public class StudentExamResultQueryInfo extends QueryInfo {
     public void setLevel(Integer level) {
         this.level = level;
     }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public Date getExamStartTime() {
+        return examStartTime;
+    }
+
+    public void setExamStartTime(Date examStartTime) {
+        this.examStartTime = examStartTime;
+    }
+
+    public Date getExamEndTime() {
+        return examEndTime;
+    }
+
+    public void setExamEndTime(Date examEndTime) {
+        this.examEndTime = examEndTime;
+    }
+
+    public Integer getIsFinishedExam() {
+        return isFinishedExam;
+    }
+
+    public void setIsFinishedExam(Integer isFinishedExam) {
+        this.isFinishedExam = isFinishedExam;
+    }
+
+    public ExamEvaluationResultEnum getResult() {
+        return result;
+    }
+
+    public void setResult(ExamEvaluationResultEnum result) {
+        this.result = result;
+    }
+
+    public Integer getResultConfirm() {
+        return resultConfirm;
+    }
+
+    public void setResultConfirm(Integer resultConfirm) {
+        this.resultConfirm = resultConfirm;
+    }
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamManualLedgerServiceImpl.java

@@ -47,7 +47,7 @@ public class ExamManualLedgerServiceImpl extends BaseServiceImpl<Long, ExamManua
 		}
 		sysUserDao.lockUser(examManualLedger.getOperatorUserId());
 		if(Objects.nonNull(examManualLedger.getOrganId())&&examManualLedger.getOrganId()>0){
-			ExamOrganizationRelation examOrganizationRelation = examOrganizationRelationDao.getExamOrganizationRelation(examManualLedger.getOrganId(), examManualLedger.getOrganId());
+			ExamOrganizationRelation examOrganizationRelation = examOrganizationRelationDao.getExamOrganizationRelation(examManualLedger.getExaminationBasicId(), examManualLedger.getOrganId());
 			if(Objects.isNull(examOrganizationRelation)){
 				throw new BizException("合作单位信息异常");
 			}

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamManualLedgerMapper.xml

@@ -98,7 +98,7 @@
 	<select id="queryExamManualLedgers" resultMap="ExamManualLedger" parameterType="map">
 		SELECT
 			eml.*,
-			o.name_ organ_name_,
+			CASE WHEN o.name_ IS NOT NULL THEN o.name_ ELSE '其他' END  organ_name_,
 			su.real_name_ user_real_name_
 		FROM
 			exam_manual_ledger eml

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamOrganizationRelationMapper.xml

@@ -206,8 +206,8 @@
 
 	<select id="queryExamOrgans" resultMap="ExamOrganizationRelationExtraDto" parameterType="map">
 		SELECT
-		ear.*,
-		a.name_ organ_name_
+			ear.*,
+			a.name_ organ_name_
 		FROM exam_organization_relation ear
 		LEFT JOIN organization a ON ear.organ_id_=a.id_
 		<include refid="queryCondition"/>

edu-user/edu-user-server/src/main/resources/config/mybatis/StudentExamResultMapper.xml

@@ -119,6 +119,36 @@
 			<if test="examId!=null">
 				AND er.examination_basic_id_ = #{examId}
 			</if>
+			<if test="cardNo!=null and cardNo!=''">
+				AND er.card_no_ = #{cardNo}
+			</if>
+			<if test="studentName!=null and studentName!=''">
+				AND su.real_name_ LIKE CONCAT(#{studentName}, '%')
+			</if>
+			<if test="examName!=null and examName!=''">
+				AND eb.name_ LIKE CONCAT(#{examName}, '%')
+			</if>
+			<if test="subjectId!=null">
+				AND er.subject_id_=#{subjectId}
+			</if>
+			<if test="level!=null">
+				AND er.level_=#{level}
+			</if>
+			<if test="examStartTime!=null and examEndTime!=null">
+				AND DATE_FORMAT(eb.expect_exam_start_time_, '%Y-%d-%m') BETWEEN #{examStartTime} AND #{examEndTime}
+			</if>
+			<if test="isFinishedExam!=null">
+				AND ser.is_finished_exam_=#{isFinishedExam}
+			</if>
+			<if test="result!=null">
+				AND ser.result_=#{result,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
+			</if>
+			<if test="resultConfirm!=null and resultConfirm=1">
+				AND eb.status_='RESULT_CONFIRM'
+			</if>
+			<if test="resultConfirm!=null and resultConfirm=0">
+				AND eb.status_!='RESULT_CONFIRM'
+			</if>
 		</where>
 	</sql>
 
@@ -132,8 +162,9 @@
 			er.level_ regist_level_
 		FROM
 			student_exam_result ser
-			LEFT JOIN exam_registration er ON er.examination_basic_id_ = ser.examination_basic_id_
-			AND er.student_id_ = ser.student_id_
+			LEFT JOIN examination_basic eb ON ser.examination_basic_id_=eb.id_
+			LEFT JOIN exam_registration er ON ser.exam_registration_id_=er.id_
+			LEFT JOIN sys_user su ON ser.student_id_=su.id_
 		<include refid="queryStudentExamResultCondition"/>
 		ORDER BY er.id_ <include refid="global.limit"/>
 	</select>