|
@@ -1101,32 +1101,36 @@ public class PrjApproverecordController extends BaseController {
|
1101
|
1101
|
paraMap.put("xmid", xmid.toString());
|
1102
|
1102
|
paraMap.put("tableName", tableName.toString());
|
1103
|
1103
|
List<PrjApproverecord> list = prjApproverecordService.getApproveByXmId2(paraMap);
|
1104
|
|
-
|
1105
|
|
- //判断备用金是否关联项目
|
1106
|
|
- if (list.get(0).getTablename().equals("sta_BudgetApproval")) {
|
1107
|
|
- PrjApproverecord prjApproverecord = new PrjApproverecord();
|
1108
|
|
- StaBudgetapproval staBudgetapproval = staBudgetapprovalService.queryById(list.get(0).getXmid());
|
1109
|
|
- System.out.println(staBudgetapproval.toString());
|
1110
|
|
- if (staBudgetapproval.getSfbyj() == true && staBudgetapproval.getXmmc() != null) {
|
1111
|
|
- prjApproverecord.setWc(true);
|
1112
|
|
- prjApproverecord.setZt("该备用金已关联项目");
|
1113
|
|
- list.add(prjApproverecord);
|
1114
|
|
- } else if (staBudgetapproval.getSfbyj() == true && staBudgetapproval.getXmmc() == null && "审批结束".equals(staBudgetapproval.getSpzt()) || "".equals(staBudgetapproval.getXmmc())) {
|
1115
|
|
- prjApproverecord.setWc(false);
|
1116
|
|
- prjApproverecord.setZt("该备用金暂未关联项目");
|
1117
|
|
- prjApproverecord.setShrxm(PostInfoEnum.KJXMGLZZ.postName());
|
1118
|
|
- list.add(prjApproverecord);
|
|
1104
|
+ if (list.isEmpty()){
|
|
1105
|
+ Map<String, Object> result = new HashMap<>();
|
|
1106
|
+ return BaseResult.success(result);
|
|
1107
|
+ }else {
|
|
1108
|
+ //判断备用金是否关联项目
|
|
1109
|
+ if (list.get(0).getTablename().equals("sta_BudgetApproval")) {
|
|
1110
|
+ PrjApproverecord prjApproverecord = new PrjApproverecord();
|
|
1111
|
+ StaBudgetapproval staBudgetapproval = staBudgetapprovalService.queryById(list.get(0).getXmid());
|
|
1112
|
+ System.out.println(staBudgetapproval.toString());
|
|
1113
|
+ if (staBudgetapproval.getSfbyj() == true && staBudgetapproval.getXmmc() != null) {
|
|
1114
|
+ prjApproverecord.setWc(true);
|
|
1115
|
+ prjApproverecord.setZt("该备用金已关联项目");
|
|
1116
|
+ list.add(prjApproverecord);
|
|
1117
|
+ } else if (staBudgetapproval.getSfbyj() == true && staBudgetapproval.getXmmc() == null && "审批结束".equals(staBudgetapproval.getSpzt()) || "".equals(staBudgetapproval.getXmmc())) {
|
|
1118
|
+ prjApproverecord.setWc(false);
|
|
1119
|
+ prjApproverecord.setZt("该备用金暂未关联项目");
|
|
1120
|
+ prjApproverecord.setShrxm(PostInfoEnum.KJXMGLZZ.postName());
|
|
1121
|
+ list.add(prjApproverecord);
|
|
1122
|
+ }
|
1119
|
1123
|
}
|
|
1124
|
+ PageInfo<PrjApproverecord> pageinfo = new PageInfo<>(list);
|
|
1125
|
+ //取出查询结果
|
|
1126
|
+ List<PrjApproverecord> rows = pageinfo.getList();
|
|
1127
|
+ int total = (int) pageinfo.getTotal();
|
|
1128
|
+ Map<String, Object> result = new HashMap<>();
|
|
1129
|
+ result.put(RESULT_ROWS, rows);
|
|
1130
|
+ result.put(RESULT_TOTAL, total);
|
|
1131
|
+
|
|
1132
|
+ return BaseResult.success(result);
|
1120
|
1133
|
}
|
1121
|
|
- PageInfo<PrjApproverecord> pageinfo = new PageInfo<>(list);
|
1122
|
|
- //取出查询结果
|
1123
|
|
- List<PrjApproverecord> rows = pageinfo.getList();
|
1124
|
|
- int total = (int) pageinfo.getTotal();
|
1125
|
|
- Map<String, Object> result = new HashMap<>();
|
1126
|
|
- result.put(RESULT_ROWS, rows);
|
1127
|
|
- result.put(RESULT_TOTAL, total);
|
1128
|
|
-
|
1129
|
|
- return BaseResult.success(result);
|
1130
|
1134
|
}
|
1131
|
1135
|
}
|
1132
|
1136
|
|