F

application/src/main/java/com/lyg/application/DTO/ErrorDto.java

@@ -0,0 +1,33 @@
+package com.lyg.application.DTO;
+
+
+import lombok.Data;
+
+@Data
+public class ErrorDto {
+    private String regularRules;//普通规则 提示
+    private String primaryPost; //原来的岗位
+    private String targetPost;// 轮岗之后的岗位
+
+
+    private String monthRules;//三个月规则 提示
+    private  String employeeNum;//员工工号
+    private  String employeeName;//员工姓名
+
+    private String counterImpPositions; //不相容 原来的岗位
+    private String counterImpPost;//不相容 轮岗之后的岗位
+
+
+    private String specificOrgName; //轮岗列表 原来单位名
+    private String specificOrgNum; //轮岗列表 原来单位号
+
+    private String specificNameOrgRotation; //轮岗列表 轮岗之后单位名
+    private String orgNumJobRotation; //轮岗列表 轮岗之后单位号
+
+//    private String counterImpPositionRotation; //轮岗列表 原来岗位
+//    private String counterImpPostRotation;//轮岗列表 轮岗之后的岗位
+
+
+
+
+}

application/src/main/java/com/lyg/application/Listener/EntityHandler.java

@@ -1,8 +0,0 @@
-package com.lyg.application.Listener;
-
-import java.util.List;
-
-public interface EntityHandler<T> {
-    T handleEntity(T entity,Integer index) throws Exception;
-    void saveEntityBatch(List<T> entityList);
-}

application/src/main/java/com/lyg/application/controller/TaIncompatibleController.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.util.SaResult;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.lyg.application.DTO.ErrorDto;
 import com.lyg.application.entity.TaIncompatible;
 import com.lyg.application.service.TaIncompatibleService;
 import com.lyg.application.util.Rule;
@@ -19,6 +20,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Hashtable;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -64,14 +66,18 @@ public class TaIncompatibleController extends BaseController {
     @GetMapping("/taIncompatible")
     public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                          @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-//                         @ApiParam("原岗位") @RequestParam(value ="primaryPost", required = false) String primaryPost,
-//                         @ApiParam("目标岗位") @RequestParam(value ="targetPost", required = false) String targetPost,
+                         @ApiParam("原岗位") @RequestParam(value ="primaryPost", required = false) String primaryPost,
+                         @ApiParam("目标岗位") @RequestParam(value ="targetPost", required = false) String targetPost,
+                         @ApiParam("规则") @RequestParam(value ="rule", required = false) String rule,
 
                          @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
                          @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "create_date") String sortDesc) throws Exception {
 
         IPage<TaIncompatible> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaIncompatible> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtil.isNotEmpty(primaryPost),"primary_post",primaryPost);
+        queryWrapper.eq(StringUtil.isNotEmpty(targetPost),"target_post",targetPost);
+        queryWrapper.eq(StringUtil.isNotEmpty(rule),"rule",rule);
         queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
         queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
         IPage<TaIncompatible> result = taIncompatibleService.page(pg, queryWrapper);
@@ -151,7 +157,7 @@ public class TaIncompatibleController extends BaseController {
             params.put("targetPost", targetPost);
             params.put("passTime", passTime);
 
-            Object result = rule.siftRule(params);
+            List<ErrorDto> result = rule.siftRule(params);
 
             return SaResult.data(result);
 

application/src/main/java/com/lyg/application/mapper/TaRotationMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 轮岗列表;(ta_rotation)表数据库访问层
@@ -17,5 +18,5 @@ import java.util.List;
 @Mapper
 public interface TaRotationMapper extends BaseMapper<TaRotation> {
 
-    List<TaRotation> selectRepel(@Param("orgList") List<String> orgList, @Param("targetList") List<String> targetList,@Param("newDate") LocalDate newDate);
+    List<TaRotation> selectRepel(@Param("orgList") List<String> orgList, @Param("targetList") List<String> targetList, @Param("newDate") LocalDate newDate, @Param("params") Map<String, String> params);
 }

application/src/main/java/com/lyg/application/util/Rule.java

@@ -1,8 +1,7 @@
 package com.lyg.application.util;
 
 
-import cn.dev33.satoken.util.SaResult;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.lyg.application.DTO.ErrorDto;
 import com.lyg.application.entity.TaIncompatible;
 import com.lyg.application.entity.TaRotation;
 import com.lyg.application.mapper.TaIncompatibleMapper;
@@ -47,7 +46,7 @@ public class Rule {
             params.put("passTime", passTime);
 
 
-            Object result = siftRule(params);
+            List<ErrorDto> result = siftRule(params);
 
             return result;
         }
@@ -55,41 +54,21 @@ public class Rule {
     }
 
 
-    public Object siftRule(Map<String, String> params) {
-        String oldOrgCode = params.get("oldOrgCode");
-        String newOrgCode = params.get("newOrgCode");
+    public List<ErrorDto> siftRule(Map<String, String> params) {
         String primaryPost = params.get("primaryPost");
         String targetPost = params.get("targetPost");
-        String passTime = params.get("passTime");
 
-        //普通规则
-        if (oldOrgCode.equals(newOrgCode)) {
-            List<TaIncompatible> taIncompatibleList = regularRules(primaryPost, targetPost);
+        List<TaRotation> repelList = getMonthRules(params);
 
-//                List<TaIncompatible> taIncompatibleList = taIncompatibleService.getRegularRules(, );
+        List<TaIncompatible> taIncompatibleList = regularRules(primaryPost, targetPost);
 
-            if (taIncompatibleList.size() == 0) {
-                return "普通规则:根据不相容设置这两个岗位是相容的";
-            } else {
-                return taIncompatibleList;
-            }
+        RuleDetail ruleDetail=new RuleDetail();
 
-        } else {
-            params.put("oldOrgCode", oldOrgCode);
-            params.put("newOrgCode", newOrgCode);
-            params.put("primaryPost", primaryPost);
-            params.put("targetPost", targetPost);
-            params.put("passTime", passTime);
-            //三个月规则
-            List<TaRotation> repelList = getMonthRules(params);
-//                List<TaRotation> repelList = taIncompatibleService.getMonthRules(params);
-            if (repelList.size() == 0) {
-                return "三个月规则: 这是两个岗位是相容的";
-            } else {
-                return repelList;
-            }
+        List<ErrorDto> result = ruleDetail.planRuleType(taIncompatibleList,repelList);
+
+
+        return result;
 
-        }
 
     }
 
@@ -111,7 +90,7 @@ public class Rule {
         LocalDate newDate = LocalDate.parse(passTime, formatter).minusMonths(3);
 
         List<String> oldPostList = taIncompatibleMapper.getMonthRulesPrimary(primaryPost, Constants.MONTH_RULE);
-        List<String> newPostList = taIncompatibleMapper.getMonthRulesTarget(targetPost, Constants.MONTH_RULE);
+        List<String> newPostList = taIncompatibleMapper.getMonthRulesPrimary(targetPost, Constants.MONTH_RULE);
 
         if (oldPostList.size() == 0 && newPostList.size() == 0) {
             return repelList;
@@ -122,8 +101,8 @@ public class Rule {
             List<String> targetList = oldPostList;//目标岗位+原来不相容岗位
             targetList.add(targetPost);
 
-            //                拿到数据 不相容轮岗数据
-            repelList = taRotationMapper.selectRepel(orgList, targetList, newDate);
+            //拿到数据 不相容轮岗数据
+            repelList = taRotationMapper.selectRepel(orgList, targetList, newDate,params);
 
             return repelList;
         }

application/src/main/java/com/lyg/application/util/RuleDetail.java

@@ -0,0 +1,47 @@
+package com.lyg.application.util;
+
+import com.lyg.application.DTO.ErrorDto;
+import com.lyg.application.entity.TaIncompatible;
+import com.lyg.application.entity.TaRotation;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RuleDetail {
+
+    public List<ErrorDto> planRuleType(List<TaIncompatible> taIncompatibleList, List<TaRotation> repelList) {
+
+        ErrorDto errorDto = new ErrorDto();
+        List<ErrorDto> result = new ArrayList<>();
+
+        //普通规则
+        if (taIncompatibleList.size() == 0) {
+            errorDto.setRegularRules("普通规则:根据不相容设置这两个岗位是相容的");
+        } else {
+            for (TaIncompatible item : taIncompatibleList) {
+                errorDto.setPrimaryPost(item.getPrimaryPost());
+                errorDto.setTargetPost(item.getTargetPost());
+
+            }
+        }
+
+
+        if (repelList.size() == 0) {
+            errorDto.setMonthRules("三个月规则: 这是两个岗位是相容的");
+        } else {
+            for (TaRotation item : repelList) {
+                errorDto.setCounterImpPositions(item.getCounterImpPositions());
+                errorDto.setCounterImpPost(item.getCounterImpPostRotation());
+                errorDto.setSpecificOrgName(item.getSpecificOrgName());
+                errorDto.setSpecificOrgNum(item.getSpecificOrgNum());
+                errorDto.setSpecificNameOrgRotation(item.getSpecificNameOrgRotation());
+                errorDto.setOrgNumJobRotation(item.getOrgNumJobRotation());
+                errorDto.setEmployeeNum(item.getEmployeeNum());
+                errorDto.setEmployeeName(item.getEmployeeName());
+            }
+        }
+        result.add(errorDto);
+        return result;
+    }
+
+}

application/src/main/resources/mapper/TaIncompatibleMapper.xml

@@ -16,9 +16,9 @@
         SELECT i.TARGET_POST FROM TA_INCOMPATIBLE i
         WHERE
         i.PRIMARY_POST=#{primaryPost}
-        and
+        AND
         i.DELETED=0
-        and
+        AND
         i.RULE=#{monthRule}
     </select>
 

application/src/main/resources/mapper/TaRotationMapper.xml

@@ -8,8 +8,10 @@
         WHERE
         r.rotation_exe_time IS NOT NULL
         AND r.specific_org_num != r.org_num_job_rotation
-        and r.rotation_exe_time <=#{newDate}
-        and r.counter_imp_positions IN
+        AND r.specific_org_num=#{params.oldOrgCode}
+        AND r.org_num_job_rotation=#{params.newOrgCode}
+        AND r.rotation_exe_time <=#{newDate}
+        AND r.counter_imp_positions IN
         <foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">
             #{item}
         </foreach>

system/src/main/java/com/lyg/system/controller/BaseController.java

@@ -34,10 +34,11 @@ public class BaseController {
     public void checkAuth() {
         SysUser sysUser = currentUser();
         Integer isAdmin = sysUser.getIsAdmin();
-        if (isAdmin.equals(1)){
+        if (isAdmin.equals(1)) {
             //是超级管理员
-        }else{
+        } else {
 //            不是管理员
+            String userId = sysUser.getUserId();
         }
 
     }