Merge remote-tracking branch 'origin/2021-04-21_music_replace' into 2021-04-21_music_replace

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ReplacementInstrumentActivityStatHead.java

@@ -8,6 +8,8 @@ import java.math.BigDecimal;
  */
 public class ReplacementInstrumentActivityStatHead {
 
+    private int openPay;
+
     private String cooperationOrganName;
 
     private BigDecimal surveyNum;
@@ -16,6 +18,16 @@ public class ReplacementInstrumentActivityStatHead {
 
     private BigDecimal replacementRate = new BigDecimal(0);
 
+    private BigDecimal paymentRate = new BigDecimal(0);
+
+    public int getOpenPay() {
+        return openPay;
+    }
+
+    public void setOpenPay(int openPay) {
+        this.openPay = openPay;
+    }
+
     public String getCooperationOrganName() {
         return cooperationOrganName;
     }
@@ -47,4 +59,12 @@ public class ReplacementInstrumentActivityStatHead {
     public void setReplacementRate(BigDecimal replacementRate) {
         this.replacementRate = replacementRate;
     }
+
+    public BigDecimal getPaymentRate() {
+        return paymentRate;
+    }
+
+    public void setPaymentRate(BigDecimal paymentRate) {
+        this.paymentRate = paymentRate;
+    }
 }

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

@@ -175,11 +175,13 @@
 
     <select id="countReplacementsInfo"
             resultType="com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatHead">
-        SELECT COUNT(DISTINCT ria.user_id_)                                            surveyNum,
+        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.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_
         WHERE ria.cooperation_organ_id_ = #{cooperationOrganId}
     </select>