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 14:22:05 +08:00
parent d36173df0c
commit cc4c7396c9
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/pay.pdm
+8 -8
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?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"?>
<?PowerDesigner AppLocale="UTF16" ID="{8176B8FB-6F24-438A-BA14-B7A4B81519C0}" Label="" LastModificationDate="1630993658" 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">
@@ -7902,9 +7902,9 @@ LABL 0 新宋体,8,N</a:FontList>
</o:TableSymbol>
<o:TableSymbol Id="o77">
<a:CreationDate>1630635062</a:CreationDate>
<a:ModificationDate>1630635062</a:ModificationDate>
<a:ModificationDate>1630993658</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
<a:Rect>((-47379,-3229), (-9967,4795))</a:Rect>
<a:Rect>((-47254,-2966), (-5592,5882))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@@ -14232,8 +14232,8 @@ LABL 0 新宋体,8,N</a:FontList>
<a:Code>pay_income_contract_associated</a:Code>
<a:CreationDate>1629706930</a:CreationDate>
<a:Creator>lilili</a:Creator>
<a:ModificationDate>1630635062</a:ModificationDate>
<a:Modifier>lilili</a:Modifier>
<a:ModificationDate>1630993655</a:ModificationDate>
<a:Modifier>LQT</a:Modifier>
<a:TotalSavingCurrency/>
<c:Columns>
<o:Column Id="o545">
@@ -14272,12 +14272,12 @@ LABL 0 新宋体,8,N</a:FontList>
</o:Column>
<o:Column Id="o548">
<a:ObjectID>29654BA7-486E-42C3-AE64-D5A51CCDF93D</a:ObjectID>
<a:Name>项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目）</a:Name>
<a:Name>项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目）</a:Name>
<a:Code>project_type</a:Code>
<a:CreationDate>1629770667</a:CreationDate>
<a:Creator>lilili</a:Creator>
<a:ModificationDate>1630635062</a:ModificationDate>
<a:Modifier>lilili</a:Modifier>
<a:ModificationDate>1630993655</a:ModificationDate>
<a:Modifier>LQT</a:Modifier>
<a:DataType>tinyint(1)</a:DataType>
<a:Length>1</a:Length>
</o:Column>
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
+1 -1
View File
@@ -374,7 +374,7 @@ public class PayIncomeContractServiceImpl extends ServiceImpl<PayIncomeContractM
throw new JeroBootException("关联id不能为空！");
}
PayIncomeContractAssociated payIncomeContractAssociated = payIncomeContractAssociatedService.getById(input.getId());
if(Objects.equals(input.getContractId(),payIncomeContractAssociated.getContractId())){
if(!Objects.equals(input.getContractId(),payIncomeContractAssociated.getContractId())){
throw new JeroBootException("关联id不能为空！");
}
if(Objects.isNull(payIncomeContractAssociated)){
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+1 -1
View File
@@ -115,7 +115,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
return Result.error("企业id不能为空！");
}
List<PayWorkingGroupVO> list = payWorkingGroupService.queryListByCompany(companyId,workingGroupProject,year, PayProjectCommon.PROJECT_TYPE2);
if(CollectionUtils.isEmpty(list)){
if(!CollectionUtils.isEmpty(list)){
setPayWorkingGroupSubItem(list);
}
return Result.OK(list);