新增主观题比较返回分数

src/main/java/com/sztzjy/linkCommerce/controller/stu/CgcpdwController.java

@@ -0,0 +1,103 @@
+package com.sztzjy.linkCommerce.controller.stu;
+
+import com.sztzjy.linkCommerce.annotation.AnonymousAccess;
+import com.sztzjy.linkCommerce.config.Constant;
+import com.sztzjy.linkCommerce.entity.*;
+import com.sztzjy.linkCommerce.mapper.CgcpdwAnswerMapper;
+import com.sztzjy.linkCommerce.mapper.CgcpdwStuAnswerMapper;
+import com.sztzjy.linkCommerce.mapper.StuGradeMapper;
+import com.sztzjy.linkCommerce.service.ScoreService;
+import com.sztzjy.linkCommerce.util.CompareListsUtil;
+import com.sztzjy.linkCommerce.util.ResultEntity;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Api(tags = "采购产品定位 PRO_GYQDGL MODULE_CGCPDW")
+@RequestMapping("api/cgcpdw")
+@RestController
+public class CgcpdwController {
+    @Autowired
+    CgcpdwAnswerMapper cgcpdwAnswerMapper;
+    @Autowired
+    CgcpdwStuAnswerMapper cgcpdwStuAnswerMapper;
+    @Autowired
+    StuGradeMapper stuGradeMapper;
+    @Autowired
+    CompareListsUtil compareListsUtil;
+    @Autowired
+    ScoreService scoreService;
+
+    @PostMapping("/selectCgcpdwStuAnswer")
+    @ApiOperation("采购产品定位-回显")
+    @AnonymousAccess
+    public ResultEntity<CgcpdwStuAnswer> selectCgxqycAnswer(@RequestParam String userId) {
+        CgcpdwStuAnswerExample example = new CgcpdwStuAnswerExample();
+        example.createCriteria().andUserIdEqualTo(userId);
+        List<CgcpdwStuAnswer> list = cgcpdwStuAnswerMapper.selectByExample(example);
+        if (list == null || list.isEmpty()) {
+            return new ResultEntity<>(HttpStatus.OK, "未提交");
+        } else {
+            return new ResultEntity<>(HttpStatus.OK, "采购需求预测-回显", list.get(0));
+        }
+    }
+
+    @PostMapping("/commitCgcpdwAnswer")
+    @ApiOperation("采购产品定位-提交")
+    @AnonymousAccess
+    public ResultEntity commitCgcpdwAnswer(@RequestBody CgcpdwStuAnswer stuAnswer, @RequestParam String userId) {
+        //先查询是否提交过
+        StuGradeExample stuGradeExample = new StuGradeExample();
+        stuGradeExample.createCriteria().andUserIdEqualTo(userId).andProjectEqualTo(Constant.PRO_GYQDGL).andModuleEqualTo(Constant.MODULE_CGCPDW);
+        List<StuGrade> stuGradeList = stuGradeMapper.selectByExample(stuGradeExample);
+        if(stuGradeList.isEmpty() || stuGradeList == null){
+            CgcpdwAnswer answer = cgcpdwAnswerMapper.selectByExample(new CgcpdwAnswerExample()).get(0);
+            int errorCount=0;
+            if(!answer.getCoreFeatures().equals(stuAnswer.getCoreFeatures())){
+                errorCount++;
+            }
+            if(!answer.getCategoryClassification().equals(stuAnswer.getCategoryClassification())){
+                errorCount++;
+            }
+            if(!answer.getPositioningBasis().equals(stuAnswer.getPositioningBasis())){
+                errorCount++;
+            }
+            if(!answer.getTypicalItems().equals(stuAnswer.getTypicalItems())){
+                errorCount++;
+            }
+            int i1 = compareListsUtil.calculateLengthPenaltyEnhanced(stuAnswer.getGgxText());
+            int i2 = compareListsUtil.calculateLengthPenaltyEnhanced(stuAnswer.getPjxText());
+            int i3 = compareListsUtil.calculateLengthPenaltyEnhanced(stuAnswer.getYbxText());
+            int i4 = compareListsUtil.calculateLengthPenaltyEnhanced(stuAnswer.getZlxText());
+            errorCount=errorCount+i1+i2+i3+i4;
+            Boolean aBoolean = scoreService.insertScore(userId, Constant.PRO_GYQDGL, Constant.MODULE_CGCPDW, BigDecimal.valueOf(100 - errorCount), null);
+            if(aBoolean){
+                return new ResultEntity<>(HttpStatus.OK, "提交成功");
+            }else {
+                return new ResultEntity<>(HttpStatus.BAD_REQUEST, "提交失败");
+            }
+        }else {
+            return new ResultEntity<>(HttpStatus.BAD_REQUEST, "已提交过");
+        }
+    }
+
+//    @PostMapping("/restartTraining")
+//    @ApiOperation("采购需求预测-重新实训")
+//    @AnonymousAccess
+//    public ResultEntity restartTraining(@RequestParam String userId) {
+//        Boolean b=scoreService.deleteScore(userId,Constant.PRO_GYQDGL,Constant.MODULE_CGXQYC);
+//        if(b){
+//            CgxqycStuAnswerExample cgxqycStuAnswerExample = new CgxqycStuAnswerExample();
+//            cgxqycStuAnswerExample.createCriteria().andUserIdEqualTo(userId);
+//            cgxqycStuAnswerMapper.deleteByExample(cgxqycStuAnswerExample);
+//            return new ResultEntity<>(HttpStatus.OK, "重新实训成功");
+//        }else {
+//            return new ResultEntity<>(HttpStatus.BAD_REQUEST, "重新实训失败");
+//        }
+//    }
+}

src/main/java/com/sztzjy/linkCommerce/controller/stu/CgxqycController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import java.math.BigDecimal;
 import java.util.List;
 
-@Api(tags = "采购需求预测相关")
+@Api(tags = "采购需求预测相关 PRO_GYQDGL,MODULE_CGXQYC")
 @RequestMapping("api/cgxqyc")
 @RestController
 public class CgxqycController {
@@ -33,38 +33,38 @@ public class CgxqycController {
     @Autowired
     ScoreService scoreService;
 
-    @PostMapping("/selectCgxqycAnswer")
+    @PostMapping("/selectCgxqycStuAnswer")
     @ApiOperation("采购需求预测-回显")
     @AnonymousAccess
     public ResultEntity<CgxqycStuAnswer> selectCgxqycAnswer(@RequestParam String userId) {
-        CgxqycStuAnswerExample cgxqycStuAnswerExample = new CgxqycStuAnswerExample();
-        cgxqycStuAnswerExample.createCriteria().andUserIdEqualTo(userId);
-        List<CgxqycStuAnswer> cgxqycStuAnswerList = cgxqycStuAnswerMapper.selectByExample(cgxqycStuAnswerExample);
-        if (cgxqycStuAnswerList == null || cgxqycStuAnswerList.isEmpty()) {
+        CgxqycStuAnswerExample example = new CgxqycStuAnswerExample();
+        example.createCriteria().andUserIdEqualTo(userId);
+        List<CgxqycStuAnswer> list = cgxqycStuAnswerMapper.selectByExample(example);
+        if (list == null || list.isEmpty()) {
             return new ResultEntity<>(HttpStatus.OK, "未提交");
         } else {
-            return new ResultEntity<>(HttpStatus.OK, "采购需求预测-回显", cgxqycStuAnswerList.get(0));
+            return new ResultEntity<>(HttpStatus.OK, "采购需求预测-回显", list.get(0));
         }
     }
 
     @PostMapping("/commitCgxqycAnswer")
     @ApiOperation("采购需求预测-提交")
     @AnonymousAccess
-    public ResultEntity commitCgxqycAnswer(@RequestBody CgxqycStuAnswer cgxqycStuAnswer, @RequestParam String userId) {
+    public ResultEntity commitCgxqycAnswer(@RequestBody CgxqycStuAnswer stuAnswer, @RequestParam String userId) {
         //先查询是否提交过
         StuGradeExample stuGradeExample = new StuGradeExample();
         stuGradeExample.createCriteria().andUserIdEqualTo(userId).andProjectEqualTo(Constant.PRO_GYQDGL).andModuleEqualTo(Constant.MODULE_CGXQYC);
         List<StuGrade> stuGradeList = stuGradeMapper.selectByExample(stuGradeExample);
         if(stuGradeList.isEmpty() || stuGradeList == null){
-            CgxqycAnswer cgxqycAnswer = cgxqycAnswerMapper.selectByExample(new CgxqycAnswerExample()).get(0);
-            String monthlyDataStu = cgxqycStuAnswer.getMonthlyData();
-            String monthlyData = cgxqycAnswer.getMonthlyData();
+            CgxqycAnswer answer = cgxqycAnswerMapper.selectByExample(new CgxqycAnswerExample()).get(0);
+            String monthlyDataStu = stuAnswer.getMonthlyData();
+            String monthlyData = answer.getMonthlyData();
             int monthlyDataErrorCount =compareListsUtil.compareLists(monthlyDataStu, monthlyData).getErrorCount();
-            String seasonalIndexStu = cgxqycStuAnswer.getSeasonalIndex();
-            String seasonalIndex = cgxqycAnswer.getSeasonalIndex();
+            String seasonalIndexStu = stuAnswer.getSeasonalIndex();
+            String seasonalIndex = answer.getSeasonalIndex();
             int seasonalIndexErrorCount = compareListsUtil.compareLists(seasonalIndexStu, seasonalIndex).getErrorCount();
-            String demandForecastStu = cgxqycStuAnswer.getDemandForecast();
-            String demandForecast = cgxqycAnswer.getDemandForecast();
+            String demandForecastStu = stuAnswer.getDemandForecast();
+            String demandForecast = answer.getDemandForecast();
             int demandForecastErrorCount = compareListsUtil.compareLists(demandForecastStu, demandForecast).getErrorCount();
             int errorCount = monthlyDataErrorCount + seasonalIndexErrorCount + demandForecastErrorCount;
             Boolean aBoolean = scoreService.insertScore(userId, Constant.PRO_GYQDGL, Constant.MODULE_CGXQYC, BigDecimal.valueOf(100 - errorCount), null);

src/main/java/com/sztzjy/linkCommerce/entity/CgcpdwAnswer.java

@@ -11,19 +11,16 @@ public class CgcpdwAnswer {
     @ApiModelProperty(notes = "主键（格式：CGCPDWA_时间戳_哈希值，例：CGCPDWA_2023110614_9d7b6c5e）")
     private String id;
 
-    @ApiModelProperty(notes = "品类分类（如：MRO物料、生产性物料）")
+    @ApiModelProperty(notes = "战略型典型采购品项‌")
     private String categoryClassification;
 
-    @ApiModelProperty(notes = "用户ID（关联userinfo表）")
-    private String userId;
-
-    @ApiModelProperty(notes = "典型采购品项（多个品项用逗号分隔）")
+    @ApiModelProperty(notes = "‌杠杆型‌典型采购品项‌")
     private String typicalItems;
 
-    @ApiModelProperty(notes = "核心特征（JSON格式，")
+    @ApiModelProperty(notes = "‌瓶颈型‌典型采购品项‌")
     private String coreFeatures;
 
-    @ApiModelProperty(notes = "模型定位依据（500字以内分析说明）")
+    @ApiModelProperty(notes = "一般型典型采购品项‌")
     private String positioningBasis;
 
     public String getId() {
@@ -42,14 +39,6 @@ public class CgcpdwAnswer {
         this.categoryClassification = categoryClassification == null ? null : categoryClassification.trim();
     }
 
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId == null ? null : userId.trim();
-    }
-
     public String getTypicalItems() {
         return typicalItems;
     }

src/main/java/com/sztzjy/linkCommerce/entity/CgcpdwAnswerExample.java

@@ -244,73 +244,213 @@ public class CgcpdwAnswerExample {
             return (Criteria) this;
         }
 
-        public Criteria andUserIdIsNull() {
-            addCriterion("user_id is null");
+        public Criteria andTypicalItemsIsNull() {
+            addCriterion("typical_items is null");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdIsNotNull() {
-            addCriterion("user_id is not null");
+        public Criteria andTypicalItemsIsNotNull() {
+            addCriterion("typical_items is not null");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdEqualTo(String value) {
-            addCriterion("user_id =", value, "userId");
+        public Criteria andTypicalItemsEqualTo(String value) {
+            addCriterion("typical_items =", value, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdNotEqualTo(String value) {
-            addCriterion("user_id <>", value, "userId");
+        public Criteria andTypicalItemsNotEqualTo(String value) {
+            addCriterion("typical_items <>", value, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdGreaterThan(String value) {
-            addCriterion("user_id >", value, "userId");
+        public Criteria andTypicalItemsGreaterThan(String value) {
+            addCriterion("typical_items >", value, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdGreaterThanOrEqualTo(String value) {
-            addCriterion("user_id >=", value, "userId");
+        public Criteria andTypicalItemsGreaterThanOrEqualTo(String value) {
+            addCriterion("typical_items >=", value, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdLessThan(String value) {
-            addCriterion("user_id <", value, "userId");
+        public Criteria andTypicalItemsLessThan(String value) {
+            addCriterion("typical_items <", value, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdLessThanOrEqualTo(String value) {
-            addCriterion("user_id <=", value, "userId");
+        public Criteria andTypicalItemsLessThanOrEqualTo(String value) {
+            addCriterion("typical_items <=", value, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdLike(String value) {
-            addCriterion("user_id like", value, "userId");
+        public Criteria andTypicalItemsLike(String value) {
+            addCriterion("typical_items like", value, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdNotLike(String value) {
-            addCriterion("user_id not like", value, "userId");
+        public Criteria andTypicalItemsNotLike(String value) {
+            addCriterion("typical_items not like", value, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdIn(List<String> values) {
-            addCriterion("user_id in", values, "userId");
+        public Criteria andTypicalItemsIn(List<String> values) {
+            addCriterion("typical_items in", values, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdNotIn(List<String> values) {
-            addCriterion("user_id not in", values, "userId");
+        public Criteria andTypicalItemsNotIn(List<String> values) {
+            addCriterion("typical_items not in", values, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdBetween(String value1, String value2) {
-            addCriterion("user_id between", value1, value2, "userId");
+        public Criteria andTypicalItemsBetween(String value1, String value2) {
+            addCriterion("typical_items between", value1, value2, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdNotBetween(String value1, String value2) {
-            addCriterion("user_id not between", value1, value2, "userId");
+        public Criteria andTypicalItemsNotBetween(String value1, String value2) {
+            addCriterion("typical_items not between", value1, value2, "typicalItems");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesIsNull() {
+            addCriterion("core_features is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesIsNotNull() {
+            addCriterion("core_features is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesEqualTo(String value) {
+            addCriterion("core_features =", value, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesNotEqualTo(String value) {
+            addCriterion("core_features <>", value, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesGreaterThan(String value) {
+            addCriterion("core_features >", value, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesGreaterThanOrEqualTo(String value) {
+            addCriterion("core_features >=", value, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesLessThan(String value) {
+            addCriterion("core_features <", value, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesLessThanOrEqualTo(String value) {
+            addCriterion("core_features <=", value, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesLike(String value) {
+            addCriterion("core_features like", value, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesNotLike(String value) {
+            addCriterion("core_features not like", value, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesIn(List<String> values) {
+            addCriterion("core_features in", values, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesNotIn(List<String> values) {
+            addCriterion("core_features not in", values, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesBetween(String value1, String value2) {
+            addCriterion("core_features between", value1, value2, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesNotBetween(String value1, String value2) {
+            addCriterion("core_features not between", value1, value2, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisIsNull() {
+            addCriterion("positioning_basis is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisIsNotNull() {
+            addCriterion("positioning_basis is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisEqualTo(String value) {
+            addCriterion("positioning_basis =", value, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisNotEqualTo(String value) {
+            addCriterion("positioning_basis <>", value, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisGreaterThan(String value) {
+            addCriterion("positioning_basis >", value, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisGreaterThanOrEqualTo(String value) {
+            addCriterion("positioning_basis >=", value, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisLessThan(String value) {
+            addCriterion("positioning_basis <", value, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisLessThanOrEqualTo(String value) {
+            addCriterion("positioning_basis <=", value, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisLike(String value) {
+            addCriterion("positioning_basis like", value, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisNotLike(String value) {
+            addCriterion("positioning_basis not like", value, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisIn(List<String> values) {
+            addCriterion("positioning_basis in", values, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisNotIn(List<String> values) {
+            addCriterion("positioning_basis not in", values, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisBetween(String value1, String value2) {
+            addCriterion("positioning_basis between", value1, value2, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisNotBetween(String value1, String value2) {
+            addCriterion("positioning_basis not between", value1, value2, "positioningBasis");
             return (Criteria) this;
         }
     }

src/main/java/com/sztzjy/linkCommerce/entity/CgcpdwStuAnswer.java

@@ -1,7 +1,5 @@
 package com.sztzjy.linkCommerce.entity;
 
-import java.util.Date;
-
 import io.swagger.annotations.ApiModelProperty;
 /**
  * 学生采购产品定位答案表（品类定位模型）
@@ -13,27 +11,33 @@ public class CgcpdwStuAnswer {
     @ApiModelProperty(notes = "主键（格式：CGCPDWSA_时间戳_哈希值，例：CGCPDWSA_2023110614_9d7b6c5e）")
     private String id;
 
-    @ApiModelProperty(notes = "品类分类（如：MRO物料、生产性物料）")
+    @ApiModelProperty(notes = "战略型典型采购品项‌")
     private String categoryClassification;
 
-    @ApiModelProperty(notes = "用户ID（关联userinfo表）")
-    private String userId;
-
-    @ApiModelProperty(notes = "提交时间")
-    private Date submitTime;
-
-    @ApiModelProperty(notes = "状态：draft-草稿/submitted-已提交/graded-已评分")
-    private String status;
-
-    @ApiModelProperty(notes = "典型采购品项（多个品项用逗号分隔）")
+    @ApiModelProperty(notes = "‌杠杆型‌典型采购品项‌")
     private String typicalItems;
 
-    @ApiModelProperty(notes = "核心特征")
+    @ApiModelProperty(notes = "‌瓶颈型‌典型采购品项‌")
     private String coreFeatures;
 
-    @ApiModelProperty(notes = "模型定位依据（500字以内分析说明）")
+    @ApiModelProperty(notes = "一般型典型采购品项‌")
     private String positioningBasis;
 
+    @ApiModelProperty(notes = "战略型管理措施")
+    private String zlxText;
+
+    @ApiModelProperty(notes = "杠杆型管理措施")
+    private String ggxText;
+
+    @ApiModelProperty(notes = "‌瓶颈型‌管理措施")
+    private String pjxText;
+
+    @ApiModelProperty(notes = "一般型管理措施")
+    private String ybxText;
+
+    @ApiModelProperty(notes = "用户ID（关联userinfo表）")
+    private String userId;
+
     public String getId() {
         return id;
     }
@@ -50,30 +54,6 @@ public class CgcpdwStuAnswer {
         this.categoryClassification = categoryClassification == null ? null : categoryClassification.trim();
     }
 
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId == null ? null : userId.trim();
-    }
-
-    public Date getSubmitTime() {
-        return submitTime;
-    }
-
-    public void setSubmitTime(Date submitTime) {
-        this.submitTime = submitTime;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status == null ? null : status.trim();
-    }
-
     public String getTypicalItems() {
         return typicalItems;
     }
@@ -97,4 +77,44 @@ public class CgcpdwStuAnswer {
     public void setPositioningBasis(String positioningBasis) {
         this.positioningBasis = positioningBasis == null ? null : positioningBasis.trim();
     }
+
+    public String getZlxText() {
+        return zlxText;
+    }
+
+    public void setZlxText(String zlxText) {
+        this.zlxText = zlxText == null ? null : zlxText.trim();
+    }
+
+    public String getGgxText() {
+        return ggxText;
+    }
+
+    public void setGgxText(String ggxText) {
+        this.ggxText = ggxText == null ? null : ggxText.trim();
+    }
+
+    public String getPjxText() {
+        return pjxText;
+    }
+
+    public void setPjxText(String pjxText) {
+        this.pjxText = pjxText == null ? null : pjxText.trim();
+    }
+
+    public String getYbxText() {
+        return ybxText;
+    }
+
+    public void setYbxText(String ybxText) {
+        this.ybxText = ybxText == null ? null : ybxText.trim();
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId == null ? null : userId.trim();
+    }
 }

src/main/java/com/sztzjy/linkCommerce/entity/CgcpdwStuAnswerExample.java

@@ -1,7 +1,6 @@
 package com.sztzjy.linkCommerce.entity;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 public class CgcpdwStuAnswerExample {
@@ -245,203 +244,563 @@ public class CgcpdwStuAnswerExample {
             return (Criteria) this;
         }
 
-        public Criteria andUserIdIsNull() {
-            addCriterion("user_id is null");
+        public Criteria andTypicalItemsIsNull() {
+            addCriterion("typical_items is null");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdIsNotNull() {
-            addCriterion("user_id is not null");
+        public Criteria andTypicalItemsIsNotNull() {
+            addCriterion("typical_items is not null");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdEqualTo(String value) {
-            addCriterion("user_id =", value, "userId");
+        public Criteria andTypicalItemsEqualTo(String value) {
+            addCriterion("typical_items =", value, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdNotEqualTo(String value) {
-            addCriterion("user_id <>", value, "userId");
+        public Criteria andTypicalItemsNotEqualTo(String value) {
+            addCriterion("typical_items <>", value, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdGreaterThan(String value) {
-            addCriterion("user_id >", value, "userId");
+        public Criteria andTypicalItemsGreaterThan(String value) {
+            addCriterion("typical_items >", value, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdGreaterThanOrEqualTo(String value) {
-            addCriterion("user_id >=", value, "userId");
+        public Criteria andTypicalItemsGreaterThanOrEqualTo(String value) {
+            addCriterion("typical_items >=", value, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdLessThan(String value) {
-            addCriterion("user_id <", value, "userId");
+        public Criteria andTypicalItemsLessThan(String value) {
+            addCriterion("typical_items <", value, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdLessThanOrEqualTo(String value) {
-            addCriterion("user_id <=", value, "userId");
+        public Criteria andTypicalItemsLessThanOrEqualTo(String value) {
+            addCriterion("typical_items <=", value, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdLike(String value) {
-            addCriterion("user_id like", value, "userId");
+        public Criteria andTypicalItemsLike(String value) {
+            addCriterion("typical_items like", value, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdNotLike(String value) {
-            addCriterion("user_id not like", value, "userId");
+        public Criteria andTypicalItemsNotLike(String value) {
+            addCriterion("typical_items not like", value, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdIn(List<String> values) {
-            addCriterion("user_id in", values, "userId");
+        public Criteria andTypicalItemsIn(List<String> values) {
+            addCriterion("typical_items in", values, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdNotIn(List<String> values) {
-            addCriterion("user_id not in", values, "userId");
+        public Criteria andTypicalItemsNotIn(List<String> values) {
+            addCriterion("typical_items not in", values, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdBetween(String value1, String value2) {
-            addCriterion("user_id between", value1, value2, "userId");
+        public Criteria andTypicalItemsBetween(String value1, String value2) {
+            addCriterion("typical_items between", value1, value2, "typicalItems");
             return (Criteria) this;
         }
 
-        public Criteria andUserIdNotBetween(String value1, String value2) {
-            addCriterion("user_id not between", value1, value2, "userId");
+        public Criteria andTypicalItemsNotBetween(String value1, String value2) {
+            addCriterion("typical_items not between", value1, value2, "typicalItems");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesIsNull() {
+            addCriterion("core_features is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesIsNotNull() {
+            addCriterion("core_features is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesEqualTo(String value) {
+            addCriterion("core_features =", value, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesNotEqualTo(String value) {
+            addCriterion("core_features <>", value, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesGreaterThan(String value) {
+            addCriterion("core_features >", value, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesGreaterThanOrEqualTo(String value) {
+            addCriterion("core_features >=", value, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesLessThan(String value) {
+            addCriterion("core_features <", value, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesLessThanOrEqualTo(String value) {
+            addCriterion("core_features <=", value, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesLike(String value) {
+            addCriterion("core_features like", value, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesNotLike(String value) {
+            addCriterion("core_features not like", value, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesIn(List<String> values) {
+            addCriterion("core_features in", values, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesNotIn(List<String> values) {
+            addCriterion("core_features not in", values, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesBetween(String value1, String value2) {
+            addCriterion("core_features between", value1, value2, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoreFeaturesNotBetween(String value1, String value2) {
+            addCriterion("core_features not between", value1, value2, "coreFeatures");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisIsNull() {
+            addCriterion("positioning_basis is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisIsNotNull() {
+            addCriterion("positioning_basis is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisEqualTo(String value) {
+            addCriterion("positioning_basis =", value, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisNotEqualTo(String value) {
+            addCriterion("positioning_basis <>", value, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisGreaterThan(String value) {
+            addCriterion("positioning_basis >", value, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisGreaterThanOrEqualTo(String value) {
+            addCriterion("positioning_basis >=", value, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisLessThan(String value) {
+            addCriterion("positioning_basis <", value, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisLessThanOrEqualTo(String value) {
+            addCriterion("positioning_basis <=", value, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisLike(String value) {
+            addCriterion("positioning_basis like", value, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisNotLike(String value) {
+            addCriterion("positioning_basis not like", value, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisIn(List<String> values) {
+            addCriterion("positioning_basis in", values, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisNotIn(List<String> values) {
+            addCriterion("positioning_basis not in", values, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisBetween(String value1, String value2) {
+            addCriterion("positioning_basis between", value1, value2, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andPositioningBasisNotBetween(String value1, String value2) {
+            addCriterion("positioning_basis not between", value1, value2, "positioningBasis");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlxTextIsNull() {
+            addCriterion("zlx_text is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlxTextIsNotNull() {
+            addCriterion("zlx_text is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlxTextEqualTo(String value) {
+            addCriterion("zlx_text =", value, "zlxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlxTextNotEqualTo(String value) {
+            addCriterion("zlx_text <>", value, "zlxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlxTextGreaterThan(String value) {
+            addCriterion("zlx_text >", value, "zlxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlxTextGreaterThanOrEqualTo(String value) {
+            addCriterion("zlx_text >=", value, "zlxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlxTextLessThan(String value) {
+            addCriterion("zlx_text <", value, "zlxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andZlxTextLessThanOrEqualTo(String value) {
+            addCriterion("zlx_text <=", value, "zlxText");
             return (Criteria) this;
         }
 
-        public Criteria andSubmitTimeIsNull() {
-            addCriterion("submit_time is null");
+        public Criteria andZlxTextLike(String value) {
+            addCriterion("zlx_text like", value, "zlxText");
             return (Criteria) this;
         }
 
-        public Criteria andSubmitTimeIsNotNull() {
-            addCriterion("submit_time is not null");
+        public Criteria andZlxTextNotLike(String value) {
+            addCriterion("zlx_text not like", value, "zlxText");
             return (Criteria) this;
         }
 
-        public Criteria andSubmitTimeEqualTo(Date value) {
-            addCriterion("submit_time =", value, "submitTime");
+        public Criteria andZlxTextIn(List<String> values) {
+            addCriterion("zlx_text in", values, "zlxText");
             return (Criteria) this;
         }
 
-        public Criteria andSubmitTimeNotEqualTo(Date value) {
-            addCriterion("submit_time <>", value, "submitTime");
+        public Criteria andZlxTextNotIn(List<String> values) {
+            addCriterion("zlx_text not in", values, "zlxText");
             return (Criteria) this;
         }
 
-        public Criteria andSubmitTimeGreaterThan(Date value) {
-            addCriterion("submit_time >", value, "submitTime");
+        public Criteria andZlxTextBetween(String value1, String value2) {
+            addCriterion("zlx_text between", value1, value2, "zlxText");
             return (Criteria) this;
         }
 
-        public Criteria andSubmitTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("submit_time >=", value, "submitTime");
+        public Criteria andZlxTextNotBetween(String value1, String value2) {
+            addCriterion("zlx_text not between", value1, value2, "zlxText");
             return (Criteria) this;
         }
 
-        public Criteria andSubmitTimeLessThan(Date value) {
-            addCriterion("submit_time <", value, "submitTime");
+        public Criteria andGgxTextIsNull() {
+            addCriterion("ggx_text is null");
             return (Criteria) this;
         }
 
-        public Criteria andSubmitTimeLessThanOrEqualTo(Date value) {
-            addCriterion("submit_time <=", value, "submitTime");
+        public Criteria andGgxTextIsNotNull() {
+            addCriterion("ggx_text is not null");
             return (Criteria) this;
         }
 
-        public Criteria andSubmitTimeIn(List<Date> values) {
-            addCriterion("submit_time in", values, "submitTime");
+        public Criteria andGgxTextEqualTo(String value) {
+            addCriterion("ggx_text =", value, "ggxText");
             return (Criteria) this;
         }
 
-        public Criteria andSubmitTimeNotIn(List<Date> values) {
-            addCriterion("submit_time not in", values, "submitTime");
+        public Criteria andGgxTextNotEqualTo(String value) {
+            addCriterion("ggx_text <>", value, "ggxText");
             return (Criteria) this;
         }
 
-        public Criteria andSubmitTimeBetween(Date value1, Date value2) {
-            addCriterion("submit_time between", value1, value2, "submitTime");
+        public Criteria andGgxTextGreaterThan(String value) {
+            addCriterion("ggx_text >", value, "ggxText");
             return (Criteria) this;
         }
 
-        public Criteria andSubmitTimeNotBetween(Date value1, Date value2) {
-            addCriterion("submit_time not between", value1, value2, "submitTime");
+        public Criteria andGgxTextGreaterThanOrEqualTo(String value) {
+            addCriterion("ggx_text >=", value, "ggxText");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIsNull() {
-            addCriterion("status is null");
+        public Criteria andGgxTextLessThan(String value) {
+            addCriterion("ggx_text <", value, "ggxText");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIsNotNull() {
-            addCriterion("status is not null");
+        public Criteria andGgxTextLessThanOrEqualTo(String value) {
+            addCriterion("ggx_text <=", value, "ggxText");
             return (Criteria) this;
         }
 
-        public Criteria andStatusEqualTo(String value) {
-            addCriterion("status =", value, "status");
+        public Criteria andGgxTextLike(String value) {
+            addCriterion("ggx_text like", value, "ggxText");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotEqualTo(String value) {
-            addCriterion("status <>", value, "status");
+        public Criteria andGgxTextNotLike(String value) {
+            addCriterion("ggx_text not like", value, "ggxText");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThan(String value) {
-            addCriterion("status >", value, "status");
+        public Criteria andGgxTextIn(List<String> values) {
+            addCriterion("ggx_text in", values, "ggxText");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThanOrEqualTo(String value) {
-            addCriterion("status >=", value, "status");
+        public Criteria andGgxTextNotIn(List<String> values) {
+            addCriterion("ggx_text not in", values, "ggxText");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThan(String value) {
-            addCriterion("status <", value, "status");
+        public Criteria andGgxTextBetween(String value1, String value2) {
+            addCriterion("ggx_text between", value1, value2, "ggxText");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThanOrEqualTo(String value) {
-            addCriterion("status <=", value, "status");
+        public Criteria andGgxTextNotBetween(String value1, String value2) {
+            addCriterion("ggx_text not between", value1, value2, "ggxText");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLike(String value) {
-            addCriterion("status like", value, "status");
+        public Criteria andPjxTextIsNull() {
+            addCriterion("pjx_text is null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotLike(String value) {
-            addCriterion("status not like", value, "status");
+        public Criteria andPjxTextIsNotNull() {
+            addCriterion("pjx_text is not null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIn(List<String> values) {
-            addCriterion("status in", values, "status");
+        public Criteria andPjxTextEqualTo(String value) {
+            addCriterion("pjx_text =", value, "pjxText");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotIn(List<String> values) {
-            addCriterion("status not in", values, "status");
+        public Criteria andPjxTextNotEqualTo(String value) {
+            addCriterion("pjx_text <>", value, "pjxText");
             return (Criteria) this;
         }
 
-        public Criteria andStatusBetween(String value1, String value2) {
-            addCriterion("status between", value1, value2, "status");
+        public Criteria andPjxTextGreaterThan(String value) {
+            addCriterion("pjx_text >", value, "pjxText");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotBetween(String value1, String value2) {
-            addCriterion("status not between", value1, value2, "status");
+        public Criteria andPjxTextGreaterThanOrEqualTo(String value) {
+            addCriterion("pjx_text >=", value, "pjxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andPjxTextLessThan(String value) {
+            addCriterion("pjx_text <", value, "pjxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andPjxTextLessThanOrEqualTo(String value) {
+            addCriterion("pjx_text <=", value, "pjxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andPjxTextLike(String value) {
+            addCriterion("pjx_text like", value, "pjxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andPjxTextNotLike(String value) {
+            addCriterion("pjx_text not like", value, "pjxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andPjxTextIn(List<String> values) {
+            addCriterion("pjx_text in", values, "pjxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andPjxTextNotIn(List<String> values) {
+            addCriterion("pjx_text not in", values, "pjxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andPjxTextBetween(String value1, String value2) {
+            addCriterion("pjx_text between", value1, value2, "pjxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andPjxTextNotBetween(String value1, String value2) {
+            addCriterion("pjx_text not between", value1, value2, "pjxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andYbxTextIsNull() {
+            addCriterion("ybx_text is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYbxTextIsNotNull() {
+            addCriterion("ybx_text is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYbxTextEqualTo(String value) {
+            addCriterion("ybx_text =", value, "ybxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andYbxTextNotEqualTo(String value) {
+            addCriterion("ybx_text <>", value, "ybxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andYbxTextGreaterThan(String value) {
+            addCriterion("ybx_text >", value, "ybxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andYbxTextGreaterThanOrEqualTo(String value) {
+            addCriterion("ybx_text >=", value, "ybxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andYbxTextLessThan(String value) {
+            addCriterion("ybx_text <", value, "ybxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andYbxTextLessThanOrEqualTo(String value) {
+            addCriterion("ybx_text <=", value, "ybxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andYbxTextLike(String value) {
+            addCriterion("ybx_text like", value, "ybxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andYbxTextNotLike(String value) {
+            addCriterion("ybx_text not like", value, "ybxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andYbxTextIn(List<String> values) {
+            addCriterion("ybx_text in", values, "ybxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andYbxTextNotIn(List<String> values) {
+            addCriterion("ybx_text not in", values, "ybxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andYbxTextBetween(String value1, String value2) {
+            addCriterion("ybx_text between", value1, value2, "ybxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andYbxTextNotBetween(String value1, String value2) {
+            addCriterion("ybx_text not between", value1, value2, "ybxText");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdEqualTo(String value) {
+            addCriterion("user_id =", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotEqualTo(String value) {
+            addCriterion("user_id <>", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThan(String value) {
+            addCriterion("user_id >", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThanOrEqualTo(String value) {
+            addCriterion("user_id >=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThan(String value) {
+            addCriterion("user_id <", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThanOrEqualTo(String value) {
+            addCriterion("user_id <=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLike(String value) {
+            addCriterion("user_id like", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotLike(String value) {
+            addCriterion("user_id not like", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIn(List<String> values) {
+            addCriterion("user_id in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotIn(List<String> values) {
+            addCriterion("user_id not in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdBetween(String value1, String value2) {
+            addCriterion("user_id between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotBetween(String value1, String value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
             return (Criteria) this;
         }
     }

src/main/java/com/sztzjy/linkCommerce/entity/CgxqycStuAnswer.java

@@ -1,7 +1,5 @@
 package com.sztzjy.linkCommerce.entity;
 
-import java.util.Date;
-
 import io.swagger.annotations.ApiModelProperty;
 /**
  * 学生采购需求预测答案表（含季节调整预测）
@@ -16,9 +14,6 @@ public class CgxqycStuAnswer {
     @ApiModelProperty(notes = "用户ID（关联userinfo表）")
     private String userId;
 
-    @ApiModelProperty(notes = "提交时间")
-    private Date submitTime;
-
     @ApiModelProperty(notes = "月度数据（JSON数组格式，如[120,150,180]，单位：件）")
     private String monthlyData;
 
@@ -44,14 +39,6 @@ public class CgxqycStuAnswer {
         this.userId = userId == null ? null : userId.trim();
     }
 
-    public Date getSubmitTime() {
-        return submitTime;
-    }
-
-    public void setSubmitTime(Date submitTime) {
-        this.submitTime = submitTime;
-    }
-
     public String getMonthlyData() {
         return monthlyData;
     }

src/main/java/com/sztzjy/linkCommerce/entity/CgxqycStuAnswerExample.java

@@ -1,7 +1,6 @@
 package com.sztzjy.linkCommerce.entity;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 public class CgxqycStuAnswerExample {
@@ -244,66 +243,6 @@ public class CgxqycStuAnswerExample {
             addCriterion("user_id not between", value1, value2, "userId");
             return (Criteria) this;
         }
-
-        public Criteria andSubmitTimeIsNull() {
-            addCriterion("submit_time is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubmitTimeIsNotNull() {
-            addCriterion("submit_time is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubmitTimeEqualTo(Date value) {
-            addCriterion("submit_time =", value, "submitTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubmitTimeNotEqualTo(Date value) {
-            addCriterion("submit_time <>", value, "submitTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubmitTimeGreaterThan(Date value) {
-            addCriterion("submit_time >", value, "submitTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubmitTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("submit_time >=", value, "submitTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubmitTimeLessThan(Date value) {
-            addCriterion("submit_time <", value, "submitTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubmitTimeLessThanOrEqualTo(Date value) {
-            addCriterion("submit_time <=", value, "submitTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubmitTimeIn(List<Date> values) {
-            addCriterion("submit_time in", values, "submitTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubmitTimeNotIn(List<Date> values) {
-            addCriterion("submit_time not in", values, "submitTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubmitTimeBetween(Date value1, Date value2) {
-            addCriterion("submit_time between", value1, value2, "submitTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubmitTimeNotBetween(Date value1, Date value2) {
-            addCriterion("submit_time not between", value1, value2, "submitTime");
-            return (Criteria) this;
-        }
     }
 
     public static class Criteria extends GeneratedCriteria {

src/main/java/com/sztzjy/linkCommerce/mapper/CgcpdwAnswerMapper.java

@@ -3,8 +3,10 @@ package com.sztzjy.linkCommerce.mapper;
 import com.sztzjy.linkCommerce.entity.CgcpdwAnswer;
 import com.sztzjy.linkCommerce.entity.CgcpdwAnswerExample;
 import java.util.List;
-import org.apache.ibatis.annotations.Param;
 
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+@Mapper
 public interface CgcpdwAnswerMapper {
     long countByExample(CgcpdwAnswerExample example);
 
@@ -16,21 +18,15 @@ public interface CgcpdwAnswerMapper {
 
     int insertSelective(CgcpdwAnswer record);
 
-    List<CgcpdwAnswer> selectByExampleWithBLOBs(CgcpdwAnswerExample example);
-
     List<CgcpdwAnswer> selectByExample(CgcpdwAnswerExample example);
 
     CgcpdwAnswer selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") CgcpdwAnswer record, @Param("example") CgcpdwAnswerExample example);
 
-    int updateByExampleWithBLOBs(@Param("record") CgcpdwAnswer record, @Param("example") CgcpdwAnswerExample example);
-
     int updateByExample(@Param("record") CgcpdwAnswer record, @Param("example") CgcpdwAnswerExample example);
 
     int updateByPrimaryKeySelective(CgcpdwAnswer record);
 
-    int updateByPrimaryKeyWithBLOBs(CgcpdwAnswer record);
-
     int updateByPrimaryKey(CgcpdwAnswer record);
 }

src/main/java/com/sztzjy/linkCommerce/mapper/CgcpdwStuAnswerMapper.java

@@ -3,8 +3,10 @@ package com.sztzjy.linkCommerce.mapper;
 import com.sztzjy.linkCommerce.entity.CgcpdwStuAnswer;
 import com.sztzjy.linkCommerce.entity.CgcpdwStuAnswerExample;
 import java.util.List;
-import org.apache.ibatis.annotations.Param;
 
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+@Mapper
 public interface CgcpdwStuAnswerMapper {
     long countByExample(CgcpdwStuAnswerExample example);
 
@@ -16,21 +18,15 @@ public interface CgcpdwStuAnswerMapper {
 
     int insertSelective(CgcpdwStuAnswer record);
 
-    List<CgcpdwStuAnswer> selectByExampleWithBLOBs(CgcpdwStuAnswerExample example);
-
     List<CgcpdwStuAnswer> selectByExample(CgcpdwStuAnswerExample example);
 
     CgcpdwStuAnswer selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") CgcpdwStuAnswer record, @Param("example") CgcpdwStuAnswerExample example);
 
-    int updateByExampleWithBLOBs(@Param("record") CgcpdwStuAnswer record, @Param("example") CgcpdwStuAnswerExample example);
-
     int updateByExample(@Param("record") CgcpdwStuAnswer record, @Param("example") CgcpdwStuAnswerExample example);
 
     int updateByPrimaryKeySelective(CgcpdwStuAnswer record);
 
-    int updateByPrimaryKeyWithBLOBs(CgcpdwStuAnswer record);
-
     int updateByPrimaryKey(CgcpdwStuAnswer record);
 }

src/main/java/com/sztzjy/linkCommerce/util/CompareListsUtil.java

@@ -8,6 +8,29 @@ import java.util.List;
 //用于比较两个集合的字符串是否对应、返回错误数量和错误位置
 @Component
 public class CompareListsUtil {
+
+    //返回扣的分数
+    public int calculateLengthPenaltyEnhanced(String input) {
+        // 情况1：空值直接扣分
+        if (input == null) {
+            return 2;
+        }
+
+        // 情况2：纯空白字符
+        String trimmed = input.trim();
+        if (trimmed.isEmpty()) {
+            return 2;
+        }
+
+        // 情况3：实际长度检查
+        int length = trimmed.length();
+        if (length < 20) {
+            return 2;
+        }
+
+        return 0;
+    }
+
     public Result compareLists(String stulist, String answerList) {
         // 将字符串分割成数组
         String[] submitted = stulist.split(",");

src/main/resources/mappers/CgcpdwAnswerMapper.xml

@@ -4,12 +4,9 @@
   <resultMap id="BaseResultMap" type="com.sztzjy.linkCommerce.entity.CgcpdwAnswer">
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="category_classification" jdbcType="VARCHAR" property="categoryClassification" />
-    <result column="user_id" jdbcType="VARCHAR" property="userId" />
-  </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.sztzjy.linkCommerce.entity.CgcpdwAnswer">
-    <result column="typical_items" jdbcType="LONGVARCHAR" property="typicalItems" />
-    <result column="core_features" jdbcType="LONGVARCHAR" property="coreFeatures" />
-    <result column="positioning_basis" jdbcType="LONGVARCHAR" property="positioningBasis" />
+    <result column="typical_items" jdbcType="VARCHAR" property="typicalItems" />
+    <result column="core_features" jdbcType="VARCHAR" property="coreFeatures" />
+    <result column="positioning_basis" jdbcType="VARCHAR" property="positioningBasis" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -70,27 +67,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, category_classification, user_id
-  </sql>
-  <sql id="Blob_Column_List">
-    typical_items, core_features, positioning_basis
+    id, category_classification, typical_items, core_features, positioning_basis
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.sztzjy.linkCommerce.entity.CgcpdwAnswerExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from cgcpdw_answer
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
   <select id="selectByExample" parameterType="com.sztzjy.linkCommerce.entity.CgcpdwAnswerExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
@@ -105,11 +83,9 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
     from cgcpdw_answer
     where id = #{id,jdbcType=VARCHAR}
   </select>
@@ -124,12 +100,10 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.sztzjy.linkCommerce.entity.CgcpdwAnswer">
-    insert into cgcpdw_answer (id, category_classification, user_id, 
-      typical_items, core_features, positioning_basis
-      )
-    values (#{id,jdbcType=VARCHAR}, #{categoryClassification,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, 
-      #{typicalItems,jdbcType=LONGVARCHAR}, #{coreFeatures,jdbcType=LONGVARCHAR}, #{positioningBasis,jdbcType=LONGVARCHAR}
-      )
+    insert into cgcpdw_answer (id, category_classification, typical_items, 
+      core_features, positioning_basis)
+    values (#{id,jdbcType=VARCHAR}, #{categoryClassification,jdbcType=VARCHAR}, #{typicalItems,jdbcType=VARCHAR}, 
+      #{coreFeatures,jdbcType=VARCHAR}, #{positioningBasis,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.sztzjy.linkCommerce.entity.CgcpdwAnswer">
     insert into cgcpdw_answer
@@ -140,9 +114,6 @@
       <if test="categoryClassification != null">
         category_classification,
       </if>
-      <if test="userId != null">
-        user_id,
-      </if>
       <if test="typicalItems != null">
         typical_items,
       </if>
@@ -160,17 +131,14 @@
       <if test="categoryClassification != null">
         #{categoryClassification,jdbcType=VARCHAR},
       </if>
-      <if test="userId != null">
-        #{userId,jdbcType=VARCHAR},
-      </if>
       <if test="typicalItems != null">
-        #{typicalItems,jdbcType=LONGVARCHAR},
+        #{typicalItems,jdbcType=VARCHAR},
       </if>
       <if test="coreFeatures != null">
-        #{coreFeatures,jdbcType=LONGVARCHAR},
+        #{coreFeatures,jdbcType=VARCHAR},
       </if>
       <if test="positioningBasis != null">
-        #{positioningBasis,jdbcType=LONGVARCHAR},
+        #{positioningBasis,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -189,40 +157,27 @@
       <if test="record.categoryClassification != null">
         category_classification = #{record.categoryClassification,jdbcType=VARCHAR},
       </if>
-      <if test="record.userId != null">
-        user_id = #{record.userId,jdbcType=VARCHAR},
-      </if>
       <if test="record.typicalItems != null">
-        typical_items = #{record.typicalItems,jdbcType=LONGVARCHAR},
+        typical_items = #{record.typicalItems,jdbcType=VARCHAR},
       </if>
       <if test="record.coreFeatures != null">
-        core_features = #{record.coreFeatures,jdbcType=LONGVARCHAR},
+        core_features = #{record.coreFeatures,jdbcType=VARCHAR},
       </if>
       <if test="record.positioningBasis != null">
-        positioning_basis = #{record.positioningBasis,jdbcType=LONGVARCHAR},
+        positioning_basis = #{record.positioningBasis,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    update cgcpdw_answer
-    set id = #{record.id,jdbcType=VARCHAR},
-      category_classification = #{record.categoryClassification,jdbcType=VARCHAR},
-      user_id = #{record.userId,jdbcType=VARCHAR},
-      typical_items = #{record.typicalItems,jdbcType=LONGVARCHAR},
-      core_features = #{record.coreFeatures,jdbcType=LONGVARCHAR},
-      positioning_basis = #{record.positioningBasis,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
   <update id="updateByExample" parameterType="map">
     update cgcpdw_answer
     set id = #{record.id,jdbcType=VARCHAR},
       category_classification = #{record.categoryClassification,jdbcType=VARCHAR},
-      user_id = #{record.userId,jdbcType=VARCHAR}
+      typical_items = #{record.typicalItems,jdbcType=VARCHAR},
+      core_features = #{record.coreFeatures,jdbcType=VARCHAR},
+      positioning_basis = #{record.positioningBasis,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -233,34 +188,25 @@
       <if test="categoryClassification != null">
         category_classification = #{categoryClassification,jdbcType=VARCHAR},
       </if>
-      <if test="userId != null">
-        user_id = #{userId,jdbcType=VARCHAR},
-      </if>
       <if test="typicalItems != null">
-        typical_items = #{typicalItems,jdbcType=LONGVARCHAR},
+        typical_items = #{typicalItems,jdbcType=VARCHAR},
       </if>
       <if test="coreFeatures != null">
-        core_features = #{coreFeatures,jdbcType=LONGVARCHAR},
+        core_features = #{coreFeatures,jdbcType=VARCHAR},
       </if>
       <if test="positioningBasis != null">
-        positioning_basis = #{positioningBasis,jdbcType=LONGVARCHAR},
+        positioning_basis = #{positioningBasis,jdbcType=VARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.sztzjy.linkCommerce.entity.CgcpdwAnswer">
-    update cgcpdw_answer
-    set category_classification = #{categoryClassification,jdbcType=VARCHAR},
-      user_id = #{userId,jdbcType=VARCHAR},
-      typical_items = #{typicalItems,jdbcType=LONGVARCHAR},
-      core_features = #{coreFeatures,jdbcType=LONGVARCHAR},
-      positioning_basis = #{positioningBasis,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
   <update id="updateByPrimaryKey" parameterType="com.sztzjy.linkCommerce.entity.CgcpdwAnswer">
     update cgcpdw_answer
     set category_classification = #{categoryClassification,jdbcType=VARCHAR},
-      user_id = #{userId,jdbcType=VARCHAR}
+      typical_items = #{typicalItems,jdbcType=VARCHAR},
+      core_features = #{coreFeatures,jdbcType=VARCHAR},
+      positioning_basis = #{positioningBasis,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
+
 </mapper>

src/main/resources/mappers/CgcpdwStuAnswerMapper.xml

@@ -4,14 +4,14 @@
   <resultMap id="BaseResultMap" type="com.sztzjy.linkCommerce.entity.CgcpdwStuAnswer">
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="category_classification" jdbcType="VARCHAR" property="categoryClassification" />
+    <result column="typical_items" jdbcType="VARCHAR" property="typicalItems" />
+    <result column="core_features" jdbcType="VARCHAR" property="coreFeatures" />
+    <result column="positioning_basis" jdbcType="VARCHAR" property="positioningBasis" />
+    <result column="zlx_text" jdbcType="VARCHAR" property="zlxText" />
+    <result column="ggx_text" jdbcType="VARCHAR" property="ggxText" />
+    <result column="pjx_text" jdbcType="VARCHAR" property="pjxText" />
+    <result column="ybx_text" jdbcType="VARCHAR" property="ybxText" />
     <result column="user_id" jdbcType="VARCHAR" property="userId" />
-    <result column="submit_time" jdbcType="TIMESTAMP" property="submitTime" />
-    <result column="status" jdbcType="CHAR" property="status" />
-  </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.sztzjy.linkCommerce.entity.CgcpdwStuAnswer">
-    <result column="typical_items" jdbcType="LONGVARCHAR" property="typicalItems" />
-    <result column="core_features" jdbcType="LONGVARCHAR" property="coreFeatures" />
-    <result column="positioning_basis" jdbcType="LONGVARCHAR" property="positioningBasis" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -72,27 +72,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, category_classification, user_id, submit_time, status
-  </sql>
-  <sql id="Blob_Column_List">
-    typical_items, core_features, positioning_basis
+    id, category_classification, typical_items, core_features, positioning_basis, zlx_text, 
+    ggx_text, pjx_text, ybx_text, user_id
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.sztzjy.linkCommerce.entity.CgcpdwStuAnswerExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from cgcpdw_stu_answer
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
   <select id="selectByExample" parameterType="com.sztzjy.linkCommerce.entity.CgcpdwStuAnswerExample" resultMap="BaseResultMap">
     select
     <if test="distinct">
@@ -107,11 +89,9 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
     from cgcpdw_stu_answer
     where id = #{id,jdbcType=VARCHAR}
   </select>
@@ -126,12 +106,14 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.sztzjy.linkCommerce.entity.CgcpdwStuAnswer">
-    insert into cgcpdw_stu_answer (id, category_classification, user_id, 
-      submit_time, status, typical_items, 
-      core_features, positioning_basis)
-    values (#{id,jdbcType=VARCHAR}, #{categoryClassification,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, 
-      #{submitTime,jdbcType=TIMESTAMP}, #{status,jdbcType=CHAR}, #{typicalItems,jdbcType=LONGVARCHAR}, 
-      #{coreFeatures,jdbcType=LONGVARCHAR}, #{positioningBasis,jdbcType=LONGVARCHAR})
+    insert into cgcpdw_stu_answer (id, category_classification, typical_items, 
+      core_features, positioning_basis, zlx_text, 
+      ggx_text, pjx_text, ybx_text, 
+      user_id)
+    values (#{id,jdbcType=VARCHAR}, #{categoryClassification,jdbcType=VARCHAR}, #{typicalItems,jdbcType=VARCHAR}, 
+      #{coreFeatures,jdbcType=VARCHAR}, #{positioningBasis,jdbcType=VARCHAR}, #{zlxText,jdbcType=VARCHAR}, 
+      #{ggxText,jdbcType=VARCHAR}, #{pjxText,jdbcType=VARCHAR}, #{ybxText,jdbcType=VARCHAR}, 
+      #{userId,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.sztzjy.linkCommerce.entity.CgcpdwStuAnswer">
     insert into cgcpdw_stu_answer
@@ -142,15 +124,6 @@
       <if test="categoryClassification != null">
         category_classification,
       </if>
-      <if test="userId != null">
-        user_id,
-      </if>
-      <if test="submitTime != null">
-        submit_time,
-      </if>
-      <if test="status != null">
-        status,
-      </if>
       <if test="typicalItems != null">
         typical_items,
       </if>
@@ -160,6 +133,21 @@
       <if test="positioningBasis != null">
         positioning_basis,
       </if>
+      <if test="zlxText != null">
+        zlx_text,
+      </if>
+      <if test="ggxText != null">
+        ggx_text,
+      </if>
+      <if test="pjxText != null">
+        pjx_text,
+      </if>
+      <if test="ybxText != null">
+        ybx_text,
+      </if>
+      <if test="userId != null">
+        user_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -168,23 +156,29 @@
       <if test="categoryClassification != null">
         #{categoryClassification,jdbcType=VARCHAR},
       </if>
-      <if test="userId != null">
-        #{userId,jdbcType=VARCHAR},
-      </if>
-      <if test="submitTime != null">
-        #{submitTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=CHAR},
-      </if>
       <if test="typicalItems != null">
-        #{typicalItems,jdbcType=LONGVARCHAR},
+        #{typicalItems,jdbcType=VARCHAR},
       </if>
       <if test="coreFeatures != null">
-        #{coreFeatures,jdbcType=LONGVARCHAR},
+        #{coreFeatures,jdbcType=VARCHAR},
       </if>
       <if test="positioningBasis != null">
-        #{positioningBasis,jdbcType=LONGVARCHAR},
+        #{positioningBasis,jdbcType=VARCHAR},
+      </if>
+      <if test="zlxText != null">
+        #{zlxText,jdbcType=VARCHAR},
+      </if>
+      <if test="ggxText != null">
+        #{ggxText,jdbcType=VARCHAR},
+      </if>
+      <if test="pjxText != null">
+        #{pjxText,jdbcType=VARCHAR},
+      </if>
+      <if test="ybxText != null">
+        #{ybxText,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null">
+        #{userId,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -203,50 +197,47 @@
       <if test="record.categoryClassification != null">
         category_classification = #{record.categoryClassification,jdbcType=VARCHAR},
       </if>
-      <if test="record.userId != null">
-        user_id = #{record.userId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.submitTime != null">
-        submit_time = #{record.submitTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.status != null">
-        status = #{record.status,jdbcType=CHAR},
-      </if>
       <if test="record.typicalItems != null">
-        typical_items = #{record.typicalItems,jdbcType=LONGVARCHAR},
+        typical_items = #{record.typicalItems,jdbcType=VARCHAR},
       </if>
       <if test="record.coreFeatures != null">
-        core_features = #{record.coreFeatures,jdbcType=LONGVARCHAR},
+        core_features = #{record.coreFeatures,jdbcType=VARCHAR},
       </if>
       <if test="record.positioningBasis != null">
-        positioning_basis = #{record.positioningBasis,jdbcType=LONGVARCHAR},
+        positioning_basis = #{record.positioningBasis,jdbcType=VARCHAR},
+      </if>
+      <if test="record.zlxText != null">
+        zlx_text = #{record.zlxText,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ggxText != null">
+        ggx_text = #{record.ggxText,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pjxText != null">
+        pjx_text = #{record.pjxText,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ybxText != null">
+        ybx_text = #{record.ybxText,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    update cgcpdw_stu_answer
-    set id = #{record.id,jdbcType=VARCHAR},
-      category_classification = #{record.categoryClassification,jdbcType=VARCHAR},
-      user_id = #{record.userId,jdbcType=VARCHAR},
-      submit_time = #{record.submitTime,jdbcType=TIMESTAMP},
-      status = #{record.status,jdbcType=CHAR},
-      typical_items = #{record.typicalItems,jdbcType=LONGVARCHAR},
-      core_features = #{record.coreFeatures,jdbcType=LONGVARCHAR},
-      positioning_basis = #{record.positioningBasis,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
   <update id="updateByExample" parameterType="map">
     update cgcpdw_stu_answer
     set id = #{record.id,jdbcType=VARCHAR},
       category_classification = #{record.categoryClassification,jdbcType=VARCHAR},
-      user_id = #{record.userId,jdbcType=VARCHAR},
-      submit_time = #{record.submitTime,jdbcType=TIMESTAMP},
-      status = #{record.status,jdbcType=CHAR}
+      typical_items = #{record.typicalItems,jdbcType=VARCHAR},
+      core_features = #{record.coreFeatures,jdbcType=VARCHAR},
+      positioning_basis = #{record.positioningBasis,jdbcType=VARCHAR},
+      zlx_text = #{record.zlxText,jdbcType=VARCHAR},
+      ggx_text = #{record.ggxText,jdbcType=VARCHAR},
+      pjx_text = #{record.pjxText,jdbcType=VARCHAR},
+      ybx_text = #{record.ybxText,jdbcType=VARCHAR},
+      user_id = #{record.userId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -257,44 +248,45 @@
       <if test="categoryClassification != null">
         category_classification = #{categoryClassification,jdbcType=VARCHAR},
       </if>
-      <if test="userId != null">
-        user_id = #{userId,jdbcType=VARCHAR},
-      </if>
-      <if test="submitTime != null">
-        submit_time = #{submitTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="status != null">
-        status = #{status,jdbcType=CHAR},
-      </if>
       <if test="typicalItems != null">
-        typical_items = #{typicalItems,jdbcType=LONGVARCHAR},
+        typical_items = #{typicalItems,jdbcType=VARCHAR},
       </if>
       <if test="coreFeatures != null">
-        core_features = #{coreFeatures,jdbcType=LONGVARCHAR},
+        core_features = #{coreFeatures,jdbcType=VARCHAR},
       </if>
       <if test="positioningBasis != null">
-        positioning_basis = #{positioningBasis,jdbcType=LONGVARCHAR},
+        positioning_basis = #{positioningBasis,jdbcType=VARCHAR},
+      </if>
+      <if test="zlxText != null">
+        zlx_text = #{zlxText,jdbcType=VARCHAR},
+      </if>
+      <if test="ggxText != null">
+        ggx_text = #{ggxText,jdbcType=VARCHAR},
+      </if>
+      <if test="pjxText != null">
+        pjx_text = #{pjxText,jdbcType=VARCHAR},
+      </if>
+      <if test="ybxText != null">
+        ybx_text = #{ybxText,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=VARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.sztzjy.linkCommerce.entity.CgcpdwStuAnswer">
-    update cgcpdw_stu_answer
-    set category_classification = #{categoryClassification,jdbcType=VARCHAR},
-      user_id = #{userId,jdbcType=VARCHAR},
-      submit_time = #{submitTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=CHAR},
-      typical_items = #{typicalItems,jdbcType=LONGVARCHAR},
-      core_features = #{coreFeatures,jdbcType=LONGVARCHAR},
-      positioning_basis = #{positioningBasis,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
   <update id="updateByPrimaryKey" parameterType="com.sztzjy.linkCommerce.entity.CgcpdwStuAnswer">
     update cgcpdw_stu_answer
     set category_classification = #{categoryClassification,jdbcType=VARCHAR},
-      user_id = #{userId,jdbcType=VARCHAR},
-      submit_time = #{submitTime,jdbcType=TIMESTAMP},
-      status = #{status,jdbcType=CHAR}
+      typical_items = #{typicalItems,jdbcType=VARCHAR},
+      core_features = #{coreFeatures,jdbcType=VARCHAR},
+      positioning_basis = #{positioningBasis,jdbcType=VARCHAR},
+      zlx_text = #{zlxText,jdbcType=VARCHAR},
+      ggx_text = #{ggxText,jdbcType=VARCHAR},
+      pjx_text = #{pjxText,jdbcType=VARCHAR},
+      ybx_text = #{ybxText,jdbcType=VARCHAR},
+      user_id = #{userId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
+
 </mapper>

src/main/resources/mappers/CgxqycStuAnswerMapper.xml

@@ -4,7 +4,6 @@
   <resultMap id="BaseResultMap" type="com.sztzjy.linkCommerce.entity.CgxqycStuAnswer">
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="user_id" jdbcType="VARCHAR" property="userId" />
-    <result column="submit_time" jdbcType="TIMESTAMP" property="submitTime" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.sztzjy.linkCommerce.entity.CgxqycStuAnswer">
     <result column="monthly_data" jdbcType="LONGVARCHAR" property="monthlyData" />
@@ -70,7 +69,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, user_id, submit_time
+    id, user_id
   </sql>
   <sql id="Blob_Column_List">
     monthly_data, seasonal_index, demand_forecast
@@ -124,12 +123,10 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.sztzjy.linkCommerce.entity.CgxqycStuAnswer">
-    insert into cgxqyc_stu_answer (id, user_id, submit_time, 
-      monthly_data, seasonal_index, demand_forecast
-      )
-    values (#{id,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{submitTime,jdbcType=TIMESTAMP}, 
-      #{monthlyData,jdbcType=LONGVARCHAR}, #{seasonalIndex,jdbcType=LONGVARCHAR}, #{demandForecast,jdbcType=LONGVARCHAR}
-      )
+    insert into cgxqyc_stu_answer (id, user_id, monthly_data, 
+      seasonal_index, demand_forecast)
+    values (#{id,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{monthlyData,jdbcType=LONGVARCHAR}, 
+      #{seasonalIndex,jdbcType=LONGVARCHAR}, #{demandForecast,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.sztzjy.linkCommerce.entity.CgxqycStuAnswer">
     insert into cgxqyc_stu_answer
@@ -140,9 +137,6 @@
       <if test="userId != null">
         user_id,
       </if>
-      <if test="submitTime != null">
-        submit_time,
-      </if>
       <if test="monthlyData != null">
         monthly_data,
       </if>
@@ -160,9 +154,6 @@
       <if test="userId != null">
         #{userId,jdbcType=VARCHAR},
       </if>
-      <if test="submitTime != null">
-        #{submitTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="monthlyData != null">
         #{monthlyData,jdbcType=LONGVARCHAR},
       </if>
@@ -189,9 +180,6 @@
       <if test="record.userId != null">
         user_id = #{record.userId,jdbcType=VARCHAR},
       </if>
-      <if test="record.submitTime != null">
-        submit_time = #{record.submitTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="record.monthlyData != null">
         monthly_data = #{record.monthlyData,jdbcType=LONGVARCHAR},
       </if>
@@ -210,7 +198,6 @@
     update cgxqyc_stu_answer
     set id = #{record.id,jdbcType=VARCHAR},
       user_id = #{record.userId,jdbcType=VARCHAR},
-      submit_time = #{record.submitTime,jdbcType=TIMESTAMP},
       monthly_data = #{record.monthlyData,jdbcType=LONGVARCHAR},
       seasonal_index = #{record.seasonalIndex,jdbcType=LONGVARCHAR},
       demand_forecast = #{record.demandForecast,jdbcType=LONGVARCHAR}
@@ -221,8 +208,7 @@
   <update id="updateByExample" parameterType="map">
     update cgxqyc_stu_answer
     set id = #{record.id,jdbcType=VARCHAR},
-      user_id = #{record.userId,jdbcType=VARCHAR},
-      submit_time = #{record.submitTime,jdbcType=TIMESTAMP}
+      user_id = #{record.userId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -233,9 +219,6 @@
       <if test="userId != null">
         user_id = #{userId,jdbcType=VARCHAR},
       </if>
-      <if test="submitTime != null">
-        submit_time = #{submitTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="monthlyData != null">
         monthly_data = #{monthlyData,jdbcType=LONGVARCHAR},
       </if>
@@ -251,7 +234,6 @@
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.sztzjy.linkCommerce.entity.CgxqycStuAnswer">
     update cgxqyc_stu_answer
     set user_id = #{userId,jdbcType=VARCHAR},
-      submit_time = #{submitTime,jdbcType=TIMESTAMP},
       monthly_data = #{monthlyData,jdbcType=LONGVARCHAR},
       seasonal_index = #{seasonalIndex,jdbcType=LONGVARCHAR},
       demand_forecast = #{demandForecast,jdbcType=LONGVARCHAR}
@@ -259,8 +241,7 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.sztzjy.linkCommerce.entity.CgxqycStuAnswer">
     update cgxqyc_stu_answer
-    set user_id = #{userId,jdbcType=VARCHAR},
-      submit_time = #{submitTime,jdbcType=TIMESTAMP}
+    set user_id = #{userId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>