履职任务管理

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

@@ -79,6 +79,6 @@ public interface RemoteOrgService {
      * @param ids
      * @return
      */
-    @GetMapping("/org/getParentName")
+    @GetMapping("/org/getParentNames")
     List<IdNameVo> getParentName(List<Long> ids);
 }

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

@@ -9,6 +9,7 @@ import com.xunmei.system.api.Eto.RoleConditionEto;
 import com.xunmei.system.api.domain.SysRole;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -25,5 +26,5 @@ public interface RemoteRoleService {
     R<SysRole> getRoleById(@RequestParam("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     @GetMapping("/role/getNames")
-    List<IdName<Long, String>> getNames(RoleConditionEto condition);
+    List<IdNameVo> getNames(RoleConditionEto condition);
 }

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

@@ -98,7 +98,7 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
             }
             @Override
             public List<IdNameVo> getParentName(List<Long> ids){
-                return  null;
+                return  new ArrayList<>();
             }
         };
     }

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

@@ -34,7 +34,7 @@ public class RemoteRoleFallbackFactory implements FallbackFactory<RemoteRoleServ
             }
 
             @Override
-            public List<IdName<Long, String>> getNames(RoleConditionEto condition) {
+            public List<IdNameVo> getNames(RoleConditionEto condition) {
                 return null;
             }
         };

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/vo/IdNameVo.java

@@ -2,9 +2,13 @@ package com.xunmei.common.core.vo;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class IdNameVo {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
@@ -12,4 +16,5 @@ public class IdNameVo {
     private String name;
 
     private String extra;
+
 }

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

@@ -37,7 +37,7 @@ public class ResumptionController {
     @Autowired
     ResumptionBusiness resumptionBusiness;
     @Autowired
-    RemoteConfigService systemParameService;
+    RemoteConfigService remoteConfigService;
     @Autowired
     ResumptionService resumptionService;
     @Autowired
@@ -62,7 +62,7 @@ public class ResumptionController {
         TaskDetailsVo  detailvo = new TaskDetailsVo();
         List<Map<String,Object>> tasktotal = resumptionBusiness.taskarealistnew(request);
         ResumptionTaskListVo taskObj =resumptionBusiness.getTaskObjByTaskid(request);
-        SysConfig systemParame = systemParameService.findFirstByCode(SystemParameterConstant.NFC_SCANNING, SecurityConstants.INNER).getData();
+        SysConfig systemParame = remoteConfigService.findFirstByCode(SystemParameterConstant.NFC_SCANNING, SecurityConstants.INNER).getData();
         detailvo.setTaskarealist(tasktotal);
         detailvo.setTaskObj(taskObj);
         detailvo.setNfcScaning(systemParame.getValue());
@@ -75,7 +75,7 @@ public class ResumptionController {
         TaskDetailsVo  detailvo = new TaskDetailsVo();
         List<Map<String,Object>> tasktotal = resumptionBusiness.toTaskDetails(request);
         ResumptionTaskListVo taskObj =resumptionBusiness.getTaskObjByTaskid(request);
-        SysConfig systemParame = systemParameService.findFirstByCode(SystemParameterConstant.NFC_SCANNING, SecurityConstants.INNER).getData();
+        SysConfig systemParame = remoteConfigService.findFirstByCode(SystemParameterConstant.NFC_SCANNING, SecurityConstants.INNER).getData();
         detailvo.setTaskarealist(tasktotal);
         detailvo.setTaskObj(taskObj);
         detailvo.setNfcScaning(systemParame.getValue());

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

@@ -34,15 +34,21 @@ public class ResumptionRecordController extends BaseController {
     IResumptionRecordService resumptionRecordService;
 
     @ApiOperation(value = "履职记录分页")
-    @PostMapping("/page")
-    public TableDataInfo page(@RequestBody @Valid ResumptionRecordPageDto pageDto) {
+    @GetMapping("/page")
+    public TableDataInfo page(@Valid ResumptionRecordPageDto pageDto) {
         return resumptionRecordService.selectList(pageDto);
     }
 
+    /**
+     *
+     * @param id
+     * @param ymd：分表字段
+     * @return
+     */
     @ApiOperation(value = "履职记录详情")
-    @GetMapping("/{id}")
-    public AjaxResult list(@PathVariable String id) {
-        List<ResumptionRecordInfoVo> list = resumptionRecordService.selectInfo(id);
+    @GetMapping("/{id}/{ymd}")
+    public AjaxResult list(@PathVariable String id,@PathVariable String ymd) {
+        List<ResumptionRecordInfoVo> list = resumptionRecordService.selectInfo(id,ymd);
         return success(list);
     }
 
@@ -54,24 +60,24 @@ public class ResumptionRecordController extends BaseController {
 
 
     @ApiOperation(value = "履职记录角色下拉框")
-    @PostMapping("/role")
-    public AjaxResult role(@RequestBody ResumptionRoleDto roleDto) {
+    @GetMapping("/role")
+    public AjaxResult role(ResumptionRoleDto roleDto) {
         List<IdNameVo> list = resumptionRecordService.selectResumptionRole(roleDto);
 
         return success(list);
     }
 
-//    @ApiOperation(value = "履职计划下拉框")
-//    @PostMapping("/plan")
-//    public JsonResponse<?> plan(@RequestBody ResumptionRoleDto roleDto) {
-//        List<ResumptionRoleVo> list = resumptionRecordService.selectResumptionPlan(roleDto);
-//        return JsonResponse.success(list);
-//    }
+    @ApiOperation(value = "履职计划下拉框")
+    @GetMapping("/plan")
+    public AjaxResult plan(ResumptionRoleDto roleDto) {
+        List<IdNameVo> list = resumptionRecordService.selectResumptionPlan(roleDto);
+        return success(list);
+    }
 
 
     @ApiOperation(value = "履职记录NFC记录")
-    @PostMapping("/nfc")
-    public AjaxResult nfc(@RequestBody ResumptionNFCDto dto) {
+    @GetMapping("/nfc")
+    public AjaxResult nfc(ResumptionNFCDto dto) {
         List<NFCRecordVo> list = resumptionRecordService.selectNFCRecord(dto);
         return success(list);
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/resumptionRecord/ResumptionRecordPageDto.java

@@ -20,13 +20,13 @@ public class ResumptionRecordPageDto extends PageDto<ResumptionRecordPageVo> {
     private Boolean checkSub;
 
     @NotNull(message = "请选择具体执行周期!")
-    @ApiModelProperty(value = "0:每日 1:每周 2:每月 3:每季度 4:每半年 5:每年 6:每小时")
+    @ApiModelProperty(value = "")
     private Integer executeCycle;
 
     @ApiModelProperty(value = "执行角色")
     private Long executeRole;
 
-    @ApiModelProperty(value = "状态 0:待履职 1:按时完成 3:未完成 5:补登完成")
+    @ApiModelProperty(value = "状态 ")
     private Integer status;
 
     @ApiModelProperty(value = "时间范围")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/resumptionRecord/ResumptionRoleDto.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.resumption.dto.resumptionRecord;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,8 +12,18 @@ import java.util.List;
  */
 @Data
 public class ResumptionRoleDto {
-//    @ApiModelProperty("机构id")
-//    private Long orgId;
+    Long planId;
+
+    String planCycle;
+
+    @ApiModelProperty("机构id")
+    private Long orgId;
+
+    /**
+     * orgId的上级机构
+     */
+    @JsonIgnore
+    private List<Long> upOrgIds;
 //
 //    @ApiModelProperty("执行周期")
 //    private Integer  type;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/mapper/ResumptionRecordMapper.java

@@ -1,7 +1,10 @@
 package com.xunmei.core.resumption.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.vo.IdNameVo;
+import com.xunmei.core.resumption.domain.Resumption;
+import com.xunmei.core.resumption.dto.resumptionRecord.ResumptionRoleDto;
 import com.xunmei.core.resumption.vo.resumptionRecord.AppResumptionDataInfoVo;
 import com.xunmei.core.resumption.dto.resumptionRecord.ResumptionNFCDto;
 import com.xunmei.core.resumption.dto.resumptionRecord.ResumptionRecordPageDto;
@@ -25,7 +28,7 @@ import java.util.Set;
  * @since 2022-05-11
  */
 @Mapper
-public interface ResumptionRecordMapper {
+public interface ResumptionRecordMapper extends BaseMapper<Resumption> {
     //    @DS(DataSourceName.SHARDING_DATA_SOURCE_NAME)
     List<ResumptionRecordPageVo> selectListByCondition(@Param("pageDto") ResumptionRecordPageDto pageDto, @Param("hashMap") HashMap<String, Object> hashMap, @Param("isTime") Boolean isTime, @Param("ymdQuarters") Set<Integer> ymdQuarters);
 
@@ -60,13 +63,14 @@ public interface ResumptionRecordMapper {
 
     ResumptionRecordInfoVo selectRuleItemInfo(@Param("ruleItemId") Long ruleItemId);
 
-    //    List<ResumptionRoleVo> selectResumptionPlan(@Param("planDto") ResumptionRoleDto planDto);
-//    @DS(DataSourceName.SHARDING_DATA_SOURCE_NAME)
+    List<IdNameVo> selectResumptionPlan(@Param("query") ResumptionRoleDto planDto);
+
+    //    @DS(DataSourceName.SHARDING_DATA_SOURCE_NAME)
 //    RegisterBookItemInfoVo selectData(@Param("id") String id);
 //    @DS(DataSourceName.SHARDING_DATA_SOURCE_NAME)
     List<Long> selectResumptionDataPointId(@Param("id") String id);
 
-    List<IdNameVo> selectResumptionRoles();
+    List<IdNameVo> selectResumptionRoles(@Param("query") ResumptionRoleDto planDto);
 
     List<ResumptionRecordTempVo> selectAbnormalData(@Param("ruleItemIdList") List<Long> ruleItemIdList, @Param("resumptionIdList") List<String> resumptionIdList);
 

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

@@ -24,7 +24,7 @@ public interface IResumptionRecordService {
 
     TableDataInfo selectList(ResumptionRecordPageDto pageDto);
 
-    List<ResumptionRecordInfoVo> selectInfo(String resumptionId);
+    List<ResumptionRecordInfoVo> selectInfo(String resumptionId,String ymd);
 
     List<IdNameVo> selectResumptionRole(ResumptionRoleDto roleDto);
 
@@ -34,5 +34,5 @@ public interface IResumptionRecordService {
 
 //    List<SecBookDtInst> selectSecBookDtInstList();
 
-//    List<ResumptionRoleVo> selectResumptionPlan(ResumptionRoleDto roleDto);
+    List<IdNameVo> selectResumptionPlan(ResumptionRoleDto roleDto);
 }

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

@@ -9,16 +9,20 @@ import cn.hutool.poi.excel.ExcelWriter;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.IdName;
 import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.resumption.domain.AppResumptionTaskDataRemarkimg;
+import com.xunmei.core.resumption.domain.Protection;
+import com.xunmei.core.resumption.domain.Resumption;
 import com.xunmei.core.resumption.dto.resumptionRecord.ResumptionNFCDto;
 import com.xunmei.core.resumption.dto.resumptionRecord.ResumptionRecordPageDto;
 import com.xunmei.core.resumption.dto.resumptionRecord.ResumptionRoleDto;
 import com.xunmei.core.resumption.mapper.AppPlanMapper;
 import com.xunmei.core.resumption.mapper.AppResumptionTaskDataRemarkimgMapper;
+import com.xunmei.core.resumption.mapper.ProtectionMapper;
 import com.xunmei.core.resumption.mapper.ResumptionRecordMapper;
 import com.xunmei.core.resumption.service.AppPlanService;
 import com.xunmei.core.resumption.service.IResumptionRecordService;
@@ -51,9 +55,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-public class ResumptionRecordServiceImpl implements IResumptionRecordService {
-    @Resource
-    private ResumptionRecordMapper resumptionRecordMapper;
+public class ResumptionRecordServiceImpl extends ServiceImpl<ResumptionRecordMapper, Resumption> implements IResumptionRecordService {
     @Resource
     private RemoteOrgService orgService;
     //    @Resource
@@ -95,8 +97,12 @@ public class ResumptionRecordServiceImpl implements IResumptionRecordService {
                 this.redisTemplate.expire(orgKey, 24, TimeUnit.HOURS);
             }
         }*/
-        List<Long> orgList = orgService.selectCheckSubOrgIdList(pageDto.getOrgId(), SecurityConstants.INNER);
-        pageDto.setOrgIdList(orgList);
+        if(pageDto.getCheckSub()){
+            List<Long> orgList = orgService.selectCheckSubOrgIdList(pageDto.getOrgId(), SecurityConstants.INNER);
+            pageDto.setOrgIdList(orgList);
+            pageDto.setOrgId(null);
+        }
+
 //        if (pageDto.getCheckSub() && ObjectUtil.isNotEmpty(pageDto.getOrgId())) {
 //            final Org org = orgService.find(pageDto.getOrgId());
 //            pageDto.setOrgId(null);
@@ -179,7 +185,7 @@ public class ResumptionRecordServiceImpl implements IResumptionRecordService {
 
 //        if (isPage) {
 //            RESUMPTIONOVERVIEWLOG.info("履职记录查询,查询条件: pageDto: {},hashMap:{},isTime:{}", JSON.toJSONString(pageDto), JSON.toJSONString(hashMap), isTime);
-        page = resumptionRecordMapper.selectPageByCondition(page, pageDto, hashMap, isTime, ymdQuarters);
+        page = baseMapper.selectPageByCondition(page, pageDto, hashMap, isTime, ymdQuarters);
         dealData(page.getRecords());
         return TableDataInfo.success(page);
 //        } else {
@@ -225,7 +231,7 @@ public class ResumptionRecordServiceImpl implements IResumptionRecordService {
 
         List<IdNameVo> planList = appPlanMapper.selectPlanNames(list.stream().map(i -> i.getPlanId()).distinct().collect(Collectors.toList()));
         List<IdNameVo> orgNames = orgService.getParentName(list.stream().map(i -> i.getOrgId()).distinct().collect(Collectors.toList()));
-        List<IdName<Long,String>> roleNames= roleService.getNames(RoleConditionEto
+        List<IdNameVo> roleNames= roleService.getNames(RoleConditionEto
                 .builder()
                 .ids(list.stream().map(i -> i.getRoleId()).distinct().collect(Collectors.toList())).build());
         list.stream().filter(pageVo -> ObjectUtil.equal(pageVo.getStatus(), "1")).forEach(pageVo -> pageVo.setSubmitter(null));
@@ -242,7 +248,7 @@ public class ResumptionRecordServiceImpl implements IResumptionRecordService {
                 vo.setPlanName(plan.get().getName());
             }
 
-            Optional<IdName<Long,String>>  role = roleNames.stream().filter(r -> r.getId().equals(vo.getRoleId())).findFirst();
+            Optional<IdNameVo>  role = roleNames.stream().filter(r -> r.getId().equals(vo.getRoleId())).findFirst();
             if (role.isPresent()) {
                 vo.setRoleName(role.get().getName());
             }
@@ -256,20 +262,20 @@ public class ResumptionRecordServiceImpl implements IResumptionRecordService {
 //    }
 
     @Override
-    public List<ResumptionRecordInfoVo> selectInfo(String resumptionId) {
+    public List<ResumptionRecordInfoVo> selectInfo(String resumptionId,String ymd) {
 //        final List<SecBookDtInst> secBookDtList = selectSecBookDtInstList();
 
         List<ResumptionRecordInfoVo> arrayList = new ArrayList<>();
-        List<Long> ItemidList = resumptionRecordMapper.selectItemIdList(resumptionId);
+        List<Long> ItemidList = baseMapper.selectItemIdList(resumptionId);
         //List<Long> ruleItemIdList = resumptionRecordMapper.selectRuleItemIdList(resumptionId);
         List<Long> ruleItemIdList = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(ItemidList)) {
-            ruleItemIdList = resumptionRecordMapper.selectRuleItemIdListNew(ItemidList);
+            ruleItemIdList = baseMapper.selectRuleItemIdListNew(ItemidList);
         }
         for (Long ruleItemId : ruleItemIdList) {
-            ResumptionRecordInfoVo info = resumptionRecordMapper.selectRuleItemInfo(ruleItemId);
+            ResumptionRecordInfoVo info = baseMapper.selectRuleItemInfo(ruleItemId);
             arrayList.add(info);
-            List<AppResumptionDataInfoVo> dataInfoList = resumptionRecordMapper.selectDataInfo(ruleItemId, resumptionId);
+            List<AppResumptionDataInfoVo> dataInfoList = baseMapper.selectDataInfo(ruleItemId, resumptionId);
             info.setDataInfoList(dataInfoList);
         }
         final ArrayList<Long> list = new ArrayList<>();
@@ -320,26 +326,31 @@ public class ResumptionRecordServiceImpl implements IResumptionRecordService {
     }
 
     @Override
-    public List<IdNameVo> selectResumptionRole(ResumptionRoleDto roleDto) {
-        return resumptionRecordMapper.selectResumptionRoles();
+    public List<IdNameVo> selectResumptionRole(ResumptionRoleDto query) {
+        if(ObjectUtil.isNotNull(query.getOrgId()) ){
+            List<Long> upOrgIds=orgService.getUpOrgs(query.getOrgId());
+            if(CollectionUtil.isNotEmpty(upOrgIds) && upOrgIds.size()>1){
+                query.setUpOrgIds(upOrgIds); //顶级机构不用
+            }
+        }
+        return baseMapper.selectResumptionRoles(query);
     }
 
-//    @Override
-//    public List<ResumptionRoleVo> selectResumptionPlan(ResumptionRoleDto planDto) {
-//        /*final Org org = orgService.find(planDto.getOrgId());
-//        planDto.setOrgPath(org.getPath());
-//        return resumptionRecordMapper.selectResumptionPlan(planDto);*/
-//        final List<ResumptionRoleVo> list = objectMapper.selectResumptionPlanIdAndName(planDto);
-//        if (ObjectUtil.equal(planDto.getType(), 0)) {
-//            planDto.setType(6);
-//            list.addAll(objectMapper.selectResumptionPlanIdAndName(planDto));
-//        }
-//        return list;
-//    }
+    @Override
+    public List<IdNameVo> selectResumptionPlan(ResumptionRoleDto query) {
+        if(ObjectUtil.isNotNull(query.getOrgId()) ){
+            List<Long> upOrgIds=orgService.getUpOrgs(query.getOrgId());
+            if(CollectionUtil.isNotEmpty(upOrgIds) && upOrgIds.size()>1){
+                query.setUpOrgIds(upOrgIds); //顶级机构不用
+            }
+        }
+        final List<IdNameVo> list = baseMapper.selectResumptionPlan(query);
+        return list;
+    }
 
     @Override
     public List<NFCRecordVo> selectNFCRecord(ResumptionNFCDto dto) {
-        return resumptionRecordMapper.selectNFCRecord(dto);
+        return baseMapper.selectNFCRecord(dto);
     }
 
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/resumptionRecord/ResumptionRecordPageVo.java

@@ -72,6 +72,9 @@ public class ResumptionRecordPageVo {
     @ApiModelProperty("异常要点数量")
     private int abnormalDataNums;
 
+    /**日期*/
+    private Date ymd;
+
 //    @ApiModelProperty("二级机构")
 //    private String secondaryOrgName;
 //

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

@@ -214,7 +214,7 @@
         select plan_name from core_resumption_plan where id = #{planId}
     </select>
     <select id="selectPlanNames" resultType="com.xunmei.common.core.vo.IdNameVo">
-        select id, plan_name as name from sys_plan where id in
+        select id, plan_name as name from core_resumption_plan where id in
             <foreach collection="ids" item="id" open="(" close=")" separator=",">
                 #{id}
             </foreach>

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

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.resumption.mapper.ResumptionRecordMapper">
-    <select id="selectListByCondition" resultType="com.xunmei.core.resumption.vo.resumptionRecord.ResumptionRecordPageVo">
+    <select id="selectListByCondition"
+            resultType="com.xunmei.core.resumption.vo.resumptionRecord.ResumptionRecordPageVo">
         select r.id as resumptionId,r.exception_count as abnormalDataNums,
-       <!-- p.plan_name as time,
-        p.plan_name as planName,-->
+        <!-- p.plan_name as time,
+         p.plan_name as planName,-->
         r.plan_id as planId,
         r.ymd_date as ymdDate,
         r.status as status,
@@ -105,7 +106,8 @@
         </where>
         order by r.plan_start_time desc ,r.plan_end_time desc
     </select>
-    <select id="selectPageByCondition" resultType="com.xunmei.core.resumption.vo.resumptionRecord.ResumptionRecordPageVo">
+    <select id="selectPageByCondition"
+            resultType="com.xunmei.core.resumption.vo.resumptionRecord.ResumptionRecordPageVo">
         select r.id as resumptionId,r.exception_count as abnormalDataNums,
         <!--p.plan_name as time,
         p.plan_name as planName,-->
@@ -159,7 +161,7 @@
                 <if test="pageDto.executeCycle==4">
                     and r.ymd_year between #{hashMap.startYear} and #{hashMap.endYear}
                     and r.ymd_date between #{hashMap.startDate} and #{hashMap.endDate}
-                   <!-- and r.ymd_month between #{hashMap.startMonth} and #{hashMap.endMonth}-->
+                    <!-- and r.ymd_month between #{hashMap.startMonth} and #{hashMap.endMonth}-->
                     and r.ymd_date between #{hashMap.startMonth} and #{hashMap.endMonth}
                     and r.ymd_quarter in
                     <foreach collection="ymdQuarters" item="item" index="index" open="(" separator="," close=")">
@@ -196,25 +198,27 @@
             <if test="pageDto.orgId !=null ">
                 and r.org_id = #{pageDto.orgId}
             </if>
+            <if test="pageDto.orgIdList!=null and pageDto.orgIdList.size()>0">
+                and r.org_id in
+                <foreach collection="pageDto.orgIdList" item="orgId" open="(" close=")" separator=",">
+                    #{orgId}
+                </foreach>
+            </if>
             <if test="pageDto.executeRole !=null ">
                 and r.role_id = #{pageDto.executeRole}
             </if>
             <if test="pageDto.planId !=null ">
                 and r.plan_id = #{pageDto.planId}
             </if>
-<!--            <if test="pageDto.checkSub == true">-->
-<!--                and o.path like concat(#{pageDto.orgPath},'%')-->
-<!--            </if>-->
-          <if test="pageDto.orgIdList!=null and pageDto.orgIdList.size()>0">
-              and r.org_id in
-              <foreach collection="pageDto.orgIdList" item="orgId" open="(" close=")" separator=",">
-                  #{orgId}
-              </foreach>
-          </if>
+            <!--            <if test="pageDto.checkSub == true">-->
+            <!--                and o.path like concat(#{pageDto.orgPath},'%')-->
+            <!--            </if>-->
+
         </where>
         order by r.plan_start_time desc ,r.plan_end_time desc
     </select>
-    <select id="selectResumptionDataList" resultType="com.xunmei.core.resumption.vo.resumptionRecord.AppResumptionDataInfoVo">
+    <select id="selectResumptionDataList"
+            resultType="com.xunmei.core.resumption.vo.resumptionRecord.AppResumptionDataInfoVo">
         select p.point_num  as rulePointNum,
                p.point_name as rulePointName,
                p.safe_type  as safeType,
@@ -235,7 +239,7 @@
     <resultMap id="infoResultMap" type="com.xunmei.core.resumption.vo.resumptionRecord.ResumptionRecordInfoVo">
         <id column="id" jdbcType="BIGINT" javaType="java.lang.Long" property="itemId"/>
         <result column="item_name" jdbcType="VARCHAR" javaType="java.lang.String" property="itemName"/>
-<!--        <result column="item_desc" jdbcType="VARCHAR" javaType="java.lang.String" property="itemDesc"/>-->
+        <!--        <result column="item_desc" jdbcType="VARCHAR" javaType="java.lang.String" property="itemDesc"/>-->
         <collection property="dataInfoList"
                     ofType="com.xunmei.core.resumption.vo.resumptionRecord.AppResumptionDataInfoVo"
                     select="selectResumptionDataList"
@@ -281,35 +285,35 @@
         where n.resumption_id = #{dto.resumptionId}
     </select>
 
-<!--    <resultMap id="secMap" type="com.isp.dict.domain.SecBookDtInst">-->
-<!--        <id column="ID" jdbcType="BIGINT" javaType="java.lang.Long" property="id"/>-->
-<!--        <result column="DATA_NAME" jdbcType="VARCHAR" javaType="java.lang.String" property="dataName"/>-->
-<!--        <result column="DATA_TYPE" jdbcType="VARCHAR" javaType="java.lang.String" property="dataType"/>-->
-<!--        <result column="DELETE_STATUS" jdbcType="VARCHAR" javaType="java.lang.String" property="deleteStatus"/>-->
-<!--        <result column="IS_VALIE" jdbcType="VARCHAR" javaType="java.lang.String" property="isValie"/>-->
-<!--        <collection property="dataItemList" ofType="com.isp.dict.domain.SecBookDtiInst"-->
-<!--                    select="selectSecBookDtiInstList"-->
-<!--                    column="{secBookDtInstId=ID}">-->
-<!--        </collection>-->
-<!--    </resultMap>-->
+    <!--    <resultMap id="secMap" type="com.isp.dict.domain.SecBookDtInst">-->
+    <!--        <id column="ID" jdbcType="BIGINT" javaType="java.lang.Long" property="id"/>-->
+    <!--        <result column="DATA_NAME" jdbcType="VARCHAR" javaType="java.lang.String" property="dataName"/>-->
+    <!--        <result column="DATA_TYPE" jdbcType="VARCHAR" javaType="java.lang.String" property="dataType"/>-->
+    <!--        <result column="DELETE_STATUS" jdbcType="VARCHAR" javaType="java.lang.String" property="deleteStatus"/>-->
+    <!--        <result column="IS_VALIE" jdbcType="VARCHAR" javaType="java.lang.String" property="isValie"/>-->
+    <!--        <collection property="dataItemList" ofType="com.isp.dict.domain.SecBookDtiInst"-->
+    <!--                    select="selectSecBookDtiInstList"-->
+    <!--                    column="{secBookDtInstId=ID}">-->
+    <!--        </collection>-->
+    <!--    </resultMap>-->
 
-<!--    <select id="selectSecBookDtInstList" resultMap="secMap">-->
-<!--        select *-->
-<!--        from sec_book_dt_inst-->
-<!--    </select>-->
+    <!--    <select id="selectSecBookDtInstList" resultMap="secMap">-->
+    <!--        select *-->
+    <!--        from sec_book_dt_inst-->
+    <!--    </select>-->
 
-<!--    <select id="selectSecBookDtiInstList" resultType="com.isp.dict.domain.SecBookDtiInst">-->
-<!--        select ID                  as id,-->
-<!--               SEC_BOOK_DT_INST_ID as secBookDtInesId,-->
-<!--               DATA_ITEM_NUMB      as dataItemNumb,-->
-<!--               DATA_ITEM_NAME      as dataItemName,-->
-<!--               DATA_ITEM_VALUE     as dataItemValue-->
-<!--        from sec_book_dti_inst-->
-<!--        where SEC_BOOK_DT_INST_ID = #{secBookDtInstId}-->
-<!--    </select>-->
+    <!--    <select id="selectSecBookDtiInstList" resultType="com.isp.dict.domain.SecBookDtiInst">-->
+    <!--        select ID                  as id,-->
+    <!--               SEC_BOOK_DT_INST_ID as secBookDtInesId,-->
+    <!--               DATA_ITEM_NUMB      as dataItemNumb,-->
+    <!--               DATA_ITEM_NAME      as dataItemName,-->
+    <!--               DATA_ITEM_VALUE     as dataItemValue-->
+    <!--        from sec_book_dti_inst-->
+    <!--        where SEC_BOOK_DT_INST_ID = #{secBookDtInstId}-->
+    <!--    </select>-->
 
     <select id="selectDataInfo" resultType="com.xunmei.core.resumption.vo.resumptionRecord.AppResumptionDataInfoVo">
-        SELECT  p.point_name  AS pointName,
+        SELECT p.point_name  AS pointName,
                a.`name`      AS areaName,
                d.res_value   AS executeResult,
                d.submit_time AS executeTime,
@@ -318,7 +322,7 @@
                d.id          AS dataId,
                p.data_type   AS dataTypeId
         FROM core_resumption_data d
-                 INNER JOIN  core_resumption_rule_point p ON d.item_id = p.id
+                 INNER JOIN core_resumption_rule_point p ON d.item_id = p.id
                  INNER JOIN sys_area a ON a.id = p.area_id
         WHERE d.resumption_id = #{resumptionId}
           and p.item_id = #{ruleItemId}
@@ -326,13 +330,12 @@
 
     <select id="selectRuleItemIdList" resultType="java.lang.Long">
         select DISTINCT p.item_id
-        from  core_resumption_rule_point p
+        from core_resumption_rule_point p
         where id in (select d.item_id from core_resumption_data d where resumption_id = #{resumptionId})
-
     </select>
     <select id="selectRuleItemIdListByResumptionIdList" resultType="java.lang.Long">
         select DISTINCT p.item_id
-        from  core_resumption_rule_point p
+        from core_resumption_rule_point p
         where id in (select d.item_id from core_resumption_data d where resumption_id IN
         <foreach collection="resumptionIdList" item="item" open="(" separator="," close=")">
             #{item}
@@ -342,37 +345,37 @@
     </select>
     <select id="selectRuleItemInfo" resultType="com.xunmei.core.resumption.vo.resumptionRecord.ResumptionRecordInfoVo">
         select i.item_num as itemNum, i.item_name as itemName, i.item_desc as itemDesc, i.id as itemId
-        from  core_resumption_rule_item i
+        from core_resumption_rule_item i
         where id = #{ruleItemId}
     </select>
 
-    <select id="selectResumptionPlan" resultType="com.xunmei.core.resumption.vo.resumptionRecord.ResumptionRoleVo">
-        select distinct p.id as id, p.plan_name as name, p.plan_status as status
-        from  core_resumption_plan p INNER JOIN core_resumption r on r.plan_id = p.id and p.plan_type = 0
-        inner join  core_resumption_plan_to_role pr on p.id = pr.plan_id
-        INNER JOIN sys_org o on o.id=r.org_id
-        where o.path like concat(#{planDto.orgPath},'%')
-        <choose>
-            <when test="planDto.type != null and planDto.type ==0">
-                and r.type in (0,6)
-            </when>
-            <otherwise>
-                and r.type = #{planDto.type}
-            </otherwise>
-        </choose>
-        <if test="planDto.roleId != null">
-            and pr.role_id = #{planDto.roleId}
-        </if>
-    </select>
-
-<!--    <select id="selectData" resultType="com.xunmei.core.resumption.vo.registerBook.RegisterBookItemInfoVo">-->
-<!--        select distinct o.name as orgName, r.start_time as date, #{id} as resumptionId-->
-<!--        from core_resumption r-->
-<!--                 inner join sys_org o on r.org_id = o.id-->
-<!--                 inner join core_resumption_data d on r.id = d.resumption_id-->
-<!--        where d.resumption_id = #{id}-->
+<!--    <select id="selectResumptionPlan" resultType="com.xunmei.core.resumption.vo.resumptionRecord.ResumptionRoleVo">-->
+<!--        select distinct p.id as id, p.plan_name as name, p.plan_status as status-->
+<!--        from core_resumption_plan p INNER JOIN core_resumption r on r.plan_id = p.id and p.plan_type = 0-->
+<!--        inner join core_resumption_plan_to_role pr on p.id = pr.plan_id-->
+<!--        INNER JOIN sys_org o on o.id=r.org_id-->
+<!--        where o.path like concat(#{planDto.orgPath},'%')-->
+<!--        <choose>-->
+<!--            <when test="planDto.type != null and planDto.type ==0">-->
+<!--                and r.type in (0,6)-->
+<!--            </when>-->
+<!--            <otherwise>-->
+<!--                and r.type = #{planDto.type}-->
+<!--            </otherwise>-->
+<!--        </choose>-->
+<!--        <if test="planDto.roleId != null">-->
+<!--            and pr.role_id = #{planDto.roleId}-->
+<!--        </if>-->
 <!--    </select>-->
 
+    <!--    <select id="selectData" resultType="com.xunmei.core.resumption.vo.registerBook.RegisterBookItemInfoVo">-->
+    <!--        select distinct o.name as orgName, r.start_time as date, #{id} as resumptionId-->
+    <!--        from core_resumption r-->
+    <!--                 inner join sys_org o on r.org_id = o.id-->
+    <!--                 inner join core_resumption_data d on r.id = d.resumption_id-->
+    <!--        where d.resumption_id = #{id}-->
+    <!--    </select>-->
+
     <select id="selectResumptionDataPointId" resultType="java.lang.Long">
         select item_id
         from core_resumption_data
@@ -382,7 +385,7 @@
     <select id="selectAbnormalData" resultType="com.xunmei.core.resumption.vo.resumptionRecord.ResumptionRecordTempVo">
         SELECT d.resumption_id as resumptionId,count(d.res_value = '1' or null) as nums,count(d.id) as nums2
         FROM core_resumption_data d
-        INNER JOIN  core_resumption_rule_point p ON d.item_id = p.id
+        INNER JOIN core_resumption_rule_point p ON d.item_id = p.id
         where d.resumption_id in
         <foreach collection="resumptionIdList" item="resumptionId" open="(" separator="," close=")">
             #{resumptionId}
@@ -394,11 +397,13 @@
         GROUP BY d.resumption_id
     </select>
     <select id="selectItemIdList" resultType="java.lang.Long">
-        select d.item_id from core_resumption_data d where resumption_id = #{resumptionId}
+        select d.item_id
+        from core_resumption_data d
+        where resumption_id = #{resumptionId}
     </select>
     <select id="selectRuleItemIdListNew" resultType="java.lang.Long">
         select DISTINCT p.item_id
-        from  core_resumption_rule_point p
+        from core_resumption_rule_point p
         where id in
         <foreach collection="ruleItemIdList" item="rulePointId" open="(" separator="," close=")">
             #{rulePointId}
@@ -406,14 +411,45 @@
     </select>
 
     <select id="selectResumptionRoles" resultType="com.xunmei.common.core.vo.IdNameVo">
-        select distinctrow r.id,r.name
+        select distinctrow r.id,r.role_name as name
         from core_resumption_plan p
         inner join core_resumption_plan_to_role pr on p.id=pr.plan_id
         inner join sys_role r on pr.role_id=r.id
-        where p.plan_status = 0
-<!--        <if test="roleDto.type != null">-->
-<!--            and plan_cycle=#{roleDto.type}-->
-<!--        </if>-->
-
+        where p.plan_status = 0 and plan_create_org_id=plan_of_org_id
+        <if test="query.planCycle != null">
+            and plan_cycle = #{query.planCycle}
+        </if>
+        <if test="query.planId != null">
+            and id = #{query.planId}
+        </if>
+        <if test="query.upOrgIds!=null and query.upOrgIds.size>0">
+            and (p.plan_create_org_id in
+            <foreach collection="query.upOrgIds" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+            or p.plan_create_org_id in (select id from sys_org
+            where type in ('1','2','3','4','11') and deleted=0 and path like concat((select path from sys_org where id=#{query.orgId}),'%'))
+            )
+        </if>
+    </select>
+    <select id="selectResumptionPlan" resultType="com.xunmei.common.core.vo.IdNameVo">
+        select id, plan_name as name
+        from core_resumption_plan
+        where plan_status = 0 and plan_create_org_id=plan_of_org_id
+        <if test="query.planCycle != null">
+            and plan_cycle = #{query.planCycle}
+        </if>
+        <if test="query.planId != null">
+            and id = #{query.planId}
+        </if>
+        <if test="query.upOrgIds!=null and query.upOrgIds.size>0">
+            and (p.plan_create_org_id in
+            <foreach collection="query.upOrgIds" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+            or p.plan_create_org_id in (select id from sys_org
+            where type in ('1','2','3','4','11') and deleted=0 and path like concat((select path from sys_org where id=#{query.orgId}),'%'))
+            )
+        </if>
     </select>
 </mapper>

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysOrgController.java

@@ -166,7 +166,7 @@ public class SysOrgController extends BaseController {
      * @param ids
      * @return
      */
-    @GetMapping("/org/getParentName")
+    @GetMapping("/getParentNames")
     public List<IdNameVo> getParentName(List<Long> ids) {
         return sysOrgMapper.getParentName(ids);
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysRoleController.java

@@ -24,6 +24,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 角色信息
@@ -214,9 +215,10 @@ public class SysRoleController extends BaseController {
         return R.ok(byId);
     }
 
-    @InnerAuth
-    @GetMapping("/role/getNames")
-    public List<IdName<Long, String>> getNames(RoleConditionEto condition) {
-        return roleService.selectSimpleRoleAll(condition);
+//    @InnerAuth
+    @PostMapping ("/getNames")
+    public List<IdNameVo> getNames(RoleConditionEto condition) {
+        List<IdName<Long, String>> r= roleService.selectSimpleRoleAll(condition);
+        return r.stream().map(i->new IdNameVo(i.getId(),i.getName(),null)).collect(Collectors.toList());
     }
 }

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

@@ -415,8 +415,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         final LambdaQueryWrapper<SysRole> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SysRole::getStatus, 0)
                 .eq(SysRole::getDelFlag, 0)
-                .select(SysRole::getId)
-                .select(SysRole::getRoleName);
+                .select(SysRole::getId,SysRole::getRoleName);
 
         if(ObjectUtil.isNotNull(conditionEto)){
             if(ObjectUtil.isNotEmpty(conditionEto.getIds())){