工资条导入调整

src/main/java/com/xjrsoft/common/utils/excel/CustomCellRangeAddress.java

@@ -7,6 +7,8 @@ import org.apache.poi.ss.util.CellRangeAddress;
  * @date 2024/1/8
  */
 public class CustomCellRangeAddress extends CellRangeAddress {
+
+    //字体是否加粗
     private boolean isBlod;
 
     public boolean getIsBlod() {

src/main/java/com/xjrsoft/module/personnel/controller/BasePersonnelLabourCapitalController.java

@@ -11,6 +11,7 @@ import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.personnel.dto.AddBasePersonnelLabourCapitalDto;
 import com.xjrsoft.module.personnel.dto.BasePersonnelLabourCapitalPageDto;
+import com.xjrsoft.module.personnel.dto.ImportBasePersonnelLabourCapitalDto;
 import com.xjrsoft.module.personnel.dto.UpdateBasePersonnelLabourCapitalDto;
 import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapital;
 import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapitalData;
@@ -107,7 +108,7 @@ public class BasePersonnelLabourCapitalController {
     }
     @PostMapping("/import")
     @ApiOperation(value = "导入")
-    public RT<Boolean> importData(@Valid @RequestBody AddBasePersonnelLabourCapitalDto dto, @RequestParam MultipartFile file) throws IOException {
+    public RT<Boolean> importData(@Valid ImportBasePersonnelLabourCapitalDto dto, @RequestParam("file") MultipartFile file) throws IOException {
         List<Map<Integer, Object>> excelDataList = EasyExcel.read(file.getInputStream()).sheet().headRowNumber(dto.getDataRow() - 1).doReadSync();
         //验证数据
 
@@ -132,7 +133,7 @@ public class BasePersonnelLabourCapitalController {
      * @param excelDataList 表格数据
      * @return 返回集合
      */
-    List<BasePersonnelLabourCapitalData> initDataList(AddBasePersonnelLabourCapitalDto dto, List<Map<Integer, Object>> excelDataList){
+    List<BasePersonnelLabourCapitalData> initDataList(ImportBasePersonnelLabourCapitalDto dto, List<Map<Integer, Object>> excelDataList){
         List<BasePersonnelLabourCapitalData> resultList = new ArrayList<>();
         for (int i = 0; i < excelDataList.size(); i ++){
             //跳过表头
@@ -185,7 +186,7 @@ public class BasePersonnelLabourCapitalController {
 
             title.setName(value.toString());
             title.setColumnNumber(column);
-            title.setRowNumber(4);
+            title.setRowsNumber(4);
             title.setMergeColumns(mergeColumns);
             title.setMergeRows(mergeRows);
             resultList.add(title);
@@ -204,7 +205,7 @@ public class BasePersonnelLabourCapitalController {
 
             title.setName(value.toString());
             title.setColumnNumber(column);
-            title.setRowNumber(4);
+            title.setRowsNumber(4);
             title.setMergeColumns(mergeColumns);
             title.setMergeRows(mergeRows);
             resultList.add(title);

src/main/java/com/xjrsoft/module/personnel/dto/AddBasePersonnelLabourCapitalDto.java

@@ -66,14 +66,4 @@ public class AddBasePersonnelLabourCapitalDto implements Serializable {
     @ApiModelProperty("数据文件")
     private String dataFile;
 
-    /**
-    * basePersonnelLabourCapitalData
-    */
-    @ApiModelProperty("basePersonnelLabourCapitalData子表")
-    private List<AddBasePersonnelLabourCapitalDataDto> basePersonnelLabourCapitalDataList;
-    /**
-    * basePersonnelLabourCapitalTitle
-    */
-    @ApiModelProperty("basePersonnelLabourCapitalTitle子表")
-    private List<AddBasePersonnelLabourCapitalTitleDto> basePersonnelLabourCapitalTitleList;
 }

src/main/java/com/xjrsoft/module/personnel/dto/AddBasePersonnelLabourCapitalTitleDto.java

@@ -32,7 +32,7 @@ public class AddBasePersonnelLabourCapitalTitleDto implements Serializable {
     * 所属行
     */
     @ApiModelProperty("所属行")
-    private Integer rowNumber;
+    private Integer rowsNumber;
     /**
     * 所属列
     */

src/main/java/com/xjrsoft/module/personnel/dto/ImportBasePersonnelLabourCapitalDto.java

@@ -0,0 +1,55 @@
+package com.xjrsoft.module.personnel.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+* @title: 工资发放
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+@Data
+public class ImportBasePersonnelLabourCapitalDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 数据开始行
+    */
+    @ApiModelProperty("数据开始行")
+    private Integer dataRow;
+    /**
+    * 证件类型所属列
+    */
+    @ApiModelProperty("证件类型所属列")
+    private Integer idTypeColumn;
+    /**
+    * 证件号码所属列
+    */
+    @ApiModelProperty("证件号码所属列")
+    private Integer idNumberColumn;
+    /**
+    * 工号所属列
+    */
+    @ApiModelProperty("工号所属列")
+    private Integer jobNumberColumn;
+    /**
+    * 名称所属列
+    */
+    @ApiModelProperty("名称所属列")
+    private Integer personnelNameColumn;
+    /**
+    * 合计所属列
+    */
+    @ApiModelProperty("合计所属列")
+    private Integer amountToColumn;
+
+}

src/main/java/com/xjrsoft/module/personnel/entity/BasePersonnelLabourCapitalTitle.java

@@ -83,7 +83,7 @@ public class BasePersonnelLabourCapitalTitle implements Serializable {
     * 所属行
     */
     @ApiModelProperty("所属行")
-    private Integer rowNumber;
+    private Integer rowsNumber;
     /**
     * 所属列
     */

src/main/java/com/xjrsoft/module/personnel/vo/BasePersonnelLabourCapitalTitleVo.java

@@ -31,7 +31,7 @@ public class BasePersonnelLabourCapitalTitleVo {
     * 所属行
     */
     @ApiModelProperty("所属行")
-    private Integer rowNumber;
+    private Integer rowsNumber;
     /**
     * 所属列
     */