bug修改

project_data/sql/0.0.5/soc/soc.sql

@@ -105,6 +105,8 @@ INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (117, 1734903034555719
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (118, 1734903034555719682);
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (119, 1734903034555719682);
 INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 1734903034555719682);
+delete  from sys_role_menu where menu_id in (select id from  sys_menu where perms='core:eduTask:report' and menu_name='报表查看' limit 1);
+delete  from sys_menu where perms='core:eduTask:report' and menu_name='报表查看' limit 1;
 delete  from sys_dict_type where  dict_type='monitor_org';
 INSERT INTO sys_dict_type (dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark)
 VALUES ('调阅机构类型', 'monitor_org', '0', null, now(), null, now(), null);

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillPlanPageVo.java

@@ -77,6 +77,9 @@ public class CoreDrillPlanPageVo {
     @ApiModelProperty(value = "标准机构下发的计划所生成任务是否存在已完成的任务", notes = "1:存在, 0/null:不存在")
     private Integer done;
 
+    @ApiModelProperty(value = "标准机构下发的计划所生成任务是否存在未完成的任务", notes = "1:存在, 0/null:不存在")
+    private Integer unDone;
+
     //private String planRoleNameList;
 
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/vo/CoreEduTrainingPlanPageVo.java

@@ -64,6 +64,8 @@ public class CoreEduTrainingPlanPageVo {
 
     @ApiModelProperty(value = "标准机构下发的计划所生成任务是否存在已完成的任务", notes = "1:存在, 0/null:不存在")
     private Integer done;
+    @ApiModelProperty(value = "标准机构下发的计划所生成任务是否存在未完成的任务", notes = "1:存在, 0/null:不存在")
+    private Integer unDone;
 
     private String planRoleNameList;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/controller/CoreDrillPlanController.java

@@ -118,7 +118,7 @@ public class CoreDrillPlanController extends BaseController {
 
 
     @ApiOperation(value = "计划下拉框")
-    @RequiresPermissions("core:drillPlan:list")
+   // @RequiresPermissions("core:drillPlan:list")
     @GetMapping("/planList/{orgId}")
     public AjaxResult planList(@PathVariable("orgId") Long orgId) {
         List<IdName<String, String>> planList = coreDrillPlanService.planList(orgId);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/controller/CoreDrillTaskController.java

@@ -142,7 +142,7 @@ public class CoreDrillTaskController extends BaseController {
     }
 
     @ApiOperation(value = "优秀案例推荐",notes = "推荐优秀案例")
-    @RequiresPermissions("core:drillTask:edit")
+    //@RequiresPermissions("core:drillTask:edit")
     @PostMapping("/doRecTask")
     public AjaxResult doRecTask(@RequestBody @Validated CoreDrillTaskDoRec request) {
         return success(coreDrillTaskService.doRecTask(request));

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/mapper/CoreDrillTaskMapper.java

@@ -9,8 +9,6 @@ import com.xunmei.common.core.domain.drill.dto.CoreDrillTaskPageDto;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillTaskRecPageDto;
 import com.xunmei.common.core.domain.drill.dto.CoreDrillTaskReportDto;
 import com.xunmei.common.core.domain.drill.vo.*;
-import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto;
-import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskExportVo;
 import com.xunmei.common.core.domain.panel.dto.PanelListDto;
 import com.xunmei.common.core.domain.panel.vo.PanelListVo;
 import org.apache.ibatis.annotations.Param;
@@ -58,4 +56,6 @@ public interface CoreDrillTaskMapper extends BaseMapper<CoreDrillTask> {
     List<CoreDrillTaskExportVo> selectDrillTaskExportList(@Param("request") CoreDrillTaskPageDto request);
 
     Integer checkHasTaskIsDoneByPlanIdOrParentId(@Param("planId") Long planId);
+
+    Integer checkHasTaskUnDoneByPlanParentId(@Param("planId") Long planId);
 }

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

@@ -26,7 +26,6 @@ import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanDataVo;
 import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanDetailVo;
 import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanPageVo;
 import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanRoleVo;
-import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingPlan;
 import com.xunmei.common.core.enums.OrgTypeEnum;
 import com.xunmei.common.core.enums.drill.DrillDoStatus;
 import com.xunmei.common.core.enums.drill.DrillPlanCycleEnum;
@@ -138,6 +137,9 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         if (record.getStandard() == 1) {
             final Integer done = coreDrillTaskMapper.checkHasTaskIsDoneByPlanParentId(record.getId());
             record.setDone(done);
+            //是否存在未完成的任务
+            final Integer unDone = coreDrillTaskMapper.checkHasTaskUnDoneByPlanParentId(record.getId());
+            record.setUnDone(unDone);
         }
     }
 
@@ -358,6 +360,9 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
     }
 
     private void doUpdatePlanForDeleted(CoreDrillPlan plan, CoreDrillPlanUpdateDto request) {
+        if (ObjectUtil.isEmpty(request.getRemark())) {
+            request.setRemark(null);
+        }
         validateFieldForStandard(request.getPlanCycle(), plan.getPlanCycle(), "当前状态仅允许修改任务名称");
         validateFieldForStandard(request.getExecTimes(), plan.getExecTimes(), "当前状态仅允许修改任务名称");
         validateFieldForStandard(request.getExecOrgType(), plan.getExecOrgType(), "当前状态仅允许修改任务名称");
@@ -650,7 +655,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
             coreDrillPlanMapper.delByIds(list);
         } else {
             //计划下有已完成：删除本轮次及以后的所有任务，计划本身做逻辑删除。
-            coreDrillTaskService.delByStartTimeAndEndTimeAndPlanIdList(list, new Date(), null);
+            coreDrillTaskService.delByStartTimeAndEndTimeAndPlanIdList(list, DateUtil.beginOfDay(new Date()), null);
             removeByIds(list);
         }
     }
@@ -736,6 +741,9 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
             plan.setBuildTaskNow(0);
             plan.setEffectiveTime(DateUtil.offsetDay(plan.getPlanEndDate(), 1));
         }
+        if (plan.getPlanCycle().equals(EduTrainingPlanCycleEnum.NONE.getCode())) {
+            plan.setEffectiveTime(new Date());
+        }
     }
 
     private Boolean anotherCheckOrgType(Integer orgType) {
@@ -870,7 +878,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
             drillPlan.setParentId(plan.getId());
             drillPlan.setCreateTime(new Date());
             drillPlan.setUpdateTime(new Date());
-            this.updatePlanTime(plan, status);
+            this.updatePlanTime(drillPlan, status);
             list.add(drillPlan);
 
             if (ObjectUtil.isNotEmpty(planExecOrgList)) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/controller/CoreEduTrainingPlanController.java

@@ -114,7 +114,7 @@ public class CoreEduTrainingPlanController extends BaseController {
 
 
     @ApiOperation(value = "计划下拉框")
-    @RequiresPermissions("core:plan:list")
+    //@RequiresPermissions("core:plan:list")
     @GetMapping("/planList/{orgId}")
     public AjaxResult planList(@PathVariable("orgId") Long orgId) {
         List<IdName<String, String>> planList = coreEduTrainingPlanService.planList(orgId);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/mapper/CoreEduTrainingTaskMapper.java

@@ -54,5 +54,5 @@ public interface CoreEduTrainingTaskMapper extends BaseMapper<CoreEduTrainingTas
     Integer checkHasTaskIsDoneByPlanIdOrParentId(@Param("planId") Long planId);
 
 
-
+    Integer checkHasTaskUnDoneByPlanParentId(@Param("planId") Long planId);
 }

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

@@ -120,21 +120,25 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         if (ObjectUtil.equal(record.getCreateOrgId(), orgId)) {
             record.setCreateByTopOrg(1);
         }
-        String roleNameList = coreEduTrainingPlanToRoleMapper.selectRoleNameByPlanId(record.getId()).stream().map(CoreEduTrainingPlanRoleVo::getRoleName).collect(Collectors.joining(","));
+        /*String roleNameList = coreEduTrainingPlanToRoleMapper.selectRoleNameByPlanId(record.getId()).stream().map(CoreEduTrainingPlanRoleVo::getRoleName).collect(Collectors.joining(","));
         record.setPlanRoleNameList(roleNameList);
         request.setId(record.getId());
-//        List<CoreEduTrainingPlanPageVo> children = coreEduTrainingPlanMapper.selectChildrenPlan(request);
-//        record.setChildren(children);
-//        for (CoreEduTrainingPlanPageVo child : children) {
-//            if (ObjectUtil.equal(child.getCreateOrgId(), orgId)) {
-//                child.setCreateByTopOrg(1);
-//            }
-//            child.setPlanRoleNameList(roleNameList);
-//        }
+        List<CoreEduTrainingPlanPageVo> children = coreEduTrainingPlanMapper.selectChildrenPlan(request);
+        record.setChildren(children);
+        for (CoreEduTrainingPlanPageVo child : children) {
+            if (ObjectUtil.equal(child.getCreateOrgId(), orgId)) {
+                child.setCreateByTopOrg(1);
+            }
+            child.setPlanRoleNameList(roleNameList);
+        }*/
 
         if (record.getStandard() == 1) {
+            //是否存在已完成的任务
             final Integer done = coreEduTrainingTaskMapper.checkHasTaskIsDoneByPlanParentId(record.getId());
             record.setDone(done);
+            //是否存在未完成的任务
+            final Integer unDone = coreEduTrainingTaskMapper.checkHasTaskUnDoneByPlanParentId(record.getId());
+            record.setUnDone(unDone);
         }
     }
 
@@ -364,6 +368,9 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
     }
 
     private void doUpdatePlanForDeleted(CoreEduTrainingPlan plan, CoreEduTrainingPlanEditDto request) {
+        if (ObjectUtil.isEmpty(request.getRemark())) {
+            request.setRemark(null);
+        }
         validateFieldForStandard(request.getPlanCycle(), plan.getPlanCycle(), "当前状态仅允许修改任务名称");
         validateFieldForStandard(request.getExecTimes(), plan.getExecTimes(), "当前状态仅允许修改任务名称");
         validateFieldForStandard(request.getExecOrgType(), plan.getExecOrgType(), "当前状态仅允许修改任务名称");
@@ -642,7 +649,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             coreEduTrainingPlanMapper.delByIds(list);
         } else {
             //计划下有已完成：删除本轮次及以后的所有任务，计划本身做逻辑删除。
-            coreEduTrainingTaskService.delByStartTimeAndEndTimeAndPlanIdList(list, new Date(), null);
+            coreEduTrainingTaskService.delByStartTimeAndEndTimeAndPlanIdList(list, DateUtil.beginOfDay(new Date()), null);
             removeByIds(list);
         }
     }
@@ -744,6 +751,9 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             plan.setBuildTaskNow(0);
             plan.setEffectiveTime(DateUtil.offsetDay(plan.getEndDate(), 1));
         }
+        if (plan.getPlanCycle().equals(EduTrainingPlanCycleEnum.NONE.getCode())) {
+            plan.setEffectiveTime(new Date());
+        }
     }
 
     public List<SysOrgVO> getPlanPublishOrgList(List<SysOrgVO> list) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/panel/service/impl/PanelServiceImpl.java

@@ -259,7 +259,9 @@ public class PanelServiceImpl implements PanelService {
         req.setUserId(SecurityUtils.getUserId());
         req.setTagRoleIds(roles);
         final TableDataInfo<MessageAppPageVo> page = notificationService.selectAppPage(req);
-        hashMap.put("index1", page.getRows());
+        final List<MessageAppPageVo> rows = page.getRows();
+        rows.sort(Comparator.comparing(MessageAppPageVo::getPublishTime).reversed());
+        hashMap.put("index1",rows );
     }
 
     private void getMaterials(Map<String, Object> hashMap) {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/controller/CoreSafetyBookController.java

@@ -37,7 +37,7 @@ public class CoreSafetyBookController extends BaseController {
      * 查询【安全检查责任书】列表
      */
     @ApiOperation(value = "查询CoreSafetyBook列表")
-    @RequiresPermissions("core:book:list")
+    //@RequiresPermissions("core:book:list")
     @PostMapping("/list")
     public TableDataInfo<CoreSafetyBook> list(@RequestBody CoreSafetyBook coreSafetyBook) {
 

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillPlanMapper.xml

@@ -659,10 +659,10 @@
     <update id="updatePlanStatusByIdOrParentId">
         update core_drill_plan
         <set>
-            <if test="status != null">
-                plan_status = #{status},
+            <if test="planStatus != null">
+                plan_status = #{planStatus},
             </if>
-            <if test="status ==2">
+            <if test="planStatus ==2">
                 withdraw_time=now(),
             </if>
         </set>

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillTaskMapper.xml

@@ -377,4 +377,11 @@
         limit 1
     </select>
 
+    <select id="checkHasTaskUnDoneByPlanParentId" resultType="java.lang.Integer">
+        select 1
+        from core_drill_task t
+        where t.status in (0,5,1)
+          and (t.plan_id = #{planId} or plan_id in (select id from core_drill_plan where parent_id = #{planId}))
+        limit 1
+    </select>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingTaskMapper.xml

@@ -282,4 +282,11 @@
         limit 1
     </select>
 
+    <select id="checkHasTaskUnDoneByPlanParentId" resultType="java.lang.Integer">
+        select 1
+        from core_edu_training_task t
+        where (t.status != 2 and t.status != 3)
+          and (t.plan_id = #{planId} or plan_id in (select id from core_edu_training_plan where parent_id = #{planId}))
+        limit 1
+    </select>
 </mapper>