Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.2

project_data/sql/0.0.2/soc/soc.sql

@@ -2173,6 +2173,12 @@ alter table core_edu_training_plan
 alter table core_drill_plan
     modify plan_status int null comment '计划状态：0草稿，1使用中,2停用';
 
+-- 修改菜单名称,删除网点用户关于培训计划/演练计划的菜单权限
+update sys_menu set menu_name ='教育培训计划下发' where menu_name='下发' and perms='core:plan:publish';
+delete from sys_role_menu where role_id in (select id from sys_role  where org_type=4) and menu_id in (select id from sys_menu m where menu_name like '%培训计划%');
+delete from sys_role_menu where role_id in (select id from sys_role  where org_type=4) and menu_id in (select id from sys_menu m where menu_name like '%演练计划%');
+
+
 -- -------------------------------------------------------
 -- ----------更新数据 end  ----------------------------
 -- -------------------------------------------------------

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

@@ -865,10 +865,12 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             SysOrg sysOrg = sysOrgList.stream().filter(org -> ObjectUtil.equal(org.getType(), OrgTypeEnum.HANG_SHE.getCode()))
                     .findFirst().orElseThrow(() -> new SystemException(ErrorMsgConstants.QUERY_ORG_DATA_ERROR));
 
-            Long count = coreDrillTaskMapper.selectCount(new LambdaQueryWrapper<CoreDrillTask>()
+            List<CoreDrillTask> coreDrillTasks = coreDrillTaskMapper.selectList(new LambdaQueryWrapper<CoreDrillTask>()
                     .eq(CoreDrillTask::getRecStatus, DrillRecStatus.REC_REGION_EXCELLENT_CASE.getCode())
-                    .likeRight(CoreDrillTask::getOrgPath, sysOrg.getPath()));
-            if (count != null && count >= Integer.parseInt(sysConfig.getConfigValue())) {
+                    .likeRight(CoreDrillTask::getOrgPath, sysOrg.getPath()).select(CoreDrillTask::getId, CoreDrillTask::getOrgId));
+            List<Long> list = coreDrillTasks.stream().map(CoreDrillTask::getId).collect(Collectors.toList());
+            //判断重复推优评优
+            if ((!list.contains(drillTask.getId())) && coreDrillTasks.size() >= Integer.parseInt(sysConfig.getConfigValue())) {
                 throw new SystemException("推荐地区优秀案例已达上限!");
             }
         }
@@ -881,10 +883,12 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
             SysOrg sysOrg = sysOrgList.stream().filter(org -> ObjectUtil.equal(org.getType(), OrgTypeEnum.BAN_SHI_CHU.getCode()))
                     .findFirst().orElseThrow(() -> new SystemException(ErrorMsgConstants.QUERY_ORG_DATA_ERROR));
 
-            Long count = coreDrillTaskMapper.selectCount(new LambdaQueryWrapper<CoreDrillTask>()
+            List<CoreDrillTask> coreDrillTasks = coreDrillTaskMapper.selectList(new LambdaQueryWrapper<CoreDrillTask>()
                     .eq(CoreDrillTask::getRecStatus, DrillRecStatus.REC_PROVINCE_EXCELLENT_CASE.getCode())
-                    .likeRight(CoreDrillTask::getOrgPath, sysOrg.getPath()));
-            if (count != null && count >= Integer.parseInt(sysConfig.getConfigValue())) {
+                    .likeRight(CoreDrillTask::getOrgPath, sysOrg.getPath()).select(CoreDrillTask::getId, CoreDrillTask::getOrgId));
+            List<Long> list = coreDrillTasks.stream().map(CoreDrillTask::getId).collect(Collectors.toList());
+            //判断重复推优评优
+            if ((!list.contains(drillTask.getId())) && coreDrillTasks.size() >= Integer.parseInt(sysConfig.getConfigValue())) {
                 throw new SystemException("推荐省级优秀案例已达上限!");
             }
         }

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

@@ -43,8 +43,6 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static com.xunmei.common.core.constant.Constants.TOP_ORG_PARENT_ID;
-
 /**
  * 学习资料Service业务层处理
  *
@@ -96,6 +94,7 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
         for (SysLearningMaterialsPageVo record : page.getRecords()) {
             record.setNo(page.getRecords().indexOf(record));
         }
+        page.getRecords().sort(Comparator.comparing(SysLearningMaterialsPageVo::getCreateTime).reversed());
         return TableDataInfo.success(page);
     }
 

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

@@ -154,31 +154,8 @@ public class ApiPlanController {
             //判断是否是编辑并且计划所属任务不存在已完成或者逾期,需要删除所有任务重新生成
             boolean isEditAll = info.getHasEdit() == null && info.getId() != null;
             //如果计划所属机构类型为行社并且勾选立即执行,新增的时候立即生成任务
-            if ((info.getId() == null &&planOfOrgType!=null&& planOfOrgType == 3 && info.getBuildTaskNow() == 1) || isEditAll) {
-//                    DateTime datetime = new DateTime();
-//                    datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-//                    //当有周期存在时保持原有接口不变（doTask），否则按照新的接口创建
-//                    Integer plancycle = info.getPlanCycle();
-//                    if (plancycle != null) {
-//                        if (plancycle == 2) {
-//                            taskBusiness.syncDay(datetime, plancycle);
-//                        }
-//                        if (plancycle == 3) {
-//                            taskBusiness.syncWeek(datetime, plancycle);
-//                        }
-//                        if (plancycle == 4) {
-//                            taskBusiness.syncMonth(datetime, plancycle);
-//                        }
-//                        if (plancycle == 5) {
-//                            taskBusiness.syncQuarter(datetime, plancycle);
-//                        }
-//                        if (plancycle == 6) {
-//                            taskBusiness.syncHalfYear(datetime, plancycle);
-//                        }
-//                        if (plancycle == 7) {
-//                            taskBusiness.syncYear(datetime, plancycle);
-//                        }
-//                    }
+            if ( isEditAll) {
+
                 //如果编辑
                 List<AppPlan> list = appPlanService.list(new LambdaQueryWrapper<AppPlan>().eq(AppPlan::getParentId, plan.getId()).eq(AppPlan::getDeleted, 0));
                 list.add(plan);

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

@@ -303,15 +303,17 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
 
             plan.setBuildTaskNow(app.getBuildTaskNow());
             plan.setDistribute("0");
+            plan.setPlanStatus(0);
             //设置计划所属机构类型
             plan.setPlanOfOrgType(Long.valueOf(orgService.selectSysOrgById(app.getPlanCreateOrgId(), SecurityConstants.INNER).getType()));
             //如果计划所属机构类型为行社
-            if (plan.getPlanOfOrgType() == 3 ) {
-                plan.setPlanStatus(1);
-                plan.setDistribute("1");
-            } else {
-                plan.setPlanStatus(0);
-            }
+//            if (plan.getPlanOfOrgType() == 3 ) {
+//                plan.setPlanStatus(1);
+//                plan.setDistribute("1");
+//            } else {
+//                plan.setPlanStatus(0);
+//            }
+
             baseMapper.insert(plan);
             Long id = plan.getId();
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/CoreSafecheckPlanController.java

@@ -123,7 +123,7 @@ public class CoreSafecheckPlanController extends BaseController {
         //判断是否是编辑并且计划所属任务不存在已完成或者逾期,需要删除所有任务重新生成
         boolean isEditAll = coreSafecheckPlan.getHasEdit() == null && coreSafecheckPlan.getId() != null;
         //如果是新增计划并且勾选立即执行并且是行社或者无周期,立即生成计划
-        if (coreSafecheckPlan.getId() == null && coreSafecheckPlan.isBuildTaskNow() && (coreSafecheckPlan.getPlanOfOrgType() == 3 || coreSafecheckPlan.getPlanCycle() == 6)) {
+        if (isEditAll) {
             CoreSafecheckPlan plan = coreSafecheckPlanService.getById(returnId);
             //获取父计划下面所有父id相等并且未删除并且已启用的计划
             List<CoreSafecheckPlan> plans = coreSafecheckPlanService.list(new LambdaQueryWrapper<CoreSafecheckPlan>().eq(CoreSafecheckPlan::getParentId, plan.getId()).eq(CoreSafecheckPlan::getIsDeleted, 0).eq(CoreSafecheckPlan::getDistribute, 1));

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

@@ -298,15 +298,17 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
             coreSafecheckPlan.setCreateTime(DateUtils.getNowDate());
             coreSafecheckPlan.setModifiedBy(SecurityUtils.getUserId());
             coreSafecheckPlan.setDistribute("0");
+            coreSafecheckPlan.setPlanStatus(0L);
             //计划所属机构类型
             coreSafecheckPlan.setPlanOfOrgType(orgService.selectSysOrgById(coreSafecheckPlan.getPlanOfOrgId(), SecurityConstants.INNER).getType());
             //如果是行社并且勾选了立即下发需要修改下发状态为已下发,因为会立即触发下发动作
-            if (coreSafecheckPlan.getPlanOfOrgType() == 3) {
-                coreSafecheckPlan.setPlanStatus(1L);
-                coreSafecheckPlan.setDistribute("1");
-            } else {
-                coreSafecheckPlan.setPlanStatus(0L);
-            }
+//            if (coreSafecheckPlan.getPlanOfOrgType() == 3) {
+//                coreSafecheckPlan.setPlanStatus(1L);
+//                coreSafecheckPlan.setDistribute("1");
+//            } else {
+//                coreSafecheckPlan.setPlanStatus(0L);
+//            }
+
             coreSafecheckPlanMapper.insert(coreSafecheckPlan);
             returnId = coreSafecheckPlan.getId();
         } else {