修改bug

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintSignclosedInfoMapper.xml

@@ -120,98 +120,102 @@
     where si.signclosed_id = #{signclosedId}
   </select>
   <select id="listSignclosed" resultMap="complaintSignclosedInfoMap" parameterType="ComplaintSignclosedInfo" >
-    SELECT
-      cs.signclosed_id,
-      cs.signclosed_logistics,
-      cs.signclosed_logistics_number,
-      cs.signclosed_send_name,
-      cs.signclosed_send_tel,
-      cs.signclosed_addr_provinces,
-      cs.signclosed_addr_city,
-      cs.signclosed_addr_area,
-      cs.signclosed_date,
-      cs.signclosed_customer_id,
-      cs.signclosed_desc,
-      cs.signclosed_create_time,
-      cs.signclosed_update_time,
-      cs.signclosed_customer_desc,
-      cs.signclosed_is_receiving,
-      cs.signclosed_is_use,
-      cs.sendback_id,
-      cs.signclosed_is_whetherLess,
-      cs.signclosed_store_id,
-      ap.province signclosedAddrProvincesName,
-      ac.city signclosedAddrCityName,
-      ad.district signclosedAddrAreaName,
-      qd.describe_title customerIdDescribe,
-      li.logistics_name signclosedLogisticsName,
-      cs.signclosed_company_id signclosedCompanyId,
-      si.store_name signclosedStoreName,
-      cd.detect_number detectNumber,
-      cpm.proc_method_name procMethodName,
-      cpt.proc_type_name procTypeName,
-      cd.detect_production detectProduction,
-      cd.detect_fuselage_barcode detectFuselageBarcode,
-      cd.detect_phenomenon detectPhenomenon,
-      cd.detect_classification detectClassification,
-      cd.detect_failure_cause detectFailureCause,
-      cd.detect_results detectResults,
-      cd.detect_point detectPoint,
-      cd.detect_nalysis detectNalysis,
-      cd.detect_content detectContent,
-      cd.detect_is_refurbishing detectIsRefurbishing
-    FROM (
+    SELECT temp.* FROM (
       SELECT
-        cs.*
-      FROM
-        tb_rst_complaint_signclosed cs
-      <where>
-        <if test="signclosedSendName != null and signclosedSendName != ''" >
-          cs.signclosed_send_name = #{signclosedSendName}
-        </if>
-        <if test="signclosedSendTel != null and signclosedSendTel != ''" >
-          AND cs.signclosed_send_tel like CONCAT('%',#{signclosedSendTel},'%')
-        </if>
-        <if test="signclosedLogisticsNumber != null and signclosedLogisticsNumber != ''" >
-          AND cs.signclosed_logistics_number like CONCAT('%',#{signclosedLogisticsNumber},'%')
-        </if>
-        <if test="signclosedCustomerId != null " >
-          AND cs.signclosed_customer_id = #{signclosedCustomerId}
-        </if>
-        <if test="isBinding != null and isBinding == 1" >
-          AND cs.signclosed_customer_id is NULL AND cs.signclosed_company_id != 3 AND cs.signclosed_company_id != 4
-        </if>
-        <if test="signclosedIsReceiving != null and signclosedIsReceiving != ''" >
-          AND cs.signclosed_is_receiving = #{signclosedIsReceiving}
-        </if>
-        <if test="signclosedDate != null and signclosedDate != ''" >
-          AND cs.signclosed_date = #{signclosedDate}
-        </if>
-        <if test="startTime != null and startTime != ''" >
-          AND cs.signclosed_date &gt; #{startTime}
-        </if>
-        <if test="endTime != null and endTime != ''" >
-          AND cs.signclosed_date &lt; #{endTime}
+        cs.signclosed_id,
+        cs.signclosed_logistics,
+        cs.signclosed_logistics_number,
+        cs.signclosed_send_name,
+        cs.signclosed_send_tel,
+        cs.signclosed_addr_provinces,
+        cs.signclosed_addr_city,
+        cs.signclosed_addr_area,
+        cs.signclosed_date,
+        cs.signclosed_customer_id,
+        cs.signclosed_desc,
+        cs.signclosed_create_time,
+        cs.signclosed_update_time,
+        cs.signclosed_customer_desc,
+        cs.signclosed_is_receiving,
+        cs.signclosed_is_use,
+        cs.sendback_id,
+        cs.signclosed_is_whetherLess,
+        cs.signclosed_store_id,
+        ap.province signclosedAddrProvincesName,
+        ac.city signclosedAddrCityName,
+        ad.district signclosedAddrAreaName,
+        qd.describe_title customerIdDescribe,
+        li.logistics_name signclosedLogisticsName,
+        cs.signclosed_company_id signclosedCompanyId,
+        si.store_name signclosedStoreName,
+        cd.detect_number detectNumber,
+        cpm.proc_method_name procMethodName,
+        cpt.proc_type_name procTypeName,
+        cd.detect_production detectProduction,
+        cd.detect_fuselage_barcode detectFuselageBarcode,
+        cd.detect_phenomenon detectPhenomenon,
+        cd.detect_classification detectClassification,
+        cd.detect_failure_cause detectFailureCause,
+        cd.detect_results detectResults,
+        cd.detect_point detectPoint,
+        cd.detect_nalysis detectNalysis,
+        cd.detect_content detectContent,
+        cd.detect_is_refurbishing detectIsRefurbishing
+      FROM (
+        SELECT
+          cs.*
+        FROM
+          tb_rst_complaint_signclosed cs
+        <where>
+          <if test="signclosedSendName != null and signclosedSendName != ''" >
+            cs.signclosed_send_name = #{signclosedSendName}
+          </if>
+          <if test="signclosedSendTel != null and signclosedSendTel != ''" >
+            AND cs.signclosed_send_tel like CONCAT('%',#{signclosedSendTel},'%')
+          </if>
+          <if test="signclosedLogisticsNumber != null and signclosedLogisticsNumber != ''" >
+            AND cs.signclosed_logistics_number like CONCAT('%',#{signclosedLogisticsNumber},'%')
+          </if>
+          <if test="signclosedCustomerId != null " >
+            AND cs.signclosed_customer_id = #{signclosedCustomerId}
+          </if>
+          <if test="isBinding != null and isBinding == 1" >
+            AND cs.signclosed_customer_id is NULL AND cs.signclosed_company_id != 3 AND cs.signclosed_company_id != 4
+          </if>
+          <if test="signclosedIsReceiving != null and signclosedIsReceiving != ''" >
+            AND cs.signclosed_is_receiving = #{signclosedIsReceiving}
+          </if>
+          <if test="signclosedDate != null and signclosedDate != ''" >
+            AND cs.signclosed_date = #{signclosedDate}
+          </if>
+          <if test="startTime != null and startTime != ''" >
+            AND cs.signclosed_date &gt; #{startTime}
+          </if>
+          <if test="endTime != null and endTime != ''" >
+            AND cs.signclosed_date &lt; #{endTime}
+          </if>
+        </where>
+        GROUP BY
+          cs.signclosed_id
+        ORDER BY
+          cs.signclosed_id DESC
+        <if test="offset != null and pageNum != null">
+          LIMIT #{offset}, #{pageNum}
         </if>
-      </where>
-      GROUP BY
-        cs.signclosed_id
-      ORDER BY
-        cs.signclosed_id DESC
-      <if test="offset != null and pageNum != null">
-        LIMIT #{offset}, #{pageNum}
-      </if>
-    ) cs
-    LEFT JOIN tb_rst_address_province ap ON cs.signclosed_addr_provinces = ap.province_id
-    LEFT JOIN tb_rst_address_city ac ON cs.signclosed_addr_city = ac.city_id
-    LEFT JOIN tb_rst_address_district ad ON ad.district_id = cs.signclosed_addr_area
-    LEFT JOIN tb_rst_cm_question_describe qd ON cs.signclosed_customer_id = qd.customer_id
-    LEFT JOIN tb_rst_logistics_info li ON cs.signclosed_logistics = li.logistics_rst_code
-    LEFT JOIN tb_rst_store_info si ON cs.signclosed_store_id = si.store_id
-    LEFT JOIN tb_rst_complaint_detect cd ON cs.signclosed_id = cd.signclosed_id
-    LEFT JOIN tb_rst_cm_relation cr ON cs.signclosed_customer_id = cr.customer_id
-    LEFT JOIN tb_rst_cm_proc_method cpm ON cr.proc_method_id = cpm.proc_method_id
-    LEFT JOIN tb_rst_cm_proc_type cpt ON cpm.proc_type_id = cpt.proc_type_id
+      ) cs
+      LEFT JOIN tb_rst_address_province ap ON cs.signclosed_addr_provinces = ap.province_id
+      LEFT JOIN tb_rst_address_city ac ON cs.signclosed_addr_city = ac.city_id
+      LEFT JOIN tb_rst_address_district ad ON ad.district_id = cs.signclosed_addr_area
+      LEFT JOIN tb_rst_cm_question_describe qd ON cs.signclosed_customer_id = qd.customer_id
+      LEFT JOIN tb_rst_logistics_info li ON cs.signclosed_logistics = li.logistics_rst_code
+      LEFT JOIN tb_rst_store_info si ON cs.signclosed_store_id = si.store_id
+      LEFT JOIN tb_rst_complaint_detect cd ON cs.signclosed_id = cd.signclosed_id
+      LEFT JOIN tb_rst_cm_relation cr ON cs.signclosed_customer_id = cr.customer_id
+      LEFT JOIN tb_rst_cm_proc_method cpm ON cr.proc_method_id = cpm.proc_method_id
+      LEFT JOIN tb_rst_cm_proc_type cpt ON cpm.proc_type_id = cpt.proc_type_id
+    ) temp
+    GROUP BY temp.signclosed_id
+    ORDER BY temp.signclosed_id DESC
   </select>
 
   <select id="countSigncoled" parameterType="ComplaintSignclosedInfo" resultType="int">