ソースを参照

2023-3-2 添加一个用于校验未打卡离开的字段,如果为空给默认。

chaiyunlong 2 年 前
コミット
da8984379c

+ 10 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/ViolationNewVo.java

@@ -110,6 +110,8 @@ public class ViolationNewVo {
 
 
     private Long deductionVal;
     private Long deductionVal;
 
 
+    private String treatmentMessage;
+
     public Long getCreact_id() {
     public Long getCreact_id() {
         return creact_id;
         return creact_id;
     }
     }
@@ -302,4 +304,12 @@ public class ViolationNewVo {
     public void setViolationReasons(String violationReasons) {
     public void setViolationReasons(String violationReasons) {
         this.violationReasons = violationReasons;
         this.violationReasons = violationReasons;
     }
     }
+
+    public String getTreatmentMessage() {
+        return treatmentMessage;
+    }
+
+    public void setTreatmentMessage(String treatmentMessage) {
+        this.treatmentMessage = treatmentMessage;
+    }
 }
 }

+ 1 - 0
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSubjectAccessRecordServiceImpl.java

@@ -288,6 +288,7 @@ public class LabSubjectAccessRecordServiceImpl implements ILabSubjectAccessRecor
                                     vo.setLearnStatus(result.getLearnStatus());
                                     vo.setLearnStatus(result.getLearnStatus());
                                     vo.setPracticeStatus(result.getPracticeStatus());
                                     vo.setPracticeStatus(result.getPracticeStatus());
                                     vo.setHandleDay(result.getHandleDay());
                                     vo.setHandleDay(result.getHandleDay());
+                                    vo.setTreatmentMessage(a.getViolationName());
                                     labViolationServiceImpl.addViolationHistory(vo);
                                     labViolationServiceImpl.addViolationHistory(vo);
                                 }
                                 }
                             }
                             }

+ 6 - 1
zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabViolationServiceImpl.java

@@ -466,7 +466,12 @@ public class LabViolationServiceImpl implements ILabViolationService {
             map.put("deductPoints", scoreSite.getViolationVal());
             map.put("deductPoints", scoreSite.getViolationVal());
         }
         }
         map.put("pointsType", "1");
         map.put("pointsType", "1");
-        map.put("reason", "手动新增违规记录");
+        if(StringUtils.isNotNull(vo.getTreatmentMessage())){
+            map.put("reason", vo.getTreatmentMessage());
+        }else{
+            map.put("reason", "手动新增违规记录");
+        }
+
         remoteExamService.deductionPoints(map);
         remoteExamService.deductionPoints(map);
         LabViolation labViolation = labViolationMapper.selectByUserId(vo.getUserId());
         LabViolation labViolation = labViolationMapper.selectByUserId(vo.getUserId());
         LabNegativeListRecords records = negativeListRecordsMapper.findByUserId(vo.getUserId());
         LabNegativeListRecords records = negativeListRecordsMapper.findByUserId(vo.getUserId());