Accept Merge Request #28: (develop-wxl -> master)

Merge Request: hebing

Created By: @万新亮
Accepted By: @万新亮
URL: https://chuanghaikeji.coding.net/p/smarCampus/d/iHotel_student_houtai/git/merge/28

src/main/java/com/template/api/ApplicationProcedureTemporaryControllerAPI.java

@@ -29,6 +29,6 @@ public interface ApplicationProcedureTemporaryControllerAPI {
 
     @GetMapping("/appletList")
     @ApiOperation(value = "小程序-临时人员流程管理展示", notes = "小程序-临时人员流程管理展示", httpMethod = "GET")
-    CommonResult appletList(int adminMenuId,String startTime,String endTime,String status,int page, int size);
+    CommonResult appletList(int adminMenuId,String startTime,String endTime,String status,String OrgIds,int page, int size);
 
 }

src/main/java/com/template/controller/AppletLoginController.java

@@ -129,6 +129,8 @@ public class AppletLoginController implements AppletLoginControllerAPI {
             String adminMenuName="";
             String usersId="";
             String manager="0";
+            String OrgIds="";
+            String parentId="";
             if (ObjectUtils.isNotEmpty(users)) {
                  usersId = String.valueOf(users.getId());
 //                通过用户id找到管理端用户id和角色id
@@ -139,11 +141,12 @@ public class AppletLoginController implements AppletLoginControllerAPI {
                 if (ObjectUtils.isNotEmpty(admin)) {
                     adminId = String.valueOf(admin.getId());
                     adminMenuId = admin.getAdminMenuId();
-
+                    OrgIds=admin.getCheckOrg();
                     AdminMenu adminMenu = adminMenuService.getById(adminMenuId);
 
                     if (ObjectUtils.isNotEmpty(adminMenu)) {
                          adminMenuName = adminMenu.getName();
+                         parentId=adminMenu.getParentId()+"";
                     }
                     //            判断是否是管理员
                     PermissionSetting permissionSetting = permissionSettingService.getMenuPermissionSetting(adminMenuId);
@@ -190,7 +193,7 @@ public class AppletLoginController implements AppletLoginControllerAPI {
            log.info("adminMenuId= "+adminMenuId);
 
           //  System.out.println("重定向路径=" + "redirect:"+ "https://chtech.ncjti.edu.cn/hotel/h5/#/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head);
-           return "redirect:"+ "https://chtech.ncjti.edu.cn/hotel/h5/#/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head+"&name="+encodeName+"&telephone="+telephone+"&department="+identityTitle+"&manager="+manager+"&head_image="+headImage;
+           return "redirect:"+ "https://chtech.ncjti.edu.cn/hotel/h5/#/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head+"&name="+encodeName+"&telephone="+telephone+"&department="+identityTitle+"&manager="+manager+"&head_image="+headImage+"&OrgIds="+OrgIds+"&parentId="+parentId;
 //            return "redirect:"+ "http://192.168.161.33:8000/hotel/h5/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head+"&name="+encodeName+"&telephone="+telephone+"&department="+identityTitle+"&manager="+manager;
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/template/controller/ApplicationProcedureTemporaryController.java

@@ -417,29 +417,32 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
     }
 
     @Override
-    public CommonResult appletList(int adminMenuId, String startTime, String endTime, String status, int page, int size) {
+    public CommonResult appletList(int adminMenuId, String startTime, String endTime, String status,String OrgIds, int page, int size) {
         if (ObjectUtils.isEmpty(page) || page <= 0) {
             page = 1;
         }
         if (ObjectUtils.isEmpty(size) || size <= 0) {
             size = 10;
         }
-
+        PageUtils<ApplicationProcedureTemporaryVo> pageList = new PageUtils(new ArrayList(),0,size,page);
+        if(!StringUtils.hasText(OrgIds)){
+            return CommonResult.ok(pageList);
+        }
+        String[] arr=OrgIds.replaceAll(" ","").split(",");
+        List<String> orgList = new ArrayList<>(Arrays.asList(arr));
         List<ApplicationProcedureSetting> list = applicationProcedureSettingService.list(new LambdaQueryWrapper<>());
         ApplicationProcedureSetting applicationProcedureSetting = list.get(0);
         String approverType = applicationProcedureSetting.getApproverType();
 
         AdminMenu byId = adminMenuService.getById(adminMenuId);
         Integer parentId = byId.getParentId();
-
-        PageUtils<ApplicationProcedureTemporaryVo> pageList = null;
         //审批一次，角色等级不为0
         if ("1".equals(approverType)) {
             if (parentId != 0) {
                 return CommonResult.fail("暂无查看权限");
             } else {
 
-                pageList = applicationProcedureTemporaryService.pageAppletList(startTime, endTime, status, page, size);
+                pageList = applicationProcedureTemporaryService.pageAppletList(startTime, endTime, status, page, size,orgList);
                 return CommonResult.ok(pageList);
 
             }
@@ -453,12 +456,12 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
                 status = "0,2,3";
             }
 
-            pageList = applicationProcedureTemporaryService.parentAppletPageList(startTime, endTime, status, page, size);
+            pageList = applicationProcedureTemporaryService.parentAppletPageList(startTime, endTime, status, page, size,orgList);
 
             return CommonResult.ok(pageList);
         }
 
-        pageList = applicationProcedureTemporaryService.pageAppletList(startTime, endTime, status, page, size);
+        pageList = applicationProcedureTemporaryService.pageAppletList(startTime, endTime, status, page, size,orgList);
         return CommonResult.ok(pageList);
 
 

src/main/java/com/template/mapper/ApplicationProcedureTemporaryMapper.java

@@ -35,8 +35,9 @@ public interface ApplicationProcedureTemporaryMapper extends BaseMapper<Applicat
 
     List<ApplicationProcedureTemporary> getDate(@Param("dateTime") LocalDateTime dateTime,@Param("userId") String userId);
 
-    IPage<ApplicationProcedureTemporaryVo> pageAppletList(Page<ApplicationProcedureTemporaryVo> pageVo,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("status") String status);
+    IPage<ApplicationProcedureTemporaryVo> pageAppletList(Page<ApplicationProcedureTemporaryVo> pageVo,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("status") String status,@Param("orgList")List<String> orgList);
 
+    IPage<ApplicationProcedureTemporaryVo> parentAppletPageList(Page<ApplicationProcedureTemporaryVo> pageVo, @Param("startTime") String startTime,@Param("endTime") String endTime,@Param("status") String status,@Param("orgList")List<String> orgList);
     IPage<ApplicationProcedureTemporaryVo> parentAppletPageList(Page<ApplicationProcedureTemporaryVo> pageVo, @Param("startTime") String startTime,@Param("endTime") String endTime,@Param("status") String status);
 
     List<ApplicationProcedureTemporary> getApt(@Param("state") LocalDate state,@Param("end") LocalDate end,@Param("userId") String userId);

src/main/java/com/template/services/ApplicationProcedureTemporaryService.java

@@ -31,8 +31,9 @@ public interface ApplicationProcedureTemporaryService extends IService<Applicati
 
     List<ApplicationProcedureTemporary> getDate(LocalDateTime dateTime, String userId);
 
-    PageUtils<ApplicationProcedureTemporaryVo> pageAppletList(String startTime, String endTime, String status, int page, int size);
+    PageUtils<ApplicationProcedureTemporaryVo> pageAppletList(String startTime, String endTime, String status, int page, int size,List<String> orgList);
 
+    PageUtils<ApplicationProcedureTemporaryVo> parentAppletPageList(String startTime, String endTime, String status, int page, int size,List<String> orgList);
     PageUtils<ApplicationProcedureTemporaryVo> parentAppletPageList(String startTime, String endTime, String status, int page, int size);
 
     List<ApplicationProcedureTemporary> getApt(LocalDate state, LocalDate end, String userId);

src/main/java/com/template/services/impl/ApplicationProcedureTemporaryServiceImpl.java

@@ -62,16 +62,16 @@ public class ApplicationProcedureTemporaryServiceImpl extends ServiceImpl<Applic
     }
 
     @Override
-    public PageUtils<ApplicationProcedureTemporaryVo> pageAppletList(String startTime, String endTime, String status, int page, int size) {
+    public PageUtils<ApplicationProcedureTemporaryVo> pageAppletList(String startTime, String endTime, String status, int page, int size,List<String> orgList) {
         Page<ApplicationProcedureTemporaryVo> pageVo = new Page<>(page,size);
-        IPage<ApplicationProcedureTemporaryVo> result=applicationProcedureTemporaryMapper.pageAppletList(pageVo,startTime,endTime,status);
+        IPage<ApplicationProcedureTemporaryVo> result=applicationProcedureTemporaryMapper.pageAppletList(pageVo,startTime,endTime,status,orgList);
         return new PageUtils(result);
     }
 
     @Override
-    public PageUtils<ApplicationProcedureTemporaryVo> parentAppletPageList(String startTime, String endTime, String status, int page, int size) {
+    public PageUtils<ApplicationProcedureTemporaryVo> parentAppletPageList(String startTime, String endTime, String status, int page, int size,List<String> orgList) {
         Page<ApplicationProcedureTemporaryVo> pageVo = new Page<>(page,size);
-        IPage<ApplicationProcedureTemporaryVo> result=applicationProcedureTemporaryMapper.parentAppletPageList(pageVo,startTime,endTime,status);
+        IPage<ApplicationProcedureTemporaryVo> result=applicationProcedureTemporaryMapper.parentAppletPageList(pageVo,startTime,endTime,status,orgList);
         return new PageUtils(result);
     }
 

src/main/resources/mapper/template/ApplicationProcedureTemporaryMapper.xml

@@ -223,7 +223,8 @@
             ap.secondary_examine_and_approve_remark as secondaryExamineAndApproveRemark,
             a.name as approverName,
             a2.name as secondaryApproverName,
-            u.user_name as usersName
+            u.user_name as usersName,
+            ap.house_count as houseCount
         FROM
             `application_procedure_temporary` ap
                 LEFT JOIN admin a on a.id=ap.approver_id
@@ -263,7 +264,8 @@
             ap.secondary_approver_id as secondaryApproverId,
             ap.secondary_examine_and_approve_time as secondaryExamineAndApproveTime,
             ap.secondary_examine_and_approve_remark as secondaryExamineAndApproveRemark,
-            u.user_name as usersName
+            u.user_name as usersName,
+            ap.house_count as houseCount
         FROM
             `application_procedure_temporary` ap
                 LEFT JOIN users u on u.id=ap.users_id and u.deleted=0
@@ -272,7 +274,12 @@
         <if test="startTime != null and startTime != ''  and  endTime != null and startTime != '' ">
             AND ap.submission_time>=#{startTime} and #{endTime}>=ap.submission_time
         </if>
-
+        <if test="orgList != null and orgList.size() > 0">
+            and ap.orgId in
+            <foreach collection="orgList" item="orgId" index="index" open="(" close=")" separator=",">
+                ${orgId}
+            </foreach>
+        </if>
         <if test="status != null and status != ''">
             AND ap.`status`=#{status}
         </if>
@@ -295,7 +302,8 @@
         ap.secondary_approver_id as secondaryApproverId,
         ap.secondary_examine_and_approve_time as secondaryExamineAndApproveTime,
         ap.secondary_examine_and_approve_remark as secondaryExamineAndApproveRemark,
-        u.user_name as usersName
+        u.user_name as usersName,
+        ap.house_count as houseCount
         FROM
         `application_procedure_temporary` ap
         LEFT JOIN users u on u.id=ap.users_id and u.deleted=0
@@ -304,6 +312,12 @@
         <if test="startTime != null and startTime != ''  and  endTime != null and startTime != '' ">
             AND ap.submission_time>=#{startTime} and #{endTime}>=ap.submission_time
         </if>
+        <if test="orgList != null and orgList.size() > 0">
+            and ap.orgId in
+            <foreach collection="orgList" item="orgId" index="index" open="(" close=")" separator=",">
+                ${orgId}
+            </foreach>
+        </if>
         and FIND_IN_SET(ap.status,#{status})
         ORDER BY ap.submission_time DESC
     </select>