Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

project_data/sql/0.0.3/soc/soc.sql

@@ -644,7 +644,7 @@ INSERT INTO `sync_fjnx_org_business_relation` (`id`, `org_code`, `business_paren
 
 DELETE FROM sys_menu WHERE id IN(01720259442805620738,01717076927401005058,01717079254782545922);
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
-VALUES (01720259442805620738, '外包评价', 0, 1, 'core', NULL, NULL, 1, 0, 'M', '0', '0', 'core:send:list', '1', 'edit', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
+VALUES (01720259442805620738, '外包评价', 0, 1, '/core/evaluate', NULL, NULL, 1, 0, 'M', '0', '0', 'core:send:list', '1', 'edit', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
 VALUES (01717076927401005058, '评价计划管理', 01720259442805620738, 1, 'resumption', 'resumptionEvaluate/evaluate/index', NULL, 1, 1, 'C', '0', '0', 'core:evaluatePlan:list', '1', 'excel', NULL, '超级管理员', '2023-09-21 10:37:52', '超级管理员', '2023-09-22 09:42:43', '');
 INSERT INTO `sys_menu` (`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -149,6 +149,8 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         TMonitoringRetrievalPlan tMonitoringRetrievalPlan = tMonitoringRetrievalPlanMapper.selectById(id);
         tMonitoringRetrievalPlan.setIsDistribute("1");
         tMonitoringRetrievalPlan.setPlanStatus(1);
+        tMonitoringRetrievalPlan.setUpdateTime(DateUtils.getNowDate());
+        tMonitoringRetrievalPlan.setUpdateBy(SecurityUtils.getUsername());
         tMonitoringRetrievalPlanMapper.updateById(tMonitoringRetrievalPlan);
         Integer i = 1;
         QueryWrapper queryWrapper = new QueryWrapper();
@@ -473,14 +475,26 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
 
     @Override
     public int withdraw(Long id) {
+
         DateRange startAndEnd;
         TMonitoringRetrievalPlan plan = baseMapper.selectById(id);
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq(PARENT_ID, id);
         List<TMonitoringRetrievalPlan> list1 = tMonitoringRetrievalPlanMapper.selectList(queryWrapper);
         List<Long> collect = new ArrayList<>();
+        //如果有子计划
         if (CollectionUtils.isNotEmpty(list1)) {
             collect = list1.stream().map(TMonitoringRetrievalPlan::getId).collect(Collectors.toList());
+            List<String>status=new ArrayList<>();
+            List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectAllTaskByPlanId(collect, null);
+            status.add("0");
+            status.add("1");
+            List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks1 = iCoreMonitoringRetrievalTaskService.selectAllTaskByPlanId(collect, status);
+            Boolean isComplete=false;
+            if (coreMonitoringRetrievalTasks.size()==coreMonitoringRetrievalTasks1.size()){
+                isComplete=true;
+            }
+            //无周期删除所有任务
             if (plan.getPlanCycle().equals("0")) {
                 iCoreMonitoringRetrievalTaskService.deleteAllTaskByPlanIds(collect);
             }
@@ -499,11 +513,15 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                     //天
                     case "1":
                         LocalDate localDate = LocalDate.now();
-                        iCoreMonitoringRetrievalTaskService.deleteDayTaskByPlanId(plan.getId(), plan.getPlanCycle(), localDate);
+                        if (isComplete){
+                            iCoreMonitoringRetrievalTaskService.deleteDayTaskByPlanId(plan.getId(), plan.getPlanCycle(), null);
+                        }
                         break;
                     default:
                         startAndEnd = DateUtils.getStartAndEnd(new Date(), Integer.valueOf(plan.getPlanCycle()) + 1);
-                        iCoreMonitoringRetrievalTaskService.deleteDayTaskByTime(plan.getId(), plan.getPlanCycle(), startAndEnd.getStartTime(), startAndEnd.getEndTime());
+                        if (isComplete){
+                            iCoreMonitoringRetrievalTaskService.deleteDayTaskByTime(plan.getId(), plan.getPlanCycle(),null,null);
+                        }
                         break;
                 }
             }
@@ -513,10 +531,22 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         }
         plan.setPlanStatus(2);
         plan.setIsDistribute("0");
+        List<String>status=new ArrayList<>();
+        List<Long>ids=new ArrayList<>();
+        ids.add(id);
+        List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectAllTaskByPlanId(ids, null);
+        status.add("0");
+        status.add("1");
+        List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks1 = iCoreMonitoringRetrievalTaskService.selectAllTaskByPlanId(ids, status);
         if (!plan.getPlanCycle().equals("0")) {
             startAndEnd = DateUtils.getStartAndEnd(new Date(), Integer.valueOf(plan.getPlanCycle()) + 1);
-            iCoreMonitoringRetrievalTaskService.deleteDayTaskByTimeAndPlanId(id, plan.getPlanCycle(), startAndEnd.getStartTime(), startAndEnd.getEndTime());
+            if (coreMonitoringRetrievalTasks.size()==coreMonitoringRetrievalTasks1.size()){
+                iCoreMonitoringRetrievalTaskService.deleteDayTaskByTimeAndPlanId(id, plan.getPlanCycle(),null,null);
+            }
         }
+        plan.setImmediately(false);
+        plan.setUpdateBy(SecurityUtils.getUsername());
+        plan.setUpdateTime(DateUtils.getNowDate());
         return baseMapper.updateById(plan);
     }
 
@@ -576,8 +606,8 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         tMonitoringRetrievalPlan.setOrgId(data.getId());
         tMonitoringRetrievalPlan.setOrganization(data.getShortName());
         tMonitoringRetrievalPlan.setCreateBy(SecurityUtils.getUsername());
-        tMonitoringRetrievalPlan.setUpdateTime(DateUtils.getNowDate());
-        tMonitoringRetrievalPlan.setUpdateBy(SecurityUtils.getUsername());
+    /*    tMonitoringRetrievalPlan.setUpdateTime(DateUtils.getNowDate());
+        tMonitoringRetrievalPlan.setUpdateBy(SecurityUtils.getUsername());*/
         SysRole sysRole = remoteRoleService.getRoleById(tMonitoringRetrievalPlan.getRoleId(), SecurityConstants.INNER);
         tMonitoringRetrievalPlan.setRoleName(sysRole.getRoleName());
         long id = IdWorker.getId();
@@ -603,8 +633,8 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     public int updateTMonitoringRetrievalPlan(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
         List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectComplete(tMonitoringRetrievalPlan.getId());
         //如果计划下面的任务都是没完成就删除所有任务，有完成就只修改
-        tMonitoringRetrievalPlan.setUpdateTime(DateUtils.getNowDate());
-        tMonitoringRetrievalPlan.setUpdateBy(SecurityUtils.getUsername());
+//        tMonitoringRetrievalPlan.setUpdateTime(DateUtils.getNowDate());
+//        tMonitoringRetrievalPlan.setUpdateBy(SecurityUtils.getUsername());
         TMonitoringRetrievalPlan plan = baseMapper.selectById(tMonitoringRetrievalPlan.getId());
         BeanUtils.copyProperties(tMonitoringRetrievalPlan, plan);
         SysRole sysRole = remoteRoleService.getRoleById(tMonitoringRetrievalPlan.getRoleId(), SecurityConstants.INNER);
@@ -695,8 +725,6 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                 e.getMessage();
             }
         }
-
-
         return i;
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/ApiPlanController.java

@@ -160,7 +160,7 @@ public class ApiPlanController {
                 List<AppPlan> list = appPlanService.list(new LambdaQueryWrapper<AppPlan>().eq(AppPlan::getParentId, plan.getId()).eq(AppPlan::getDeleted, 0));
                 list.add(plan);
                 List<Object> newlist = new ArrayList<>(list);
-                resumptionTaskBusiness.rebuildCurrentCycleTask(newlist);
+//                resumptionTaskBusiness.rebuildCurrentCycleTask(newlist);
 
             }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/mapper/CoreMonitoringRetrievalTaskMapper.java

@@ -134,6 +134,8 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
      */
     void deleteDayTaskByPlanId(@Param("planId") Long planId, @Param("cycle") String cycle, @Param("ymdDate") String ymdDate);
 
+    List<CoreMonitoringRetrievalTask> selectAllTaskByPlanId(@Param("planIds") Long[] planIds,@Param("statusList") String[] statusList);
+
     /**
      * 删除月任务
      *

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/ICoreMonitoringRetrievalTaskService.java

@@ -119,6 +119,8 @@ public interface ICoreMonitoringRetrievalTaskService extends IService<CoreMonito
 
     void deleteAllTaskByPlanIds(List<Long> planId);
 
+    List<CoreMonitoringRetrievalTask> selectAllTaskByPlanId(List<Long> planId,List<String>status);
+
     /**
      * 删除日任务
      *

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -413,6 +413,17 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     }
 
     @Override
+    public List<CoreMonitoringRetrievalTask> selectAllTaskByPlanId(List<Long> planId, List<String> status) {
+        Long[] longs = planId.toArray(new Long[planId.size()]);
+        String[] strings =null;
+        if (null!=status){
+       strings = status.toArray(new String[status.size()]);
+        }
+        List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = coreMonitoringRetrievalTaskMapper.selectAllTaskByPlanId(longs, strings);
+        return coreMonitoringRetrievalTasks;
+    }
+
+    @Override
     public void deleteDayTaskByPlanId(Long planId, String cycle, LocalDate ymdDate) {
         coreMonitoringRetrievalTaskMapper.deleteDayTaskByPlanId(planId, cycle, ymdDate.toString());
     }
@@ -618,7 +629,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     public List<CoreSafetyExceptionData> selectMonitorExceptionData(List<Long> orgIds, DateTime time) {
         SysRole role = roleService.getRoleByName("网点安全员", SecurityConstants.INNER);
         //扩展字段1：任务状态 扩展字段2 计划id
-        List<CoreSafetyExceptionData> exceptionData = baseMapper.selectMonitorExceptionDataNew(time.year(), time.quarter(), time.month() + 1, role.getId(),orgIds);
+        List<CoreSafetyExceptionData> exceptionData = baseMapper.selectMonitorExceptionDataNew(time.year(), time.quarter(), time.month() + 1, role.getId(), orgIds);
         exceptionData.removeIf(item -> ObjectUtil.isNull(item.getDataId()));
         return exceptionData;
     }

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

@@ -204,8 +204,11 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
 
             //撤回需要删除本周期所有任务
             DateRange dateRange = DateUtils.getStartAndEnd(new Date(), Math.toIntExact(plan.getPlanCycle()));
-            coreSafetyTaskMapper.delete(new LambdaQueryWrapper<CoreSafetyTask>().eq(CoreSafetyTask::getPlanId, ap.getId()).in(CoreSafetyTask::getStatus,1,2).between(CoreSafetyTask::getYmdDate, dateRange.getStartTime(), dateRange.getEndTime()));
-
+            if (plan.getPlanCycle()==6L){
+                coreSafetyTaskMapper.delete(new LambdaQueryWrapper<CoreSafetyTask>().eq(CoreSafetyTask::getPlanId, ap.getId()).between(CoreSafetyTask::getYmdDate, dateRange.getStartTime(), dateRange.getEndTime()));
+            }else {
+                coreSafetyTaskMapper.delete(new LambdaQueryWrapper<CoreSafetyTask>().eq(CoreSafetyTask::getPlanId, ap.getId()).in(CoreSafetyTask::getStatus, 1, 2).between(CoreSafetyTask::getYmdDate, dateRange.getStartTime(), dateRange.getEndTime()));
+            }
         }
         //设置下发状态为未下发
         plan.setDistribute("0");
@@ -213,8 +216,12 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
         baseMapper.updateById(plan);
         //撤回需要删除本周期所有任务
         DateRange dateRange = DateUtils.getStartAndEnd(new Date(), Math.toIntExact(plan.getPlanCycle()));
-        coreSafetyTaskMapper.delete(new LambdaQueryWrapper<CoreSafetyTask>().eq(CoreSafetyTask::getPlanId, plan.getId()).in(CoreSafetyTask::getStatus,1,2).between(CoreSafetyTask::getYmdDate, dateRange.getStartTime(), dateRange.getEndTime()));
+        if (plan.getPlanCycle()==6L) {
+            coreSafetyTaskMapper.delete(new LambdaQueryWrapper<CoreSafetyTask>().eq(CoreSafetyTask::getPlanId, plan.getId()).between(CoreSafetyTask::getYmdDate, dateRange.getStartTime(), dateRange.getEndTime()));
+        }else{
+            coreSafetyTaskMapper.delete(new LambdaQueryWrapper<CoreSafetyTask>().eq(CoreSafetyTask::getPlanId, plan.getId()).in(CoreSafetyTask::getStatus, 1, 2).between(CoreSafetyTask::getYmdDate, dateRange.getStartTime(), dateRange.getEndTime()));
 
+        }
     }
 
     @Override

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -522,7 +522,9 @@
         DELETE
         FROM core_monitoring_retrieval_task
         WHERE cycle = #{cycle}
-          AND ymd_date = #{ymdDate}
+          <if test="ymdDate !=null">
+              AND ymd_date = #{ymdDate}
+          </if>
           AND plan_id IN (SELECT id FROM core_monitoring_retrieval_plan WHERE parent_id = #{planId})
     </delete>
     <delete id="deleteWeekTaskByPlanId">
@@ -547,14 +549,18 @@
         DELETE
         FROM core_monitoring_retrieval_task
         WHERE cycle = #{cycle}
-          AND ymd_date BETWEEN #{startTime} AND #{endTime}
+          <if test="startTime !=null and endTime !=null">
+              AND ymd_date BETWEEN #{startTime} AND #{endTime}
+          </if>
           AND plan_id IN (SELECT id FROM core_monitoring_retrieval_plan WHERE parent_id = #{planId})
     </delete>
     <delete id="deleteDayTaskByTimeAndPlanId">
         DELETE
         FROM core_monitoring_retrieval_task
         WHERE cycle = #{cycle}
-          AND ymd_date BETWEEN #{startTime} AND #{endTime}
+          <if test="startTime !=null and endTime !=null">
+              AND ymd_date BETWEEN #{startTime} AND #{endTime}
+          </if>
           AND plan_id = #{planId}
     </delete>
     <delete id="deleteAllTaskByPlanIds">
@@ -711,4 +717,21 @@
             #{orgId}
     </foreach>
     </select>
+    <select id="selectAllTaskByPlanId"
+            resultType="com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask">
+        SELECT * FROM core_monitoring_retrieval_task WHERE
+  1=1
+<if test="planIds !=null">
+and    plan_id IN  <foreach collection="planIds" item="planId" open="(" separator="," close=")">
+    #{planId}
+
+</foreach>
+</if>
+        <if test="statusList != null">
+            AND `status` IN
+            <foreach collection="statusList" item="status" open="(" separator="," close=")">
+            #{status}
+            </foreach>
+        </if>
+    </select>
 </mapper>