住建

src/main/java/com/sooka/sponest/data/housingconstruction/mapper/CenterdataTHousingconstructionCarMapper.java

@@ -4,6 +4,7 @@ package com.sooka.sponest.data.housingconstruction.mapper;
 import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionCar;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 车辆数据Mapper接口
@@ -59,4 +60,12 @@ public interface CenterdataTHousingconstructionCarMapper {
      * @return 结果
      */
     public int deleteCenterdataTHousingconstructionCarByIds(String[] ids);
+
+    /*
+    * 车辆列表
+    *
+    * @author 韩福成
+    * @date 2024/9/12 下午2:37
+    */
+    public List<Map<String,Object>> getCarList(CenterdataTHousingconstructionCar car);
 }

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

@@ -5,6 +5,7 @@ import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
 import com.ruoyi.system.api.RemoteConfigService;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.housingconstruction.domain.*;
+import com.sooka.sponest.data.housingconstruction.mapper.CenterdataTHousingconstructionCarMapper;
 import com.sooka.sponest.data.housingconstruction.mapper.CenterdataTHousingconstructionEnterpriseMapper;
 import com.sooka.sponest.data.housingconstruction.mapper.CenterdataTHousingconstructionRealnameuserMapper;
 import com.sooka.sponest.data.housingconstruction.mapper.CenterdataTHousingconstructionViewMapper;
@@ -33,6 +34,9 @@ public class CenterdataTHousingconstructionViewServiceImpl extends BaseServiceIm
     @Autowired
     private CenterdataTHousingconstructionEnterpriseMapper centerdataTHousingconstructionEnterpriseMapper;
 
+    @Autowired
+    private CenterdataTHousingconstructionCarMapper centerdataTHousingconstructionCarMapper;
+
     /*
     * 液化气罐总数
     *
@@ -245,7 +249,12 @@ public class CenterdataTHousingconstructionViewServiceImpl extends BaseServiceIm
                 break;
             case "3":
                 //车辆
-               // mapList = centerdataTHousingconstructionViewMapper.getResourcePoint(storagetank);
+                CenterdataTHousingconstructionCar car = new CenterdataTHousingconstructionCar();
+                setSookaDataBase(car);
+                car.setEnterpriseId(storagetank.getEnterpriseId());
+                car.setCarNumber(storagetank.getName());
+                mapList = centerdataTHousingconstructionCarMapper.getCarList(car);
+                break;
             case "4":
                 //厂站
                 CenterdataTHousingconstructionEnterprise enterprise = new CenterdataTHousingconstructionEnterprise();

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

@@ -156,4 +156,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="getCarList" parameterType="CenterdataTHousingconstructionCar" resultType="map">
+        <include refid="selectCenterdataTHousingconstructionCarVo"/>
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+        <where>
+            <if test="enterpriseId != null  and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="carNumber != null  and carNumber != ''"> and car_number like concat('%', #{carNumber}, '%')</if>
+            ${params.dataScope}
+        </where>
+    </select>
 </mapper>