|
@@ -781,6 +781,14 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
|
|
if (null != details) {
|
|
if (null != details) {
|
|
reportData.setDetails(details);
|
|
reportData.setDetails(details);
|
|
}
|
|
}
|
|
|
|
+ //根据报告类型查询下一节点用户
|
|
|
|
+ List<ReviewUser> stringList = new ArrayList<>();
|
|
|
|
+ if (reportData.getReportType().equals("1")) {
|
|
|
|
+ stringList = reportMapper.getReviewByS("1");
|
|
|
|
+ } else {
|
|
|
|
+ stringList = reportMapper.getReviewByS("2");
|
|
|
|
+ }
|
|
|
|
+ reportData.setReviewBys(stringList);
|
|
//将新增行数据查询出来放入到cwProjectInfoList中
|
|
//将新增行数据查询出来放入到cwProjectInfoList中
|
|
cwProjectInfoData = infoMapper.selectByReportId(reportData.getId());
|
|
cwProjectInfoData = infoMapper.selectByReportId(reportData.getId());
|
|
if (null != cwProjectInfoData){
|
|
if (null != cwProjectInfoData){
|
|
@@ -1085,6 +1093,14 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
|
|
if (null != details) {
|
|
if (null != details) {
|
|
reportData.setDetails(details);
|
|
reportData.setDetails(details);
|
|
}
|
|
}
|
|
|
|
+ //根据报告类型查询下一节点用户
|
|
|
|
+ List<ReviewUser> stringList = new ArrayList<>();
|
|
|
|
+ if (reportData.getReportType().equals("1")) {
|
|
|
|
+ stringList = reportMapper.getReviewByS("1");
|
|
|
|
+ } else {
|
|
|
|
+ stringList = reportMapper.getReviewByS("2");
|
|
|
|
+ }
|
|
|
|
+ reportData.setReviewBys(stringList);
|
|
//将新增行数据查询出来放入到cwProjectInfoList中
|
|
//将新增行数据查询出来放入到cwProjectInfoList中
|
|
cwProjectInfoData = infoMapper.selectByReportId(reportData.getId());
|
|
cwProjectInfoData = infoMapper.selectByReportId(reportData.getId());
|
|
if (null != cwProjectInfoData){
|
|
if (null != cwProjectInfoData){
|