1、新增工资分页接口

2、完成工资前端分页展示

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/flow/salary/controller/SalaryInfoController.java

@@ -1,10 +1,17 @@
 package com.zjugis.module.business.flow.salary.controller;
 
 import com.zjugis.framework.workflow.model.BaseController;
+import com.zjugis.module.business.flow.salary.dto.SalaryInfoPageDTO;
+import com.zjugis.module.business.flow.salary.service.ISalaryInfoService;
+import com.zjugis.module.business.flow.supplierinfo.dto.SupplierInfoPageDTO;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 /**
  * 工资相关操作接口 前端控制器
  *
@@ -14,6 +21,21 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/salary")
 public class SalaryInfoController extends BaseController {
+    @Resource
+    private ISalaryInfoService salaryInfoService;
+
+    /**
+     * 工资分页
+     *
+     * @param createReqVO
+     * @return
+     */
+    @PostMapping("/page")
+    public String selectSalaryInfoPage(@RequestBody SalaryInfoPageDTO createReqVO) {
+        return success(salaryInfoService.selectSalaryInfoPage(createReqVO));
+    }
+
+
 
 
 }

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/flow/salary/dto/SalaryInfoPageDTO.java

@@ -0,0 +1,21 @@
+package com.zjugis.module.business.flow.salary.dto;
+
+import com.zjugis.framework.common.pojo.PageParam;
+import lombok.Data;
+
+/**
+ * @author: Fuwb
+ * @date: 2025/4/3
+ * @time: 16:46
+ * @description:
+ */
+@Data
+public class SalaryInfoPageDTO extends PageParam {
+    private static final long serialVersionUID = 3281789155256654268L;
+
+    private Integer isAdmin;
+
+    private String searchKey;
+
+    private String name;
+}

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/flow/salary/entity/SalaryInfo.java

@@ -81,6 +81,11 @@ public class SalaryInfo extends BaseEntity {
      */
     private String idCard;
 
+    /**
+     * 人名
+     */
+    private String name;
+
     /**
      * 银行卡号
      */

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/flow/salary/service/ISalaryInfoService.java

@@ -1,6 +1,9 @@
 package com.zjugis.module.business.flow.salary.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zjugis.module.business.flow.salary.dto.SalaryInfoPageDTO;
+import com.zjugis.module.business.flow.salary.vo.SalaryInfoVO;
 
 /**
  * 工资信息表 服务类
@@ -10,4 +13,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ISalaryInfoService {
 
+    Page<SalaryInfoVO> selectSalaryInfoPage(SalaryInfoPageDTO createReqVO);
+
 }

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/flow/salary/service/impl/SalaryInfoServiceImpl.java

@@ -1,8 +1,18 @@
 package com.zjugis.module.business.flow.salary.service.impl;
 
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zjugis.module.business.flow.salary.dto.SalaryInfoPageDTO;
+import com.zjugis.module.business.flow.salary.entity.SalaryInfo;
 import com.zjugis.module.business.flow.salary.service.ISalaryInfoService;
+import com.zjugis.module.business.flow.salary.vo.SalaryInfoVO;
+import com.zjugis.module.business.flow.supplierinfo.entity.SupplierInfo;
+import com.zjugis.module.business.mapper.SalaryInfoMapper;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * 工资信息表 服务实现类
  *
@@ -11,5 +21,23 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SalaryInfoServiceImpl implements ISalaryInfoService {
+    @Resource
+    private SalaryInfoMapper salaryInfoMapper;
 
+    @Override
+    public Page<SalaryInfoVO> selectSalaryInfoPage(SalaryInfoPageDTO createReqVO) {
+        Page<SalaryInfoVO> page = new Page<>(createReqVO.getPageNo(), createReqVO.getPageSize());
+        LambdaQueryWrapper<SalaryInfo> wrapper = new LambdaQueryWrapper<>();
+        if (createReqVO.getIsAdmin() == 1) {
+            wrapper.eq(SalaryInfo::getIsvalid, 1)
+                    .orderByDesc(SalaryInfo::getImportDate)
+                    .orderByAsc(SalaryInfo::getSortOrder);
+            if (StrUtil.isNotBlank(createReqVO.getSearchKey())) {
+                wrapper.like(SalaryInfo::getName, createReqVO.getSearchKey());
+            }
+        } else {
+            wrapper.eq(SalaryInfo::getName, createReqVO.getName());
+        }
+        return salaryInfoMapper.selectSalaryInfoPage(page, wrapper);
+    }
 }

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/flow/salary/vo/SalaryInfoVO.java

@@ -0,0 +1,92 @@
+package com.zjugis.module.business.flow.salary.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @author: Fuwb
+ * @date: 2025/4/3
+ * @time: 16:51
+ * @description:
+ */
+@Data
+public class SalaryInfoVO implements Serializable {
+    private static final long serialVersionUID = 679444934892368667L;
+
+    /**
+     * 工资信息记录的唯一标识
+     */
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 工资记录对应的年度
+     */
+    private Integer year;
+
+    /**
+     * 工资记录对应的月份
+     */
+    private Integer month;
+
+    /**
+     * 导入时间
+     */
+    private LocalDateTime importDate;
+
+    /**
+     * 人员类型（行政参公，事业单位）
+     */
+    private String personnelType;
+
+    /**
+     * 人员类型（excel导入）
+     */
+    private String personnelTypeDesc;
+
+    /**
+     * 人员的身份证号码
+     */
+    private String idCard;
+
+    /**
+     * 人名
+     */
+    private String name;
+
+    /**
+     * 银行卡号
+     */
+    private String bankCard;
+
+    /**
+     * 银行
+     */
+    private String bank;
+
+    /**
+     * 单位
+     */
+    private String workUnint;
+
+    /**
+     * 应发工资合计
+     */
+    private Double totalPayable;
+
+    /**
+     * 扣发工资合计
+     */
+    private Double totalDeducted;
+
+    /**
+     * 实发工资
+     */
+    private Double actualPay;
+}

zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/mapper/SalaryInfoMapper.java

@@ -1,7 +1,12 @@
 package com.zjugis.module.business.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.module.business.flow.salary.entity.SalaryInfo;
+import com.zjugis.module.business.flow.salary.vo.SalaryInfoVO;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 工资信息表 Mapper 接口
@@ -11,4 +16,5 @@ import com.zjugis.module.business.flow.salary.entity.SalaryInfo;
  */
 public interface SalaryInfoMapper extends BaseMapper<SalaryInfo> {
 
+    Page<SalaryInfoVO> selectSalaryInfoPage(Page<SalaryInfoVO> page, @Param(Constants.WRAPPER) LambdaQueryWrapper<SalaryInfo> wrapper);
 }

zjugis-module-business/zjugis-module-business-biz/src/main/resources/application.yaml

@@ -96,7 +96,7 @@ zjugis:
     base-package: ${zjugis.info.base-package}
   security:
     permit-all-urls:
-      - /raevent/*
+      - /raevent/**
 debug: false
 
 version: 2023.11.13

zjugis-module-business/zjugis-module-business-biz/src/main/resources/mapper/SalaryInfoMapper.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zjugis.module.business.mapper.SalaryInfoMapper">
+
+    <select id="selectSalaryInfoPage" resultType="com.zjugis.module.business.flow.salary.vo.SalaryInfoVO">
+        SELECT * FROM oa_salary_info
+        ${ew.customSqlSegment}
+    </select>
+
+</mapper>