LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:80828

Browse Source
This commit is contained in:
梁琦涛
2024-01-15 16:26:04 +08:00
parent 50d3608b58
commit fc56a9a562
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+4 -1
View File
@@ -461,7 +461,9 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
} }
} }
// 工作组项目资料 // 工作组项目资料
if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE2)){ // 起草组项目资料
if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE2)
|| Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE7)){
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
LambdaQueryWrapper<PayWorkingGroupDistributionRecord> queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayWorkingGroupDistributionRecord> queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>();
queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getSubId,id); queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getSubId,id);
@@ -491,6 +493,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
} }
} }
String strProject = JSON.toJSONString(payCommonProject); String strProject = JSON.toJSONString(payCommonProject);
payCompanyCommonProject = JSONObject.parseObject(strProject,PayCompanyCommonProject.class); payCompanyCommonProject = JSONObject.parseObject(strProject,PayCompanyCommonProject.class);
if(Objects.isNull(payCompanyCommonProject.getPaidAmount())){ if(Objects.isNull(payCompanyCommonProject.getPaidAmount())){