分配

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

@@ -52,13 +52,19 @@ public class HyIntendDevMappingDAO {
         return hyIntendDevelopementMappingMapper.selectByMappingIdList(idList);
     }
 
-    public List<ZoneCheckDTO> selectByOpenAreaMappingIdList(List<Long> idList){
+    public List<ZoneCheckDTO> selectByOpenAreaMappingIdList(List<Long> idList,String type){
         if (CollectionUtils.isEmpty(idList)){
             return new ArrayList<>();
         }
-        return hyIntendDevelopementMappingMapper.selectByOpenAreaMappingIdList(idList);
+        return hyIntendDevelopementMappingMapper.selectByOpenAreaMappingIdList(idList,type);
     }
 
+    public HyIntendDevelopementMappingDO selectByOpenAreaMappingId(Long id,String type){
+        if (id==null){
+            return null;
+        }
+        return hyIntendDevelopementMappingMapper.selectByOpenAreaMappingId(id,type);
+    }
 
     public int batchInsert(List<HyIntendDevelopementMappingDO> recordList){
         if (CollectionUtils.isEmpty(recordList)){

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

@@ -42,6 +42,13 @@ public class HyIntendDevZoneInfoDAO {
         return hyIntendDevZoneInfoMapper.selectById(id);
     }
 
+    public List<HyIntendDevZoneInfoDO> selectByIds(List<Long> ids){
+        if (CollectionUtils.isEmpty(ids)){
+            return new ArrayList<>();
+        }
+        return hyIntendDevZoneInfoMapper.selectByIds(ids);
+    }
+
 
     public List<HyIntendDevZoneInfoDO> getHyIntendDevZoneInfoList(String type){
         if (StringUtils.isEmpty(type)){

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

@@ -33,6 +33,9 @@ public interface HyIntendDevZoneInfoMapper {
      */
     HyIntendDevZoneInfoDO selectById(@Param("id") Long id);
 
+
+    List<HyIntendDevZoneInfoDO> selectByIds(@Param("ids") List<Long> ids);
+
     /**
      * 查询战区列表
      * @param type

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

@@ -55,5 +55,11 @@ public interface HyIntendDevelopementMappingMapper {
      */
     List<ZoneCheckDTO> selectByMappingIdList(@Param("mappingIdList") List<Long> mappingIdList);
 
-    List<ZoneCheckDTO> selectByOpenAreaMappingIdList(@Param("openAreaMappingIdList") List<Long> openAreaMappingIdList);
+    List<ZoneCheckDTO> selectByOpenAreaMappingIdList(@Param("openAreaMappingIdList") List<Long> openAreaMappingIdList,
+                                                     @Param("type") String type);
+
+
+    HyIntendDevelopementMappingDO selectByOpenAreaMappingId(@Param("openAreaMappingId") Long openAreaMappingId,
+                                                     @Param("type") String type);
+
 }

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

@@ -305,5 +305,9 @@
             enterprise_user
         where
             deleted = 0  and <foreach collection="regionIds" separator="or" open="(" close=")" item="regionId"> user_region_ids like concat("%", #{regionId}, "%") </foreach>
+        ORDER BY
+        CASE WHEN jobnumber='' OR jobnumber IS NULL THEN 1 ELSE 0 END,
+        SUBSTR(jobnumber,1,1),
+        CAST(SUBSTR(jobnumber,2) AS UNSIGNED) ASC
     </select>
 </mapper>

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

@@ -137,4 +137,18 @@
     where
       deleted = 0 and <foreach collection="regionIds" separator="or" open="(" close=")" item="regionId">associated_region_id like concat("%", #{regionId}, "%")</foreach>
   </select>
+
+
+  <select id="selectByIds" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"></include>
+    from hy_intend_dev_zone_info
+    <where>
+      <if test="ids !=null and ids.size>0">
+        <foreach collection="ids" item="id" open="and id in (" close=")" separator=",">
+          #{id}
+        </foreach>
+      </if>
+    </where>
+  </select>
 </mapper>

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

@@ -135,9 +135,13 @@
   <select id="selectByOpenAreaMappingIdList" resultType="com.cool.store.dto.partner.ZoneCheckDTO">
     select
     a.open_area_mapping_id  as openAreaMappingId,
-    b.zone_name as zoneName
+    b.zone_name as zoneName,
+    b.id as zoneId
     from hy_intend_developement_mapping a inner join hy_intend_dev_zone_info b on a.mapping_id = b.id
     <where>
+      <if test="type!=null and type !=''">
+        and type = #{type}
+      </if>
       <if test="openAreaMappingIdList!=null and openAreaMappingIdList.size>0">
         <foreach collection="openAreaMappingIdList" open="and a.open_area_mapping_id in (" close=")" separator="," item="mappingId">
           #{mappingId}
@@ -145,4 +149,18 @@
       </if>
     </where>
   </select>
+
+  <select id="selectByOpenAreaMappingId" resultMap="BaseResultMap">
+    select
+    *
+    from hy_intend_developement_mapping a
+    <where>
+      <if test="type!=null and type !=''">
+        and a.type = #{type}
+      </if>
+      <if test="openAreaMappingId!=null">
+        and a.open_area_mapping_id = #{openAreaMappingId}
+      </if>
+    </where>
+  </select>
 </mapper>

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

@@ -43,11 +43,13 @@
     select
     <include refid="Base_Column_List"></include>
     from hy_partner_user_info
-    <if test="partnerIdList!=null and partnerIdList.size>0">
-      <foreach collection="partnerIdList" open="and partner_id in (" close=")" separator="," item="partnerId">
-        #{partnerId}
-      </foreach>
-    </if>
+    <where>
+      <if test="partnerIdList!=null and partnerIdList.size>0">
+        <foreach collection="partnerIdList" open="and partner_id in (" close=")" separator="," item="partnerId">
+          #{partnerId}
+        </foreach>
+      </if>
+    </where>
   </select>
 
   <insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">