[task-4097]【接口】新增满意度调查白名单接口

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/persistence/entity/SatisfactionDetailTbl.java

@@ -38,8 +38,58 @@ public class SatisfactionDetailTbl extends AbstractPo<String>{
 	protected String  bianZhiShiJian; 		/*编制时间*/
 	@ApiModelProperty(value = "快照")
 	protected String  kuaiZhao; 		/*快照*/
+	@ApiModelProperty(value = "题目id")
+	protected String  tiMuId; 		/*题目id*/
+	@ApiModelProperty(value = "题型")
+	protected String  tiXing; 		/*题型*/
+	@ApiModelProperty(value = "题干")
+	protected String  tiGan; 		/*题干*/
+	@ApiModelProperty(value = "选项")
+	protected String  xuanXiang; 		/*选项*/
+	@ApiModelProperty(value = "答案")
+	protected String  daAn; 		/*答案*/
 
-	public void setId(String id) 
+	public String getTiMuId() {
+		return tiMuId;
+	}
+
+	public void setTiMuId(String tiMuId) {
+		this.tiMuId = tiMuId;
+	}
+
+	public String getTiXing() {
+		return tiXing;
+	}
+
+	public void setTiXing(String tiXing) {
+		this.tiXing = tiXing;
+	}
+
+	public String getTiGan() {
+		return tiGan;
+	}
+
+	public void setTiGan(String tiGan) {
+		this.tiGan = tiGan;
+	}
+
+	public String getXuanXiang() {
+		return xuanXiang;
+	}
+
+	public void setXuanXiang(String xuanXiang) {
+		this.xuanXiang = xuanXiang;
+	}
+
+	public String getDaAn() {
+		return daAn;
+	}
+
+	public void setDaAn(String daAn) {
+		this.daAn = daAn;
+	}
+
+	public void setId(String id)
 	{
 		this.id = id;
 	}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/employee/provider/SatisfactionProvider.java

@@ -72,18 +72,13 @@ public class SatisfactionProvider extends GenericProvider implements ISatisfacti
 	public APIResult<List<Map<String,Object>>> getQuestionnaireByQrCodeId(String qrCodeId) {
 		APIResult<List<Map<String,Object>>> result = new APIResult<>();
 		try {
-			String sql = "SELECT \n" +
-					"  d.id_ wj_id, d.ti_xing_, d.ti_gan_, d.xuan_xiang_, d.bei_zhu_, d.pai_xu_, d.shi_fou_bi_tian_,\n" +
-					"  c.id_ wj_pid, c.wen_juan_ming_che wj_name, \n" +
-					"  a.id_ dc_id, a.diao_cha_ming_che dc_name, a.shi_fou_guo_shen_, a.diao_cha_dui_xian,\n" +
-					"  q.id_ qr_id \n" +
-					"FROM \n" +
-					"  t_qrcodeb q\n" +
-					"  INNER JOIN t_myddctjb a ON q.guan_lian_id_ = a.id_\n" +
-					"  INNER JOIN t_myddctjbzb b ON a.id_ = b.parent_id_\n" +
-					"  INNER JOIN t_myddcwjb c ON b.zi_wen_juan_id_ = c.id_\n" +
-					"  INNER JOIN t_myddcwjtmb d ON c.id_ = d.parent_id_\n" +
-					"WHERE q.id_ = '%s'";
+			String sql = "SELECT d.id_ wj_id, d.ti_xing_, d.ti_gan_, d.xuan_xiang_, d.bei_zhu_, d.pai_xu_, d.shi_fou_bi_tian_," +
+					"  c.id_ wj_pid, c.wen_juan_ming_che wj_name,a.id_ dc_id, a.diao_cha_ming_che dc_name, a.shi_fou_guo_shen_, " +
+					"  a.diao_cha_dui_xian,b.zi_diao_cha_dui_x,q.id_ qr_id,c.wen_hou_yu_,c.id_ tm_id FROM t_qrcodeb q " +
+					"  INNER JOIN t_myddctjb a ON q.guan_lian_id_ = a.id_ " +
+					"  INNER JOIN t_myddctjbzb b ON a.id_ = b.parent_id_ " +
+					"  INNER JOIN t_myddcwjb c ON b.zi_wen_juan_id_ = c.id_ " +
+					"  INNER JOIN t_myddcwjtmb d ON c.id_ = d.parent_id_ WHERE q.id_ = '%s'";
 			sql = String.format(sql, qrCodeId);
 			List<Map<String,Object>> list = commonDao.query(sql);
 			result.setData(list);

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/employee/persistence/mapping/SatisfactionDetail.map.xml

@@ -17,17 +17,26 @@
 		<result property="bianZhiBuMen" column="BIAN_ZHI_BU_MEN_" jdbcType="VARCHAR"/>
 		<result property="bianZhiShiJian" column="BIAN_ZHI_SHI_JIAN" jdbcType="VARCHAR"/>
 		<result property="kuaiZhao" column="KUAI_ZHAO_" jdbcType="VARCHAR"/>
+		<result property="tiMuId" column="TI_MU_ID_" jdbcType="VARCHAR"/>
+		<result property="tiXing" column="TI_XING_" jdbcType="VARCHAR"/>
+		<result property="tiGan" column="TI_GAN_" jdbcType="BLOB"/>
+		<result property="xuanXiang" column="XUAN_XIANG_" jdbcType="BLOB"/>
+		<result property="daAn" column="DA_AN_" jdbcType="BLOB"/>
 	</resultMap>
 	
 	<sql id="columns">
-		ID_,PARENT_ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,DI_DIAN_,BIAN_ZHI_REN_,BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,KUAI_ZHAO_
+		ID_,PARENT_ID_,TENANT_ID_,IP_,CREATE_BY_,CREATE_TIME_,UPDATE_BY_,UPDATE_TIME_,SHI_FOU_GUO_SHEN_,DI_DIAN_,BIAN_ZHI_REN_,
+		BIAN_ZHI_BU_MEN_,BIAN_ZHI_SHI_JIAN,KUAI_ZHAO_,TI_MU_ID_,TI_XING_,TI_GAN_,XUAN_XIANG_,DA_AN_
 	</sql>
 	
 	<insert id="create" parameterType="com.lc.ibps.components.employee.persistence.entity.SatisfactionDetailPo">
 		INSERT INTO T_MYDDCJLXQ
 		(<include refid="columns"/>)
 		VALUES 
-		(#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR})
+		(#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},
+		#{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR},
+		#{diDian,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR},
+		#{kuaiZhao,jdbcType=VARCHAR},#{tiMuId,jdbcType=VARCHAR}, #{tiXing,jdbcType=VARCHAR}, #{tiGan,jdbcType=BLOB}, #{xuanXiang,jdbcType=BLOB},#{daAn,jdbcType=BLOB})
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="SatisfactionDetailPo">
@@ -81,7 +90,12 @@
 		BIAN_ZHI_REN_=#{bianZhiRen,jdbcType=VARCHAR},
 		BIAN_ZHI_BU_MEN_=#{bianZhiBuMen,jdbcType=VARCHAR},
 		BIAN_ZHI_SHI_JIAN=#{bianZhiShiJian,jdbcType=VARCHAR},
-		KUAI_ZHAO_=#{kuaiZhao,jdbcType=VARCHAR}
+		KUAI_ZHAO_=#{kuaiZhao,jdbcType=VARCHAR},
+		TI_MU_ID_=#{tiMuId,jdbcType=VARCHAR},
+		TI_XING_=#{tiXing,jdbcType=VARCHAR},
+		TI_GAN_=#{tiGan,jdbcType=BLOB},
+		XUAN_XIANG_=#{xuanXiang,jdbcType=BLOB},
+		DA_AN_=#{daAn,jdbcType=BLOB}
 		WHERE
 		ID_=#{id}
 	</update>