Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java

coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java

@@ -29,8 +29,8 @@ public class HyOpenAreaInfoDAO {
         return hyOpenAreaInfoMapper.queryKeyOpenArea();
     }
 
-    public List<HyOpenAreaInfoDO> queryByKeyword(String keyword,String areaStatus,Boolean filterData){
-        return hyOpenAreaInfoMapper.queryByKeyword(keyword,areaStatus,filterData);
+    public List<HyOpenAreaInfoDO> queryByKeyword(String keyword,Boolean applyFlag,String areaStatus,Boolean filterData){
+        return hyOpenAreaInfoMapper.queryByKeyword(keyword,applyFlag,areaStatus,filterData);
     }
 
     public List<HyOpenAreaInfoDO> queryFirstLevel(){

coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java

@@ -131,9 +131,9 @@ public class HyPartnerLineInfoDAO {
     }
 
     public List<PrivateSeaLineDTO> getPrivateSeaLineList(String keyword, String keywordType, String workflowStage, String workflowStatus, Date deadlineStart, Date deadlineEnd,
-                                                        String intentArea, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List<String> userIdList){
+                                                        String intentArea, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List<String> userIdList,List<String> developmentManagerList){
         return  hyPartnerLineInfoMapper.getPrivateSeaLineList( keyword,  keywordType,  workflowStage,  workflowStatus,  deadlineStart,  deadlineEnd,
-                 intentArea,  acceptAdjustType,  storeKeyword,  storeKeywordType, userIdList);
+                 intentArea,  acceptAdjustType,  storeKeyword,  storeKeywordType, userIdList,developmentManagerList);
     }
 
 

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java

@@ -41,6 +41,7 @@ public interface HyOpenAreaInfoMapper {
      * @return
      */
     List<HyOpenAreaInfoDO> queryByKeyword(@Param("keyword") String keyword,
+                                          @Param("applyFlag") Boolean applyFlag,
                                           @Param("areaStatus") String areaStatus,
                                           @Param("filterData") Boolean filterData);
 

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java

@@ -18,7 +18,7 @@ public interface HyPartnerInterviewMapper {
 	 * 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null
      * dateTime:2023-06-09 05:51
      */
-    int insertSelective(HyPartnerInterviewDO record);
+    int insertSelective(@Param("record") HyPartnerInterviewDO record);
 
     /**
      *

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java

@@ -173,7 +173,8 @@ public interface HyPartnerLineInfoMapper {
                                                   @Param("acceptAdjustType") Integer acceptAdjustType,
                                                   @Param("storeKeyword") String storeKeyword,
                                                   @Param("storeKeywordType") String storeKeywordType,
-                                                  @Param("userIdList") List<String> userIdList);
+                                                  @Param("userIdList") List<String> userIdList,
+                                                  @Param("developmentManagerList") List<String> developmentManagerList);
 
 
     /**

coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml

@@ -54,133 +54,133 @@
   <insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">
     insert into hy_partner_interview
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="status != null">
+      <if test="record.status != null">
         status,
       </if>
-      <if test="partnerLineId != null">
+      <if test="record.partnerLineId != null">
         partner_line_id,
       </if>
-      <if test="interviewPlanId != null">
+      <if test="record.interviewPlanId != null">
         interview_plan_id,
       </if>
-      <if test="partnerId != null">
+      <if test="record.partnerId != null">
         partner_id,
       </if>
-      <if test="deadline != null">
+      <if test="record.deadline != null">
         deadline,
       </if>
-      <if test="interviewer != null">
+      <if test="record.interviewer != null">
         interviewer,
       </if>
-      <if test="recorder != null">
+      <if test="record.recorder != null">
         recorder,
       </if>
-      <if test="processInfo != null">
+      <if test="record.processInfo != null">
         process_info,
       </if>
-      <if test="recordTime != null">
+      <if test="record.recordTime != null">
         record_time,
       </if>
-      <if test="summary != null">
+      <if test="record.summary != null">
         summary,
       </if>
-      <if test="authCode != null">
+      <if test="record.authCode != null">
         auth_code,
       </if>
-      <if test="passFileUrl != null">
+      <if test="record.passFileUrl != null">
         pass_file_url,
       </if>
-      <if test="expiryDate != null">
+      <if test="record.expiryDate != null">
         expiry_date,
       </if>
-      <if test="latestLogMessage != null">
+      <if test="record.latestLogMessage != null">
         latest_log_message,
       </if>
-      <if test="passReason != null">
+      <if test="record.passReason != null">
         pass_reason,
       </if>
-      <if test="certifyFile != null">
+      <if test="record.certifyFile != null">
         certify_file,
       </if>
-      <if test="createTime != null">
+      <if test="record.createTime != null">
         create_time,
       </if>
-      <if test="updateTime != null">
+      <if test="record.updateTime != null">
         update_time,
       </if>
-      <if test="approveTime != null">
+      <if test="record.approveTime != null">
         approve_time,
       </if>
-      <if test="partnerEnterTime != null">
+      <if test="record.partnerEnterTime != null">
         partner_enter_time,
       </if>
-      <if test="interviewerEnterTime != null">
+      <if test="record.interviewerEnterTime != null">
         interviewer_enter_time,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="status != null">
-        #{status},
+      <if test="record.status != null">
+        #{record.status},
       </if>
-      <if test="partnerLineId != null">
-        #{partnerLineId},
+      <if test="record.partnerLineId != null">
+        #{record.partnerLineId},
       </if>
-      <if test="interviewPlanId != null">
-        #{interviewPlanId},
+      <if test="record.interviewPlanId != null">
+        #{record.interviewPlanId},
       </if>
-      <if test="partnerId != null">
-        #{partnerId},
+      <if test="record.partnerId != null">
+        #{record.partnerId},
       </if>
-      <if test="deadline != null">
-        #{deadline},
+      <if test="record.deadline != null">
+        #{record.deadline},
       </if>
-      <if test="interviewer != null">
-        #{interviewer},
+      <if test="record.interviewer != null">
+        #{record.interviewer},
       </if>
-      <if test="recorder != null">
-        #{recorder},
+      <if test="record.recorder != null">
+        #{record.recorder},
       </if>
-      <if test="processInfo != null">
-        #{processInfo},
+      <if test="record.processInfo != null">
+        #{record.processInfo},
       </if>
-      <if test="recordTime != null">
-        #{recordTime},
+      <if test="record.recordTime != null">
+        #{record.recordTime},
       </if>
-      <if test="summary != null">
-        #{summary},
+      <if test="record.summary != null">
+        #{record.summary},
       </if>
-      <if test="authCode != null">
-        #{authCode},
+      <if test="record.authCode != null">
+        #{record.authCode},
       </if>
-      <if test="passFileUrl != null">
-        #{passFileUrl},
+      <if test="record.passFileUrl != null">
+        #{record.passFileUrl},
       </if>
-      <if test="expiryDate != null">
-        #{expiryDate},
+      <if test="record.expiryDate != null">
+        #{record.expiryDate},
       </if>
-      <if test="latestLogMessage != null">
-        #{latestLogMessage},
+      <if test="record.latestLogMessage != null">
+        #{record.latestLogMessage},
       </if>
-      <if test="passReason != null">
-        #{passReason},
+      <if test="record.passReason != null">
+        #{record.passReason},
       </if>
-      <if test="certifyFile != null">
-        #{certifyFile},
+      <if test="record.certifyFile != null">
+        #{record.certifyFile},
       </if>
-      <if test="createTime != null">
-        #{createTime},
+      <if test="record.createTime != null">
+        #{record.createTime},
       </if>
-      <if test="updateTime != null">
-        #{updateTime},
+      <if test="record.updateTime != null">
+        #{record.updateTime},
       </if>
-      <if test="approveTime != null">
-        #{approveTime},
+      <if test="record.approveTime != null">
+        #{record.approveTime},
       </if>
-      <if test="partnerEnterTime != null">
-        #{partnerEnterTime},
+      <if test="record.partnerEnterTime != null">
+        #{record.partnerEnterTime},
       </if>
-      <if test="interviewerEnterTime != null">
-        #{interviewerEnterTime},
+      <if test="record.interviewerEnterTime != null">
+        #{record.interviewerEnterTime},
       </if>
     </trim>
   </insert>

coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml

@@ -359,9 +359,9 @@
       a.close_user_id  as closeUserId,
       a.close_time  as closeTime,
       a.join_black_reason as joinBlackReason
-    from hy_partner_line_info a inner join hy_partner_user_info b where a.partner_id = b.partner_id
-    where deleted = 0
-    and line_status = 3
+    from hy_partner_line_info a inner join hy_partner_user_info b on a.partner_id = b.partner_id
+    where a.deleted = 0
+    and a.line_status = 3
     <if test="userNameKeyword!=null and userNameKeyword !=''">
       and b.username like concat('%', #{userNameKeyword}, '%')
     </if>
@@ -494,6 +494,11 @@
         #{userId}
       </foreach>
     </if>
+    <if test="developmentManagerList!=null and developmentManagerList.size>0">
+      <foreach collection="developmentManagerList" item="developmentManager" open="and a.development_manager in (" close=")" separator=",">
+        #{developmentManager}
+      </foreach>
+    </if>
   </select>