Merge branch 'online1' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ReplacementInstrumentActivity.java

@@ -18,9 +18,10 @@ public class ReplacementInstrumentActivity {
 	/** 合作单位置换活动表编号 */
 	private Integer replacementInstrumentCooperationId;
 
-	private Integer topicId;
+	/** 活动标题 */
+	private String replacementInstrumentCooperationTitle;
 
-	private String topicName;
+	private Integer topicId;
 
 	/** 合作单位 */
 	private String cooperationOrganName;
@@ -72,12 +73,12 @@ public class ReplacementInstrumentActivity {
 	/**  */
 	private java.util.Date updateTime;
 
-	public String getTopicName() {
-		return topicName;
+	public String getReplacementInstrumentCooperationTitle() {
+		return replacementInstrumentCooperationTitle;
 	}
 
-	public void setTopicName(String topicName) {
-		this.topicName = topicName;
+	public void setReplacementInstrumentCooperationTitle(String replacementInstrumentCooperationTitle) {
+		this.replacementInstrumentCooperationTitle = replacementInstrumentCooperationTitle;
 	}
 
 	public Integer getReplacementInstrumentCooperationId() {

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ReplacementInstrumentCooperation.java

@@ -24,6 +24,9 @@ public class ReplacementInstrumentCooperation {
     @ApiModelProperty(value = "合作单位id")
     private Integer cooperationOrganId;
 
+    @ApiModelProperty(value = "活动标题")
+    private String title;
+
     @ApiModelProperty(value = "问卷编号")
     private Integer topicId;
 
@@ -76,6 +79,14 @@ public class ReplacementInstrumentCooperation {
     @ApiModelProperty(value = "缴费率")
     private BigDecimal payScale = BigDecimal.ZERO;
 
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
     public String getTopicTitle() {
         return topicTitle;
     }

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

@@ -603,11 +603,7 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
             replacementInstrumentActivity.setTopicId(cooperation.getTopicId());
             replacementInstrumentActivity.setReplacementInstrumentCooperationId(cooperationId);
         }
-        QuestionnaireTopic topic = questionnaireTopicDao.get(cooperation.getTopicId());
-        if(topic != null){
-            replacementInstrumentActivity.setTopicName(topic.getTitle());
-        }
-
+        replacementInstrumentActivity.setReplacementInstrumentCooperationTitle(cooperation.getTitle());
         replacementInstrumentActivity.setMobileNo(user.getPhone());
         CooperationOrgan cooperationOrgan = cooperationOrganService.get(cooperationOrganId);
         if (cooperationOrgan != null) {

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

@@ -2,8 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ym.mec.biz.dal.dao.ReplacementInstrumentCooperationDao">
     <resultMap id="ReplacementInstrumentCooperation" type="com.ym.mec.biz.dal.entity.ReplacementInstrumentCooperation">
-        <!--@mbg.generated-->
-        <!--@Table replacement_instrument_cooperation-->
         <result column="id_" property="id"/>
         <result column="organ_id_" property="organId"/>
         <result column="cooperation_organ_id_" property="cooperationOrganId"/>
@@ -13,6 +11,7 @@
         <result column="show_question_" property="showQuestion" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="organName" property="organName"/>
         <result column="cooperationOrganName" property="cooperationOrganName"/>
+        <result column="title_" property="title"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
     </resultMap>
@@ -27,11 +26,11 @@
             useGeneratedKeys="true" keyColumn="id" keyProperty="id">
         <!--@mbg.generated-->
         insert into replacement_instrument_cooperation (organ_id_, cooperation_organ_id_, open_pay_,show_question_,topic_id_, create_time_,
-        update_time_
+        update_time_,title_
         )
         values (#{organId}, #{cooperationOrganId},
         #{openPay,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{showQuestion,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{topicId}, #{createTime}, #{updateTime}
+        #{topicId}, NOW(), NOW(),#{title}
         )
     </insert>
 
@@ -43,6 +42,9 @@
         <!--@mbg.generated-->
         update replacement_instrument_cooperation
         <set>
+            <if test="title != null">
+                title_ = #{title},
+            </if>
             <if test="topicId != null">
                 topic_id_ = #{topicId},
             </if>
@@ -84,7 +86,7 @@
                 AND ric.show_question_ = #{showQuestion,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
             <if test="search != null and search != ''">
-                AND (ric.cooperation_organ_id_ = #{search} OR co.name_ LIKE CONCAT('%',#{search},'%'))
+                AND (ric.cooperation_organ_id_ = #{search} OR co.name_ LIKE CONCAT('%',#{search},'%') OR ric.title_ LIKE CONCAT('%',#{search},'%'))
             </if>
         </where>
     </sql>

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

@@ -4,7 +4,6 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.ReplacementInstrumentActivityStatDto;
-import com.ym.mec.biz.dal.dto.StudentInstrumentExportDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
@@ -22,19 +21,16 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @RequestMapping("replacementInstrumentActivity")
 @Api(tags = "乐器置换-调查问卷服务")
@@ -52,10 +48,6 @@ public class ReplacementInstrumentActivityController extends BaseController {
     @Autowired
     private ReplacementInstrumentCooperationService replacementInstrumentCooperationService;
     @Autowired
-    private QuestionnaireQuestionDao questionnaireQuestionDao;
-    @Autowired
-    private QuestionnaireUserResultService questionnaireUserResultService;
-    @Autowired
     private SysConfigDao sysConfigDao;
     @Autowired
     private SysMessageService sysMessageService;