工资条管理，新增page

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

@@ -4,16 +4,19 @@ 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.baomidou.mybatisplus.core.metadata.IPage;
 import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.page.ConventPage;
+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.BasePersonnelLabourCapitalListDto;
+import com.xjrsoft.module.personnel.dto.BasePersonnelLabourCapitalPageDto;
 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.BasePersonnelLabourCapitalPageVo;
 import com.xjrsoft.module.personnel.vo.BasePersonnelLabourCapitalVo;
 import com.yomahub.liteflow.util.JsonUtil;
 import io.swagger.annotations.Api;
@@ -50,19 +53,18 @@ public class BasePersonnelLabourCapitalController {
 
     private final IBasePersonnelLabourCapitalService basePersonnelLabourCapitalService;
 
-    @GetMapping(value = "/list")
-    @ApiOperation(value="工资发放列表(不分页)")
+    @GetMapping(value = "/page")
+    @ApiOperation(value="工资发放列表(分页)")
     @SaCheckPermission("basepersonnellabourcapital:detail")
-    public RT<List<BasePersonnelLabourCapitalListVo>> list(@Valid BasePersonnelLabourCapitalListDto dto){
+    public RT<PageOutput<BasePersonnelLabourCapitalPageVo>> page(@Valid BasePersonnelLabourCapitalPageDto 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);
+                .select(BasePersonnelLabourCapital.class,x -> VoToColumnUtil.fieldsToColumns(BasePersonnelLabourCapitalPageVo.class).contains(x.getProperty()));
+        IPage<BasePersonnelLabourCapital> page = basePersonnelLabourCapitalService.page(ConventPage.getPage(dto), queryWrapper);
+        PageOutput<BasePersonnelLabourCapitalPageVo> pageOutput = ConventPage.getPageOutput(page, BasePersonnelLabourCapitalPageVo.class);
+        return RT.ok(pageOutput);
     }
 
     @GetMapping(value = "/info")
@@ -210,4 +212,5 @@ public class BasePersonnelLabourCapitalController {
 
         return resultList;
     }
+
 }

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

@@ -1,6 +1,6 @@
 package com.xjrsoft.module.personnel.dto;
 
-import com.xjrsoft.common.page.ListInput;
+import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,14 +13,14 @@ import java.util.Date;
 
 
 /**
-* @title: 工资发放列表查询入参
+* @title: 工资发放分页查询入参
 * @Author dzx
 * @Date: 2023-11-08
 * @Version 1.0
 */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class BasePersonnelLabourCapitalListDto extends ListInput {
+public class BasePersonnelLabourCapitalPageDto extends PageInput {
 
 
 }

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

@@ -15,13 +15,13 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
-* @title: 工资发放列表列表入参
+* @title: 工资发放分页列表出参
 * @Author dzx
 * @Date: 2023-11-08
 * @Version 1.0
 */
 @Data
-public class BasePersonnelLabourCapitalListVo {
+public class BasePersonnelLabourCapitalPageVo {
 
     /**
     * 主键编号

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -81,7 +81,7 @@ public class FreeMarkerGeneratorTest {
         params.setPage(true);
         params.setImport(true);
         params.setExport(true);
-        params.setOutMainDir(false);
+        params.setOutMainDir(true);
         params.setDs(ds);
 
 
@@ -328,7 +328,7 @@ public class FreeMarkerGeneratorTest {
 
 
     @Test
-    public void gcAppFunction() throws IOException {
+    public void gcAppWorkflowConfig() throws IOException {
         List<TableConfig> tableConfigs = new ArrayList<>();
         TableConfig mainTable = new TableConfig();
         mainTable.setTableName("base_app_function");
@@ -342,10 +342,10 @@ public class FreeMarkerGeneratorTest {
         params.setAuthor("fanxp");
         params.setPackageName("app");
         params.setTableConfigs(tableConfigs);
-        params.setPage(true);
-        params.setImport(false);
-        params.setExport(false);
-        params.setOutMainDir(false);
+        params.setPage(false);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
         params.setDs(ds);
 
 
@@ -355,24 +355,44 @@ public class FreeMarkerGeneratorTest {
     }
 
     @Test
-    public void gcOauthFunction() throws IOException {
+    public void gcBasePersonnelLabourCapital() throws IOException {
         List<TableConfig> tableConfigs = new ArrayList<>();
         TableConfig mainTable = new TableConfig();
-        mainTable.setTableName("oauth_client_details");
-        mainTable.setIsMain(true);
-        mainTable.setPkField(GlobalConstant.DEFAULT_PK);
-        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);
+        mainTable.setTableName("base_personnel_labour_capital");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+
+        tableConfigs.add(mainTable);
+
+        mainTable = new TableConfig();
+        mainTable.setTableName("base_personnel_labour_capital_data");//init_sql中的表名
+        mainTable.setIsMain(false);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        mainTable.setRelationField("labour_capital_id");//设置外键
+        mainTable.setRelationTableField(GlobalConstant.DEFAULT_PK);//设置外键
+
+        tableConfigs.add(mainTable);
+
+        mainTable = new TableConfig();
+        mainTable.setTableName("base_personnel_labour_capital_title");//init_sql中的表名
+        mainTable.setIsMain(false);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+        mainTable.setRelationField("labour_capital_id");//设置外键
+        mainTable.setRelationTableField(GlobalConstant.DEFAULT_PK);//设置外键
 
         tableConfigs.add(mainTable);
 
         ApiGenerateCodesDto params = new ApiGenerateCodesDto();
-        params.setAuthor("fanxp");
-        params.setPackageName("system");
+        params.setAuthor("dzx");//作者名称
+        params.setPackageName("personnel");//包名
         params.setTableConfigs(tableConfigs);
-        params.setPage(false);
-        params.setImport(false);
-        params.setExport(false);
-        params.setOutMainDir(true);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(true);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
         params.setDs(ds);