修改系统审批功能

src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java

@@ -853,7 +853,11 @@ public class DepositoryRecordController {
         // 获取对应主订单
         List<ApplicationOutRecordP> list = new ArrayList<>();
         Integer countBy = 0;
-        if (Integer.compare(userByPort.getMaindeparment(), 361) == 0) {
+        Integer role = userByPort.getIsadmin();
+        if (role == null) {
+            role = 1;
+        }
+        if ((Integer.compare(userByPort.getMaindeparment(), 361) == 0) || role == 4) {
             list = depositoryRecordService.findApplicationOutRecordPByCondition(map, userByPort);
             countBy = depositoryRecordService.findApplicationOutRecordPCountByCondition(map);
         } else {
@@ -1592,8 +1596,7 @@ public class DepositoryRecordController {
                         typeList.add((String) inRecord.get("inType"));
                         depositoryIdList.add(ObjectFormatUtil.toInteger(inRecord.get("depositoryId")));
                     }
-                }
+                } else {
-                else {
                     success += depositoryRecordService.applicationInPlace(inRecord, false);
                     recordIds.add(ObjectFormatUtil.toInteger(inRecord.get("applicationInId")));
                     mtIdList.add(ObjectFormatUtil.toLong(inRecord.get("mtId")));
@@ -1708,8 +1711,7 @@ public class DepositoryRecordController {
                     }
                 }
             }).start();
-        }
+        } else if ("out".equals(type)) {
-        else if ("out".equals(type)) {
             Map<String, Object> mainRecord = new HashMap<>();
             Integer sumQuantity = 0;
             for (Object o : quantitys) {

target/classes/templates/pages/application/form-step-look_back.html

@@ -108,16 +108,16 @@
                                 <input id="depositoryManagerPass" style="display: none" th:value="${record.getDepositoryManagerPass()}">
 
                                 <tr id="depositoryManagerNameT" style="display: none">
-                                    <td>仓储负责人</td>
+                                    <td th:text="${depositoryManagerText}"></td>
 
-                                    <td id="depositoryManagerName" th:text="${record.getDepositoryManagerName()}">仓储负责人</td>
+                                    <td id="depositoryManagerName" th:text="${record.getDepositoryManagerName()}"></td>
                                 </tr>
                                 <tr id="depositoryManagerNameMessageT" style="display: none">
-                                    <td>仓储负责人备注</td>
+                                    <td th:text="${depositoryManagerText}+'备注'"></td>
                                     <td id="depositoryManagerNameMessage" th:text="${record.getDepositoryManagerMessage()}">2016-11-28</td>
                                 </tr>
                                 <tr id="depositoryManagerNameTimeT" style="display: none">
-                                    <td>仓储负责人审核时间</td>
+                                    <td th:text="${depositoryManagerText}+'审核时间'"></td>
                                     <td id="depositoryManagerNameTime" th:text="${record.getDepositoryManagerTime().equals('1970-01-01 08:00:00')?'':record.getDepositoryManagerTime()}">2016-11-28</td>
                                 </tr>