Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/domain/Meeting.java

@@ -48,6 +48,9 @@ public class Meeting implements Serializable {
     @ApiModelProperty("地区编码")
     private String regionCode;
 
+    @ApiModelProperty("地区层级")
+    private Integer regionLevel;
+
     @ApiModelProperty("联系人")
     private String connecter;
 

pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/req/MeetingListReq.java

@@ -45,4 +45,10 @@ public class MeetingListReq extends PagePo {
     @ApiModelProperty("项目名称")
     private String projectName;
 
+    @ApiModelProperty("区域编码")
+    private String regionCode;
+
+    @ApiModelProperty("区域层级")
+    private Integer regionLevel;
+
 }

pmapi/src/main/java/com/ningdatech/pmapi/meeting/helper/MeetingManageHelper.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ningdatech.basic.exception.BizException;
 import com.ningdatech.basic.util.CollUtils;
+import com.ningdatech.pmapi.common.helper.RegionCacheHelper;
 import com.ningdatech.pmapi.common.util.BizUtils;
 import com.ningdatech.pmapi.common.util.StrUtils;
 import com.ningdatech.pmapi.expert.constant.ExpertAccountStatusEnum;
@@ -33,6 +34,7 @@ import com.ningdatech.pmapi.meeting.service.IMeetingExpertService;
 import com.ningdatech.pmapi.meta.constant.DictExpertInfoTypeEnum;
 import com.ningdatech.pmapi.meta.helper.DictionaryCache;
 import com.ningdatech.pmapi.meta.model.dto.DictionaryDTO;
+import com.ningdatech.pmapi.sys.model.dto.RegionDTO;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Component;
@@ -57,6 +59,7 @@ public class MeetingManageHelper {
     private final IMeetingExpertService meetingExpertService;
     private final IExpertInviteRuleService inviteRuleService;
     private final IExpertInviteAvoidRuleService inviteAvoidRuleService;
+    private final RegionCacheHelper regionCacheHelper;
 
     public void checkReviewProject(MeetingBasicDTO meetingBasic) {
         if (meetingBasic.getIsInnerProject()) {
@@ -125,6 +128,11 @@ public class MeetingManageHelper {
     }
 
     public void buildMeetingQuery(LambdaQueryWrapper<Meeting> query, MeetingListReq req) {
+        if (StrUtils.isNotBlank(req.getRegionCode())) {
+            List<RegionDTO> regions = regionCacheHelper.listChildren(req.getRegionCode(), req.getRegionLevel());
+            List<String> regionCodes = CollUtils.fieldList(regions, RegionDTO::getRegionCode);
+            query.in(Meeting::getRegionCode, regionCodes).ge(Meeting::getRegionLevel, req.getRegionLevel());
+        }
         if (StrUtil.isNotBlank(req.getName())) {
             query.like(Meeting::getName, req.getName());
         }

pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java

@@ -126,6 +126,7 @@ public class MeetingManage {
             meeting.setHoldOrg(userDetail.getOrganizationName());
             meeting.setHoldOrgCode(userDetail.getOrganizationCode());
             meeting.setRegionCode(userDetail.getRegionCode());
+            meeting.setRegionLevel(userDetail.getRegionLevel());
             meeting.setCreator(userDetail.getUsername());
             meeting.setInviteStatus(Boolean.FALSE);
             meeting.setConfirmedRoster(Boolean.FALSE);

pmapi/src/main/java/com/ningdatech/pmapi/meeting/mapper/MeetingExpertMapper.xml

@@ -96,7 +96,7 @@
 
     <select id="pageReviewProjectList" resultType="com.ningdatech.pmapi.meeting.entity.dto.ReviewProjectDTO">
         select mip.project_id, np.project_name, np.project_type, np.project_year, np.build_org_name,
-        np.biz_domain, np.declared_amount, mip.meeting_id, m.type meetingType, m.start_time reviewTime,
+        np.biz_domain, np.declare_amount declare_amount, mip.meeting_id, m.type meetingType, m.start_time reviewTime,
         m.connecter, m.contact, me.is_headman, (select count(1) from nd_expert_review  ner where ner.project_id = np.id
         and ner.create_by = me.expert_id) reviewed
         from nd_project np inner join meeting_inner_project mip on mip.project_id = np.id

pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserAuthLoginManage.java

@@ -155,6 +155,10 @@ public class UserAuthLoginManage {
         userFullInfoDTO.setRealName(userInfo.getRealName());
         userFullInfoDTO.setEmployeeCode(employeeCode);
         userFullInfoDTO.setUsername(userInfo.getRealName());
+
+        // TODO 测试使用
+        userFullInfoDTO.setRegionCode("330000");
+        userFullInfoDTO.setRegionLevel(1);
     }
 
     public UserFullInfoDTO getUserFullInfoByEmployeeCode(String employeeCode) {

pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/agent/AgentLoginUserDetailService.java

@@ -38,6 +38,7 @@ public class AgentLoginUserDetailService implements UserDetailsService {
         userInfoDetails.setRealName(userFullInfoDTO.getRealName());
         userInfoDetails.setUserRoleList(userFullInfoDTO.getUserRoleList());
         userInfoDetails.setRegionCode(userFullInfoDTO.getRegionCode());
+        userInfoDetails.setRegionLevel(userFullInfoDTO.getRegionLevel());
         userInfoDetails.setIdentifier(userFullInfoDTO.getIdentifier());
         userInfoDetails.setPassword(userFullInfoDTO.getCredential());
         userInfoDetails.setEmployeeCode(userFullInfoDTO.getEmployeeCode());

pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/credential/CredentialLoginUserDetailService.java

@@ -59,6 +59,7 @@ public class CredentialLoginUserDetailService implements UserDetailsService {
         userInfoDetails.setRealName(userFullInfoDTO.getRealName());
         userInfoDetails.setUserRoleList(userFullInfoDTO.getUserRoleList());
         userInfoDetails.setRegionCode(userFullInfoDTO.getRegionCode());
+        userInfoDetails.setRegionLevel(userFullInfoDTO.getRegionLevel());
         userInfoDetails.setIdentifier(userFullInfoDTO.getIdentifier());
         userInfoDetails.setPassword(userFullInfoDTO.getCredential());
         userInfoDetails.setEmployeeCode(userFullInfoDTO.getEmployeeCode());

pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/model/UserFullInfoDTO.java

@@ -27,6 +27,10 @@ public class UserFullInfoDTO {
      * 所属区域编码
      */
     private String regionCode;
+    /**
+     * 所属区域编码
+     */
+    private Integer regionLevel;
 
     /**
      * 浙政钉扫码 员工code

pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/model/UserInfoDetails.java

@@ -37,6 +37,11 @@ public class UserInfoDetails extends AbstractLoginUser implements UserDetails {
     private String regionCode;
 
     /**
+     * 所属区域层级
+     */
+    private Integer regionLevel;
+
+    /**
      * 浙政钉扫码 员工code
      */
     private String employeeCode;