F

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

@@ -4,23 +4,26 @@ 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.TaIncompatible;
+import com.lyg.application.service.TaIncompatibleService;
 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 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.TaIncompatible;
-import com.lyg.application.service.TaIncompatibleService;
 
- /**
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
+/**
  * 不相容;(ta_incompatible)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2024-3-6
  */
@@ -28,12 +31,13 @@ import com.lyg.application.service.TaIncompatibleService;
 @RestController
 @RequestMapping("/")
 public class TaIncompatibleController extends BaseController {
-    
+
     @Autowired
     private TaIncompatibleService taIncompatibleService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param id 主键
      * @return 实例对象
@@ -45,11 +49,11 @@ public class TaIncompatibleController extends BaseController {
     public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         return SaResult.data(taIncompatibleService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
@@ -57,21 +61,24 @@ public class TaIncompatibleController extends BaseController {
     @AccessLimit()
     @ApiOperation("分页查询")
     @GetMapping("/taIncompatible")
-    public SaResult list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                            @ApiParam("正序排列") @RequestParam(value ="sortAsc", required = false) String sortAsc,
-                         @ApiParam("倒序排列") @RequestParam(value ="sortDesc", defaultValue = "created_date") String sortDesc) throws Exception {
-        
+    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 = "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.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
         queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
         IPage<TaIncompatible> result = taIncompatibleService.page(pg, queryWrapper);
-        
+
         return SaResult.data(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param taIncompatible 实例对象
@@ -85,8 +92,8 @@ public class TaIncompatibleController extends BaseController {
         taIncompatibleService.save(taIncompatible);
         return SaResult.data(taIncompatible);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param taIncompatible 实例对象
@@ -97,13 +104,13 @@ public class TaIncompatibleController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/taIncompatible/{id}")
     public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody TaIncompatible taIncompatible,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+                         @ApiParam("对象ID") @PathVariable String id) throws Exception {
         taIncompatible.setIncompatibleId(id);
         taIncompatibleService.updateById(taIncompatible);
         return SaResult.data(taIncompatible);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param id 主键
@@ -113,8 +120,60 @@ public class TaIncompatibleController extends BaseController {
     @AccessLimit()
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taIncompatible/{id}")
-    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id){
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id) {
         taIncompatibleService.removeById(id);
         return SaResult.data("success");
     }
+
+
+    /**
+     * 分页查询
+     *
+     * @return 查询结果
+     */
+    @OpLog(module = "不相容规则查询", action = "")
+    @AccessLimit()
+    @ApiOperation("不相容规则查询")
+    @GetMapping("/taIncompatible/rule")
+    public SaResult listRule(
+            @ApiParam("当前时间") @RequestParam(value = "newTime", required = false) String newTime,
+            @ApiParam("原机构/网点") @RequestParam(value = "orgCode", required = false) String oldOrgCode,
+            @ApiParam("原岗位") @RequestParam(value = "primaryPost", required = false) String primaryPost,
+            @ApiParam("目标机构/网点") @RequestParam(value = "orgCode", required = false) String newOrgCode,
+            @ApiParam("目标岗位") @RequestParam(value = "targetPost", required = false) String targetPost) throws Exception {
+
+
+        Map<String, String> params = new Hashtable<>();
+        params.put("oldOrgCode", oldOrgCode);
+        params.put("newOrgCode", newOrgCode);
+        params.put("primaryPost", primaryPost);
+        params.put("targetPost", targetPost);
+        if (oldOrgCode != null && newOrgCode != null && primaryPost != null && targetPost != null && newTime != null) {
+
+            //普通规则
+            if (oldOrgCode.equals(newOrgCode)) {
+                List<TaIncompatible> taIncompatibleList = taIncompatibleService.getRegularRules(primaryPost, targetPost);
+
+                if (taIncompatibleList.size() == 0) {
+                   return SaResult.data("普通规则:根据不相容设置这两个岗位是相容的");
+                } else {
+                    return SaResult.data(taIncompatibleList);
+                }
+
+            } else {
+//三个月规则
+
+
+                taIncompatibleService.getMonthRules(params);
+
+
+            }
+        } else {
+            return SaResult.error("请输入岗位或机构号");
+        }
+
+        return null;
+    }
+
+
 }

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

@@ -4,20 +4,18 @@ 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.TaMandatoryLeave;
+import com.lyg.application.service.TaMandatoryLeaveService;
 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 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.TaMandatoryLeave;
-import com.lyg.application.service.TaMandatoryLeaveService;
 
  /**
  * 强制休假表;(ta_mandatory_leave)表控制层
@@ -59,11 +57,29 @@ public class TaMandatoryLeaveController extends BaseController {
     @GetMapping("/taMandatoryLeave")
     public SaResult list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                            @ApiParam("正序排列") @RequestParam(value ="sortAsc", required = false) String sortAsc,
-                         @ApiParam("倒序排列") @RequestParam(value ="sortDesc", defaultValue = "created_date") String sortDesc) throws Exception {
+                         @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 ="orgNum",required = false) String orgNum,
+                         @ApiParam("所在单位名称") @RequestParam(value ="orgName",required = false) String orgName,
+                         @ApiParam("对应机构层次") @RequestParam(value ="counterInstitutionsLevel",required = false) String counterInstitutionsLevel,
+                         @ApiParam("对应重要岗位") @RequestParam(value ="counterImpPost",required = false) String counterImpPost,
+                         @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<TaMandatoryLeave> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaMandatoryLeave> 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(orgNum),"org_num",orgNum);
+        queryWrapper.like(StringUtil.isNotEmpty(orgName),"org_name",orgName);
+        queryWrapper.like(StringUtil.isNotEmpty(counterInstitutionsLevel),"counter_institutions_level",counterInstitutionsLevel);
+        queryWrapper.like(StringUtil.isNotEmpty(counterImpPost),"counter_imp_post",counterImpPost);
+        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<TaMandatoryLeave> result = taMandatoryLeaveService.page(pg, queryWrapper);

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

@@ -59,11 +59,31 @@ public class TaRotationController extends BaseController {
     @GetMapping("/taRotation")
     public SaResult list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                            @ApiParam("正序排列") @RequestParam(value ="sortAsc", required = false) String sortAsc,
-                         @ApiParam("倒序排列") @RequestParam(value ="sortDesc", defaultValue = "created_date") String sortDesc) throws Exception {
+                         @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.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
         queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
         IPage<TaRotation> result = taRotationService.page(pg, queryWrapper);

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

@@ -1,134 +1,114 @@
-//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.dao.UploadDataListenerManage;
-//import com.lyg.application.dto.CustomerExcelDTO;
-//import com.lyg.application.dto.CustomerManageExcelDTO;
-//import com.lyg.application.service.CustomerBirthdayManageService;
-//import com.lyg.application.service.CustomerBirthdayService;
-//import com.lyg.framework.accesslimit.AccessLimit;
-//import com.lyg.framework.log.OpLog;
-//import com.lyg.system.controller.BaseController;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import io.swagger.annotations.ApiParam;
-//import lombok.SneakyThrows;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.transaction.annotation.Transactional;
-//import org.springframework.web.bind.annotation.*;
-//import org.springframework.web.multipart.MultipartFile;
-//
-//import javax.servlet.http.HttpServletResponse;
-//import java.io.File;
-//import java.io.IOException;
-//import java.io.InputStream;
-//import java.util.HashMap;
-//import java.util.Map;
-//
-//
-///**
-// * 客户生日维护经理表;(客户生日维护经理表)表控制层
-// *
-// * @author : http://njyunzhi.com
-// * @date : 2024-1-29
-// */
-//@Api(tags = "上传")
-//@RestController
-//@RequestMapping("/")
-//@ResponseBody
-//public class UploadController extends BaseController {
-//
-//
-//    @Autowired
-//    private CustomerBirthdayService customerBirthdayService;
-//    @Autowired
-//    private CustomerBirthdayManageService customerBirthdayManageService;
-////    @Autowired
-////    private CustomerBirthDAO customerBirthDAO;
-////
-////
-////    @Autowired
-////    private CustomerBirthManageDAO customerBirthManageDAO;
-//
-//
-//    @AccessLimit()
-//    @ApiOperation("上传文件")
-//    @PostMapping("/upload")
-//    public SaResult upload(@ApiParam("文件") @RequestParam("file") MultipartFile file) throws IOException {
-//        if (file.isEmpty()) {//检查文件是否为空
-//            throw new IllegalArgumentException("文件不能为空");
-//
-//        }
-//        try {
-//            InputStream inputStream = file.getInputStream();
-//            EasyExcel.read(inputStream, CustomerExcelDTO.class, new UploadDataListener(customerBirthdayService)).sheet(0).doReadSync();
-//            return SaResult.data("操作成功");
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            return SaResult.error("读取文件失败: " + e.getMessage());
-//        }
-//
-//
-//    }
-//
-//
-//    @AccessLimit()
-//    @ApiOperation("上传文件")
-//    @PostMapping("/uploadManage")
-//
-//    public SaResult uploadManage(@ApiParam("文件") @RequestParam("file") MultipartFile file) throws IOException {
-//        if (file.isEmpty()) {//检查文件是否为空
-//            new Exception("文件不能为空");
-//        }
-//        try {
-//            EasyExcel.read(file.getInputStream(), CustomerManageExcelDTO.class, new UploadDataListenerManage(customerBirthdayManageService)).sheet().doRead();
-//            return SaResult.data("操作成功");
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            return SaResult.error("读取文件失败: " + e.getMessage());
-//        }
-//
-//    }
-//
-//
-//    @OpLog(module = "CustomerBirthday", action = "客户生日表模板下载")
-//    @AccessLimit()
-//    @ApiOperation("CustomerBirthday")
-//    @GetMapping(value = "/downloadBirth")
-//    public SaResult downloadBirth(HttpServletResponse response) throws IOException {
-//        Map<String, Object> params = new HashMap<>();
-//        String fileName = "CustomerBirthday.xlsx";
-//
-//        File file = new File("application/src/main/resources/" + fileName);
-//
-//        params.put("fileName", fileName);
-//        params.put("file", file);
-//        return SaResult.data(params);
-//
-//
-//    }
-//
-//    @OpLog(module = "客户生日维护经理表", action = "客户生日维护经理表模板下载")
-//    @AccessLimit()
-//    @ApiOperation("客户生日维护经理表")
-//    @GetMapping(value = "/downloadBirManage")
-//    public SaResult downloadBirManage(HttpServletResponse response) {
-////        Map<String, Object> params = new HashMap<>();
-////
-////        String fileName = "/客户生日维护经理表.xlsx";
-////        File file = null;
-////        try {
-////            file = DownloadExcel.download(response, fileName);
-////
-////        } catch (Exception e) {
-////            e.printStackTrace();
-////        }
-////        params.put("fileName", fileName);
-////        params.put("file", file);
-//        return SaResult.data("");
-//    }
-//
-//
-//}
+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.entity.TaMandatoryLeave;
+import com.lyg.application.entity.TaRotation;
+import com.lyg.application.service.TaRotationService;
+import com.lyg.application.service.impl.TaMandatoryLeaveServiceImpl;
+import com.lyg.application.service.impl.TaRotationServiceImpl;
+import com.lyg.framework.accesslimit.AccessLimit;
+import com.lyg.system.controller.BaseController;
+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.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+
+/**
+ * 客户生日维护经理表;(客户生日维护经理表)表控制层
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2024-1-29
+ */
+@Api(tags = "上传")
+@RestController
+@RequestMapping("/")
+@ResponseBody
+public class UploadController extends BaseController {
+
+
+    @Autowired
+    private TaRotationService taRotationService;
+
+    @Autowired
+    private TaRotationServiceImpl taRotationServiceImpl;
+
+    @Autowired
+    private TaMandatoryLeaveServiceImpl taMandatoryLeaveServiceImpl;
+
+
+    @AccessLimit()
+    @ApiOperation("上传文件")
+    @PostMapping("/upload/taRotation")
+    public SaResult upload(@ApiParam("文件") @RequestParam("file") MultipartFile file) throws IOException {
+        if (file.isEmpty()) {//检查文件是否为空
+            throw new IllegalArgumentException("文件不能为空");
+
+        }
+        try {
+
+            InputStream inputStream = file.getInputStream();
+            UploadDataListener<TaRotation> uploadDataListener = new UploadDataListener<>(taRotationServiceImpl);
+            EasyExcel.read(inputStream, TaRotation.class, uploadDataListener).sheet().headRowNumber(4).doRead();
+
+            List<String> errorMessages = taRotationServiceImpl.getErrorMessages();
+            StringBuilder errorMessageBuilder = new StringBuilder();
+
+            for (String errorMessage : errorMessages) {
+                errorMessageBuilder.append(errorMessage).append("\n");
+            }
+
+            errorMessages.clear();
+            return SaResult.data("读取文件失败:" + errorMessageBuilder);
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return SaResult.error("读取文件失败: " + e.getMessage());
+        }
+
+    }
+
+
+    @AccessLimit()
+    @ApiOperation("上传文件")
+    @PostMapping("/upload/taMandatoryLeave")
+    public SaResult uploadLeave(@ApiParam("文件") @RequestParam("file") MultipartFile file) throws IOException {
+        if (file.isEmpty()) {//检查文件是否为空
+            throw new IllegalArgumentException("文件不能为空");
+
+        }
+        try {
+
+            InputStream inputStream = file.getInputStream();
+            UploadDataListener<TaMandatoryLeave> uploadDataListener = new UploadDataListener<>(taMandatoryLeaveServiceImpl);
+            EasyExcel.read(inputStream, TaMandatoryLeave.class, uploadDataListener).sheet().headRowNumber(4).doRead();
+
+            List<String> errorMessages = taMandatoryLeaveServiceImpl.getErrorMessages();
+            StringBuilder errorMessageBuilder = new StringBuilder();
+
+            for (String errorMessage : errorMessages) {
+                errorMessageBuilder.append(errorMessage).append("\n");
+            }
+
+            errorMessages.clear();
+            return SaResult.data("读取文件失败:" + errorMessageBuilder);
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return SaResult.error("读取文件失败: " + e.getMessage());
+        }
+
+    }
+
+
+}

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

@@ -0,0 +1,10 @@
+package com.lyg.application.dao;
+
+import com.lyg.application.entity.TaRotation;
+
+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/dao/UploadDataListener.java

@@ -1,87 +1,65 @@
-//package com.lyg.application.dao;
-//
-//import com.alibaba.excel.context.AnalysisContext;
-//import com.alibaba.excel.read.listener.ReadListener;
-//import com.lyg.application.dto.CustomerExcelDTO;
-//import com.lyg.application.service.CustomerBirthdayService;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.transaction.annotation.Transactional;
-//import org.springframework.transaction.interceptor.TransactionAspectSupport;
-//
-//import java.time.LocalDate;
-//import java.time.format.DateTimeFormatter;
-//import java.time.format.DateTimeParseException;
-//import java.time.temporal.ChronoField;
-//import java.util.ArrayList;
-//import java.util.List;
-//
-//@Slf4j
-//public class UploadDataListener implements ReadListener<CustomerExcelDTO> {
-//
-//
-//    private static final int BATCH_COUNT = 10;
-//    private final List<CustomerExcelDTO> dataList = new ArrayList<>();
-//
-//
-//    private final CustomerBirthdayService customerBirthdayService;
-//
-//
-//    public UploadDataListener(CustomerBirthdayService customerBirthdayService) {
-//        this.customerBirthdayService = customerBirthdayService;
+package com.lyg.application.dao;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.read.listener.ReadListener;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+public class UploadDataListener<T> implements ReadListener<T> {
+
+
+    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;
+
+    public UploadDataListener(EntityHandler<T> entityHandler) {
+        this.entityHandler = entityHandler;
+    }
+
+    @SneakyThrows
+    @Override
+    public void invoke(T 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);
+        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;
 //    }
-//
-//    @Override
-//    public void invoke(CustomerExcelDTO data, AnalysisContext context) {
-//        log.info("解析到一条数据:{}", data);
-//        if (data == null) {
-//            throw new RuntimeException("excel读取失败");
-//        }
-//        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-//        String dateString = data.getBirth();
-////        try {
-//            LocalDate date = LocalDate.parse(dateString, formatter);
-//            // 检查日期是否有效
-//            int month = date.get(ChronoField.MONTH_OF_YEAR);
-//            int day = date.get(ChronoField.DAY_OF_MONTH);
-//            if (month < 1 || month > 12 || day < 1 || day > date.lengthOfMonth()) {
-////            log.error("日期错误: {}", dateString);
-//                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-//                throw new RuntimeException("日期错误");
-//            }
-//
-//            if (data.getIdNum() == null||data.getName() == null||data.getCustId() == null||data.getBirth() == null) {
-//                throw new RuntimeException("请输入完整信息!");
-//            }
-////            if () {
-////                throw new RuntimeException("请输入姓名!");
-////            }
-////            if () {
-////                throw new RuntimeException("请输入客户号!");
-////            }
-////
-////            if (data.getBirth() == null) {
-////                throw new RuntimeException("请输入出生日期!");
-////            }
-//            dataList.add(data);
-//            saveData();
-////        } catch (DateTimeParseException e) {
-////            // 日期格式错误，抛出异常
-////            throw new RuntimeException("解析错误");
-////        }
+
+//    public List<T> getDataList() {
+//        return dataList;
 //    }
-//
-//    @Override
-////    @Transactional(rollbackFor = Exception.class)
-//    public void doAfterAllAnalysed(AnalysisContext context) {
-//        saveData();
-//        log.info("所有数据解析完成！");
-//    }
-//
-//    //    @Transactional(rollbackFor = Exception.class)
-//    public void saveData() {
-//        if (!dataList.isEmpty()) {
-//            customerBirthdayService.saveBatch(dataList);
-//            dataList.clear();
-//        }
-//    }
-//}
+
+    public void saveData() {
+        log.info("正在读取 {} 条数据", dataList.size());
+//        log.info("错误信息列表: {}", errorMessages);
+        if (!dataList.isEmpty()) { // 只有当数据列表不为空且没有错误信息时才保存数据
+            entityHandler.saveEntityBatch(dataList);
+            dataList.clear();
+        }
+    }
+}

application/src/main/java/com/lyg/application/dao/UploadDataListenerManage.java

@@ -1,62 +0,0 @@
-//package com.lyg.application.dao;
-//
-//import com.alibaba.excel.context.AnalysisContext;
-//import com.alibaba.excel.read.listener.ReadListener;
-//import com.lyg.application.dto.CustomerManageExcelDTO;
-//import com.lyg.application.service.CustomerBirthdayManageService;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.transaction.annotation.Transactional;
-//import org.springframework.transaction.interceptor.TransactionAspectSupport;
-//
-//import java.time.format.DateTimeParseException;
-//import java.util.ArrayList;
-//import java.util.List;
-//
-//@Slf4j
-//public class UploadDataListenerManage implements ReadListener<CustomerManageExcelDTO> {
-//
-//    private static final int BATCH_COUNT = 10;
-//    private final List<CustomerManageExcelDTO> dataList = new ArrayList<>();
-//
-//    //
-//    private final CustomerBirthdayManageService customerBirthdayManageService;
-//
-//    public UploadDataListenerManage(CustomerBirthdayManageService customerBirthdayManageService) {
-//        this.customerBirthdayManageService = customerBirthdayManageService;
-//    }
-//
-//    @Override
-//    public void invoke(CustomerManageExcelDTO data, AnalysisContext context) {
-////
-//        log.info("解析到一条数据:{}", data);
-//        if (data == null) {
-//            throw new RuntimeException("excel读取失败");
-//        }
-//
-//            if (data.getPhoneNo() == null||data.getName() == null) {
-//                throw new RuntimeException("请输入完整信息!");
-//            }
-//
-//            dataList.add(data);
-////            saveData();
-////        } catch (DateTimeParseException e) {
-////            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-////            throw new RuntimeException("数据异常");
-////        }
-//
-//    }
-//
-//
-//    @Override
-//    public void doAfterAllAnalysed(AnalysisContext context) {
-//        saveData();
-//        log.info("所有数据解析完成！");
-//    }
-//
-//    public void saveData() {
-//        if (!dataList.isEmpty()) {
-//            customerBirthdayManageService.saveBatchManage(dataList);
-//            dataList.clear();
-//        }
-//    }
-//}

application/src/main/java/com/lyg/application/dto/CustomerExcelDTO.java

@@ -1,32 +0,0 @@
-//package com.lyg.application.dto;
-//
-//
-//import com.alibaba.excel.annotation.ExcelProperty;
-//import io.swagger.annotations.ApiModelProperty;
-//import lombok.Data;
-//import org.springframework.stereotype.Repository;
-//
-//@Data
-//@Repository
-//
-//public class CustomerExcelDTO  {
-//
-//    @ApiModelProperty(name = "客户号", notes = "")
-////    @TableId(value = "cust_id", type = IdType.ASSIGN_UUID)
-//    private String custId;
-//    @ExcelProperty(value = "姓名", index = 1)
-//    private String name;
-//
-//    @ExcelProperty(value = "身份证号", index = 2)
-//    private String idNum;
-//
-//    @ExcelProperty(value = "归属机构号", index = 3)
-//    private String brNo;
-//
-//    @ExcelProperty(value = "生日", index = 4)
-//    private String birth;
-//
-//    @ExcelProperty(value = "客户标志位辅助匹配客户经理", index = 5)
-//    private Integer custClass;
-//
-//}

application/src/main/java/com/lyg/application/dto/CustomerManageExcelDTO.java

@@ -1,35 +0,0 @@
-//package com.lyg.application.dto;
-//
-//
-//import com.alibaba.excel.annotation.ExcelProperty;
-//import io.swagger.annotations.ApiModelProperty;
-//import lombok.Data;
-//import org.springframework.stereotype.Repository;
-//
-//import javax.validation.constraints.NotBlank;
-//
-//@Data
-//@Repository
-//public class CustomerManageExcelDTO {
-//
-//
-//    @ExcelProperty(value = "归属机构", index = 0)
-//    @ApiModelProperty(name = "归属机构", notes = "")
-//    private String brNo;
-//
-//
-//    @ExcelProperty(value = "员工姓名", index = 1)
-//    @NotBlank(message = "员工姓名")
-//    @ApiModelProperty(name = "员工姓名", notes = "")
-//    private String name;
-//
-//    @ExcelProperty(value = "员工手机号", index = 2)
-//    @ApiModelProperty(name = "员工手机号", notes = "")
-//    private Integer phoneNo;
-//
-//    @ExcelProperty(value = "客户标志位辅助匹配客户经理", index = 3)
-//    @ApiModelProperty(name = "客户标志位辅助匹配客户经理", notes = "")
-//    private Integer custClass;
-//
-//
-//}

application/src/main/java/com/lyg/application/entity/TaIncompatible.java

@@ -32,7 +32,7 @@ public class TaIncompatible implements Serializable,Cloneable{
     @ApiModelProperty(name = "目标岗位",notes = "")
     private String targetPost ;
 
-    @ApiModelProperty(name = "规则",notes = "")
+    @ApiModelProperty(name = "规则 普通规则 regularRules,三个月规则 monthRules",notes = "")
     private String rule ;
 
     @ApiModelProperty(name = "状态",notes = "")

application/src/main/java/com/lyg/application/entity/TaMandatoryLeave.java

@@ -1,9 +1,13 @@
 package com.lyg.application.entity;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.lyg.common.util.excel.LocalDateConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.*;
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,7 +21,7 @@ import javax.validation.constraints.NotBlank;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
+@Accessors(chain = false)
 @ApiModel(value = "强制休假表",description = "")
 @TableName("ta_mandatory_leave")
 public class TaMandatoryLeave implements Serializable,Cloneable{
@@ -25,57 +29,76 @@ public class TaMandatoryLeave implements Serializable,Cloneable{
     @ApiModelProperty(name = "轮岗Id",notes = "")
     @TableId(value = "leave_id", type = IdType.ASSIGN_UUID)
     private String leaveId ;
-    
-    @ApiModelProperty(name = "总行部门/一级分行",notes = "")
+
+     @ExcelProperty(index = 1)
+     @ApiModelProperty(name = "总行部门/一级分行",notes = "")
     private String headOfficeOrg ;
-    
-    @ApiModelProperty(name = "员工工号",notes = "")
+
+     @ExcelProperty(index = 2)
+     @ApiModelProperty(name = "员工工号",notes = "")
     private String employeeNum ;
-    
-    @NotBlank(message = "员工姓名不能为空")
+
+     @ExcelProperty(index = 3)
+     @NotBlank(message = "员工姓名不能为空")
     @ApiModelProperty(name = "员工姓名",notes = "")
     private String employeeName ;
-    
-    @ApiModelProperty(name = "所在单位机构号",notes = "")
+
+     @ExcelProperty(index = 4)
+     @ApiModelProperty(name = "所在单位机构号",notes = "")
     private String orgNum ;
-    
-    @NotBlank(message = "所在单位名称不能为空")
+
+     @ExcelProperty(index = 5)
+     @NotBlank(message = "所在单位名称不能为空")
     @ApiModelProperty(name = "所在单位名称",notes = "")
     private String orgName ;
-    
-    @ApiModelProperty(name = "对应机构层次",notes = "")
+
+     @ExcelProperty(index = 6)
+     @ApiModelProperty(name = "对应机构层次",notes = "")
     private String counterInstitutionsLevel ;
-    
-    @ApiModelProperty(name = "当前职位",notes = "")
+
+     @ExcelProperty(index = 7)
+     @ApiModelProperty(name = "当前职位",notes = "")
     private String currentPosition ;
-    
-    @ApiModelProperty(name = "对应重要岗位",notes = "")
+
+     @ExcelProperty(index = 8)
+     @ApiModelProperty(name = "对应重要岗位",notes = "")
     private String counterImpPost ;
-    
-    @ApiModelProperty(name = "对应总行条线",notes = "")
+
+     @ExcelProperty(index = 9)
+     @ApiModelProperty(name = "对应总行条线",notes = "")
     private String counterHeadOfficeLine ;
-    
-    @ApiModelProperty(name = "休假起始时间 格式：年/月/日",notes = "")
-    private LocalDateTime startTimeVacation ;
-    
-    @ApiModelProperty(name = "休假截止时间 格式：年/月/日",notes = "")
-    private LocalDateTime vacationDeadline ;
-    
-    @ApiModelProperty(name = "已强制休假天数（工作日）",notes = "")
+
+     @ExcelProperty(index = 10, converter = LocalDateConverter.class)
+//     @DateTimeFormat("yyyy/MM/dd")
+     @ApiModelProperty(name = "休假起始时间 格式：年/月/日",notes = "")
+    private LocalDate startTimeVacation ;
+
+     @ExcelProperty(index = 11, converter = LocalDateConverter.class)
+//     @DateTimeFormat("yyyy/MM/dd")
+     @ApiModelProperty(name = "休假截止时间 格式：年/月/日",notes = "")
+    private LocalDate vacationDeadline ;
+
+     @ExcelProperty(index = 12)
+     @ApiModelProperty(name = "已强制休假天数（工作日）",notes = "")
     private Integer mandatoryVacationDay ;
-    
-    @ApiModelProperty(name = "开展离岗检查/代职检查情况",notes = "")
+
+     @ExcelProperty(index = 13)
+     @ApiModelProperty(name = "开展离岗检查/代职检查情况",notes = "")
     private String depSbtDepartureCheck ;
-    
+
+     @ExcelProperty(index = 14)
     @ApiModelProperty(name = "备注",notes = "")
     private String remark ;
-    
-    @ApiModelProperty(name = "立查立改(是/否）",notes = "")
+
+     @ExcelProperty(index = 15)
+     @ApiModelProperty(name = "立查立改(是/否）",notes = "")
     private String checkChange ;
-    
-    @ApiModelProperty(name = "自查自纠 (是/否）",notes = "")
+
+     @ExcelProperty(index = 16)
+     @ApiModelProperty(name = "自查自纠 (是/否）",notes = "")
     private String checkCorrect ;
-    
+
+    @ExcelProperty(index = 0)
     @ApiModelProperty(name = "序号",notes = "")
     private String sort ;
     

application/src/main/java/com/lyg/application/entity/TaRotation.java

@@ -1,133 +1,172 @@
 package com.lyg.application.entity;
 
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.*;
+import com.lyg.common.util.excel.LocalDateConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.*;
-import java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 
- /**
+/**
  * 轮岗列表;
+ *
  * @author : http://www.chiner.pro
  * @date : 2024-3-6
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "轮岗列表",description = "")
+@Accessors(chain = false)
+@ApiModel(value = "轮岗列表", description = "")
 @TableName("ta_rotation")
-public class TaRotation implements Serializable,Cloneable{
-    
-    @ApiModelProperty(name = "轮岗Id",notes = "")
+public class TaRotation implements Serializable, Cloneable {
+
+    @ApiModelProperty(name = "轮岗Id", notes = "")
     @TableId(value = "rotation_id", type = IdType.ASSIGN_UUID)
-    private String rotationId ;
-    
-    @ApiModelProperty(name = "总行部门/一级分行",notes = "")
-    private String headOfficeOrg ;
-    
-    @ApiModelProperty(name = "员工工号",notes = "")
-    private String employeeNum ;
-    
+    private String rotationId;
+
+    @ExcelProperty(index = 0)
+    @ApiModelProperty(name = "序号", notes = "")
+    private String sort;
+
+    @ExcelProperty(index = 1)
+    @NotBlank(message = "总行部门不能为空")
+    @ApiModelProperty(name = "总行部门/一级分行", notes = "")
+    private String headOfficeOrg;
+
+    @ExcelProperty(index = 2)
+    @NotBlank(message = "员工工号不能为空")
+    @ApiModelProperty(name = "员工工号", notes = "")
+    private String employeeNum;
+
+    @ExcelProperty(index = 3)
     @NotBlank(message = "员工姓名不能为空")
-    @ApiModelProperty(name = "员工姓名",notes = "")
-    private String employeeName ;
-    
-    @ApiModelProperty(name = "具体单位机构号",notes = "")
-    private String specificOrgNum ;
-    
+    @ApiModelProperty(name = "员工姓名", notes = "")
+    private String employeeName;
+
+    @ExcelProperty(index = 4)
+    @NotBlank(message = "单位机构号不能为空")
+    @ApiModelProperty(name = "具体单位机构号", notes = "")
+    private String specificOrgNum;
+
+    @ExcelProperty(index = 5)
     @NotBlank(message = "所在单位具体名称不能为空")
-    @ApiModelProperty(name = "所在单位具体名称",notes = "")
-    private String specificOrgName ;
-    
-    @ApiModelProperty(name = "对应机构层次",notes = "")
-    private String counterInstitutionsLevel ;
-    
-    @ApiModelProperty(name = "当前职位",notes = "")
-    private String currentPosition ;
-    
-    @ApiModelProperty(name = "对应重要岗位",notes = "")
-    private String counterImpPositions ;
-    
-    @ApiModelProperty(name = "对应总行条线",notes = "")
-    private String counterHeadOfficeLine ;
-    
-    @ApiModelProperty(name = "从事相应重要岗位时间 格式：年/月/日",notes = "")
-    private LocalDateTime durationOfEmployment ;
-    
-    @ApiModelProperty(name = "轮岗周期要求（年）",notes = "")
-    private Integer rotationCycle ;
-    
-    @ApiModelProperty(name = "轮岗截止日期",notes = "")
-    private LocalDateTime rotationDeadline ;
-    
-    @ApiModelProperty(name = "对应轮岗方式",notes = "")
-    private String counterRotationMethod ;
-    
-    @ApiModelProperty(name = "轮岗后单位机构号",notes = "")
-    private String orgNumJobRotation ;
-    
-    @NotBlank(message = "轮岗后单位具体名称不能为空")
-    @ApiModelProperty(name = "轮岗后单位具体名称",notes = "")
-    private String specificNameOrgRotation ;
-    
-    @ApiModelProperty(name = "轮岗后职位",notes = "")
-    private String jobRotationPost ;
-    
-    @ApiModelProperty(name = "轮岗后对应重要岗位",notes = "")
-    private String counterImpPostRotation ;
-    
-    @ApiModelProperty(name = "轮岗后对应总行条线",notes = "")
-    private String counterOfficeLineRotation ;
-    
-    @ApiModelProperty(name = "轮岗执行时间 格式：年/月/",notes = "")
-    private LocalDateTime rotationExeTime ;
-    
-    @ApiModelProperty(name = "备注",notes = "")
-    private String remark ;
-    
-    @ApiModelProperty(name = "立查立改(是/否）",notes = "")
-    private String checkChange ;
-    
-    @ApiModelProperty(name = "是否问责",notes = "")
-    private String accountability ;
-    
-    @ApiModelProperty(name = "事实确认书编号",notes = "")
-    private String factConfirmationNum ;
-    
-    @ApiModelProperty(name = "自查自纠 (是/否）",notes = "")
-    private String checkCorrect ;
-    
-    @ApiModelProperty(name = "计划轮岗日期",notes = "")
-    private LocalDateTime planRotationDate ;
-    
-    @ApiModelProperty(name = "序号",notes = "")
-    private String sort ;
-    
-    @ApiModelProperty(name = "状态",notes = "")
-    private Integer status ;
-    
-    @ApiModelProperty(name = "创建人",notes = "")
+    @ApiModelProperty(name = "所在单位具体名称", notes = "")
+    private String specificOrgName;
+
+    @ExcelProperty(index = 6)
+    @ApiModelProperty(name = "对应机构层次", notes = "")
+    private String counterInstitutionsLevel;
+
+    @ExcelProperty(index = 7)
+    @ApiModelProperty(name = "当前职位", notes = "")
+    private String currentPosition;
+
+    @ExcelProperty(index = 8)
+    @ApiModelProperty(name = "对应重要岗位", notes = "")
+    private String counterImpPositions;
+
+    @ExcelProperty(index = 9)
+    @ApiModelProperty(name = "对应总行条线", notes = "")
+    private String counterHeadOfficeLine;
+
+    //    @DateTimeFormat("yyyy/MM/dd")
+    @ExcelProperty(index = 10, converter = LocalDateConverter.class)
+    @ApiModelProperty(name = "从事相应重要岗位时间 格式：年/月/日", notes = "")
+    private LocalDate durationOfEmployment;
+
+    @ExcelProperty(index = 11)
+    @ApiModelProperty(name = "轮岗周期要求（年）", notes = "")
+    private Integer rotationCycle;
+
+    //    @DateTimeFormat("yyyy/MM/dd")
+    @ExcelProperty(index = 12, converter = LocalDateConverter.class)
+    @ApiModelProperty(name = "轮岗截止日期", notes = "")
+    private LocalDate rotationDeadline;
+
+    @ExcelProperty(index = 13)
+    @ApiModelProperty(name = "对应轮岗方式", notes = "")
+    private String counterRotationMethod;
+
+    @ExcelProperty(index = 14)
+    @ApiModelProperty(name = "轮岗后单位机构号", notes = "")
+    private String orgNumJobRotation;
+
+    @ExcelProperty(index = 15)
+//    @NotBlank(message = "轮岗后单位具体名称不能为空")
+    @ApiModelProperty(name = "轮岗后单位具体名称", notes = "")
+    private String specificNameOrgRotation;
+
+    @ExcelProperty(index = 16)
+    @ApiModelProperty(name = "轮岗后职位", notes = "")
+    private String jobRotationPost;
+
+    @ExcelProperty(index = 17)
+    @ApiModelProperty(name = "轮岗后对应重要岗位", notes = "")
+    private String counterImpPostRotation;
+
+    @ExcelProperty(index = 18)
+    @ApiModelProperty(name = "轮岗后对应总行条线", notes = "")
+    private String counterOfficeLineRotation;
+
+    //    @DateTimeFormat("yyyy/MM/dd")
+    @ExcelProperty(index = 19, converter = LocalDateConverter.class)
+    @ApiModelProperty(name = "轮岗执行时间 格式：年/月/日", notes = "")
+    private LocalDate rotationExeTime;
+
+    @ExcelProperty(index = 20)
+    @ApiModelProperty(name = "备注", notes = "")
+    private String remark;
+
+    @ExcelProperty(index = 21)
+    @ApiModelProperty(name = "立查立改(是/否）", notes = "")
+    private String checkChange;
+
+    @ExcelProperty(index = 22)
+    @ApiModelProperty(name = "是否问责", notes = "")
+    private String accountability;
+
+    @ExcelProperty(index = 23)
+    @ApiModelProperty(name = "事实确认书编号", notes = "")
+    private String factConfirmationNum;
+
+    @ExcelProperty(index = 24)
+    @ApiModelProperty(name = "自查自纠(是/否）", notes = "")
+    private String checkCorrect;
+
+    //    @DateTimeFormat("yyyy/MM/dd")
+    @ExcelProperty(index = 25, converter = LocalDateConverter.class)
+    @ApiModelProperty(name = "计划轮岗日期", notes = "")
+    private LocalDate planRotationDate;
+
+
+    @ApiModelProperty(name = "状态", notes = "")
+    private Integer status;
+
+    @ApiModelProperty(name = "创建人", notes = "")
     @TableField(fill = FieldFill.INSERT)
-    private String createUser ;
-    
-    @ApiModelProperty(name = "创建时间",notes = "")
+    private String createUser;
+
+    @ApiModelProperty(name = "创建时间", notes = "")
     @TableField(fill = FieldFill.INSERT)
-    private LocalDateTime createDate ;
-    
-    @ApiModelProperty(name = "更新人",notes = "")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(name = "更新人", notes = "")
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateUser ;
-    
-    @ApiModelProperty(name = "更新时间",notes = "")
+    private String updateUser;
+
+    @ApiModelProperty(name = "更新时间", notes = "")
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    private LocalDateTime updateDate ;
-    
-    @ApiModelProperty(name = "删除标志",notes = "1删除")
+    private LocalDateTime updateDate;
+
+    @ApiModelProperty(name = "删除标志", notes = "1删除")
     @TableField(fill = FieldFill.INSERT)
-    private Integer deleted ;
+    private Integer deleted;
 
 }

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

@@ -5,12 +5,19 @@ 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>{
-    
+
+     List<TaIncompatible> getRegularRules(@Param("oldOrgName") String oldOrgName, @Param("newOrgName") String newOrgName);
+
+    List<String> getMonthRulesPrimary(@Param("primaryPost") String primaryPost);
+
+    List<String> getMonthRulesTarget(@Param("targetPost") String targetPost);
 }

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

@@ -4,11 +4,18 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.lyg.application.entity.TaIncompatible;
 import com.lyg.system.service.IBaseService;
 
- /**
+import java.util.List;
+import java.util.Map;
+
+/**
  * 不相容;(ta_incompatible)表服务接口
  * @author : http://njyunzhi.com
  * @date : 2024-3-6
  */
 public interface TaIncompatibleService extends IBaseService<TaIncompatible> {
-    
+
+
+    List<TaIncompatible> getRegularRules(String primaryPost, String targetPost);
+
+    void getMonthRules(Map<String, String> params);
 }

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

@@ -1,14 +1,21 @@
 package com.lyg.application.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.lyg.application.entity.TaRotation;
 import com.lyg.system.service.IBaseService;
+import org.apache.poi.ss.formula.functions.T;
 
- /**
+import java.util.List;
+
+/**
  * 轮岗列表;(ta_rotation)表服务接口
+ *
  * @author : http://njyunzhi.com
  * @date : 2024-3-6
  */
 public interface TaRotationService extends IBaseService<TaRotation> {
-    
+
+//
+//    void handleEntity(List<T> entityList) throws Exception;
+//
+//    void saveEntityBatch(List<T> entityList);
 }

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

@@ -1,18 +1,49 @@
 package com.lyg.application.service.impl;
 
-import com.lyg.system.service.impl.BaseServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.lyg.application.entity.TaIncompatible;
 import com.lyg.application.mapper.TaIncompatibleMapper;
 import com.lyg.application.service.TaIncompatibleService;
+import com.lyg.application.util.IncompatibleRule;
+import com.lyg.system.service.impl.BaseServiceImpl;
+import lombok.SneakyThrows;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
- /**
+/**
  * 不相容;(ta_incompatible)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2024-3-6
  */
 @Service
 public class TaIncompatibleServiceImpl extends BaseServiceImpl<TaIncompatibleMapper, TaIncompatible> implements TaIncompatibleService {
-    
+    @Autowired
+    private IncompatibleRule incompatibleRule;
+
+//    @Override
+//    public List<TaIncompatible> selectRule(String oldOrgName, String newOrgName) {
+//        return baseMapper.selectRule(oldOrgName, newOrgName);
+//    }
+
+
+    @SneakyThrows
+    @Override
+    public List<TaIncompatible> getRegularRules(String oldOrgName, String newOrgName) {
+        return baseMapper.getRegularRules(oldOrgName, newOrgName);
+
+    }
+
+    @Override
+    public void getMonthRules(Map<String, String> params) {
+        String primaryPost=params.get("primaryPost");
+        String targetPost=params.get("targetPost");
+        List<String> oldPostList = baseMapper.getMonthRulesPrimary(primaryPost);//原来岗位+不容岗位
+        List<String> newPostList = baseMapper.getMonthRulesTarget(targetPost);//目标岗位+不容岗位
+
+
+    }
 }

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

@@ -1,18 +1,82 @@
 package com.lyg.application.service.impl;
 
-import com.lyg.system.service.impl.BaseServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+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.service.SysOrgService;
+import com.lyg.system.service.SysPositionService;
+import com.lyg.system.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
 
- /**
+/**
  * 强制休假表;(ta_mandatory_leave)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2024-3-6
  */
 @Service
-public class TaMandatoryLeaveServiceImpl extends BaseServiceImpl<TaMandatoryLeaveMapper, TaMandatoryLeave> implements TaMandatoryLeaveService {
-    
+public class TaMandatoryLeaveServiceImpl extends BaseServiceImpl<TaMandatoryLeaveMapper, TaMandatoryLeave> implements TaMandatoryLeaveService, EntityHandler<TaMandatoryLeave> {
+    private final List<String> errorMessages = new ArrayList<>();
+    @Autowired
+    private SysOrgService sysOrgService;
+    @Autowired
+    private SysPositionService sysPositionService;
+
+    @Override
+    public TaMandatoryLeave handleEntity(TaMandatoryLeave entity, Integer index) throws Exception {
+//校验验证
+        System.out.println("******************************entity**************************************");
+        System.out.println(entity);
+
+        String orgCode = entity.getOrgNum();//单位机构号
+        String orgName = entity.getOrgName().replaceAll("\n", "");//单位机构名
+        String counterImpPost = entity.getCounterImpPost().replaceAll("\n", "");//岗位名
+        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);
+        }
+
+        count = sysOrgService.countBy("name", orgName, true);
+        if (count == 0 || orgName.isEmpty()) {
+            errorMessages.add("第 " + index + " 行处理发生错误: " + "没有此机构名字 " + orgName);
+        }
+
+        count = sysPositionService.countBy("name", counterImpPost, true);
+        if (count == 0) {
+            errorMessages.add("第 " + index + " 行处理发生错误: " + "没有此岗位 " + counterImpPost);
+        }
+
+        if (durationOfEmployment == null) {
+            errorMessages.add("第 " + index + " 行时间错误:休假起始时间为 " + durationOfEmployment);
+        }
+        if (vacationDeadline == null) {
+            errorMessages.add("第 " + index + " 行时间错误:休假截止时间为 " + vacationDeadline);
+        }
+
+        return entity;
+    }
+
+    @Override
+    public void saveEntityBatch(List<TaMandatoryLeave> entityList) {
+        // 实现逻辑：保存批量实体
+        System.out.println("******************************entityList**************************************");
+        System.out.println(entityList);
+        for (TaMandatoryLeave taMandatoryLeave : entityList) {
+            baseMapper.insert(taMandatoryLeave);
+        }
+    }
+
+    public List<String> getErrorMessages() {
+        return errorMessages;
+
+    }
 }

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

@@ -1,18 +1,95 @@
 package com.lyg.application.service.impl;
 
-import com.lyg.system.service.impl.BaseServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+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.system.service.SysOrgService;
+import com.lyg.system.service.SysPositionService;
+import com.lyg.system.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
- /**
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
  * 轮岗列表;(ta_rotation)表服务实现类
+ *
  * @author : http://www.chiner.pro
  * @date : 2024-3-6
  */
 @Service
-public class TaRotationServiceImpl extends BaseServiceImpl<TaRotationMapper, TaRotation> implements TaRotationService {
-    
-}
+
+public class TaRotationServiceImpl extends BaseServiceImpl<TaRotationMapper, TaRotation> implements TaRotationService, EntityHandler<TaRotation> {
+
+    private final List<String> errorMessages = new ArrayList<>();
+    @Autowired
+    private SysOrgService sysOrgService;
+    @Autowired
+    private SysPositionService sysPositionService;
+
+    @Override
+    public TaRotation handleEntity(TaRotation entity, Integer index) throws Exception {
+//校验验证
+        System.out.println("******************************entity**************************************");
+        System.out.println(entity);
+
+        String orgCode = entity.getSpecificOrgNum();//单位机构号
+        String orgName = entity.getSpecificOrgName().replaceAll("\n", "");//单位机构名
+        String rotationName = entity.getCounterImpPositions().replaceAll("\n", "");//岗位名
+        LocalDate durationOfEmployment = entity.getDurationOfEmployment();
+        LocalDate rotationExeTime = entity.getRotationExeTime();
+        LocalDate rotationDeadline = entity.getRotationDeadline();
+        LocalDate planRotationDate = entity.getPlanRotationDate();
+
+        Long count = sysOrgService.countBy("org_id", orgCode, true);
+        if (count == 0||orgCode.isEmpty()) {
+            errorMessages.add("第 " + index + " 行处理发生错误: " + "没有此机构号 " + orgCode);
+        }
+
+        count = sysOrgService.countBy("name", orgName, true);
+        if (count == 0||orgName.isEmpty()) {
+            errorMessages.add("第 " + index + " 行处理发生错误: " + "没有此机构名字 " + orgName);
+        }
+
+        count = sysPositionService.countBy("name", rotationName, true);
+        if (count == 0||rotationName.isEmpty()) {
+            errorMessages.add("第 " + index + " 行处理发生错误: " + "没有此岗位 " + rotationName);
+        }
+
+        if (durationOfEmployment == null) {
+            errorMessages.add("第 " + index + " 行时间错误:从事相应重要岗位时间为 " + durationOfEmployment);
+        }
+        if (rotationExeTime == null) {
+            errorMessages.add("第 " + index + " 行时间错误:轮岗截止日期为 " + rotationExeTime);
+        }
+        if (rotationDeadline == null) {
+            errorMessages.add("第 " + index + " 行时间错误:轮岗执行时间 " + rotationDeadline);
+        }
+        if (planRotationDate == null) {
+            errorMessages.add("第 " + index + " 行时间错误:计划轮岗日期 " + planRotationDate);
+        }
+        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;
+
+    }
+}
+

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

@@ -0,0 +1,33 @@
+package com.lyg.application.util;
+
+
+import com.lyg.application.entity.TaIncompatible;
+import com.lyg.application.service.TaIncompatibleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class IncompatibleRule {
+
+
+    /**
+     * 三个月规则 不同网点下轮岗 (注意录入规则)
+     *
+     * @throws Exception
+     */
+    public void timeRule(String newOrgCOde, String oldOrgCOde, String oldOrgName, String newOrgName) throws Exception {
+        // 时间(三 个月)  网点号   岗位名
+    }
+
+//    /**
+//     * 普通规则  同网点下轮岗 (注意录入规则)
+//     *
+//     * @throws Exception
+//     */
+//    public List<TaIncompatible>  ordinaryRule(String oldOrgName, String newOrgName) throws Exception {
+//
+////        return
+//    }
+}

application/src/main/resources/application.yml

@@ -12,6 +12,9 @@ logging:
 
 
 spring:
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
   datasource:
     url: jdbc:oracle:thin:@192.168.89.10:1521:orcl
     username: job_waring

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

@@ -2,5 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.lyg.application.mapper.TaIncompatibleMapper">
-    
+    <select id="getRegularRules" resultType="com.lyg.application.entity.TaIncompatible">
+        SELECT
+        *
+        FROM
+        TA_INCOMPATIBLE i
+        WHERE
+        i.PRIMARY_POST=#{oldOrgName} AND i.TARGET_POST=#{newOrgName}
+        AND i.DELETED=0 AND i.Rule='regularRules'
+    </select>
+
+    <select id="getMonthRulesPrimary" resultType="java.lang.String">
+        SELECT * FROM TA_INCOMPATIBLE i
+        WHERE
+        i.PRIMARY_POST=#{primaryPost}
+        and
+        i.DELETED=0
+        and
+        i.RULE='monthRules'
+    </select>
+
+
+    <select id="getMonthRulesTarget" resultType="java.lang.String"></select>
 </mapper>

common/src/main/java/com/lyg/common/util/excel/DownloadExcel.java

@@ -1,36 +0,0 @@
-//package com.lyg.common.util.excel;
-//
-//
-//import com.alibaba.excel.EasyExcel;
-//import org.springframework.core.io.ClassPathResource;
-//import org.springframework.util.ResourceUtils;
-//
-//import javax.servlet.http.HttpServletResponse;
-//import java.io.*;
-//import java.net.URLEncoder;
-//
-//public class DownloadExcel {
-//
-//    public static File download(HttpServletResponse response, String fileName) throws Exception {
-//
-//        try {
-//
-//////            ClassPathResource classPathResource = new ClassPathResource(fileName);
-////            File file = ResourceUtils.getFile("classpath:"+fileName);
-////
-////            return file;
-//
-//            response.setContentType("application/vnd.ms-excel");
-//            response.setCharacterEncoding("utf-8");
-//            // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
-////            String fileName = URLEncoder.encode("测试", "UTF-8");
-//            response.setHeader("Content-disposition", "attachment;filename=" + fileName );
-//            EasyExcel.write(response.getOutputStream(), DownloadData.class).sheet("模板").doWrite(data());
-//        } catch (Exception e) {
-//            throw new Exception("下载模版失败！！！" + e.getMessage());
-//        }
-//
-//    }
-//
-//
-//}

common/src/main/java/com/lyg/common/util/excel/LocalDateConverter.java

@@ -0,0 +1,76 @@
+package com.lyg.common.util.excel;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import org.apache.poi.ss.usermodel.DateUtil;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+
+@Component
+public class LocalDateConverter implements Converter<LocalDate> {
+    @Override
+    public Class supportJavaTypeKey() {
+        return LocalDate.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+        @Override
+    public LocalDate convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if(null==cellData) {
+            return null;
+        }
+        LocalDate result=null;
+        if(cellData.getType()==CellDataTypeEnum.NUMBER) {
+            if (contentProperty == null || contentProperty.getDateTimeFormatProperty() == null) {
+                Date date= DateUtil.getJavaDate(cellData.getNumberValue().doubleValue(),
+                        globalConfiguration.getUse1904windowing(), null);
+                result =date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+            } else {
+                Date date=  DateUtil.getJavaDate(cellData.getNumberValue().doubleValue(),
+                        contentProperty.getDateTimeFormatProperty().getUse1904windowing(), null);
+                result =date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+            }
+        }
+        if(cellData.getType()==CellDataTypeEnum.STRING) {
+            String value=cellData.getStringValue();
+            if(value.contains("-")) {
+                try {
+                    result= LocalDate.parse(cellData.getStringValue());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            else if(value.contains("/")) {
+                try {
+                    result = LocalDate.parse(value, DateTimeFormatter.ofPattern("yyyy/MM/dd"));
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return result;
+    }
+
+
+
+    @Override
+    public WriteCellData<?> convertToExcelData(LocalDate value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        if (null == value) return null;
+        return new WriteCellData<>(value.format(DateTimeFormatter.ofPattern("yyyy/MM/dd")));
+    }
+
+}

common/src/main/java/com/lyg/common/util/excel/LocalDateTimeConverter.java

@@ -36,4 +36,7 @@ public class LocalDateTimeConverter implements Converter<LocalDateTime> {
 
         return new WriteCellData(val);
     }
+
+
+
 }

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

@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lyg.common.Constants;
 import com.lyg.common.util.StringUtil;
+import com.lyg.framework.log.OpLog;
 import com.lyg.system.entity.SysOrg;
 import com.lyg.system.entity.SysUser;
-import com.lyg.framework.log.OpLog;
 import com.lyg.system.service.SysOrgService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -59,7 +59,7 @@ public class SysOrgController extends BaseController {
 
         IPage<SysOrg> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(!StringUtil.isEmpty(name),"name", name);
+        queryWrapper.like(!StringUtil.isEmpty(name), "name", name);
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("sort_no");
         IPage<SysOrg> result = sysOrgService.page(pg, queryWrapper);
@@ -89,6 +89,11 @@ public class SysOrgController extends BaseController {
         if (count > 0) {
             return SaResult.error("机构名称重复");
         }
+        count = sysOrgService.countBy("org_id", sysOrg.getOrgCode(), true);
+        if (count > 0) {
+            return SaResult.error("机构号重复");
+        }
+
 
         SysUser user = currentUser();
 

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

@@ -4,21 +4,25 @@ 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.common.util.StringUtil;
-import com.lyg.system.entity.SysPosition;
 import com.lyg.framework.log.OpLog;
-import com.lyg.system.service.SysPositionService;
+import com.lyg.system.controller.BaseController;
+import com.lyg.framework.accesslimit.AccessLimit;
 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.system.entity.SysPosition;
+import com.lyg.system.service.SysPositionService;
 
-/**
+ /**
  * 岗位表;(sys_position)表控制层
  * @author : http://njyunzhi.com
- * @date : 2023-1-27
+ * @date : 2024-3-6
  */
 @Api(tags = "岗位表对象功能接口")
 @RestController
@@ -26,8 +30,7 @@ import org.springframework.web.bind.annotation.*;
 public class SysPositionController extends BaseController {
     
     @Autowired
-    public SysPositionService sysPositionService;
-
+    private SysPositionService sysPositionService;
     
     /** 
      * 通过ID查询单条数据 
@@ -35,7 +38,8 @@ public class SysPositionController extends BaseController {
      * @param id 主键
      * @return 实例对象
      */
-    @OpLog(module = "岗位管理", action = "查询详情")
+    @OpLog(module = "岗位表", action = "查询单条数据", desc = "ID：{{#id}}")
+    @AccessLimit()
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("/sysPosition/{id}")
     public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
@@ -49,20 +53,22 @@ public class SysPositionController extends BaseController {
      * @param pageSize 每页条数
      * @return 查询结果
      */
-    @OpLog(module = "岗位管理", action = "查询列表")
+    @OpLog(module = "岗位表", action = "分页列表查询")
+    @AccessLimit()
     @ApiOperation("分页查询")
     @GetMapping("/sysPosition")
     public SaResult list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                         @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                         @ApiParam("机构") @RequestParam(value ="orgId", required = false) String orgId,
-                         @ApiParam("名称") @RequestParam(value ="name", required = false) String name) throws Exception {
+                            @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 {
+        
         IPage<SysPosition> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<SysPosition> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(!StringUtil.isEmpty(orgId), "org_id", orgId);
-        queryWrapper.like(!StringUtil.isEmpty(name), "name", name);
-        queryWrapper.gt("status", Constants.STATUS_DELETE);
-        queryWrapper.orderByDesc("create_date");
+        queryWrapper.like(StringUtil.isNotEmpty(name),"name",name);
+        queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
+        queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
         IPage<SysPosition> result = sysPositionService.page(pg, queryWrapper);
         
         return SaResult.data(result);
@@ -74,16 +80,13 @@ public class SysPositionController extends BaseController {
      * @param sysPosition 实例对象
      * @return 实例对象
      */
-    @OpLog(module = "岗位管理", action = "新增数据")
+    @OpLog(module = "岗位表", action = "新增数据")
+    @AccessLimit()
     @ApiOperation("新增数据")
     @PostMapping("/sysPosition")
-    public SaResult add(@ApiParam("对象实体") @RequestBody SysPosition sysPosition) throws Exception {
-        if (StringUtil.isEmpty(sysPosition.getOrgId())) {
-            return SaResult.error("未设置所属部门");
-        }
-
+    public SaResult add(@ApiParam("对象实体") @Validated @RequestBody SysPosition sysPosition) throws Exception {
         sysPositionService.save(sysPosition);
-        return SaResult.data(sysPositionService.getById(sysPosition.getPositionId()));
+        return SaResult.data(sysPosition);
     }
     
     /** 
@@ -92,15 +95,12 @@ public class SysPositionController extends BaseController {
      * @param sysPosition 实例对象
      * @return 实例对象
      */
-    @OpLog(module = "岗位管理", action = "更新数据")
+    @OpLog(module = "岗位表", action = "更新数据")
+    @AccessLimit()
     @ApiOperation("更新数据")
     @PutMapping("/sysPosition/{id}")
-    public SaResult edit(@ApiParam("对象实体") @RequestBody SysPosition sysPosition,
+    public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody SysPosition sysPosition,
                             @ApiParam("对象ID") @PathVariable String id ) throws Exception {
-        if (StringUtil.isEmpty(sysPosition.getOrgId())) {
-            return SaResult.error("未设置所属部门");
-        }
-
         sysPosition.setPositionId(id);
         sysPositionService.updateById(sysPosition);
         return SaResult.data(sysPosition);
@@ -112,11 +112,12 @@ public class SysPositionController extends BaseController {
      * @param id 主键
      * @return 是否成功
      */
-    @OpLog(module = "岗位管理", action = "删除数据")
+    @OpLog(module = "岗位表", action = "删除数据", desc = "ID：{{#id}}")
+    @AccessLimit()
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/sysPosition/{id}")
     public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id){
-        sysPositionService.removeLogicById(id);
-        return SaResult.ok("success");
+        sysPositionService.removeById(id);
+        return SaResult.data("success");
     }
 }

system/src/main/java/com/lyg/system/entity/SysPosition.java

@@ -1,54 +1,49 @@
 package com.lyg.system.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
+import javax.validation.constraints.NotBlank;
 
 /**
  * 岗位表;
- *
  * @author : http://www.chiner.pro
- * @date : 2023-1-27
+ * @date : 2024-3-6
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value = "岗位表", description = "")
+@ApiModel(value = "岗位表",description = "")
 @TableName("sys_position")
-public class SysPosition implements Serializable, Cloneable {
-    /**
-     * 岗位ID
-     */
-    @ApiModelProperty(name = "岗位ID", notes = "")
+public class SysPosition implements Serializable,Cloneable{
+
+    @ApiModelProperty(name = "岗位ID",notes = "")
     @TableId(value = "position_id", type = IdType.ASSIGN_UUID)
-    private String positionId;
-    /**
-     * 岗位名称
-     */
-    @ApiModelProperty(name = "岗位名称", notes = "")
-    private String name;
-    /**
-     * 所属单位
-     */
-    @ApiModelProperty(name = "所属单位", notes = "")
-    private String orgId;
-    /**
-     * 排序
-     */
-    @ApiModelProperty(name = "排序", notes = "")
-    private Integer sortNum;
-    /**
-     * 状态
-     */
-    @ApiModelProperty(name = "状态", notes = "")
-    private Integer status;
+    private String positionId ;
+
+    @ApiModelProperty(name = "岗位编码",notes = "")
+    private String positionCode ;
+
+    @NotBlank(message = "岗位名称不能为空")
+    @ApiModelProperty(name = "岗位名称",notes = "")
+    private String name ;
+
+    @ApiModelProperty(name = "标准码",notes = "")
+    private String standCode ;
+
+    @ApiModelProperty(name = "所属机构",notes = "")
+    private String orgId ;
+
+    @ApiModelProperty(name = "排序",notes = "")
+    private Integer sortNum ;
 
+    @ApiModelProperty(name = "状态",notes = "")
+    private Integer status ;
 
     @ApiModelProperty(name = "创建人",notes = "")
     @TableField(fill = FieldFill.INSERT)

system/src/main/java/com/lyg/system/entity/SysUser.java

@@ -23,6 +23,12 @@ import java.util.List;
 @ApiModel(value = "用户表", description = "")
 @TableName("sys_user")
 public class SysUser implements Serializable, Cloneable {
+    @ApiModelProperty(name = "角色列表", notes = "")
+    @TableField(exist = false)
+    List<SysRole> rolesList;
+    @ApiModelProperty(name = "菜单列表", notes = "")
+    @TableField(exist = false)
+    List<SysMenu> menuList;
     /**
      * 用户ID
      */
@@ -44,6 +50,11 @@ public class SysUser implements Serializable, Cloneable {
      */
     @ApiModelProperty(name = "手机", notes = "")
     private String phone;
+    /**
+     * 是否管理员 0否,1是
+     */
+    @ApiModelProperty(name = "是否管理员 0否,1是", notes = "")
+    private Integer isAdmin;
     /**
      * 行信ID
      */
@@ -64,33 +75,19 @@ public class SysUser implements Serializable, Cloneable {
      */
     @ApiModelProperty(name = "状态", notes = "")
     private Integer status;
-
-
-    @ApiModelProperty(name = "创建人",notes = "")
+    @ApiModelProperty(name = "创建人", notes = "")
     @TableField(fill = FieldFill.INSERT)
-    private String createUser ;
-
-    @ApiModelProperty(name = "创建时间",notes = "")
+    private String createUser;
+    @ApiModelProperty(name = "创建时间", notes = "")
     @TableField(fill = FieldFill.INSERT)
-    private LocalDateTime createDate ;
-
-    @ApiModelProperty(name = "更新人",notes = "")
+    private LocalDateTime createDate;
+    @ApiModelProperty(name = "更新人", notes = "")
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateUser ;
-
-    @ApiModelProperty(name = "更新时间",notes = "")
+    private String updateUser;
+    @ApiModelProperty(name = "更新时间", notes = "")
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    private LocalDateTime updateDate ;
-
-    @ApiModelProperty(name = "删除标志",notes = "1删除")
+    private LocalDateTime updateDate;
+    @ApiModelProperty(name = "删除标志", notes = "1删除")
     @TableField(fill = FieldFill.INSERT)
-    private Integer deleted ;
-
-    @ApiModelProperty(name = "角色列表", notes = "")
-    @TableField(exist = false)
-    List<SysRole> rolesList;
-
-    @ApiModelProperty(name = "菜单列表", notes = "")
-    @TableField(exist = false)
-    List<SysMenu> menuList;
+    private Integer deleted;
 }

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

@@ -16,9 +16,13 @@ import java.util.List;
 @Mapper
 public interface SysOrgMapper extends BaseMapper<SysOrg> {
 
+
+    List<SysOrg> getSelectList();
+
     List<SysOrg> getListByUser(@Param("userId") String userId);
 
     String getMaxCode(@Param("parentId") String parentId);
 
     long changeOrgCode(@Param("from") String from, @Param("to") String to);
+
 }

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

@@ -1,15 +1,16 @@
 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 : 2023-1-27
+ * @date : 2024-3-6
  */
 @Mapper
-public interface SysPositionMapper  extends BaseMapper<SysPosition> {
-
+public interface SysPositionMapper  extends BaseMapper<SysPosition>{
+    
 }

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

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

system/src/main/java/com/lyg/system/service/impl/SysOrgServiceImpl.java

@@ -30,9 +30,10 @@ public class SysOrgServiceImpl extends BaseServiceImpl<SysOrgMapper, SysOrg> imp
 
     @Override
     public void createNew(SysOrg sysOrg, SysUser user) {
-        long maxCode = getMaxCode(sysOrg.getParentId());
-        sysOrg.setOrgCode(String.valueOf(maxCode + 1));
-        sysOrg.setOrgId(null);
+//        long maxCode = getMaxCode(sysOrg.getParentId());
+//        sysOrg.setOrgCode(String.valueOf(maxCode + 1));
+        sysOrg.setOrgCode(sysOrg.getOrgCode());
+        sysOrg.setOrgId(sysOrg.getOrgCode());
         sysOrg.setStatus(Constants.STATUS_NORMAL);
 //        sysOrg.setCreateUser(user.getUserId());
 //        sysOrg.setCreateDate(LocalDateTime.now());

system/src/main/java/com/lyg/system/service/impl/SysPositionServiceImpl.java

@@ -1,17 +1,18 @@
 package com.lyg.system.service.impl;
 
+import com.lyg.system.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import com.lyg.system.entity.SysPosition;
 import com.lyg.system.mapper.SysPositionMapper;
 import com.lyg.system.service.SysPositionService;
-import org.springframework.stereotype.Service;
 
-/**
+ /**
  * 岗位表;(sys_position)表服务实现类
- *
  * @author : http://www.chiner.pro
- * @date : 2023-1-27
+ * @date : 2024-3-6
  */
 @Service
 public class SysPositionServiceImpl extends BaseServiceImpl<SysPositionMapper, SysPosition> implements SysPositionService {
-
+    
 }

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

@@ -28,4 +28,10 @@
             t.parent_id = #{parentId}
           AND t.status > - 1
     </select>
+    <select id="getSelectList" resultType="com.lyg.system.entity.SysOrg">
+        SELECT
+        *
+        FROM
+        sys_org
+    </select>
 </mapper>

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

@@ -2,5 +2,5 @@
 <!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">
-
+    
 </mapper>