安全指数代码提交

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/safetyindex/dto/CoreSafeMonthScorePageDto.java

@@ -24,7 +24,7 @@ public class CoreSafeMonthScorePageDto extends PageRequest {
         this.date = date;
         if (null != date){
             this.dataYear = DateUtil.year(this.date);
-            this.dataMonth = DateUtil.month(this.date);
+            this.dataMonth = DateUtil.month(this.date)+1;
         }
     }
 }

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/safetyindex/vo/SafeScoreResumptionDataVo.java

@@ -1,6 +1,7 @@
 package com.xunmei.common.core.domain.safetyindex.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -15,25 +16,35 @@ import java.util.Date;
 @Data
 public class SafeScoreResumptionDataVo {
 
-    private String resumptionId;
+    @ApiModelProperty(value = "事件单号(任务id)")
+    private String id;
 
-    private String resumptionTaskName;
+    @ApiModelProperty(value = "事件名称(任务名称)")
+    private String taskName;
 
+    @ApiModelProperty(value = "机构名称")
     private String orgName;
 
-    private String execManName;
+    /*@ApiModelProperty(value = "执行人")
+    private String execManName;*/
 
+    @ApiModelProperty(value = "执行岗位(角色)")
     private String execPostName;
+
+    @ApiModelProperty(value = "计划开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date planTimeStart;
+
+    @ApiModelProperty(value = "计划结束时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date planTimeEnd;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+   /* @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date execTimeStart;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date execTimeEnd;
 
     private Integer execStatus;
-    private String execStatusText;
+    private String execStatusText;*/
 }

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/edu/EduTrainingType.java

@@ -17,9 +17,9 @@ public enum EduTrainingType {
 
     HSANBWJYPX(0, "行社安全保卫教育培训"),
     HSXFAQPX(1, "行社消防安全培训"),
-    YYWDAQBWJYPX(1, "营业网点安全保卫教育培训"),
-    YYWDXFAQPX(1, "营业网点消防安全培训"),
-    QT(1, "其他"),
+    YYWDAQBWJYPX(2, "营业网点安全保卫教育培训"),
+    YYWDXFAQPX(3, "营业网点消防安全培训"),
+    QT(4, "其他"),
     ;
 
 

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

@@ -1,5 +1,6 @@
 package com.xunmei.core.resumption.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -7,7 +8,6 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xunmei.common.core.constant.DictConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.panel.dto.PanelListDto;
 import com.xunmei.common.core.domain.panel.enums.PanelTypeEnums;
@@ -18,9 +18,8 @@ import com.xunmei.common.core.domain.safetyindex.dto.SafeScoreSourceDto;
 import com.xunmei.common.core.domain.safetyindex.vo.SafeScoreResumptionDataVo;
 import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.common.core.utils.ResumptionType;
-import com.xunmei.common.core.utils.StreamHelper;
 import com.xunmei.common.core.utils.Ymd;
-import com.xunmei.common.security.utils.DictUtils;
+import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.core.resumption.domain.AppPlan;
 import com.xunmei.core.resumption.domain.Resumption;
 import com.xunmei.core.resumption.dto.TaskDetailsDto;
@@ -35,6 +34,7 @@ import com.xunmei.core.resumption.vo.ResumptionTaskNewDto;
 import com.xunmei.core.resumption.vo.WorkChangeResumptionVo;
 import com.xunmei.core.safetyindex.mapper.CoreSafeMonthScoreMapper;
 import com.xunmei.core.safetyindex.mapper.CoreSafetyExceptionDataMapper;
+import com.xunmei.system.api.Eto.RoleConditionEto;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.RemoteRoleService;
 import com.xunmei.system.api.domain.SysRole;
@@ -47,6 +47,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class ResumptionServiceImpl extends ServiceImpl<ResumptionMapper, Resumption> implements ResumptionService {
@@ -345,37 +346,39 @@ public class ResumptionServiceImpl extends ServiceImpl<ResumptionMapper, Resumpt
     public List<SafeScoreResumptionDataVo>  findSource(SafeScoreSourceDto request) {
 
 
-        List<CoreSafetyExceptionData> excetionDataList = exceptionDataMapper.selectList(new LambdaQueryWrapper<CoreSafetyExceptionData>()
+        List<CoreSafetyExceptionData> exceptionDataList = exceptionDataMapper.selectList(new LambdaQueryWrapper<CoreSafetyExceptionData>()
                 .eq(CoreSafetyExceptionData::getOrgId, request.getOrgId())
                 .eq(CoreSafetyExceptionData::getDataSource, "core_resumption")
                 .between(CoreSafetyExceptionData::getDataTime, DateUtil.beginOfMonth(request.getDate()), DateUtil.endOfMonth(request.getDate())));
-        List<SafeScoreResumptionDataVo> voList = StreamHelper.to(excetionDataList, safetyExcetionData -> {
+        if (CollectionUtil.isEmpty(exceptionDataList)) {
+            return null;
+        }
+        List<String> dataIdList = exceptionDataList.stream().map(CoreSafetyExceptionData::getDataId).collect(Collectors.toList());
+        List<Resumption> taskList = baseMapper.selectList(new LambdaQueryWrapper<Resumption>()
+                .in(Resumption::getId, dataIdList)
+                .eq(Resumption::getYmdYear, DateUtil.year(request.getDate()))
+                .eq(Resumption::getYmdQuarter, DateUtil.quarter(request.getDate())));
+        List<Long> roleIdList = taskList.stream().map(Resumption::getRoleId).distinct().collect(Collectors.toList());
+        List<SafeScoreResumptionDataVo> list = new ArrayList<>();
+        Map<Long, String> map = getRoleNames(roleIdList);
+        for (Resumption resumption : taskList) {
             SafeScoreResumptionDataVo resumptionDataVo = new SafeScoreResumptionDataVo();
-            int year = DateUtil.year(request.getDate());
-            int quarter = DateUtil.quarter(request.getDate());
-            Resumption resumption = baseMapper.selectOne(new LambdaQueryWrapper<Resumption>()
-                    .eq(Resumption::getId, safetyExcetionData.getDataId())
-                    .eq(Resumption::getYmdYear, year)
-                    .eq(Resumption::getYmdQuarter, quarter));
-            resumptionDataVo.setResumptionId(resumption.getId().toString());
-            resumptionDataVo.setExecManName(resumption.getUpdateBy());
-            String roleName = this.roleService.getRoleById(resumption.getRoleId(),SecurityConstants.INNER).getRoleName();
-            resumptionDataVo.setExecPostName(roleName);
-            resumptionDataVo.setExecStatus(resumption.getStatus());
-            String dictLabel = DictUtils.getDictLabel(DictConstants.RESUMPTION_STATUS, resumption.getStatus());
-            resumptionDataVo.setExecStatusText(dictLabel);
-            resumptionDataVo.setExecTimeStart(resumption.getStartTime());
-            resumptionDataVo.setExecTimeEnd(resumption.getEndTime());
+            resumptionDataVo.setId(resumption.getId().toString());
+            resumptionDataVo.setExecPostName(map.get(resumption.getRoleId()));
             resumptionDataVo.setPlanTimeStart(resumption.getPlanStartTime());
             resumptionDataVo.setPlanTimeEnd(resumption.getPlanEndTime());
-//            Org org = resumption.getOrg();
-//            System.out.println(org);
-            String orgName = this.orgService.selectOrgById(resumption.getOrgId(),SecurityConstants.INNER).getName();
-            resumptionDataVo.setOrgName(orgName);
-            String planName = this.appPlanMapper.selectPlanNameById(resumption.getPlanId());
-            resumptionDataVo.setResumptionTaskName(planName);
-            return resumptionDataVo;
-        });
-        return voList;
+            resumptionDataVo.setOrgName(resumption.getOrgName());
+            resumptionDataVo.setTaskName(resumption.getName());
+            list.add(resumptionDataVo);
+        }
+
+        return list;
+    }
+
+    private Map<Long, String> getRoleNames(List<Long> roleIdList) {
+        RoleConditionEto conditionEto = new RoleConditionEto();
+        conditionEto.setIds(roleIdList);
+        List<IdNameVo> names = roleService.getNames(conditionEto);
+        return names.stream().collect(Collectors.toMap(IdNameVo::getId, IdNameVo::getName));
     }
 }

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

@@ -193,4 +193,7 @@ public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonito
                                     @Param("month") int month,
                                     @Param("roleId") Long roleId,
                                     @Param("orgIds") List<Long> orgIds);
+
+    List<CoreMonitoringRetrievalTask> selectTaskByIdList(@Param("list") List<String> list);
+
 }

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

@@ -7,6 +7,7 @@ import com.xunmei.common.core.domain.panel.vo.PanelListVo;
 import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
 import com.xunmei.common.core.domain.retrieval.vo.CoreMonitoringRetrievalTaskOneVo;
+import com.xunmei.common.core.domain.safetyindex.dto.SafeScoreSourceDto;
 import com.xunmei.common.core.event.WorkTimeChangeEvent;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
@@ -143,4 +144,6 @@ public interface ICoreMonitoringRetrievalTaskService extends IService<CoreMonito
     void selectMonitorExceptionData(List<Long> orgIds,DateTime time);
 
     void taskChangeForTimeWorkChange(WorkTimeChangeEvent event);
+
+    Object findSource(SafeScoreSourceDto request);
 }

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

@@ -6,6 +6,7 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -20,6 +21,9 @@ import com.xunmei.common.core.domain.panel.vo.PanelListVo;
 import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.common.core.domain.retrieval.dto.RetrievalTaskPageDto;
 import com.xunmei.common.core.domain.retrieval.vo.*;
+import com.xunmei.common.core.domain.safetyindex.domain.CoreSafetyExceptionData;
+import com.xunmei.common.core.domain.safetyindex.dto.SafeScoreSourceDto;
+import com.xunmei.common.core.domain.safetyindex.vo.SafeScoreResumptionDataVo;
 import com.xunmei.common.core.domain.worktime.domain.SysWorkTime;
 import com.xunmei.common.core.domain.worktime.dto.WorkTimeDto;
 import com.xunmei.common.core.enums.CycleCommonEnum;
@@ -29,6 +33,7 @@ import com.xunmei.common.core.event.WorkTimeChangeEvent;
 import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.Ymd;
+import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
@@ -37,6 +42,8 @@ import com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMapper;
 import com.xunmei.core.access.service.ITMonitoringRetrievalPlanService;
 import com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
+import com.xunmei.core.safetyindex.mapper.CoreSafetyExceptionDataMapper;
+import com.xunmei.system.api.Eto.RoleConditionEto;
 import com.xunmei.system.api.RemoteDictDataService;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.RemoteRoleService;
@@ -87,6 +94,9 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     @Autowired
     RemoteWorkTimeService workTimeService;
 
+    @Autowired
+    CoreSafetyExceptionDataMapper exceptionDataMapper;
+
     @Override
     public TableDataInfo selectPage(RetrievalTaskPageDto request) {
 
@@ -256,16 +266,16 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
             //对list进行重新编号和保存
             //对lista 按机构进行分组
             Map<Long, List<CoreMonitoringRetrievalTask>> map = lista.stream().collect(Collectors.groupingBy(CoreMonitoringRetrievalTask::getOrgId));
-            for(Long  orgId:map.keySet()){
+            for (Long orgId : map.keySet()) {
                 List<CoreMonitoringRetrievalTask> listb = map.get(orgId);
-                for(int i=0;i<listb.size();i++){
-                    listb.get(i).setOrderNum(i+1);
+                for (int i = 0; i < listb.size(); i++) {
+                    listb.get(i).setOrderNum(i + 1);
                     // 第" + frequency + "次调阅
-                    String oldName =  listb.get(i).getTaskName();
-                    String str  =  "第"+(i+1)+"次调阅";
+                    String oldName = listb.get(i).getTaskName();
+                    String str = "第" + (i + 1) + "次调阅";
                     int index = oldName.lastIndexOf("第");
-                    if(index>0){
-                        listb.get(i).setTaskName(oldName.substring(0,index)+str);
+                    if (index > 0) {
+                        listb.get(i).setTaskName(oldName.substring(0, index) + str);
                     }
                 }
                 listAll.addAll(listb);
@@ -640,7 +650,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRES_NEW)
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
     public void selectMonitorExceptionData(DateTime time) {
         SysRole role = roleService.getRoleByName("网点负责人", SecurityConstants.INNER);
         //扩展字段1：任务状态 扩展字段2 计划id
@@ -648,7 +658,7 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRES_NEW)
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
     public void selectMonitorExceptionData(List<Long> orgIds, DateTime time) {
         SysRole role = roleService.getRoleByName("网点安全员", SecurityConstants.INNER);
         //扩展字段1：任务状态 扩展字段2 计划id
@@ -657,6 +667,42 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
     }
 
     @Override
+    public Object findSource(SafeScoreSourceDto request) {
+
+        List<CoreSafetyExceptionData> exceptionDataList = exceptionDataMapper.selectList(new LambdaQueryWrapper<CoreSafetyExceptionData>()
+                .eq(CoreSafetyExceptionData::getOrgId, request.getOrgId())
+                .eq(CoreSafetyExceptionData::getDataSource, "core_monitoring_retrieval_task")
+                .between(CoreSafetyExceptionData::getDataTime, DateUtil.beginOfMonth(request.getDate()), DateUtil.endOfMonth(request.getDate())));
+        if (CollectionUtil.isEmpty(exceptionDataList)) {
+            return null;
+        }
+        List<String> dataIdList = exceptionDataList.stream().map(CoreSafetyExceptionData::getDataId).collect(Collectors.toList());
+        List<CoreMonitoringRetrievalTask> taskList = baseMapper.selectTaskByIdList(dataIdList);
+        List<Long> roleIdList = taskList.stream().map(CoreMonitoringRetrievalTask::getRoleId).distinct().collect(Collectors.toList());
+        List<SafeScoreResumptionDataVo> list = new ArrayList<>();
+        Map<Long, String> map = getRoleNames(roleIdList);
+        for (CoreMonitoringRetrievalTask task : taskList) {
+            SafeScoreResumptionDataVo safeScoreResumptionDataVo = new SafeScoreResumptionDataVo();
+            safeScoreResumptionDataVo.setId(task.getId().toString());
+            safeScoreResumptionDataVo.setTaskName(task.getTaskName());
+            safeScoreResumptionDataVo.setOrgName(task.getOrgName());
+            safeScoreResumptionDataVo.setExecPostName(map.get(task.getRoleId()));
+            safeScoreResumptionDataVo.setPlanTimeStart(task.getPlanEndTime());
+            safeScoreResumptionDataVo.setPlanTimeEnd(task.getPlanEndTime());
+            list.add(safeScoreResumptionDataVo);
+        }
+        return list;
+
+    }
+
+    private Map<Long, String> getRoleNames(List<Long> roleIdList) {
+        RoleConditionEto conditionEto = new RoleConditionEto();
+        conditionEto.setIds(roleIdList);
+        List<IdNameVo> names = roleService.getNames(conditionEto);
+        return names.stream().collect(Collectors.toMap(IdNameVo::getId, IdNameVo::getName));
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public void taskChangeForTimeWorkChange(WorkTimeChangeEvent event) {
         //修改的作息的日期

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyindex/service/impl/CoreSafeMonthScoreServiceImpl.java

@@ -20,6 +20,7 @@ import com.xunmei.common.core.enums.OrgTypeEnum;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.resumption.service.ResumptionService;
+import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
 import com.xunmei.core.safetyindex.mapper.CoreSafeLevelMapper;
 import com.xunmei.core.safetyindex.mapper.CoreSafeMonthScoreMapper;
 import com.xunmei.core.safetyindex.service.ICoreSafeMonthScoreService;
@@ -35,6 +36,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static com.xunmei.core.safetyindex.service.impl.CoreSafetyExceptionDataServiceImpl.MONITORING_DICT_CODE;
 import static com.xunmei.core.safetyindex.service.impl.CoreSafetyExceptionDataServiceImpl.RESUMPTION_DICT_CODE;
 
 /**
@@ -53,6 +55,8 @@ public class CoreSafeMonthScoreServiceImpl extends ServiceImpl<CoreSafeMonthScor
     private RemoteOrgService orgService;
     @Autowired
     private CoreSafeLevelMapper safeLevelMapper;
+    @Autowired
+    private ICoreMonitoringRetrievalTaskService  monitoringRetrievalTaskService;
 
     @Override
     public TableDataInfo<CoreSafeMonthScorePageVo> selectPage(CoreSafeMonthScorePageDto req) {
@@ -102,7 +106,7 @@ public class CoreSafeMonthScoreServiceImpl extends ServiceImpl<CoreSafeMonthScor
         vo.setLevelName(levelName);
         Long orgId = safeMonthScore.getOrgId();
         SysOrg org = this.orgService.selectOrgById(orgId, SecurityConstants.INNER);
-        vo.setOrgName(org.getName());
+        vo.setOrgName(org.getShortName());
         vo.setOrgType(org.getType());
         vo.setOrgTypeText(OrgTypeEnum.getName(org.getType()));
         vo.setOrgId(org.getId());
@@ -155,9 +159,9 @@ public class CoreSafeMonthScoreServiceImpl extends ServiceImpl<CoreSafeMonthScor
             case RESUMPTION_DICT_CODE:
                 List<SafeScoreResumptionDataVo> source = resumptionService.findSource(request);
                 return source;
-           /* case MONITORING_DICT_CODE:
+            case MONITORING_DICT_CODE:
                 return monitoringRetrievalTaskService.findSource(request);
-            case QUESTION_DICT_CODE:
+           /* case QUESTION_DICT_CODE:
                 return questionService.findSource(request);*/
         }
         return null;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyindex/service/impl/CoreSafetyExceptionDataServiceImpl.java

@@ -26,6 +26,7 @@ import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.vo.SysOrgVO;
 import io.netty.util.internal.StringUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -47,6 +48,7 @@ import java.util.stream.Collectors;
  * @author xunmei
  * @date 2023-10-09
  */
+@Slf4j
 @Service
 public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyExceptionDataMapper, CoreSafetyExceptionData> implements ICoreSafetyExceptionDataService {
     public static final String CORE_RESUMPTION = "core_resumption";
@@ -274,7 +276,7 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
             monthScore.setDataYear(year);
             monthScore.setId(IdWorker.getId());
             monthScore.setOrgId(o.getId());
-            monthScore.setOrgName(o.getName());
+            monthScore.setOrgName(o.getShortName());
             monthScore.setOrgPath(o.getPath());
             monthScore.setReleaseStatus(1);
             List<CoreSafetyDeductData> listdata = safeSourceDataList.get(o.getId());

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/ResumptionMapper.xml

@@ -362,7 +362,7 @@
         and ymd_quarter=#{quarter}
         and ymd_month=#{month}
         and status in (4)
-        and role_id =#{roleId}
+        and p.id in (select distinct pr.plan_id from core_resumption_plan_to_role pr where pr.role_id=#{roleId})
     </insert>
 
     <insert id="saveResumptionExceptionListNew">

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

@@ -785,4 +785,12 @@
             #{orgId}
         </foreach>
     </insert>
+
+    <select id="selectTaskByIdList" resultMap="CoreMonitoringRetrievalTaskResult">
+        select id, task_name,org_name,  plan_start_time, plan_end_time, role_id from core_monitoring_retrieval_task where id in
+            <foreach collection="list" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        order by plan_start_time desc
+    </select>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/safetyindex/CoreSafeMonthScoreMapper.xml

@@ -206,8 +206,8 @@
     </select>
 
     <insert id="saveOrUpdateData">
-        insert into core_safe_month_score(id,org_id, level_id, data_year, data_month, org_score, release_status, org_path)
-            values (#{id},#{orgId},#{levelId},#{dataYear},#{dataMonth},#{orgScore},#{releaseStatus},#{orgPath})
+        insert into core_safe_month_score(id,org_id,org_name, level_id, data_year, data_month, org_score, release_status, org_path)
+            values (#{id},#{orgId},#{orgName},#{levelId},#{dataYear},#{dataMonth},#{orgScore},#{releaseStatus},#{orgPath})
         ON DUPLICATE KEY UPDATE id = VALUES(id), level_id = VALUES(level_id), org_score = VALUES(org_score),
                                 release_status = VALUES(release_status), org_path = VALUES(org_path),org_name=VALUES(org_name);
     </insert>