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:
zhangqinlin
2021-09-26 11:07:22 +08:00
parent 13f70a5391
commit 2e89abb2e3
8 changed files with 135 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+3 -12
View File
@@ -67,8 +67,6 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
@Autowired
private ProjectDetailService projectDetailService;
@Autowired
private IPayContactsManagementService iPayContactsManagementService;
@Autowired
private IPayMailBillProjectService iPayMailBillProjectService;
@Autowired
private IPayCommonProjectService payCommonProjectService;
@@ -118,7 +116,6 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
calendar.add(Calendar.MINUTE,59);//时
calendar.add(Calendar.SECOND,59);//秒
queryWrapper.le("send_date", calendar.getTime());
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getChargeCompanyName())){
queryWrapper.like("charge_company_name",payMailBillSearch.getChargeCompanyName());
@@ -156,14 +153,8 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
@ApiOperation(value="邮寄票据-项目详情", notes="邮寄票据-项目详情")
@PostMapping(value = "/getProjectDetail")
@Transactional
public Result<?> getProjectDetail(@RequestParam(name="keyId") String keyId,
@RequestParam(name="companyName") String companyName,
@RequestParam(name="liaisonMan") String liaisonMan) {
//获取联系人id公司id
LambdaQueryWrapper<PayContactsManagement> payContactsManagementLambdaQueryWrapper = new LambdaQueryWrapper<>();
payContactsManagementLambdaQueryWrapper.eq(PayContactsManagement::getCompanyName,companyName);
payContactsManagementLambdaQueryWrapper.eq(PayContactsManagement::getName,liaisonMan);
PayContactsManagement one = iPayContactsManagementService.getOne(payContactsManagementLambdaQueryWrapper, false);
public Result<?> getProjectDetail(@RequestParam(name="keyId") String keyId
) {
//获取项目id
LambdaQueryWrapper<PayMailBillProject> payMailBillProjectLambdaQueryWrapper = new LambdaQueryWrapper<>();
payMailBillProjectLambdaQueryWrapper.eq(PayMailBillProject::getBillId,keyId);
@@ -199,7 +190,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
queryPayMailBillProject.eq(PayMailBillProject::getBillId,payMailBill.getId());
PayMailBillProject one = payMailBillProjectService.getOne(queryPayMailBillProject,false);
if(ObjectUtils.isEmpty(one)){
if(ObjectUtils.isNotEmpty(one)){
LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject2 = new LambdaQueryWrapper<>();
queryPayMailBillProject2.eq(PayMailBillProject::getProjectId,one.getProjectId());
List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject2);