选址阶段

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

@@ -26,7 +26,7 @@
   </resultMap>
 
   <sql id="allColumn">
-    id, point_code, point_name, region_id, shop_id, line_id, point_area, longitude, latitude, address, development_manager, operate_user_id, development_time, point_status, point_score, select_status, submit_audit_count, is_line_upload
+    id, point_code, point_name, region_id, shop_id, line_id, point_area, longitude, latitude, address, development_manager, operate_user_id, development_time, point_status, point_score, select_status, submit_audit_count, is_line_upload, deleted, create_time, update_time
   </sql>
 
   <select id="getMyPointData" resultType="com.cool.store.vo.point.PointHomePageDataVO">
@@ -45,6 +45,7 @@
       pi.id,
       pi.point_name,
       pi.point_code,
+      pi.address,
       pi.region_id,
       pi.point_status,
       pi.point_score,
@@ -52,7 +53,9 @@
       pi.development_manager,
       pi.operate_user_id,
       pi.development_time,
-      pi.select_status
+      pi.select_status,
+      pi.create_time,
+      pi.update_time
     from xfsg_point_info pi
     where pi.deleted = 0 and pi.development_manager = #{request.developmentManager}
     <if test="request.keyword != null and request.keyword != ''">
@@ -64,8 +67,11 @@
     <if test="request.developmentEndTime != null and request.developmentEndTime != ''">
       <![CDATA[and pi.development_time <= #{request.developmentEndTime}]]>
     </if>
-    <if test="request.pointStatus != null and request.pointStatus != ''">
-      and pi.point_status = #{request.pointStatus}
+    <if test="request.pointStatusList != null and request.pointStatusList.size() > 0">
+      and pi.point_status in
+      <foreach collection="request.pointStatusList" item="pointStatus" open="(" close=")" separator=",">
+            #{pointStatus}
+      </foreach>
     </if>
     <if test="request.storageStatus != null and request.storageStatus == 1">
       and pi.point_status in (4,5,6,7)
@@ -102,8 +108,11 @@
       <include refid="allColumn"/>
     from xfsg_point_info
     where deleted = 0 and point_status in (4,5) and development_manager = #{request.developmentManager}
-    <if test="request.pointStatus != null and request.pointStatus != ''">
-      and point_status = #{request.pointStatus}
+    <if test="request.pointStatusList != null and request.pointStatusList.size() > 0">
+      and point_status in
+      <foreach collection="request.pointStatusList" item="pointStatus" open="(" close=")">
+        #{pointStatus}
+      </foreach>
     </if>
   </select>
 

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

@@ -68,4 +68,31 @@
   <update id="updatePointTodoInfo">
     update xfsg_point_todo_info set status = if(handler_user_id = #{handlerUserId}, 1, 2), update_time = now() where point_id = #{pointId} and node_no = #{nodeNo} and cycle_count = #{cycleCount} and deleted = 0
   </update>
+
+  <select id="getUserTodoList" resultType="com.cool.store.entity.PointInfoDO">
+    select
+      b.id,
+      b.point_name,
+      b.point_code,
+      b.point_status,
+      b.point_score,
+      b.development_manager,
+      b.development_time,
+      b.point_area,
+      b.address,
+      b.latitude,
+      b.longitude,
+      b.region_id,
+      b.line_id,
+      b.shop_id,
+      b.select_status,
+      b.operate_user_id,
+      b.is_line_upload,
+      b.create_time,
+      b.update_time
+    from
+      xfsg_point_todo_info a inner join xfsg_point_info b on a.point_id = b.id
+    where
+      a.handler_user_id = #{request.developmentManager} and a.status = 0 and a.deleted = 0 and b.deleted = 0
+  </select>
 </mapper>