1

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionRealnameuser.java

@@ -108,6 +108,8 @@ public class CenterdataTHousingconstructionRealnameuser extends BaseBusinessEnti
 
     private String radius;//距离
 
+    private String joinHouseId;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionStoragetank.java

@@ -97,6 +97,8 @@ public class CenterdataTHousingconstructionStoragetank extends BaseBusinessEntit
     private String latitude;//纬度
     private String radius;//距离
 
+    private String joinHouseId;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionViewServiceImpl.java

@@ -256,6 +256,7 @@ public class CenterdataTHousingconstructionViewServiceImpl extends BaseServiceIm
                 realnameuser.setLongitude(storagetank.getLongitude());
                 realnameuser.setLatitude(storagetank.getLatitude());
                 realnameuser.setRadius(storagetank.getRadius());
+                realnameuser.setJoinHouseId(storagetank.getJoinHouseId());
                 List<Map<String, Object>> realnameuserList = centerdataTHousingconstructionRealnameuserMapper.getRealnameuserList(realnameuser);
                 List<Map<String, Object>> steelcylinderList = centerdataTHousingconstructionRealnameuserMapper.getSteelcylinderName(realnameuser);
                 for (Map<String, Object> realnameuserMap : realnameuserList) {

src/main/resources/mapper/housingconstruction/CenterdataTHousingconstructionRealnameuserMapper.xml

@@ -156,6 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             b.dict_type = 'enterprise_user_type'
             and a.longitude is not null
             <if test="enterpriseId != null  and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
+            <if test="joinHouseId != null  and joinHouseId != ''"> and a.id = #{joinHouseId}</if>
             <if test="userName != null  and userName != ''"> and a.user_name = #{userName}</if>
             ${params.dataScope}
         </where>

src/main/resources/mapper/housingconstruction/CenterdataTHousingconstructionViewMapper.xml

@@ -100,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getCarList" parameterType="CenterdataTHousingconstructionCar" resultType="map">
         SELECT
+            a.id,
             a.car_number carNumber,
             a.driver_name driverName,
             b.phone,
@@ -244,6 +245,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getDeliverymanList" parameterType="CenterdataTHousingconstructionDeliveryPersonnel" resultType="map">
         SELECT
+            a.id,
             a.staff_name staffName,
             a.phone,
             '送货中' type
@@ -429,16 +431,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getJoinHouseUserList" parameterType="CenterdataTHousingconstructionSteelcylinder" resultType="map">
         SELECT
             l.steelcylinderName steelcylinderName,
-            l.steelcylinder_id,
+            l.steelcylinder_id steelcylinderId,
             u.longitude,
             u.latitude,
             u.gas_address gasAddress,
             l.join_house_id as joinHouseId,
-            l.join_house_name as joinHouseName,
+            l.join_house_name as userName,
             u.dept_id as id,
             u.dept_name as name,
             l.sign_time deliveryTime,
-            l.delivery_name deliveryName
+            l.delivery_name deliveryName,
+            a.enterprise_name enterpriseName
         FROM centerdata_t_housingconstruction_steelcylinder a
         left join ( SELECT
                     SUBSTRING_INDEX( GROUP_CONCAT( l.steelcylinder_name ORDER BY sign_time DESC ), ',', 1 ) steelcylinderName,