申领页面功能调整

src/main/java/com/scpyun/platform/jilinsscgsdp/service/impl/KeyDmBorrowServiceImpl.java

@@ -32,8 +32,10 @@ public class KeyDmBorrowServiceImpl {
     private final String detailNamespace = "com.scpyun.platform.standard.jilinsscgsdp.keyDmBorrowDetail.";
     private final String materialNamespace = "com.scpyun.platform.standard.jilinsscgsdp.keyDmMaterialLog.";
     @ApiOperation(value = "领用申请列表", desc = "分页查询")
-    public Page<Map<String, Object>> selectList(Page<Map<String, Object>> map) {
-        if (map == null) map = new Page<>();
+    public Page<Map<String, Object>> selectList(Map<String, Object> map) {
+        if (map == null) map = new HashMap<>();
+        Map<String, Object> user = (Map<String, Object>) map.get("_user");
+        map.put("user", user);
         return commonService.findPage(namespace + "selectList", map);
     }
 
@@ -50,6 +52,7 @@ public class KeyDmBorrowServiceImpl {
         if (map == null) map = new HashMap<>();
         return commonService.findPage(namespace + "selectHistoryList", map);
     }
+
     @Transactional(rollbackFor = Exception.class)
     @ApiOperation(value = "保存申请（含明细）", desc = "新增或修改申请")
     public String save(Map<String, Object> map) {

src/main/resources/mybatis/mappers/standard/jilinsscgsdp/KeyDmBorrowApplicationDao.xml

@@ -6,15 +6,22 @@
         SELECT * FROM jl_key_dm_borrow_application
         <where>
             is_used = 1
+            and applicant_id = #{params.user.id}
             <if test="params.params.applicant_name != null and params.params.applicant_name != ''">
                 AND applicant_name LIKE CONCAT('%', #{params.params.applicant_name}, '%')
             </if>
-            <if test="params.params.application_no != null and params.params.application_no != ''">
-                AND application_no LIKE CONCAT('%', #{params.params.application_no}, '%')
+            <if test="params.params.department_name != null and params.params.department_name != ''">
+                AND department_name LIKE CONCAT('%', #{params.params.department_name}, '%')
             </if>
             <if test="params.params.approval_status != null">
                 AND approval_status = #{params.params.approval_status}
             </if>
+            <if test="params.params.startDate != null">
+                AND submit_time &gt;= #{params.params.startDate}
+            </if>
+            <if test="params.params.endDate != null">
+                AND submit_time &lt;= #{params.params.endDate}
+            </if>
         </where>
         ORDER BY create_time DESC
     </select>
@@ -29,21 +36,27 @@
         ORDER BY submit_time DESC
     </select>
 
-    <select id="selectHistoryList" parameterType="page" resultType="map">
+    <select id="selectHistoryList" parameterType="map" resultType="map">
         SELECT * FROM jl_key_dm_borrow_application
         <where>
             is_used = 1
-            <if test="params.applicant_name != null and params.applicant_name != ''">
-                AND applicant_name LIKE CONCAT('%', #{params.applicant_name}, '%')
+            <if test="params.params.applicant_name != null and params.params.applicant_name != ''">
+                AND applicant_name LIKE CONCAT('%', #{params.params.applicant_name}, '%')
             </if>
-            <if test="params.application_no != null and params.application_no != ''">
-                AND application_no LIKE CONCAT('%', #{params.application_no}, '%')
+            <if test="params.params.department_name != null and params.params.department_name != ''">
+                AND department_name LIKE CONCAT('%', #{params.params.department_name}, '%')
             </if>
-            <if test="params.approval_status != null and params.approval_status != ''">
-                AND approval_status = #{params.approval_status}
+            <if test="params.params.approval_status != null">
+                AND approval_status = #{params.params.approval_status}
+            </if>
+            <if test="params.params.startDate != null">
+                AND submit_time &gt;= #{params.params.startDate}
+            </if>
+            <if test="params.params.endDate != null">
+                AND submit_time &lt;= #{params.params.endDate}
             </if>
         </where>
-        ORDER BY approval_complete_time DESC
+        ORDER BY create_time DESC
     </select>
 
     <select id="getById" parameterType="map" resultType="map">