浏览代码

审批列表检索空值校验,合同查看页面缩小抖动问题

梁世豪 7 月之前
父节点
当前提交
dd762acf9c

+ 28 - 24
src/main/java/com/liang/controller/PrjApproverecordController.java

@@ -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
 

+ 2 - 2
src/main/resources/templates/prjcontract/view.html

@@ -163,7 +163,7 @@
163 163
                     {type: 'numbers', align: 'center'},
164 164
                     {field: 'wjm', title: '文件名', width: '40%'},
165 165
                     {field: 'scrq', title: '上传日期', width: '15%', align: 'center'},
166
-                    {field: 'sm', title: '说明', edit: 'text'}
166
+                    {field: 'sm', title: '说明', edit: 'text',width: '35%'}
167 167
                 ]
168 168
             ],
169 169
             autoSort: false,
@@ -238,7 +238,7 @@
238 238
                     {type: 'numbers', align: 'center'},
239 239
                     {field: 'wjm', title: '文件名', width: '30%'},
240 240
                     {field: 'scrq', title: '上传日期', width: '15%', align: 'center'},
241
-                    {field: 'sm', title: '说明'}
241
+                    {field: 'sm', title: '说明',width: '40%'}
242 242
                 ]
243 243
             ],
244 244
             autoSort: false,