From 2a85d551f74ffdf599b9a239cca70768e3e8fda7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Mon, 11 Oct 2021 16:36:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayContactsManagementController.java | 6 ++++++ .../controller/PayIncomeContractController.java | 12 ++++++++++++ .../controller/PaySpendingContractController.java | 6 ++++++ .../controller/PayPackCompanyProjectController.java | 3 +++ .../controller/PayCommonProjectController.java | 11 +++++++++++ .../controller/PayWorkingGroupController.java | 7 +++++++ .../PayWorkingGroupDataFileController.java | 3 +++ .../controller/PayWorkingGroupSubItemController.java | 7 +++++++ 8 files changed, 55 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index 962495dc..c8f7024f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -91,6 +91,12 @@ public class PayContactsManagementController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = payContactsManagementService.queryPageList(page, payContactsManagement); List listPayContactsManagement = pageList.getRecords(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index 3c0b6b90..2c7ca374 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -103,6 +103,15 @@ public class PayIncomeContractController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = payIncomeContractService.queryPageList(page, payIncomeContract,chargeStatus,projectName,startTime,endTime); return Result.OK(pageList); @@ -126,6 +135,9 @@ public class PayIncomeContractController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = payIncomeContractService.queryCompanyPageList(page, payIncomeContract); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java index 2233f2b0..ac36b4fd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java @@ -88,6 +88,12 @@ public class PaySpendingContractController extends JeroController 50){ return Result.error("合同名称长度不能大于50个字符!"); } + if(!StringUtils.isBlank(paySpendingContract.getContractName())){ + paySpendingContract.setContractName(oConvertUtils.replaceAllPercent(paySpendingContract.getContractName())); + } + if(!StringUtils.isBlank(paySpendingContract.getContractNum())){ + paySpendingContract.setContractNum(oConvertUtils.replaceAllPercent(paySpendingContract.getContractNum())); + } Page page = new Page<>(pageNo, pageSize); IPage pageList = paySpendingContractService.queryPageList(page, paySpendingContract.getContractNum(), paySpendingContract.getContractName(),startTime,endTime); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java index 358c13bc..a2d57534 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java @@ -108,6 +108,9 @@ public class PayPackCompanyProjectController extends JeroController list = payPackCompanyProjectService.queryListAll(input); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java index 60b3a622..21e7e914 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java @@ -24,6 +24,7 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.ValidUtil; +import com.jero.common.util.oConvertUtils; import com.jero.common.vo.PayMailBillVO; import com.jero.common.vo.ProjectDetailVO; import com.jero.contract.entity.PayIncomeContract; @@ -118,6 +119,16 @@ public class PayCommonProjectController extends JeroController 50){ return Result.error("来款单位长度不能大于50个字符"); } + if(!StringUtils.isBlank(payCommonProject.getChargeProject())){ + payCommonProject.setChargeProject(oConvertUtils.replaceAllPercent(payCommonProject.getChargeProject())); + } + if(!StringUtils.isBlank(payCommonProject.getChargeCompanyTemporaryName())){ + payCommonProject.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payCommonProject.getChargeCompanyTemporaryName())); + } + if(!StringUtils.isBlank(payCommonProject.getContactsTemporaryName())){ + payCommonProject.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payCommonProject.getContactsTemporaryName())); + } + Page page = new Page(pageNo, pageSize); IPage pageList = payCommonProjectService.queryPageList(page, payCommonProject, paymentDate); if(!CollectionUtils.isEmpty(pageList.getRecords())){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java index 08bda049..503a83c6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java @@ -16,6 +16,7 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.ValidUtil; +import com.jero.common.util.oConvertUtils; import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.service.IPayIncomeContractService; import com.jero.pack.service.IPayPackCompanyProjectService; @@ -75,6 +76,9 @@ public class PayWorkingGroupController extends JeroController page = new Page(pageNo, pageSize); + if(!StringUtils.isBlank(payWorkingGroup.getWorkingGroupProject())){ + payWorkingGroup.setWorkingGroupProject(oConvertUtils.replaceAllPercent(payWorkingGroup.getWorkingGroupProject())); + } IPage pageList = payWorkingGroupService.queryPageList(page, payWorkingGroup); if(!Objects.isNull(pageList)){ List listPayWorkingGroupVO = pageList.getRecords(); @@ -146,6 +150,9 @@ public class PayWorkingGroupController extends JeroController list = payWorkingGroupService.queryListByCompany(companyId,workingGroupProject,year, PayProjectCommon.PROJECT_TYPE2); List listNew = new ArrayList<>(); if(!CollectionUtils.isEmpty(list)){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java index ea0b12c6..74fbb1a3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java @@ -87,6 +87,9 @@ public class PayWorkingGroupDataFileController extends JeroController page = new Page(pageNo, pageSize); IPage pageList = payWorkingGroupDataFileService.queryPageList(page, payWorkingGroupDataFile); return Result.OK(pageList); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 1138b76c..ba23271e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -20,6 +20,7 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; +import com.jero.common.util.oConvertUtils; import com.jero.common.vo.ProjectDetailVO; import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.entity.PayIncomeContractAssociated; @@ -109,6 +110,9 @@ public class PayWorkingGroupSubItemController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = payWorkingGroupSubItemService.queryPageList(page, payWorkingGroupSubItem, paymentDate); if(!CollectionUtils.isEmpty(pageList.getRecords())){ @@ -217,6 +221,9 @@ public class PayWorkingGroupSubItemController extends JeroController pageList = payWorkingGroupSubItemService.queryCompanyPageList(page, payWorkingGroupSubItem,listNeedInvoice,listProjectIdsNew); if(!CollectionUtils.isEmpty(pageList.getRecords())){ List list = pageList.getRecords();