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

模糊查询替换%

Browse Source
This commit is contained in:
梁琦涛
2021-10-11 16:36:03 +08:00
parent 5e1efef297
commit 2a85d551f7
8 changed files with 55 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+6
View File
@@ -91,6 +91,12 @@ public class PayContactsManagementController extends JeroController<PayContactsM
if(!StringUtils.isBlank(payContactsManagement.getPhone())){
payContactsManagement.setPhone(PasswordUtil.encrypt(payContactsManagement.getPhone()));
}
if(!StringUtils.isBlank(payContactsManagement.getName())){
payContactsManagement.setName(oConvertUtils.replaceAllPercent(payContactsManagement.getName()));
}
if(!StringUtils.isBlank(payContactsManagement.getCompanyName())){
payContactsManagement.setCompanyName(oConvertUtils.replaceAllPercent(payContactsManagement.getCompanyName()));
}
Page<PayContactsManagement> page = new Page<>(pageNo, pageSize);
IPage<PayContactsManagement> pageList = payContactsManagementService.queryPageList(page, payContactsManagement);
List<PayContactsManagement> listPayContactsManagement = pageList.getRecords();
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+12
View File
@@ -103,6 +103,15 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
if(Objects.equals(chargeStatus,PayIncomeContractCommon.CHARGE_STATUS0)){
chargeStatus = "";
}
if(!StringUtils.isBlank(payIncomeContract.getContractNum())){
payIncomeContract.setContractNum(oConvertUtils.replaceAllPercent(payIncomeContract.getContractNum()));
}
if(!StringUtils.isBlank(payIncomeContract.getContractName())){
payIncomeContract.setContractName(oConvertUtils.replaceAllPercent(payIncomeContract.getContractName()));
}
if(!StringUtils.isBlank(projectName)){
projectName = oConvertUtils.replaceAllPercent(projectName);
}
Page<PayIncomeContract> page = new Page<>(pageNo, pageSize);
IPage<PayIncomeContract> pageList = payIncomeContractService.queryPageList(page, payIncomeContract,chargeStatus,projectName,startTime,endTime);
return Result.OK(pageList);
@@ -126,6 +135,9 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
if(Objects.isNull(sysUser)){
return Result.error("没有查到用户信息！");
}
if(!StringUtils.isBlank(payIncomeContract.getContractName())){
payIncomeContract.setContractName(oConvertUtils.replaceAllPercent(payIncomeContract.getContractName()));
}
payIncomeContract.setSignedContactsId(sysUser.getId());
Page<PayIncomeContract> page = new Page<>(pageNo, pageSize);
IPage<PayIncomeContract> pageList = payIncomeContractService.queryCompanyPageList(page, payIncomeContract);
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
+6
View File
@@ -88,6 +88,12 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
if(!StringUtils.isBlank(paySpendingContract.getContractName()) && paySpendingContract.getContractName().length() > 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<PaySpendingContract> page = new Page<>(pageNo, pageSize);
IPage<PaySpendingContract> pageList = paySpendingContractService.queryPageList(page, paySpendingContract.getContractNum(),
paySpendingContract.getContractName(),startTime,endTime);
jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java
+3
View File
@@ -108,6 +108,9 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
if(Objects.isNull(payPackCompany)){
return Result.error("打包企业不存在");
}
if(!StringUtils.isBlank(input.getProjectName())){
input.setProjectName(oConvertUtils.replaceAllPercent(input.getProjectName()));
}
input.setCompanyId(payPackCompany.getCompanyId());
input.setPackYear(payPackCompany.getPackYear());
List<PayCommonProject> list = payPackCompanyProjectService.queryListAll(input);
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+11
View File
@@ -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<PayCommonProject,
if(!StringUtils.isBlank(payCommonProject.getChargeCompanyTemporaryName()) && payCommonProject.getChargeCompanyTemporaryName().length() > 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<PayCommonProject> page = new Page<PayCommonProject>(pageNo, pageSize);
IPage<PayCommonProject> pageList = payCommonProjectService.queryPageList(page, payCommonProject, paymentDate);
if(!CollectionUtils.isEmpty(pageList.getRecords())){
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+7
View File
@@ -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<PayWorkingGroup, I
return Result.error("工作组项目长度不能大于50个字符");
}
Page<PayWorkingGroupVO> page = new Page<PayWorkingGroupVO>(pageNo, pageSize);
if(!StringUtils.isBlank(payWorkingGroup.getWorkingGroupProject())){
payWorkingGroup.setWorkingGroupProject(oConvertUtils.replaceAllPercent(payWorkingGroup.getWorkingGroupProject()));
}
IPage<PayWorkingGroupVO> pageList = payWorkingGroupService.queryPageList(page, payWorkingGroup);
if(!Objects.isNull(pageList)){
List<PayWorkingGroupVO> listPayWorkingGroupVO = pageList.getRecords();
@@ -146,6 +150,9 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
if(Objects.isNull(payIncomeContract)){
return Result.error("合同不存在！");
}
if(!StringUtils.isBlank(workingGroupProject)){
workingGroupProject = oConvertUtils.replaceAllPercent(workingGroupProject);
}
List<PayWorkingGroupVO> list = payWorkingGroupService.queryListByCompany(companyId,workingGroupProject,year, PayProjectCommon.PROJECT_TYPE2);
List<PayWorkingGroupVO> listNew = new ArrayList<>();
if(!CollectionUtils.isEmpty(list)){
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java
+3
View File
@@ -87,6 +87,9 @@ public class PayWorkingGroupDataFileController extends JeroController<PayWorking
&& payWorkingGroupDataFile.getProjectType() != PayProjectCommon.PROJECT_TYPE_FILE2){
return Result.error("项目状态不正确！");
}
if(!StringUtils.isBlank(payWorkingGroupDataFile.getFileName())){
payWorkingGroupDataFile.setFileName(oConvertUtils.replaceAllPercent(payWorkingGroupDataFile.getFileName()));
}
Page<PayWorkingGroupDataFile> page = new Page<PayWorkingGroupDataFile>(pageNo, pageSize);
IPage<PayWorkingGroupDataFile> pageList = payWorkingGroupDataFileService.queryPageList(page, payWorkingGroupDataFile);
return Result.OK(pageList);
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java
+7
View File
@@ -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<PayWorkingG
if (StringUtils.isBlank(payWorkingGroupSubItem.getWorkingGroupId())) {
return Result.error("工作组id不能为空！");
}
if(!StringUtils.isBlank(payWorkingGroupSubItem.getChargeCompanyTemporaryName())){
payWorkingGroupSubItem.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubItem.getChargeCompanyTemporaryName()));
}
Page<PayWorkingGroupSubItem> page = new Page<>(pageNo, pageSize);
IPage<PayWorkingGroupSubItem> pageList = payWorkingGroupSubItemService.queryPageList(page, payWorkingGroupSubItem, paymentDate);
if(!CollectionUtils.isEmpty(pageList.getRecords())){
@@ -217,6 +221,9 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
listNeedInvoice.add(payWorkingGroupSubItem.getNeedInvoice());
}
}
if(!StringUtils.isBlank(payWorkingGroupSubItem.getChargeProject())){
payWorkingGroupSubItem.setChargeProject(oConvertUtils.replaceAllPercent(payWorkingGroupSubItem.getChargeProject()));
}
IPage<PayWorkingGroupSubItem> pageList = payWorkingGroupSubItemService.queryCompanyPageList(page, payWorkingGroupSubItem,listNeedInvoice,listProjectIdsNew);
if(!CollectionUtils.isEmpty(pageList.getRecords())){
List<PayWorkingGroupSubItem> list = pageList.getRecords();