住建

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

@@ -230,6 +230,7 @@ public class CenterdataTHousingconstructionViewServiceImpl extends BaseServiceIm
                 CenterdataTHousingconstructionSteelcylinder steelcylinder = new CenterdataTHousingconstructionSteelcylinder();
                 setSookaDataBase(steelcylinder);
                 steelcylinder.setEnterpriseId(storagetank.getEnterpriseId());
+                steelcylinder.setName(storagetank.getName());
                 mapList = centerdataTHousingconstructionViewMapper.getSteelcylinderPointList(steelcylinder);
                 break;
             case "2":
@@ -237,6 +238,7 @@ public class CenterdataTHousingconstructionViewServiceImpl extends BaseServiceIm
                 CenterdataTHousingconstructionRealnameuser realnameuser = new CenterdataTHousingconstructionRealnameuser();
                 setSookaDataBase(realnameuser);
                 realnameuser.setEnterpriseId(storagetank.getEnterpriseId());
+                realnameuser.setUserName(storagetank.getName());
                 mapList = centerdataTHousingconstructionRealnameuserMapper.getRealnameuserList(realnameuser);
                 break;
             case "3":
@@ -247,6 +249,7 @@ public class CenterdataTHousingconstructionViewServiceImpl extends BaseServiceIm
                 CenterdataTHousingconstructionEnterprise enterprise = new CenterdataTHousingconstructionEnterprise();
                 setSookaDataBase(enterprise);
                 enterprise.setId(storagetank.getEnterpriseId());
+                enterprise.setEnterpriseName(storagetank.getName());
                 mapList = centerdataTHousingconstructionEnterpriseMapper.getEnterpriseList(enterprise);
                 break;
             case "5":

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

@@ -165,6 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
      <where>
          <if test="id != null  and id != ''"> and a.id = #{id}</if>
+         <if test="enterpriseName != null  and enterpriseName != ''"> and a.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
          ${params.dataScope}
      </where>
     </select>

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

@@ -145,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             b.dict_type = 'enterprise_user_type'
             <if test="enterpriseId != null  and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
+            <if test="userName != null  and userName != ''"> and a.user_name like concat('%', #{userName}, '%')</if>
         </where>
     </select>
 

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

@@ -343,7 +343,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             a.state = 'state_4'
             and z.dict_type = 'steelcylinder_type'
-            <if test="enterpriseId != null  and enterpriseId != ''"> and a.enterprise_id = #{enterpriseId}</if>
+        <if test="name != null  and name != ''"> and a.`name` like concat('%', #{name}, '%')</if>
+        <if test="enterpriseId != null  and enterpriseId != ''"> and a.enterprise_id = #{enterpriseId}</if>
             ${params.dataScope}
         GROUP BY a.id
     </select>