F

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

 import com.lyg.application.entity.TaIncompatible;
 import com.lyg.application.entity.TaRotation;
 import com.lyg.application.service.TaIncompatibleService;
+import com.lyg.application.util.Rule;
 import com.lyg.common.util.StringUtil;
 import com.lyg.framework.accesslimit.AccessLimit;
 import com.lyg.framework.log.OpLog;
 @RequestMapping("/")
 public class TaIncompatibleController extends BaseController {
 
+    @Autowired
+    Rule rule;
     @Autowired
     private TaIncompatibleService taIncompatibleService;
 
-
     /**
      * 通过ID查询单条数据
      *
 
         Map<String, String> params = new Hashtable<>();
 
+
         if (oldOrgCode != null && newOrgCode != null && primaryPost != null && targetPost != null && passTime != null) {
+
             //普通规则
             if (oldOrgCode.equals(newOrgCode)) {
-                List<TaIncompatible> taIncompatibleList = taIncompatibleService.getRegularRules(primaryPost, targetPost);
+                List<TaIncompatible> taIncompatibleList = rule.regularRules(primaryPost, targetPost);
+
+//                List<TaIncompatible> taIncompatibleList = taIncompatibleService.getRegularRules(, );
 
                 if (taIncompatibleList.size() == 0) {
                     return SaResult.data("普通规则:根据不相容设置这两个岗位是相容的");
                 params.put("targetPost", targetPost);
                 params.put("passTime", passTime);
                 //三个月规则
-
-                List<TaRotation> repelList = taIncompatibleService.getMonthRules(params);
+                List<TaRotation> repelList =rule.getMonthRules(params);
+//                List<TaRotation> repelList = taIncompatibleService.getMonthRules(params);
                 if (repelList.size() == 0) {
                     return SaResult.data("三个月规则: 这是两个岗位是相容的");
                 } else {

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

+package com.lyg.application.util;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.lyg.application.entity.TaIncompatible;
+import com.lyg.application.entity.TaRotation;
+import com.lyg.application.mapper.TaIncompatibleMapper;
+import com.lyg.application.mapper.TaRotationMapper;
+import com.lyg.application.service.TaIncompatibleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class Rule {
+
+    @Autowired
+    TaIncompatibleService taIncompatibleService;
+
+
+    @Autowired
+    TaIncompatibleMapper taIncompatibleMapper;
+    @Autowired
+    TaRotationMapper taRotationMapper;
+
+    public List<TaIncompatible> regularRules(String primaryPost, String targetPost) {
+        return taIncompatibleService.getRegularRules(primaryPost, targetPost);
+
+    }
+
+
+    public List<TaRotation> getMonthRules(Map<String, String> params) {
+        List<TaRotation> repelList = new ArrayList<>();
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+        QueryWrapper<TaRotation> queryWrapper = new QueryWrapper<>();
+        String primaryPost = params.get("primaryPost");
+        String targetPost = params.get("targetPost");
+        String passTime = params.get("passTime");
+        LocalDate newDate = LocalDate.parse(passTime, formatter).minusMonths(3);
+
+        List<String> oldPostList = taIncompatibleMapper.getMonthRulesPrimary(primaryPost);//原来岗位+目标不相容岗位
+        List<String> newPostList = taIncompatibleMapper.getMonthRulesTarget(targetPost);//目标岗位+原来不相容岗位
+
+        if (oldPostList.size() == 0 && newPostList.size() == 0) {
+            return repelList;
+        } else {
+            List<String> orgList = newPostList;//原来岗位 不相容的
+            orgList.add(orgList.size() - 1, primaryPost);
+
+            List<String> targetList = oldPostList;//目标岗位 不相容的
+            targetList.add(targetList.size() - 1, targetPost);
+
+            //                拿到数据 不相容轮岗数据
+            repelList = taRotationMapper.selectRepel(orgList, targetList, newDate);
+
+            return repelList;
+        }
+    }
+}