拜访模板

src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitInstanceServiceImpl.java

@@ -102,6 +102,9 @@ public class BazVisitInstanceServiceImpl extends ServiceImpl<BazVisitInstanceMap
                 }
 
             }
+
+            instanceFlow.setTargetAddressId(flowBo.getTargetAddressId());
+
             instanceFlowList.add(instanceFlow);
         }
 

src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java

@@ -61,6 +61,7 @@ public class BmsChannelPointController {
     public R<PageVo<BmsUserPoint4VisitVo>> getPage4Visit(BmsPointVisitSo param){
         String sysUserId = AuthContextUtils.getSysUserId();
         param.setUserId(sysUserId);
+        param.setTenantId(AuthContextUtils.getTenant());
         PageUtil.startPage();
         List<BmsUserPoint4VisitVo> list = channelPointMapper.selectUserPointList4Visit(param);
         return R.byPageHelperList(list);

src/main/java/com/qs/serve/modules/bms/entity/so/BmsPointVisitSo.java

@@ -20,4 +20,7 @@ public class BmsPointVisitSo {
     /** 忽略这个参数，后端设值 */
     String userId;
 
+    /** 忽略这个参数，后端设值 */
+    String tenantId;
+
 }

src/main/java/com/qs/serve/modules/bms/entity/vo/BmsUserPoint4VisitVo.java

@@ -19,9 +19,15 @@ public class BmsUserPoint4VisitVo {
     /** 网点名称 */
     String pointName;
 
+    /**  */
+    String channelName;
+
     /** 地址*/
     String address;
 
+    /** 地图地址*/
+    String mapAddress;
+
     /** 距离 */
     Double distance;
 

src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java

@@ -28,6 +28,7 @@ public interface BmsChannelPointMapper extends BaseMapper<BmsChannelPoint> {
     List<BmsChannelPoint> selectChannelPointList(@Param("query") BmsChannelPoint channelPoint);
 
 
+    @InterceptorIgnore(tenantLine = "1")
     List<BmsUserPoint4VisitVo> selectUserPointList4Visit(@Param("query") BmsPointVisitSo param);
 
 }

src/main/resources/mapper/bms/BmsChannelPointMapper.xml

@@ -93,9 +93,42 @@
         ORDER BY `bms_channel_point`.`create_time` DESC
     </select>
 
-    <select id="selectUserPointList4Visit" resultType="com.qs.serve.modules.bms.entity.vo.BmsUserPoint4VisitVo">
 
+    <resultMap id="userPointList4VisitMap" type="com.qs.serve.modules.bms.entity.vo.BmsUserPoint4VisitVo" >
+        <result property="pointId"  column="id"/>
+        <result property="pointName"  column="point_name"/>
+        <result property="pointCode"  column="point_code"/>
+        <result property="distance"  column="distance"/>
+        <result property="channelName"  column="channel_name"/>
+        <result property="address"  column="address"/>
+        <result property="mapAddress"  column="map_address"/>
+    </resultMap>
 
+    <select id="selectUserPointList4Visit" resultType="com.qs.serve.modules.bms.entity.vo.BmsUserPoint4VisitVo" resultMap="userPointList4VisitMap">
+        SELECT
+            `bms_channel_point`.id,
+            `bms_channel_point`.point_code,
+            `bms_channel_point`.point_name,
+            `bms_channel_point`.channel_name,
+            `bms_channel_point`.address,
+            `bms_channel_point`.map_address
+            <if test="query.localY!=null and query.localX!=null">
+                ,st_distance_sphere (
+                POINT ( bms_channel_point.local_y, bms_channel_point.local_x ),
+                POINT ( #{query.localY}, #{query.localX} )) AS distance
+            </if>
+            FROM ( SELECT mu.target_id target_id FROM `bms_master_user` mu WHERE mu.type = 'point' AND del_flag = 0 AND user_id = #{query.userId} AND tenant_id = #{query.tenantId} ) pmu
+        LEFT JOIN `bms_channel_point` `bms_channel_point` ON `bms_channel_point`.id = pmu.target_id
+        <where>
+            and `bms_channel_point`.`del_flag` = 0
+            <if test="query.pointCode != null and query.pointCode != ''"> and `bms_channel_point`.`point_code` like concat('%',#{query.pointCode},'%') </if>
+            <if test="query.pointName != null and query.pointName != ''"> and `bms_channel_point`.`point_name` like concat('%',#{query.pointName},'%') </if>
+        </where>
+        ORDER BY
+        <if test="query.localY!=null and query.localX!=null">
+            -distance desc,
+        </if>
+        bms_channel_point.id
     </select>
 
 </mapper>