init: init project step4: biz code support

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/model/input/WmDept.java

@@ -3,6 +3,8 @@ package com.qunzhixinxi.hnqz.admin.api.model.input;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 组织架构
  *
@@ -16,5 +18,6 @@ public class WmDept {
 
 	private String name;
 
+	private List<Long> areaCodes;
 
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -963,20 +963,20 @@ public class ApiController {
 
 			// 查询E证通数据
 			Set<Integer> allUserIds = sysUserList.stream().map(UserVO::getUserId).collect(Collectors.toSet());
-			SysUserExtRecord userExtRecord = sysUserExtRecordService.getOne(Wrappers.<SysUserExtRecord>lambdaQuery()
-					.in(SysUserExtRecord::getUserId, allUserIds)
-					.eq(SysUserExtRecord::getDelFlag, DelEnum.NOT_DEL.val())
-					.last("limit 1"));
-			if (userExtRecord != null) {
-				mapOne.put("existEidResult", true);
-				// E证通照片
-				Map<String, Object> eidResultMap = new HashMap<>();
-				eidResultMap.put("idCardFrontUrl", userExtRecord.getIdCardFrontUrl());
-				eidResultMap.put("idCardBackUrl", userExtRecord.getIdCardBackUrl());
-				mapOne.put("eidResult", eidResultMap);
-			} else {
+			//SysUserExtRecord userExtRecord = sysUserExtRecordService.getOne(Wrappers.<SysUserExtRecord>lambdaQuery()
+			//		.in(SysUserExtRecord::getUserId, allUserIds)
+			//		.eq(SysUserExtRecord::getDelFlag, DelEnum.NOT_DEL.val())
+			//		.last("limit 1"));
+			//if (userExtRecord != null) {
+			//	mapOne.put("existEidResult", true);
+			//	// E证通照片
+			//	Map<String, Object> eidResultMap = new HashMap<>();
+			//	eidResultMap.put("idCardFrontUrl", userExtRecord.getIdCardFrontUrl());
+			//	eidResultMap.put("idCardBackUrl", userExtRecord.getIdCardBackUrl());
+			//	mapOne.put("eidResult", eidResultMap);
+			//} else {
 				mapOne.put("existEidResult", false);
-			}
+			//}
 
 			// 签署协议信息
 			Set<String> agreementSet = sysUserList.stream()

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysRoleController.java

@@ -170,7 +170,7 @@ public class SysRoleController {
 			queryWrapper.orderByAsc(SysRole::getRoleId);
 		} else {
 			List<Integer> drugEntAdmin = Stream.of(3,4,5,6,7,31).collect(Collectors.toList());
-			List<Integer> CSOAdmin = Stream.of(4,5,6,7,31).collect(Collectors.toList());
+			List<Integer> CSOAdmin = Stream.of(4,5,6,7,31,37).collect(Collectors.toList());
 			List<Integer> CROAdmin = Stream.of(7,9,10).collect(Collectors.toList());
 			List<Integer> HCPAdmin = Stream.of(7,11,13).collect(Collectors.toList());
 			List<Integer> CFOAdmin = Stream.of(7).collect(Collectors.toList());
@@ -185,6 +185,7 @@ public class SysRoleController {
 						queryRoleIdSet.addAll(drugEntAdmin);
 						break;
 					case 4:
+					case 37:
 						queryRoleIdSet.addAll(CSOAdmin);
 						break;
 					case 7:

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -1120,13 +1120,13 @@ public class SysUserController {
         HnqzUser user = SecurityUtils.getUser();
         List<Integer> roles = SecurityUtils.getRoles();
 
-        // 药企管理员（事业部）
+        // 平台管理员
         List<Tree<Long>> userAreaTree;
-        if (roles.contains(3)) {
+        if (roles.contains(2)) {
             userAreaTree = areaEntityService.selectTree(new SysAreaEntity());
         }
-        // 区域管理员（一级cso管理员）
-        else if (roles.contains(4)) {
+        //  药企管理员（事业部） || 区域管理员（一级cso管理员）
+        else if (roles.contains(3) || roles.contains(4)) {
             userAreaTree = userService.getUserAreaTree(Long.valueOf(user.getId()));
         }
         // 服务商管理员（二级cso管理员）

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaAgentController.java

@@ -17,6 +17,7 @@ import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmRelation;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskType;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskTypeEntRef;
+import com.qunzhixinxi.hnqz.admin.api.model.input.WmDept;
 import com.qunzhixinxi.hnqz.admin.mapper.SysDeptCsmMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.SysDeptMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.SysDeptRelationMapper;
@@ -184,7 +185,7 @@ public class WmDaAgentController {
         if (CollUtil.isNotEmpty(pageList)) {
             pageList.forEach(p -> {
 
-                List<Long> areas = enterpriseAreaService.listEntAreas(Long.valueOf(p.getDeptId()));
+                List<Long> areas = enterpriseAreaService.listEntAreas(Collections.singletonList(Long.valueOf(p.getDeptId())));
                 p.setAreaCodes(areas);
 
             });
@@ -819,8 +820,19 @@ public class WmDaAgentController {
      */
     @GetMapping("/listByDept")
     public R<?> listByDept() {
+        List<WmDept> dept = wmDaAgentService.listByDept();
 
-        return R.ok(wmDaAgentService.listByDept());
+        if (CollUtil.isNotEmpty(dept)){
+
+            Set<Long> collect = dept.stream().map(d -> Long.valueOf(d.getDeptId())).collect(Collectors.toSet());
+            Map<Long, List<Long>> longListMap = enterpriseAreaService.listEntAreas1(collect);
+
+            dept.forEach(d -> {
+               d.setAreaCodes(longListMap.get(Long.valueOf(d.getDeptId())));
+           });
+        }
+
+        return R.ok(dept);
     }
 
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/SysEnterpriseAreaService.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysEnterpriseArea;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 企业区域关系表
@@ -29,7 +31,9 @@ public interface SysEnterpriseAreaService extends IService<SysEnterpriseArea> {
      * @param deptId 企业ID
      * @return 区域列表
      */
-    List<Long> listEntAreas(Long deptId);
+    List<Long> listEntAreas(Collection<Long> deptId);
+
+    Map<Long, List<Long>> listEntAreas1(Collection<Long> deptId);
 
     /**
      * 删除关系

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmDaAgentService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaAgent;
+import com.qunzhixinxi.hnqz.admin.api.model.input.WmDept;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import feign.Param;
 
@@ -31,7 +32,7 @@ public interface WmDaAgentService extends IService<WmDaAgent> {
 
 	List selectNameByDeptId(Integer deptId);
 
-	List listByDept();
+	List<WmDept> listByDept();
 
 	int updateUserByDeptId(WmDaAgent wmDaAgent);
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysDeptServiceImpl.java

@@ -556,7 +556,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
      */
     @Override
     public List<Tree<Long>> getDeptAreaTree(Long deptId) {
-        List<Long> areas = enterpriseAreaService.listEntAreas(deptId);
+        List<Long> areas = enterpriseAreaService.listEntAreas(Collections.singletonList(deptId));
         return areaEntityService.selectTree(areas);
     }
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysEnterpriseAreaServiceImpl.java

@@ -13,7 +13,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -62,8 +64,13 @@ public class SysEnterpriseAreaServiceImpl extends ServiceImpl<SysEnterpriseAreaM
      * @return 区域列表
      */
     @Override
-    public List<Long> listEntAreas(Long deptId) {
-        return this.list(Wrappers.<SysEnterpriseArea>lambdaQuery().eq(SysEnterpriseArea::getEntId, deptId)).stream().map(SysEnterpriseArea::getAreaId).collect(Collectors.toList());
+    public List<Long> listEntAreas(Collection<Long> deptId) {
+        return this.list(Wrappers.<SysEnterpriseArea>lambdaQuery().in(SysEnterpriseArea::getEntId, deptId)).stream().map(SysEnterpriseArea::getAreaId).collect(Collectors.toList());
+    }
+
+    @Override
+    public Map<Long, List<Long>> listEntAreas1(Collection<Long> deptId) {
+        return this.list(Wrappers.<SysEnterpriseArea>lambdaQuery().in(SysEnterpriseArea::getEntId, deptId)).stream().collect(Collectors.groupingBy(SysEnterpriseArea::getEntId, Collectors.mapping(SysEnterpriseArea::getAreaId, Collectors.toList())));
     }
 
     /**

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaAgentServiceImpl.java

@@ -223,11 +223,11 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 
         wmDaAgentMapper.selectWmManagementPage(page, wmDaAgent);
 
-        if (CollUtil.isNotEmpty(page.getRecords())){
-           page.getRecords().forEach(agent -> {
-               List<Long> areas = enterpriseAreaService.listEntAreas(Long.valueOf(agent.getDeptId()));
-               agent.setAreaCodes(areas);
-           });
+        if (CollUtil.isNotEmpty(page.getRecords())) {
+            page.getRecords().forEach(agent -> {
+                List<Long> areas = enterpriseAreaService.listEntAreas(Collections.singletonList(Long.valueOf(agent.getDeptId())));
+                agent.setAreaCodes(areas);
+            });
         }
 
         return page;
@@ -375,13 +375,13 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
             wmTaskTypeEntRef.setAgentId(wmDaAgent.getId());
             wmTaskTypeEntRef.setDrugentId(null);
 
-            String [] drugId = null;
-            if (StrUtil.isNotBlank(wmDaAgent.getDrugEntId())){
-                drugId  = wmDaAgent.getDrugEntId().contains(StrUtil.COMMA) ? wmDaAgent.getDrugEntId().split(StrUtil.COMMA) : new String[]{wmDaAgent.getDrugEntId()};
+            String[] drugId = null;
+            if (StrUtil.isNotBlank(wmDaAgent.getDrugEntId())) {
+                drugId = wmDaAgent.getDrugEntId().contains(StrUtil.COMMA) ? wmDaAgent.getDrugEntId().split(StrUtil.COMMA) : new String[]{wmDaAgent.getDrugEntId()};
             }
 
             List<WmTaskType> list = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
-                    .in(ArrayUtil.isNotEmpty(drugId), WmTaskType::getDurgentId,  Arrays.stream(drugId).collect(Collectors.toSet()))
+                    .in(ArrayUtil.isNotEmpty(drugId), WmTaskType::getDurgentId, Arrays.stream(drugId).collect(Collectors.toSet()))
                     .eq(WmTaskType::getLevel1Id, wmDaAgent.getId())
                     .eq(WmTaskType::getDelFlag, CommonConstants.STATUS_NORMAL)
 
@@ -628,7 +628,7 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
 
 
     @Override
-    public List listByDept() {
+    public List<WmDept> listByDept() {
         List<WmDept> wmDeptList = new ArrayList<>();
 //		if(SecurityUtils.getRoles().contains(9)){
 //			WmDept wmDept = new WmDept();

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaDrugEntServiceImpl.java

@@ -170,7 +170,7 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 		wmDaDrugEntMapper.selectPage(page, wmDaDrugEnt);
 
 		page.getRecords().forEach(ent -> {
-			List<Long> areaCodes = enterpriseAreaService.listEntAreas(Long.valueOf(ent.getDeptId()));
+			List<Long> areaCodes = enterpriseAreaService.listEntAreas(Collections.singletonList(Long.valueOf(ent.getDeptId())));
 			ent.setAreaCodes(areaCodes);;
 		});
 

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -114,7 +114,6 @@
         u.salt,
         u.phone,
         u.id_card_number,
-        u.user_type,
         u.bank_card_number,
         u.avatar,
         u.wx_openid,
@@ -156,7 +155,6 @@
         u.salt,
         u.phone,
         u.id_card_number,
-        u.user_type,
         u.bank_card_number,
         u.avatar,
         u.wx_openid,
@@ -340,7 +338,6 @@
         u.username,
         u.password,
         u.id_card_number,
-        u.user_type,
         u.salt,
         u.phone,
         u.avatar,
@@ -420,7 +417,6 @@
         u.username,
         u.password,
         u.id_card_number,
-        u.user_type,
         u.salt,
         u.phone,
         u.avatar,
@@ -482,7 +478,6 @@
         u.username,
         u.password,
         u.id_card_number,
-        u.user_type,
         u.user_sign,
         u.salt,
         u.phone,