在出库查询页面添加按申请人搜索功能

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

@@ -1061,6 +1061,15 @@ public class DepositoryRecordController {
             }
         }
 
+        if (map.containsKey("applicantName")) {
+            List<Long> applicantIdList = new ArrayList<>();
+            List<UserByPort> 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);

src/main/java/com/dreamchaser/depository_manage/depository_mapper/DepositoryRecordMapper.xml

@@ -639,6 +639,15 @@
         <if test="constructionunitid != null and constructionunitid != ''">
             and constructionunitid = #{constructionunitid}
         </if>
+
+        <if test="applicantIdList != null">
+            and  applicantId   in
+            <foreach collection="applicantIdList" index="index" item="applicantId" open="(" separator="," close=")">
+                #{applicantId}
+            </foreach>
+
+        </if>
+
         <if test="isGroup != null and isGroup != ''">
             GROUP BY aorid
         </if>
@@ -707,6 +716,13 @@
         <if test="constructionunitid != null and constructionunitid != ''">
             and constructionunitid = #{constructionunitid}
         </if>
+        <if test="applicantIdList != null">
+            and  applicantId   in
+            <foreach collection="applicantIdList" index="index" item="applicantId" open="(" separator="," close=")">
+                #{applicantId}
+            </foreach>
+
+        </if>
         <if test="isGroup != null and isGroup != ''">
             GROUP BY aorid
         </if>
@@ -770,6 +786,13 @@
         <if test="constructionunitid != null and constructionunitid != ''">
             and constructionunitid = #{constructionunitid}
         </if>
+        <if test="applicantIdList != null">
+            and  applicantId   in
+            <foreach collection="applicantIdList" index="index" item="applicantId" open="(" separator="," close=")">
+                #{applicantId}
+            </foreach>
+
+        </if>
     </select>
 
     <!--    查询所有入库记录-->
@@ -1035,6 +1058,13 @@
         <if test="constructionunitid != null and constructionunitid != ''">
             and constructionunitid = #{constructionunitid}
         </if>
+        <if test="applicantIdList != null">
+            and  applicantId   in
+            <foreach collection="applicantIdList" index="index" item="applicantId" open="(" separator="," close=")">
+                #{applicantId}
+            </foreach>
+
+        </if>
 
     </select>
 

src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.java

@@ -65,4 +65,11 @@ public interface UserMapper {
      * @return
      */
     Integer findUserCountByCondition(Map<String, Object> map);
+
+    /**
+     * 根据用户名称查询用户信息
+     * @param name 待查询名称
+     * @return
+     */
+    List<UserByPort> findUserByName(String name);
 }

src/main/java/com/dreamchaser/depository_manage/hrNew_mapper/UserMapper.xml

@@ -196,4 +196,16 @@
             and person_in_charge = #{personInCharge}
         </if>
     </select>
+
+
+    <select id="findUserByName" resultMap="userMap" parameterType="string">
+        select
+        <include refid="manContAllColumn"/>
+        from man_cont
+        where 1 = 1
+        <if test="name != null and name != ''">
+            and name like concat('%',#{name},'%')
+        </if>
+    </select>
+
 </mapper>

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<UserByPort> findUserByName(String name);
+
 }

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<UserByPort> findUserByName(String name){
+        return userMapper.findUserByName(name);
+    }
+
+
     public UserByPort packForOne(UserByPort userByPort) {
         // 获取当前用户所处部门
         Administration departmentByUser = administrativeService.getDepartmentByUser(userByPort);

src/main/resources/templates/pages/depository/table-out.html

@@ -23,18 +23,6 @@
                         <form class="layui-form layui-form-pane" action="">
                             <input style="display: none" th:value="${type}" id="selectDepositoryType">
                             <div class="layui-form-item">
-                                <div class="layui-inline">
-                                    <label class="layui-form-label">申请时间</label>
-                                    <div class="layui-input-block">
-                                        <input type="text" style="display:inline;width: 130px;" id="startDate"
-                                               name="startDate"
-                                               autocomplete="off" placeholder="开始日期" class="layui-input">
-                                        -
-                                        <input type="text" style="display:inline;width: 130px;" id="endDate"
-                                               name="endDate"
-                                               autocomplete="off" placeholder="结束日期" class="layui-input">
-                                    </div>
-                                </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">仓库</label>
                                     <div class="layui-input-block">
@@ -59,6 +47,14 @@
                                                class="layui-input"/>
                                     </div>
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">型号</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" id="version" name="version"
+                                               autocomplete="off"
+                                               placeholder="请填写物料型号"/>
+                                    </div>
+                                </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">物料编码</label>
                                     <div class="layui-input-block">
@@ -67,12 +63,24 @@
                                     </div>
                                 </div>
 
+
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">型号</label>
+                                    <label class="layui-form-label">申请时间</label>
                                     <div class="layui-input-block">
-                                        <input type="text" class="layui-input" id="version" name="version"
+                                        <input type="text" style="display:inline;width: 130px;" id="startDate"
-                                               autocomplete="off"
+                                               name="startDate"
-                                               placeholder="请填写物料型号"/>
+                                               autocomplete="off" placeholder="开始日期" class="layui-input">
+                                        -
+                                        <input type="text" style="display:inline;width: 130px;" id="endDate"
+                                               name="endDate"
+                                               autocomplete="off" placeholder="结束日期" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">申请人</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" name="applicantName" autocomplete="off" class="layui-input"
+                                               placeholder="请填写申请人名称">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
@@ -104,14 +112,6 @@
                th:style="'display:'+${display}">删除</a>
         </script>
 
-
-        <script type="text/html" id="mnameSelect">
-            <button class="layui-btn layui-btn-primary dropdpwn-demo mname{{d.id}}">
-                <span>{{= d.mname.split(",")[0] }}</span>
-                <i class="layui-icon layui-icon-down layui-font-12"></i>
-            </button>
-        </script>
-
     </div>
 </div>
 <script src="/static/lib/layui-v2.8.6/layui.js" charset="utf-8"></script>
@@ -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', {

src/main/resources/templates/pages/depository/table-out_mobile.html

@@ -59,6 +59,16 @@
                                                class="layui-input"/>
                                     </div>
                                 </div>
+
+
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">型号</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" id="version" name="version"
+                                               autocomplete="off"
+                                               placeholder="请填写物料型号"/>
+                                    </div>
+                                </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">物料编码</label>
                                     <div class="layui-input-block">
@@ -66,13 +76,11 @@
                                                placeholder="请填写物料编码">
                                     </div>
                                 </div>
-
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">型号</label>
+                                    <label class="layui-form-label">申请人</label>
                                     <div class="layui-input-block">
-                                        <input type="text" class="layui-input" id="version" name="version"
+                                        <input type="text" name="applicantName" autocomplete="off" class="layui-input"
-                                               autocomplete="off"
+                                               placeholder="请填写申请人名称">
-                                               placeholder="请填写物料型号"/>
                                     </div>
                                 </div>
                                 <div class="layui-inline">
@@ -240,6 +248,9 @@
             if (data.version !== '') {
                 req.version = data.version.trim();
             }
+            if (data.applicantName !== '') {
+                req.applicantName = data.applicantName.trim();
+            }
             //执行搜索重载
             updateFlow(req);
             return false;