diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java index 96f4e955..0c951cd7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContract.java @@ -223,4 +223,11 @@ public class PayIncomeContract implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "邮寄状态") private Integer postStatus; + + /** + * 邮寄表id,用于展示邮寄状态并用于查询邮寄信息 + */ + @TableField(exist = false) + @ApiModelProperty(value = "邮寄id") + private String mailId; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java index db1cdffd..9dc8e203 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java @@ -212,4 +212,17 @@ public class PaySpendingContract implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "来款状态 0:全部 1:到期未付款") private Integer chargeStatus; + /** + * 邮寄状态 + */ + @TableField(exist = false) + @ApiModelProperty(value = "邮寄状态") + private Integer postStatus; + + /** + * 邮寄表id,用于展示邮寄状态并用于查询邮寄信息 + */ + @TableField(exist = false) + @ApiModelProperty(value = "邮寄id") + private String mailId; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml index 29cca89f..41ab71e2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml @@ -33,6 +33,8 @@ pic.pack, pic.pack_year AS packYear, pic.status, + pmc.id as mailId, + pmc.post_status as postStatus, if(pic.status = 2,1,0) as statusOrder, pic.create_by AS createBy, pic.create_time AS createTime, @@ -45,6 +47,7 @@ ) AS chargeStatus, if(pic.status = 6,GROUP_CONCAT(picac.charge_project ORDER BY picac.id DESC),GROUP_CONCAT(project.projectName ORDER BY project.id DESC)) AS associatedProject FROM pay_income_contract pic + LEFT JOIN pay_mail_contract pmc ON pmc.contract_id = pic.id LEFT JOIN pay_income_contract_associated pica ON pica.contract_id = pic.id LEFT JOIN pay_income_contract_associated_cancellation picac ON picac.contract_id = pic.id LEFT JOIN diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml index c6e3508d..bfe0aaf8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml @@ -32,6 +32,8 @@ psc.pack_year, psc.status, if(psc.status = 2,1,0) as statusOrder, + pmc.id as mailId, + pmc.post_status as postStatus, psc.create_by, psc.create_time, psc.update_by, @@ -42,6 +44,7 @@ ) AS chargeStatus FROM pay_spending_contract psc left join sys_user su on psc.principal_id = su.id + LEFT JOIN pay_mail_contract pmc ON pmc.contract_id = psc.id AND contract_num LIKE CONCAT('%',CONCAT(#{paySpendingContract.contractNum},'%')) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java index d4e0ccd1..729db11d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java @@ -304,5 +304,21 @@ public class PayMailContractController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { + PayMailContract payMailContract = payMailContractService.getById(id); + if(payMailContract==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payMailContract); + } }