增加查询获取验收列表详情接口

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

@@ -256,5 +256,13 @@ public class ShopStageInfoDAO {
         ShopSubStageEnum shopSubStageEnum = ShopSubStageEnum.SHOP_STAGE_16;
         return shopStageInfoMapper.getShopCountByLineIdAndStageStatus(lineId, shopSubStageEnum.getShopStageEnum().getShopStage(), shopSubStageEnum.getShopSubStage(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus());
     }
+    /**
+     * @Auther: wangshuo
+     * @Date: 2024/5/11
+     * @description:获取处于a阶段或b阶段，和c阶段的
+     */
+    public List<ShopStageInfoDO> getSubStageListBySubStageStatus(ShopSubStageStatusEnum a,ShopSubStageStatusEnum b, ShopSubStageStatusEnum c){
 
+        return shopStageInfoMapper.getSubStageListBySubStageStatus(a.getShopSubStageStatus(),b.getShopSubStageStatus(),c.getShopSubStageStatus());
+    }
 }

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

@@ -2,6 +2,7 @@ package com.cool.store.mapper;
 
 import com.cool.store.dto.Preparation.ScheduleDTO;
 import com.cool.store.entity.ShopStageInfoDO;
+import com.cool.store.enums.point.ShopSubStageStatusEnum;
 import com.cool.store.vo.shop.RentInfoToDoVO;
 import com.github.pagehelper.Page;
 import org.apache.ibatis.annotations.Param;
@@ -134,4 +135,10 @@ public interface ShopStageInfoMapper extends Mapper<ShopStageInfoDO> {
      * @return
      */
     Integer getShopCountByLineIdAndStageStatus(@Param("lineId")Long lineId, @Param("shopStage") Integer shopStage, @Param("shopSubStage") Integer shopSubStage, @Param("shopSubStageStatus") Integer shopSubStageStatus);
+    /**
+     * @Auther: wangshuo
+     * @Date: 2024/5/11
+     * @description:获取处于a阶段或b阶段，和c阶段的
+     */
+    List<ShopStageInfoDO> getSubStageListBySubStageStatus(@Param("subStageStatusA")Integer subStageStatusA,@Param("subStageStatusB")Integer subStageStatusB,@Param("subStageStatusC")Integer subStageStatusC );
 }

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

@@ -24,13 +24,14 @@
         <result column="plan_acceptance_time" jdbcType="TIMESTAMP" property="planAcceptanceTime"/>
         <result column="actual_acceptance_time" jdbcType="TIMESTAMP" property="actualAcceptanceTime"/>
         <result column="booking_user" jdbcType="VARCHAR" property="bookingUser"/>
+        <result column="plan_exit_time" jdbcType="TIMESTAMP" property="planExitTime"/>
     </resultMap>
     <sql id="baseColumn">
         id
         ,shop_id,actual_entry_time,planned_completion_time,planned_start_time,decoration_planned_completion_time,
            decoration_planned_start_time,construction_completion_time,engineering_acceptance_signatures,
            operations_acceptance_signatures,partner_acceptance_signatures,
-           create_time,update_time,deleted,plan_acceptance_time,actual_acceptance_time,booking_user
+           create_time,update_time,deleted,plan_acceptance_time,actual_acceptance_time,booking_user,plan_exit_time
     </sql>
     <update id="updateByShopIDSelective">
         update xfsg_acceptance_info
@@ -77,6 +78,9 @@
             <if test="bookingUser !=null ">
                 booking_user  =#{bookingUser},
             </if>
+            <if test="planExitTime !=null">
+                plan_exit_time =#{planExitTime}
+            </if>
         </set>
         where shop_id = #{shopId}
     </update>

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

@@ -54,25 +54,25 @@
   <update id="batchUpdate">
       update xfsg_assessment_data
       <set>
-          qualified = CASE id
+          qualified = CASE template_id
           <foreach collection="AssessmentDataDOS" separator=" " item="item">
-              WHEN #{item.id} THEN #{item.qualified}
+              WHEN #{item.templateId} THEN #{item.qualified}
           </foreach>
           END,
-          reason = CASE id
+          reason = CASE template_id
           <foreach collection="AssessmentDataDOS" separator=" " item="item">
-              WHEN #{item.id} THEN #{item.reason}
+              WHEN #{item.templateId} THEN #{item.reason}
           </foreach>
           END,
-          comments = CASE id
+          comments = CASE template_id
           <foreach collection="AssessmentDataDOS" separator=" " item="item">
-              WHEN #{item.id} THEN #{item.comments}
+              WHEN #{item.templateId} THEN #{item.comments}
           </foreach>
           END
       </set>
-      where id in (
+      where template_id in (
       <foreach collection="AssessmentDataDOS" item="item" separator=",">
-          #{item.id}
+          #{item.templateId}
       </foreach>
       )
   </update>

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

@@ -265,4 +265,18 @@
   <select id="getShopCountByLineIdAndStageStatus" resultType="integer">
     select count(1) from xfsg_shop_stage_info where shop_stage = #{shopStage} and shop_sub_stage = #{shopSubStage} and shop_sub_stage_status = #{shopSubStageStatus} and line_id = #{lineId}
   </select>
+  <select id="getSubStageListBySubStageStatus" resultType="com.cool.store.entity.ShopStageInfoDO">
+    select *
+    from xfsg_shop_stage_info
+    where 1=1
+    <if test="subStageStatusA !=null">
+      or shop_sub_stage_status = #{subStageStatusA}
+    </if>
+    <if test="subStageStatusB !=null">
+      or shop_sub_stage_status = #{subStageStatusB}
+    </if>
+    <if test="subStageStatusC !=null">
+      and shop_sub_stage_status = #{subStageStatusC}
+    </if>
+  </select>
 </mapper>