提交工资条管理

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

@@ -0,0 +1,213 @@
+package com.xjrsoft.module.personnel.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.personnel.dto.AddBasePersonnelLabourCapitalDto;
+import com.xjrsoft.module.personnel.dto.BasePersonnelLabourCapitalListDto;
+import com.xjrsoft.module.personnel.dto.UpdateBasePersonnelLabourCapitalDto;
+import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapital;
+import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapitalData;
+import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapitalTitle;
+import com.xjrsoft.module.personnel.service.IBasePersonnelLabourCapitalService;
+import com.xjrsoft.module.personnel.vo.BasePersonnelLabourCapitalListVo;
+import com.xjrsoft.module.personnel.vo.BasePersonnelLabourCapitalVo;
+import com.yomahub.liteflow.util.JsonUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+* @title: 工资发放
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/personnel" + "/basepersonnellabourcapital")
+@Api(value = "/personnel"  + "/basepersonnellabourcapital",tags = "工资发放代码")
+@AllArgsConstructor
+public class BasePersonnelLabourCapitalController {
+
+
+    private final IBasePersonnelLabourCapitalService basePersonnelLabourCapitalService;
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value="工资发放列表(不分页)")
+    @SaCheckPermission("basepersonnellabourcapital:detail")
+    public RT<List<BasePersonnelLabourCapitalListVo>> list(@Valid BasePersonnelLabourCapitalListDto dto){
+
+        LambdaQueryWrapper<BasePersonnelLabourCapital> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(BasePersonnelLabourCapital::getId)
+                    .select(BasePersonnelLabourCapital.class,x -> VoToColumnUtil.fieldsToColumns(BasePersonnelLabourCapitalListVo.class).contains(x.getProperty()));
+
+        List<BasePersonnelLabourCapital> list = basePersonnelLabourCapitalService.list(queryWrapper);
+        List<BasePersonnelLabourCapitalListVo> listVos = BeanUtil.copyToList(list, BasePersonnelLabourCapitalListVo.class);
+        return RT.ok(listVos);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询工资发放信息")
+    @SaCheckPermission("basepersonnellabourcapital:detail")
+    public RT<BasePersonnelLabourCapitalVo> info(@RequestParam Long id){
+        BasePersonnelLabourCapital basePersonnelLabourCapital = basePersonnelLabourCapitalService.getByIdDeep(id);
+        if (basePersonnelLabourCapital == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(basePersonnelLabourCapital, BasePersonnelLabourCapitalVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增工资发放")
+    @SaCheckPermission("basepersonnellabourcapital:add")
+    public RT<Boolean> add(@Valid @RequestBody AddBasePersonnelLabourCapitalDto dto){
+        BasePersonnelLabourCapital basePersonnelLabourCapital = BeanUtil.toBean(dto, BasePersonnelLabourCapital.class);
+        boolean isSuccess = basePersonnelLabourCapitalService.add(basePersonnelLabourCapital);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改工资发放")
+    @SaCheckPermission("basepersonnellabourcapital:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateBasePersonnelLabourCapitalDto dto){
+
+        BasePersonnelLabourCapital basePersonnelLabourCapital = BeanUtil.toBean(dto, BasePersonnelLabourCapital.class);
+        return RT.ok(basePersonnelLabourCapitalService.update(basePersonnelLabourCapital));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除工资发放")
+    @SaCheckPermission("basepersonnellabourcapital:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(basePersonnelLabourCapitalService.delete(ids));
+
+    }
+    @PostMapping("/import")
+    @ApiOperation(value = "导入")
+    public RT<Boolean> importData(@Valid @RequestBody AddBasePersonnelLabourCapitalDto dto, @RequestParam MultipartFile file) throws IOException {
+        List<Map<Integer, Object>> excelDataList = EasyExcel.read(file.getInputStream()).sheet().headRowNumber(dto.getDataRow() - 1).doReadSync();
+        //验证数据
+
+
+        //处理表头数据，目前只支持2行表头
+        List<BasePersonnelLabourCapitalTitle> titleList = initTitleList(excelDataList.get(0), excelDataList.get(1));
+        //读取表内容数据
+        List<BasePersonnelLabourCapitalData> dataList = initDataList(dto, excelDataList);
+
+        //构造数据
+        BasePersonnelLabourCapital basePersonnelLabourCapital = BeanUtil.toBean(dto, BasePersonnelLabourCapital.class);
+        //添加表头数据
+        basePersonnelLabourCapital.setBasePersonnelLabourCapitalTitleList(titleList);
+        basePersonnelLabourCapital.setBasePersonnelLabourCapitalDataList(dataList);
+
+        Boolean result = basePersonnelLabourCapitalService.add(basePersonnelLabourCapital);
+        return RT.ok(result);
+    }
+
+    /**
+     * 处理教师工资数据
+     * @param excelDataList 表格数据
+     * @return 返回集合
+     */
+    List<BasePersonnelLabourCapitalData> initDataList(AddBasePersonnelLabourCapitalDto dto, List<Map<Integer, Object>> excelDataList){
+        List<BasePersonnelLabourCapitalData> resultList = new ArrayList<>();
+        for (int i = 0; i < excelDataList.size(); i ++){
+            //跳过表头
+            if(i < 2){
+                continue;
+            }
+            Map<Integer, Object> datatMap = excelDataList.get(i);
+            BasePersonnelLabourCapitalData data = new BasePersonnelLabourCapitalData();
+            data.setName(datatMap.get(dto.getPersonnelNameColumn()) == null?null:datatMap.get(dto.getPersonnelNameColumn()).toString());
+            data.setIdNumber(datatMap.get(dto.getIdNumberColumn()) == null?null:datatMap.get(dto.getIdNumberColumn()).toString());
+            data.setIdType(datatMap.get(dto.getIdTypeColumn()) == null?null:datatMap.get(dto.getIdTypeColumn()).toString());
+            data.setAmountTo(datatMap.get(dto.getAmountToColumn()) == null?null:datatMap.get(dto.getAmountToColumn()).toString());
+            data.setJobNumber(datatMap.get(dto.getJobNumberColumn()) == null?null:datatMap.get(dto.getJobNumberColumn()).toString());
+            data.setExtendJson(JsonUtil.toJsonString(datatMap));
+            resultList.add(data);
+        }
+
+        return resultList;
+    }
+
+    /**
+     * 处理表头数据
+     * @param titleRow1 第一行数据
+     * @param titleRow2 第二行数据
+     * @return 返回集合
+     */
+    List<BasePersonnelLabourCapitalTitle> initTitleList(Map<Integer, Object> titleRow1, Map<Integer, Object> titleRow2){
+        List<BasePersonnelLabourCapitalTitle> resultList = new ArrayList<>();
+        //识别第一行
+        int mergeColumns = 0, mergeRows = 0;
+        for (Integer column : titleRow1.keySet()) {
+            BasePersonnelLabourCapitalTitle title = new BasePersonnelLabourCapitalTitle();
+            Object value = titleRow1.get(column);
+            if(value == null){
+                mergeColumns = 0;
+                continue;
+            }
+            for (int i = column + 1; i < titleRow1.size(); i ++){
+                Object mergeValue = titleRow1.get(i);
+                if(mergeValue != null){
+                    break;
+                }
+                mergeColumns ++;
+            }
+
+            Object value2 = titleRow2.get(column);
+            if(value2 == null){
+                mergeRows = 2;
+            }
+
+            title.setName(value.toString());
+            title.setColumnNumber(column);
+            title.setRowNumber(4);
+            title.setMergeColumns(mergeColumns);
+            title.setMergeRows(mergeRows);
+            resultList.add(title);
+
+            mergeColumns = 0;
+            mergeRows = 0;
+        }
+
+        //识别第二行
+        for (Integer column : titleRow2.keySet()) {
+            BasePersonnelLabourCapitalTitle title = new BasePersonnelLabourCapitalTitle();
+            Object value = titleRow2.get(column);
+            if(value == null){
+                continue;
+            }
+
+            title.setName(value.toString());
+            title.setColumnNumber(column);
+            title.setRowNumber(4);
+            title.setMergeColumns(mergeColumns);
+            title.setMergeRows(mergeRows);
+            resultList.add(title);
+        }
+
+        return resultList;
+    }
+}

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

@@ -0,0 +1,63 @@
+package com.xjrsoft.module.personnel.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 工资条数据
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+@Data
+public class AddBasePersonnelLabourCapitalDataDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 工资发放id
+    */
+    @ApiModelProperty("工资发放id")
+    private Long labourCapitalId;
+    /**
+    * 证件类型
+    */
+    @ApiModelProperty("证件类型")
+    private String idType;
+    /**
+    * 证件号码
+    */
+    @ApiModelProperty("证件号码")
+    private String idNumber;
+    /**
+    * 工号
+    */
+    @ApiModelProperty("工号")
+    private String jobNumber;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 合计
+    */
+    @ApiModelProperty("合计")
+    private String amountTo;
+    /**
+    * 扩展信息
+    */
+    @ApiModelProperty("扩展信息")
+    private String extendJson;
+
+}

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

@@ -0,0 +1,85 @@
+package com.xjrsoft.module.personnel.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapitalData;
+import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapitalTitle;
+
+
+
+/**
+* @title: 工资发放
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+@Data
+public class AddBasePersonnelLabourCapitalDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 工资发放名称
+    */
+    @ApiModelProperty("工资发放名称")
+    private String name;
+    /**
+    * 发放年月
+    */
+    @ApiModelProperty("发放年月")
+    private Date dateOfIssue;
+    /**
+    * 数据开始行
+    */
+    @ApiModelProperty("数据开始行")
+    private Integer dataRow;
+    /**
+    * 证件类型所属列
+    */
+    @ApiModelProperty("证件类型所属列")
+    private Integer idTypeColumn;
+    /**
+    * 证件号码所属列
+    */
+    @ApiModelProperty("证件号码所属列")
+    private Integer idNumberColumn;
+    /**
+    * 工号所属列
+    */
+    @ApiModelProperty("工号所属列")
+    private Integer jobNumberColumn;
+    /**
+    * 名称所属列
+    */
+    @ApiModelProperty("名称所属列")
+    private Integer personnelNameColumn;
+    /**
+    * 合计所属列
+    */
+    @ApiModelProperty("合计所属列")
+    private Integer amountToColumn;
+    /**
+    * 数据文件
+    */
+    @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

@@ -0,0 +1,58 @@
+package com.xjrsoft.module.personnel.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 工资发放表头
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+@Data
+public class AddBasePersonnelLabourCapitalTitleDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 工资发放id
+    */
+    @ApiModelProperty("工资发放id")
+    private Long labourCapitalId;
+    /**
+    * 表头名称
+    */
+    @ApiModelProperty("表头名称")
+    private String name;
+    /**
+    * 所属行
+    */
+    @ApiModelProperty("所属行")
+    private Integer rowNumber;
+    /**
+    * 所属列
+    */
+    @ApiModelProperty("所属列")
+    private Integer columnNumber;
+    /**
+    * 合并行数
+    */
+    @ApiModelProperty("合并行数")
+    private Integer mergeRows;
+    /**
+    * 合并列数
+    */
+    @ApiModelProperty("合并列数")
+    private Integer mergeColumns;
+
+}

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

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.personnel.dto;
+
+import com.xjrsoft.common.page.ListInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 工资发放列表查询入参
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BasePersonnelLabourCapitalListDto extends ListInput {
+
+
+}

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

@@ -0,0 +1,34 @@
+package com.xjrsoft.module.personnel.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapitalData;
+import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapitalTitle;
+
+
+
+/**
+* @title: 工资发放
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+@Data
+public class UpdateBasePersonnelLabourCapitalDto extends AddBasePersonnelLabourCapitalDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

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

@@ -0,0 +1,137 @@
+package com.xjrsoft.module.personnel.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 工资发放
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+@Data
+@TableName("base_personnel_labour_capital")
+@ApiModel(value = "工资发放对象", description = "工资发放")
+public class BasePersonnelLabourCapital implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 工资发放名称
+    */
+    @ApiModelProperty("工资发放名称")
+    private String name;
+    /**
+    * 发放年月
+    */
+    @ApiModelProperty("发放年月")
+    private Date dateOfIssue;
+    /**
+    * 数据开始行
+    */
+    @ApiModelProperty("数据开始行")
+    private Integer dataRow;
+    /**
+    * 证件类型所属列
+    */
+    @ApiModelProperty("证件类型所属列")
+    private Integer idTypeColumn;
+    /**
+    * 证件号码所属列
+    */
+    @ApiModelProperty("证件号码所属列")
+    private Integer idNumberColumn;
+    /**
+    * 工号所属列
+    */
+    @ApiModelProperty("工号所属列")
+    private Integer jobNumberColumn;
+    /**
+    * 名称所属列
+    */
+    @ApiModelProperty("名称所属列")
+    private Integer personnelNameColumn;
+    /**
+    * 合计所属列
+    */
+    @ApiModelProperty("合计所属列")
+    private Integer amountToColumn;
+    /**
+    * 数据文件
+    */
+    @ApiModelProperty("数据文件")
+    private String dataFile;
+
+    /**
+    * basePersonnelLabourCapitalData
+    */
+    @ApiModelProperty("basePersonnelLabourCapitalData子表")
+    @TableField(exist = false)
+    @EntityMapping(thisField = "id", joinField = "labourCapitalId")
+    private List<BasePersonnelLabourCapitalData> basePersonnelLabourCapitalDataList;
+    /**
+    * basePersonnelLabourCapitalTitle
+    */
+    @ApiModelProperty("basePersonnelLabourCapitalTitle子表")
+    @TableField(exist = false)
+    @EntityMapping(thisField = "id", joinField = "labourCapitalId")
+    private List<BasePersonnelLabourCapitalTitle> basePersonnelLabourCapitalTitleList;
+
+}

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

@@ -0,0 +1,113 @@
+package com.xjrsoft.module.personnel.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 工资条数据
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+@Data
+@TableName("base_personnel_labour_capital_data")
+@ApiModel(value = "工资条数据对象", description = "工资条数据")
+public class BasePersonnelLabourCapitalData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 工资发放id
+    */
+    @ApiModelProperty("工资发放id")
+    private Long labourCapitalId;
+    /**
+    * 证件类型
+    */
+    @ApiModelProperty("证件类型")
+    private String idType;
+    /**
+    * 证件号码
+    */
+    @ApiModelProperty("证件号码")
+    private String idNumber;
+    /**
+    * 工号
+    */
+    @ApiModelProperty("工号")
+    private String jobNumber;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 合计
+    */
+    @ApiModelProperty("合计")
+    private String amountTo;
+    /**
+    * 扩展信息
+    */
+    @ApiModelProperty("扩展信息")
+    private String extendJson;
+
+
+}

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

@@ -0,0 +1,108 @@
+package com.xjrsoft.module.personnel.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 工资发放表头
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+@Data
+@TableName("base_personnel_labour_capital_title")
+@ApiModel(value = "工资发放表头对象", description = "工资发放表头")
+public class BasePersonnelLabourCapitalTitle implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 工资发放id
+    */
+    @ApiModelProperty("工资发放id")
+    private Long labourCapitalId;
+    /**
+    * 表头名称
+    */
+    @ApiModelProperty("表头名称")
+    private String name;
+    /**
+    * 所属行
+    */
+    @ApiModelProperty("所属行")
+    private Integer rowNumber;
+    /**
+    * 所属列
+    */
+    @ApiModelProperty("所属列")
+    private Integer columnNumber;
+    /**
+    * 合并行数
+    */
+    @ApiModelProperty("合并行数")
+    private Integer mergeRows;
+    /**
+    * 合并列数
+    */
+    @ApiModelProperty("合并列数")
+    private Integer mergeColumns;
+
+
+}

src/main/java/com/xjrsoft/module/personnel/mapper/BasePersonnelLabourCapitalDataMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.personnel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapitalData;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 工资条数据
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+@Mapper
+public interface BasePersonnelLabourCapitalDataMapper extends MPJBaseMapper<BasePersonnelLabourCapitalData> {
+
+}

src/main/java/com/xjrsoft/module/personnel/mapper/BasePersonnelLabourCapitalMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.personnel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapital;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 工资发放
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+@Mapper
+public interface BasePersonnelLabourCapitalMapper extends MPJBaseMapper<BasePersonnelLabourCapital> {
+
+}

src/main/java/com/xjrsoft/module/personnel/mapper/BasePersonnelLabourCapitalTitleMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.personnel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapitalTitle;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 工资发放表头
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+@Mapper
+public interface BasePersonnelLabourCapitalTitleMapper extends MPJBaseMapper<BasePersonnelLabourCapitalTitle> {
+
+}

src/main/java/com/xjrsoft/module/personnel/service/IBasePersonnelLabourCapitalService.java

@@ -0,0 +1,40 @@
+package com.xjrsoft.module.personnel.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapital;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 工资发放
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+
+public interface IBasePersonnelLabourCapitalService extends MPJBaseService<BasePersonnelLabourCapital> {
+    /**
+    * 新增
+    *
+    * @param basePersonnelLabourCapital
+    * @return
+    */
+    Boolean add(BasePersonnelLabourCapital basePersonnelLabourCapital);
+
+    /**
+    * 更新
+    *
+    * @param basePersonnelLabourCapital
+    * @return
+    */
+    Boolean update(BasePersonnelLabourCapital basePersonnelLabourCapital);
+
+    /**
+    * 删除
+    *
+    * @param ids
+    * @return
+    */
+    Boolean delete(List<Long> ids);
+}

src/main/java/com/xjrsoft/module/personnel/service/impl/BasePersonnelLabourCapitalServiceImpl.java

@@ -0,0 +1,125 @@
+package com.xjrsoft.module.personnel.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapitalData;
+import com.xjrsoft.module.personnel.mapper.BasePersonnelLabourCapitalDataMapper;
+import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapitalTitle;
+import com.xjrsoft.module.personnel.mapper.BasePersonnelLabourCapitalTitleMapper;
+import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapital;
+import com.xjrsoft.module.personnel.mapper.BasePersonnelLabourCapitalMapper;
+import com.xjrsoft.module.personnel.service.IBasePersonnelLabourCapitalService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 工资发放
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class BasePersonnelLabourCapitalServiceImpl extends MPJBaseServiceImpl<BasePersonnelLabourCapitalMapper, BasePersonnelLabourCapital> implements IBasePersonnelLabourCapitalService {
+    private final BasePersonnelLabourCapitalMapper basePersonnelLabourCapitalBasePersonnelLabourCapitalMapper;
+
+    private final BasePersonnelLabourCapitalDataMapper basePersonnelLabourCapitalBasePersonnelLabourCapitalDataMapper;
+    private final BasePersonnelLabourCapitalTitleMapper basePersonnelLabourCapitalBasePersonnelLabourCapitalTitleMapper;
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean add(BasePersonnelLabourCapital basePersonnelLabourCapital) {
+        basePersonnelLabourCapitalBasePersonnelLabourCapitalMapper.insert(basePersonnelLabourCapital);
+        for (BasePersonnelLabourCapitalData basePersonnelLabourCapitalData : basePersonnelLabourCapital.getBasePersonnelLabourCapitalDataList()) {
+            basePersonnelLabourCapitalData.setLabourCapitalId(basePersonnelLabourCapital.getId());
+            basePersonnelLabourCapitalBasePersonnelLabourCapitalDataMapper.insert(basePersonnelLabourCapitalData);
+        }
+        for (BasePersonnelLabourCapitalTitle basePersonnelLabourCapitalTitle : basePersonnelLabourCapital.getBasePersonnelLabourCapitalTitleList()) {
+            basePersonnelLabourCapitalTitle.setLabourCapitalId(basePersonnelLabourCapital.getId());
+            basePersonnelLabourCapitalBasePersonnelLabourCapitalTitleMapper.insert(basePersonnelLabourCapitalTitle);
+        }
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean update(BasePersonnelLabourCapital basePersonnelLabourCapital) {
+        basePersonnelLabourCapitalBasePersonnelLabourCapitalMapper.updateById(basePersonnelLabourCapital);
+        //********************************* BasePersonnelLabourCapitalData  增删改  开始 *******************************************/
+        {
+            // 查出所有子级的id
+            List<BasePersonnelLabourCapitalData> basePersonnelLabourCapitalDataList = basePersonnelLabourCapitalBasePersonnelLabourCapitalDataMapper.selectList(Wrappers.lambdaQuery(BasePersonnelLabourCapitalData.class).eq(BasePersonnelLabourCapitalData::getLabourCapitalId, basePersonnelLabourCapital.getId()).select(BasePersonnelLabourCapitalData::getId));
+            List<Long> basePersonnelLabourCapitalDataIds = basePersonnelLabourCapitalDataList.stream().map(BasePersonnelLabourCapitalData::getId).collect(Collectors.toList());
+            //原有子表单 没有被删除的主键
+            List<Long> basePersonnelLabourCapitalDataOldIds = basePersonnelLabourCapital.getBasePersonnelLabourCapitalDataList().stream().map(BasePersonnelLabourCapitalData::getId).filter(Objects::nonNull).collect(Collectors.toList());
+            //找到需要删除的id
+            List<Long> basePersonnelLabourCapitalDataRemoveIds = basePersonnelLabourCapitalDataIds.stream().filter(item -> !basePersonnelLabourCapitalDataOldIds.contains(item)).collect(Collectors.toList());
+
+            for (BasePersonnelLabourCapitalData basePersonnelLabourCapitalData : basePersonnelLabourCapital.getBasePersonnelLabourCapitalDataList()) {
+                //如果不等于空则修改
+                if (basePersonnelLabourCapitalData.getId() != null) {
+                    basePersonnelLabourCapitalBasePersonnelLabourCapitalDataMapper.updateById(basePersonnelLabourCapitalData);
+                }
+                //如果等于空 则新增
+                else {
+                    //已经不存在的id 删除
+                    basePersonnelLabourCapitalData.setLabourCapitalId(basePersonnelLabourCapital.getId());
+                    basePersonnelLabourCapitalBasePersonnelLabourCapitalDataMapper.insert(basePersonnelLabourCapitalData);
+                }
+            }
+            //已经不存在的id 删除
+            if(basePersonnelLabourCapitalDataRemoveIds.size() > 0){
+                basePersonnelLabourCapitalBasePersonnelLabourCapitalDataMapper.deleteBatchIds(basePersonnelLabourCapitalDataRemoveIds);
+            }
+        }
+        //********************************* BasePersonnelLabourCapitalData  增删改  结束 *******************************************/
+
+        //********************************* BasePersonnelLabourCapitalTitle  增删改  开始 *******************************************/
+        {
+            // 查出所有子级的id
+            List<BasePersonnelLabourCapitalTitle> basePersonnelLabourCapitalTitleList = basePersonnelLabourCapitalBasePersonnelLabourCapitalTitleMapper.selectList(Wrappers.lambdaQuery(BasePersonnelLabourCapitalTitle.class).eq(BasePersonnelLabourCapitalTitle::getLabourCapitalId, basePersonnelLabourCapital.getId()).select(BasePersonnelLabourCapitalTitle::getId));
+            List<Long> basePersonnelLabourCapitalTitleIds = basePersonnelLabourCapitalTitleList.stream().map(BasePersonnelLabourCapitalTitle::getId).collect(Collectors.toList());
+            //原有子表单 没有被删除的主键
+            List<Long> basePersonnelLabourCapitalTitleOldIds = basePersonnelLabourCapital.getBasePersonnelLabourCapitalTitleList().stream().map(BasePersonnelLabourCapitalTitle::getId).filter(Objects::nonNull).collect(Collectors.toList());
+            //找到需要删除的id
+            List<Long> basePersonnelLabourCapitalTitleRemoveIds = basePersonnelLabourCapitalTitleIds.stream().filter(item -> !basePersonnelLabourCapitalTitleOldIds.contains(item)).collect(Collectors.toList());
+
+            for (BasePersonnelLabourCapitalTitle basePersonnelLabourCapitalTitle : basePersonnelLabourCapital.getBasePersonnelLabourCapitalTitleList()) {
+                //如果不等于空则修改
+                if (basePersonnelLabourCapitalTitle.getId() != null) {
+                    basePersonnelLabourCapitalBasePersonnelLabourCapitalTitleMapper.updateById(basePersonnelLabourCapitalTitle);
+                }
+                //如果等于空 则新增
+                else {
+                    //已经不存在的id 删除
+                    basePersonnelLabourCapitalTitle.setLabourCapitalId(basePersonnelLabourCapital.getId());
+                    basePersonnelLabourCapitalBasePersonnelLabourCapitalTitleMapper.insert(basePersonnelLabourCapitalTitle);
+                }
+            }
+            //已经不存在的id 删除
+            if(basePersonnelLabourCapitalTitleRemoveIds.size() > 0){
+                basePersonnelLabourCapitalBasePersonnelLabourCapitalTitleMapper.deleteBatchIds(basePersonnelLabourCapitalTitleRemoveIds);
+            }
+        }
+        //********************************* BasePersonnelLabourCapitalTitle  增删改  结束 *******************************************/
+
+        return true;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean delete(List<Long> ids) {
+        basePersonnelLabourCapitalBasePersonnelLabourCapitalMapper.deleteBatchIds(ids);
+        basePersonnelLabourCapitalBasePersonnelLabourCapitalDataMapper.delete(Wrappers.lambdaQuery(BasePersonnelLabourCapitalData.class).in(BasePersonnelLabourCapitalData::getLabourCapitalId, ids));
+        basePersonnelLabourCapitalBasePersonnelLabourCapitalTitleMapper.delete(Wrappers.lambdaQuery(BasePersonnelLabourCapitalTitle.class).in(BasePersonnelLabourCapitalTitle::getLabourCapitalId, ids));
+
+        return true;
+    }
+}

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

@@ -0,0 +1,64 @@
+package com.xjrsoft.module.personnel.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 工资条数据表单出参
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+@Data
+public class BasePersonnelLabourCapitalDataVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 工资发放id
+    */
+    @ApiModelProperty("工资发放id")
+    private Long labourCapitalId;
+    /**
+    * 证件类型
+    */
+    @ApiModelProperty("证件类型")
+    private String idType;
+    /**
+    * 证件号码
+    */
+    @ApiModelProperty("证件号码")
+    private String idNumber;
+    /**
+    * 工号
+    */
+    @ApiModelProperty("工号")
+    private String jobNumber;
+    /**
+    * 名称
+    */
+    @ApiModelProperty("名称")
+    private String name;
+    /**
+    * 合计
+    */
+    @ApiModelProperty("合计")
+    private String amountTo;
+    /**
+    * 扩展信息
+    */
+    @ApiModelProperty("扩展信息")
+    private String extendJson;
+
+
+
+}

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

@@ -0,0 +1,139 @@
+package com.xjrsoft.module.personnel.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.write.style.ContentStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 工资发放列表列表入参
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+@Data
+public class BasePersonnelLabourCapitalListVo {
+
+    /**
+    * 主键编号
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("主键编号")
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建人")
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("创建时间")
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改人")
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("修改时间")
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("删除标记")
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("有效标志")
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 工资发放名称
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("工资发放名称")
+    @ApiModelProperty("工资发放名称")
+    private String name;
+    /**
+    * 发放年月
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("发放年月")
+    @ApiModelProperty("发放年月")
+    private Date dateOfIssue;
+    /**
+    * 数据开始行
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("数据开始行")
+    @ApiModelProperty("数据开始行")
+    private Integer dataRow;
+    /**
+    * 证件类型所属列
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("证件类型所属列")
+    @ApiModelProperty("证件类型所属列")
+    private Integer idTypeColumn;
+    /**
+    * 证件号码所属列
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("证件号码所属列")
+    @ApiModelProperty("证件号码所属列")
+    private Integer idNumberColumn;
+    /**
+    * 工号所属列
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("工号所属列")
+    @ApiModelProperty("工号所属列")
+    private Integer jobNumberColumn;
+    /**
+    * 名称所属列
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("名称所属列")
+    @ApiModelProperty("名称所属列")
+    private Integer personnelNameColumn;
+    /**
+    * 合计所属列
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("合计所属列")
+    @ApiModelProperty("合计所属列")
+    private Integer amountToColumn;
+    /**
+    * 数据文件
+    */
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("数据文件")
+    @ApiModelProperty("数据文件")
+    private String dataFile;
+
+}

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

@@ -0,0 +1,59 @@
+package com.xjrsoft.module.personnel.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 工资发放表头表单出参
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+@Data
+public class BasePersonnelLabourCapitalTitleVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 工资发放id
+    */
+    @ApiModelProperty("工资发放id")
+    private Long labourCapitalId;
+    /**
+    * 表头名称
+    */
+    @ApiModelProperty("表头名称")
+    private String name;
+    /**
+    * 所属行
+    */
+    @ApiModelProperty("所属行")
+    private Integer rowNumber;
+    /**
+    * 所属列
+    */
+    @ApiModelProperty("所属列")
+    private Integer columnNumber;
+    /**
+    * 合并行数
+    */
+    @ApiModelProperty("合并行数")
+    private Integer mergeRows;
+    /**
+    * 合并列数
+    */
+    @ApiModelProperty("合并列数")
+    private Integer mergeColumns;
+
+
+
+}

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

@@ -0,0 +1,86 @@
+package com.xjrsoft.module.personnel.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapitalData;
+import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapitalTitle;
+
+/**
+* @title: 工资发放表单出参
+* @Author dzx
+* @Date: 2023-11-08
+* @Version 1.0
+*/
+@Data
+public class BasePersonnelLabourCapitalVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 工资发放名称
+    */
+    @ApiModelProperty("工资发放名称")
+    private String name;
+    /**
+    * 发放年月
+    */
+    @ApiModelProperty("发放年月")
+    private Date dateOfIssue;
+    /**
+    * 数据开始行
+    */
+    @ApiModelProperty("数据开始行")
+    private Integer dataRow;
+    /**
+    * 证件类型所属列
+    */
+    @ApiModelProperty("证件类型所属列")
+    private Integer idTypeColumn;
+    /**
+    * 证件号码所属列
+    */
+    @ApiModelProperty("证件号码所属列")
+    private Integer idNumberColumn;
+    /**
+    * 工号所属列
+    */
+    @ApiModelProperty("工号所属列")
+    private Integer jobNumberColumn;
+    /**
+    * 名称所属列
+    */
+    @ApiModelProperty("名称所属列")
+    private Integer personnelNameColumn;
+    /**
+    * 合计所属列
+    */
+    @ApiModelProperty("合计所属列")
+    private Integer amountToColumn;
+    /**
+    * 数据文件
+    */
+    @ApiModelProperty("数据文件")
+    private String dataFile;
+
+
+    /**
+    * basePersonnelLabourCapitalData
+    */
+    @ApiModelProperty("basePersonnelLabourCapitalData子表")
+    private List<BasePersonnelLabourCapitalDataVo> basePersonnelLabourCapitalDataList;
+    /**
+    * basePersonnelLabourCapitalTitle
+    */
+    @ApiModelProperty("basePersonnelLabourCapitalTitle子表")
+    private List<BasePersonnelLabourCapitalTitleVo> basePersonnelLabourCapitalTitleList;
+
+}

src/main/resources/sqlScript/20231108_sql.sql

@@ -0,0 +1,99 @@
+-- ----------------------------
+-- 工资发放
+-- ----------------------------
+DROP TABLE IF EXISTS base_personnel_labour_capital;
+CREATE TABLE base_personnel_labour_capital
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `name` VARCHAR(100) NULL DEFAULT NULL COMMENT '工资发放名称',
+    `date_of_issue` DATE NULL DEFAULT NULL COMMENT '发放年月',
+    `data_row` INT NULL DEFAULT NULL COMMENT '数据开始行',
+    `id_type_column` INT NULL DEFAULT NULL COMMENT '证件类型所属列',
+    `id_number_column` INT NULL DEFAULT NULL COMMENT '证件号码所属列',
+    `job_number_column` INT NULL DEFAULT NULL COMMENT '工号所属列',
+    `personnel_name_column` INT NULL DEFAULT NULL COMMENT '名称所属列',
+    `amount_to_column` INT NULL DEFAULT NULL COMMENT '合计所属列',
+    `data_file` VARCHAR(200) NULL DEFAULT NULL COMMENT '数据文件',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '工资发放';
+
+
+-- ----------------------------
+-- 工资发放
+-- ----------------------------
+DROP TABLE IF EXISTS base_personnel_labour_capital_title;
+CREATE TABLE base_personnel_labour_capital_title
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `labour_capital_id` BIGINT NULL DEFAULT NULL COMMENT '工资发放id',
+    `name` VARCHAR(100) NULL DEFAULT NULL COMMENT '表头名称',
+    `row_number` INT NULL DEFAULT NULL COMMENT '所属行',
+    `column_number` INT NULL DEFAULT NULL COMMENT '所属列',
+    `merge_rows` INT NULL DEFAULT NULL COMMENT '合并行数',
+    `merge_columns` INT NULL DEFAULT NULL COMMENT '合并列数',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '工资发放表头';
+
+
+-- ----------------------------
+-- 工资条数据
+-- ----------------------------
+DROP TABLE IF EXISTS base_personnel_labour_capital_data;
+CREATE TABLE base_personnel_labour_capital_data
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `labour_capital_id` BIGINT NULL DEFAULT NULL COMMENT '工资发放id',
+    `id_type` VARCHAR(100) NULL DEFAULT NULL COMMENT '证件类型',
+    `id_number` VARCHAR(50) NULL DEFAULT NULL COMMENT '证件号码',
+    `job_number` VARCHAR(100) NULL DEFAULT NULL COMMENT '工号',
+    `name` VARCHAR(100) NULL DEFAULT NULL COMMENT '名称',
+    `amount_to` VARCHAR(100) NULL DEFAULT NULL COMMENT '合计',
+    `extend_json` VARCHAR(3000) NULL DEFAULT NULL COMMENT '扩展信息',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '工资条数据';
+
+
+-- ----------------------------
+-- 教职工经历信息
+-- ----------------------------
+DROP TABLE IF EXISTS wf_personnel_experience;
+CREATE TABLE wf_personnel_experience
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `company_name` VARCHAR(50) NULL DEFAULT NULL COMMENT '企业名称',
+    `learning_forms` VARCHAR(100) NULL DEFAULT NULL COMMENT '学习形式',
+    `post` VARCHAR(100) NULL DEFAULT NULL COMMENT '岗位',
+    `start_date` DATE NULL DEFAULT NULL COMMENT '实习开始时间',
+    `end_date` DATE NULL DEFAULT NULL COMMENT '实习结束时间',
+    `total_duration` BIGINT NULL DEFAULT NULL COMMENT '共计时长',
+    `practice_description` VARCHAR(1000) NULL DEFAULT NULL COMMENT '实践描述',
+    `annex` VARCHAR(200) NULL DEFAULT NULL COMMENT '佐证材料',
+    `notes` VARCHAR(500) NULL DEFAULT NULL COMMENT '备注',
+    `status` INT NOT NULL COMMENT '状态（1:结束 0:未结束）',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '教职工经历信息';