diff --git a/src/main/java/org/yangliu/codegenerate/Main.java b/src/main/java/org/yangliu/codegenerate/Main.java index f3bfaf9..68d71ae 100644 --- a/src/main/java/org/yangliu/codegenerate/Main.java +++ b/src/main/java/org/yangliu/codegenerate/Main.java @@ -70,7 +70,7 @@ public class Main { String password = "Nomi1234"; //2.选择表配置 //String json="{\"oqc_spot_check_record\":\"抽检记录\",\"oqc_shipment_record\":\"成品出货记录\",\"oqc_1008_record\":\"1008仓台账\",\"oqc_after_sales_record\":\"售后记录\",\"oqc_special_sample\":\"特殊样件\",\"oqc_product_record\":\"产品追溯\",\"oqc_ncr_record\":\"NCR明细\",\"oqc_qrqc_record\":\"QRQC明细\"}"; - String json="{\"oqc_shipment_inspection\":\"出货检验\"}"; + String json="{\"oqc_b_product_warehouse_inspection\":\"B品仓检验\"}"; JSONObject tables = JSONObject.parseObject(json); for (String table : tables.keySet()) { String entityName = TableFieldUtil.tableNameToEntityName(table); diff --git a/src/main/resources/yangliu/XXXController.javai b/src/main/resources/yangliu/XXXController.javai index 8911d07..5781c8c 100644 --- a/src/main/resources/yangliu/XXXController.javai +++ b/src/main/resources/yangliu/XXXController.javai @@ -47,13 +47,11 @@ public class ${entityName}Controller extends BaseController { */ @ApiOperation(value="分页", notes="分页") @ApiImplicitParams({ - @ApiImplicitParam(name = "pageNo", value = "分页参数:当前页", dataType = "String", paramType = "query"), + @ApiImplicitParam(name = "pageNum", value = "分页参数:当前页", dataType = "String", paramType = "query"), @ApiImplicitParam(name = "pageSize", value = "分页参数:每页数量", dataType = "String", paramType = "query") }) @GetMapping(value = "/list") public TableDataInfo queryPageList(Query${entityName}VO query${entityName}VO, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { startPage(); TableDataInfo tableDataInfo = ${entityName?uncap_first}Service.pageList(query${entityName}VO); diff --git a/src/main/resources/yangliu/XXXServiceImpl.javai b/src/main/resources/yangliu/XXXServiceImpl.javai index 00634d2..3724028 100644 --- a/src/main/resources/yangliu/XXXServiceImpl.javai +++ b/src/main/resources/yangliu/XXXServiceImpl.javai @@ -70,8 +70,8 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $ } rspData.setCode(HttpStatus.SUCCESS); rspData.setRows(list); + rspData.setTotal(new PageInfo(dbEntityList).getTotal()); rspData.setMsg(internationalizationService.getMessage(Constants.QUERY_SUCCESS)); - rspData.setTotal(new PageInfo(list).getTotal()); return rspData; }catch(Exception e){ log.error("获取 分页异常:",e);