Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.5

project_data/sql/0.0.5/soc/soc.sql

@@ -153,5 +153,5 @@ insert into sys_role_menu select DISTINCT id,@id from sys_role;
 -- 仅仅给超级管理员用，标记为删除状态,通过脚本维护了一条管理员与角色的关联数据，防止首页等依赖于登录用户角色信息的页面查询报错
 DELETE FROM `sys_role` WHERE `role_name`='超级管理员';
 INSERT INTO `sys_role` (`org_type`, `role_name`, `role_key`, `role_sort`, `data_scope`, `menu_check_strictly`, `dept_check_strictly`, `status`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ('1', '超级管理员', 'default', 0, 1, 1, 1, '0', 2, '超级管理员', '2023-12-07 17:14:07', '', NULL, '仅仅给超级管理员用，标记为删除状态,通过脚本维护了一条管理员与角色的关联数据，防止首页等依赖于登录用户角色信息的页面查询报错');
-DELETE FROM `sys_user_role` WHERE `role_id` = (SELECT id FROM `sys_role` WHERE `role_name`='超级管理员')
+DELETE FROM `sys_user_role` WHERE `role_id` = (SELECT id FROM `sys_role` WHERE `role_name`='超级管理员');
 INSERT INTO `sys_user_role` (`user_id`, `role_id`, `create_by`, `create_time`, `update_by`, `update_time`) SELECT 1 as `user_id`, id as `role_id`, '超级管理员' as `create_by`, '2023-09-17 19:57:06' as `create_time`, NULL, NULL  FROM `sys_role` WHERE `role_name`='超级管理员';

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/ICoreDrillTaskService.java

@@ -109,7 +109,7 @@ public interface ICoreDrillTaskService extends IService<CoreDrillTask> {
 
     void delTaskByIdList(List<Long> taskIdList);
 
-    void delByStartTimeAndEndTimeAndPlanIdList(List<Long> planIdList, Date startTime, Date endTime);
+    List<Long> delByStartTimeAndEndTimeAndPlanIdList(List<Long> planIdList, Date startTime, Date endTime);
 
     List<PanelListVo> selectRecList(PanelListDto panelListDto);
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillPlanServiceImpl.java

@@ -48,6 +48,8 @@ import com.xunmei.core.drill.service.ICoreDrillPlanService;
 import com.xunmei.core.drill.service.ICoreDrillPlanToExecOrgService;
 import com.xunmei.core.drill.service.ICoreDrillPlanToRoleService;
 import com.xunmei.core.drill.service.ICoreDrillTaskService;
+import com.xunmei.core.registerbook.service.ICoreRegisterBookPdfService;
+import com.xunmei.core.resumption.service.IResumptionRegisterService;
 import com.xunmei.core.thread.ThreadPoolConfig;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
@@ -101,7 +103,8 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
 
     @Autowired
     private RemoteOrgService orgService;
-
+    @Autowired
+    private ICoreRegisterBookPdfService registerBookPdfService;
     @Override
     public TableDataInfo<CoreDrillPlanPageVo> selectPage(CoreDrillPlanPageDto request) {
         //下穿
@@ -655,13 +658,17 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         } else {
             //计划下有已完成：删除本轮次及以后的所有任务，计划本身做逻辑删除。
             final CoreDrillPlan plan = getById(id);
+            Date date=null;
             if (plan.getPlanCycle().equals(DrillPlanCycleEnum.NONE.getCode())) {
-                coreDrillTaskService.delByStartTimeAndEndTimeAndPlanIdList(list, DateUtil.beginOfDay(new Date()), null);
+                date=DateUtil.beginOfDay(new Date());
             } else {
                 final DateRange range = DateUtils.getStartAndEnd(new Date(), plan.getPlanCycle());
-                coreDrillTaskService.delByStartTimeAndEndTimeAndPlanIdList(list, DateUtil.beginOfDay(range.getStartTime()), null);
+                date=DateUtil.beginOfDay(range.getStartTime());
+            }
+            final List<Long> taskIdList = coreDrillTaskService.delByStartTimeAndEndTimeAndPlanIdList(list, date, null);
+            for (Long taskId : taskIdList) {
+                registerBookPdfService.deleteWithFile(taskId);
             }
-
             removeByIds(list);
         }
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -377,7 +377,11 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
      * @return 结果
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int deleteCoreDrillTaskByIds(Long[] ids) {
+        for (Long taskId : ids) {
+            registerBookPdfService.deleteWithFile(taskId);
+        }
         return coreDrillTaskMapper.deleteBatchIds(Arrays.asList((ids)));
     }
 
@@ -1635,7 +1639,8 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
 
     @Override
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void delByStartTimeAndEndTimeAndPlanIdList(List<Long> planIdList, Date startTime, Date endTime) {
+    public List<Long> delByStartTimeAndEndTimeAndPlanIdList(List<Long> planIdList, Date startTime, Date endTime) {
+        List<Long> list = new ArrayList<>();
         if (ObjectUtil.isNotEmpty(planIdList)) {
             List<CoreDrillTask> taskList = lambdaQuery()
                     .ge(ObjectUtil.isNotNull(startTime), CoreDrillTask::getStartDate, startTime)
@@ -1645,7 +1650,9 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
                     .list();
             List<Long> taskIdList = taskList.stream().map(CoreDrillTask::getId).collect(Collectors.toList());
             delTaskByIdList(taskIdList);
+            list = taskIdList;
         }
+        return list;
     }
 }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/ICoreEduTrainingTaskService.java

@@ -107,7 +107,7 @@ public interface ICoreEduTrainingTaskService extends IService<CoreEduTrainingTas
 
     void delTaskByIdList(List<Long> idList);
 
-    void delByStartTimeAndEndTimeAndPlanIdList(List<Long> planIdList, Date startTime, Date endTime);
+    List<Long> delByStartTimeAndEndTimeAndPlanIdList(List<Long> planIdList, Date startTime, Date endTime);
 
     void export(CoreEduTrainingTaskPageDto request, HttpServletResponse response);
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingPlanServiceImpl.java

@@ -42,6 +42,7 @@ import com.xunmei.core.edu.service.ICoreEduTrainingPlanService;
 import com.xunmei.core.edu.service.ICoreEduTrainingPlanToExecOrgService;
 import com.xunmei.core.edu.service.ICoreEduTrainingPlanToRoleService;
 import com.xunmei.core.edu.service.ICoreEduTrainingTaskService;
+import com.xunmei.core.registerbook.service.ICoreRegisterBookPdfService;
 import com.xunmei.core.thread.ThreadPoolConfig;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
@@ -87,11 +88,11 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
     private ICoreEduTrainingTaskService coreEduTrainingTaskService;
     @Autowired
     private CoreEduTrainingTaskMapper coreEduTrainingTaskMapper;
-    @Autowired
-    private CoreEduTrainingPlanToOrgTypeMapper coreEduTrainingPlanToOrgTypeMapper;
+
     @Autowired
     private RemoteOrgService orgService;
-
+    @Autowired
+    private ICoreRegisterBookPdfService registerBookPdfService;
     @Autowired
     @Qualifier(ThreadPoolConfig.SOC_EXECUTOR)
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
@@ -646,12 +647,18 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         } else {
             //计划下有已完成：删除本轮次及以后的所有任务，计划本身做逻辑删除。
             final CoreEduTrainingPlan plan = getById(id);
+            Date date=null;
             if (plan.getPlanCycle().equals(EduTrainingPlanCycleEnum.NONE.getCode())) {
-                coreEduTrainingTaskService.delByStartTimeAndEndTimeAndPlanIdList(list, DateUtil.beginOfDay(new Date()), null);
+                date=DateUtil.beginOfDay(new Date());
             } else {
                 final DateRange range = DateUtils.getStartAndEnd(new Date(), plan.getPlanCycle());
-                coreEduTrainingTaskService.delByStartTimeAndEndTimeAndPlanIdList(list, DateUtil.beginOfDay(range.getStartTime()), null);
+                date=DateUtil.beginOfDay(range.getStartTime());
+            }
+            final List<Long> del = coreEduTrainingTaskService.delByStartTimeAndEndTimeAndPlanIdList(list, date, null);
+            for (Long taskId : del) {
+                registerBookPdfService.deleteWithFile(taskId);
             }
+
             removeByIds(list);
         }
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -401,6 +401,9 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int deleteCoreEduTrainingTaskByIds(Long[] ids) {
+        for (Long taskId : ids) {
+            registerBookPdfService.deleteWithFile(taskId);
+        }
         return coreEduTrainingTaskMapper.deleteBatchIds(Arrays.asList((ids)));
     }
 
@@ -899,7 +902,8 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void delByStartTimeAndEndTimeAndPlanIdList(List<Long> planIdList, Date startTime, Date endTime) {
+    public List<Long> delByStartTimeAndEndTimeAndPlanIdList(List<Long> planIdList, Date startTime, Date endTime) {
+        List<Long> list = new ArrayList<>();
         if (ObjectUtil.isNotEmpty(planIdList)) {
             List<CoreEduTrainingTask> taskList = lambdaQuery()
                     .ge(ObjectUtil.isNotNull(startTime), CoreEduTrainingTask::getStartDate, startTime)
@@ -909,7 +913,9 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
                     .list();
             List<Long> taskIdList = taskList.stream().map(CoreEduTrainingTask::getId).collect(Collectors.toList());
             delTaskByIdList(taskIdList);
+            list=taskIdList;
         }
+        return list;
     }
 
     @Override

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/service/impl/CoreSafetyBookNewServiceImpl.java

@@ -51,19 +51,6 @@ public class CoreSafetyBookNewServiceImpl extends ServiceImpl<CoreSafetyBookNewM
         }
         //查询条件
         QueryWrapper<CoreSafetyBookNew> query = new QueryWrapper<>(coreSafetyBookNew);
-        //下穿
-//        if (coreSafetyBookNew.getCheckSub()) {
-//            List<Long> ids = orgService.selectCheckSubOrgIdList(coreSafetyBookNew.getOrgId());
-//            //清空前端传递的org_id
-//            coreSafetyBookNew.setOrgId(null);
-//            //添加in条件
-//            query.in("org_id", ids);
-//        }
-//        //时间范围查询
-//        if (coreSafetyBookNew.getParams().get("beginTime") != null && coreSafetyBookNew.getParams().get("endTime") != null) {
-//            query.between("create_time", coreSafetyBookNew.getParams().get("beginTime"), coreSafetyBookNew.getParams().get("endTime"));
-//        }
-//        SysOrg org = orgService.selectOrgById(coreSafetyBookNew.getPartyBOrg() != null ? coreSafetyBookNew.getPartyBOrg() : SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER);
         SysOrg org = orgService.selectOrgById(coreSafetyBookNew.getPartyBOrg() ,SecurityConstants.INNER);
         if (org != null) {
             coreSafetyBookNew.setSelectOrgPath(org.getPath());

soc-modules/soc-modules-core/src/main/resources/mapper/safetybook/CoreSafetyBookNewMapper.xml

@@ -91,12 +91,11 @@
         u.name as user_name,
         b.party_a_org_name,
         b.party_b_org_name
-        # o.short_name as partyBOrgName,
-        # o2.short_name as partyAOrgName
+
         from core_safety_book_new b
         left join sys_user u on b.create_by=u.id
         left join sys_org o on o.id=b.party_b_org
-        # left join sys_org o2 on o2.id = b.party_a_org
+
         where b.deleted = 0
         <if test="info.year != null">
             and b.year=#{info.year}