F

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

@@ -1,6 +1,4 @@
-package com.lyg.application.dao;
-
-import com.lyg.application.entity.TaRotation;
+package com.lyg.application.Listener;
 
 import java.util.List;
 

application/src/main/java/com/lyg/application/dao/UploadDataListener.java → application/src/main/java/com/lyg/application/Listener/TaMandatoryLeaveListener.java

@@ -1,7 +1,9 @@
-package com.lyg.application.dao;
+package com.lyg.application.Listener;
 
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.read.listener.ReadListener;
+import com.lyg.application.entity.TaMandatoryLeave;
+import com.lyg.application.service.TaMandatoryLeaveService;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
@@ -9,28 +11,30 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
-public class UploadDataListener<T> implements ReadListener<T> {
+public class TaMandatoryLeaveListener implements ReadListener<TaMandatoryLeave> {
 
 
     private static final int BATCH_COUNT = 10;
     final List<String> errorMessages = new ArrayList<>();
-    private final List<T> dataList = new ArrayList<>();
-    private final EntityHandler<T> entityHandler;
+    private final List<TaMandatoryLeave> dataList = new ArrayList<>();
 
-    public UploadDataListener(EntityHandler<T> entityHandler) {
-        this.entityHandler = entityHandler;
+    private final TaMandatoryLeaveService taMandatoryLeaveService;
+
+    public TaMandatoryLeaveListener(TaMandatoryLeaveService taMandatoryLeaveService) {
+        this.taMandatoryLeaveService = taMandatoryLeaveService;
     }
 
+
     @SneakyThrows
     @Override
-    public void invoke(T data, AnalysisContext context) {
+    public void invoke(TaMandatoryLeave data, AnalysisContext context) {
         log.info("解析到一条数据: {}", data);
         if (data == null) {
             throw new RuntimeException("excel读取失败");
         }
         Integer index = context.readRowHolder().getRowIndex() + 1;
 
-        T processedData = entityHandler.handleEntity(data, index);
+        TaMandatoryLeave processedData = taMandatoryLeaveService.handleEntity(data, index);
         if (processedData != null) {
             dataList.add(processedData);
             if (dataList.size() >= BATCH_COUNT) {
@@ -58,7 +62,7 @@ public class UploadDataListener<T> implements ReadListener<T> {
         log.info("正在读取 {} 条数据", dataList.size());
 //        log.info("错误信息列表: {}", errorMessages);
         if (!dataList.isEmpty()) { // 只有当数据列表不为空且没有错误信息时才保存数据
-            entityHandler.saveEntityBatch(dataList);
+            taMandatoryLeaveService.saveEntityBatch(dataList);
             dataList.clear();
         }
     }

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

@@ -0,0 +1,69 @@
+package com.lyg.application.Listener;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.read.listener.ReadListener;
+import com.lyg.application.entity.TaRotation;
+import com.lyg.application.service.TaRotationService;
+import com.lyg.application.util.Rule;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+public class TaRotationListener implements ReadListener<TaRotation> {
+
+
+    private static final int BATCH_COUNT = 10;
+    final List<String> errorMessages = new ArrayList<>();
+    private final List<TaRotation> dataList = new ArrayList<>();
+
+    private final TaRotationService taRotationService;
+
+    public TaRotationListener(TaRotationService taRotationService) {
+        this.taRotationService = taRotationService;
+    }
+
+
+    @SneakyThrows
+    @Override
+    public void invoke(TaRotation data, AnalysisContext context) {
+        log.info("解析到一条数据: {}", data);
+        if (data == null) {
+            throw new RuntimeException("excel读取失败");
+        }
+        Integer index = context.readRowHolder().getRowIndex() + 1;
+
+        TaRotation processedData = taRotationService.handleEntity(data, index);
+        if (processedData != null) {
+            dataList.add(processedData);
+            if (dataList.size() >= BATCH_COUNT) {
+                saveData();
+            }
+        }
+    }
+
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext context) {
+        saveData();
+        log.info("所有数据解析完成！");
+    }
+//    public List<String> getErrorMessages() {
+//        return errorMessages;
+//    }
+
+//    public List<T> getDataList() {
+//        return dataList;
+//    }
+
+    public void saveData() {
+        log.info("正在读取 {} 条数据", dataList.size());
+//        log.info("错误信息列表: {}", errorMessages);
+        if (!dataList.isEmpty()) { // 只有当数据列表不为空且没有错误信息时才保存数据
+            taRotationService.saveEntityBatch(dataList);
+            dataList.clear();
+        }
+    }
+}

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

@@ -5,7 +5,6 @@ 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.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;
@@ -20,7 +19,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Hashtable;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -130,7 +128,7 @@ public class TaIncompatibleController extends BaseController {
 
 
     /**
-     * 分页查询
+     *
      */
     @OpLog(module = "不相容规则查询", action = "")
     @AccessLimit()
@@ -146,37 +144,17 @@ public class TaIncompatibleController extends BaseController {
 
         Map<String, String> params = new Hashtable<>();
 
-
         if (oldOrgCode != null && newOrgCode != null && primaryPost != null && targetPost != null && passTime != null) {
+            params.put("oldOrgCode", oldOrgCode);
+            params.put("newOrgCode", newOrgCode);
+            params.put("primaryPost", primaryPost);
+            params.put("targetPost", targetPost);
+            params.put("passTime", passTime);
+
+            Object result = rule.siftRule(params);
+
+            return SaResult.data(result);
 
-            //普通规则
-            if (oldOrgCode.equals(newOrgCode)) {
-                List<TaIncompatible> taIncompatibleList = rule.regularRules(primaryPost, targetPost);
-
-//                List<TaIncompatible> taIncompatibleList = taIncompatibleService.getRegularRules(, );
-
-                if (taIncompatibleList.size() == 0) {
-                    return SaResult.data("普通规则:根据不相容设置这两个岗位是相容的");
-                } else {
-                    return SaResult.data(taIncompatibleList);
-                }
-
-            } else {
-                params.put("oldOrgCode", oldOrgCode);
-                params.put("newOrgCode", newOrgCode);
-                params.put("primaryPost", primaryPost);
-                params.put("targetPost", targetPost);
-                params.put("passTime", passTime);
-                //三个月规则
-                List<TaRotation> repelList =rule.getMonthRules(params);
-//                List<TaRotation> repelList = taIncompatibleService.getMonthRules(params);
-                if (repelList.size() == 0) {
-                    return SaResult.data("三个月规则: 这是两个岗位是相容的");
-                } else {
-                    return SaResult.data(repelList);
-                }
-
-            }
         }
         return SaResult.error("请输入岗位或机构号");
 

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

@@ -4,23 +4,24 @@ 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 java.util.List;
-import com.lyg.common.Constants;
+import com.lyg.application.entity.TaRotation;
+import com.lyg.application.service.TaRotationService;
+import com.lyg.application.util.Rule;
 import com.lyg.common.util.StringUtil;
+import com.lyg.framework.accesslimit.AccessLimit;
 import com.lyg.framework.log.OpLog;
 import com.lyg.system.controller.BaseController;
-import com.lyg.framework.accesslimit.AccessLimit;
+import com.lyg.system.mapper.SysOrgMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import com.lyg.application.entity.TaRotation;
-import com.lyg.application.service.TaRotationService;
 
- /**
+/**
  * 轮岗列表;(ta_rotation)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2024-3-6
  */
@@ -28,12 +29,18 @@ import com.lyg.application.service.TaRotationService;
 @RestController
 @RequestMapping("/")
 public class TaRotationController extends BaseController {
-    
+
     @Autowired
     private TaRotationService taRotationService;
-    
-    /** 
-     * 通过ID查询单条数据 
+    @Autowired
+    private Rule rule;
+
+    @Autowired
+    private SysOrgMapper sysOrgMapper;
+
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param id 主键
      * @return 实例对象
@@ -45,11 +52,11 @@ public class TaRotationController extends BaseController {
     public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         return SaResult.data(taRotationService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
@@ -57,41 +64,41 @@ public class TaRotationController extends BaseController {
     @AccessLimit()
     @ApiOperation("分页查询")
     @GetMapping("/taRotation")
-    public SaResult list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                         @ApiParam("总行部门/一级分行") @RequestParam(value ="headOfficeOrg",required = false) String headOfficeOrg,
-                         @ApiParam("员工工号") @RequestParam(value ="employeeNum",required = false) String employeeNum,
-                         @ApiParam("员工姓名") @RequestParam(value ="employeeName",required = false) String employeeName,
-                         @ApiParam("具体单位机构号") @RequestParam(value ="specificOrgNum",required = false) String specificOrgNum,
-                         @ApiParam("所在单位具体名称") @RequestParam(value ="specificOrgName",required = false) String specificOrgName,
-                         @ApiParam("对应机构层次") @RequestParam(value ="counterInstitutionsLevel",required = false) String counterInstitutionsLevel,
-                         @ApiParam("对应重要岗位") @RequestParam(value ="counterImpPositions",required = false) String counterImpPositions,
-                         @ApiParam("对应总行条线") @RequestParam(value ="counterHeadOfficeLine",required = false) String counterHeadOfficeLine,
-
-
-                         @ApiParam("正序排列") @RequestParam(value ="sortAsc", defaultValue = "create_date") String sortAsc,
-                         @ApiParam("倒序排列") @RequestParam(value ="sortDesc",required = false) String sortDesc
+    public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                         @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                         @ApiParam("总行部门/一级分行") @RequestParam(value = "headOfficeOrg", required = false) String headOfficeOrg,
+                         @ApiParam("员工工号") @RequestParam(value = "employeeNum", required = false) String employeeNum,
+                         @ApiParam("员工姓名") @RequestParam(value = "employeeName", required = false) String employeeName,
+                         @ApiParam("具体单位机构号") @RequestParam(value = "specificOrgNum", required = false) String specificOrgNum,
+                         @ApiParam("所在单位具体名称") @RequestParam(value = "specificOrgName", required = false) String specificOrgName,
+                         @ApiParam("对应机构层次") @RequestParam(value = "counterInstitutionsLevel", required = false) String counterInstitutionsLevel,
+                         @ApiParam("对应重要岗位") @RequestParam(value = "counterImpPositions", required = false) String counterImpPositions,
+                         @ApiParam("对应总行条线") @RequestParam(value = "counterHeadOfficeLine", required = false) String counterHeadOfficeLine,
+
+
+                         @ApiParam("正序排列") @RequestParam(value = "sortAsc", defaultValue = "create_date") String sortAsc,
+                         @ApiParam("倒序排列") @RequestParam(value = "sortDesc", required = false) String sortDesc
     ) throws Exception {
-        
+
         IPage<TaRotation> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaRotation> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StringUtil.isNotEmpty(headOfficeOrg),"head_office_org",headOfficeOrg);
-        queryWrapper.eq(StringUtil.isNotEmpty(employeeNum),"employee_num",employeeNum);
-        queryWrapper.like(StringUtil.isNotEmpty(employeeName),"employee_name",employeeName);
-        queryWrapper.eq(StringUtil.isNotEmpty(specificOrgNum),"specific_org_num",specificOrgNum);
-        queryWrapper.like(StringUtil.isNotEmpty(specificOrgName),"specific_org_name",specificOrgName);
-        queryWrapper.like(StringUtil.isNotEmpty(counterInstitutionsLevel),"counter_institutions_level",counterInstitutionsLevel);
-        queryWrapper.like(StringUtil.isNotEmpty(counterImpPositions),"counter_imp_positions",counterImpPositions);
-        queryWrapper.like(StringUtil.isNotEmpty(counterHeadOfficeLine),"counter_head_office_line",counterHeadOfficeLine);
+        queryWrapper.like(StringUtil.isNotEmpty(headOfficeOrg), "head_office_org", headOfficeOrg);
+        queryWrapper.eq(StringUtil.isNotEmpty(employeeNum), "employee_num", employeeNum);
+        queryWrapper.like(StringUtil.isNotEmpty(employeeName), "employee_name", employeeName);
+        queryWrapper.eq(StringUtil.isNotEmpty(specificOrgNum), "specific_org_num", specificOrgNum);
+        queryWrapper.like(StringUtil.isNotEmpty(specificOrgName), "specific_org_name", specificOrgName);
+        queryWrapper.like(StringUtil.isNotEmpty(counterInstitutionsLevel), "counter_institutions_level", counterInstitutionsLevel);
+        queryWrapper.like(StringUtil.isNotEmpty(counterImpPositions), "counter_imp_positions", counterImpPositions);
+        queryWrapper.like(StringUtil.isNotEmpty(counterHeadOfficeLine), "counter_head_office_line", counterHeadOfficeLine);
 
         queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
         queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
         IPage<TaRotation> result = taRotationService.page(pg, queryWrapper);
-        
+
         return SaResult.data(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param taRotation 实例对象
@@ -102,11 +109,22 @@ public class TaRotationController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/taRotation")
     public SaResult add(@ApiParam("对象实体") @Validated @RequestBody TaRotation taRotation) throws Exception {
+
+
+        String specificOrgNum = taRotation.getSpecificOrgName();//轮岗前具体单位名称 传来的是orgId
+//        String specificOrgNum = taRotation.getSpecificOrgNum();//轮岗前单位号
+        String specificNameOrgRotation = taRotation.getSpecificNameOrgRotation();//轮岗后具体单位名称
+        String orgNumJobRotation = taRotation.getOrgNumJobRotation();//轮岗后单位号
+        String specificOrgName = sysOrgMapper.getOrgId(specificOrgNum);
+        taRotation.setSpecificOrgNum(specificOrgName);
+        taRotation.setSpecificOrgName();
         taRotationService.save(taRotation);
-        return SaResult.data(taRotation);
+        Object result = rule.taRotationRule(taRotation);
+
+        return SaResult.data(result);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param taRotation 实例对象
@@ -117,13 +135,15 @@ public class TaRotationController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/taRotation/{id}")
     public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody TaRotation taRotation,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+                         @ApiParam("对象ID") @PathVariable String id) throws Exception {
         taRotation.setRotationId(id);
         taRotationService.updateById(taRotation);
-        return SaResult.data(taRotation);
+        Object result = rule.taRotationRule(taRotation);
+        return SaResult.data(result);
+
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param id 主键
@@ -133,7 +153,7 @@ public class TaRotationController extends BaseController {
     @AccessLimit()
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taRotation/{id}")
-    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id){
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id) {
         taRotationService.removeById(id);
         return SaResult.data("success");
     }

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

@@ -2,9 +2,11 @@ package com.lyg.application.controller;
 
 import cn.dev33.satoken.util.SaResult;
 import com.alibaba.excel.EasyExcel;
-import com.lyg.application.dao.UploadDataListener;
+import com.lyg.application.Listener.TaMandatoryLeaveListener;
+import com.lyg.application.Listener.TaRotationListener;
 import com.lyg.application.entity.TaMandatoryLeave;
 import com.lyg.application.entity.TaRotation;
+import com.lyg.application.service.TaMandatoryLeaveService;
 import com.lyg.application.service.TaRotationService;
 import com.lyg.application.service.impl.TaMandatoryLeaveServiceImpl;
 import com.lyg.application.service.impl.TaRotationServiceImpl;
@@ -14,7 +16,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -41,6 +42,8 @@ public class UploadController extends BaseController {
 
     @Autowired
     private TaRotationServiceImpl taRotationServiceImpl;
+    @Autowired
+    private TaMandatoryLeaveService taMandatoryLeaveService;
 
     @Autowired
     private TaMandatoryLeaveServiceImpl taMandatoryLeaveServiceImpl;
@@ -57,13 +60,13 @@ public class UploadController extends BaseController {
         try {
 
             InputStream inputStream = file.getInputStream();
-            UploadDataListener<TaRotation> uploadDataListener = new UploadDataListener<>(taRotationServiceImpl);
-            EasyExcel.read(inputStream, TaRotation.class, uploadDataListener).sheet().headRowNumber(4).doRead();
+            TaRotationListener taRotationListener = new TaRotationListener(taRotationService);
+            EasyExcel.read(inputStream, TaRotation.class, taRotationListener).sheet().headRowNumber(4).doRead();
 
-            List<String> errorMessages = taRotationServiceImpl.getErrorMessages();
+            List<Object> errorMessages = taRotationServiceImpl.getErrorMessages();
             StringBuilder errorMessageBuilder = new StringBuilder();
 
-            for (String errorMessage : errorMessages) {
+            for (Object errorMessage : errorMessages) {
                 errorMessageBuilder.append(errorMessage).append("\n");
             }
 
@@ -90,8 +93,8 @@ public class UploadController extends BaseController {
         try {
 
             InputStream inputStream = file.getInputStream();
-            UploadDataListener<TaMandatoryLeave> uploadDataListener = new UploadDataListener<>(taMandatoryLeaveServiceImpl);
-            EasyExcel.read(inputStream, TaMandatoryLeave.class, uploadDataListener).sheet().headRowNumber(4).doRead();
+            TaMandatoryLeaveListener taMandatoryLeaveListener = new TaMandatoryLeaveListener(taMandatoryLeaveService);
+            EasyExcel.read(inputStream, TaMandatoryLeave.class, taMandatoryLeaveListener).sheet().headRowNumber(4).doRead();
 
             List<String> errorMessages = taMandatoryLeaveServiceImpl.getErrorMessages();
             StringBuilder errorMessageBuilder = new StringBuilder();
@@ -112,8 +115,6 @@ public class UploadController extends BaseController {
     }
 
 
-
-
 //
 //    @AccessLimit()
 //    @ApiOperation("提示/预警")
@@ -128,10 +129,4 @@ public class UploadController extends BaseController {
 //    }
 
 
-
-
-
-
-
-
 }

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

@@ -1,23 +1,26 @@
 package com.lyg.application.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lyg.application.entity.TaIncompatible;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.lyg.application.entity.TaIncompatible;
 
 import java.util.List;
 
 /**
  * 不相容;(ta_incompatible)表数据库访问层
+ *
  * @author : http://njyunzhi.com
  * @date : 2024-3-6
  */
 @Mapper
-public interface TaIncompatibleMapper  extends BaseMapper<TaIncompatible>{
+public interface TaIncompatibleMapper extends BaseMapper<TaIncompatible> {
+
+    List<TaIncompatible> getRegularRules(@Param("oldOrgName") String oldOrgName, @Param("newOrgName") String newOrgName, @Param("regularRule") String regularRule);
+
+    List<String> getMonthRulesPrimary(@Param("primaryPost") String primaryPost, @Param("monthRule") String monthRule);
 
-     List<TaIncompatible> getRegularRules(@Param("oldOrgName") String oldOrgName, @Param("newOrgName") String newOrgName);
+    List<String> getMonthRulesTarget(@Param("targetPost") String targetPost, @Param("monthRule") String monthRule);
 
-    List<String> getMonthRulesPrimary(@Param("primaryPost") String primaryPost);
 
-    List<String> getMonthRulesTarget(@Param("targetPost") String targetPost);
 }

application/src/main/java/com/lyg/application/service/TaIncompatibleService.java

@@ -16,7 +16,6 @@ import java.util.Map;
 public interface TaIncompatibleService extends IBaseService<TaIncompatible> {
 
 
-    List<TaIncompatible> getRegularRules(String primaryPost, String targetPost);
 
-    List<TaRotation> getMonthRules(Map<String, String> params);
+//    List<TaRotation> getMonthRules(Map<String, String> params);
 }

application/src/main/java/com/lyg/application/service/TaMandatoryLeaveService.java

@@ -2,13 +2,17 @@ package com.lyg.application.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.lyg.application.entity.TaMandatoryLeave;
+import com.lyg.application.entity.TaRotation;
 import com.lyg.system.service.IBaseService;
 
- /**
+import java.util.List;
+
+/**
  * 强制休假表;(ta_mandatory_leave)表服务接口
  * @author : http://njyunzhi.com
  * @date : 2024-3-6
  */
 public interface TaMandatoryLeaveService extends IBaseService<TaMandatoryLeave> {
-    
+ TaMandatoryLeave handleEntity(TaMandatoryLeave entity, Integer index) throws Exception;
+ void saveEntityBatch(List<TaMandatoryLeave> entityList);
 }

application/src/main/java/com/lyg/application/service/TaRotationService.java

@@ -1,8 +1,8 @@
 package com.lyg.application.service;
 
+import cn.dev33.satoken.util.SaResult;
 import com.lyg.application.entity.TaRotation;
 import com.lyg.system.service.IBaseService;
-import org.apache.poi.ss.formula.functions.T;
 
 import java.util.List;
 
@@ -13,6 +13,8 @@ import java.util.List;
  * @date : 2024-3-6
  */
 public interface TaRotationService extends IBaseService<TaRotation> {
+    TaRotation handleEntity(TaRotation entity,Integer index) throws Exception;
+    void saveEntityBatch(List<TaRotation> entityList);
 
 //
 //    void handleEntity(List<T> entityList) throws Exception;

application/src/main/java/com/lyg/application/service/impl/TaIncompatibleServiceImpl.java

@@ -37,42 +37,36 @@ public class TaIncompatibleServiceImpl extends BaseServiceImpl<TaIncompatibleMap
 //    }
 
 
-    @SneakyThrows
-    @Override
-    public List<TaIncompatible> getRegularRules(String oldOrgName, String newOrgName) {
-        return baseMapper.getRegularRules(oldOrgName, newOrgName);
-
-    }
-
-    @Override
-    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 = baseMapper.getMonthRulesPrimary(primaryPost);//原来岗位+目标不相容岗位
-        List<String> newPostList = baseMapper.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;
-        }
-
-    }
+//
+//
+//    @Override
+//    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 = baseMapper.getMonthRulesPrimary(primaryPost);//原来岗位+目标不相容岗位
+//        List<String> newPostList = baseMapper.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;
+//        }
+//    }
 }

application/src/main/java/com/lyg/application/service/impl/TaMandatoryLeaveServiceImpl.java

@@ -1,9 +1,9 @@
 package com.lyg.application.service.impl;
 
-import com.lyg.application.dao.EntityHandler;
 import com.lyg.application.entity.TaMandatoryLeave;
 import com.lyg.application.mapper.TaMandatoryLeaveMapper;
 import com.lyg.application.service.TaMandatoryLeaveService;
+import com.lyg.system.mapper.SysPositionMapper;
 import com.lyg.system.service.SysOrgService;
 import com.lyg.system.service.SysPositionService;
 import com.lyg.system.service.impl.BaseServiceImpl;
@@ -21,12 +21,14 @@ import java.util.List;
  * @date : 2024-3-6
  */
 @Service
-public class TaMandatoryLeaveServiceImpl extends BaseServiceImpl<TaMandatoryLeaveMapper, TaMandatoryLeave> implements TaMandatoryLeaveService, EntityHandler<TaMandatoryLeave> {
+public class TaMandatoryLeaveServiceImpl extends BaseServiceImpl<TaMandatoryLeaveMapper, TaMandatoryLeave> implements TaMandatoryLeaveService {
     private final List<String> errorMessages = new ArrayList<>();
     @Autowired
     private SysOrgService sysOrgService;
     @Autowired
     private SysPositionService sysPositionService;
+    @Autowired
+    private SysPositionMapper sysPositionMapper;
 
     @Override
     public TaMandatoryLeave handleEntity(TaMandatoryLeave entity, Integer index) throws Exception {
@@ -36,10 +38,18 @@ public class TaMandatoryLeaveServiceImpl extends BaseServiceImpl<TaMandatoryLeav
 
         String orgCode = entity.getOrgNum();//单位机构号
         String orgName = entity.getOrgName().replaceAll("\n", "");//单位机构名
-        String counterImpPost = entity.getCounterImpPost().replaceAll("\n", "");//岗位名
+
+        String counterImpPost = null;
+        if (entity.getCounterImpPost() != null) {
+            counterImpPost = entity.getCounterImpPost().replaceAll("\n", "");//岗位名
+            //        轮岗之前岗位名  获取id
+            String rotationId = sysPositionMapper.getPostId(counterImpPost);
+            entity.setCounterImpPost(rotationId);
+        }
         LocalDate durationOfEmployment = entity.getStartTimeVacation();
         LocalDate vacationDeadline = entity.getVacationDeadline();
 
+
         Long count = sysOrgService.countBy("org_id", orgCode, true);
         if (count == 0 || orgCode.isEmpty()) {
             errorMessages.add("第 " + index + " 行处理发生错误: " + "没有此机构号 " + orgCode);

application/src/main/java/com/lyg/application/service/impl/TaRotationServiceImpl.java

@@ -1,9 +1,10 @@
 package com.lyg.application.service.impl;
 
-import com.lyg.application.dao.EntityHandler;
 import com.lyg.application.entity.TaRotation;
 import com.lyg.application.mapper.TaRotationMapper;
 import com.lyg.application.service.TaRotationService;
+import com.lyg.application.util.Rule;
+import com.lyg.system.mapper.SysPositionMapper;
 import com.lyg.system.service.SysOrgService;
 import com.lyg.system.service.SysPositionService;
 import com.lyg.system.service.impl.BaseServiceImpl;
@@ -22,40 +23,60 @@ import java.util.List;
  */
 @Service
 
-public class TaRotationServiceImpl extends BaseServiceImpl<TaRotationMapper, TaRotation> implements TaRotationService, EntityHandler<TaRotation> {
+public class TaRotationServiceImpl extends BaseServiceImpl<TaRotationMapper, TaRotation> implements TaRotationService {
 
-    private final List<String> errorMessages = new ArrayList<>();
+    private final List<Object> errorMessages = new ArrayList<>();
+    @Autowired
+    Rule rule;
     @Autowired
     private SysOrgService sysOrgService;
     @Autowired
     private SysPositionService sysPositionService;
+    @Autowired
+    private SysPositionMapper sysPositionMapper;
 
-    @Override
     public TaRotation handleEntity(TaRotation entity, Integer index) throws Exception {
 //校验验证
         System.out.println("******************************entity**************************************");
-        System.out.println(entity);
+//        System.out.println(entity);
+
+        String specificNameOrgRotation = entity.getSpecificNameOrgRotation();
+        String counterImpPostRotation = entity.getCounterImpPostRotation();
+
 
         String orgCode = entity.getSpecificOrgNum();//单位机构号
         String orgName = entity.getSpecificOrgName().replaceAll("\n", "");//单位机构名
-        String rotationName = entity.getCounterImpPositions().replaceAll("\n", "");//岗位名
+        String rotationName = entity.getCounterImpPositions().replaceAll("\n", "");//轮岗之前岗位名
+        String impPostRotation = null;
+        if (entity.getCounterImpPostRotation() != null) {
+            impPostRotation = entity.getCounterImpPostRotation().replaceAll("\n", "");//轮岗之后岗位名
+        }
         LocalDate durationOfEmployment = entity.getDurationOfEmployment();
         LocalDate rotationExeTime = entity.getRotationExeTime();
         LocalDate rotationDeadline = entity.getRotationDeadline();
         LocalDate planRotationDate = entity.getPlanRotationDate();
+//        轮岗之前岗位名  获取id
+        String rotationId = sysPositionMapper.getPostId(rotationName);
+        entity.setCounterImpPositions(rotationId);
+        if(impPostRotation!=null){
+        //   轮岗之后岗位名  获取id
+        String impPostRotationId = sysPositionMapper.getPostId(impPostRotation);
+        entity.setCounterImpPostRotation(impPostRotationId);
+        }
+
 
         Long count = sysOrgService.countBy("org_id", orgCode, true);
-        if (count == 0||orgCode.isEmpty()) {
+        if (count == 0 || orgCode.isEmpty()) {
             errorMessages.add("第 " + index + " 行处理发生错误: " + "没有此机构号 " + orgCode);
         }
 
         count = sysOrgService.countBy("name", orgName, true);
-        if (count == 0||orgName.isEmpty()) {
+        if (count == 0) {
             errorMessages.add("第 " + index + " 行处理发生错误: " + "没有此机构名字 " + orgName);
         }
 
         count = sysPositionService.countBy("name", rotationName, true);
-        if (count == 0||rotationName.isEmpty()) {
+        if (count == 0 || rotationName.isEmpty()) {
             errorMessages.add("第 " + index + " 行处理发生错误: " + "没有此岗位 " + rotationName);
         }
 
@@ -71,25 +92,33 @@ public class TaRotationServiceImpl extends BaseServiceImpl<TaRotationMapper, TaR
         if (planRotationDate == null) {
             errorMessages.add("第 " + index + " 行时间错误:计划轮岗日期 " + planRotationDate);
         }
+
+
+        if (orgName != null && specificNameOrgRotation != null && rotationName != null && counterImpPostRotation != null) {
+            Object result = rule.taRotationRule(entity);
+            errorMessages.add(result);
+        }
+
         return entity;
     }
 
+
     //    @Transactional(rollbackFor = Exception.class)
-    @Override
     public void saveEntityBatch(List<TaRotation> entityList) {
         // 实现逻辑：保存批量实体
         System.out.println("******************************entityList**************************************");
         System.out.println(entityList);
         for (TaRotation taRotation : entityList) {
+
+
             baseMapper.insert(taRotation);
+
         }
     }
 
 
-    public List<String> getErrorMessages() {
-
-            return errorMessages;
-
+    public List<Object> getErrorMessages() {
+        return errorMessages;
     }
 }
 

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

@@ -1,35 +1,101 @@
 package com.lyg.application.util;
 
 
+import cn.dev33.satoken.util.SaResult;
 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 com.lyg.common.Constants;
 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.Hashtable;
 import java.util.List;
 import java.util.Map;
 
 @Component
 public class Rule {
 
-    @Autowired
-    TaIncompatibleService taIncompatibleService;
-
 
     @Autowired
     TaIncompatibleMapper taIncompatibleMapper;
     @Autowired
     TaRotationMapper taRotationMapper;
 
+
+    //这是在controller中使用的
+    public Object taRotationRule(TaRotation taRotation) {
+        Map<String, String> params = new Hashtable<>();
+        String specificOrgName = taRotation.getSpecificOrgName();
+        String specificNameOrgRotation = taRotation.getSpecificNameOrgRotation();
+        String counterImpPositions = taRotation.getCounterImpPositions();
+        String counterImpPostRotation = taRotation.getCounterImpPostRotation();
+
+        if (specificOrgName != null && specificNameOrgRotation != null && counterImpPositions != null && counterImpPostRotation != null) {
+            LocalDate newDate = LocalDate.now();
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            String passTime = newDate.format(formatter);
+            params.put("oldOrgCode", taRotation.getSpecificOrgName());
+            params.put("newOrgCode", taRotation.getSpecificNameOrgRotation());
+            params.put("primaryPost", taRotation.getCounterImpPositions());
+            params.put("targetPost", taRotation.getCounterImpPostRotation());
+            params.put("passTime", passTime);
+
+
+            Object result = siftRule(params);
+
+            return result;
+        }
+        return taRotation;
+    }
+
+
+    public Object siftRule(Map<String, String> params) {
+        String oldOrgCode = params.get("oldOrgCode");
+        String newOrgCode = params.get("newOrgCode");
+        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<TaIncompatible> taIncompatibleList = taIncompatibleService.getRegularRules(, );
+
+            if (taIncompatibleList.size() == 0) {
+                return "普通规则:根据不相容设置这两个岗位是相容的";
+            } else {
+                return taIncompatibleList;
+            }
+
+        } 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;
+            }
+
+        }
+
+    }
+
+
     public List<TaIncompatible> regularRules(String primaryPost, String targetPost) {
-        return taIncompatibleService.getRegularRules(primaryPost, targetPost);
+        return taIncompatibleMapper.getRegularRules(primaryPost, targetPost, Constants.REGULAR_RULE);
 
     }
 
@@ -39,23 +105,22 @@ public class Rule {
 
         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);//目标岗位+原来不相容岗位
+        List<String> oldPostList = taIncompatibleMapper.getMonthRulesPrimary(primaryPost, Constants.MONTH_RULE);
+        List<String> newPostList = taIncompatibleMapper.getMonthRulesTarget(targetPost, Constants.MONTH_RULE);
 
         if (oldPostList.size() == 0 && newPostList.size() == 0) {
             return repelList;
         } else {
-            List<String> orgList = newPostList;//原来岗位 不相容的
-            orgList.add(orgList.size() - 1, primaryPost);
+            List<String> orgList = newPostList;//原来岗位+目标不相容岗位
+            orgList.add(primaryPost);
 
-            List<String> targetList = oldPostList;//目标岗位 不相容的
-            targetList.add(targetList.size() - 1, targetPost);
+            List<String> targetList = oldPostList;//目标岗位+原来不相容岗位
+            targetList.add(targetPost);
 
             //                拿到数据 不相容轮岗数据
             repelList = taRotationMapper.selectRepel(orgList, targetList, newDate);
@@ -64,3 +129,4 @@ public class Rule {
         }
     }
 }
+

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

@@ -9,7 +9,7 @@
         TA_INCOMPATIBLE i
         WHERE
         i.PRIMARY_POST=#{oldOrgName} AND i.TARGET_POST=#{newOrgName}
-        AND i.DELETED=0 AND i.Rule='regularRules'
+        AND i.DELETED=0 AND i.Rule=#{regularRule}
     </select>
 
     <select id="getMonthRulesPrimary" resultType="java.lang.String">
@@ -19,7 +19,7 @@
         and
         i.DELETED=0
         and
-        i.RULE='monthRules'
+        i.RULE=#{monthRule}
     </select>
 
 
@@ -30,6 +30,6 @@
         and
         i.DELETED=0
         and
-        i.RULE='monthRules'
+        i.RULE=#{monthRule}
     </select>
 </mapper>

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

@@ -7,6 +7,7 @@
         FROM TA_ROTATION r
         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
         <foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">

common/src/main/java/com/lyg/common/Constants.java

@@ -12,4 +12,11 @@ public class Constants {
     // 东海特殊规则
     public final static String SPECIAL_RULE_DH = "donghai";
 
+
+    //普通规则
+    public final static String REGULAR_RULE = "regularRule";
+
+    //三个月规则
+    public final static String MONTH_RULE = "monthRules";
+
 }

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

@@ -60,7 +60,6 @@ public class SysPositionController extends BaseController {
     public SaResult list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                          @ApiParam("岗位名字") @RequestParam(value ="name", required = false) String name,
-
                          @ApiParam("正序排列") @RequestParam(value ="sortAsc", required = false) String sortAsc,
                          @ApiParam("倒序排列") @RequestParam(value ="sortDesc", defaultValue = "create_date") String sortDesc) throws Exception {
         

system/src/main/java/com/lyg/system/mapper/SysOrgMapper.java

@@ -25,4 +25,5 @@ public interface SysOrgMapper extends BaseMapper<SysOrg> {
 
     long changeOrgCode(@Param("from") String from, @Param("to") String to);
 
+    String getOrgId(@Param("orgName") String orgName);
 }

system/src/main/java/com/lyg/system/mapper/SysPositionMapper.java

@@ -1,16 +1,19 @@
 package com.lyg.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lyg.system.entity.SysPosition;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.lyg.system.entity.SysPosition;
 
- /**
+/**
  * 岗位表;(sys_position)表数据库访问层
+ *
  * @author : http://njyunzhi.com
  * @date : 2024-3-6
  */
 @Mapper
-public interface SysPositionMapper  extends BaseMapper<SysPosition>{
-    
+public interface SysPositionMapper extends BaseMapper<SysPosition> {
+
+    String getPostId(@Param("postName") String postName);
+
 }

system/src/main/java/com/lyg/system/service/SysPositionService.java

@@ -3,12 +3,13 @@ package com.lyg.system.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.lyg.system.entity.SysPosition;
 import com.lyg.system.service.IBaseService;
+import org.apache.ibatis.annotations.Param;
 
- /**
+/**
  * 岗位表;(sys_position)表服务接口
  * @author : http://njyunzhi.com
  * @date : 2024-3-6
  */
 public interface SysPositionService extends IBaseService<SysPosition> {
-    
-}
+
+ }

system/src/main/resources/mapper/SysOrgMapper.xml

@@ -34,4 +34,12 @@
         FROM
         sys_org
     </select>
+    <select id="getOrgId" resultType="java.lang.String">
+        SELECT
+        o.name
+        FROM
+        SYS_ORG o
+        WHERE
+        o.ORG_ID = #{orgName}
+    </select>
 </mapper>

system/src/main/resources/mapper/SysPositionMapper.xml

@@ -2,5 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.lyg.system.mapper.SysPositionMapper">
-    
+
+    <select id="getPostId" resultType="java.lang.String">
+        SELECT
+        p.POSITION_ID
+        FROM
+        SYS_POSITION p
+        WHERE
+        p.name = #{postName}
+    </select>
 </mapper>