更新

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

@@ -140,11 +140,12 @@ public class AppletLoginController implements AppletLoginControllerAPI {
                          adminMenuName = adminMenu.getName();
                     }
                     //            判断是否是管理员
-                    PermissionSetting permissionSetting = permissionSettingService.getById(adminMenuId);
+                    PermissionSetting permissionSetting = permissionSettingService.getMenuPermissionSetting(adminMenuId);
                     if (ObjectUtils.isNotEmpty(permissionSetting)) {
                         //      判断该用户是否拥有权限
                         //      判断该用户是否拥有权限
                         String processManagement = permissionSetting.getProcessManagement();
+                        log.info("processManagement= "+processManagement);
                         if (processManagement.equals("0")) {
                             manager="1";
                         }else if (processManagement.contains("3")&&processManagement.contains("4")&&processManagement.contains("5")){
@@ -176,6 +177,9 @@ public class AppletLoginController implements AppletLoginControllerAPI {
             }
             String user_head = AesUtils.encrypt(adminId);
 
+           log.info("usersId= "+usersId);
+           log.info("adminId= "+adminId);
+           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;

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

@@ -127,12 +127,10 @@ public class ApplicationProcedureController implements ApplicationProcedureContr
         PageUtils<ApplicationProcedureVo> pageList=null;
         //审批一次，角色等级不为0
         if ("1".equals(approverType)) {
-            if (parentId!=0) {
-                return CommonResult.ok("无审批权限");
-            }else {
+
                 pageList=applicationProcedureService.pageList(submissionStartTime,submissionEndTime,examineAndApproveStartTime,examineAndApproveEndTime,type,department,key,page,size);
                 return CommonResult.ok(pageList);
-            }
+
 
         }
 

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

@@ -31,7 +31,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author ceshi
@@ -59,21 +59,21 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         }
         Integer usersId = applicationProcedureDto.getUsersId();
 //        一个人只能有一个待审批的
-        List<ApplicationProcedureTemporary> list=applicationProcedureTemporaryService.list(new QueryWrapper<ApplicationProcedureTemporary>()
-                .eq("users_id",usersId)
-                .eq("status","1"));
-        if(!list.isEmpty()){
-            for(ApplicationProcedureTemporary apt:list){
-                if(apt.getEndTime().equals(applicationProcedureDto.getEndTime())
-                        ||apt.getStartTime().equals(applicationProcedureDto.getStartTime())){
+        List<ApplicationProcedureTemporary> list = applicationProcedureTemporaryService.list(new QueryWrapper<ApplicationProcedureTemporary>()
+                .eq("users_id", usersId)
+                .eq("status", "1"));
+        if (!list.isEmpty()) {
+            for (ApplicationProcedureTemporary apt : list) {
+                if (apt.getEndTime().equals(applicationProcedureDto.getEndTime())
+                        || apt.getStartTime().equals(applicationProcedureDto.getStartTime())) {
                     return CommonResult.fail("相同日期已有待审批申请");
                 }
                 try {
-                    boolean a=TimeExchange.CompareDate(apt.getEndTime(),applicationProcedureDto.getStartTime(),"yyyy-MM-dd");
-                    boolean b=TimeExchange.CompareDate(applicationProcedureDto.getEndTime(),apt.getStartTime(),"yyyy-MM-dd");
-               if(!(a||b)){
-                   return CommonResult.fail("日期范围内已有待审批申请");
-               }
+                    boolean a = TimeExchange.CompareDate(apt.getEndTime(), applicationProcedureDto.getStartTime(), "yyyy-MM-dd");
+                    boolean b = TimeExchange.CompareDate(applicationProcedureDto.getEndTime(), apt.getStartTime(), "yyyy-MM-dd");
+                    if (!(a || b)) {
+                        return CommonResult.fail("日期范围内已有待审批申请");
+                    }
                 } catch (ParseException e) {
                     throw new RuntimeException(e);
                 }
@@ -102,7 +102,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
     }
 
     @Override
-    public CommonResult list( int adminMenuId, String submissionStartTime, String submissionEndTime, String examineAndApproveStartTime, String examineAndApproveEndTime, String type, String department, String key, int page, int size) {
+    public CommonResult list(int adminMenuId, String submissionStartTime, String submissionEndTime, String examineAndApproveStartTime, String examineAndApproveEndTime, String type, String department, String key, int page, int size) {
         PermissionSetting permissionSetting = permissionSettingService.getById(adminMenuId);
         if (ObjectUtils.isEmpty(permissionSetting)) {
             return CommonResult.fail("非法进入");
@@ -130,30 +130,28 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         AdminMenu byId = adminMenuService.getById(adminMenuId1);
         Integer parentId = byId.getParentId();
 
-        PageUtils<ApplicationProcedureTemporaryVo> pageList=null;
+        PageUtils<ApplicationProcedureTemporaryVo> pageList = null;
         //审批一次，角色等级不为0
         if ("1".equals(approverType)) {
-            if (parentId!=0) {
-                return CommonResult.ok("无审批权限");
-            }else {
-                pageList=applicationProcedureTemporaryService.pageList(submissionStartTime,submissionEndTime,examineAndApproveStartTime,examineAndApproveEndTime,type,department,key,page,size);
-                return CommonResult.ok(pageList);
-            }
+
+            pageList = applicationProcedureTemporaryService.pageList(submissionStartTime, submissionEndTime, examineAndApproveStartTime, examineAndApproveEndTime, type, department, key, page, size);
+            return CommonResult.ok(pageList);
+
 
         }
 
-        if (parentId==0) {
+        if (parentId == 0) {
             //            全部则是没有待审批的全部
             if (ObjectUtils.isEmpty(type)) {
-                type="0,2,3";
+                type = "0,2,3";
             }
 
-            pageList=applicationProcedureTemporaryService.parentPageList(submissionStartTime,submissionEndTime,examineAndApproveStartTime,examineAndApproveEndTime,type,department,key,page,size);
+            pageList = applicationProcedureTemporaryService.parentPageList(submissionStartTime, submissionEndTime, examineAndApproveStartTime, examineAndApproveEndTime, type, department, key, page, size);
 
             return CommonResult.ok(pageList);
         }
 
-        pageList=applicationProcedureTemporaryService.pageList(submissionStartTime,submissionEndTime,examineAndApproveStartTime,examineAndApproveEndTime,type,department,key,page,size);
+        pageList = applicationProcedureTemporaryService.pageList(submissionStartTime, submissionEndTime, examineAndApproveStartTime, examineAndApproveEndTime, type, department, key, page, size);
 
 
         return CommonResult.ok(pageList);
@@ -172,7 +170,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
 //      判断该用户是否拥有权限
         //      判断该用户是否拥有权限
         String processManagement = permissionSetting.getProcessManagement();
-        if (!"0".equals(processManagement) && !processManagement.contains("3")&& !processManagement.contains("4")) {
+        if (!"0".equals(processManagement) && !processManagement.contains("3") && !processManagement.contains("4")) {
             return CommonResult.fail("此账号暂无该权限");
         }
 
@@ -187,7 +185,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
             return CommonResult.fail("参数异常");
         }
         String applicationProcedureStatus = applicationProcedure.getStatus();
-        if ("0".equals(applicationProcedureStatus)||"3".equals(applicationProcedureStatus)) {
+        if ("0".equals(applicationProcedureStatus) || "3".equals(applicationProcedureStatus)) {
             return CommonResult.fail("已审批,无需再次审批");
         }
 
@@ -211,9 +209,9 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         if ("1".equals(approverType)) {
 //            只有最高级才能审批
             //        当为最高审批人
-            if (parentId==0) {
+            if (parentId == 0) {
                 if ("1".equals(status)) {
-                    status="3";
+                    status = "3";
                 }
                 applicationProcedure.setStatus(status);
                 applicationProcedure.setApproverId(adminId);
@@ -229,7 +227,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         }
 
 //        当为最高审批人
-        if (parentId==0) {
+        if (parentId == 0) {
             //            先判断是否已经被审批了
             if (!"2".equals(applicationProcedureStatus)) {
 //                当不是处理中时则无法审批
@@ -237,7 +235,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
             }
 
             if ("1".equals(status)) {
-                status="3";
+                status = "3";
             }
             applicationProcedure.setStatus(status);
             applicationProcedure.setApproverId(adminId);
@@ -250,7 +248,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         }
 
         if ("1".equals(status)) {
-            status="2";
+            status = "2";
         }
         applicationProcedure.setStatus(status);
         applicationProcedure.setSecondaryApproverId(adminId);
@@ -274,7 +272,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         String adminId = appletApprovalProcessDto.getAdminId();
 
 //        判断对应的管理端是否有权限
-        if (ObjectUtils.isEmpty(adminMenuId)&&ObjectUtils.isEmpty(adminId)) {
+        if (ObjectUtils.isEmpty(adminMenuId) && ObjectUtils.isEmpty(adminId)) {
             return CommonResult.fail("无审批权限");
         }
         PermissionSetting permissionSetting = permissionSettingService.getMenuPermissionSetting(adminMenuId);
@@ -282,7 +280,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
             return CommonResult.fail("无审批权限");
         }
         String processManagement = permissionSetting.getProcessManagement();
-        if (!"0".equals(processManagement) && !processManagement.contains("3")&& !processManagement.contains("4")) {
+        if (!"0".equals(processManagement) && !processManagement.contains("3") && !processManagement.contains("4")) {
             return CommonResult.fail("此账号暂无该权限");
         }
 
@@ -295,7 +293,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
 
 
         String applicationProcedureStatus = applicationProcedure.getStatus();
-        if ("0".equals(applicationProcedureStatus)||"3".equals(applicationProcedureStatus)) {
+        if ("0".equals(applicationProcedureStatus) || "3".equals(applicationProcedureStatus)) {
             return CommonResult.fail("已审批,无需再次审批");
         }
 
@@ -306,7 +304,6 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         String approverType = applicationProcedureSetting.getApproverType();
 
 
-
         AdminMenu byId = adminMenuService.getById(adminMenuId);
 //        角色等级
         Integer parentId = byId.getParentId();
@@ -319,7 +316,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
 
             //            只有最高级才能审批
             //        当为最高审批人
-            if (parentId==0) {
+            if (parentId == 0) {
                 if ("1".equals(status)) {
                     status = "3";
                 }
@@ -336,7 +333,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         }
 
 //        当为最高审批人
-        if (parentId==0) {
+        if (parentId == 0) {
             //            先判断是否已经被审批了
             if (!"2".equals(applicationProcedureStatus)) {
 //                当不是处理中时则无法审批
@@ -344,7 +341,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
             }
 
             if ("1".equals(status)) {
-                status="3";
+                status = "3";
             }
             applicationProcedure.setStatus(status);
             applicationProcedure.setApproverId(adminId);
@@ -357,7 +354,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         }
 
         if ("1".equals(status)) {
-            status="2";
+            status = "2";
         }
         applicationProcedure.setStatus(status);
         applicationProcedure.setSecondaryApproverId(adminId);
@@ -372,7 +369,7 @@ 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, int page, int size) {
         if (ObjectUtils.isEmpty(page) || page <= 0) {
             page = 1;
         }
@@ -387,39 +384,38 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         AdminMenu byId = adminMenuService.getById(adminMenuId);
         Integer parentId = byId.getParentId();
 
-        PageUtils<ApplicationProcedureTemporaryVo> pageList=null;
+        PageUtils<ApplicationProcedureTemporaryVo> pageList = null;
         //审批一次，角色等级不为0
         if ("1".equals(approverType)) {
-            if (parentId!=0) {
-                return CommonResult.ok("无审批权限");
-            }else {
+            if (parentId != 0) {
+                return CommonResult.fail("暂无查看权限");
+            } else {
 
-                pageList=applicationProcedureTemporaryService.pageAppletList(startTime,endTime,status,page,size);
+                pageList = applicationProcedureTemporaryService.pageAppletList(startTime, endTime, status, page, size);
                 return CommonResult.ok(pageList);
 
             }
 
         }
 
-        if (parentId==0) {
+        if (parentId == 0) {
 
             //            全部则是没有待审批的全部
             if (ObjectUtils.isEmpty(status)) {
-                status="0,2,3";
+                status = "0,2,3";
             }
 
-            pageList=applicationProcedureTemporaryService.parentAppletPageList(startTime,endTime,status,page,size);
+            pageList = applicationProcedureTemporaryService.parentAppletPageList(startTime, endTime, status, page, size);
 
             return CommonResult.ok(pageList);
         }
 
-        pageList=applicationProcedureTemporaryService.pageAppletList(startTime,endTime,status,page,size);
+        pageList = applicationProcedureTemporaryService.pageAppletList(startTime, endTime, status, page, size);
         return CommonResult.ok(pageList);
 
 
     }
 
 
-
 }
 

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

@@ -401,7 +401,7 @@ public class HouseController implements HouseAPI {
             String[] split1 = roomConfiguration.split(",");
             ArrayList<FacilityServices> strings = new ArrayList<>();
             for (int i = 0; i < split1.length; i++) {
-                String name=split1[0];
+                String name=split1[i];
                 LambdaQueryWrapper<FacilityServices> wrapperRC=new LambdaQueryWrapper<>();
                 wrapperRC.eq(FacilityServices::getHouseService,name);
                 FacilityServices one = facilityServicesService.getOne(wrapperRC);

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

@@ -205,12 +205,14 @@
             ap.secondary_examine_and_approve_remark as secondaryExamineAndApproveRemark,
             u.user_name as changeUsersName,
             a.name as approverName,
-            a2.name as secondaryApproverName
+            a2.name as secondaryApproverName,
+            u2.user_name as usersName
         FROM
             `application_procedure` ap
                 LEFT JOIN users u on u.id=ap.change_users_id
                 LEFT JOIN admin a on a.id=ap.approver_id
                 LEFT JOIN admin a2 on a2.id=ap.secondary_approver_id
+                LEFT JOIN users u2 on u2.id=ap.users_id
         where
             ap.deleted=0
             and ap.id=#{id}

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

@@ -196,11 +196,13 @@
             ap.secondary_examine_and_approve_time as secondaryExamineAndApproveTime,
             ap.secondary_examine_and_approve_remark as secondaryExamineAndApproveRemark,
             a.name as approverName,
-            a2.name as secondaryApproverName
+            a2.name as secondaryApproverName,
+            u.user_name as usersName
         FROM
             `application_procedure_temporary` ap
                 LEFT JOIN admin a on a.id=ap.approver_id
                 LEFT JOIN admin a2 on a2.id=ap.secondary_approver_id
+                LEFT JOIN users u on u.id=ap.users_id and u.deleted=0
         where
             ap.deleted=0
           AND ap.id=#{id}