1

data-ui/src/views/data/housingconstruction/car/index.vue

@@ -310,6 +310,9 @@ export default {
         deptId: [
           {required: true, message: "所属部门不能为空", trigger: "change"},
         ],
+        escortId: [
+          {required: true, message: "押运员不能为空", trigger: "blur"},
+        ],
       }
     };
   },

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

@@ -232,12 +232,12 @@ public class CenterdataTHousingconstructionViewServiceImpl extends BaseServiceIm
     @DataScopeMutiDept(deptAlias = "d")
     @Override
     public List<Map<String,Object>> getResourcePoint(CenterdataTHousingconstructionStoragetank storagetank) {
-        setSookaDataBase(storagetank);
         List<Map<String,Object>> mapList = new ArrayList<Map<String,Object>>();
         switch (storagetank.getState()){
             case "1":
                 //钢瓶
                 CenterdataTHousingconstructionSteelcylinder steelcylinder = new CenterdataTHousingconstructionSteelcylinder();
+                steelcylinder.setParams(storagetank.getParams());
                 setSookaDataBase(steelcylinder);
                 steelcylinder.setEnterpriseId(storagetank.getEnterpriseId());
                 steelcylinder.setName(storagetank.getName());
@@ -249,6 +249,7 @@ public class CenterdataTHousingconstructionViewServiceImpl extends BaseServiceIm
             case "2":
                 //用户
                 CenterdataTHousingconstructionRealnameuser realnameuser = new CenterdataTHousingconstructionRealnameuser();
+                realnameuser.setParams(storagetank.getParams());
                 setSookaDataBase(realnameuser);
                 realnameuser.setEnterpriseId(storagetank.getEnterpriseId());
                 realnameuser.setUserName(storagetank.getName());
@@ -271,6 +272,7 @@ public class CenterdataTHousingconstructionViewServiceImpl extends BaseServiceIm
             case "3":
                 //车辆
                 CenterdataTHousingconstructionCar car = new CenterdataTHousingconstructionCar();
+                car.setParams(storagetank.getParams());
                 setSookaDataBase(car);
                 car.setEnterpriseId(storagetank.getEnterpriseId());
                 car.setCarNumber(storagetank.getName());
@@ -279,6 +281,7 @@ public class CenterdataTHousingconstructionViewServiceImpl extends BaseServiceIm
             case "4":
                 //厂站
                 CenterdataTHousingconstructionEnterprise enterprise = new CenterdataTHousingconstructionEnterprise();
+                enterprise.setParams(storagetank.getParams());
                 setSookaDataBase(enterprise);
                 enterprise.setId(storagetank.getEnterpriseId());
                 enterprise.setEnterpriseName(storagetank.getName());
@@ -291,6 +294,7 @@ public class CenterdataTHousingconstructionViewServiceImpl extends BaseServiceIm
             case "5":
                 //配送员
                 CenterdataTHousingconstructionCar cars = new CenterdataTHousingconstructionCar();
+                cars.setParams(storagetank.getParams());
                 setSookaDataBase(cars);
                 cars.setEnterpriseId(storagetank.getEnterpriseId());
                 cars.setEscortName(storagetank.getName());

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

@@ -473,13 +473,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             u.latitude,
             u.user_name userName,
             u.gas_address gasAddress,
-            d.address,
+            b.address,
             a.dept_name deptName,
             a.id steelcylinderId,
         round( st_distance_sphere ( point ( #{longitude}, #{latitude}), point ( longitude, latitude ) ), 2 ) AS distance
         FROM centerdata_t_housingconstruction_steelcylinder_log l
         left join centerdata_t_housingconstruction_steelcylinder a on a.id = l.steelcylinder_id
-        LEFT JOIN centerdata_t_housingconstruction_realnameuser u ON u.id = l.join_house_id and u.longitude is not null
+        LEFT JOIN centerdata_t_housingconstruction_realnameuser u ON u.id = l.join_house_id
         LEFT JOIN (SELECT
                     a.steelcylinder_id,
                     GROUP_CONCAT( b.gas_address ORDER BY a.sign_time DESC SEPARATOR '@_@' ) address
@@ -488,11 +488,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     LEFT JOIN centerdata_t_housingconstruction_realnameuser b ON a.join_house_id = b.id
                     GROUP BY
                     a.steelcylinder_id
-                    ) d ON l.steelcylinder_id = d.steelcylinder_id
-        LEFT JOIN ${database_system}.sys_dept d ON d.dept_id = u.dept_id
+                    ) b ON l.steelcylinder_id = b.steelcylinder_id
+        LEFT JOIN ${database_system}.sys_dept d ON d.dept_id = a.dept_id
         where l.recycling_time is null
+            and u.longitude is not null
             <if test="enterpriseId != null  and enterpriseId != ''"> and u.enterprise_id = #{enterpriseId}</if>
             <if test="name != null  and name != ''"> and l.steelcylinder_name = #{name}</if>
+            ${params.dataScope}
         GROUP BY l.steelcylinder_id
         <if test="radius != null">having distance &lt; #{radius}</if>
     </select>