Merge branch 'zx_saas_0303' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -45,5 +45,5 @@ public interface QuestionnaireUserResultDao extends BaseDAO<Long, QuestionnaireU
 
     int countResultCount(Map<String, Object> params);
 
-    List<QuestionnaireUserResultDto> queryUserResult(@Param("topicId") Integer topicId, @Param("userId") Integer userId);
+    QuestionnaireUserResultDto queryUserResult(@Param("topicId") Integer topicId, @Param("userId") Integer userId);
 }

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

@@ -2,10 +2,7 @@ package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import javax.validation.constraints.*;
 import java.io.Serializable;
 
 /**
@@ -20,7 +17,7 @@ public class TenantPreJoinDto implements Serializable {
     @ApiModelProperty(value = "公司全称")
     private String tsignName;
 
-    @NotBlank(message = "推荐人不能为空")
+    @NotNull(message = "推荐人不能为空")
     @ApiModelProperty(value = "推荐人")
     private Integer recommender;
 

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

@@ -46,6 +46,16 @@ public class QuestionnaireTopic extends BaseEntity {
 
 	private Integer templateType;
 
+	private Boolean modifyFlag = true;
+
+	public Boolean getModifyFlag() {
+		return modifyFlag;
+	}
+
+	public void setModifyFlag(Boolean modifyFlag) {
+		this.modifyFlag = modifyFlag;
+	}
+
 	public Integer getTemplateType() {
 		return templateType;
 	}

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -22,6 +23,10 @@ public class TenantPreJoin implements Serializable {
     @ApiModelProperty(value = "主键")
     private Integer id;
 
+    @TableField("recommender_")
+    @ApiModelProperty(value = "推荐人")
+    private Integer recommender;
+
     @TableField("tsign_name_")
     @ApiModelProperty(value = "公司全称")
     private String tsignName;
@@ -122,6 +127,14 @@ public class TenantPreJoin implements Serializable {
     @ApiModelProperty(value = "省份名称")
     private String provinceName;
 
+    public Integer getRecommender() {
+        return recommender;
+    }
+
+    public void setRecommender(Integer recommender) {
+        this.recommender = recommender;
+    }
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {

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

@@ -47,5 +47,5 @@ public interface QuestionnaireUserResultService extends BaseService<Long, Questi
 
     String[] getExportHeader(QuestionnaireTopic topic, List<QuestionnaireQuestion> questionList);
 
-    List<QuestionnaireUserResultDto> queryUserResult(Integer topicId);
+    QuestionnaireUserResultDto queryUserResult(Integer topicId);
 }

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

@@ -129,6 +129,11 @@ public class QuestionnaireTopicServiceImpl extends BaseServiceImpl<Integer, Ques
 		if(questionnaireTopic == null){
 			throw new BizException("问卷[{}]模板查询失败", topicId);
 		}
+		//调查问卷是否有用户参与
+		int num = questionnaireUserResultDao.countByTopicId(topicId);
+		if(num > 0){
+			questionnaireTopic.setModifyFlag(false);
+		}
 		Map<String,Object> paramMap = new HashMap(1);
 		paramMap.put("topicId",topicId);
 		paramMap.put("tenantId",questionnaireTopic.getTenantId());

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

@@ -173,16 +173,14 @@ public class QuestionnaireUserResultServiceImpl extends BaseServiceImpl<Long, Qu
 				throw new BizException("请填写问卷结果");
 			}
 			QuestionnaireActiveTypeEnum activeType = replacementInstrumentActivity.getActiveType();
-			if(topic.getAgainCommitFlag() == 0){
-				HashMap<String, Object> paramMap = new HashMap<>(4);
-				paramMap.put("activeId",replacementInstrumentActivity.getReplacementInstrumentCooperationId());
-				paramMap.put("activeType",activeType);
-				paramMap.put("userId",sysUser.getId());
-				paramMap.put("topicId",topicId);
-				List<QuestionnaireUserResult> userResults = questionnaireUserResultDao.findAll(paramMap);
-				if(userResults != null && userResults.size() > 0){
-					throw new BizException("您已提交问卷，请勿重复操作");
-				}
+			HashMap<String, Object> paramMap = new HashMap<>(4);
+			paramMap.put("activeId",replacementInstrumentActivity.getReplacementInstrumentCooperationId());
+			paramMap.put("activeType",activeType);
+			paramMap.put("userId",sysUser.getId());
+			paramMap.put("topicId",topicId);
+			List<QuestionnaireUserResult> userResults = questionnaireUserResultDao.findAll(paramMap);
+			if(userResults != null && userResults.size() > 0){
+				throw new BizException("您已提交问卷，请勿重复操作");
 			}
 			//删除原来的问卷结果
 			questionnaireUserResultDao.delByActiveIdAndUserId(null, sysUser.getId(),activeType);
@@ -238,7 +236,7 @@ public class QuestionnaireUserResultServiceImpl extends BaseServiceImpl<Long, Qu
 	}
 
 	@Override
-	public List<QuestionnaireUserResultDto> queryUserResult(Integer topicId) {
+	public QuestionnaireUserResultDto queryUserResult(Integer topicId) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		return questionnaireUserResultDao.queryUserResult(topicId,sysUser.getId());
 	}

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

@@ -116,14 +116,15 @@
 
     <!-- 分页查询 -->
 	<select id="findResultCount" resultMap="QuestionnaireUserResultDto" parameterType="map">
-		SELECT qu1.*,qq.content_,GROUP_CONCAT(qqi.answer_value_ ORDER BY qqi.sort_) answer_value_,qq.type_
-		FROM (SELECT qu.user_id_ id_ FROM questionnaire_user_result qu
+		SELECT qu1.*,qq.content_,GROUP_CONCAT(qqi.answer_value_ ORDER BY qqi.sort_) answer_value_,qq.type_,qur.username_,qur.phone_
+		FROM (SELECT qu.user_id_,su.username_,su.phone_ FROM questionnaire_user_result qu
+		LEFT JOIN sys_user su ON su.id_ = qu.user_id_
 		WHERE qu.questionnaire_topic_id_ = #{topicId}
 		<if test="search != null and search != ''">
 			AND (qu.user_id_ = #{search} OR qu.additional_value_ LIKE CONCAT('%',#{search},'%'))
 		</if>
 		GROUP BY qu.user_id_ <include refid="global.limit"/>) qur
-		LEFT JOIN questionnaire_user_result qu1 ON qur.id_ = qu1.user_id_
+		LEFT JOIN questionnaire_user_result qu1 ON qur.user_id_ = qu1.user_id_
 		LEFT JOIN questionnaire_question qq ON qq.id_ = qu1.questionnaire_question_id_
 		LEFT JOIN questionnaire_question_item qqi ON FIND_IN_SET(qqi.id_,qu1.questionnaire_question_item_id_list_)
 		WHERE qu1.questionnaire_topic_id_ = #{topicId}
@@ -220,7 +221,7 @@
 	</select>
 
 	<select id="queryUserResult" resultMap="QuestionnaireUserResultDto">
-		SELECT qu1.*, qur.username_, qur.phone_, qq.content_,GROUP_CONCAT( qqi.answer_value_ ORDER BY qqi.sort_ ) answer_value_
+		SELECT qu1.*, qur.username_, qur.phone_, qq.content_,GROUP_CONCAT( qqi.answer_value_ ORDER BY qqi.sort_ ) answer_value_,qq.type_
 		FROM (SELECT qu.user_id_,su.username_,su.phone_
 		FROM questionnaire_user_result qu
 		LEFT JOIN sys_user su ON su.id_ = qu.user_id_