Merge branch '2021-04-28' of http://git.dayaedu.com/yonge/mec

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

@@ -12,6 +12,8 @@ public class ReplacementInstrumentActivityStatHead {
 
     private String cooperationOrganName;
 
+    private String topicName;
+
     private BigDecimal surveyNum;
 
     private BigDecimal replacementNum;
@@ -20,6 +22,14 @@ public class ReplacementInstrumentActivityStatHead {
 
     private BigDecimal paymentRate = new BigDecimal(0);
 
+    public String getTopicName() {
+        return topicName;
+    }
+
+    public void setTopicName(String topicName) {
+        this.topicName = topicName;
+    }
+
     public int getOpenPay() {
         return openPay;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ReplacementInstrumentActivityServiceImpl.java

@@ -45,8 +45,6 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
     @Autowired
     private CooperationOrganDao cooperationOrganDao;
     @Autowired
-    private ReplacementInstrumentDao replacementInstrumentDao;
-    @Autowired
     private SysUserCashAccountService sysUserCashAccountService;
     @Autowired
     private IdGeneratorService idGeneratorService;
@@ -79,6 +77,8 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
     @Autowired
     private SellOrderDao sellOrderDao;
     @Autowired
+    private QuestionnaireTopicDao questionnaireTopicDao;
+    @Autowired
     private QuestionnaireUserResultDao questionnaireUserResultDao;
     @Autowired
     private QuestionnaireQuestionDao questionnaireQuestionDao;
@@ -247,7 +247,9 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
             ReplacementInstrumentActivityStatHead head = replacementInstrumentActivityDao.countReplacementsInfo(queryInfo.getCooperationId());
             ReplacementInstrumentCooperation cooperation = replacementInstrumentCooperationDao.get(queryInfo.getCooperationId());
             CooperationOrgan cooperationOrgan = cooperationOrganDao.get(cooperation.getCooperationOrganId());
+            QuestionnaireTopic questionnaireTopic = questionnaireTopicDao.get(cooperation.getTopicId());
             head.setCooperationOrganName(cooperationOrgan.getName());
+            head.setTopicName(questionnaireTopic.getTitle());
             pageInfo.setStatInfo(head);
         }