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

@@ -1181,6 +1181,11 @@ ALTER TABLE `core_protection` MODIFY COLUMN `device_id` BIGINT NULL DEFAULT NULL
 -- 修改培训任务表状态字段含义注释
 	alter table core_edu_training_task  modify status int null comment '任务状态:0:待培训,1:待签名,2:已完成,3:已逾期,4:待提交';
 	alter table sys_menu modify icon mediumtext null comment '菜单图标';
+-- 修改表字段释义
+alter table core_edu_training_plan
+    modify plan_status int null comment '计划状态：0草稿，1使用中,2停用';
+alter table core_drill_plan
+    modify plan_status int null comment '计划状态：0草稿，1使用中,2停用';
 
 END ??
 DELIMITER;
@@ -2095,6 +2100,12 @@ INSERT INTO sys_dict_data ( dict_sort, dict_label, dict_value, dict_type, css_cl
 INSERT INTO sys_dict_data ( dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES ( 1, '使用中', '1', 'materials_status', null, 'default', 'N', '0', null, now(), '', null, null);
 INSERT INTO sys_dict_data ( dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES ( 2, '停用', '2', 'materials_status', null, 'default', 'N', '0', null, now(), '', null, null);
 
+delete from sys_dict_data where dict_type='resumption_status';
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 0, '待履职', '1', 'resumption_status', NULL, 'default', 'N', '0', 'admin', '2023-08-11 09:21:09', '', NULL, NULL);
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 1, '进行中', '2', 'resumption_status', NULL, 'default', 'N', '0', 'admin', '2023-08-11 09:21:09', '', NULL, NULL);
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 2, '已完成', '3', 'resumption_status', NULL, 'default', 'N', '0', 'admin', '2023-08-11 09:21:09', '省联社账号', '2023-10-24 17:03:48', NULL);
+INSERT INTO `sys_dict_data`( `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES ( 3, '已逾期', '4', 'resumption_status', NULL, 'default', 'N', '0', 'admin', '2023-08-11 09:21:09', '', NULL, NULL);
+
 -- -------------------------------------------------------
 -- ----------新增数据 end  ----------------------------
 -- -------------------------------------------------------
@@ -2188,12 +2199,6 @@ DELETE from sys_menu WHERE perms in ('device:protection:add','device:protection:
 -- 隐藏知识库标签管理菜单
 delete  from sys_role_menu rm  where rm.menu_id in ( select id from sys_menu  where menu_name='知识库标签管理' union all select sm.id from sys_menu m inner join sys_menu sm on m.id=sm.parent_id where  m.menu_name='知识库标签管理');
 
--- 修改表字段释义
-alter table core_edu_training_plan
-    modify plan_status int null comment '计划状态：0草稿，1使用中,2停用';
-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 '%培训计划%');

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteSyncOrgAndUserService.java

@@ -25,4 +25,22 @@ public interface RemoteSyncOrgAndUserService
      */
     @GetMapping("/fjnx/organduser")
     public R<Boolean> syncOrgAndUser(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 同步机构
+     * @param source
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/fjnx/org")
+    public R<Boolean> syncOrg(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 同步用户
+     * @param source
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/fjnx/user")
+    public R<Boolean> syncUser(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteSyncOrgAndUserFactory.java

@@ -31,6 +31,16 @@ public class RemoteSyncOrgAndUserFactory implements FallbackFactory<RemoteSyncOr
             public R<Boolean> syncOrgAndUser(String source) {
                 return R.fail("同步机构、用户失败:" + throwable.getMessage());
             }
+
+            @Override
+            public R<Boolean> syncOrg(String source) {
+                return R.fail("同步机构失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Boolean> syncUser(String source) {
+                return R.fail("同步用户失败:" + throwable.getMessage());
+            }
         };
     }
 }

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

@@ -669,7 +669,8 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         tMonitoringRetrievalPlan.setUpdateBy(SecurityUtils.getUsername());
         TMonitoringRetrievalPlan plan = baseMapper.selectById(tMonitoringRetrievalPlan.getId());
         BeanUtils.copyProperties(tMonitoringRetrievalPlan, plan);
-        // plan.setIsDistribute("0");
+        SysRole sysRole = remoteRoleService.getRoleById(tMonitoringRetrievalPlan.getRoleId(), SecurityConstants.INNER);
+        plan.setRoleName(sysRole.getRoleName());
         int i = tMonitoringRetrievalPlanMapper.updateById(plan);
         if (CollectionUtils.isEmpty(coreMonitoringRetrievalTasks)) {
             iCoreMonitoringRetrievalTaskService.deleteTaskByPlanId(tMonitoringRetrievalPlan.getId());

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

@@ -87,4 +87,5 @@ public interface ICoreDrillPlanService extends IService<CoreDrillPlan> {
 
     int revocationPlan(Long planId);
 
+    void populateProperties(CoreDrillPlan source, CoreDrillPlan target);
 }

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

@@ -294,16 +294,19 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         // 判断标准计划能否修改:存在下发的计划生成了任务且任务存在已执行
         Integer standardPlanHasDone = coreDrillTaskMapper.checkHasTaskIsDoneByPlanParentId(planId);
         if (ObjectUtil.equal(standardPlanHasDone, 1)) {
+            SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() ->
+                    orgService.selectOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
             //验证修改的字段是否符合要求
             String errorMsg = "有任务已执行或已过期,仅允许修改计划名称!";
-            validatePlanForStandard(request, plan, errorMsg);
+            validatePlanForStandard(request, plan, errorMsg, sysOrg.getType());
             doUpdatePlan(plan, request);
             coreDrillPlanMapper.updatePlanName(plan.getId(), plan.getPlanName());
             coreDrillTaskMapper.updateTaskNameByParentPlanId(planId, plan.getPlanName(), range.getStartTime(), range.getEndTime());
         } else {
             doUpdatePlan(plan, request);
             delAllByParentPlanId(plan.getId());
-            List<CoreDrillPlan> planList = buildPlanData(plan, null, false);            TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
+            List<CoreDrillPlan> planList = buildPlanData(plan, null, false);
+            TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
                 @Override
                 public void afterCommit() {
                     for (CoreDrillPlan drillPlan : planList) {
@@ -327,7 +330,8 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
 
     }
 
-    private void populateProperties(CoreDrillPlan source, CoreDrillPlan target) {
+    @Override
+    public void populateProperties(CoreDrillPlan source, CoreDrillPlan target) {
         target.setPlanName(source.getPlanName());
         target.setPlanCycle(source.getPlanCycle());
         target.setExecTimes(source.getExecTimes());
@@ -369,8 +373,15 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
             throw new RuntimeException("执行次数不能小于基准计划执行次数!");
         }
         if (ObjectUtil.notEqual(plan.getId(), plan.getParentId())) {
-            String errorMsg = "子计划仅允许修改培训次数!";
-            validatePlanForStandard(request, plan, errorMsg);
+            String errorMsg = null;
+            SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() ->
+                    orgService.selectOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+            if (ObjectUtil.equal(sysOrg.getType(), OrgTypeEnum.SHEGN_LIAN_SHE.getCode())) {
+                errorMsg = "当前用户身份仅允许修改子计划的计划名称和演练次数!!";
+            } else {
+                errorMsg = "当前用户身份仅允许修改子计划的演练次数!";
+            }
+            validatePlanForStandard(request, plan, errorMsg, sysOrg.getType());
         }
         doUpdatePlan(plan, request);
         final long done = coreDrillTaskMapper.selectCount(new LambdaQueryWrapper<CoreDrillTask>()
@@ -418,7 +429,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
     }
 
 
-    private void validatePlanForStandard(CoreDrillPlanUpdateDto request, CoreDrillPlan plan, String errorMsg) {
+    private void validatePlanForStandard(CoreDrillPlanUpdateDto request, CoreDrillPlan plan, String errorMsg, Integer type) {
         validateFieldForStandard(request.getPlanCycle(), plan.getPlanCycle(), errorMsg);
         validateFieldForStandard(request.getExecOrgType(), plan.getExecOrgType(), errorMsg);
         List<Long> execOrgIdList = coreDrillPlanToExecOrgMapper.selectOrgIdByPlanId(plan.getId());
@@ -426,9 +437,10 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         validateFieldForStandard(request.getRemark(), plan.getRemark(), errorMsg);
         validateFileListForStandard(request.getFileList(), JSON.parseArray(plan.getFileList(), String.class), errorMsg);
 
-        //标准计划可以修改名称
-        //validateFieldForStandard(request.getPlanName(), plan.getPlanName(), errorMsg);
-
+        if (OrgTypeEnum.HANG_SHE.equals(OrgTypeEnum.getOrgTypeEnum(type))) {
+            //标准计划可以修改名称,行社不允许修改名称
+            validateFieldForStandard(request.getPlanName(), plan.getPlanName(), errorMsg);
+        }
 
     }
 

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

@@ -281,8 +281,15 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         }
 
         if (ObjectUtil.notEqual(plan.getId(), plan.getParentId())) {
-            String errorMsg = "子计划仅允许修改培训次数!";
-            validatePlanForStandard(request, plan, errorMsg);
+            String errorMsg = null;
+            SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() ->
+                    orgService.selectOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+            if (ObjectUtil.equal(sysOrg.getType(), OrgTypeEnum.SHEGN_LIAN_SHE.getCode())) {
+                errorMsg = "当前用户身份仅允许修改子计划的培训主题和培训次数!!";
+            } else {
+                errorMsg = "当前用户身份仅允许修改子计划的培训次数!";
+            }
+            validatePlanForStandard(request, plan, errorMsg, sysOrg.getType());
         }
         doUpdatePlan(plan, request);
 
@@ -338,9 +345,11 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         // 判断标准计划能否修改:存在下发的计划生成了任务且任务存在已执行
         Integer standardPlanHasDone = coreEduTrainingTaskMapper.checkHasTaskIsDoneByPlanParentId(planId);
         if (ObjectUtil.equal(standardPlanHasDone, 1)) {
+            SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() ->
+                    orgService.selectOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
             //验证修改的字段是否符合要求
             String errorMsg = "有任务已执行或已过期,仅允许修改培训主题!";
-            validatePlanForStandard(request, plan, errorMsg);
+            validatePlanForStandard(request, plan, errorMsg,sysOrg.getType());
             doUpdatePlan(plan, request);
             coreEduTrainingPlanMapper.updatePlanName(plan.getId(), plan.getPlanName());
             coreEduTrainingTaskMapper.updateTaskNameByParentPlanId(planId, plan.getPlanName(), range.getStartTime(), range.getEndTime());
@@ -402,7 +411,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
 
     }
 
-    private void validatePlanForStandard(CoreEduTrainingPlanEditDto request, CoreEduTrainingPlan plan, String errorMsg) {
+    private void validatePlanForStandard(CoreEduTrainingPlanEditDto request, CoreEduTrainingPlan plan, String errorMsg,Integer type) {
         validateFieldForStandard(request.getPlanCycle(), plan.getPlanCycle(), errorMsg);
         validateFieldForStandard(request.getExecOrgType(), plan.getExecOrgType(), errorMsg);
         List<Long> execOrgIdList = coreEduTrainingPlanToExecOrgMapper.selectOrgIdByPlanId(plan.getId());
@@ -410,8 +419,11 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         validateFieldForStandard(request.getRemark(), plan.getRemark(), errorMsg);
         validateFileListForStandard(request.getFileList(), JSON.parseArray(plan.getFileList(), String.class), errorMsg);
 
-        //标准计划可以修改名称
-        validateFieldForStandard(request.getPlanName(), plan.getPlanName(), errorMsg);
+        if (OrgTypeEnum.HANG_SHE.equals(OrgTypeEnum.getOrgTypeEnum(type))) {
+            //标准计划可以修改名称,行社不允许修改名称
+            validateFieldForStandard(request.getPlanName(), plan.getPlanName(), errorMsg);
+        }
+
 
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/mapper/CoreEvaluateTaskMapper.java

@@ -71,4 +71,6 @@ public interface CoreEvaluateTaskMapper extends BaseMapper<CoreEvaluateTask> {
     Page<CoreEvaluateTaskVO> selectPageList(@Param("page") Page<CoreEvaluateTaskVO> page, @Param("request") EvaluateTaskDTO request);
 
     Page<Map> statistics(@Param("page") Page<Map> page, @Param("request") EvaluateTaskDTO request);
+
+    List<Map>getContentByTaskId(@Param("taskId") Long taskId);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/ICoreEvaluateTaskService.java

@@ -9,6 +9,7 @@ import com.xunmei.core.evaluate.dto.EvaluateTaskDTO;
 import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 外包评价任务Service接口
@@ -80,5 +81,5 @@ public interface ICoreEvaluateTaskService extends IService<CoreEvaluateTask> {
      * @param evaluateTaskDTO
      * @return
      */
-    TableDataInfo statistics(EvaluateTaskDTO evaluateTaskDTO);
+    TableDataInfo<Map> statistics(EvaluateTaskDTO evaluateTaskDTO);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/service/impl/CoreEvaluateTaskServiceImpl.java

@@ -3,6 +3,7 @@ package com.xunmei.core.evaluate.service.impl;
 
 import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.C;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.SecurityConstants;
@@ -36,10 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -67,6 +65,18 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
 
     @Override
     public TableDataInfo<CoreEvaluateTaskVO> selectPage(EvaluateTaskDTO evaluateTaskDTO) {
+/*        TableDataInfo<Map> statistics = statistics(evaluateTaskDTO);
+        List<Map> rows = statistics.getRows();
+        for (int i = 0; i < rows.size(); i++) {
+            Object taskId = rows.get(i).get("taskId");
+            List<Map> contentByTaskId = baseMapper.getContentByTaskId((Long) taskId);
+            if (CollectionUtils.isNotEmpty(contentByTaskId)) {
+                for (int l = 0; l < contentByTaskId.size(); l++) {
+                    rows.get(i).put(contentByTaskId.get(l).get("content"), contentByTaskId.get(l).get("score"));
+                }
+            }
+        }*/
+        statistics(evaluateTaskDTO);
         Page<CoreEvaluateTaskVO> page;
         //分页
         if (evaluateTaskDTO.getPageNum() != null && evaluateTaskDTO.getPageSize() != null) {
@@ -102,9 +112,30 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
     }
 
     @Override
-    public TableDataInfo statistics(EvaluateTaskDTO evaluateTaskDTO) {
-
-        return null;
+    public TableDataInfo<Map> statistics(EvaluateTaskDTO evaluateTaskDTO) {
+        Page<Map> page;
+        //分页
+        if (evaluateTaskDTO.getPageNum() != null && evaluateTaskDTO.getPageSize() != null) {
+            page = new Page<>(evaluateTaskDTO.getPageNum(), evaluateTaskDTO.getPageSize());
+        } else {
+            page = new Page<>();
+        }
+        Page<Map> statistics = baseMapper.statistics(page, evaluateTaskDTO);
+        List<Map> rows = statistics.getRecords();
+        for (int i = 0; i < rows.size(); i++) {
+            Object taskId = rows.get(i).get("taskId");
+            List<Map> contentByTaskId = baseMapper.getContentByTaskId((Long) taskId);
+            if (CollectionUtils.isNotEmpty(contentByTaskId)) {
+                int total = 0;
+                for (int l = 0; l < contentByTaskId.size(); l++) {
+                    Integer score = Integer.valueOf(contentByTaskId.get(l).get("score").toString());
+                    rows.get(i).put(contentByTaskId.get(l).get("content"), score);
+                    total += score;
+                }
+                rows.get(i).put("合计", total);
+            }
+        }
+        return TableDataInfo.build(statistics);
     }
 
     /**
@@ -141,7 +172,7 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         CoreEvaluateTaskVO coreEvaluateTaskVO = new CoreEvaluateTaskVO();
         CoreEvaluateTask coreEvaluateTask = coreEvaluateTaskMapper.selectById(id);
         BeanUtils.copyProperties(coreEvaluateTask, coreEvaluateTaskVO);
-        switch ( coreEvaluateTaskVO.getEvaluateCycle()){
+        switch (coreEvaluateTaskVO.getEvaluateCycle()) {
             case "0":
                 coreEvaluateTaskVO.setEvaluateCycle("每月");
                 break;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/job/SafetyCheckJobBusiness.java

@@ -13,7 +13,6 @@ import com.xunmei.common.core.enums.CycleCommonEnum;
 import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.core.TaskCreatingServiceImplBase;
-import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
 import com.xunmei.core.safetyCheck.domain.*;
 import com.xunmei.core.safetyCheck.domain.CoreSafecheckPlan;
 import com.xunmei.core.safetyCheck.dto.SafetyTaskBuildDto;
@@ -650,7 +649,28 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
     public void rebuildTask(List<Long> orgIds, Date startDate, Date endDate, CycleCommonEnum cycle) {
         Map<Long, Boolean> workingMap = orgWorkTimeStatusMap(startDate, cycle, orgIds);
 //        List<Long> deleteTaskIds = new ArrayList<>();
+        Integer planCycle = 0;
+        switch (cycle) {
+            case WEEKLY:
+                planCycle = 1;
+                break;
+            case MONTHLY:
+                planCycle = 2;
+                break;
+            case QUARTERLY:
+                planCycle = 3;
+                break;
+            case HALF_YEARLY:
+                planCycle = 4;
+                break;
+            case YEARLY:
+                planCycle = 5;
+                break;
+            case NONE:
+                planCycle = 6;
+                break;
 
+        }
         List<SysOrg> orgs = remoteOrgService.selectByOrgIdList(orgIds, SecurityConstants.INNER);
         for (SysOrg worg : orgs) {
             if (ObjectUtil.isNull(worg.getType())) {
@@ -658,20 +678,24 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
             }
 
             Long orgId = worg.getId();
-            checkTaskService.deleteByOrgIdAndRange(orgId, startDate, endDate);
+            checkTaskService.deleteByOrgIdAndRange(orgId, startDate, endDate, planCycle);
             if (!workingMap.containsKey(orgId) || !workingMap.get(orgId)) {
                 //当前作息周期已经歇业,删除未进行的任务
-                checkTaskService.deleteByOrgIdAndRange(orgId, startDate, endDate);
+                checkTaskService.deleteByOrgIdAndRange(orgId, startDate, endDate, planCycle);
                 continue;
             } else {
                 //开始营业,重新生成任务
-                //拿到所有检查计划
-                List<CoreSafecheckPlan> plans = planMapper.selectByPlanStatus(1);
+                //拿到当前周期所有检查计划
+                List<CoreSafecheckPlan> plans = planMapper.selectByPlanStatus(1, planCycle);
                 Iterator<CoreSafecheckPlan> safecheckPlanIterator = plans.iterator();
                 //遍历计划
                 while (safecheckPlanIterator.hasNext()) {
                     //拿到计划所属受检机构
                     List<SysOrg> checkOrgList = safecheckPlanIterator.next().getCheckOrgList();
+//                    //如果检查机构数量为0表示未指定具体检查机构,默认当前计划拥有当前机构
+//                    if(checkOrgList.size()==0){
+//                        checkOrgList.add(worg);
+//                    }
                     //过滤掉不等于当前作息变更机构的受检机构
                     List<SysOrg> collect = checkOrgList.stream().filter(e -> e.getId().equals(orgId)).collect(Collectors.toList());
                     //过滤完数组长度0表示没有受检机构等于作息变更机构的数据

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/mapper/CoreSafecheckPlanMapper.java

@@ -3,7 +3,6 @@ package com.xunmei.core.safetyCheck.mapper;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.core.resumption.domain.AppPlan;
 import com.xunmei.core.safetyCheck.domain.CoreSafecheckPlan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -74,5 +73,5 @@ public interface CoreSafecheckPlanMapper extends BaseMapper<CoreSafecheckPlan> {
 
     List<CoreSafecheckPlan> selectChildren(@Param("check") CoreSafecheckPlan coreSafecheckPlan);
 
-    List<CoreSafecheckPlan> selectByPlanStatus(@Param("planStatus")int i);
+    List<CoreSafecheckPlan> selectByPlanStatus(@Param("planStatus") int i, @Param("cycle")Integer cycle);
 }

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

@@ -4,7 +4,6 @@ import java.util.Date;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.domain.panel.dto.PanelListDto;
 import com.xunmei.common.core.domain.panel.vo.PanelListVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -83,6 +82,7 @@ public interface ICoreSafetyTaskService extends IService<CoreSafetyTask> {
      * @param orgId
      * @param startDate
      * @param endDate
+     * @param cycle
      */
-    void deleteByOrgIdAndRange(Long orgId, Date startDate, Date endDate);
+    void deleteByOrgIdAndRange(Long orgId, Date startDate, Date endDate, Integer cycle);
 }

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

@@ -11,7 +11,6 @@ import com.xunmei.common.core.domain.panel.dto.PanelListDto;
 import com.xunmei.common.core.domain.panel.enums.PanelTypeEnums;
 import com.xunmei.common.core.domain.panel.vo.PanelListVo;
 import com.xunmei.common.core.utils.DateUtils;
-import com.xunmei.core.safetyCheck.domain.CoreSafecheckPlanToRole;
 import com.xunmei.core.safetyCheck.domain.CoreSafetyTask;
 import com.xunmei.core.safetyCheck.mapper.CoreSafecheckPlanToRoleMapper;
 import com.xunmei.core.safetyCheck.mapper.CoreSafetyTaskMapper;
@@ -167,8 +166,8 @@ public class CoreSafetyTaskServiceImpl extends ServiceImpl<CoreSafetyTaskMapper,
     }
 
     @Override
-    public void deleteByOrgIdAndRange(Long orgId, Date startDate, Date endDate) {
-        coreSafetyTaskMapper.delete(new LambdaQueryWrapper<CoreSafetyTask>().eq(CoreSafetyTask::getOrgId, orgId).between(CoreSafetyTask::getYmdDate, startDate, endDate).in(CoreSafetyTask::getStatus,1,2));
+    public void deleteByOrgIdAndRange(Long orgId, Date startDate, Date endDate, Integer cycle) {
+        coreSafetyTaskMapper.delete(new LambdaQueryWrapper<CoreSafetyTask>().eq(CoreSafetyTask::getOrgId, orgId).eq(CoreSafetyTask::getCheckCycle,cycle).between(CoreSafetyTask::getYmdDate, startDate, endDate).in(CoreSafetyTask::getStatus,1,2));
     }
 
 

soc-modules/soc-modules-core/src/main/resources/mapper/evaluate/CoreEvaluateTaskMapper.xml

@@ -101,8 +101,22 @@ SELECT
         GROUP BY a.id
     </select>
     <select id="statistics" resultType="java.util.Map">
-
+        SELECT
+            a.id AS taskId,
+            a.org_name AS '评价机构',
+                a.evaluate_org AS '被评价机构名称'
+        FROM
+            core_evaluate_task a
+                LEFT JOIN core_evaluate_plan b ON a.plan_id = b.id
+        WHERE
+            a.`status` = 2
+--           AND a.id = '1716653246680956930'
+          AND b.id = '1716653207053172738'
     </select>
+    <select id="getContentByTaskId" resultType="java.util.Map">
+            SELECT   content,IF(content_type=1,0,score)score FROM core_evaluate_task_content    WHERE task_id=#{taskId}
+    </select>
+
 
     <insert id="insertCoreEvaluateTask" parameterType="com.xunmei.core.evaluate.domain.CoreEvaluateTask">
         insert into core_evaluate_task

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

@@ -571,7 +571,9 @@
         <if test="planStatus != null ">
             and c.plan_status = #{planStatus}
         </if>
-
+        <if test="cycle != null ">
+            and c.plan_cycle = #{cycle}
+        </if>
 
 
 

soc-modules/soc-modules-job/src/main/java/com/xunmei/job/task/SyncFjnxOrgUserTask.java

@@ -32,6 +32,25 @@ public class SyncFjnxOrgUserTask {
         System.out.println(JSON.toJSONString(booleanR));
     }
 
+    /**
+     * 同步 fjnx 机构、用户
+     */
+    public void syncFjnxOrg()
+    {
+        System.out.println("执行无参方法");
+        R<Boolean> booleanR = remoteSyncOrgAndUserService.syncOrg(SecurityConstants.INNER);
+        System.out.println(JSON.toJSONString(booleanR));
+    }
+
+    /**
+     * 同步 fjnx 机构、用户
+     */
+    public void syncFjnxUser()
+    {
+        System.out.println("执行无参方法");
+        R<Boolean> booleanR = remoteSyncOrgAndUserService.syncUser(SecurityConstants.INNER);
+        System.out.println(JSON.toJSONString(booleanR));
+    }
 
 
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysUserServiceImpl.java

@@ -129,6 +129,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     @Override
     public List<SysUser> selectSyncUserList(SysUser user) {
+        user.setDeleted(0);
         return userMapper.selectSyncUserList(user);
     }
 

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -197,7 +197,7 @@
     <select id="selectSyncUserList" parameterType="com.xunmei.system.api.domain.SysUser"
             resultType="com.xunmei.system.api.domain.SysUser">
         select *
-        from sys_user u where deleted=0
+        from sys_user u where deleted !=1  and is_lock !=1  and locked != 1
         <if test="source != null">
             AND u.source =#{source}
         </if>