修改流程步骤

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

@@ -121,7 +121,7 @@ public class TDkAuditflowRecordServiceImpl implements ITDkAuditflowRecordService
             v0_id = IdUtils.fastSimpleUUID();
             newDkAuditFlowRecord.setNextId(v0_id);
             tDkAuditflowRecordMapper.insertTDkAuditflowRecord(newDkAuditFlowRecord);
-            if ("SJXF".equals(stepNewObj.getNextSuccess())) {
+            if ("WYFF".equals(stepNewObj.getNextSuccess())) {
                 break;
             }
             xyjAuditflowOrder++;
@@ -144,8 +144,8 @@ public class TDkAuditflowRecordServiceImpl implements ITDkAuditflowRecordService
 
         TDkjbxxState tDkjbxxState = new TDkjbxxState();
         tDkjbxxState.setId(newDkAuditFlowRecord.getDkjdxxId());
-        tDkjbxxState.setAuditflow(newDkAuditFlowRecord.getAuditflowType());
-        tDkjbxxState.setStepCode(newDkAuditFlowRecord.getAuditflowStep());
+        tDkjbxxState.setAuditflow(stepNewObj.getAuditflowCode());
+        tDkjbxxState.setStepCode(stepNewObj.getStepCode());
         tDkjbxxState.setOperationBy(SecurityUtils.getUsername());
         tDkjbxxState.setOperationTime(DateUtils.getNowDate());
         tDkjbxxState.setOperationId(SecurityUtils.getUserId().toString());

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

@@ -194,7 +194,6 @@ public class TDkGeomDbServiceImpl implements ITDkGeomDbService {
                 mapvi.put("upload", tDkGeomDb.getId());
                 sheet_json.add(mapvi);
 
-                ;
                 String yjjbnt_hgx_ywyp = yjjbnt_hgx.getYwypCode();
                 String gd_hgx_ywyp = gd_hgx.getYwypCode();
                 if (StringUtils.isNotEmpty(yjjbnt_hgx_ywyp)) {