fix:80828
This commit is contained in:
+8
-5
@@ -359,7 +359,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
|
||||
return Result.OK(listPayCommonProjectOutputNew);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
@@ -381,7 +381,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
|
||||
payCommonProjectService.addPayCommonProject(payCommonProject);
|
||||
return Result.OK("添加成功!");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
@@ -420,7 +420,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
|
||||
payCommonProjectService.delete(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
@@ -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();
|
||||
LambdaQueryWrapper<PayWorkingGroupDistributionRecord> queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>();
|
||||
queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getSubId,id);
|
||||
@@ -491,6 +493,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
String strProject = JSON.toJSONString(payCommonProject);
|
||||
payCompanyCommonProject = JSONObject.parseObject(strProject,PayCompanyCommonProject.class);
|
||||
if(Objects.isNull(payCompanyCommonProject.getPaidAmount())){
|
||||
@@ -557,7 +560,7 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
|
||||
}
|
||||
return Result.OK(payCompanyCommonProject);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user