三方验收

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

@@ -69,7 +69,7 @@
     select <include refid="baseColumn"/>
     from xfsg_acceptance_info a
         left join   join  xfsg_shop_stage_info b on a.shop_id = b.shop_id
-    where b.shop_sub_stage_status = 1200 and a.deleted = 0
+    where b.shop_sub_stage_status = #{status} and a.deleted = 0
   </select>
     <select id="selectByShopId" resultType="com.cool.store.entity.AcceptanceInfoDO">
         select
@@ -77,5 +77,11 @@
         from xfsg_acceptance_info
         where shop_id = #{shopId}
     </select>
+    <select id="selectListByActualEntryTime" resultType="com.cool.store.entity.AcceptanceInfoDO">
+        select
+        <include refid="baseColumn"/>
+        from xfsg_acceptance_info
+        where actual_entry_time is null
+    </select>
 
 </mapper>

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

@@ -492,6 +492,17 @@
     </if>
 
   </select>
+  <select id="getByLineIds" resultType="com.cool.store.entity.LineInfoDO">
+      select *
+      from xfsg_line_info
+      where deleted = 0
+      <if test="lineIds !=null and lineIds.size()>0">
+          and id in
+        <foreach collection="lineIds" item="lineId" open="(" separator="," close=")" >
+          #{lineId}
+        </foreach>
+      </if>
+  </select>
 
 
 </mapper>

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

@@ -155,6 +155,25 @@
       from xfsg_shop_info
       where store_num = #{storeNum}
     </select>
+    <select id="selectShopListByRegionId" resultType="com.cool.store.entity.ShopInfoDO">
+      select
+      xsi.id,xsi.line_id as lineId,xsi.region_id as regionId,xsi.shop_name as shopName,xsi.store_num as storeNum
+      from xfsg_shop_info xsi
+      join xfsg_shop_stage_info xssi on xssi.shop_id = xsi.id
+      where
+       xsi.deleted = 0
+      <if test="regionIds != null and regionIds.size() > 0">
+        and xsi.region_id in
+        <foreach collection="regionIds" item="regionId" index="index" open="(" separator="," close=")">
+          #{regionId}
+        </foreach>
+      </if>
+      AND xssi.shop_sub_stage_status != -100
+      and xssi.shop_sub_stage in (120,130)
+      <if test="status != null">
+          and xssi.shop_sub_stage_status = #{status}
+      </if>
+    </select>
 
 
 </mapper>

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

@@ -135,7 +135,20 @@
     where
       shop_id = #{shopId} and shop_sub_stage = #{shopSubStage}
   </update>
-  
+  <update id="updateByShopId">
+      update xfsg_shop_stage_info
+      <set>
+      <if test="shopStageInfoDO.planCompleteTime">
+          plan_complete_time = #{shopStageInfoDO.planCompleteTime},
+      </if>
+      <if test="shopStageInfoDO.actualCompleteTime">
+          actual_complete_time = #{shopStageInfoDO.actualCompleteTime},
+      </if>
+      </set>
+    where shop_id = #{shopStageInfoDO.shopId}
+
+  </update>
+
   <select id="getRentContractToDoPage" resultType="com.cool.store.vo.shop.RentInfoToDoVO">
     select
       b.id as lineId,
@@ -193,5 +206,15 @@
       #{shopId}
     </foreach>
   </select>
+  <select id="getShopContractIncompletion" resultType="java.lang.Long">
+    SELECT
+      shop_id
+    FROM
+      xfsg_shop_stage_info
+    WHERE
+      shop_sub_stage = 110
+      AND (shop_sub_stage_status = 1100 OR shop_sub_stage_status = 1110)
+  </select>
+
 
 </mapper>