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-09-07 11:16:30 +08:00
parent 8cc6b25e73
commit d29f2d85ca
6 changed files with 60 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/pay.pdm
+36 -36
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?PowerDesigner AppLocale="UTF16" ID="{8176B8FB-6F24-438A-BA14-B7A4B81519C0}" Label="" LastModificationDate="1630979489" Name="pay" Objects="746" Symbols="43" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<?PowerDesigner AppLocale="UTF16" ID="{8176B8FB-6F24-438A-BA14-B7A4B81519C0}" Label="" LastModificationDate="1630982726" Name="pay" Objects="742" Symbols="43" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
<!-- do not edit this file -->
<Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -13556,8 +13556,8 @@ LABL 0 新宋体,8,N</a:FontList>
<a:Code>pay_spending_contract_installment</a:Code>
<a:CreationDate>1629706931</a:CreationDate>
<a:Creator>lilili</a:Creator>
<a:ModificationDate>1630635062</a:ModificationDate>
<a:Modifier>lilili</a:Modifier>
<a:ModificationDate>1630982578</a:ModificationDate>
<a:Modifier>LQT</a:Modifier>
<a:TotalSavingCurrency/>
<c:Columns>
<o:Column Id="o488">
@@ -13600,10 +13600,10 @@ LABL 0 新宋体,8,N</a:FontList>
<a:Code>accounts_receivable_amount</a:Code>
<a:CreationDate>1629770021</a:CreationDate>
<a:Creator>lilili</a:Creator>
<a:ModificationDate>1630635062</a:ModificationDate>
<a:Modifier>lilili</a:Modifier>
<a:DataType>varchar(20)</a:DataType>
<a:Length>20</a:Length>
<a:ModificationDate>1630982578</a:ModificationDate>
<a:Modifier>LQT</a:Modifier>
<a:DataType>int(11)</a:DataType>
<a:Length>11</a:Length>
</o:Column>
<o:Column Id="o492">
<a:ObjectID>44B204B5-3CC8-4955-A3FF-8BC9A68EC0E0</a:ObjectID>
@@ -13611,9 +13611,9 @@ LABL 0 新宋体,8,N</a:FontList>
<a:Code>accounts_receivable_time</a:Code>
<a:CreationDate>1629770021</a:CreationDate>
<a:Creator>lilili</a:Creator>
<a:ModificationDate>1630635062</a:ModificationDate>
<a:Modifier>lilili</a:Modifier>
<a:DataType>datetime</a:DataType>
<a:ModificationDate>1630982578</a:ModificationDate>
<a:Modifier>LQT</a:Modifier>
<a:DataType>date</a:DataType>
</o:Column>
<o:Column Id="o493">
<a:ObjectID>F7C67B9A-D07D-4E81-9BCE-1B7171F1178A</a:ObjectID>
@@ -13621,10 +13621,10 @@ LABL 0 新宋体,8,N</a:FontList>
<a:Code>paid_amount</a:Code>
<a:CreationDate>1629770021</a:CreationDate>
<a:Creator>lilili</a:Creator>
<a:ModificationDate>1630635062</a:ModificationDate>
<a:Modifier>lilili</a:Modifier>
<a:DataType>varchar(20)</a:DataType>
<a:Length>20</a:Length>
<a:ModificationDate>1630982578</a:ModificationDate>
<a:Modifier>LQT</a:Modifier>
<a:DataType>int(11)</a:DataType>
<a:Length>11</a:Length>
</o:Column>
<o:Column Id="o494">
<a:ObjectID>80852A90-3EA9-4B46-8064-3DA5B659F384</a:ObjectID>
@@ -13632,9 +13632,9 @@ LABL 0 新宋体,8,N</a:FontList>
<a:Code>paid_time</a:Code>
<a:CreationDate>1629770021</a:CreationDate>
<a:Creator>lilili</a:Creator>
<a:ModificationDate>1630635062</a:ModificationDate>
<a:Modifier>lilili</a:Modifier>
<a:DataType>datetime</a:DataType>
<a:ModificationDate>1630982578</a:ModificationDate>
<a:Modifier>LQT</a:Modifier>
<a:DataType>date</a:DataType>
</o:Column>
<o:Column Id="o495">
<a:ObjectID>56B3BE45-4096-4382-9F05-A130EAE15C3B</a:ObjectID>
@@ -13776,11 +13776,11 @@ LABL 0 新宋体,8,N</a:FontList>
</o:Column>
<o:Column Id="o506">
<a:ObjectID>9ACA3F07-10E0-4456-BC65-29BEEF758DCC</a:ObjectID>
<a:Name>签订单位联系人id2</a:Name>
<a:Code>signed_contacts_id2</a:Code>
<a:Name>签订单位联系人id</a:Name>
<a:Code>signed_contacts_id</a:Code>
<a:CreationDate>1629768287</a:CreationDate>
<a:Creator>LQT</a:Creator>
<a:ModificationDate>1630890240</a:ModificationDate>
<a:ModificationDate>1630982525</a:ModificationDate>
<a:Modifier>LQT</a:Modifier>
<a:DataType>varchar(32)</a:DataType>
<a:Length>32</a:Length>
@@ -14348,8 +14348,8 @@ LABL 0 新宋体,8,N</a:FontList>
<a:Code>pay_income_contract_installment</a:Code>
<a:CreationDate>1629706929</a:CreationDate>
<a:Creator>lilili</a:Creator>
<a:ModificationDate>1630635062</a:ModificationDate>
<a:Modifier>lilili</a:Modifier>
<a:ModificationDate>1630982726</a:ModificationDate>
<a:Modifier>LQT</a:Modifier>
<a:TotalSavingCurrency/>
<c:Columns>
<o:Column Id="o554">
@@ -14392,10 +14392,10 @@ LABL 0 新宋体,8,N</a:FontList>
<a:Code>accounts_receivable_amount</a:Code>
<a:CreationDate>1629770021</a:CreationDate>
<a:Creator>lilili</a:Creator>
<a:ModificationDate>1630635062</a:ModificationDate>
<a:Modifier>lilili</a:Modifier>
<a:DataType>varchar(20)</a:DataType>
<a:Length>20</a:Length>
<a:ModificationDate>1630982726</a:ModificationDate>
<a:Modifier>LQT</a:Modifier>
<a:DataType>int(11)</a:DataType>
<a:Length>11</a:Length>
</o:Column>
<o:Column Id="o558">
<a:ObjectID>33C4941B-9D64-4B40-AB13-8815FCC4D3DE</a:ObjectID>
@@ -14403,9 +14403,9 @@ LABL 0 新宋体,8,N</a:FontList>
<a:Code>accounts_receivable_time</a:Code>
<a:CreationDate>1629770021</a:CreationDate>
<a:Creator>lilili</a:Creator>
<a:ModificationDate>1630635062</a:ModificationDate>
<a:Modifier>lilili</a:Modifier>
<a:DataType>datetime</a:DataType>
<a:ModificationDate>1630982726</a:ModificationDate>
<a:Modifier>LQT</a:Modifier>
<a:DataType>date</a:DataType>
</o:Column>
<o:Column Id="o559">
<a:ObjectID>94BCB4AD-8947-45ED-B9D9-21A528B1C323</a:ObjectID>
@@ -14413,10 +14413,10 @@ LABL 0 新宋体,8,N</a:FontList>
<a:Code>paid_amount</a:Code>
<a:CreationDate>1629770021</a:CreationDate>
<a:Creator>lilili</a:Creator>
<a:ModificationDate>1630635062</a:ModificationDate>
<a:Modifier>lilili</a:Modifier>
<a:DataType>varchar(20)</a:DataType>
<a:Length>20</a:Length>
<a:ModificationDate>1630982726</a:ModificationDate>
<a:Modifier>LQT</a:Modifier>
<a:DataType>int(11)</a:DataType>
<a:Length>11</a:Length>
</o:Column>
<o:Column Id="o560">
<a:ObjectID>BEA9FB1A-3326-4271-904C-0BAC630F55C7</a:ObjectID>
@@ -14424,9 +14424,9 @@ LABL 0 新宋体,8,N</a:FontList>
<a:Code>paid_time</a:Code>
<a:CreationDate>1629770021</a:CreationDate>
<a:Creator>lilili</a:Creator>
<a:ModificationDate>1630635062</a:ModificationDate>
<a:Modifier>lilili</a:Modifier>
<a:DataType>datetime</a:DataType>
<a:ModificationDate>1630982726</a:ModificationDate>
<a:Modifier>LQT</a:Modifier>
<a:DataType>date</a:DataType>
</o:Column>
<o:Column Id="o561">
<a:ObjectID>592EADCA-DD09-4735-96D4-F5230E54AF6F</a:ObjectID>
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+3 -2
View File
@@ -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
+2 -2
View File
@@ -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
+4
View File
@@ -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
+5 -2
View File
@@ -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 -1
View File
@@ -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
*/