调整

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerContractMapper.xml

@@ -4,8 +4,14 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*
+        SELECT a.*,
+               b.project_name,
+               c.name AS customer_name,
+               d.company_name
         FROM tower_contract a
+        LEFT JOIN tower_project b ON a.project_id = b.project_id
+        LEFT JOIN tower_customer c ON a.customer_id = c.customer_id
+        LEFT JOIN sys_company d ON a.company_id = d.company_id
         <where>
             <if test="param.contractId != null">
                 AND a.contract_id = #{param.contractId}
@@ -19,6 +25,9 @@
             <if test="param.customerId != null">
                 AND a.customer_id = #{param.customerId}
             </if>
+            <if test="param.keywords != null">
+                AND (a.contact_number LIKE CONCAT('%', #{param.keywords}, '%')  OR b.project_name LIKE CONCAT('%', #{param.keywords}, '%'))
+            </if>
             <if test="param.customerContact != null">
                 AND a.customer_contact LIKE CONCAT('%', #{param.customerContact}, '%')
             </if>

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerCustomerMapper.xml

@@ -55,6 +55,15 @@
             <if test="param.createTimeEnd != null">
                 AND a.create_time &lt;= #{param.createTimeEnd}
             </if>
+            <if test="param.keywords != null">
+                AND (
+                a.name LIKE CONCAT('%', #{param.keywords}, '%')
+                OR a.full_name LIKE CONCAT('%', #{param.keywords}, '%')
+                OR a.credit_code LIKE CONCAT('%', #{param.keywords}, '%')
+                OR a.address LIKE CONCAT('%', #{param.keywords}, '%')
+                OR a.contact LIKE CONCAT('%', #{param.keywords}, '%')
+                )
+            </if>
         </where>
     </sql>
 

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerEquipmentMapper.xml

@@ -91,12 +91,17 @@
             <if test="param.createTimeEnd != null">
                 AND a.create_time &lt;= #{param.createTimeEnd}
             </if>
+            <if test="param.equipmentIdList != null">
+                AND a.equipment_id IN (#{param.equipmentIdList})
+            </if>
             <if test="param.keywords != null">
               AND (
               a.name LIKE CONCAT('%', #{param.keywords}, '%')
               OR a.model LIKE CONCAT('%', #{param.keywords}, '%')
               OR a.equipment_no LIKE CONCAT('%', #{param.keywords}, '%')
               OR a.company LIKE CONCAT('%', #{param.keywords}, '%')
+              OR a.filing_no LIKE CONCAT('%', #{param.keywords}, '%')
+              OR a.factory_no LIKE CONCAT('%', #{param.keywords}, '%')
               )
             </if>
         </where>

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectMapper.xml

@@ -88,6 +88,9 @@
             <if test="param.createTimeEnd != null">
                 AND a.create_time &lt;= #{param.createTimeEnd}
             </if>
+            <if test="param.keywords != null">
+                AND ( a.project_name LIKE CONCAT('%', #{param.keywords}, '%') )
+            </if>
         </where>
     </sql>
 

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerProjectUserMapper.xml

@@ -9,6 +9,7 @@
         LEFT JOIN sys_user b ON a.user_id = b.user_id
         LEFT JOIN sys_organization c ON b.organization_id = c.organization_id
         <where>
+            AND a.user_id != 0
             <if test="param.id != null">
                 AND a.id = #{param.id}
             </if>
@@ -38,6 +39,7 @@
               )
             </if>
         </where>
+        GROUP BY a.user_id
     </sql>
 
     <!-- 分页查询 -->