调查问卷

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/QuestionnaireQuestionDao.java

@@ -12,4 +12,7 @@ public interface QuestionnaireQuestionDao extends BaseDAO<Long, QuestionnaireQue
     void batchDel(@Param("questionIdList") List<Long> delQuestionnaireQuestionIdList);
 
     List<QuestionnaireQuestion> findByTopicId(int topicId);
+
+    //获取导出字段
+    List<String> findQuestionColumnList(Integer cooperationId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ReplacementInstrumentActivityDao.java

@@ -28,10 +28,10 @@ public interface ReplacementInstrumentActivityDao extends BaseDAO<Integer, Repla
     /**
      * 获取开启缴费推送的人
      *
-     * @param cooperationOrganId
+     * @param cooperationId
      * @return
      */
-    List<ReplacementInstrumentActivityStatDto> getPushUsers(@Param("cooperationOrganId") Integer cooperationOrganId);
+    List<ReplacementInstrumentActivityStatDto> getPushUsers(@Param("cooperationId") Integer cooperationId);
 
     /**
      * 获取置换记录详情

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

@@ -0,0 +1,19 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.QuestionnaireUserResult;
+import com.ym.mec.biz.dal.enums.QuestionnaireActiveTypeEnum;
+
+import java.util.List;
+
+public class QuestionnaireUserResultExportDto extends QuestionnaireUserResult {
+
+    private List<QuestionnaireResultDto> questionnaireResultDtoList;
+
+    public List<QuestionnaireResultDto> getQuestionnaireResultDtoList() {
+        return questionnaireResultDtoList;
+    }
+
+    public void setQuestionnaireResultDtoList(List<QuestionnaireResultDto> questionnaireResultDtoList) {
+        this.questionnaireResultDtoList = questionnaireResultDtoList;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/ReplacementInstrumentCooperationService.java

@@ -9,10 +9,10 @@ public interface ReplacementInstrumentCooperationService extends BaseService<Int
 
     /**
      * 开启缴费
-     * @param id
+     * @param cooperationId
      * @return
      */
-    ReplacementInstrumentCooperation openPay(Integer id);
+    ReplacementInstrumentCooperation openPay(Integer cooperationId);
 
     /**
      * 获取合作单位乐器置换列表

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

@@ -46,8 +46,8 @@ public class ReplacementInstrumentCooperationServiceImpl extends BaseServiceImpl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ReplacementInstrumentCooperation openPay(Integer id) {
-        ReplacementInstrumentCooperation replacementInstrumentCooperation = replacementInstrumentCooperationDao.get(id);
+    public ReplacementInstrumentCooperation openPay(Integer cooperationId) {
+        ReplacementInstrumentCooperation replacementInstrumentCooperation = replacementInstrumentCooperationDao.get(cooperationId);
         if (replacementInstrumentCooperation == null) {
             throw new BizException("合作单位乐器置换活动不存在");
         }
@@ -59,7 +59,7 @@ public class ReplacementInstrumentCooperationServiceImpl extends BaseServiceImpl
 
         //发送推送链接
         //家长您好！您订购的 {乐器品牌}品牌乐器已经开始接受预定，请点击{链接地址}完成付款，付款后15个工作日以内到货，如有疑问请咨询乐团管理老师。
-        List<ReplacementInstrumentActivityStatDto> pushUsers = replacementInstrumentActivityDao.getPushUsers(replacementInstrumentCooperation.getCooperationOrganId());
+        List<ReplacementInstrumentActivityStatDto> pushUsers = replacementInstrumentActivityDao.getPushUsers(cooperationId);
 
         replacementInstrumentActivityDao.openPay(replacementInstrumentCooperation.getCooperationOrganId());
 
@@ -91,7 +91,8 @@ public class ReplacementInstrumentCooperationServiceImpl extends BaseServiceImpl
                     if (!row.getCooperationOrganId().equals(replacementInstrument.getCooperationOrganId())) continue;
                     row.setActiveNum(replacementInstrument.getActiveNum());
                     row.setReplaceNum(replacementInstrument.getReplaceNum());
-                    row.setReplaceScale(new BigDecimal(replacementInstrument.getReplaceNum()).multiply(new BigDecimal(100)).divide(new BigDecimal(replacementInstrument.getActiveNum()), 2, BigDecimal.ROUND_HALF_UP));
+                    row.setReplaceScale(new BigDecimal(replacementInstrument.getReplaceNum()).multiply(new BigDecimal(100)).
+                            divide(new BigDecimal(replacementInstrument.getActiveNum()), 2, BigDecimal.ROUND_HALF_UP));
                     row.setPayScale(
                             replacementInstrument.getReplaceNum() <= 0 ? new BigDecimal("0.00") :
                                     new BigDecimal(replacementInstrument.getPayNum()).multiply(new BigDecimal(100)).divide(new BigDecimal(replacementInstrument.getReplaceNum()), 2, BigDecimal.ROUND_HALF_UP)

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

@@ -113,4 +113,9 @@
     <select id="findByTopicId" resultMap="QuestionnaireQuestion">
 		SELECT * FROM questionnaire_question WHERE questionnaire_topic_id_ = #{topicId}
 	</select>
+    <select id="findQuestionColumnList" resultType="java.lang.String">
+		SELECT qq.content_ FROM replacement_instrument_cooperation ric
+		LEFT JOIN questionnaire_question qq ON qq.questionnaire_topic_id_ = ric.topic_id_
+		WHERE ric.id_ = #{cooperationId}
+	</select>
 </mapper>

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

@@ -252,7 +252,7 @@
         FROM replacement_instrument_activity ria
                  LEFT JOIN sys_user su ON su.id_ = ria.user_id_
                  LEFT JOIN goods g ON g.id_ = ria.instruments_id_
-        WHERE cooperation_organ_id_ = #{cooperationOrganId}
+        WHERE replacement_instrument_cooperation_id_ = #{cooperationId}
           AND open_flag_ = 0
           AND instruments_id_ > 0
     </select>

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

@@ -99,7 +99,7 @@
     <select id="countAllReplacementsInfo" resultType="com.ym.mec.biz.dal.entity.ReplacementInstrumentCooperation">
         SELECT cooperation_organ_id_              cooperationOrganId,
                COUNT(user_id_)                           activeNum,
-               SUM(IF(instruments_id_ > 0, 1, 0)) replaceNum,
+               SUM(IF(instruments_id_ IS NOT NULL AND instruments_id_ > 0, 1, 0)) replaceNum,
                SUM(IF(pay_status_ = 2, 1, 0)) payNum
         FROM replacement_instrument_activity
         GROUP BY replacement_instrument_cooperation_id_

mec-web/src/main/java/com/ym/mec/web/controller/ReplacementInstrumentActivityController.java

@@ -53,7 +53,9 @@ public class ReplacementInstrumentActivityController extends BaseController {
     @Autowired
     private ReplacementInstrumentCooperationService replacementInstrumentCooperationService;
     @Autowired
-    private ReplacementInstrumentDao replacementInstrumentDao;
+    private QuestionnaireQuestionDao questionnaireQuestionDao;
+    @Autowired
+    private QuestionnaireUserResultDao questionnaireUserResultDao;
     @Autowired
     private SysConfigDao sysConfigDao;
     @Autowired
@@ -133,6 +135,24 @@ public class ReplacementInstrumentActivityController extends BaseController {
 
     @ApiOperation(value = "导出")
     @RequestMapping("/export")
+    @PreAuthorize("@pcs.hasPermissions('questionnaireUserResult/export')")
+    public void questionnaireUserResultExport(ReplacementInstrumentActivityQueryInfo queryInfo, HttpServletResponse response) throws Exception {
+        List<String> questionColumn = questionnaireQuestionDao.findQuestionColumnList(queryInfo.getCooperationId());
+        if(questionColumn != null && questionColumn.size() > 0){
+            List<String> column = new ArrayList<>();
+            column.add("学员编号");
+            column.add("学员姓名");
+            column.add("手机号");
+            column.addAll(questionColumn);
+            String[] header = column.toArray(new String[column.size()]);
+//            questionnaireUserResultDao.queryDetailPage()
+        }else {
+            throw new BizException("暂无可导出数据");
+        }
+    }
+
+    @ApiOperation(value = "导出")
+    @RequestMapping("/export")
     @PreAuthorize("@pcs.hasPermissions('replacementInstrumentActivity/export')")
     public void export(ReplacementInstrumentActivityQueryInfo queryInfo, HttpServletResponse response) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -172,8 +192,8 @@ public class ReplacementInstrumentActivityController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         HSSFWorkbook workbook = null;
         try {
-            String[] header = {"分部", "合作单位编号", "合作单位", "学员编号", "学员姓名", "联系电话", "声部", "品牌", "型号", "是否参与市赛", "是否置换乐器"};
-            String[] body = {"organName", "cooperationOrganId", "cooperationOrganName", "userId", "userName", "mobileNo", "subjectName", "brand", "specification","hasYesFirstAnswer","hasInstrumentsId"};
+            String[] header = {"分部", "合作单位编号", "合作单位", "学员编号", "学员姓名", "联系电话", "声部", "品牌", "型号", "是否置换乐器"};
+            String[] body = {"organName", "cooperationOrganId", "cooperationOrganName", "userId", "userName", "mobileNo", "subjectName", "brand", "specification","hasInstrumentsId"};
             workbook = POIUtil.exportExcel(header, body, pageList.getRows());
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=replacement-" + DateUtil.getDate(new Date()) + ".xls");