From 34ffe5a0bab0bb34ec8bb36608d960e174ef8ea8 Mon Sep 17 00:00:00 2001 From: yz <3614508250@qq.com> Date: Fri, 25 Apr 2025 14:19:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=BB=E8=A7=82=E9=A2=98?= =?UTF-8?q?=E6=AF=94=E8=BE=83=E8=BF=94=E5=9B=9E=E5=88=86=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/stu/CgcpdwController.java | 103 ++++ .../controller/stu/CgxqycController.java | 30 +- .../linkCommerce/entity/CgcpdwAnswer.java | 19 +- .../entity/CgcpdwAnswerExample.java | 196 ++++++- .../linkCommerce/entity/CgcpdwStuAnswer.java | 98 ++-- .../entity/CgcpdwStuAnswerExample.java | 521 +++++++++++++++--- .../linkCommerce/entity/CgxqycStuAnswer.java | 13 - .../entity/CgxqycStuAnswerExample.java | 61 -- .../mapper/CgcpdwAnswerMapper.java | 10 +- .../mapper/CgcpdwStuAnswerMapper.java | 10 +- .../linkCommerce/util/CompareListsUtil.java | 23 + .../resources/mappers/CgcpdwAnswerMapper.xml | 104 +--- .../mappers/CgcpdwStuAnswerMapper.xml | 216 ++++---- .../mappers/CgxqycStuAnswerMapper.xml | 33 +- 14 files changed, 954 insertions(+), 483 deletions(-) create mode 100644 src/main/java/com/sztzjy/linkCommerce/controller/stu/CgcpdwController.java diff --git a/src/main/java/com/sztzjy/linkCommerce/controller/stu/CgcpdwController.java b/src/main/java/com/sztzjy/linkCommerce/controller/stu/CgcpdwController.java new file mode 100644 index 0000000..9e771a5 --- /dev/null +++ b/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 selectCgxqycAnswer(@RequestParam String userId) { + CgcpdwStuAnswerExample example = new CgcpdwStuAnswerExample(); + example.createCriteria().andUserIdEqualTo(userId); + List 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 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, "重新实训失败"); +// } +// } +} diff --git a/src/main/java/com/sztzjy/linkCommerce/controller/stu/CgxqycController.java b/src/main/java/com/sztzjy/linkCommerce/controller/stu/CgxqycController.java index 64f3ce1..a382bd6 100644 --- a/src/main/java/com/sztzjy/linkCommerce/controller/stu/CgxqycController.java +++ b/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 selectCgxqycAnswer(@RequestParam String userId) { - CgxqycStuAnswerExample cgxqycStuAnswerExample = new CgxqycStuAnswerExample(); - cgxqycStuAnswerExample.createCriteria().andUserIdEqualTo(userId); - List cgxqycStuAnswerList = cgxqycStuAnswerMapper.selectByExample(cgxqycStuAnswerExample); - if (cgxqycStuAnswerList == null || cgxqycStuAnswerList.isEmpty()) { + CgxqycStuAnswerExample example = new CgxqycStuAnswerExample(); + example.createCriteria().andUserIdEqualTo(userId); + List 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 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); diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/CgcpdwAnswer.java b/src/main/java/com/sztzjy/linkCommerce/entity/CgcpdwAnswer.java index 00c1ec7..61b4434 100644 --- a/src/main/java/com/sztzjy/linkCommerce/entity/CgcpdwAnswer.java +++ b/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; } diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/CgcpdwAnswerExample.java b/src/main/java/com/sztzjy/linkCommerce/entity/CgcpdwAnswerExample.java index 14f6b19..41b0fec 100644 --- a/src/main/java/com/sztzjy/linkCommerce/entity/CgcpdwAnswerExample.java +++ b/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 values) { - addCriterion("user_id in", values, "userId"); + public Criteria andTypicalItemsIn(List values) { + addCriterion("typical_items in", values, "typicalItems"); return (Criteria) this; } - public Criteria andUserIdNotIn(List values) { - addCriterion("user_id not in", values, "userId"); + public Criteria andTypicalItemsNotIn(List 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 values) { + addCriterion("core_features in", values, "coreFeatures"); + return (Criteria) this; + } + + public Criteria andCoreFeaturesNotIn(List 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 values) { + addCriterion("positioning_basis in", values, "positioningBasis"); + return (Criteria) this; + } + + public Criteria andPositioningBasisNotIn(List 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; } } diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/CgcpdwStuAnswer.java b/src/main/java/com/sztzjy/linkCommerce/entity/CgcpdwStuAnswer.java index 89116f1..9cae933 100644 --- a/src/main/java/com/sztzjy/linkCommerce/entity/CgcpdwStuAnswer.java +++ b/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(); + } } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/CgcpdwStuAnswerExample.java b/src/main/java/com/sztzjy/linkCommerce/entity/CgcpdwStuAnswerExample.java index 2d5bee0..c80de6d 100644 --- a/src/main/java/com/sztzjy/linkCommerce/entity/CgcpdwStuAnswerExample.java +++ b/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 values) { - addCriterion("user_id in", values, "userId"); + public Criteria andTypicalItemsIn(List values) { + addCriterion("typical_items in", values, "typicalItems"); return (Criteria) this; } - public Criteria andUserIdNotIn(List values) { - addCriterion("user_id not in", values, "userId"); + public Criteria andTypicalItemsNotIn(List 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 values) { + addCriterion("core_features in", values, "coreFeatures"); + return (Criteria) this; + } + + public Criteria andCoreFeaturesNotIn(List 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 values) { + addCriterion("positioning_basis in", values, "positioningBasis"); + return (Criteria) this; + } + + public Criteria andPositioningBasisNotIn(List 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 values) { + addCriterion("zlx_text in", values, "zlxText"); return (Criteria) this; } - public Criteria andSubmitTimeNotEqualTo(Date value) { - addCriterion("submit_time <>", value, "submitTime"); + public Criteria andZlxTextNotIn(List 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 values) { - addCriterion("submit_time in", values, "submitTime"); + public Criteria andGgxTextEqualTo(String value) { + addCriterion("ggx_text =", value, "ggxText"); return (Criteria) this; } - public Criteria andSubmitTimeNotIn(List 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 values) { + addCriterion("ggx_text in", values, "ggxText"); return (Criteria) this; } - public Criteria andStatusGreaterThanOrEqualTo(String value) { - addCriterion("status >=", value, "status"); + public Criteria andGgxTextNotIn(List 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 values) { - addCriterion("status in", values, "status"); + public Criteria andPjxTextEqualTo(String value) { + addCriterion("pjx_text =", value, "pjxText"); return (Criteria) this; } - public Criteria andStatusNotIn(List 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 values) { + addCriterion("pjx_text in", values, "pjxText"); + return (Criteria) this; + } + + public Criteria andPjxTextNotIn(List 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 values) { + addCriterion("ybx_text in", values, "ybxText"); + return (Criteria) this; + } + + public Criteria andYbxTextNotIn(List 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 values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List 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; } } diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/CgxqycStuAnswer.java b/src/main/java/com/sztzjy/linkCommerce/entity/CgxqycStuAnswer.java index 35ad33c..4f029b6 100644 --- a/src/main/java/com/sztzjy/linkCommerce/entity/CgxqycStuAnswer.java +++ b/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; } diff --git a/src/main/java/com/sztzjy/linkCommerce/entity/CgxqycStuAnswerExample.java b/src/main/java/com/sztzjy/linkCommerce/entity/CgxqycStuAnswerExample.java index 0a8c392..3ba1206 100644 --- a/src/main/java/com/sztzjy/linkCommerce/entity/CgxqycStuAnswerExample.java +++ b/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 values) { - addCriterion("submit_time in", values, "submitTime"); - return (Criteria) this; - } - - public Criteria andSubmitTimeNotIn(List 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 { diff --git a/src/main/java/com/sztzjy/linkCommerce/mapper/CgcpdwAnswerMapper.java b/src/main/java/com/sztzjy/linkCommerce/mapper/CgcpdwAnswerMapper.java index a24260a..0e659a6 100644 --- a/src/main/java/com/sztzjy/linkCommerce/mapper/CgcpdwAnswerMapper.java +++ b/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 selectByExampleWithBLOBs(CgcpdwAnswerExample example); - List 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); } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/linkCommerce/mapper/CgcpdwStuAnswerMapper.java b/src/main/java/com/sztzjy/linkCommerce/mapper/CgcpdwStuAnswerMapper.java index b36ee6c..bb82f2a 100644 --- a/src/main/java/com/sztzjy/linkCommerce/mapper/CgcpdwStuAnswerMapper.java +++ b/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 selectByExampleWithBLOBs(CgcpdwStuAnswerExample example); - List 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); } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/linkCommerce/util/CompareListsUtil.java b/src/main/java/com/sztzjy/linkCommerce/util/CompareListsUtil.java index 443cb22..73e61c5 100644 --- a/src/main/java/com/sztzjy/linkCommerce/util/CompareListsUtil.java +++ b/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(","); diff --git a/src/main/resources/mappers/CgcpdwAnswerMapper.xml b/src/main/resources/mappers/CgcpdwAnswerMapper.xml index 4f1d687..d56d33a 100644 --- a/src/main/resources/mappers/CgcpdwAnswerMapper.xml +++ b/src/main/resources/mappers/CgcpdwAnswerMapper.xml @@ -4,12 +4,9 @@ - - - - - - + + + @@ -70,27 +67,8 @@ - id, category_classification, user_id - - - typical_items, core_features, positioning_basis + id, category_classification, typical_items, core_features, positioning_basis - - select - , - from cgcpdw_answer where id = #{id,jdbcType=VARCHAR} @@ -124,12 +100,10 @@ - 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 into cgcpdw_answer @@ -140,9 +114,6 @@ category_classification, - - user_id, - typical_items, @@ -160,17 +131,14 @@ #{categoryClassification,jdbcType=VARCHAR}, - - #{userId,jdbcType=VARCHAR}, - - #{typicalItems,jdbcType=LONGVARCHAR}, + #{typicalItems,jdbcType=VARCHAR}, - #{coreFeatures,jdbcType=LONGVARCHAR}, + #{coreFeatures,jdbcType=VARCHAR}, - #{positioningBasis,jdbcType=LONGVARCHAR}, + #{positioningBasis,jdbcType=VARCHAR}, @@ -189,40 +157,27 @@ category_classification = #{record.categoryClassification,jdbcType=VARCHAR}, - - user_id = #{record.userId,jdbcType=VARCHAR}, - - typical_items = #{record.typicalItems,jdbcType=LONGVARCHAR}, + typical_items = #{record.typicalItems,jdbcType=VARCHAR}, - core_features = #{record.coreFeatures,jdbcType=LONGVARCHAR}, + core_features = #{record.coreFeatures,jdbcType=VARCHAR}, - positioning_basis = #{record.positioningBasis,jdbcType=LONGVARCHAR}, + positioning_basis = #{record.positioningBasis,jdbcType=VARCHAR}, - - 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} - - - - 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} @@ -233,34 +188,25 @@ category_classification = #{categoryClassification,jdbcType=VARCHAR}, - - user_id = #{userId,jdbcType=VARCHAR}, - - typical_items = #{typicalItems,jdbcType=LONGVARCHAR}, + typical_items = #{typicalItems,jdbcType=VARCHAR}, - core_features = #{coreFeatures,jdbcType=LONGVARCHAR}, + core_features = #{coreFeatures,jdbcType=VARCHAR}, - positioning_basis = #{positioningBasis,jdbcType=LONGVARCHAR}, + positioning_basis = #{positioningBasis,jdbcType=VARCHAR}, where id = #{id,jdbcType=VARCHAR} - - 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 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} + \ No newline at end of file diff --git a/src/main/resources/mappers/CgcpdwStuAnswerMapper.xml b/src/main/resources/mappers/CgcpdwStuAnswerMapper.xml index f5d57b1..9c73c74 100644 --- a/src/main/resources/mappers/CgcpdwStuAnswerMapper.xml +++ b/src/main/resources/mappers/CgcpdwStuAnswerMapper.xml @@ -4,14 +4,14 @@ + + + + + + + - - - - - - - @@ -72,27 +72,9 @@ - id, category_classification, user_id, submit_time, status - - - 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 - - select - , - from cgcpdw_stu_answer where id = #{id,jdbcType=VARCHAR} @@ -126,12 +106,14 @@ - 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 into cgcpdw_stu_answer @@ -142,15 +124,6 @@ category_classification, - - user_id, - - - submit_time, - - - status, - typical_items, @@ -160,6 +133,21 @@ positioning_basis, + + zlx_text, + + + ggx_text, + + + pjx_text, + + + ybx_text, + + + user_id, + @@ -168,23 +156,29 @@ #{categoryClassification,jdbcType=VARCHAR}, - - #{userId,jdbcType=VARCHAR}, - - - #{submitTime,jdbcType=TIMESTAMP}, - - - #{status,jdbcType=CHAR}, - - #{typicalItems,jdbcType=LONGVARCHAR}, + #{typicalItems,jdbcType=VARCHAR}, - #{coreFeatures,jdbcType=LONGVARCHAR}, + #{coreFeatures,jdbcType=VARCHAR}, - #{positioningBasis,jdbcType=LONGVARCHAR}, + #{positioningBasis,jdbcType=VARCHAR}, + + + #{zlxText,jdbcType=VARCHAR}, + + + #{ggxText,jdbcType=VARCHAR}, + + + #{pjxText,jdbcType=VARCHAR}, + + + #{ybxText,jdbcType=VARCHAR}, + + + #{userId,jdbcType=VARCHAR}, @@ -203,50 +197,47 @@ 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}, + typical_items = #{record.typicalItems,jdbcType=VARCHAR}, - core_features = #{record.coreFeatures,jdbcType=LONGVARCHAR}, + core_features = #{record.coreFeatures,jdbcType=VARCHAR}, - positioning_basis = #{record.positioningBasis,jdbcType=LONGVARCHAR}, + 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}, - - 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} - - - - 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} @@ -257,44 +248,45 @@ category_classification = #{categoryClassification,jdbcType=VARCHAR}, - - user_id = #{userId,jdbcType=VARCHAR}, - - - submit_time = #{submitTime,jdbcType=TIMESTAMP}, - - - status = #{status,jdbcType=CHAR}, - - typical_items = #{typicalItems,jdbcType=LONGVARCHAR}, + typical_items = #{typicalItems,jdbcType=VARCHAR}, - core_features = #{coreFeatures,jdbcType=LONGVARCHAR}, + core_features = #{coreFeatures,jdbcType=VARCHAR}, - positioning_basis = #{positioningBasis,jdbcType=LONGVARCHAR}, + 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 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 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} + \ No newline at end of file diff --git a/src/main/resources/mappers/CgxqycStuAnswerMapper.xml b/src/main/resources/mappers/CgxqycStuAnswerMapper.xml index 33b2c65..0fa990f 100644 --- a/src/main/resources/mappers/CgxqycStuAnswerMapper.xml +++ b/src/main/resources/mappers/CgxqycStuAnswerMapper.xml @@ -4,7 +4,6 @@ - @@ -70,7 +69,7 @@ - id, user_id, submit_time + id, user_id monthly_data, seasonal_index, demand_forecast @@ -124,12 +123,10 @@ - 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 into cgxqyc_stu_answer @@ -140,9 +137,6 @@ user_id, - - submit_time, - monthly_data, @@ -160,9 +154,6 @@ #{userId,jdbcType=VARCHAR}, - - #{submitTime,jdbcType=TIMESTAMP}, - #{monthlyData,jdbcType=LONGVARCHAR}, @@ -189,9 +180,6 @@ user_id = #{record.userId,jdbcType=VARCHAR}, - - submit_time = #{record.submitTime,jdbcType=TIMESTAMP}, - monthly_data = #{record.monthlyData,jdbcType=LONGVARCHAR}, @@ -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 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} @@ -233,9 +219,6 @@ user_id = #{userId,jdbcType=VARCHAR}, - - submit_time = #{submitTime,jdbcType=TIMESTAMP}, - monthly_data = #{monthlyData,jdbcType=LONGVARCHAR}, @@ -251,7 +234,6 @@ 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 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} \ No newline at end of file