Parcourir la source

导出链接增加,分部字段

周箭河 il y a 4 ans
Parent
commit
b7a94f64a4

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

@@ -143,6 +143,9 @@
             <if test="hasInstrumentsId!=null and hasInstrumentsId==true">
                 AND ria.instruments_id_ >=1
             </if>
+            <if test="hasInstrumentsId!=null and hasInstrumentsId==false">
+                AND ria.instruments_id_ IS NULL
+            </if>
             <if test="hasYesFirstAnswer!=null and hasYesFirstAnswer==true">
                 AND ria.question_result_ LIKE CONCAT('1', '%')
             </if>
@@ -257,12 +260,13 @@
 
     <!-- 获取问卷分页数据 -->
     <select id="getPageList" resultMap="ReplacementInstrumentActivityStatDto" parameterType="map">
-        SELECT ria.*,o.name_,ri.brand_,ri.specification_,ri.param_,ri.market_price_,ri.discount_price_,ri.depreciation_price_,
+        SELECT ria.*,su.phone_ mobile_no_,o.name_,ri.brand_,ri.specification_,ri.param_,ri.market_price_,ri.discount_price_,ri.depreciation_price_,
         ri.sale_price_,s.name_ subject_name_,co.name_ cooperationOrganName 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_
-        LEFT JOIN cooperation_organ co on co.id_ = ria.cooperation_organ_id_
-        LEFT JOIN organization o on o.id_ = co.organ_id_
+        LEFT JOIN subject s ON s.id_ = ri.subject_id_
+        lEFT JOIN sys_user su ON su.id_ = ria.user_id_
+        LEFT JOIN cooperation_organ co ON co.id_ = ria.cooperation_organ_id_
+        LEFT JOIN organization o ON o.id_ = co.organ_id_
         <include refid="queryReplacementsCondition"/>
         ORDER BY ria.id_ DESC
         <include refid="global.limit"/>