diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index b9801a29..b3cb3518 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -1061,6 +1061,15 @@ public class DepositoryRecordController { } } + if (map.containsKey("applicantName")) { + List applicantIdList = new ArrayList<>(); + List applicantName = userService.findUserByName(map.get("applicantName").toString()); + for (UserByPort byPort : applicantName) { + applicantIdList.add(byPort.getId()); + } + map.put("applicantIdList",applicantIdList); + } + if (PublicConfig.roleAdminorgList.contains(maindeparment)) { list = depositoryRecordService.findApplicationOutRecordPByCondition(map, userByPort, userKey, token); countBy = depositoryRecordService.findApplicationOutRecordPCountByCondition(map); diff --git a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.xml index bcaacfde..333e3569 100644 --- a/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.xml @@ -639,6 +639,15 @@ and constructionunitid = #{constructionunitid} + + + and applicantId in + + #{applicantId} + + + + GROUP BY aorid @@ -707,6 +716,13 @@ and constructionunitid = #{constructionunitid} + + and applicantId in + + #{applicantId} + + + GROUP BY aorid @@ -770,6 +786,13 @@ and constructionunitid = #{constructionunitid} + + and applicantId in + + #{applicantId} + + + @@ -1035,6 +1058,13 @@ and constructionunitid = #{constructionunitid} + + and applicantId in + + #{applicantId} + + + diff --git a/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.java b/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.java index 9bdee4dd..fe28b408 100644 --- a/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.java +++ b/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.java @@ -65,4 +65,11 @@ public interface UserMapper { * @return */ Integer findUserCountByCondition(Map map); + + /** + * 根据用户名称查询用户信息 + * @param name 待查询名称 + * @return + */ + List findUserByName(String name); } diff --git a/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.xml b/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.xml index 6e3e9157..6fcb81b0 100644 --- a/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.xml @@ -196,4 +196,16 @@ and person_in_charge = #{personInCharge} + + + + \ No newline at end of file diff --git a/src/main/java/com/dreamchaser/depository_manage/service/UserService.java b/src/main/java/com/dreamchaser/depository_manage/service/UserService.java index 66a0e28c..14c64634 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/UserService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/UserService.java @@ -89,4 +89,12 @@ public interface UserService { */ UserByPort findUserByWorkWechat(String workWechat); + + /** + * 根据用户名称查询用户信息 + * @param name 待查询名称 + * @return + */ + List findUserByName(String name); + } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/UserServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/UserServiceImpl.java index d11d5a71..7342c547 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/UserServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/UserServiceImpl.java @@ -154,6 +154,17 @@ public class UserServiceImpl implements UserService { return packForOne(userMapper.findUserByWorkWechat(workWechat)); } + /** + * 根据用户名称查询用户信息 + * @param name 待查询名称 + * @return + */ + @Override + public List findUserByName(String name){ + return userMapper.findUserByName(name); + } + + public UserByPort packForOne(UserByPort userByPort) { // 获取当前用户所处部门 Administration departmentByUser = administrativeService.getDepartmentByUser(userByPort); diff --git a/src/main/resources/templates/pages/depository/table-out.html b/src/main/resources/templates/pages/depository/table-out.html index b5394f63..2ae3ebd3 100644 --- a/src/main/resources/templates/pages/depository/table-out.html +++ b/src/main/resources/templates/pages/depository/table-out.html @@ -23,18 +23,6 @@
-
- -
- - - - -
-
@@ -59,6 +47,14 @@ class="layui-input"/>
+
+ +
+ +
+
@@ -67,12 +63,24 @@
+
- +
- + + - + +
+
+
+ +
+
@@ -104,14 +112,6 @@ th:style="'display:'+${display}">删除 - - -
@@ -250,9 +250,6 @@ , id: "showEchart" , icon: 'layui-icon-chart-screen' }], - css: [ // 设置单元格样式 - '.layui-btn{height: 26px; line-height: 26px;}', - ].join(''), cols: [ [ {type: "checkbox", width: 50}, @@ -293,19 +290,7 @@ } $.each(res['data'], function (i, j) { - let dropdownData = []; let allApproval = j["allApproval"]; - let id = j["id"]; - let mnameList = j["mname"].split(","); - for (let k = 0; k < mnameList.length; k++) { - let mnameItem = mnameList[k]; - if(mnameItem !== ""){ - let req = {}; - req.title = mnameItem; - req.id = k; - dropdownData.push(req) - } - } let pass = j["pass"]; if (pass === 3) { if (allApproval) { @@ -319,11 +304,6 @@ Layui_SetDataTableRowColor('table', i + 1, '#ff211e'); } - // dropdown 方式的下拉选择 - dropdown.render({ - elem:'.mname'+id, - data:dropdownData - }); }); @@ -380,6 +360,9 @@ if (data.version !== '') { req.version = data.version.trim(); } + if (data.applicantName !== '') { + req.applicantName = data.applicantName.trim(); + } req.groupByForState = true; //执行搜索重载 table.reloadData('currentTableId', { diff --git a/src/main/resources/templates/pages/depository/table-out_mobile.html b/src/main/resources/templates/pages/depository/table-out_mobile.html index d815dafd..67014e2a 100644 --- a/src/main/resources/templates/pages/depository/table-out_mobile.html +++ b/src/main/resources/templates/pages/depository/table-out_mobile.html @@ -59,6 +59,16 @@ class="layui-input"/> + + +
+ +
+ +
+
@@ -66,13 +76,11 @@ placeholder="请填写物料编码">
-
- +
- +
@@ -240,6 +248,9 @@ if (data.version !== '') { req.version = data.version.trim(); } + if (data.applicantName !== '') { + req.applicantName = data.applicantName.trim(); + } //执行搜索重载 updateFlow(req); return false;