子计划不小于父计划

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

@@ -305,9 +305,10 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             plan.setDistribute("0");
             //设置计划所属机构类型
             plan.setPlanOfOrgType(Long.valueOf(orgService.selectSysOrgById(app.getPlanCreateOrgId(), SecurityConstants.INNER).getType()));
-            //如果计划所属机构类型为行社并且勾选立即生效
-            if (plan.getPlanOfOrgType() == 3 && plan.getBuildTaskNow() == 1) {
+            //如果计划所属机构类型为行社
+            if (plan.getPlanOfOrgType() == 3 ) {
                 plan.setPlanStatus(1);
+                plan.setDistribute("1");
             } else {
                 plan.setPlanStatus(0);
             }

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

@@ -301,7 +301,7 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
             //计划所属机构类型
             coreSafecheckPlan.setPlanOfOrgType(orgService.selectSysOrgById(coreSafecheckPlan.getPlanOfOrgId(), SecurityConstants.INNER).getType());
             //如果是行社并且勾选了立即下发需要修改下发状态为已下发,因为会立即触发下发动作
-            if (coreSafecheckPlan.getPlanOfOrgType() == 3&&coreSafecheckPlan.isBuildTaskNow()) {
+            if (coreSafecheckPlan.getPlanOfOrgType() == 3) {
                 coreSafecheckPlan.setPlanStatus(1L);
                 coreSafecheckPlan.setDistribute("1");
             } else {

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -225,7 +225,7 @@
             and t.title like concat('%', #{task.title}, '%')
         </if>
         <if test="task.planStartTime != null ">
-            and t.plan_start_time =#{task.planStartTime}
+            and DATE_FORMAT(t.plan_start_time, '%Y-%m-%d') = DATE_FORMAT(#{task.planStartTime}, '%Y-%m-%d')
         </if>
         <if test="task.status != null  and task.status != ''">
             and t.status =#{task.status}