Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ReplacementInstrumentActivityDao.java
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/ReplacementInstrumentCooperationServiceImpl.java
#	mec-biz/src/main/resources/config/mybatis/ReplacementInstrumentActivityMapper.xml

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

@@ -19,7 +19,7 @@ public interface ReplacementInstrumentActivityDao extends BaseDAO<Integer, Repla
 
     int countReplacements(Map<String, Object> params);
 
-    ReplacementInstrumentActivityStatHead countReplacementsInfo(Integer cooperationOrganId);
+    ReplacementInstrumentActivityStatHead countReplacementsInfo(Integer cooperationId);
 
     int openPay(@Param("replacementInstrumentCooperationId") Integer replacementInstrumentCooperationId);
 

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/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/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/IndexBaseMonthDataServiceImpl.java

@@ -905,12 +905,6 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		resultMap.put("musicPatrol",flag1);
 		boolean flag2 = false;
 		if(!flag2){
-			int countNoPaymentStudentNum = indexBaseMonthDataDao.countNoPaymentStudentNum(organIds,educationUserId, 0);
-			if(countNoPaymentStudentNum > 0){
-				flag2 = true;
-			}
-		}
-		if(!flag2){
 			List<Long> quitGroupNum = indexBaseMonthDataDao.queryApplyForQuitGroupNum(organIds,educationUserId);
 			if(quitGroupNum.size() > 0){
 				flag2 = true;
@@ -952,13 +946,6 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 		boolean flag4 = false;
 		if(!flag4){
-			String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
-			int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
-			if(lowTeacherSalary > 0){
-				flag4 = true;
-			}
-		}
-		if(!flag4){
 			int courseTimeError = 0;
 			if(classGroupIds == null || classGroupIds.size() > 0){
 				courseTimeError = indexBaseMonthDataDao.getCourseTimeError(organIds,classGroupIds);
@@ -1001,19 +988,35 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		}
 		resultMap.put("attendanceServe",flag4);
 
-		//获取关联的乐团列表
-		List<String> musicGroupIds = musicGroupDao.queryIdsByEduIdAndOrganIds(educationUserId,organIdsStr);
-		if(musicGroupIds.size() > 0){
-			String configValue1 = sysConfigDao.findConfigValue("push_create_payment_calender");
-			date = new Date();
-			String format = DateUtil.format(date, DateUtil.DEFAULT_PATTERN);
-			List<Long> calenderIds = musicGroupPaymentCalenderDao.queryEndIds(configValue1, format,musicGroupIds);
-			if(calenderIds.size() > 0){
-				resultMap.put("remindMatterData",true);
-			}else {
-				resultMap.put("remindMatterData",false);
+		boolean flag5 = false;
+		if(!flag5){
+			String monthStr = DateUtil.format(date, DateUtil.ISO_YEAR_MONTH_FORMAT);
+			int lowTeacherSalary = indexBaseMonthDataDao.queryLowTeacherSalary(organIdsStr,monthStr);
+			if(lowTeacherSalary > 0){
+				flag5 = true;
 			}
 		}
+		if(!flag5){
+			int countNoPaymentStudentNum = indexBaseMonthDataDao.countNoPaymentStudentNum(organIds,educationUserId, 0);
+			if(countNoPaymentStudentNum > 0){
+				flag5 = true;
+			}
+		}
+		if(!flag5){
+			//获取关联的乐团列表
+			List<String> musicGroupIds = musicGroupDao.queryIdsByEduIdAndOrganIds(educationUserId,organIdsStr);
+			if(musicGroupIds.size() > 0){
+				String configValue1 = sysConfigDao.findConfigValue("push_create_payment_calender");
+				date = new Date();
+				String format = DateUtil.format(date, DateUtil.DEFAULT_PATTERN);
+				List<Long> calenderIds = musicGroupPaymentCalenderDao.queryEndIds(configValue1, format,musicGroupIds);
+				if(calenderIds.size() > 0){
+					flag5 = true;
+				}
+			}
+		}
+		resultMap.put("remindMatterData",flag5);
+
 		return resultMap;
 	}
 }

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;
@@ -241,15 +241,16 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
 
-        if (Objects.isNull(queryInfo.getCooperationOrganId())) {
-            throw new BizException("请指定合作单位");
-        }
-
         int count = replacementInstrumentActivityDao.countReplacements(params);
 
         if (queryInfo.getPage() == 1) {
-            ReplacementInstrumentActivityStatHead head = replacementInstrumentActivityDao.countReplacementsInfo(queryInfo.getCooperationOrganId());
-            CooperationOrgan cooperationOrgan = cooperationOrganDao.get(queryInfo.getCooperationOrganId());
+            ReplacementInstrumentActivityStatHead head = replacementInstrumentActivityDao.countReplacementsInfo(queryInfo.getCooperationId());
+            ReplacementInstrumentCooperation cooperation = replacementInstrumentCooperationDao.get(queryInfo.getCooperationId());
+            CooperationOrgan cooperationOrgan = cooperationOrganDao.get(cooperation.getCooperationOrganId());
+            QuestionnaireTopic questionnaireTopic = questionnaireTopicDao.get(cooperation.getTopicId());
+            if(questionnaireTopic != null){
+                head.setTopicName(questionnaireTopic.getTitle());
+            }
             head.setCooperationOrganName(cooperationOrgan.getName());
             pageInfo.setStatInfo(head);
         }

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

@@ -88,10 +88,11 @@ public class ReplacementInstrumentCooperationServiceImpl extends BaseServiceImpl
             List<ReplacementInstrumentCooperation> replacementInstruments = replacementInstrumentCooperationDao.countAllReplacementsInfo();
             for (ReplacementInstrumentCooperation row : pageInfo.getRows()) {
                 for (ReplacementInstrumentCooperation replacementInstrument : replacementInstruments) {
-                    if (!row.getCooperationOrganId().equals(replacementInstrument.getCooperationOrganId())) continue;
+                    if (!row.getId().equals(replacementInstrument.getId())) 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

@@ -217,19 +217,15 @@
 
     <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
-        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 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(DISTINCT IF ( ria.instruments_id_ IS NOT NULL, ria.user_id_, NULL )) / COUNT( DISTINCT ria.user_id_ ) * 100, 2 ) replacementRate,
+               TRUNCATE ( COUNT(DISTINCT 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.replacement_instrument_cooperation_id_ = #{cooperationId}
     </select>
 
     <update id="openPay" parameterType="integer">

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

@@ -99,8 +99,8 @@
     <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(pay_status_ = 2, 1, 0)) payNum
+               SUM(IF(instruments_id_ IS NOT NULL AND instruments_id_ > 0, 1, 0)) replaceNum,
+               SUM(IF(pay_status_ = 2, 1, 0)) payNum,replacement_instrument_cooperation_id_ id
         FROM replacement_instrument_activity
         GROUP BY replacement_instrument_cooperation_id_
     </select>

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
@@ -131,6 +133,24 @@ public class ReplacementInstrumentActivityController extends BaseController {
         return succeed(replacementInstrumentActivity);
     }
 
+//    @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')")
@@ -157,11 +177,6 @@ public class ReplacementInstrumentActivityController extends BaseController {
             throw new BizException("没有可导出的记录");
         }
         for (ReplacementInstrumentActivityStatDto row : pageList.getRows()) {
-            if (row.getQuestionResult().substring(0, 1).equals("1")) {
-                row.setHasYesFirstAnswer("是");
-            } else {
-                row.setHasYesFirstAnswer("否");
-            }
             if(row.getInstrumentsId() == null){
                 row.setHasInstrumentsId("否");
             }else {
@@ -172,8 +187,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");