修改临期履职提醒问题

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

@@ -5,7 +5,7 @@ import com.xunmei.common.core.constant.ServiceNameConstants;
 import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.domain.message.domain.CoreAnnouncementNotificationToRole;
 import com.xunmei.common.core.vo.IdNameVo;
-import com.xunmei.system.api.dto.SysRoleOrgDTO;
+import com.xunmei.system.api.dto.SysPlanOrgDTO;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.api.factory.RemoteUserFallbackFactory;
 import com.xunmei.system.api.model.LoginUser;
@@ -72,7 +72,7 @@ public interface RemoteUserService {
     public List<SysUser>  getUserListByRole(@RequestBody List<CoreAnnouncementNotificationToRole> notificationToRoles, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     @PostMapping("/user/userListByRoleAndOrg")
-    public List<SysUser> userListByRoleAndOrg(@RequestBody SysRoleOrgDTO sysRoleOrgDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source) ;
+    public List<SysUser> userListByRoleAndOrg(@RequestBody SysPlanOrgDTO sysRoleOrgDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source) ;
 
     /**
      * 获取用户的角色id及名称

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/SysRoleOrgDTO.java → soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/SysPlanOrgDTO.java

@@ -2,12 +2,14 @@ package com.xunmei.system.api.dto;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author :LuoWei
  * @date : 2023/9/21
  */
 @Data
-public class SysRoleOrgDTO {
+public class SysPlanOrgDTO {
     private Long orgId;
-    private Long roleId;
+    private Long planId;
 }

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

@@ -6,7 +6,7 @@ import com.xunmei.common.core.domain.message.domain.CoreAnnouncementNotification
 import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.system.api.RemoteUserService;
 import com.xunmei.system.api.domain.SysUser;
-import com.xunmei.system.api.dto.SysRoleOrgDTO;
+import com.xunmei.system.api.dto.SysPlanOrgDTO;
 import com.xunmei.system.api.model.LoginUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -72,7 +72,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
             }
 
             @Override
-            public List<SysUser> userListByRoleAndOrg(SysRoleOrgDTO sysRoleOrgDTO, String source) {
+            public List<SysUser> userListByRoleAndOrg(SysPlanOrgDTO sysRoleOrgDTO, String source) {
                 return null;
             }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/evaluate/controller/CoreEvaluateTaskController.java

@@ -43,7 +43,7 @@ public class CoreEvaluateTaskController extends BaseController {
     @ApiOperation(value = "统计")
     @RequiresPermissions("core:task:list")
     @GetMapping("/statistics")
-    public TableDataInfo<CoreEvaluateTaskVO> statistics(EvaluateTaskDTO coreEvaluateTask) {
+    public TableDataInfo statistics(EvaluateTaskDTO coreEvaluateTask) {
         return coreEvaluateTaskService.selectPage(coreEvaluateTask);
     }
     /**

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

@@ -11,6 +11,7 @@ import com.xunmei.core.evaluate.vo.CoreEvaluateTaskVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 外包评价任务Mapper接口
@@ -69,4 +70,5 @@ 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);
 }

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

@@ -75,4 +75,10 @@ public interface ICoreEvaluateTaskService extends IService<CoreEvaluateTask> {
      */
     TableDataInfo<CoreEvaluateTaskVO> selectPage(EvaluateTaskDTO evaluateTaskDTO);
 
+    /**
+     * 统计
+     * @param evaluateTaskDTO
+     * @return
+     */
+    TableDataInfo statistics(EvaluateTaskDTO evaluateTaskDTO);
 }

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

@@ -101,6 +101,12 @@ public class CoreEvaluateTaskServiceImpl extends ServiceImpl<CoreEvaluateTaskMap
         return TableDataInfo.build(page);
     }
 
+    @Override
+    public TableDataInfo statistics(EvaluateTaskDTO evaluateTaskDTO) {
+
+        return null;
+    }
+
     /**
      * 查询外包评价任务
      *

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/information/service/impl/CoreResumptionConfigurationServiceImpl.java

@@ -7,17 +7,15 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.utils.StringUtils;
-import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.core.information.service.ICoreMessageCenterService;
 import com.xunmei.system.api.RemoteJobService;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.api.dto.SysJobDTO;
-import com.xunmei.system.api.dto.SysRoleOrgDTO;
+import com.xunmei.system.api.dto.SysPlanOrgDTO;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.information.domain.CoreMessageCenter;
 import com.xunmei.core.information.domain.CoreResumptionConfiguration;
-import com.xunmei.core.information.mapper.CoreMessageCenterMapper;
 import com.xunmei.core.resumption.domain.Resumption;
 import com.xunmei.core.resumption.dto.CoreResumptionConfigurationDTO;
 import com.xunmei.core.information.mapper.CoreResumptionConfigurationMapper;
@@ -213,13 +211,12 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         c.set(Calendar.SECOND, 0);
         c.set(Calendar.MILLISECOND, 0);
         c.add(Calendar.DAY_OF_MONTH, time);
-        System.out.print(simpleDateFormat.format(c.getTime()));
         return simpleDateFormat.format(c.getTime());
     }
 
-    private void addMassageCenter(String taskName, String time, String cycle, Long orgId, Long roleId) {
-        SysRoleOrgDTO sysRoleOrgDTO = new SysRoleOrgDTO();
-        sysRoleOrgDTO.setRoleId(roleId);
+    private void addMassageCenter(String taskName, String time, String cycle, Long orgId, Long planId) {
+        SysPlanOrgDTO sysRoleOrgDTO = new SysPlanOrgDTO();
+        sysRoleOrgDTO.setPlanId(planId);
         sysRoleOrgDTO.setOrgId(orgId);
         //根据角色和机构查人
         List<SysUser> sysUsers = remoteUserService.userListByRoleAndOrg(sysRoleOrgDTO, SecurityConstants.INNER);
@@ -275,7 +272,7 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         List<Resumption> resumptions = resumptionMapper.selectDay(getTime(0), "2");
         if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
             resumptions.forEach(r -> {
-                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getRoleId());
+                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getPlanId());
             });
         }
     }
@@ -289,7 +286,7 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         List<Resumption> resumptions = resumptionMapper.selectDay(getTime(0), "3");
         if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
             resumptions.forEach(r -> {
-                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getRoleId());
+                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getPlanId());
             });
         }
     }
@@ -303,7 +300,7 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         List<Resumption> resumptions = resumptionMapper.selectDay(getTime(0), "4");
         if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
             resumptions.forEach(r -> {
-                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getRoleId());
+                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getPlanId());
             });
         }
     }
@@ -317,7 +314,7 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         List<Resumption> resumptions = resumptionMapper.selectDay(getTime(0), "1");
         if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
             resumptions.forEach(r -> {
-                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getRoleId());
+                addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getPlanId());
             });
         }
     }

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

@@ -100,6 +100,9 @@ SELECT
         </if>
         GROUP BY a.id
     </select>
+    <select id="statistics" resultType="java.util.Map">
+
+    </select>
 
     <insert id="insertCoreEvaluateTask" parameterType="com.xunmei.core.evaluate.domain.CoreEvaluateTask">
         insert into core_evaluate_task

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

@@ -25,7 +25,7 @@ import com.xunmei.system.api.model.LoginUser;
 import com.xunmei.system.domain.SysUserRole;
 import com.xunmei.system.domain.vo.SysUserListVo;
 import com.xunmei.system.domain.vo.UserRoleVo;
-import com.xunmei.system.api.dto.SysRoleOrgDTO;
+import com.xunmei.system.api.dto.SysPlanOrgDTO;
 import com.xunmei.system.mapper.SysOrgMapper;
 import com.xunmei.system.service.*;
 import com.xunmei.system.util.UserExport;
@@ -455,7 +455,7 @@ public class SysUserController extends BaseController {
     @ApiOperation(value = "通过角色和机构获取用户")
     @InnerAuth
     @PostMapping("/userListByRoleAndOrg")
-    public List<SysUser> userListByRoleAndOrg(@RequestBody SysRoleOrgDTO sysRoleOrgDTO) {
+    public List<SysUser> userListByRoleAndOrg(@RequestBody SysPlanOrgDTO sysRoleOrgDTO) {
         return userService.selectUserListByRoleAndOrg(sysRoleOrgDTO);
     }
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysUserMapper.java

@@ -7,7 +7,7 @@ import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.SysRole;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.domain.vo.SysUserVO;
-import com.xunmei.system.api.dto.SysRoleOrgDTO;
+import com.xunmei.system.api.dto.SysPlanOrgDTO;
 import com.xunmei.system.util.UserExport;
 import org.apache.ibatis.annotations.Param;
 
@@ -155,7 +155,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     List<SysUser> selectUserListByRole(@Param("notificationToRoles") List<CoreAnnouncementNotificationToRole> notificationToRoles);
 
-    List<SysUser> selectUserListByRoleAndOrg(@Param("sysRoleOrgDTO") SysRoleOrgDTO sysRoleOrgDTO);
+    List<SysUser> selectUserListByRoleAndOrg(@Param("sysRoleOrgDTO") SysPlanOrgDTO sysRoleOrgDTO);
 
     List<UserExport> select(@Param("info") SysUser user);
 

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

@@ -7,7 +7,7 @@ import com.xunmei.system.api.domain.SysRole;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.domain.vo.SysUserListVo;
 import com.xunmei.system.domain.vo.SysUserVO;
-import com.xunmei.system.api.dto.SysRoleOrgDTO;
+import com.xunmei.system.api.dto.SysPlanOrgDTO;
 import com.xunmei.system.util.UserExport;
 
 import java.util.List;
@@ -222,7 +222,7 @@ public interface ISysUserService extends IService<SysUser> {
 
     List<SysUser> selectUserListByRole(List<CoreAnnouncementNotificationToRole> notificationToRoles);
 
-    List<SysUser> selectUserListByRoleAndOrg(SysRoleOrgDTO sysRoleOrgDTO);
+    List<SysUser> selectUserListByRoleAndOrg(SysPlanOrgDTO sysRoleOrgDTO);
 
     List<SysUser> selectAllUser(String userName);
 

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

@@ -21,7 +21,7 @@ import com.xunmei.system.domain.SysUserPost;
 import com.xunmei.system.domain.SysUserRole;
 import com.xunmei.system.domain.vo.SysUserListVo;
 import com.xunmei.system.domain.vo.SysUserVO;
-import com.xunmei.system.api.dto.SysRoleOrgDTO;
+import com.xunmei.system.api.dto.SysPlanOrgDTO;
 import com.xunmei.system.mapper.*;
 import com.xunmei.system.service.ISysConfigService;
 import com.xunmei.system.service.ISysOrgService;
@@ -608,7 +608,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public List<SysUser> selectUserListByRoleAndOrg(SysRoleOrgDTO sysRoleOrgDTO) {
+    public List<SysUser> selectUserListByRoleAndOrg(SysPlanOrgDTO sysRoleOrgDTO) {
         return userMapper.selectUserListByRoleAndOrg(sysRoleOrgDTO);
     }
 

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

@@ -609,7 +609,7 @@
             a.deleted = 0
           AND d.del_flag = 0
           AND b.id = #{sysRoleOrgDTO.orgId}
-          AND d.id = #{sysRoleOrgDTO.roleId}
+          AND d.id IN (	SELECT role_id FROM core_resumption_plan_to_role WHERE plan_id=#{sysRoleOrgDTO.planId})
     </select>
     <select id="select" resultType="com.xunmei.system.util.UserExport">
         SELECT