siwei-modules/siwei-rsmonitoring/src/main/java/com/siwei/rsmonitoring/service/impl/TDkjbxxHcServiceImpl.java

@@ -150,6 +150,7 @@ public class TDkjbxxHcServiceImpl implements ITDkjbxxHcService {
         if (!dkAuditflowRecordService.isCheckUserTDkAuditflowRecord(v1.getDkjdxxId(), v1.getAuditflow(), auditflowStep, null)) {
             return 0;
         }
+        tDkjbxxHc.setAuditflowId(null);
         tDkjbxxHc.setDkjbxxId(v1.getDkjdxxId());
         tDkjbxxHc.setCreateBy(SecurityUtils.getUsername());
         tDkjbxxHc.setId(IdUtils.fastSimpleUUID());
@@ -161,7 +162,7 @@ public class TDkjbxxHcServiceImpl implements ITDkjbxxHcService {
             try {
                 fjObj = checkPhoto(fjObj);
             } catch (MetadataException e) {
-                throw new RuntimeException(e);
+                throw new ServiceException("实地核查照片检查失败");
             }
             fjObj.setDkjbxxId(dkid);
             fjObj.setId(IdUtils.fastSimpleUUID());

siwei-modules/siwei-rsmonitoring/src/main/java/com/siwei/rsmonitoring/service/impl/TDkjbxxHgxServiceImpl.java

@@ -168,7 +168,7 @@ public class TDkjbxxHgxServiceImpl implements ITDkjbxxHgxService {
         if (!dkAuditflowRecordService.isCheckUserTDkAuditflowRecord(dkjbxx.getId(), dkjbxx.getAuditflow(), auditflowStep, StaticConfig.AUDIT_FLOW_STEP_OPERATION_TYPE_001)) {
             throw new ServiceException("无权限操作");
         }
-
+        tDkjbxxHgxRecord.setAuditflowId(null);
         tDkjbxxHgxRecord.setDkbh(dkjbxx.getDkbh());
         tDkjbxxHgxRecord.setDkmj(dkjbxx.getDkmj());
         tDkjbxxHgxRecord.setId(IdUtils.fastSimpleUUID());

siwei-modules/siwei-rsmonitoring/src/main/java/com/siwei/rsmonitoring/service/impl/TDkjbxxScServiceImpl.java

@@ -118,6 +118,7 @@ public class TDkjbxxScServiceImpl implements ITDkjbxxScService {
         if (!dkAuditflowRecordService.isCheckUserTDkAuditflowRecord(dkjbxx.getId(), dkjbxx.getAuditflow(), auditflowStep, StaticConfig.AUDIT_FLOW_STEP_OPERATION_TYPE_002)) {
             return 0;
         }
+        tDkjbxxSc.setAuditflowId(null);
         tDkjbxxSc.setCreateBy(SecurityUtils.getUsername());
         tDkjbxxSc.setId(IdUtils.fastSimpleUUID());
         tDkjbxxSc.setCreateTime(DateUtils.getNowDate());

siwei-modules/siwei-rsmonitoring/src/main/java/com/siwei/rsmonitoring/service/impl/TDkjbxxTjServiceImpl.java

@@ -165,6 +165,7 @@ public class TDkjbxxTjServiceImpl implements ITDkjbxxTjService {
         if (!dkAuditflowRecordService.isCheckUserTDkAuditflowRecord(dkjbxx.getId(), dkjbxx.getAuditflow(), auditflowStep, StaticConfig.AUDIT_FLOW_STEP_OPERATION_TYPE_003)) {
             return 0;
         }
+        tDkjbxxTj.setAuditflowId(null);
         tDkjbxxTj.setCreateBy(SecurityUtils.getUsername());
         tDkjbxxTj.setId(IdUtils.fastSimpleUUID());
         tDkjbxxTj.setCreateTime(DateUtils.getNowDate());

siwei-modules/siwei-rsmonitoring/src/main/java/com/siwei/rsmonitoring/service/impl/TFieldworkTjServiceImpl.java

@@ -230,6 +230,7 @@ public class TFieldworkTjServiceImpl implements ITFieldworkTjService {
         if (!dkAuditflowRecordService.isCheckUserTDkAuditflowRecord(v1.getDkjdxxId(), v1.getAuditflow(), auditflowStep, null)) {
             return 0;
         }
+        tFieldworkTj.setAuditflowId(null);
         tFieldworkTj.setDkjbxxId(dkid);
         tFieldworkTj.setCreateBy(SecurityUtils.getUsername());
         tFieldworkTj.setId(IdUtils.fastSimpleUUID());