修复任务生成

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -573,7 +573,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
 
                     child = baseMapper.selectById(newChildPlanId);
                 }
-                if (needRebuildOnEdit(existPlan)) {
+                if (needRebuildOnEdit(child,existPlan.getTaskHasCompleted())) {
                     needRebuildPlans.add(child);
                 }
 
@@ -724,7 +724,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             plan.setPlanCreateOrgName(null);
             baseMapper.updateById(plan);
 
-            if (needRebuildOnEdit(existPlan)) {
+            if (needRebuildOnEdit(existPlan,existPlan.getTaskHasCompleted())) {
                 needRebuildPlans.add(baseMapper.selectById(plan.getId()));
             }
             resumptionTaskBusiness.rebuildCurrentCycleTask(needRebuildPlans);
@@ -778,10 +778,10 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
      * @param plan
      * @return
      */
-    private Boolean needRebuildOnEdit(AppPlan plan) {
+    private Boolean needRebuildOnEdit(AppPlan plan,Integer taskHasCompleted) {
         if (ObjectUtil.equal(plan.getPlanStatus(), PlanStatus.USING.getCode())
                 && ObjectUtil.equal(plan.getPlanOfOrgType(), OrgTypeEnum.HANG_SHE.getCode())
-                && (ObjectUtil.isNull(plan.getTaskHasCompleted()) || ObjectUtil.equal(plan.getTaskHasCompleted(), 0))
+                && ObjectUtil.notEqual(taskHasCompleted,1)
                 && !new Date().before(plan.getEffectiveTime())) {
             return true;
         }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/task/ResumptionTaskBusiness.java

@@ -196,7 +196,7 @@ public class ResumptionTaskBusiness extends TaskCreatingServiceImplBase<Resumpti
                 .le(Resumption::getYmdDate, dr.getEndTime())
                 .ne(Resumption::getStatus, ResumptionTaskStatus.Completed.getCode())
                 .in(Resumption::getSolidId, appPlans.stream().map(p -> p.getSolidId()).collect(Collectors.toList()));
-        baseMapper.delete(wrapper);
+        int count = baseMapper.delete(wrapper);
 
 
 //        AppPlan plan = appPlans.get(0);

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

@@ -625,7 +625,7 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
             }
         }
 
-        if (needRebuildOnEdit(coreSafecheckPlan, planStatus)) {
+        if (needRebuildOnEdit(coreSafecheckPlan, planStatus,coreSafecheckPlan.getTaskHasCompleted())) {
             CoreSafecheckPlan plan = baseMapper.selectById(coreSafecheckPlan.getId());
             safetyCheckJobBusiness.createTaskByPlans(Arrays.asList(plan));
         }
@@ -659,7 +659,7 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
 
                 child = baseMapper.selectById(newChildPlanId);
             }
-            if (needRebuildOnEdit(p, p.getPlanStatus())) {
+            if (needRebuildOnEdit(p, p.getPlanStatus(),coreSafecheckPlan.getTaskHasCompleted())) {
                 needRebuildPlans.add(child);
             }
             child.setUpdateTime(DateUtils.getNowDate());
@@ -805,10 +805,10 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
      * @param plan
      * @return
      */
-    private Boolean needRebuildOnEdit(CoreSafecheckPlan plan, Integer planStatus) {
+    private Boolean needRebuildOnEdit(CoreSafecheckPlan plan, Integer planStatus,Integer taskHasCompleted) {
         if (ObjectUtil.equal(planStatus, PlanStatus.USING.getCode())
                 && (ObjectUtil.equal(plan.getPlanOfOrgType(), OrgTypeEnum.HANG_SHE.getCode()) || ObjectUtil.equal(plan.getExecOrgType(), OrgTypeEnum.BAN_SHI_CHU.getCode()) || ObjectUtil.equal(plan.getExecOrgType(), OrgTypeEnum.SHEGN_LIAN_SHE.getCode()))
-                && (ObjectUtil.isNull(plan.getTaskHasCompleted()) || ObjectUtil.equal(plan.getTaskHasCompleted(), 0))
+                && ObjectUtil.notEqual (taskHasCompleted,1)
                 && !new Date().before(plan.getEffectiveTime())) {
             return true;
         }