Merge branch 'dev' of wujunjie/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/entity/survey/QuestionnaireWinning.java

@@ -1,5 +1,6 @@
package com.yihu.wlyy.entity.survey;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
@@ -45,6 +46,7 @@ public class QuestionnaireWinning extends IdEntity {
        this.address = address;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getValidity() {
        return validity;
    }
@@ -125,6 +127,7 @@ public class QuestionnaireWinning extends IdEntity {
        this.del = del;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCreateTime() {
        return createTime;
    }
@@ -133,6 +136,7 @@ public class QuestionnaireWinning extends IdEntity {
        this.createTime = createTime;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getUpdateTime() {
        return updateTime;
    }

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/survey/QuestionnaireService.java

@@ -53,8 +53,22 @@ public class QuestionnaireService extends BaseJpaService {
        if(pageSize <= 0){
            pageSize = 15;
        }
    String sql = "SELECT w.* FROM wlyy_questionnaire_winning w WHERE w.winning = 1 and w.del = 0  " +
            "and w.prize_type = " + type;
    String sql = "SELECT " +
            " w.`code`, " +
            " w.user_code," +
            " CONCAT(LEFT (w.user_idcard,6),'**********',RIGHT (w.user_idcard,2)) user_idcard, " +
            " w.user_name, " +
            " CONCAT(LEFT (w.user_openid,6),'**********',RIGHT (w.user_openid,2)) user_openid, " +
            " w.prize_type, " +
            " w.prize_code, "+
            " w.winning, " +
            " w.del, " +
            " w.create_time, " +
            " w.update_time, " +
            " w.validity, " +
            " w.address " +
            " FROM wlyy_questionnaire_winning w WHERE w.winning = 1 and w.del = 0  " +
            " and w.prize_type = " + type;
        if (StringUtils.isNotEmpty(name) && StringUtils.isNotEmpty(idCard)){
            sql += " and w.user_name = '" + name + "' and w.user_idcard = " + idCard;
        }else if (StringUtils.isEmpty(name) && StringUtils.isNotEmpty(idCard)){

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/questionnaire/prize/prize_list_js.jsp

@@ -66,9 +66,9 @@
						ajaxHeaderValue: ajaxHeaderValue,
						columns: [
							{display: 'ID', name: 'id', hide: true},
							{display: '姓名', name: 'userName', width: '10%', align: "center"},
							{display: '姓名', name: 'userName', width: '8%', align: "center"},
							{display: '身份证号', name: 'userIdcard', width: '15%', align: "center"},
							{display: '微信标识', name: 'userOpenid', width: '20%', align: "center"},
							{display: '微信标识', name: 'userOpenid', width: '15%', align: "center"},
                            {
                                display: '奖品类型', name: 'prizeType', width: '10%', align: "center",
                                render: function (item) {
@@ -76,9 +76,9 @@
                                    return '其他';
                                }
                            },
							{display: '兑奖码', name: 'prizeCode', width: '15%', align: "center"},
							{display: '有效期', name: 'validity', width: '10%', align: "center"},
							{display: '领取地址', name: 'address', width: '20%', align: "left"},
							{display: '兑奖码', name: 'prizeCode', width: '20%', align: "center"},
							{display: '有效期', name: 'validity', width: '15%', align: "center"},
							{display: '领取地址', name: 'address', width: '22%', align: "left"},
						],
					}));