From a1aacc420be70d519fc6be644c1780c0ae1806a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Thu, 30 Sep 2021 13:55:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=88=91=E7=9A=84=E5=90=88=E5=90=8C=E6=8E=A5=E5=8F=A3=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayIncomeContractController.java | 56 ++++++++++++++++--- .../vo/PayIncomeContractDetailOutput.java | 6 ++ 2 files changed, 54 insertions(+), 8 deletions(-) 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 44911305..cb71df3c 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 @@ -26,7 +26,8 @@ import com.jero.contract.service.IPayIncomeContractAuditService; import com.jero.contract.service.IPayIncomeContractInstallmentService; import com.jero.contract.service.IPayIncomeContractService; import com.jero.contract.vo.*; -import com.jero.temporary.entity.PayCompanyManagementTemporary; +import com.jero.mail.entity.PayMailContract; +import com.jero.mail.service.IPayMailContractService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -38,10 +39,10 @@ import org.jeecgframework.poi.excel.def.MapExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; import org.jeecgframework.poi.excel.view.JeecgMapExcelView; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.text.SimpleDateFormat; @@ -59,18 +60,20 @@ import java.util.stream.Collectors; @RequestMapping("/contract/payIncomeContract") @Slf4j public class PayIncomeContractController extends JeroController { - @Autowired + @Resource private IPayIncomeContractService payIncomeContractService; - @Autowired + @Resource private IPayIncomeContractInstallmentService payIncomeContractInstallmentService; - @Autowired + @Resource private IPayIncomeContractAuditService payIncomeContractAuditService; - @Autowired + @Resource private Environment env; - @Autowired + @Resource private ISysBaseAPI sysBaseAPI; - @Autowired + @Resource private IPayIncomeContractAssociatedService payIncomeContractAssociatedService; + @Resource + private IPayMailContractService payMailContractService; /** * 分页列表查询 @@ -372,6 +375,43 @@ public class PayIncomeContractController extends JeroController queryCompanyById(@RequestParam(name="id") String id) { + if(StringUtils.isBlank(id)){ + return Result.error("id不能为空!"); + } + PayIncomeContract payIncomeContract = payIncomeContractService.getById(id); + if(payIncomeContract==null) { + return Result.error("未找到对应数据"); + } + String str = JSON.toJSONString(payIncomeContract); + PayIncomeContractDetailOutput payIncomeContractDetailOutput = JSONObject.parseObject(str,PayIncomeContractDetailOutput.class); + // 获取关联项目id + List listProject = payIncomeContractService.getAssociated(id); + LambdaQueryWrapper queryPayMailContract = new LambdaQueryWrapper<>(); + queryPayMailContract.eq(PayMailContract::getContractId,id); + queryPayMailContract.eq(PayMailContract::getPostStatus,PayIncomeContractCommon.POST_STATUS1); + PayMailContract payMailContract = payMailContractService.getOne(queryPayMailContract); + if(!Objects.isNull(payMailContract)){ + payIncomeContractDetailOutput.setPayMailContract(payMailContract); + } + if(!CollectionUtils.isEmpty(listProject)){ + listProject.forEach(p->{ + if(!Objects.isNull(p.getChargeUse())){ + p.setChargeUse_dictText(sysBaseAPI.translateDict("payment_charge_use",String.valueOf(p.getChargeUse()))); + } + }); + payIncomeContractDetailOutput.setListProject(listProject); + } + return Result.OK(payIncomeContractDetailOutput); + } + /** * 通过id查询详情 * diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PayIncomeContractDetailOutput.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PayIncomeContractDetailOutput.java index ffa08c41..32d4f644 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PayIncomeContractDetailOutput.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/PayIncomeContractDetailOutput.java @@ -3,6 +3,7 @@ package com.jero.contract.vo; import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.entity.PayIncomeContractAudit; import com.jero.contract.entity.PayIncomeContractInstallment; +import com.jero.mail.entity.PayMailContract; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -48,4 +49,9 @@ public class PayIncomeContractDetailOutput extends PayIncomeContract implements */ @ApiModelProperty(value = "审核记录") private List listAudit; + /** + * 邮寄信息 + */ + @ApiModelProperty(value = "邮寄信息") + private PayMailContract payMailContract; }