LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 委员会排序

Browse Source
This commit is contained in:
lijiarao
2024-08-15 11:11:53 +08:00
parent 8dc104efb5
commit d052ae8218
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeInfoController.java
+2 -2
View File
@@ -54,8 +54,8 @@ public class PayCommitteeInfoController extends JeroController<PayCommitteeInfo,
HttpServletRequest req) {
QueryWrapper<PayCommitteeInfo> queryWrapper = QueryGenerator.initQueryWrapper(payCommitteeInfo, req.getParameterMap());
queryWrapper.lambda()
.eq(PayCommitteeInfo::getDelFlag, CommonConstant.DEL_FLAG_0)
.orderByAsc(PayCommitteeInfo::getCommitteeNumber);
.eq(PayCommitteeInfo::getDelFlag, CommonConstant.DEL_FLAG_0);
queryWrapper.orderByAsc("CAST(REPLACE(REPLACE(committee_number, 'TC',''),'/SC','') AS UNSIGNED)");
Page<PayCommitteeInfo> page = new Page<>(pageNo, pageSize);
IPage<PayCommitteeInfo> pageList = payCommitteeInfoService.page(page, queryWrapper);
return Result.OK(pageList);
jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeMemberInfoController.java
+4 -2
View File
@@ -62,8 +62,10 @@ public class PayCommitteeMemberInfoController extends JeroController<PayCommitte
queryWrapper.lambda()
.eq(StringUtils.isNotBlank(committeeNumber),PayCommitteeMemberInfo::getCommitteeNumber,committeeNumber)
.eq(PayCommitteeMemberInfo::getDelFlag, CommonConstant.DEL_FLAG_0)
.eq(StringUtils.isNotBlank(positionOfStandardsCommittee), PayCommitteeMemberInfo::getPositionOfStandardsCommittee, positionOfStandardsCommittee)
.orderByAsc(PayCommitteeMemberInfo::getNumber);
.eq(StringUtils.isNotBlank(positionOfStandardsCommittee), PayCommitteeMemberInfo::getPositionOfStandardsCommittee, positionOfStandardsCommittee);
//.orderByAsc(PayCommitteeMemberInfo::getNumber)
queryWrapper.orderByAsc("CAST(REPLACE(REPLACE(committee_number, 'TC',''),'/SC','') AS UNSIGNED),number");
Page<PayCommitteeMemberInfo> page = new Page<>(pageNo, pageSize);
IPage<PayCommitteeMemberInfo> pageList = payCommitteeMemberInfoService.page(page, queryWrapper);
for (PayCommitteeMemberInfo record : pageList.getRecords()) {