日志增加工作名称

sql/更新脚本.sql

@@ -39,4 +39,8 @@ alter table student drop KEY `exam_number`;
 alter table student ADD UNIQUE index(`exam_number`,`work_id`,`is_test`);
 
 -- 2019.11.08 by wl
-ALTER TABLE `mark_user` ADD COLUMN `level_callback` BIT(1) NOT NULL default false COMMENT '档位打回';
+ALTER TABLE `mark_user` ADD COLUMN `level_callback` BIT(1) NOT NULL default false COMMENT '档位打回';
+
+-- 2019.11.14 by xf
+ALTER TABLE `mark_log`
+ADD COLUMN `work_name` VARCHAR(255) NULL COMMENT '工作名称' AFTER `work_id`;

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/domain/MarkLog.java

@@ -57,6 +57,8 @@ public class MarkLog implements Serializable {
     private Date createTime;
     @NotNull
     private Long workId;
+
+    private String workName;
     @NotNull
     private Long paperId;
 //    @ApiModelProperty(value = "备注")
@@ -76,7 +78,7 @@ public class MarkLog implements Serializable {
 
     public MarkLog(Long createUserId, String createUserName, Role createRole,
                    Subject subject, String examNumber, String studentName,
-                   Integer operType, Long workId, Long paperId, MarkStage stage, String operDataBefore, String operDataAfter, String remark) {
+                   Integer operType, Long workId, Long paperId, MarkStage stage, String operDataBefore, String operDataAfter, String remark, String workName) {
         this.createUserId = createUserId;
         this.createUserName = createUserName;
         this.createRole = createRole.getName();
@@ -90,6 +92,7 @@ public class MarkLog implements Serializable {
         this.operDataAfter = operDataAfter;
         this.operDataBefore = operDataBefore;
         this.remark = remark;
+        this.workName = workName;
         this.createTime = new Date();
     }
 
@@ -216,6 +219,16 @@ public class MarkLog implements Serializable {
         this.createTime = createTime;
     }
 
+    @Basic
+    @Column(name = "work_name")
+    public String getWorkName() {
+        return workName;
+    }
+
+    public void setWorkName(String workName) {
+        this.workName = workName;
+    }
+
     @Basic
     @Column(name = "work_id")
     public Long getWorkId() {

stmms-ms-log/src/main/java/cn/com/qmth/stmms/ms/log/aop/MarkLogAop.java

@@ -80,6 +80,9 @@ public class MarkLogAop {
     @Autowired
     MarkingConfig markingConfig;
 
+    @Autowired
+    WorkRepo workRepo;
+
     /**
      * 标准卷、定档、档位打回切入点
      */
@@ -136,7 +139,8 @@ public class MarkLogAop {
         if (Objects.nonNull(markLogPrev)) {
             operResult = Optional.ofNullable(markLogPrev.getOperDataAfter()).orElse(DEFAULT_RESULT);
         }
-        MarkLog markLog = new MarkLog(markUser.getId(), markUser.getName(), markUser.getRole(), markUser.getSubject(), paper.getExamNumber(), paper.getStudentName(), operType, paper.getWorkId(), paper.getId(), MarkStage.LEVEL, operResult, String.valueOf(jsonObjectResult.get(LEVEL)), null);
+        Work work = workRepo.findOne(paper.getWorkId());
+        MarkLog markLog = new MarkLog(markUser.getId(), markUser.getName(), markUser.getRole(), markUser.getSubject(), paper.getExamNumber(), paper.getStudentName(), operType, paper.getWorkId(), paper.getId(), MarkStage.LEVEL, operResult, String.valueOf(jsonObjectResult.get(LEVEL)), null, work.getName());
         LOGGER.info("markLog:{}", JSONObject.toJSONString(markLog));
         //标准卷设置、定档设置、档位打回end
         markLogRepo.save(markLog);
@@ -211,7 +215,8 @@ public class MarkLogAop {
                 }
             }
         }
-        MarkLog markLog = new MarkLog(markUser.getId(), markUser.getName(), markUser.getRole(), markUser.getSubject(), paper.getExamNumber(), paper.getStudentName(), operType, paper.getWorkId(), paper.getId(), markStage, operResult, String.valueOf(jsonObjectResult.get(RESULT)), null);
+        Work work = workRepo.findOne(paper.getWorkId());
+        MarkLog markLog = new MarkLog(markUser.getId(), markUser.getName(), markUser.getRole(), markUser.getSubject(), paper.getExamNumber(), paper.getStudentName(), operType, paper.getWorkId(), paper.getId(), markStage, operResult, String.valueOf(jsonObjectResult.get(RESULT)), null, work.getName());
         LOGGER.info("markLog:{}", JSONObject.toJSONString(markLog));
         //分档、打分、回评档位、回评分数、档位打回、档位打回回评end
         markLogRepo.save(markLog);
@@ -235,7 +240,7 @@ public class MarkLogAop {
                                     operResult = Optional.ofNullable(markLogPrev.getOperDataAfter()).orElse("-");
                                 }
                                 //加入打回日志
-                                markLog = new MarkLog(m.getMarkerId(), m.getMarkerName(), Role.MARKER, m.getSubject(), paper.getExamNumber(), paper.getStudentName(), MarkLogOperType.SYSTEM_CALLBACK_LEVEl.getId(), paper.getWorkId(), paper.getId(), m.getStage(), operResult, String.valueOf(d.getC()), MarkLogOperType.SYSTEM_CALLBACK_LEVEl.getName());
+                                markLog = new MarkLog(m.getMarkerId(), m.getMarkerName(), Role.MARKER, m.getSubject(), paper.getExamNumber(), paper.getStudentName(), MarkLogOperType.SYSTEM_CALLBACK_LEVEl.getId(), paper.getWorkId(), paper.getId(), m.getStage(), operResult, String.valueOf(d.getC()), MarkLogOperType.SYSTEM_CALLBACK_LEVEl.getName(), work.getName());
                                 markLogList.add(markLog);
                             }
                         }
@@ -280,6 +285,8 @@ public class MarkLogAop {
 
         Integer operType = MarkLogOperType.COLLECT.getId();
 
+        Work work = workRepo.findOne(workId);
+
         MarkLog markLog = new MarkLog();
         markLog.setCreateUserId(clientUserId);
         markLog.setCreateUserName(clientUsername);
@@ -289,6 +296,7 @@ public class MarkLogAop {
         markLog.setStudentName(name);
         markLog.setOperType(operType);
         markLog.setWorkId(workId);
+        markLog.setWorkName(work.getName());
         markLog.setPaperId(paper.getId());
         markLog.setStage(MarkStage.INIT);
         //识别方式

stmms-ms-log/src/main/java/cn/com/qmth/stmms/ms/log/controller/MarkLogController.java

@@ -46,6 +46,7 @@ public class MarkLogController {
             @RequestParam(required = false) String startTime,
 //                                             @ApiParam(value = "结束时间", required = false)
             @RequestParam(required = false) String endTime,
+            @RequestParam(required = false) Long workId,
                                              @RequestParam Integer curPage,
                                              @RequestParam Integer pageSize) {
         Pageable pageable = new PageRequest(curPage, pageSize, Sort.Direction.DESC, "createTime");
@@ -71,6 +72,9 @@ public class MarkLogController {
                 //小于或等于传入时间
                 predicates.add(cb.lessThanOrEqualTo(root.get("createTime").as(String.class), endTime));
             }
+            if (Objects.nonNull(workId)) {
+                predicates.add(cb.equal(root.get("workId").as(Long.class), workId));
+            }
             return cb.and(predicates.toArray(new Predicate[predicates.size()]));
         };
         Page<MarkLog> result = markLogRepo.findAll(specification, pageable);
@@ -98,6 +102,7 @@ public class MarkLogController {
             @RequestParam(required = false) String createUserId,
             @RequestParam(required = false) String startTime,
             @RequestParam(required = false) String endTime,
+            @RequestParam(required = false) Long workId,
             @RequestParam Integer curPage,
             @RequestParam Integer pageSize) {
         Pageable pageable = new PageRequest(curPage, pageSize, Sort.Direction.DESC, "createTime");
@@ -123,6 +128,9 @@ public class MarkLogController {
                 //小于或等于传入时间
                 predicates.add(cb.lessThanOrEqualTo(root.get("createTime").as(String.class), endTime));
             }
+            if (Objects.nonNull(workId)) {
+                predicates.add(cb.equal(root.get("workId").as(Long.class), workId));
+            }
             //采集端
             predicates.add(cb.equal(root.get("operType").as(Integer.class), MarkLogOperType.COLLECT.getId()));
             return cb.and(predicates.toArray(new Predicate[predicates.size()]));

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/api/TaskApi.java

@@ -3,11 +3,13 @@ package cn.com.qmth.stmms.ms.marking.api;
 import cn.com.qmth.stmms.ms.core.domain.MarkLog;
 import cn.com.qmth.stmms.ms.core.domain.MarkLogOperType;
 import cn.com.qmth.stmms.ms.core.domain.Paper;
+import cn.com.qmth.stmms.ms.core.domain.Work;
 import cn.com.qmth.stmms.ms.core.domain.task.MarkTask;
 import cn.com.qmth.stmms.ms.core.domain.user.Role;
 import cn.com.qmth.stmms.ms.core.repository.MarkLogRepo;
 import cn.com.qmth.stmms.ms.core.repository.MarkTaskRepo;
 import cn.com.qmth.stmms.ms.core.repository.PaperRepo;
+import cn.com.qmth.stmms.ms.core.repository.WorkRepo;
 import cn.com.qmth.stmms.ms.marking.assembler.PaperAssembler;
 import cn.com.qmth.stmms.ms.marking.dto.PaperDTO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +46,9 @@ public class TaskApi {
     @Autowired
     private MarkLogRepo markLogRepo;
 
+    @Autowired
+    private WorkRepo workRepo;
+
     /**
      * 任务管理查询
      *
@@ -123,7 +128,8 @@ public class TaskApi {
         if (Objects.nonNull(markLogPrev)) {
             operResult = Optional.ofNullable(markLogPrev.getOperDataAfter()).orElse("-");
         }
-        MarkLog markLog = new MarkLog(markTask.getMarkerId(), markTask.getMarkerName(), Role.MARKER, markTask.getSubject(), paper.getExamNumber(), paper.getStudentName(), MarkLogOperType.REEVALUATION_LEVEl.getId(), paper.getWorkId(), paper.getId(), markTask.getStage(), operResult, markTask.getOriginLevel(), MarkLogOperType.REEVALUATION_LEVEl.getName());
+        Work work = workRepo.findOne(paper.getWorkId());
+        MarkLog markLog = new MarkLog(markTask.getMarkerId(), markTask.getMarkerName(), Role.MARKER, markTask.getSubject(), paper.getExamNumber(), paper.getStudentName(), MarkLogOperType.REEVALUATION_LEVEl.getId(), paper.getWorkId(), paper.getId(), markTask.getStage(), operResult, markTask.getOriginLevel(), MarkLogOperType.REEVALUATION_LEVEl.getName(), work.getName());
         markLogRepo.save(markLog);
         return true;
     }

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/service/MarkingService.java

@@ -51,6 +51,9 @@ public class MarkingService {
     @Autowired
     MarkLogRepo markLogRepo;
 
+    @Autowired
+    WorkRepo workRepo;
+
     @Autowired
     LevelConfig levelConfig;
 
@@ -160,7 +163,8 @@ public class MarkingService {
                     jsonObject.put("paper", paper.getLevel());
                     if (Objects.isNull(markLogPrev)) {
                         //加入档位落差值日志
-                        MarkLog markLog = new MarkLog(m.getMarkerId(), m.getMarkerName(), Role.MARKER, m.getSubject(), paper.getExamNumber(), paper.getStudentName(), MarkLogOperType.LEVEl_DIFFERENCE.getId(), paper.getWorkId(), paper.getId(), m.getStage(), operResult, String.valueOf(d.getDistance()), jsonObject.toJSONString());
+                        Work work = workRepo.findOne(paper.getWorkId());
+                        MarkLog markLog = new MarkLog(m.getMarkerId(), m.getMarkerName(), Role.MARKER, m.getSubject(), paper.getExamNumber(), paper.getStudentName(), MarkLogOperType.LEVEl_DIFFERENCE.getId(), paper.getWorkId(), paper.getId(), m.getStage(), operResult, String.valueOf(d.getDistance()), jsonObject.toJSONString(), work.getName());
                         markLogRepo.save(markLog);
                     } else {
                         operResult = Optional.ofNullable(markLogPrev.getOperDataAfter()).orElse("-");
@@ -238,7 +242,8 @@ public class MarkingService {
                         if (Objects.nonNull(markLogPrev)) {
                             operResult = Optional.ofNullable(markLogPrev.getOperDataAfter()).orElse("-");
                         }
-                        MarkLog markLog = new MarkLog(markTask.getMarkerId(), markTask.getMarkerName(), Role.MARKER, markTask.getSubject(), paper.getExamNumber(), paper.getStudentName(), MarkLogOperType.HANDLE_LEVEl.getId(), paper.getWorkId(), paper.getId(), markTask.getStage(), operResult, markTask.getOriginLevel(), MarkLogOperType.HANDLE_LEVEl.getName());
+                        Work work = workRepo.findOne(paper.getWorkId());
+                        MarkLog markLog = new MarkLog(markTask.getMarkerId(), markTask.getMarkerName(), Role.MARKER, markTask.getSubject(), paper.getExamNumber(), paper.getStudentName(), MarkLogOperType.HANDLE_LEVEl.getId(), paper.getWorkId(), paper.getId(), markTask.getStage(), operResult, markTask.getOriginLevel(), MarkLogOperType.HANDLE_LEVEl.getName(), work.getName());
                         markLogList.add(markLog);
                     }
                 }