导出bug修改

gic-evaluate-api/src/main/java/com/gic/evaluate/dto/ProblemReplyDTO.java

@@ -48,6 +48,10 @@ public class ProblemReplyDTO implements Serializable {
     private String memberName;
 
     /**
+     * 会员头像
+     */
+    private String memberImgUrl;
+    /**
      * 管理员id
      */
     private Integer userId;
@@ -179,4 +183,12 @@ public class ProblemReplyDTO implements Serializable {
     public List<String> getImgList() {
         return imgList;
     }
+
+    public String getMemberImgUrl() {
+        return memberImgUrl;
+    }
+
+    public void setMemberImgUrl(String memberImgUrl) {
+        this.memberImgUrl = memberImgUrl;
+    }
 }

gic-evaluate-service/src/main/java/com/gic/evaluate/entity/TabProblemReply.java

@@ -44,6 +44,11 @@ public class TabProblemReply {
     /**
      * 
      */
+    private String memberImgUrl;
+
+    /**
+     * 
+     */
     private Integer userId;
 
     /**
@@ -122,6 +127,14 @@ public class TabProblemReply {
         this.memberName = memberName;
     }
 
+    public String getMemberImgUrl() {
+        return memberImgUrl;
+    }
+
+    public void setMemberImgUrl(String memberImgUrl) {
+        this.memberImgUrl = memberImgUrl;
+    }
+
     public Integer getUserId() {
         return userId;
     }

gic-evaluate-service/src/main/resources/mapper/TabEvaluateMapper.xml

@@ -57,7 +57,7 @@
           #{item}
         </foreach>
       </if>
-      <if test="null != evaluateIds and evaluateIds.size > 0">
+      <if test="null != evaluateIds and evaluateIds.length > 0">
         and evaluate_id in
         <foreach collection="evaluateIds" index="index" item="item" open="(" separator="," close=")">
           #{item}

gic-evaluate-service/src/main/resources/mapper/TabProblemMapper.xml

@@ -241,7 +241,7 @@
     <include refid="Base_Column_List" />
     from tab_problem
     <where>
-      <if test="null != problemIds and problemIds.size &gt; 0">
+      <if test="null != problemIds and problemIds.length &gt; 0">
         and problem_id in
         <foreach close=")" collection="problemIds" index="index" item="item" open="(" separator=",">
           #{item}
@@ -285,7 +285,7 @@
           #{item}
         </foreach>
       </if>
-      <if test="null != problemIds and problemIds.size &gt; 0">
+      <if test="null != problemIds and problemIds.length &gt; 0">
         and problem_id in
         <foreach close=")" collection="problemIds" index="index" item="item" open="(" separator=",">
           #{item}

gic-evaluate-service/src/main/resources/mapper/TabProblemReplyMapper.xml

@@ -7,8 +7,9 @@
     <result column="problem_id" jdbcType="INTEGER" property="problemId" />
     <result column="replyer_type" jdbcType="INTEGER" property="replyerType" />
     <result column="reply_content" jdbcType="VARCHAR" property="replyContent" />
-    <result column="member_id" jdbcType="INTEGER" property="memberId" />
+    <result column="member_id" jdbcType="BIGINT" property="memberId" />
     <result column="member_name" jdbcType="VARCHAR" property="memberName" />
+    <result column="member_img_url" jdbcType="VARCHAR" property="memberImgUrl" />
     <result column="user_id" jdbcType="INTEGER" property="userId" />
     <result column="user_name" jdbcType="VARCHAR" property="userName" />
     <result column="status" jdbcType="INTEGER" property="status" />
@@ -17,7 +18,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     problem_reply_id, enterprise_id, problem_id, replyer_type, reply_content, member_id, 
-    member_name, user_id, user_name, status, create_time, update_time
+    member_name, member_img_url, user_id, user_name, status, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -32,19 +33,16 @@
   <insert id="insert" parameterType="com.gic.evaluate.entity.TabProblemReply">
     insert into tab_problem_reply (problem_reply_id, enterprise_id, problem_id, 
       replyer_type, reply_content, member_id, 
-      member_name, user_id, user_name, 
-      status, create_time, update_time
-      )
+      member_name, member_img_url, user_id, 
+      user_name, status, create_time, 
+      update_time)
     values (#{problemReplyId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{problemId,jdbcType=INTEGER}, 
-      #{replyerType,jdbcType=INTEGER}, #{replyContent,jdbcType=VARCHAR}, #{memberId,jdbcType=INTEGER}, 
-      #{memberName,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, 
-      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+      #{replyerType,jdbcType=INTEGER}, #{replyContent,jdbcType=VARCHAR}, #{memberId,jdbcType=BIGINT}, 
+      #{memberName,jdbcType=VARCHAR}, #{memberImgUrl,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER}, 
+      #{userName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.evaluate.entity.TabProblemReply">
-    <selectKey keyProperty="problemReplyId" order="AFTER" resultType="java.lang.Integer">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
     insert into tab_problem_reply
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="problemReplyId != null">
@@ -68,6 +66,9 @@
       <if test="memberName != null">
         member_name,
       </if>
+      <if test="memberImgUrl != null">
+        member_img_url,
+      </if>
       <if test="userId != null">
         user_id,
       </if>
@@ -101,11 +102,14 @@
         #{replyContent,jdbcType=VARCHAR},
       </if>
       <if test="memberId != null">
-        #{memberId,jdbcType=INTEGER},
+        #{memberId,jdbcType=BIGINT},
       </if>
       <if test="memberName != null">
         #{memberName,jdbcType=VARCHAR},
       </if>
+      <if test="memberImgUrl != null">
+        #{memberImgUrl,jdbcType=VARCHAR},
+      </if>
       <if test="userId != null">
         #{userId,jdbcType=INTEGER},
       </if>
@@ -139,11 +143,14 @@
         reply_content = #{replyContent,jdbcType=VARCHAR},
       </if>
       <if test="memberId != null">
-        member_id = #{memberId,jdbcType=INTEGER},
+        member_id = #{memberId,jdbcType=BIGINT},
       </if>
       <if test="memberName != null">
         member_name = #{memberName,jdbcType=VARCHAR},
       </if>
+      <if test="memberImgUrl != null">
+        member_img_url = #{memberImgUrl,jdbcType=VARCHAR},
+      </if>
       <if test="userId != null">
         user_id = #{userId,jdbcType=INTEGER},
       </if>
@@ -168,8 +175,9 @@
       problem_id = #{problemId,jdbcType=INTEGER},
       replyer_type = #{replyerType,jdbcType=INTEGER},
       reply_content = #{replyContent,jdbcType=VARCHAR},
-      member_id = #{memberId,jdbcType=INTEGER},
+      member_id = #{memberId,jdbcType=BIGINT},
       member_name = #{memberName,jdbcType=VARCHAR},
+      member_img_url = #{memberImgUrl,jdbcType=VARCHAR},
       user_id = #{userId,jdbcType=INTEGER},
       user_name = #{userName,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
@@ -195,9 +203,9 @@
     WHERE
         replyer_type = 2
         and status = 1
-        <if test="null != ids and ids.size > 0">
+        <if test="null != ids and ids.size &gt; 0">
           and problem_id in
-          <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+          <foreach close=")" collection="ids" index="index" item="item" open="(" separator=",">
             #{item}
           </foreach>
         </if>

gic-evaluate-web/pom.xml

@@ -134,11 +134,6 @@
             <artifactId>gic-evaluate-api</artifactId>
             <version>${gic-evaluate-api}</version>
         </dependency>
-        <dependency>
-            <groupId>com.gic</groupId>
-            <artifactId>gic-store-api</artifactId>
-            <version>${gic-store-api}</version>
-        </dependency>
     </dependencies>
 
     <build>