Merge remote-tracking branch 'origin/dev' into dev

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

@@ -282,7 +282,7 @@ public class CenterdataTHousingconstructionViewServiceImpl extends BaseServiceIm
                 CenterdataTHousingconstructionCar cars = new CenterdataTHousingconstructionCar();
                 setSookaDataBase(cars);
                 cars.setEnterpriseId(storagetank.getEnterpriseId());
-                cars.setCarNumber(storagetank.getName());
+                cars.setEscortName(storagetank.getName());
                 mapList = centerdataTHousingconstructionCarMapper.getCarList(cars);
         }
         return mapList;

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

@@ -462,7 +462,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ${database_system}.sys_dept d ON d.dept_id = u.dept_id
         <where>
             <if test="enterpriseId != null  and enterpriseId != ''"> and u.enterprise_id = #{enterpriseId}</if>
-            <if test="name != null  and name != ''"> and l.steelcylinder_name like concat('%', #{name}, '%')</if>
+            <if test="name != null  and name != ''"> and l.steelcylinder_name = #{name}</if>
             and u.longitude is not null
         </where>
         GROUP BY l.steelcylinder_id