关联项目回显调整

jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java

@@ -69,6 +69,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 	private Environment env;
 	@Autowired
 	private ISysBaseAPI sysBaseAPI;
+	// todo 缺少定时任务验证分期信息发送短信
 	
 	/**
 	 * 分页列表查询
@@ -386,9 +387,9 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 						listSub.forEach(p1->{
 							int n = listSub.indexOf(p1) + 1;
 							map.put("phaseName" + n,p1.getPhaseName());
-							map.put("accountsReceivableAmount" + n,p1.getAccountsReceivableAmount());
+							map.put("accountsReceivableAmount" + n,String.valueOf(p1.getAccountsReceivableAmount()));
 							map.put("accountsReceivableTime" + n, DateUtils.date2Str(p1.getAccountsReceivableTime(),new SimpleDateFormat("yyyy-MM-dd")));
-							map.put("paidAmount" + n,p1.getPaidAmount());
+							map.put("paidAmount" + n,String.valueOf(p1.getPaidAmount()));
 							map.put("paidTime" + n,DateUtils.date2Str(p1.getPaidTime(),new SimpleDateFormat("yyyy-MM-dd")));
 						});
 					}

jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PayIncomeContractInstallment.java

@@ -42,7 +42,7 @@ public class PayIncomeContractInstallment implements Serializable {
 	/**应收金额*/
 	@Excel(name = "应收金额", width = 15)
     @ApiModelProperty(value = "应收金额")
-    private java.lang.String accountsReceivableAmount;
+    private java.lang.Integer accountsReceivableAmount;
 	/**应收时间*/
 	@Excel(name = "应收时间", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -52,7 +52,7 @@ public class PayIncomeContractInstallment implements Serializable {
 	/**实收金额*/
 	@Excel(name = "实收金额", width = 15)
     @ApiModelProperty(value = "实收金额")
-    private java.lang.String paidAmount;
+    private java.lang.Integer paidAmount;
 	/**实收时间*/
 	@Excel(name = "实收时间", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")

jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml

@@ -78,6 +78,8 @@
     <select id="getAssociated" resultType="com.jero.contract.vo.ProjectOutput">
         SELECT * FROM (
             SELECT
+                pica.id AS id,
+                pica.contract_id AS contractId,
                 pcp.id AS projectId,
                 '1' AS projectType,
                 pcp.charge_project AS chargeProject,
@@ -93,6 +95,8 @@
             WHERE pica.contract_id = #{contractId}
             UNION ALL
             SELECT
+                pica.id AS id,
+                pica.contract_id AS contractId,
                 pwgs.id AS projectId,
                 '2' AS projectType,
                 pwg.working_group_project AS chargeProject,

jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java

@@ -144,7 +144,6 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         if(!StringUtils.isBlank(msgPayIncomeContractInstallment)){
             throw new JeroBootException(msgPayIncomeContractInstallment.toString());
         }
-        // todo 缺少发送消息
         return payIncomeContract;
     }
 
@@ -334,8 +333,11 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
                     break;
                 default:break;
             }
-            listProjectOutput.add(projectOutput);
+
             payIncomeContractAssociatedService.save(p);
+            projectOutput.setContractId(p.getContractId());
+            projectOutput.setId(p.getId());
+            listProjectOutput.add(projectOutput);
         });
         return listProjectOutput;
     }
@@ -445,6 +447,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
         updatePayIncomeContract.eq(PayIncomeContract::getId,payIncomeContract.getId());
         updatePayIncomeContract.set(PayIncomeContract::getStatus,PayIncomeContractCommon.STATUS2);
         payIncomeContractService.update(updatePayIncomeContract);
+        // todo 缺少发送消息
     }
 
     /**

jero-boot-incoming-payment/src/main/java/com/jero/contract/vo/ProjectOutput.java

@@ -10,7 +10,16 @@ import java.util.Date;
 @Data
 @ApiModel(value="关联项目", description="关联项目")
 public class ProjectOutput implements Serializable {
-
+    /**
+     * 关联id
+     */
+    @ApiModelProperty(value = "关联id")
+    private String id;
+    /**
+     * 合同id
+     */
+    @ApiModelProperty(value = "合同id")
+    private String contractId;
     /**
      * 项目id
      */