履职、安全检查登记时，若从异常保存后，再切回到正常异常信息未清除

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/gx/service/ResumptionServiceImpl.java

@@ -166,8 +166,10 @@ public class ResumptionServiceImpl implements ResumptionService {
                 data.setAreaId(check.getAreaId());
                 data.setCheckId(point.getCheckId());
                 data.setItemId(point.getPointId());
-                data.setRectificationDeadline(point.getRectificationDeadline());
-                data.setResRemark(point.getResRemark());
+                if(ObjectUtil.equal(point.getResValue(),1)){
+                    data.setRectificationDeadline(point.getRectificationDeadline());
+                    data.setResRemark(point.getResRemark());
+                }
                 data.setResValue(point.getResValue());
                 data.setSubmitTime(new Date());
                 data.setResTime(new Date());
@@ -222,14 +224,19 @@ public class ResumptionServiceImpl implements ResumptionService {
                 if (ObjectUtil.equal(point.getResValue(), 1)) {
                     exceptionCount++;
                 }
-                List<AppResumptionDataRemarkimg> imgs = point.getImgs();
-                for (AppResumptionDataRemarkimg img : imgs) {
-                    img.setResumptionDataId(pointId);
-                    img.setResumptionId(taskId);
-                    img.setId(IdWorker.getId(img));
-                    //appResumptionDataRemarkimgMapper.insert(img);
+
+                if(ObjectUtil.equal(point.getResValue(), 1) && ObjectUtil.isNotNull(point.getImgs())){
+                    //有异常时才保存图片
+                    List<AppResumptionDataRemarkimg> imgs = point.getImgs();
+                    for (AppResumptionDataRemarkimg img : imgs) {
+                        img.setResumptionDataId(pointId);
+                        img.setResumptionId(taskId);
+                        img.setId(IdWorker.getId(img));
+                        //appResumptionDataRemarkimgMapper.insert(img);
+                    }
+                    adImgs.addAll(imgs);
                 }
-                adImgs.addAll(imgs);
+
             }
         }
         sysResumption.setExceptionCount(exceptionCount);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRegisterSericeImpl.java

@@ -475,7 +475,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
                 }
             }
 
-            if (CollectionUtil.isNotEmpty(pointVo.getImgData())) {
+            if (ObjectUtil.equal(point.getValue(), 1) && CollectionUtil.isNotEmpty(pointVo.getImgData())) {
                 for (SafetyCheckDataRemarkingVo imgDatum : pointVo.getImgData()) {
                     CoreSafetyTaskDataRemarkimg img = imgVoToDomain(data, point, imgDatum);
                     remarkimgs.add(img);
@@ -524,7 +524,13 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         point.setPlanId(task.getPlanId());
         point.setTaskId(task.getId());
         point.setValue(pointVo.getStatus());
-        point.setRectificationDeadline(pointVo.getRectificationDeadline());
+
+        if (ObjectUtil.equal(pointVo.getStatus(), 1)) {
+            point.setRectificationDeadline(pointVo.getRectificationDeadline());
+        } else {
+            point.setRemark(null);
+            point.setRectificationDeadline(null);
+        }
         if (ObjectUtil.isNull(point.getSubmitTime())) {
             point.setSubmitTime(new Date());
         }