init: init project step4: biz code support

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/SysDept.java

@@ -1,10 +1,12 @@
 package com.qunzhixinxi.hnqz.admin.api.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
+import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -29,9 +31,9 @@ public class SysDept implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     *
+     * 部门ID
      */
-    @TableId
+    @TableId(type = IdType.INPUT)
     private Integer deptId;
     /**
      * 部门名称
@@ -76,7 +78,7 @@ public class SysDept implements Serializable {
     /**
      * 是否删除 1：已删除 0：正常
      */
-    @TableLogic
+    @TableLogic(value = CommonConstants.STATUS_NORMAL, delval = CommonConstants.STATUS_DEL)
     private String delFlag;
 
     /**
@@ -86,9 +88,10 @@ public class SysDept implements Serializable {
     private String delFlagName;
 
     /**
-     *
+     * 部门code
      */
     private String deptCode;
+
     /**
      * 级别
      */
@@ -125,21 +128,11 @@ public class SysDept implements Serializable {
      */
     private Integer level3Id;
 
-    private String appId;
-    private String appSecret;
-    private String rsaPublicKey;
-    private String queryUrl;
-    private String subjectName;
-
     /**
      * 税号
      */
     private String taxCode;
 
-    /**
-     * 结算主体类型：0->人力家，1->税邦云
-     */
-    private String[] subjectType;
 
     /**
      * 部门专用权限限制（字符串逗号分隔，0.导出）
@@ -149,21 +142,6 @@ public class SysDept implements Serializable {
     @TableField(exist = false)
     private List<String> subList;
 
-    /**
-     * gmv1收益率（万分之）
-     */
-    private Integer gmv1Rate;
-
-    /**
-     * gmv2收益率（万分之）
-     */
-    private Integer gmv2Rate;
-
-    /**
-     * 人力家服务费费率（万分之）
-     */
-    private Integer renlijiaServiceChargeRate;
-
     /**
      * 财务复核方式
      */
@@ -187,4 +165,10 @@ public class SysDept implements Serializable {
     @TableField(exist = false)
     private String superDeptName;
 
+    /**
+     * 区域
+     */
+    @TableField(exist = false)
+    private List<Long> areaCodes;
+
 }

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmDaDrugEnt.java

@@ -5,11 +5,14 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
+import com.qunzhixinxi.hnqz.common.core.entity.BaseEntity;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.util.Map;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -23,6 +26,7 @@ import java.util.Set;
 public class WmDaDrugEnt implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    @NotNull(message = "ID必填", groups = {BaseEntity.Update.class})
     @TableId(type = IdType.AUTO)
     private Integer id;
     /**
@@ -44,6 +48,7 @@ public class WmDaDrugEnt implements Serializable {
     /**
      * 组织机构ID
      */
+    @NotNull(message = "企业ID必填", groups = {BaseEntity.Update.class})
     private Integer deptId;
     /**
      * 是否删除
@@ -74,6 +79,9 @@ public class WmDaDrugEnt implements Serializable {
      */
     private Integer updateUser;
 
+    /**
+     * 派工权限
+     */
     private String pgqx;
 
     /**
@@ -81,17 +89,6 @@ public class WmDaDrugEnt implements Serializable {
      */
     private String management;
 
-    /**
-     * 结算主体类型：0->人力家，1->税邦云
-     */
-    private String[] subjectType;
-
-    /**
-     * 结算主体和通道
-     */
-    @TableField(exist = false)
-    private Map<String, Integer> subjectTypeAndChannel;
-
     /**
      * 部门专用权限限制（0.导出）
      */
@@ -110,4 +107,11 @@ public class WmDaDrugEnt implements Serializable {
     @TableField(exist = false)
     private Set<Integer> csmUserIdList;
 
+    /**
+     * 区域
+     */
+    @NotEmpty(message = "所属区域必填", groups = {BaseEntity.Create.class})
+    @TableField(exist = false)
+    private List<Long> areaCodes;
+
 }

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/vo/UserVO.java

@@ -2,7 +2,6 @@ package com.qunzhixinxi.hnqz.admin.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysRole;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmPlatformQuizTestResult;
 import com.qunzhixinxi.hnqz.admin.api.model.WmQuizResultModel;
 import com.qunzhixinxi.hnqz.common.core.sensitive.Sensitive;
 import com.qunzhixinxi.hnqz.common.core.sensitive.SensitiveTypeEnum;
@@ -11,7 +10,6 @@ import lombok.Data;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author hnqz
@@ -191,31 +189,6 @@ public class UserVO implements Serializable {
 	 */
 	private String bankName;
 
-	/**
-	 * 人力家认证状态
-	 */
-	private Integer rljCertStatus;
-
-	/**
-	 * 税邦云协议签署,0->未签署，1->已签署 2-> 需补签
-	 */
-	private Integer taxHelperAgreementSignature;
-
-	/**
-	 * 结算主体和通道
-	 */
-	private Map<String, Integer> subjectTypeAndChannel;
-
-	/**
-	 * 不同渠道的认证状态
-	 */
-	private String[] certStatusArr;
-
-	/**
-	 * 不同渠道认证信息列表 ?为SysUserSubVO对象
-	 */
-	private List<?> certList;
-
 	/**
 	 * 小程序签署协议信息
 	 */
@@ -239,4 +212,9 @@ public class UserVO implements Serializable {
 	 */
 	private List<Integer> parentIdList;
 
+	/**
+	 * 区域代码
+	 */
+	private List<Long> areaCodes;
+
 }

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

@@ -796,10 +796,8 @@ public class ApiController {
 			mapOne.put("phone", sysU.getPhone());
 			mapOne.put("idCardNumber", sysU.getIdCardNumber());
 			mapOne.put("certStatus", sysU.getCertStatus());
-			mapOne.put("rljCertStatus", sysU.getRljCertStatus());
 			mapOne.put("userSign", sysU.getUserSign());
 			mapOne.put("certRemark", sysU.getCertRemark());
-			mapOne.put("taxHelperAgreementSignature", sysU.getTaxHelperAgreementSignature());
 			mapOne.put("reSignedAgreement", sysU.getReSignedAgreement());
 			mapOne.put("bankCardNumber", sysU.getBankCardNumber());
 			mapOne.put("bankPhone", sysU.getBankPhone());

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

@@ -324,9 +324,9 @@ public class SysUserController {
         } else if (userDto.getRole().contains(3)) {
             UserDTO userDTO = new UserDTO();
             userDTO.setUsername(userDto.getUsername());
-            userDTO.setDelFlag("0");
+            userDTO.setDelFlag(CommonConstants.STATUS_NORMAL);
             List<UserVO> userDTOList = sysUserMapper.selectByPhone(userDTO);
-            if (userDTOList.size() > 0) {
+            if (CollUtil.isNotEmpty(userDTOList)) {
                 for (UserVO userVO : userDTOList) {
                     if (null != userVO.getRoleList()) {
                         for (SysRole sysRole : userVO.getRoleList()) {
@@ -378,8 +378,8 @@ public class SysUserController {
                                 SysUserRole sysUserRole = new SysUserRole();
                                 sysUserRole.setUserId(userVO.getUserId());
                                 List<SysUserRole> sysUserRoleList = sysUserRoleMapper.selectById(sysUserRole);
-                                for (int i = 0; i < sysUserRoleList.size(); i++) {
-                                    SysUser sysUser = userService.getById(sysUserRoleList.get(i).getUserId());
+                                for (SysUserRole userRole : sysUserRoleList) {
+                                    SysUser sysUser = userService.getById(userRole.getUserId());
                                     if (!sysUser.getDeptId().equals(userDto.getDeptId())) {
                                         return R.failed("用户已存在全职学术推广员角色,不能为其他机构CSO管理员");
                                     }
@@ -389,8 +389,8 @@ public class SysUserController {
                                 SysUserRole sysUserRole = new SysUserRole();
                                 sysUserRole.setUserId(userVO.getUserId());
                                 List<SysUserRole> sysUserRoleList = sysUserRoleMapper.selectById(sysUserRole);
-                                for (int i = 0; i < sysUserRoleList.size(); i++) {
-                                    SysUser sysUser = userService.getById(sysUserRoleList.get(i).getUserId());
+                                for (SysUserRole userRole : sysUserRoleList) {
+                                    SysUser sysUser = userService.getById(userRole.getUserId());
                                     if (!sysUser.getDeptId().equals(userDto.getDeptId())) {
                                         return R.failed("用户已存在招商经理角色,不能为其他机构CSO管理员");
                                     }
@@ -684,16 +684,6 @@ public class SysUserController {
             //}
 
 
-            List<Integer> cetList = new ArrayList<>();
-            cetList.add(1);
-            cetList.add(3);
-            cetList.add(11);
-            cetList.add(12);
-            cetList.add(13);
-            cetList.add(14);
-            cetList.add(15);
-            cetList.add(16);
-
             /**
              * @Modify: start
              * @Version: v2021.4.16
@@ -925,15 +915,6 @@ public class SysUserController {
     public R<?> selectUserList(Page page, UserDTO userDTO) {
 
         userDTO.setSubType(null);
-        //if (StrUtil.isNotBlank(userDTO.getSubjectLocation())) {
-        //    //String[] locationArr = Stream.of(SubjectLocation.values())
-        //    //        .map(SubjectLocation::getType)
-        //    //        .toArray(String[]::new);
-        //    if (!ArrayUtil.containsAny(userDTO.getSubjectLocation().split(StrUtil.COMMA), locationArr)) {
-        //        // 只接收已有的税源地类型值
-        //        userDTO.setSubjectLocation(null);
-        //    }
-        //}
 
         IPage<UserVO> userVosPage = userService.selectUserList(page, userDTO);
 
@@ -959,6 +940,11 @@ public class SysUserController {
                 }
 
                 vo.setQuizResult(CollUtil.isEmpty(pure) ? Collections.emptyList() : pure);
+
+                // 所属区域
+                List<Long> areaCodes = userAreaService.listUserAreas(Long.valueOf(vo.getUserId()));
+                vo.setAreaCodes(areaCodes);
+
             });
 
 
@@ -976,7 +962,6 @@ public class SysUserController {
         }
 
         userVosPage.getRecords().forEach(userVO -> {
-
             // 上级csm
             List<SysCsmUserRelation> csmUserRelations = csmParentUserMap.get(userVO.getUserId());
             if (CollUtil.isNotEmpty(csmUserRelations)) {
@@ -1016,17 +1001,17 @@ public class SysUserController {
      * @return success/false
      */
     @GetMapping("/list")
-    public R listScope(Page page, UserDTO userDTO) {
-        if (null != userDTO.getRole() && userDTO.getRole().size() > 0) {
+    public R<?> listScope(Page page, UserDTO userDTO) {
+        if (CollUtil.isNotEmpty(userDTO.getRole())) {
             userDTO.setDeptId(SecurityUtils.getUser().getDeptId());
             page.setSize(10000);
             List<UserVO> sysUserList = userService.getUsersWithRolePage(page, userDTO).getRecords();
-            List<Map<String, String>> answerList = new ArrayList<>();
-            if (sysUserList.size() > 0) {
+            List<Map<String, Object>> answerList = new ArrayList<>();
+            if (CollUtil.isNotEmpty(sysUserList)) {
                 for (UserVO sysUser : sysUserList) {
-                    Map<String, String> map = new HashMap<>();
-                    map.put("id", sysUser.getUserId() + "");
-                    map.put("realname", sysUser.getRealname() + "");
+                    Map<String, Object> map = new HashMap<>(2);
+                    map.put("id", sysUser.getUserId());
+                    map.put("realname", sysUser.getRealname());
                     answerList.add(map);
                 }
 
@@ -1040,12 +1025,12 @@ public class SysUserController {
             userDTO.setRole(list);
 
             List<UserVO> sysUserList = userService.getUsersWithRolePage(page, userDTO).getRecords();
-            List<Map<String, String>> answerList = new ArrayList<>();
-            if (sysUserList.size() > 0) {
+            List<Map<String, Object>> answerList = new ArrayList<>(sysUserList.size());
+            if (CollUtil.isNotEmpty(sysUserList)) {
                 for (UserVO sysUser : sysUserList) {
-                    Map<String, String> map = new HashMap<>();
-                    map.put("id", sysUser.getUserId() + "");
-                    map.put("realname", sysUser.getRealname() + "");
+                    Map<String, Object> map = new HashMap<>(2);
+                    map.put("id", sysUser.getUserId());
+                    map.put("realname", sysUser.getRealname());
                     answerList.add(map);
                 }
 
@@ -1068,13 +1053,13 @@ public class SysUserController {
             userDTO.setDeptId(SecurityUtils.getUser().getDeptId());
             page.setSize(10000);
             List<UserVO> sysUserList = userService.getUsersWithRolePage(page, userDTO).getRecords();
-            List<Map<String, String>> answerList = new ArrayList<>();
-            if (sysUserList.size() > 0) {
+            List<Map<String, Object>> answerList = new ArrayList<>(sysUserList.size());
+            if (CollUtil.isNotEmpty(sysUserList)) {
                 for (UserVO sysUser : sysUserList) {
-                    Map<String, String> map = new HashMap<>();
-                    map.put("id", sysUser.getUserId() + "");
-                    map.put("username", sysUser.getUsername() + "");
-                    map.put("realname", sysUser.getRealname() + "");
+                    Map<String, Object> map = new HashMap<>(3);
+                    map.put("id", sysUser.getUserId());
+                    map.put("username", sysUser.getUsername());
+                    map.put("realname", sysUser.getRealname());
                     answerList.add(map);
                 }
 
@@ -1088,13 +1073,13 @@ public class SysUserController {
             userDTO.setRole(list);
 
             List<UserVO> sysUserList = userService.getUsersWithRolePage(page, userDTO).getRecords();
-            List<Map<String, String>> answerList = new ArrayList<>();
-            if (sysUserList.size() > 0) {
+            List<Map<String, Object>> answerList = new ArrayList<>();
+            if (CollUtil.isNotEmpty(sysUserList)) {
                 for (UserVO sysUser : sysUserList) {
-                    Map<String, String> map = new HashMap<>();
-                    map.put("id", sysUser.getUserId() + "");
-                    map.put("username", sysUser.getUsername() + "");
-                    map.put("realname", sysUser.getRealname() + "");
+                    Map<String, Object> map = new HashMap<>(3);
+                    map.put("id", sysUser.getUserId());
+                    map.put("username", sysUser.getUsername());
+                    map.put("realname", sysUser.getRealname());
                     answerList.add(map);
                 }
 
@@ -1124,13 +1109,13 @@ public class SysUserController {
             query.lambda().like(SysUser::getRealname, userDTO.getRealname());
         }
         List<SysUser> sysUserList = userService.list(query);
-        List<Map<String, String>> answerList = new ArrayList<>();
-        if (sysUserList.size() > 0) {
+        List<Map<String, Object>> answerList = new ArrayList<>(sysUserList.size());
+        if (CollUtil.isNotEmpty(sysUserList)) {
             for (SysUser sysUser : sysUserList) {
-                Map<String, String> map = new HashMap<>();
-                map.put("id", sysUser.getUserId() + "");
-                map.put("realname", sysUser.getRealname() + "");
-                map.put("name", sysUser.getUsername() + "");
+                Map<String, Object> map = new HashMap<>(3);
+                map.put("id", sysUser.getUserId());
+                map.put("realname", sysUser.getRealname());
+                map.put("name", sysUser.getUsername());
 
                 answerList.add(map);
             }
@@ -1146,25 +1131,16 @@ public class SysUserController {
      * @return success/false
      */
     @GetMapping("/listNoScopeAll")
-    public R listNoScopeAll(Page page, UserDTO userDTO) {
-        page.setSize(10000);
-        QueryWrapper<SysUser> queryWrapper = null;
-        if (userDTO.getDeptId() != null) {
-            SysUser sysUser = new SysUser();
-            sysUser.setDeptId(userDTO.getDeptId());
-            queryWrapper = Wrappers.query(sysUser);
-        } else {
-            queryWrapper = Wrappers.query();
-        }
+    public R<?> listNoScopeAll(UserDTO userDTO) {
 
-        List<SysUser> sysUserList = userService.list(queryWrapper);
-        List<Map<String, String>> answerList = new ArrayList<>();
-        if (sysUserList.size() > 0) {
+        List<SysUser> sysUserList = userService.list(Wrappers.<SysUser>lambdaQuery().eq(userDTO.getDeptId() != null, SysUser::getDeptId, userDTO.getDeptId()));
+        List<Map<String, Object>> answerList = new ArrayList<>(sysUserList.size());
+        if (CollUtil.isNotEmpty(sysUserList)) {
             for (SysUser sysUser : sysUserList) {
-                Map<String, String> map = new HashMap<>();
-                map.put("id", sysUser.getUserId() + "");
-                map.put("realname", sysUser.getRealname() + "");
-                map.put("name", sysUser.getUsername() + "");
+                Map<String, Object> map = new HashMap<>(3);
+                map.put("id", sysUser.getUserId());
+                map.put("realname", sysUser.getRealname());
+                map.put("name", sysUser.getUsername());
 
                 answerList.add(map);
             }
@@ -1185,7 +1161,7 @@ public class SysUserController {
         List<UserVO> users = sysUserMapper.listUserByRole(userDTO);
 
         List<Map<String, Object>> result = users.stream().map(user -> {
-            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> map = new HashMap<>(2);
             map.put("userId", user.getUserId());
             map.put("realname", user.getRealname());
             return map;

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

@@ -1,22 +1,32 @@
-
 package com.qunzhixinxi.hnqz.admin.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.api.dto.UserInfo;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptCsm;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
-import com.qunzhixinxi.hnqz.admin.api.entity.*;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.EnableEnum;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmDaAgent;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskType;
+import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskTypeEntRef;
 import com.qunzhixinxi.hnqz.admin.mapper.SysDeptCsmMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.SysDeptMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.SysUserMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmTaskTypeEntRefMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmTaskTypeMapper;
-import com.qunzhixinxi.hnqz.admin.service.*;
+import com.qunzhixinxi.hnqz.admin.service.SysCsmUserRelationService;
+import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
+import com.qunzhixinxi.hnqz.admin.service.SysEnterpriseAreaService;
+import com.qunzhixinxi.hnqz.admin.service.SysUserService;
+import com.qunzhixinxi.hnqz.admin.service.WmDaAgentService;
+import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntService;
 import com.qunzhixinxi.hnqz.common.core.constant.CacheConstants;
+import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
+import com.qunzhixinxi.hnqz.common.core.entity.BaseEntity;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
@@ -25,7 +35,15 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -59,18 +77,20 @@ public class WmDaDrugEntController {
     private final SysUserMapper sysUserMapper;
     private final SysCsmUserRelationService sysCsmUserRelationService;
     private final SysDeptCsmMapper sysDeptCsmMapper;
-    private final RedisTemplate redisTemplate;
+    private final RedisTemplate<String, Object> redisTemplate;
+    private final SysEnterpriseAreaService enterpriseAreaService;
+
 
     /**
      * 分页查询
      *
      * @param page        分页对象
      * @param wmDaDrugEnt 档案-药企
-     * @return
+     * @return 分页结果
      */
     @GetMapping("/page")
     @PreAuthorize("@pms.hasPermission('admin_wmdadrugent_view')")
-    public R getWmDaDrugEntPage(Page page, WmDaDrugEnt wmDaDrugEnt) {
+    public R<?> getWmDaDrugEntPage(Page<WmDaDrugEnt> page, WmDaDrugEnt wmDaDrugEnt) {
         if (SecurityUtils.getRoles().contains(19)) {
             // CSM只能查看自己维护的企业下的用户, 以及下属维护的企业下的用户
             Integer userId = SecurityUtils.getUser().getId();
@@ -78,8 +98,8 @@ public class WmDaDrugEntController {
             Set<Integer> allUserIds = sysCsmUserRelationService.recurseCsmLowerUserId(Collections.singleton(userId), new AtomicInteger(10));
             wmDaDrugEnt.setCsmUserIdList(allUserIds);
         }
-
-        return R.ok(wmDaDrugEntService.selectPage(page, wmDaDrugEnt));
+        wmDaDrugEntService.selectPage(page, wmDaDrugEnt);
+        return R.ok(page);
     }
 
 
@@ -91,41 +111,10 @@ public class WmDaDrugEntController {
      */
     @GetMapping("/{id}")
     @PreAuthorize("@pms.hasPermission('admin_wmdadrugent_view')")
-    public R getById(@PathVariable("id") Integer id) {
+    public R<WmDaDrugEnt> getById(@PathVariable("id") Integer id) {
         return R.ok(wmDaDrugEntService.getById(id));
     }
 
-
-    /**
-     * @Modify: start
-     * @Version: v2021.4.16
-     * @Author: ryz
-     * @Date: 2021/5/26  弃用
-     */
-    /**
-     * 新增档案-药企
-     *
-     * @param wmDaDrugEnt 档案-药企
-     * @return R
-     */
-    @SysLog("新增档案-药企")
-    @PostMapping
-    @PreAuthorize("@pms.hasPermission('admin_wmdadrugent_add')")
-    public R save(@RequestBody WmDaDrugEnt wmDaDrugEnt) {
-
-        WmDaDrugEnt query = new WmDaDrugEnt();
-        query.setEntname(wmDaDrugEnt.getEntname());
-        List<WmDaDrugEnt> list = wmDaDrugEntService.list(Wrappers.query(query));
-
-        if (list.size() > 0) {
-            return R.failed("药企公司名称已存在");
-        }
-
-        wmDaDrugEnt.setCreateTime(LocalDateTime.now());
-        return R.ok(wmDaDrugEntService.saveDrugEnt(wmDaDrugEnt));
-    }
-
-
     /**
      * 新增档案-药企
      *
@@ -136,22 +125,17 @@ public class WmDaDrugEntController {
     @PostMapping("/saves")
     @PreAuthorize("@pms.hasPermission('admin_wmdadrugent_add')")
     @Transactional(rollbackFor = Exception.class)
-    public R<?> saves(@RequestBody WmDaDrugEnt wmDaDrugEnt) {
+    public R<?> saves(@Validated(value = BaseEntity.Create.class) @RequestBody WmDaDrugEnt wmDaDrugEnt) {
 
-        WmDaDrugEnt query = new WmDaDrugEnt();
-        query.setEntname(wmDaDrugEnt.getEntname());
-        List<WmDaDrugEnt> list = wmDaDrugEntService.list(Wrappers.query(query));
 
-        if (CollUtil.isNotEmpty(list)) {
-            return R.failed("药企公司名称已存在");
-        }
-
-        WmDaDrugEnt query1 = new WmDaDrugEnt();
-        query1.setEntcode(wmDaDrugEnt.getEntcode());
-        List<WmDaDrugEnt> list1 = wmDaDrugEntService.list(Wrappers.query(query1));
+        int count = wmDaDrugEntService.count(Wrappers.<WmDaDrugEnt>lambdaQuery()
+                .eq(WmDaDrugEnt::getEntname, wmDaDrugEnt.getEntname())
+                .or()
+                .eq(WmDaDrugEnt::getEntcode, wmDaDrugEnt.getEntcode())
+        );
 
-        if (CollUtil.isNotEmpty(list1)) {
-            return R.failed("统一社会信用代码已经存在");
+        if (count != 0) {
+            return R.failed("药企公司名称或统一社会信用代码已存在");
         }
 
         wmDaDrugEnt.setManagement("1");
@@ -205,10 +189,15 @@ public class WmDaDrugEntController {
             insert.setUserId(userId);
             insert.setCsmName(user.getRealname());
             sysDeptCsmMapper.insert(insert);
+
+            // 区域
+            enterpriseAreaService.saveRelation(Long.valueOf(wmDaDrugEnt.getDeptId()), wmDaDrugEnt.getAreaCodes());
+
         }
         wmDaDrugEnt.setCreateTime(LocalDateTime.now());
 
-        return R.ok();
+
+        return R.ok(Boolean.TRUE);
     }
 
     /**
@@ -221,60 +210,21 @@ public class WmDaDrugEntController {
     @PutMapping
     @PreAuthorize("@pms.hasPermission('admin_wmdadrugent_edit')")
     @Transactional(rollbackFor = Exception.class)
-    public R updateById(@RequestBody WmDaDrugEnt wmDaDrugEnt) {
-        if (wmDaDrugEnt.getDeptId() == null || wmDaDrugEnt.getId() == null) {
-            return R.failed("id和deptId必填");
-        }
+    public R<?> updateById(@Validated(value = BaseEntity.Update.class) @RequestBody WmDaDrugEnt wmDaDrugEnt) {
 
         SysDept sysDept = new SysDept();
         sysDept.setDelFlag(wmDaDrugEnt.getEnableFlag());
         sysDept.setName(wmDaDrugEnt.getEntname());
         sysDept.setDeptId(wmDaDrugEnt.getDeptId());
-
-
-        /**
-         * @Modify: start
-         * @Author: ryz
-         * @Date: 2021/4/19
-         */
-//		if(!Arrays.equals(sysDept.getSubjectType(),wmDaDrugEnt.getSubjectType())){
-//			sysDeptSubService.update(Wrappers.<SysDeptSub>lambdaUpdate()
-//					.eq(SysDeptSub::getDeptId,sysDept.getDeptId())
-//					.set(SysDeptSub::getEnableFlag,SubjectTypeEnum.ENABLE_FLAG_FALSE.getCode()));
-//
-//			for (String subType : wmDaDrugEnt.getSubjectType()) {
-//				SysDeptSub condition = new SysDeptSub();
-//				condition.setDeptId(sysDept.getDeptId());
-//				condition.setSubjectType(subType);
-//				SysDeptSub existSub = sysDeptSubService.getOne(Wrappers.query(condition));
-//				if(null != existSub){
-//					existSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
-//					sysDeptSubService.updateById(existSub);
-//				}else {
-//					existSub = new SysDeptSub();
-//					existSub.setEnableFlag(SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode());
-//					existSub.setDeptId(sysDept.getDeptId());
-//					existSub.setSubjectType(subType);
-//					sysDeptSubService.save(existSub);
-//				}
-//			}
-//		}
         sysDept.setTaxCode(wmDaDrugEnt.getEntcode());
-        /**
-         * @Modify: end
-         */
-
-        sysDept.setSubjectType(wmDaDrugEnt.getSubjectType());
         sysDept.setDeptPermissions(wmDaDrugEnt.getDeptPermissions());
         sysDept.setFinancialReviewType(wmDaDrugEnt.getFinancialReviewType());
         sysDeptMapper.updateByPrimaryKeySelective(sysDept);
+
         SysUser sysUserCondition = new SysUser();
         sysUserCondition.setDeptId(wmDaDrugEnt.getDeptId());
         List<SysUser> sysUserList = sysUserMapper.selectUserById(sysUserCondition);
-//		List<Integer> id1 = sysUserList.stream().map(p -> p.getUserId()).collect(Collectors.toList());
-        /**
-         * 修改机构的人员状态
-         */
+
         for (SysUser item : sysUserList) {
             item.setDelFlag(wmDaDrugEnt.getEnableFlag());
             sysUserMapper.updateByPrimaryKeySelective(item);
@@ -290,8 +240,17 @@ public class WmDaDrugEntController {
 
         wmDaDrugEnt.setUpdateTime(LocalDateTime.now());
         wmDaDrugEnt.setUpdateUser(SecurityUtils.getUser().getId());
+        wmDaDrugEntService.updateById(wmDaDrugEnt);
+
+        if (CollUtil.isNotEmpty(wmDaDrugEnt.getAreaCodes())) {
+            // 删除历史的
+            enterpriseAreaService.delRelation(Long.valueOf(wmDaDrugEnt.getDeptId()));
+            // 保存信息
+            enterpriseAreaService.saveRelation(Long.valueOf(wmDaDrugEnt.getDeptId()), wmDaDrugEnt.getAreaCodes());
+        }
+
 
-        return R.ok(wmDaDrugEntService.updateById(wmDaDrugEnt));
+        return R.ok(Boolean.TRUE);
     }
 
     /**
@@ -303,7 +262,7 @@ public class WmDaDrugEntController {
     @SysLog("通过id删除档案-药企")
     @DeleteMapping("/{id}")
     @PreAuthorize("@pms.hasPermission('admin_wmdadrugent_del')")
-    public R removeById(@PathVariable Integer id) {
+    public R<Boolean> removeById(@PathVariable Integer id) {
         return R.ok(wmDaDrugEntService.removeById(id));
     }
 
@@ -314,7 +273,7 @@ public class WmDaDrugEntController {
      * @return 角色列表
      */
     @GetMapping("/list")
-    public R listDrugEnt(WmDaDrugEnt wmDaDrugEnt) {
+    public R<List<WmDaDrugEnt>> listDrugEnt(WmDaDrugEnt wmDaDrugEnt) {
         wmDaDrugEnt.setDelFlag("0");
         wmDaDrugEnt.setEnableFlag("0");
         if (null != wmDaDrugEnt.getEntname()) {
@@ -332,9 +291,9 @@ public class WmDaDrugEntController {
      * @return 角色列表
      */
     @GetMapping("/listScope")
-    public R listScope(WmDaDrugEnt wmDaDrugEnt) {
-        wmDaDrugEnt.setDelFlag("0");
-        wmDaDrugEnt.setEnableFlag("0");
+    public R<List<WmDaDrugEnt>> listScope(WmDaDrugEnt wmDaDrugEnt) {
+        wmDaDrugEnt.setDelFlag(CommonConstants.STATUS_NORMAL);
+        wmDaDrugEnt.setEnableFlag(CommonConstants.STATUS_NORMAL);
 
         if (null != wmDaDrugEnt.getEntname()) {
             String entname = wmDaDrugEnt.getEntname();
@@ -377,18 +336,17 @@ public class WmDaDrugEntController {
     /**
      * 通过ID查询
      *
-     * @param username
+     * @param username 用户名
      * @return SysDept
      */
     @GetMapping("/getDrugListByUsername")
-    public R getDrugListByUsername(String username) {
+    public R<?> getDrugListByUsername(String username) {
 
         List<SysUser> userList = userService.list(Wrappers.<SysUser>query().lambda().eq(SysUser::getUsername, username).eq(SysUser::getDelFlag, "0"));
         List<Integer> list = new ArrayList<>();
-        if (userList.size() > 0) {
-            for (SysUser s : userList
-            ) {
-                if (null != s.getDrugEntId() && !"null".equals(s.getDrugEntId()) && !"".equals(s.getDrugEntId())) {
+        if (CollUtil.isNotEmpty(userList)) {
+            for (SysUser s : userList) {
+                if (null != s.getDrugEntId()) {
                     UserInfo userInfo = userService.findUserInfo(s);
                     if (isZbOrDbUsers(userInfo.getRoles())) {
                         list.add(s.getDrugEntId());
@@ -396,7 +354,7 @@ public class WmDaDrugEntController {
                 }
             }
         }
-        if (list.size() > 0) {
+        if (CollUtil.isNotEmpty(list)) {
             return R.ok(wmDaDrugEntService.listByIds(list));
         } else {
             return R.ok();
@@ -410,22 +368,18 @@ public class WmDaDrugEntController {
      * @return SysDept
      */
     @GetMapping("/getDrugListByAgentServiceEnt")
-    public R getDrugListByAgentServiceEnt() {
+    public R<?> getDrugListByAgentServiceEnt() {
 
         List<String> stringList = new ArrayList<>();
 
         SysDept sysDept = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
         if (null != sysDept) {
-            String levelId = "";
-            if (sysDept.getLevel() == 3) {
-                levelId = sysDept.getLevel2Id() + "";
-            } else {
-                levelId = sysDept.getLevel3Id() + "";
-            }
+            String levelId = sysDept.getLevel() == 3 ? sysDept.getLevel2Id().toString() : sysDept.getLevel3Id().toString();
+
             WmDaAgent wmDaAgent = wmDaAgentService.getById(levelId);
-            if (null != wmDaAgent && null != wmDaAgent.getExtDrugEnt() && !"".equals(wmDaAgent.getExtDrugEnt())) {
+            if (null != wmDaAgent && null != wmDaAgent.getExtDrugEnt() && StrUtil.isNotBlank(wmDaAgent.getExtDrugEnt())) {
                 String extDrugEnt = wmDaAgent.getExtDrugEnt();
-                String ext[] = extDrugEnt.split(",");
+                String[] ext = extDrugEnt.split(",");
                 for (String args : ext) {
                     if (!(sysDept.getLevel1Id() + "").equals(args)) {
                         stringList.add(args);
@@ -435,7 +389,7 @@ public class WmDaDrugEntController {
         }
         stringList.add(SecurityUtils.getUser().getDrugEntId().toString());
 
-        if (stringList.size() > 0) {
+        if (CollUtil.isNotEmpty(stringList)) {
             return R.ok(wmDaDrugEntService.listByIds(stringList));
         }
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/SysDeptMapper.java

@@ -62,7 +62,7 @@ public interface SysDeptMapper extends DataScopeMapper<SysDept> {
     /**
      * 查询所有dept
      *
-     * @return
+     * @return 部门列表
      */
     List<SysDept> listAllDept();
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/WmDaDrugEntMapper.java

@@ -27,7 +27,7 @@ public interface WmDaDrugEntMapper extends DataScopeMapper<WmDaDrugEnt> {
 	 * @param wmDaDrugEnt 实体对象
 	 * @return 分页列表
 	 */
-	IPage<WmDaDrugEnt> selectPage(Page page, @Param("query") WmDaDrugEnt wmDaDrugEnt);
+	Page<WmDaDrugEnt> selectPage(Page<WmDaDrugEnt> page, @Param("query") WmDaDrugEnt wmDaDrugEnt);
 
 	List<WmDaDrugEnt> selectByDrugId(WmDaDrugEnt wmDaDrugEnt);
 
@@ -43,7 +43,7 @@ public interface WmDaDrugEntMapper extends DataScopeMapper<WmDaDrugEnt> {
 
 	WmDaDrugEnt selectId(WmDaDrugEnt wmDaDrugEnt);
 
-    List selectEntNameByDeptId(Integer deptId);
+    List<Map<String, Object>> selectEntNameByDeptId(Integer deptId);
 
 	List selectEntNameByByDeptIds(Integer upId);
 

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

@@ -3,6 +3,9 @@ package com.qunzhixinxi.hnqz.admin.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysEnterpriseArea;
 
+import java.util.Collection;
+import java.util.List;
+
 /**
  * 企业区域关系表
  *
@@ -12,4 +15,26 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysEnterpriseArea;
  */
 public interface SysEnterpriseAreaService extends IService<SysEnterpriseArea> {
 
+    /**
+     * 保存企业区域关系
+     *
+     * @param deptId    部门ID
+     * @param areaCodes 区域ID
+     */
+    void saveRelation(Long deptId, Collection<Long> areaCodes);
+
+    /**
+     * 获取企业的区域
+     *
+     * @param deptId 企业ID
+     * @return 区域列表
+     */
+    List<Long> listEntAreas(Long deptId);
+
+    /**
+     * 删除关系
+     *
+     * @param deptId 部门ID
+     */
+    void delRelation(Long deptId);
 }

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

@@ -1,4 +1,3 @@
-
 package com.qunzhixinxi.hnqz.admin.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -8,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 档案-药企
@@ -17,37 +17,37 @@ import java.util.List;
  */
 public interface WmDaDrugEntService extends IService<WmDaDrugEnt> {
 
-	/**
-	 * 保存药企
-	 * @param wmDaDrugEnt 药企信息
-	 * @return 结果
-	 */
-	boolean saveDrugEnt(WmDaDrugEnt wmDaDrugEnt);
-
-	List<WmDaDrugEnt> selectByScope(Wrapper<WmDaDrugEnt> queryWrapper);
-
-	List<WmDaDrugEnt> selectByDrugId(WmDaDrugEnt wmDaDrugEnt);
-
-	List selectEntNameByDrugId(Integer id);
+    /**
+     * 保存药企
+     *
+     * @param wmDaDrugEnt 药企信息
+     * @return 结果
+     */
+    boolean saveDrugEnt(WmDaDrugEnt wmDaDrugEnt);
 
-	List selectEntNameByDrugIds(Integer id);
+    List<WmDaDrugEnt> selectByScope(Wrapper<WmDaDrugEnt> queryWrapper);
 
-	boolean saveDrugEnts(WmDaDrugEnt wmDaDrugEnt);
+    /**
+     * 保存药企
+     *
+     * @param wmDaDrugEnt 药企信息
+     * @return 保存结果
+     */
+    boolean saveDrugEnts(WmDaDrugEnt wmDaDrugEnt);
 
-	WmDaDrugEnt selectByDeptId(Integer deptId);
+    WmDaDrugEnt selectByDeptId(Integer deptId);
 
-	List selectEntNameByDeptId(Integer deptId);
+    List<Map<String, Object>> selectEntNameByDeptId(Integer deptId);
 
-	List selectEntNameByByDeptIds(Integer upId);
+    List selectEntNameByByDeptIds(Integer upId);
 
-	List<WmDaDrugEnt> getListByCsoDeptId(Integer deptId);
+    List<WmDaDrugEnt> getListByCsoDeptId(Integer deptId);
 
-	/**
-	 * 分页查询
-	 *
-	 * @param page 分页对象
-	 * @param wmDaDrugEnt 实体对象
-	 * @return 分页列表
-	 */
-	IPage<WmDaDrugEnt> selectPage(Page page, WmDaDrugEnt wmDaDrugEnt);
+    /**
+     * 分页查询
+     *
+     * @param page        分页对象
+     * @param wmDaDrugEnt 实体对象
+     */
+    void selectPage(Page<WmDaDrugEnt> page, WmDaDrugEnt wmDaDrugEnt);
 }

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

@@ -1,5 +1,7 @@
 package com.qunzhixinxi.hnqz.admin.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysEnterpriseArea;
 import com.qunzhixinxi.hnqz.admin.mapper.SysEnterpriseAreaMapper;
@@ -7,6 +9,12 @@ import com.qunzhixinxi.hnqz.admin.service.SysEnterpriseAreaService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 企业区域关系表
@@ -20,6 +28,56 @@ import org.springframework.stereotype.Service;
 @AllArgsConstructor
 public class SysEnterpriseAreaServiceImpl extends ServiceImpl<SysEnterpriseAreaMapper, SysEnterpriseArea> implements SysEnterpriseAreaService {
 
+    /**
+     * 保存企业区域关系
+     *
+     * @param deptId    部门ID
+     * @param areaCodes 区域ID
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveRelation(Long deptId, Collection<Long> areaCodes) {
+
+        if (CollUtil.isEmpty(areaCodes)) {
+            log.info("所属区域缺失");
+            return;
+        }
+        LocalDateTime now = LocalDateTime.now();
+        List<SysEnterpriseArea> collect = areaCodes.stream().distinct().map(code -> {
+            SysEnterpriseArea enterpriseArea = new SysEnterpriseArea();
+            enterpriseArea.setEntId(deptId);
+            enterpriseArea.setAreaId(code);
+            enterpriseArea.setCreateTime(now);
+            return enterpriseArea;
+        }).collect(Collectors.toList());
+
+        this.saveBatch(collect);
+
+    }
+
+    /**
+     * 获取企业的区域
+     *
+     * @param deptId 企业ID
+     * @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());
+    }
+
+    /**
+     * 删除关系
+     *
+     * @param deptId 部门ID
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delRelation(Long deptId) {
+
+        this.remove(Wrappers.<SysEnterpriseArea>lambdaQuery().eq(SysEnterpriseArea::getEntId, deptId));
+
+    }
 }
 
 

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

@@ -778,14 +778,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         if (null != deptId) {
             userList = userList.stream().filter(item -> deptId.equals(item.getDeptId())).collect(Collectors.toList());
-            ;
         }
 
 
         //每页数据条数
         Page<UserVO> page1 = new Page<>();
-        int current = new Long(page.getCurrent()).intValue();
-        int size = new Long(page.getSize()).intValue();
+        int current = Long.valueOf(page.getCurrent()).intValue();
+        int size = Long.valueOf(page.getSize()).intValue();
 
         int count = userList.size();
         List<UserVO> pageList = new ArrayList<>();

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

@@ -123,7 +123,6 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
                     SysDept sysDept = new SysDept();
                     sysDept.setName(wmDaAgent.getGsmc());
                     sysDept.setTaxCode(wmDaAgent.getZjNumber());
-                    sysDept.setSubjectType(wmDaAgent.getSubjectType());
                     sysDept.setLevel(3);
                     sysDept.setExpiryDate(queryDept.getExpiryDate());
                     sysDeptService.save(sysDept);
@@ -155,7 +154,6 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
                     sysDept.setName(wmDaAgent.getGsmc());
                     sysDept.setLevel(4);
                     sysDept.setTaxCode(wmDaAgent.getZjNumber());
-                    sysDept.setSubjectType(wmDaAgent.getSubjectType());
                     sysDept.setExpiryDate(queryDept.getExpiryDate());
                     sysDeptService.save(sysDept);
                     wmDaAgent.setDeptId(sysDept.getDeptId());
@@ -340,7 +338,6 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
              */
 
             sysDept.setTaxCode(wmDaAgent.getZjNumber());
-            sysDept.setSubjectType(wmDaAgent.getSubjectType());
             sysDept.setDeptPermissions(wmDaAgent.getDeptPermissions());
             sysDept.setFinancialReviewType(wmDaAgent.getFinancialReviewType());
             sysDept.setExpiryDate(now.plusYears(1L).toLocalDate());
@@ -631,7 +628,6 @@ public class WmDaAgentServiceImpl extends ServiceImpl<WmDaAgentMapper, WmDaAgent
         /**
          * @Modify: end
          */
-        sysDept.setSubjectType(wmDaAgent.getSubjectType());
         sysDept.setDeptPermissions(wmDaAgent.getDeptPermissions());
         sysDept.setFinancialReviewType(wmDaAgent.getFinancialReviewType());
         sysDeptMapper.updateByPrimaryKeySelective(sysDept);

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

@@ -10,12 +10,12 @@ import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt;
 import com.qunzhixinxi.hnqz.admin.mapper.WmDaDrugEntMapper;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptRelationService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
+import com.qunzhixinxi.hnqz.admin.service.SysEnterpriseAreaService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionPercentRuleService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionRuleService;
 import com.qunzhixinxi.hnqz.common.data.datascope.DataScope;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
-import com.qunzhixinxi.hnqz.common.sequence.sequence.Sequence;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +24,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 档案-药企
@@ -39,6 +40,7 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 	private final WmDaDrugEntMapper wmDaDrugEntMapper;
 	private final SysDeptRelationService sysDeptRelationService;
 	private final WmTaskSubmissionRuleService taskSubmissionRuleService;
+	private final SysEnterpriseAreaService enterpriseAreaService;
 	private final WmTaskSubmissionPercentRuleService taskSubmissionPercentRuleService;
 
 	@Override
@@ -55,7 +57,6 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 			sysDept.setLevel(2);
 			sysDept.setLevel1Id(entity.getId());
 			sysDept.setLevel1Name(entity.getEntname());
-			sysDept.setSubjectType(entity.getSubjectType());
 			sysDept.setTaxCode(entity.getEntcode());
 			sysDept.setFinancialReviewType(entity.getFinancialReviewType());
 			sysDept.setDeptPermissions(entity.getDeptPermissions());
@@ -98,57 +99,40 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 
 	}
 
-	@Override
-	public List<WmDaDrugEnt> selectByDrugId(WmDaDrugEnt wmDaDrugEnt) {
-		return wmDaDrugEntMapper.selectByDrugId(wmDaDrugEnt);
-	}
-
-	@Override
-	public List selectEntNameByDrugId(Integer id) {
-		return wmDaDrugEntMapper.selectEntNameByDrugId(id);
-	}
-
-	@Override
-	public List selectEntNameByDrugIds(Integer id) {
-		return wmDaDrugEntMapper.selectEntNameByDrugIds(id);
-	}
-
 	@Override
 	public boolean saveDrugEnts(WmDaDrugEnt entity) {
 
 		LocalDateTime now = LocalDateTime.now();
-
-		entity.setDeptId((int) System.currentTimeMillis() / 1000);
+		Integer deptId = (int) System.currentTimeMillis() / 1000;
+		entity.setDeptId(deptId);
 		entity.setCreateTime(now);
 		entity.setCreateUser(SecurityUtils.getUser().getId());
 
 		if (super.save(entity)) {
 			SysDept sysDept = new SysDept();
+			sysDept.setDeptId(deptId);
 			sysDept.setName(entity.getEntname());
 			sysDept.setLevel(2);
-			sysDept.setSubjectType(entity.getSubjectType());
 			sysDept.setDeptPermissions(entity.getDeptPermissions());
 			sysDept.setFinancialReviewType(entity.getFinancialReviewType());
 			sysDept.setExpiryDate(now.plusYears(1L).toLocalDate());
 			sysDeptService.save(sysDept);
-			entity.setDeptId(sysDept.getDeptId());
-			wmDaDrugEntMapper.updateById(entity);
 
 			List<SysDeptRelation> newList = new ArrayList<>(2);
 			SysDeptRelation sysDeptRelation = new SysDeptRelation();
 			sysDeptRelation.setAncestor(SecurityUtils.getUser().getDeptId());
-			sysDeptRelation.setDescendant(entity.getDeptId());
+			sysDeptRelation.setDescendant(deptId);
 			newList.add(sysDeptRelation);
 			SysDeptRelation sysDeptRelation1 = new SysDeptRelation();
-			sysDeptRelation1.setAncestor(entity.getDeptId());
-			sysDeptRelation1.setDescendant(entity.getDeptId());
+			sysDeptRelation1.setAncestor(deptId);
+			sysDeptRelation1.setDescendant(deptId);
 			newList.add(sysDeptRelation1);
 			sysDeptRelationService.saveBatch(newList);
 
 			// 初始化任务规则
-			taskSubmissionRuleService.initDeptTaskSubmissionRule(Collections.singleton(sysDept.getDeptId()));
+			taskSubmissionRuleService.initDeptTaskSubmissionRule(Collections.singleton(deptId));
 			// 初始化企业的任务类型配置的信息
-			taskSubmissionPercentRuleService.initTaskTypeConfigRule(Collections.singleton(sysDept.getDeptId()));
+			taskSubmissionPercentRuleService.initTaskTypeConfigRule(Collections.singleton(deptId));
 
 			return true;
 		}
@@ -161,7 +145,7 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 	}
 
 	@Override
-	public List selectEntNameByDeptId(Integer deptId) {
+	public List<Map<String, Object>> selectEntNameByDeptId(Integer deptId) {
 		return wmDaDrugEntMapper.selectEntNameByDeptId(deptId);
 	}
 
@@ -180,22 +164,15 @@ public class WmDaDrugEntServiceImpl extends ServiceImpl<WmDaDrugEntMapper, WmDaD
 	 *
 	 * @param page 分页对象
 	 * @param wmDaDrugEnt 实体对象
-	 * @return 分页列表
 	 */
 	@Override
-	public IPage<WmDaDrugEnt> selectPage(Page page, WmDaDrugEnt wmDaDrugEnt) {
-		IPage<WmDaDrugEnt> listIPage = wmDaDrugEntMapper.selectPage(page, wmDaDrugEnt);
-
-		//listIPage.getRecords().forEach(ent -> {
-		//		Map<String, Integer> collect = sysDeptSubMapper.selectList(Wrappers.<SysDeptSub>lambdaQuery()
-		//				.eq(SysDeptSub::getDeptId, ent.getDeptId())
-		//				//.eq(SysDeptSub::getEnableFlag, SubjectTypeEnum.ENABLE_FLAG_TRUE.getCode()))
-		//				.stream()
-		//				.collect(Collectors.toMap(sysDeptSub -> sysDeptSub.getSubjectLocation().name(), SysDeptSub::getSubjectChannel));
-		//		ent.setSubjectType(collect.keySet().toArray(new String[0]));
-		//		ent.setSubjectTypeAndChannel(collect);
-		//});
-
-		return listIPage;
+	public void selectPage(Page<WmDaDrugEnt> page, WmDaDrugEnt wmDaDrugEnt) {
+		wmDaDrugEntMapper.selectPage(page, wmDaDrugEnt);
+
+		page.getRecords().forEach(ent -> {
+			List<Long> areaCodes = enterpriseAreaService.listEntAreas(Long.valueOf(ent.getDeptId()));
+			ent.setAreaCodes(areaCodes);;
+		});
+
 	}
 }

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

@@ -3,259 +3,250 @@
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qunzhixinxi.hnqz.admin.mapper.SysDeptMapper">
-	<resultMap id="sysDeptMap" type="com.qunzhixinxi.hnqz.admin.api.entity.SysDept">
-		<id property="deptId" column="dept_id"/>
-		<result property="name" column="name"/>
-		<result property="sort" column="sort"/>
-		<result property="createTime" column="create_time"/>
-		<result property="updateTime" column="update_time"/>
-		<result property="delFlag" column="del_flag"/>
-		<result property="parentId" column="parent_id"/>
-		<result property="tenantId" column="tenant_id"/>
-		<result property="deptCode" column="dept_code"/>
-		<result property="level" column="level"/>
-		<result property="level1Name" column="level1_name"/>
-		<result property="level1Id" column="level1_id"/>
-		<result property="level2Name" column="level2_name"/>
-		<result property="level2Id" column="level2_id"/>
-		<result property="level3Name" column="level3_name"/>
-		<result property="level3Id" column="level3_id"/>
-		<result property="appId" column="app_id"/>
-		<result property="appSecret" column="app_secret"/>
-		<result property="rsaPublicKey" column="rsa_public_key"/>
-		<result property="queryUrl" column="query_url"/>
-		<result property="subjectName" column="subject_name"/>
-		<result property="financialReviewType" column="financial_review_type"/>
-		<result property="subjectType" column="subject_type" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
-		<result property="taxCode" column="tax_code"/>
-	</resultMap>
-
-	<resultMap id="sysEntRelMap" type="com.qunzhixinxi.hnqz.admin.api.vo.SysEnterpriseRelationVO">
-		<id property="relId" column="rel_id"/>
-		<result property="entId" column="ent_id"/>
-		<result property="entName" column="ent_name"/>
-		<result property="rootId" column="root_id"/>
-		<result property="rootName" column="root_name"/>
-		<result property="entType" column="ent_type"/>
-		<result property="productLine" column="product_line"/>
-		<result property="entLevel" column="ent_level"/>
-		<collection property="serviceCharges" ofType="com.qunzhixinxi.hnqz.admin.api.vo.SysEnterpriseServiceChargeVO"
-					select="com.qunzhixinxi.hnqz.admin.mapper.SysDeptSubMapper.listSysEnterpriseServiceCharge"
-					column="ent_id"/>
-	</resultMap>
-
-	<select id="selectDistinctDeptId" resultMap="sysDeptMap">
-		SELECT DISTINCT dept_id,
-						level
-		FROM sys_dept
-		WHERE dept_id = #{query.deptId,jdbcType=INTEGER}
-		ORDER BY level
-		LIMIT 1
-	</select>
-
-	<select id="selectDeptList" resultMap="sysDeptMap">
-		SELECT dept_id,
-			   sort,
-			   name
-		FROM sys_dept
-	</select>
-
-	<select id="selectDeptByIds" resultMap="sysDeptMap">
-		SELECT *
-		FROM sys_dept
-		WHERE dept_id = #{query.deptId,jdbcType=INTEGER}
-	</select>
-
-	<select id="selectDeptByName" resultMap="sysDeptMap">
-		SELECT dept_id,
-			   name
-		FROM sys_dept
-		WHERE dept_id = #{query.deptId,jdbcType=INTEGER}
-	</select>
-
-	<select id="selectDept" resultMap="sysDeptMap">
-		SELECT *
-		FROM sys_dept
-		WHERE dept_id = #{deptId,jdbcType=INTEGER}
-	</select>
-
-	<select id="selectListByDept" resultMap="sysDeptMap">
-		SELECT dept_id,
-			   name
-		FROM sys_dept
-		WHERE del_flag = 0
-	</select>
-
-	<select id="selectDeptById" resultType="java.util.HashMap">
-		SELECT d.dept_id AS                                                      deptId,
-			   d.name,
-			   d.level,
-			   CASE WHEN a.zj_number IS NULL THEN e.entcode ELSE a.zj_number END entcode
-		FROM sys_dept d
-				 LEFT JOIN wm_da_agent a ON d.dept_id = a.dept_id
-				 LEFT JOIN wm_da_drug_ent e ON d.dept_id = e.dept_id
-		WHERE d.dept_id = #{query.deptId,jdbcType=INTEGER}
-	</select>
-
-	<select id="getAllParentDept" resultMap="sysDeptMap">
-		SELECT DISTINCT dept_id,
-						`name`,
-						`level`
-		FROM sys_dept
-		WHERE dept_id IN
-			  (SELECT d.dept_id
-			   FROM sys_dept d
-			   WHERE d.dept_id = #{query.deptId}
-			   UNION
-			   SELECT r.up_id
-			   FROM sys_dept d
-						LEFT JOIN wm_relation r ON d.dept_id = r.down_id
-			   WHERE d.dept_id = #{query.deptId}
-			   UNION
-			   SELECT r2.up_id
-			   FROM sys_dept d
-						LEFT JOIN wm_relation r ON d.dept_id = r.down_id
-						LEFT JOIN wm_relation r2 ON r.up_id = r2.down_id
-			   WHERE d.dept_id = #{query.deptId}
-			  )
-		  AND del_flag = 0
-		  AND dept_id NOT IN (1)
-	</select>
-
-	<select id="selectByName" resultMap="sysDeptMap">
-		SELECT *
-		FROM sys_dept
-		WHERE name = #{name,jdbcType=VARCHAR}
-	</select>
-	<select id="selectEntCodeByLevelId" resultType="string">
-		<choose>
-			<when test="level = 1">
-				SELECT `entcode` FROM `wm_da_drug_ent`
-			</when>
-			<otherwise>
-				SELECT `zj_number` FROM `wm_da_agent`
-			</otherwise>
-		</choose>
-		WHERE `id` = #{levelId}
-	</select>
-
-	<update id="updateByPrimaryKeySelective" parameterType="com.qunzhixinxi.hnqz.admin.api.entity.SysDept">
-		update sys_dept
-		<set>
-			<if test="delFlag != null">
-				del_flag = #{delFlag,jdbcType=VARCHAR},
-			</if>
-			<if test="name != null">
-				name = #{name,jdbcType=VARCHAR},
-			</if>
-			<if test="subjectType != null">
-				subject_type = #{subjectType,jdbcType=VARCHAR},
-			</if>
-			<if test="taxCode != null">
-				tax_code = #{taxCode,jdbcType=VARCHAR},
-			</if>
-			<if test="deptPermissions != null and deptPermissions != ''">
-				dept_permissions = #{deptPermissions, jdbcType=VARCHAR},
-			</if>
-			<if test="financialReviewType != null">
-				financial_review_type = #{financialReviewType.type, jdbcType=CHAR}
-			</if>
-		</set>
-		where dept_id = #{deptId,jdbcType=BIGINT}
-	</update>
-
-	<select id="getParentDept" resultType="map">
-		SELECT DISTINCT dept_id deptId,
-						`name`
-		FROM sys_dept
-		WHERE dept_id IN
-			  (
-				  SELECT r.up_id
-				  FROM sys_dept d
-						   LEFT JOIN wm_relation r ON d.dept_id = r.down_id
-				  WHERE d.dept_id = #{query.deptId}
-				  UNION
-				  SELECT r2.up_id
-				  FROM sys_dept d
-						   LEFT JOIN wm_relation r ON d.dept_id = r.down_id
-						   LEFT JOIN wm_relation r2 ON r.up_id = r2.down_id
-				  WHERE d.dept_id = #{query.deptId}
-			  )
-		  AND del_flag = 0
-		  AND dept_id NOT IN (1)
-	</select>
-
-	<select id="getChildDept" resultType="map">
-		SELECT DISTINCT dept_id deptId,
-						`name`
-		FROM sys_dept
-		WHERE dept_id IN
-			  (
-				  SELECT r.down_id
-				  FROM sys_dept d
-						   LEFT JOIN wm_relation r ON d.dept_id = r.up_id
-				  WHERE d.dept_id = #{query.deptId}
-				  UNION
-				  SELECT r2.down_id
-				  FROM sys_dept d
-						   LEFT JOIN wm_relation r ON d.dept_id = r.up_id
-						   LEFT JOIN wm_relation r2 ON r.down_id = r2.up_id
-				  WHERE d.dept_id = #{query.deptId}
-			  )
-		  AND del_flag = 0
-		  AND dept_id NOT IN (1)
-	</select>
-
-	<select id="getDeptConvertToName" resultType="map">
-		SELECT dept_id deptId, `name`
-		FROM sys_dept
-	</select>
-
-	<!-- 查询所有dept -->
-	<select id="listAllDept" resultMap="sysDeptMap">
-		SELECT *
-		FROM sys_dept
-	</select>
-
-	<!-- 分页查询所有dept -->
-	<select id="pageAllDept" resultMap="sysDeptMap">
-		SELECT *
-		FROM sys_dept
-		<where>
-			<if test="ew != null">
-				<if test="ew.nonEmptyOfWhere">
-					AND
-				</if>
-				${ew.sqlSegment}
-			</if>
-		</where>
-	</select>
-
-	<!-- 根据id批量查询 -->
-	<select id="selectByIds" resultMap="sysDeptMap">
-		select * from sys_dept where dept_id in
-		<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
-			#{item}
-		</foreach>
-	</select>
-
-	<select id="pageEntRels" resultMap="sysEntRelMap">
-		SELECT el.rel_id,
-		d.dept_id AS `ent_id`,
-		d.name AS `ent_name`,
-		d1.dept_id AS `root_id`,
-		d1.name AS `root_name`,
-		el.e_type AS `ent_type`,
-		el.pro_line AS `product_line`,
-		el.e_level AS `ent_level`
-		FROM sys_dept d
-		LEFT JOIN sys_ent_rel el ON el.ent_id = d.dept_id
-		LEFT JOIN sys_dept d1 ON el.root_id = d1.dept_id
-		<where>
-			d.del_flag = 0
-			<if test="entName != null and entName != ''">
-				AND d.name like CONCAT('%', #{entName},'%')
-			</if>
-		</where>
-	</select>
+    <resultMap id="sysDeptMap" type="com.qunzhixinxi.hnqz.admin.api.entity.SysDept">
+        <id property="deptId" column="dept_id"/>
+        <result property="name" column="name"/>
+        <result property="sort" column="sort"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="deptCode" column="dept_code"/>
+        <result property="level" column="level"/>
+        <result property="level1Name" column="level1_name"/>
+        <result property="level1Id" column="level1_id"/>
+        <result property="level2Name" column="level2_name"/>
+        <result property="level2Id" column="level2_id"/>
+        <result property="level3Name" column="level3_name"/>
+        <result property="level3Id" column="level3_id"/>
+        <result property="financialReviewType" column="financial_review_type"/>
+        <result property="taxCode" column="tax_code"/>
+    </resultMap>
+
+    <resultMap id="sysEntRelMap" type="com.qunzhixinxi.hnqz.admin.api.vo.SysEnterpriseRelationVO">
+        <id property="relId" column="rel_id"/>
+        <result property="entId" column="ent_id"/>
+        <result property="entName" column="ent_name"/>
+        <result property="rootId" column="root_id"/>
+        <result property="rootName" column="root_name"/>
+        <result property="entType" column="ent_type"/>
+        <result property="productLine" column="product_line"/>
+        <result property="entLevel" column="ent_level"/>
+        <collection property="serviceCharges" ofType="com.qunzhixinxi.hnqz.admin.api.vo.SysEnterpriseServiceChargeVO"
+                    select="com.qunzhixinxi.hnqz.admin.mapper.SysDeptSubMapper.listSysEnterpriseServiceCharge"
+                    column="ent_id"/>
+    </resultMap>
+
+    <select id="selectDistinctDeptId" resultMap="sysDeptMap">
+        SELECT DISTINCT dept_id,
+        level
+        FROM sys_dept
+        WHERE dept_id = #{query.deptId,jdbcType=INTEGER}
+        ORDER BY level
+        LIMIT 1
+    </select>
+
+    <select id="selectDeptList" resultMap="sysDeptMap">
+        SELECT dept_id,
+        sort,
+        name
+        FROM sys_dept
+    </select>
+
+    <select id="selectDeptByIds" resultMap="sysDeptMap">
+        SELECT *
+        FROM sys_dept
+        WHERE dept_id = #{query.deptId,jdbcType=INTEGER}
+    </select>
+
+    <select id="selectDeptByName" resultMap="sysDeptMap">
+        SELECT dept_id,
+        name
+        FROM sys_dept
+        WHERE dept_id = #{query.deptId,jdbcType=INTEGER}
+    </select>
+
+    <select id="selectDept" resultMap="sysDeptMap">
+        SELECT *
+        FROM sys_dept
+        WHERE dept_id = #{deptId,jdbcType=INTEGER}
+    </select>
+
+    <select id="selectListByDept" resultMap="sysDeptMap">
+        SELECT dept_id,
+        name
+        FROM sys_dept
+        WHERE del_flag = 0
+    </select>
+
+    <select id="selectDeptById" resultType="java.util.HashMap">
+        SELECT d.dept_id AS deptId,
+        d.name,
+        d.level,
+        CASE WHEN a.zj_number IS NULL THEN e.entcode ELSE a.zj_number END entcode
+        FROM sys_dept d
+        LEFT JOIN wm_da_agent a ON d.dept_id = a.dept_id
+        LEFT JOIN wm_da_drug_ent e ON d.dept_id = e.dept_id
+        WHERE d.dept_id = #{query.deptId,jdbcType=INTEGER}
+    </select>
+
+    <select id="getAllParentDept" resultMap="sysDeptMap">
+        SELECT DISTINCT dept_id,
+        `name`,
+        `level`
+        FROM sys_dept
+        WHERE dept_id IN
+        (SELECT d.dept_id
+        FROM sys_dept d
+        WHERE d.dept_id = #{query.deptId}
+        UNION
+        SELECT r.up_id
+        FROM sys_dept d
+        LEFT JOIN wm_relation r ON d.dept_id = r.down_id
+        WHERE d.dept_id = #{query.deptId}
+        UNION
+        SELECT r2.up_id
+        FROM sys_dept d
+        LEFT JOIN wm_relation r ON d.dept_id = r.down_id
+        LEFT JOIN wm_relation r2 ON r.up_id = r2.down_id
+        WHERE d.dept_id = #{query.deptId}
+        )
+        AND del_flag = 0
+        AND dept_id NOT IN (1)
+    </select>
+
+    <select id="selectByName" resultMap="sysDeptMap">
+        SELECT *
+        FROM sys_dept
+        WHERE name = #{name,jdbcType=VARCHAR}
+    </select>
+    <select id="selectEntCodeByLevelId" resultType="string">
+        <choose>
+            <when test="level = 1">
+                SELECT `entcode` FROM `wm_da_drug_ent`
+            </when>
+            <otherwise>
+                SELECT `zj_number` FROM `wm_da_agent`
+            </otherwise>
+        </choose>
+        WHERE `id` = #{levelId}
+    </select>
+
+    <update id="updateByPrimaryKeySelective" parameterType="com.qunzhixinxi.hnqz.admin.api.entity.SysDept">
+        update sys_dept
+        <set>
+            <if test="delFlag != null">
+                del_flag = #{delFlag,jdbcType=VARCHAR},
+            </if>
+            <if test="name != null">
+                name = #{name,jdbcType=VARCHAR},
+            </if>
+            <if test="taxCode != null">
+                tax_code = #{taxCode,jdbcType=VARCHAR},
+            </if>
+            <if test="deptPermissions != null and deptPermissions != ''">
+                dept_permissions = #{deptPermissions, jdbcType=VARCHAR},
+            </if>
+            <if test="financialReviewType != null">
+                financial_review_type = #{financialReviewType.type, jdbcType=CHAR}
+            </if>
+        </set>
+        where dept_id = #{deptId,jdbcType=BIGINT}
+    </update>
+
+    <select id="getParentDept" resultType="map">
+        SELECT DISTINCT dept_id deptId,
+        `name`
+        FROM sys_dept
+        WHERE dept_id IN
+        (
+        SELECT r.up_id
+        FROM sys_dept d
+        LEFT JOIN wm_relation r ON d.dept_id = r.down_id
+        WHERE d.dept_id = #{query.deptId}
+        UNION
+        SELECT r2.up_id
+        FROM sys_dept d
+        LEFT JOIN wm_relation r ON d.dept_id = r.down_id
+        LEFT JOIN wm_relation r2 ON r.up_id = r2.down_id
+        WHERE d.dept_id = #{query.deptId}
+        )
+        AND del_flag = 0
+        AND dept_id NOT IN (1)
+    </select>
+
+    <select id="getChildDept" resultType="map">
+        SELECT DISTINCT dept_id deptId,
+        `name`
+        FROM sys_dept
+        WHERE dept_id IN
+        (
+        SELECT r.down_id
+        FROM sys_dept d
+        LEFT JOIN wm_relation r ON d.dept_id = r.up_id
+        WHERE d.dept_id = #{query.deptId}
+        UNION
+        SELECT r2.down_id
+        FROM sys_dept d
+        LEFT JOIN wm_relation r ON d.dept_id = r.up_id
+        LEFT JOIN wm_relation r2 ON r.down_id = r2.up_id
+        WHERE d.dept_id = #{query.deptId}
+        )
+        AND del_flag = 0
+        AND dept_id NOT IN (1)
+    </select>
+
+    <select id="getDeptConvertToName" resultType="map">
+        SELECT dept_id deptId, `name`
+        FROM sys_dept
+    </select>
+
+    <!-- 查询所有dept -->
+    <select id="listAllDept" resultMap="sysDeptMap">
+        SELECT *
+        FROM sys_dept
+    </select>
+
+    <!-- 分页查询所有dept -->
+    <select id="pageAllDept" resultMap="sysDeptMap">
+        SELECT *
+        FROM sys_dept
+        <where>
+            <if test="ew != null">
+                <if test="ew.nonEmptyOfWhere">
+                    AND
+                </if>
+                ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+
+    <!-- 根据id批量查询 -->
+    <select id="selectByIds" resultMap="sysDeptMap">
+        select * from sys_dept where dept_id in
+        <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="pageEntRels" resultMap="sysEntRelMap">
+        SELECT el.rel_id,
+        d.dept_id AS `ent_id`,
+        d.name AS `ent_name`,
+        d1.dept_id AS `root_id`,
+        d1.name AS `root_name`,
+        el.e_type AS `ent_type`,
+        el.pro_line AS `product_line`,
+        el.e_level AS `ent_level`
+        FROM sys_dept d
+        LEFT JOIN sys_ent_rel el ON el.ent_id = d.dept_id
+        LEFT JOIN sys_dept d1 ON el.root_id = d1.dept_id
+        <where>
+            d.del_flag = 0
+            <if test="entName != null and entName != ''">
+                AND d.name like CONCAT('%', #{entName},'%')
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -137,7 +137,9 @@
 
     <select id="selectEntNameByDeptId" resultMap="wmDaDrugEntMap" parameterType="java.util.HashMap">
         select
-        id,dept_id,entname
+        id,
+        dept_id,
+        entname
         from wm_da_drug_ent
         where
         dept_id = #{deptId,jdbcType=INTEGER}