回访问卷代码提交

common/common-entity/src/main/java/com/yihu/wlyy/entity/questionnaire/QuestionnairePrize.java

@@ -32,8 +32,8 @@ public class QuestionnairePrize extends IdEntity implements Serializable {
	private Integer used;
	//0为有效，1为删除
	private Integer del;
	private Date create_time;
	private Date update_time;
	private Date createTime;
	private Date updateTime;
	
	public String getCode() {
		return code;
@@ -90,20 +90,20 @@ public class QuestionnairePrize extends IdEntity implements Serializable {
	public void setDel(Integer del) {
		this.del = del;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCreate_time() {
		return create_time;
	
	public Date getCreateTime() {
		return createTime;
	}
	
	public void setCreate_time(Date create_time) {
		this.create_time = create_time;
	public void setCreateTime(Date createTime) {
		this.createTime = createTime;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getUpdate_time() {
		return update_time;
	
	public Date getUpdateTime() {
		return updateTime;
	}
	
	public void setUpdate_time(Date update_time) {
		this.update_time = update_time;
	public void setUpdateTime(Date updateTime) {
		this.updateTime = updateTime;
	}
}

common/common-entity/src/main/java/com/yihu/wlyy/entity/questionnaire/QuestionnaireWinning.java

@@ -35,10 +35,14 @@ public class QuestionnaireWinning extends IdEntity implements Serializable {
	private Integer winning;
	//奖品兑奖码
	private String prizeCode;
	//兑奖地址
	private String address;
	//奖品有效期
	private Date validity;
	private Date createTime;
	private Date updateTime;
	//0为未删除，1为删除
	private Integer del;
	private Date create_time;
	private Date update_time;
	
	public String getCode() {
		return code;
@@ -104,21 +108,43 @@ public class QuestionnaireWinning extends IdEntity implements Serializable {
		this.del = del;
	}
	
	public Integer getWinning() {
		return winning;
	}
	
	public void setWinning(Integer winning) {
		this.winning = winning;
	}
	
	public String getAddress() {
		return address;
	}
	
	public void setAddress(String address) {
		this.address = address;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCreate_time() {
		return create_time;
	public Date getValidity() {
		return validity;
	}
	
	public void setCreate_time(Date create_time) {
		this.create_time = create_time;
	public void setValidity(Date validity) {
		this.validity = validity;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCreateTime() {
		return createTime;
	}
	
	public void setCreateTime(Date createTime) {
		this.createTime = createTime;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getUpdate_time() {
		return update_time;
	public Date getUpdateTime() {
		return updateTime;
	}
	
	public void setUpdate_time(Date update_time) {
		this.update_time = update_time;
	public void setUpdateTime(Date updateTime) {
		this.updateTime = updateTime;
	}
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/questionnaire/QuestionnaireService.java

@@ -51,10 +51,10 @@ public class QuestionnaireService extends BaseService {
	 * @return
	 * @throws Exception
	 */
	public QuestionnaireWinningESDO getQuestionnaireWinningESDOByIdcardAndOpenid(String idcard,String openid) throws Exception{
	public List<QuestionnaireWinningESDO> getQuestionnaireWinningESDOByIdcardAndOpenid(String idcard,String openid) throws Exception{
		//中奖纪录
		String sql = "SELECT * FROM " + esType + "  where del = 0 and ( userIdcard= '" + idcard + "' or userOpenid = '"+openid+"' ) ";
		QuestionnaireWinningESDO result = (QuestionnaireWinningESDO)elasticsearchUtil.excuteOneObject(sql, HealthEduArticleES.class, esIndex, esType);
		List<QuestionnaireWinningESDO> result = elasticsearchUtil.excute(sql, QuestionnaireWinningESDO.class, esIndex, esType);
		return result;
	}
	
@@ -64,7 +64,7 @@ public class QuestionnaireService extends BaseService {
	 * @return
	 * @throws Exception
	 */
	public QuestionnaireWinningESDO questionnaireLottery(QuestionnaireUsers questionnaireUsers)throws Exception{
	public List<QuestionnaireWinningESDO> questionnaireLottery(QuestionnaireUsers questionnaireUsers)throws Exception{
		
		if(StringUtils.isBlank(questionnaireUsers.getIdcard()) || !"undefined".equals(questionnaireUsers.getIdcard())){
			throw new Exception("身份证号为空或者异常："+questionnaireUsers.getIdcard());
@@ -92,9 +92,9 @@ public class QuestionnaireService extends BaseService {
			questionnaireWinning.setUserIdcard(questionnaireUsers.getIdcard());
			questionnaireWinning.setUserName(questionnaireUsers.getName());
			questionnaireWinning.setUserOpenid(questionnaireUsers.getOpenid());
			questionnaireWinning.setCreate_time(new Date());
			questionnaireWinning.setUpdate_time(new Date());
			questionnaireWinning.setCreateTime(new Date());
			questionnaireWinning.setUpdateTime(new Date());
			
			if("YES".equals(lotteryItem.getAwardName())){
				List<QuestionnaireWinning> winningList = questionnaireWinningDao.findByUserIdcardAndUserOpenid(questionnaireUsers.getIdcard(),questionnaireUsers.getOpenid());
				if(winningList.isEmpty()){