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

Merge Request: 登录获取账号权限部门；审批增加部门和数量，增加权限管理

Created By: @万新亮
Accepted By: @万新亮
URL: https://chuanghaikeji.coding.net/p/smarCampus/d/iHotel_student_houtai/git/merge/27?initial=true

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

@@ -17,7 +17,7 @@ public interface ApplicationProcedureTemporaryControllerAPI {
 
     @GetMapping("/list")
     @ApiOperation(value = "临时人员流程管理展示", notes = "临时人员流程管理展示", httpMethod = "GET")
-    CommonResult list(@RequestParam int adminMenuId, String submissionStartTime, String submissionEndTime, String examineAndApproveStartTime, String examineAndApproveEndTime, String type, String department, String key, int page, int size);
+    CommonResult list(@RequestParam int adminMenuId, String submissionStartTime, String submissionEndTime, String examineAndApproveStartTime, String examineAndApproveEndTime, String type, String department, String OrgIds,String key, int page, int size);
 
     @PostMapping("/update")
     @ApiOperation(value = "临时人员流程管理审批", notes = "临时人员流程管理审批", httpMethod = "POST")

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

@@ -22,6 +22,8 @@ import org.springframework.web.bind.annotation.RestController;
 import java.text.ParseException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -55,6 +57,9 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
     @Autowired
     UsersService usersService;
 
+    @Autowired
+    OrganizationService organizationService;
+
     @Override
     public CommonResult save(ApplicationProcedureTemporaryDto applicationProcedureDto) {
         if (ObjectUtils.isEmpty(applicationProcedureDto)) {
@@ -105,6 +110,9 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         }
         List<Admin> admins=adminService.list(new QueryWrapper<>());
         String orgId=usersService.getById(usersId).getOrganId();
+        if(ObjectUtils.isEmpty(organizationService.getById(orgId))){
+            return CommonResult.fail("身份异常，申请提交失败");
+        }
         boolean flag =true;
         for(Admin admin:admins){
             if (StringUtils.hasText(admin.getCheckOrg())&&admin.getCheckOrg().indexOf(orgId) > 0) {
@@ -138,7 +146,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 OrgIds, String key, int page, int size) {
         PermissionSetting permissionSetting = permissionSettingService.getById(adminMenuId);
         if (ObjectUtils.isEmpty(permissionSetting)) {
             return CommonResult.fail("非法进入");
@@ -149,7 +157,6 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
             return CommonResult.fail("此账号暂无该权限");
         }
 
-
         if (ObjectUtils.isEmpty(page) || page <= 0) {
             page = 1;
         }
@@ -157,6 +164,12 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
             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();
@@ -166,11 +179,10 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         AdminMenu byId = adminMenuService.getById(adminMenuId1);
         Integer parentId = byId.getParentId();
 
-        PageUtils<ApplicationProcedureTemporaryVo> pageList = null;
         //审批一次，角色等级不为0
         if ("1".equals(approverType)) {
 
-            pageList = applicationProcedureTemporaryService.pageList(submissionStartTime, submissionEndTime, examineAndApproveStartTime, examineAndApproveEndTime, type, department, key, page, size);
+            pageList = applicationProcedureTemporaryService.pageList(submissionStartTime, submissionEndTime, examineAndApproveStartTime, examineAndApproveEndTime, type, department, key, page, size,orgList);
             return CommonResult.ok(pageList);
 
 
@@ -182,12 +194,12 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
                 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,orgList);
 
             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,orgList);
 
 
         return CommonResult.ok(pageList);

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

@@ -20,13 +20,17 @@ import com.template.model.vo.LoginVO;
 import com.template.model.vo.MenuBarVo;
 import com.template.services.AdminMenuService;
 import com.template.services.AdminService;
+import com.template.services.OrganizationService;
 import com.template.services.PermissionSettingService;
+import com.template.model.pojo.Organization;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @Author: binguo
@@ -50,6 +54,9 @@ public class LoginController implements LoginControllerAPI {
     @Autowired
     AdminMenuService adminMenuService;
 
+    @Autowired
+    OrganizationService organizationService;
+
     /**
      * 登录接口
      *
@@ -73,6 +80,13 @@ public class LoginController implements LoginControllerAPI {
             return CommonResult.fail("账号或密码错误");
         }
 
+        List<Organization> organizationList=new ArrayList<>();
+        if (StringUtils.hasText(result.getCheckOrg())){
+            String[] aa=result.getCheckOrg().replaceAll(" ","").split(",");
+            for (int i = 0; i < aa.length; i++) {
+                organizationList.add(organizationService.getById(aa[i]));
+            }
+        }
         try {
 //           传入的解密
             String decryptData = RSAUtils.decrypt(loginRequest.getPassword(), RSAUtils.getPrivateKey(mySecurity.privateKey));
@@ -104,6 +118,7 @@ public class LoginController implements LoginControllerAPI {
             login.setUser_head(AesUtils.encrypt(result.getId() + ""));
             login.setPermissionSetting(one);
             login.setAdminMenuParentId(adminMenu.getParentId());
+            login.setOrganizations(organizationList);
             return CommonResult.ok("登录成功", login);
 
         } catch (Exception e) {

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

@@ -23,9 +23,9 @@ import java.util.List;
 @Mapper
 public interface ApplicationProcedureTemporaryMapper extends BaseMapper<ApplicationProcedureTemporary> {
 
-    IPage<ApplicationProcedureTemporaryVo> pageList(Page<ApplicationProcedureTemporaryVo> pageVo, @Param("submissionStartTime") String submissionStartTime, @Param("submissionEndTime") String submissionEndTime, @Param("examineAndApproveStartTime") String examineAndApproveStartTime, @Param("examineAndApproveEndTime") String examineAndApproveEndTime, @Param("type") String type, @Param("department") String department, @Param("key") String key);
+    IPage<ApplicationProcedureTemporaryVo> pageList(Page<ApplicationProcedureTemporaryVo> pageVo, @Param("submissionStartTime") String submissionStartTime, @Param("submissionEndTime") String submissionEndTime, @Param("examineAndApproveStartTime") String examineAndApproveStartTime, @Param("examineAndApproveEndTime") String examineAndApproveEndTime, @Param("type") String type, @Param("department") String department, @Param("key") String key,@Param("orgList")List<String> orgList);
 
-    IPage<ApplicationProcedureTemporaryVo> parentPageList(Page<ApplicationProcedureTemporaryVo> pageVo, @Param("submissionStartTime") String submissionStartTime, @Param("submissionEndTime") String submissionEndTime, @Param("examineAndApproveStartTime") String examineAndApproveStartTime, @Param("examineAndApproveEndTime") String examineAndApproveEndTime, @Param("type") String type, @Param("department") String department, @Param("key") String key);
+    IPage<ApplicationProcedureTemporaryVo> parentPageList(Page<ApplicationProcedureTemporaryVo> pageVo, @Param("submissionStartTime") String submissionStartTime, @Param("submissionEndTime") String submissionEndTime, @Param("examineAndApproveStartTime") String examineAndApproveStartTime, @Param("examineAndApproveEndTime") String examineAndApproveEndTime, @Param("type") String type, @Param("department") String department, @Param("key") String key,@Param("orgList")List<String> orgList);
 
 
     IPage<ApplicationProcedureTemporaryRecordVo> appletRecordPage(Page<ApplicationProcedureTemporaryRecordVo> pageVo, @Param("userId") Integer userId,@Param("startTime")  String startTime,@Param("endTime")  String endTime,@Param("status")  String status);

src/main/java/com/template/model/vo/ApplicationProcedureTemporaryVo.java

@@ -22,6 +22,12 @@ public class ApplicationProcedureTemporaryVo {
     @ApiModelProperty(value = "部门")
     private String department;
 
+    @ApiModelProperty(value = "申请人部门")
+    private String orgName;
+
+    @ApiModelProperty(value = "房间数量")
+    private String houseCount;
+
     @ApiModelProperty(value = "申请原因")
     private String reasonApplication;
 

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

@@ -19,9 +19,9 @@ import java.util.List;
  */
 public interface ApplicationProcedureTemporaryService extends IService<ApplicationProcedureTemporary> {
 
-    PageUtils<ApplicationProcedureTemporaryVo> pageList(String submissionStartTime, String submissionEndTime, String examineAndApproveStartTime, String examineAndApproveEndTime, String type, String department, String key, int page, int size);
+    PageUtils<ApplicationProcedureTemporaryVo> pageList(String submissionStartTime, String submissionEndTime, String examineAndApproveStartTime, String examineAndApproveEndTime, String type, String department, String key, int page, int size,List<String> orgList);
 
-    PageUtils<ApplicationProcedureTemporaryVo> parentPageList(String submissionStartTime, String submissionEndTime, String examineAndApproveStartTime, String examineAndApproveEndTime, String type, String department, String key, int page, int size);
+    PageUtils<ApplicationProcedureTemporaryVo> parentPageList(String submissionStartTime, String submissionEndTime, String examineAndApproveStartTime, String examineAndApproveEndTime, String type, String department, String key, int page, int size,List<String> orgList);
 
 
     PageUtils<ApplicationProcedureTemporaryRecordVo> appletRecordPage(Integer userId, String startTime, String endTime, String status, int page, int size);

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

@@ -30,16 +30,16 @@ public class ApplicationProcedureTemporaryServiceImpl extends ServiceImpl<Applic
     ApplicationProcedureTemporaryMapper applicationProcedureTemporaryMapper;
 
     @Override
-    public PageUtils<ApplicationProcedureTemporaryVo> pageList(String submissionStartTime, String submissionEndTime, String examineAndApproveStartTime, String examineAndApproveEndTime, String type, String department, String key, int page, int size) {
+    public PageUtils<ApplicationProcedureTemporaryVo> pageList(String submissionStartTime, String submissionEndTime, String examineAndApproveStartTime, String examineAndApproveEndTime, String type, String department, String key, int page, int size,List<String> orgList) {
         Page<ApplicationProcedureTemporaryVo> pageVo = new Page<>(page,size);
-        IPage<ApplicationProcedureTemporaryVo> result=applicationProcedureTemporaryMapper.pageList(pageVo,submissionStartTime,submissionEndTime,examineAndApproveStartTime,examineAndApproveEndTime,type,department,key);
+        IPage<ApplicationProcedureTemporaryVo> result=applicationProcedureTemporaryMapper.pageList(pageVo,submissionStartTime,submissionEndTime,examineAndApproveStartTime,examineAndApproveEndTime,type,department,key,orgList);
         return new PageUtils(result);
     }
 
     @Override
-    public PageUtils<ApplicationProcedureTemporaryVo> parentPageList(String submissionStartTime, String submissionEndTime, String examineAndApproveStartTime, String examineAndApproveEndTime, String type, String department, String key, int page, int size) {
+    public PageUtils<ApplicationProcedureTemporaryVo> parentPageList(String submissionStartTime, String submissionEndTime, String examineAndApproveStartTime, String examineAndApproveEndTime, String type, String department, String key, int page, int size,List<String> orgList) {
         Page<ApplicationProcedureTemporaryVo> pageVo = new Page<>(page,size);
-        IPage<ApplicationProcedureTemporaryVo> result=applicationProcedureTemporaryMapper.parentPageList(pageVo,submissionStartTime,submissionEndTime,examineAndApproveStartTime,examineAndApproveEndTime,type,department,key);
+        IPage<ApplicationProcedureTemporaryVo> result=applicationProcedureTemporaryMapper.parentPageList(pageVo,submissionStartTime,submissionEndTime,examineAndApproveStartTime,examineAndApproveEndTime,type,department,key,orgList);
         return new PageUtils(result);
     }
 

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

@@ -20,7 +20,9 @@
         apu.secondary_examine_and_approve_time as secondaryExamineAndApproveTime,
         apu.secondary_examine_and_approve_remark as secondaryExamineAndApproveRemark,
         apu.approverName,
-        apu.secondaryApproverName
+        apu.secondaryApproverName,
+        apu.houseCount,
+        apu.orgName
         FROM
         (
         SELECT
@@ -40,12 +42,16 @@
         ap.secondary_examine_and_approve_remark,
         a.name as approverName,
         a2.name as secondaryApproverName,
-        u.user_name as userName
+        u.user_name as userName,
+        o.id as orgId,
+        o.name as orgName,
+        ap.house_count as houseCount
         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
+        LEFT JOIN organization o on o.id=u.organ_id
         WHERE ap.deleted=0
         ) apu
         <where>
@@ -69,6 +75,12 @@
             <if test="department != null and department != ''">
                 and apu.department= #{department}
             </if>
+            <if test="orgList != null and orgList.size() > 0">
+                and apu.orgId in
+                <foreach collection="orgList" item="orgId" index="index" open="(" close=")" separator=",">
+                    ${orgId}
+                </foreach>
+            </if>
 
         </where>
         ORDER BY apu.submission_time DESC
@@ -91,7 +103,9 @@
         apu.secondary_examine_and_approve_time as secondaryExamineAndApproveTime,
         apu.secondary_examine_and_approve_remark as secondaryExamineAndApproveRemark,
         apu.approverName,
-        apu.secondaryApproverName
+        apu.secondaryApproverName,
+        apu.houseCount,
+        apu.orgName
         FROM
         (
         SELECT
@@ -111,12 +125,16 @@
         ap.secondary_examine_and_approve_remark,
         a.name as approverName,
         a2.name as secondaryApproverName,
-        u.user_name as userName
+        u.user_name as userName,
+        o.id as orgId,
+        o.name as orgName,
+        ap.house_count as houseCount
         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
+        LEFT JOIN organization o on o.id=u.organ_id
         WHERE ap.deleted=0 and FIND_IN_SET(ap.status,#{type})
         ) apu
         <where>
@@ -141,6 +159,13 @@
                 and apu.department= #{department}
             </if>
 
+            <if test="orgList != null and orgList.size() > 0">
+                and apu.orgId in
+                <foreach collection="orgList" item="orgId" index="index" open="(" close=")" separator=",">
+                    ${orgId}
+                </foreach>
+            </if>
+
         </where>
         ORDER BY apu.submission_time DESC
     </select>