修改超管学习测评一个Excel导入多个模块题目

src/main/java/com/sztzjy/digital_credit/entity/AdminExcelErrorMessage.java

@@ -1,24 +1,42 @@
 package com.sztzjy.digital_credit.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+/**
+ *
+ * @author whb
+ * admin_excel_error_message
+ */
 public class AdminExcelErrorMessage {
+    @ApiModelProperty("id")
     private Integer id;
 
+    @ApiModelProperty("题目")
     private String topicName;
 
+    @ApiModelProperty("题目类型")
     private String topicType;
 
+    @ApiModelProperty("题目ID")
     private String topicId;
 
+    @ApiModelProperty("状态")
     private String state;
 
+    @ApiModelProperty("错误信息")
     private String resultMsg;
 
+    @ApiModelProperty("归属模块")
     private String module;
 
+    @ApiModelProperty("用户ID")
     private String userid;
 
+    @ApiModelProperty("提交状态")
     private Integer submissionState;
 
+    @ApiModelProperty("所属模块")
+    private String ascription;
+
     public Integer getId() {
         return id;
     }
@@ -90,4 +108,12 @@ public class AdminExcelErrorMessage {
     public void setSubmissionState(Integer submissionState) {
         this.submissionState = submissionState;
     }
+
+    public String getAscription() {
+        return ascription;
+    }
+
+    public void setAscription(String ascription) {
+        this.ascription = ascription == null ? null : ascription.trim();
+    }
 }

src/main/java/com/sztzjy/digital_credit/entity/AdminExcelErrorMessageExample.java

@@ -713,6 +713,76 @@ public class AdminExcelErrorMessageExample {
             addCriterion("submission_state not between", value1, value2, "submissionState");
             return (Criteria) this;
         }
+
+        public Criteria andAscriptionIsNull() {
+            addCriterion("ascription is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAscriptionIsNotNull() {
+            addCriterion("ascription is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAscriptionEqualTo(String value) {
+            addCriterion("ascription =", value, "ascription");
+            return (Criteria) this;
+        }
+
+        public Criteria andAscriptionNotEqualTo(String value) {
+            addCriterion("ascription <>", value, "ascription");
+            return (Criteria) this;
+        }
+
+        public Criteria andAscriptionGreaterThan(String value) {
+            addCriterion("ascription >", value, "ascription");
+            return (Criteria) this;
+        }
+
+        public Criteria andAscriptionGreaterThanOrEqualTo(String value) {
+            addCriterion("ascription >=", value, "ascription");
+            return (Criteria) this;
+        }
+
+        public Criteria andAscriptionLessThan(String value) {
+            addCriterion("ascription <", value, "ascription");
+            return (Criteria) this;
+        }
+
+        public Criteria andAscriptionLessThanOrEqualTo(String value) {
+            addCriterion("ascription <=", value, "ascription");
+            return (Criteria) this;
+        }
+
+        public Criteria andAscriptionLike(String value) {
+            addCriterion("ascription like", value, "ascription");
+            return (Criteria) this;
+        }
+
+        public Criteria andAscriptionNotLike(String value) {
+            addCriterion("ascription not like", value, "ascription");
+            return (Criteria) this;
+        }
+
+        public Criteria andAscriptionIn(List<String> values) {
+            addCriterion("ascription in", values, "ascription");
+            return (Criteria) this;
+        }
+
+        public Criteria andAscriptionNotIn(List<String> values) {
+            addCriterion("ascription not in", values, "ascription");
+            return (Criteria) this;
+        }
+
+        public Criteria andAscriptionBetween(String value1, String value2) {
+            addCriterion("ascription between", value1, value2, "ascription");
+            return (Criteria) this;
+        }
+
+        public Criteria andAscriptionNotBetween(String value1, String value2) {
+            addCriterion("ascription not between", value1, value2, "ascription");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

src/main/java/com/sztzjy/digital_credit/entity/Topic.java

@@ -17,6 +17,10 @@ public class Topic extends StuLearningAssessment {
     // @ExcelProperty(index = 0)
 
 
+    @ExcelProperty(value = "模块")
+    @ExcelValid(message = "【模块】不能有空数据！")
+    private String topicModule;
+
     // value 指定excel中某列的标题名称
     @ExcelProperty(value = "题型")
     @ExcelValid(message = "【题型】不能有空数据！")

src/main/java/com/sztzjy/digital_credit/mapper/AdminExcelErrorMessageMapper.java

@@ -1,13 +1,10 @@
 package com.sztzjy.digital_credit.mapper;
 
-
 import com.sztzjy.digital_credit.entity.AdminExcelErrorMessage;
 import com.sztzjy.digital_credit.entity.AdminExcelErrorMessageExample;
-import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-@Mapper
 public interface AdminExcelErrorMessageMapper {
     long countByExample(AdminExcelErrorMessageExample example);
 

src/main/java/com/sztzjy/digital_credit/service/impl/AdminBlockServiceImpl.java

@@ -155,8 +155,7 @@ public class AdminBlockServiceImpl implements AdminBlockService {
 
 
         try {
-            EasyExcel.read(file.getInputStream(), Topic.class, new MyExcelListener(stuLearningAssessmentMapper, stuBlockProductWithBLOBs.getModule()
-                    , stuBlockProductWithBLOBs.getUserId())).sheet().doRead();
+            EasyExcel.read(file.getInputStream(), Topic.class, new MyExcelListener(stuLearningAssessmentMapper, stuBlockProductWithBLOBs.getModule(), stuBlockProductWithBLOBs.getUserId())).sheet().doRead();
 
         } catch (IOException e) {
             e.printStackTrace();

src/main/java/com/sztzjy/digital_credit/service/impl/AdminHashServiceIml.java

@@ -175,9 +175,15 @@ public class AdminHashServiceIml implements AdminHashService {
         AdminExcelErrorMessageExample messageExample = new AdminExcelErrorMessageExample();
         messageExample.createCriteria().andUseridEqualTo(stuBlockProductWithBLOBs.getUserId()).andModuleEqualTo(stuBlockProductWithBLOBs.getModule()).andStateEqualTo("1");
         List<AdminExcelErrorMessage> messages = adminExcelErrorMessageMapper.selectByExample(messageExample);
+        if (messages.isEmpty())
+        {
+            return null;
+        }else {
             return messages;
         }
 
+    }
+
 
 
     /**

src/main/java/com/sztzjy/digital_credit/util/excel/MyExcelListener.java

@@ -91,14 +91,20 @@ public class MyExcelListener implements ReadListener<Topic> {
 //            max = max + 1;
 //        }
         for (int i = 0; i < cachedDataList.size(); i++) {
+
+            if (cachedDataList.get(i).getTopicModule()== null)
+            {
+                break;
+            }
+
             String s = UUID.randomUUID().toString().replaceAll("-", "");
             cachedDataList.get(i).setTopicId(s);
-            cachedDataList.get(i).setModule(module);
+            cachedDataList.get(i).setModule(cachedDataList.get(i).getTopicModule());
             cachedDataList.get(i).setLogic(1);
 //            cachedDataList.get(i).setTopicNumber(BigDecimal.valueOf(max+i));
             mapper.insertData(cachedDataList.get(i));
         }
-      // mapper.insertBatch(cachedDataList);
+       //mapper.insertBatch(cachedDataList);
     }
 
     // 异常处理

src/main/resources/mappers/AdminExcelErrorMessageMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sztzjy.digital_credit.mappers.AdminExcelErrorMessageMapper">
+<mapper namespace="com.sztzjy.digital_credit.mapper.AdminExcelErrorMessageMapper">
   <resultMap id="BaseResultMap" type="com.sztzjy.digital_credit.entity.AdminExcelErrorMessage">
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="topic_name" jdbcType="VARCHAR" property="topicName" />
@@ -11,6 +11,7 @@
     <result column="module" jdbcType="VARCHAR" property="module" />
     <result column="userId" jdbcType="VARCHAR" property="userid" />
     <result column="submission_state" jdbcType="INTEGER" property="submissionState" />
+    <result column="ascription" jdbcType="VARCHAR" property="ascription" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -71,7 +72,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, topic_name, topic_type, topic_id, state, result_msg, module, userId, submission_state
+    id, topic_name, topic_type, topic_id, state, result_msg, module, userId, submission_state, 
+    ascription
   </sql>
   <select id="selectByExample" parameterType="com.sztzjy.digital_credit.entity.AdminExcelErrorMessageExample" resultMap="BaseResultMap">
     select
@@ -106,12 +108,12 @@
   <insert id="insert" parameterType="com.sztzjy.digital_credit.entity.AdminExcelErrorMessage">
     insert into admin_excel_error_message (id, topic_name, topic_type, 
       topic_id, state, result_msg, 
-      module, userId, submission_state
-      )
+      module, userId, submission_state, 
+      ascription)
     values (#{id,jdbcType=INTEGER}, #{topicName,jdbcType=VARCHAR}, #{topicType,jdbcType=VARCHAR}, 
       #{topicId,jdbcType=VARCHAR}, #{state,jdbcType=VARCHAR}, #{resultMsg,jdbcType=VARCHAR}, 
-      #{module,jdbcType=VARCHAR}, #{userid,jdbcType=VARCHAR}, #{submissionState,jdbcType=INTEGER}
-      )
+      #{module,jdbcType=VARCHAR}, #{userid,jdbcType=VARCHAR}, #{submissionState,jdbcType=INTEGER}, 
+      #{ascription,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.sztzjy.digital_credit.entity.AdminExcelErrorMessage">
     insert into admin_excel_error_message
@@ -143,6 +145,9 @@
       <if test="submissionState != null">
         submission_state,
       </if>
+      <if test="ascription != null">
+        ascription,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -172,6 +177,9 @@
       <if test="submissionState != null">
         #{submissionState,jdbcType=INTEGER},
       </if>
+      <if test="ascription != null">
+        #{ascription,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.sztzjy.digital_credit.entity.AdminExcelErrorMessageExample" resultType="java.lang.Long">
@@ -210,6 +218,9 @@
       <if test="record.submissionState != null">
         submission_state = #{record.submissionState,jdbcType=INTEGER},
       </if>
+      <if test="record.ascription != null">
+        ascription = #{record.ascription,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -225,7 +236,8 @@
       result_msg = #{record.resultMsg,jdbcType=VARCHAR},
       module = #{record.module,jdbcType=VARCHAR},
       userId = #{record.userid,jdbcType=VARCHAR},
-      submission_state = #{record.submissionState,jdbcType=INTEGER}
+      submission_state = #{record.submissionState,jdbcType=INTEGER},
+      ascription = #{record.ascription,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -257,6 +269,9 @@
       <if test="submissionState != null">
         submission_state = #{submissionState,jdbcType=INTEGER},
       </if>
+      <if test="ascription != null">
+        ascription = #{ascription,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -269,7 +284,8 @@
       result_msg = #{resultMsg,jdbcType=VARCHAR},
       module = #{module,jdbcType=VARCHAR},
       userId = #{userid,jdbcType=VARCHAR},
-      submission_state = #{submissionState,jdbcType=INTEGER}
+      submission_state = #{submissionState,jdbcType=INTEGER},
+      ascription = #{ascription,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>