内外部报验项目报验点天数需要算上拒收

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

@@ -2038,26 +2038,20 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
         if("20".equals(inOper.getOperType())) {
             entity.setInstate("20");
             entity.setIntimes(inOper.getInspection().getInspectioncount());
+            entity.setIncompletetime(complateTime);
         }
 
         //接收
         if("50".equals(inOper.getOperType())) {
             entity.setInstate("10");
             entity.setIntimes(inOper.getInspection().getInspectioncount());
+            entity.setIncompletetime(complateTime);
         }
 
         //有条件接收
         if ("60".equals(inOper.getOperType())) {
             entity.setInstate("30");
             entity.setIntimes(inOper.getInspection().getInspectioncount());
-        }
-
-        //接收
-        if("50".equals(inOper.getOperType())) {
-            entity.setIncompletetime(complateTime);
-        }
-        //有条件接收
-        else if ("60".equals(inOper.getOperType())) {
             entity.setIncompletetime(complateTime);
         }
     }

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

@@ -120,6 +120,7 @@ public class ZhcxItpProjectNodeStateServiceImpl extends ServiceImpl<ZhcxItpProje
             //拒收
             if("20".equals(operType)) {
                 entity.setOutstate("20");
+                entity.setOutcompletetime(itpDo.getInspectioncomplatetime());
             }
 
             //接收