Merge branch 'uat'

pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.chinaunicom.ebtp</groupId>
 		<artifactId>mall-ebtp-cloud-parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.1-SNAPSHOT</version>
 	</parent>
 	<groupId>com.chinaunicom.mall.ebtp</groupId>
 	<artifactId>biz_service_ebtp_project</artifactId>
@@ -18,7 +18,7 @@
 		<dependency>
 			<groupId>com.chinaunicom.mall.ebtp</groupId>
 			<artifactId>uboot-core</artifactId>
-			<version>2.0.0-SNAPSHOT</version>
+			<version>2.0.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 

src/main/java/com/chinaunicom/mall/ebtp/project/common/InquiryCommonUtil.java

@@ -112,4 +112,9 @@ public class InquiryCommonUtil {
         put(SELECT_TYPE_0,ProjectCommonUtil.EVAL_METHOD_2);
         put(SELECT_TYPE_1,ProjectCommonUtil.EVAL_METHOD_1);
     }};
+
+    /**
+     * 文件名称特殊字符校验规则
+     */
+    public static final String FILE_NAME_PATTERN = "[\\s\\\\/:\\*\\?\\\"<>\\|]";
 }

src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java

@@ -569,4 +569,9 @@ public class ProjectCommonUtil {
      * 集团编码
      */
     public static final String PROVINCES_BLOC = "001000";
+
+    /**
+     * 账号兼职正则表达式
+     */
+    public static final String REG_PATTEN = "^.+_\\d*$";
 }

src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java

@@ -177,6 +177,12 @@ public enum ProjectExceptionEnum implements BusinessExceptionAssert {
     FRAME_EXCEPTION_PROJECT_ENTRUST_AGENCY_COMPANY_EMPTY(110082, "项目委托信息代理机构ID为空！"),
 
     FRAME_EXCEPTION_USER_PROVINCE_EMPTY(110083, "用户信息或者用户的所属省分编码为空！"),
+
+    FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_NAME_ERROR(110084,"询价应答格式列表数据中目录名称包含特殊字符"),
+
+    FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_CATEGORY_NAME_ERROR(110085,"询价应答格式列表数据中类别名称包含特殊字符"),
+
+    FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_NAME_EMPTY(110086,"询价应答格式列表数据中目录名称不能为空字符并且不能超过30个字符"),
     ;
 
     /**

src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java

@@ -30,6 +30,7 @@ import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.regex.Pattern;
 
 /**
  * 项目询价serviceImpl
@@ -286,6 +287,25 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl<ProjectEnt
             if(isEmptyCodeCount > 0){
                 ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_CODE_EMPTY.throwException();
             }
+
+            //询价应答格式name目录名称不能为空
+            long isEmptyNameCount = inquiryVO.getResponseFormatList().stream().filter(n -> StringUtils.isEmpty(n.getName()) || n.getName().length() > 30).count();
+            if(isEmptyNameCount > 0){
+                ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_NAME_EMPTY.throwException();
+            }
+
+            Pattern pattern = Pattern.compile(InquiryCommonUtil.FILE_NAME_PATTERN);
+            //获取目录名称中包含特殊字符
+            long isNamePatternCount = inquiryVO.getResponseFormatList().stream().filter(n -> StringUtils.isNotBlank(n.getName()) && pattern.matcher(n.getName()).find()).count();
+            if(isNamePatternCount > 0){
+                ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_NAME_ERROR.throwException();
+            }
+
+            //获取目录名称中包含特殊字符
+            long isCategoryNamePatternCount = inquiryVO.getResponseFormatList().stream().filter(n -> StringUtils.isNotBlank(n.getCategoryName()) && pattern.matcher(n.getCategoryName()).find()).count();
+            if(isCategoryNamePatternCount > 0){
+                ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_RESPONSE_FORMAT_LIST_CATEGORY_NAME_ERROR.throwException();
+            }
         }
     }
 }

src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java

@@ -159,6 +159,10 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
             query.eq("status", projectRecordVO.getStatus());
         }
 
+        if(StringUtils.isNotBlank(projectRecordVO.getProvince())){
+            query.eq("province", projectRecordVO.getProvince());
+        }
+
         if(null != projectRecordVO.getNeStatus()){
             query.ne("status", projectRecordVO.getNeStatus());
         }

src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java

@@ -43,6 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -247,6 +248,13 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
             CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess());
         }
         LoginUserDetailVO loginUserDetailVO = baseResponse.getData();
+
+        //正则验证是否为兼职岗位
+        if (Pattern.matches(ProjectCommonUtil.REG_PATTEN, loginUserDetailVO.getStaffId())) {
+            log.info("查询用户中心，兼岗职位，id={}，ou={}", loginUserDetailVO.getStaffId(), loginUserDetailVO.getOu());
+            loginUserDetailVO.setStaffId(loginUserDetailVO.getStaffId().substring(0, loginUserDetailVO.getStaffId().indexOf("_")));
+        }
+
         approve.setWfSectionNo(wfSectionNo);
         approve.setWfSectionName(wfSectionName);
         approve.setBusinessType(record.getBidMethodSubDict());
@@ -260,8 +268,8 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
         standardNextParticipants.add(participantVO);
 
         approve.setStandardNextParticipants(standardNextParticipants);
-        approve.setUndertaker(record.getOwnerContactName());
+        approve.setUndertaker(loginUserDetailVO.getStaffName());
-        approve.setUndertakerCode(record.getOwnerContactId());
+        approve.setUndertakerCode(loginUserDetailVO.getStaffId());
         approve.setTelNo(record.getOwnerContactTel());
 
         log.info("访问重新评审流程初始化接口参数："+ JsonUtils.objectToJson(approve));
@@ -273,6 +281,7 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
         return response.getData();
     }
 
+
     /**
      * 修改重新评审信息状态
      * @param id 主键

src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java

@@ -105,6 +105,10 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
             query.eq("project_id",projectSectionVO.getProjectId());
         }
 
+        if(StringUtils.isNotBlank(projectSectionVO.getBidSectName())){
+            query.like("bid_sect_name",projectSectionVO.getBidSectName());
+        }
+
         if(null != projectSectionVO.getStatus()){
             query.eq("status",projectSectionVO.getStatus());
         }