add 问卷调查搜索条件修改

mec-biz/src/main/resources/config/mybatis/ReplacementInstrumentActivityMapper.xml

@@ -126,7 +126,8 @@
     <select id="findByUserId" resultMap="ReplacementInstrumentActivity">
         SELECT *
         FROM replacement_instrument_activity
-        WHERE user_id_ = #{userId} and cooperation_organ_id_ = #{cooperationOrganId}
+        WHERE user_id_ = #{userId}
+          and cooperation_organ_id_ = #{cooperationOrganId}
         LIMIT 1
     </select>
 
@@ -155,7 +156,7 @@
             </if>
             <if test="cooperationOrganIdOrName!=null and cooperationOrganIdOrName!=''">
                 AND (ria.cooperation_organ_id_ = #{cooperationOrganIdOrName} OR co.name_ LIKE CONCAT('%', #{cooperationOrganIdOrName}, '%'))
-        </if>
+            </if>
         </where>
     </sql>
 
@@ -189,13 +190,18 @@
 
     <select id="countReplacementsInfo"
             resultType="com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatHead">
-        SELECT ric.open_pay_ openPay,
-               COUNT(DISTINCT ria.user_id_)                                            surveyNum,
-               COUNT(DISTINCT IF(ria.instruments_id_ IS NOT NULL, ria.user_id_, NULL)) replacementNum,
-               TRUNCATE(COUNT(IF(ria.instruments_id_ IS NOT NULL, ria.user_id_, NULL)) / COUNT(DISTINCT ria.user_id_) * 100, 2) replacementRate,
-               TRUNCATE(COUNT(IF(ria.pay_status_ = 2, ria.user_id_, NULL)) / COUNT(DISTINCT IF(ria.instruments_id_ IS NOT NULL, ria.user_id_, NULL)) * 100, 2) paymentRate
+        SELECT ric.open_pay_                                                                              openPay,
+               COUNT(DISTINCT ria.user_id_)                                                               surveyNum,
+               COUNT(DISTINCT
+                     IF(ria.instruments_id_ IS NOT NULL, ria.user_id_, NULL))                             replacementNum,
+               TRUNCATE(COUNT(IF(ria.instruments_id_ IS NOT NULL, ria.user_id_, NULL)) / COUNT(DISTINCT ria.user_id_) *
+                        100,
+                        2)                                                                                replacementRate,
+               TRUNCATE(COUNT(IF(ria.pay_status_ = 2, ria.user_id_, NULL)) /
+                        COUNT(DISTINCT IF(ria.instruments_id_ IS NOT NULL, ria.user_id_, NULL)) * 100, 2) paymentRate
         FROM replacement_instrument_activity ria
-            LEFT JOIN replacement_instrument_cooperation ric ON ria.cooperation_organ_id_=ric.cooperation_organ_id_
+                 LEFT JOIN replacement_instrument_cooperation ric
+                           ON ria.cooperation_organ_id_ = ric.cooperation_organ_id_
         WHERE ria.cooperation_organ_id_ = #{cooperationOrganId}
     </select>
 
@@ -203,26 +209,40 @@
         UPDATE replacement_instrument_activity
         SET open_flag_ = 1
         WHERE cooperation_organ_id_ = #{cooperationOrganId}
-          AND open_flag_ = 0 AND instruments_id_ > 0
+          AND open_flag_ = 0
+          AND instruments_id_ > 0
     </update>
 
     <select id="getLock" resultMap="ReplacementInstrumentActivity">
-        SELECT * FROM replacement_instrument_activity WHERE id_ = #{id} FOR UPDATE
+        SELECT *
+        FROM replacement_instrument_activity
+        WHERE id_ = #{id} FOR
+        UPDATE
     </select>
 
     <select id="getPushUsers" resultMap="ReplacementInstrumentActivityStatDto">
-        SELECT ria.*,su.phone_ mobile_no_,ri.brand_ FROM replacement_instrument_activity ria
-        LEFT JOIN sys_user su ON su.id_ = ria.user_id_
-        LEFT JOIN replacement_instrument ri ON ri.id_ = ria.instruments_id_
+        SELECT ria.*, su.phone_ mobile_no_, ri.brand_
+        FROM replacement_instrument_activity ria
+                 LEFT JOIN sys_user su ON su.id_ = ria.user_id_
+                 LEFT JOIN replacement_instrument ri ON ri.id_ = ria.instruments_id_
         WHERE cooperation_organ_id_ = #{cooperationOrganId}
-        AND open_flag_ = 0 AND instruments_id_ > 0
+          AND open_flag_ = 0
+          AND instruments_id_ > 0
     </select>
 
     <select id="getInfo" resultMap="ReplacementInstrumentActivityStatDto">
-        SELECT ria.*,ri.brand_,ri.specification_,ri.param_,ri.market_price_,ri.discount_price_,ri.depreciation_price_,
-        ri.sale_price_,s.name_ subject_name_ FROM replacement_instrument_activity ria
-        LEFT JOIN replacement_instrument ri ON ri.id_ = ria.instruments_id_
-        LEFT JOIN subject s on s.id_ = ri.subject_id_
+        SELECT ria.*,
+               ri.brand_,
+               ri.specification_,
+               ri.param_,
+               ri.market_price_,
+               ri.discount_price_,
+               ri.depreciation_price_,
+               ri.sale_price_,
+               s.name_ subject_name_
+        FROM replacement_instrument_activity ria
+                 LEFT JOIN replacement_instrument ri ON ri.id_ = ria.instruments_id_
+                 LEFT JOIN subject s on s.id_ = ri.subject_id_
         WHERE ria.id_ = #{id}
     </select>