报验完成更新完成时间

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxInsideInspectionServiceImpl.java

@@ -1377,10 +1377,10 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
             ZhcxInsideInspectionDo inspection = new ZhcxInsideInspectionDo();
             inspection.setId(insideId);
             inspection.setInspectionstatus("30");
-//            if(ObjectUtil.isNull(inOper.getInspection().getInspectioncomplatetime())) {
-//                inspection.setInspectioncomplatetime(new Date());
-//            }
-            inspection.setInspectioncomplatetime(new Date());
+            if(ObjectUtil.isNull(inOper.getInspection().getInspectioncomplatetime())) {
+                inspection.setInspectioncomplatetime(new Date());
+            }
+//            inspection.setInspectioncomplatetime(new Date());
             inspectionList.add(inspection);
 
             //报验点状态

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxOutsideInspectionItpServiceImpl.java

@@ -808,6 +808,7 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
         String newCode = genNewCode(itpDo, dispatchDo);
         masterSlaveUpdate.getMasterUpdate().getUpdatecolumns().put("INSPECTIONCODE", newCode);
         masterSlaveUpdate.getMasterUpdate().getUpdatecolumns().put("INSPECTIONSTATUS", "20");
+        masterSlaveUpdate.getMasterUpdate().getUpdatecolumns().put("INSPECTIONCOMPLATETIME", "");
 
         //报验次数需要累计
         masterSlaveUpdate.getMasterUpdate().getUpdatecolumns().remove("INSPECTIONCOUNT");