修改重新实训bug

src/main/java/com/sztzjy/linkCommerce/config/Constant.java

@@ -40,7 +40,7 @@ public class Constant {
     public static final String MODULE_YHSJFX="用户数据分析";
 
     public static final String PRO_CPGH="产品规划";
-    public static final String MODULE_SJHCP="数据化产品";
+    public static final String MODULE_SJHCP="数据化选品";
     public static final String MODULE_CPDJ="产品定价";
     public static final String MODULE_CPCYHDW="产品差异化定位";
     public static final String MODULE_CPJGGH="产品结构规划";

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

@@ -153,50 +153,42 @@ public class CptfController {
 
         if (Constant.MODULE_FBQDPG.equals(module)) {
             Boolean b = scoreService.deleteScore(userId, Constant.PRO_CPTFCS, module);
-            if (b) {
+
                 FbqdStuAnswerExample cpdjStuAnswerExample = new FbqdStuAnswerExample();
                 cpdjStuAnswerExample.createCriteria().andUserIdEqualTo(userId);
                 fbqdStuAnswerMapper.deleteByExample(cpdjStuAnswerExample);
                 return new ResultEntity<>(HttpStatus.OK, "重新实训成功");
-            } else {
+
-                return new ResultEntity<>(HttpStatus.BAD_REQUEST, "重新实训失败");
-            }
         }
 
         if (Constant.MODULE_CPTGCS.equals(module)) {
             Boolean b = scoreService.deleteScore(userId, Constant.PRO_CPTFCS, module);
-            if (b) {
+
                 CptgcsStuAnswerExample cptgcsStuAnswerExample = new CptgcsStuAnswerExample();
                 cptgcsStuAnswerExample.createCriteria().andUserIdEqualTo(userId);
                 cptgcsStuAnswerMapper.deleteByExample(cptgcsStuAnswerExample);
                 return new ResultEntity<>(HttpStatus.OK, "重新实训成功");
-            } else {
+
-                return new ResultEntity<>(HttpStatus.BAD_REQUEST, "重新实训失败");
-            }
         }
 
         if (Constant.MODULE_CPTGCS.equals(module)) {
             Boolean b = scoreService.deleteScore(userId, Constant.PRO_CPGH, module);
-            if (b) {
+
                 CptgcsStuAnswerExample cptgcsStuAnswerExample = new CptgcsStuAnswerExample();
                 cptgcsStuAnswerExample.createCriteria().andUserIdEqualTo(userId);
                 cptgcsStuAnswerMapper.deleteByExample(cptgcsStuAnswerExample);
                 return new ResultEntity<>(HttpStatus.OK, "重新实训成功");
-            } else {
+
-                return new ResultEntity<>(HttpStatus.BAD_REQUEST, "重新实训失败");
-            }
         }
 
         if (Constant.MODULE_CPYXDW.equals(module)) {
             Boolean b = scoreService.deleteScore(userId, Constant.PRO_CPGH, module);
-            if (b) {
+
                 CpyxdwStuAnswerExample cpyxdwStuAnswerExample = new CpyxdwStuAnswerExample();
                 cpyxdwStuAnswerExample.createCriteria().andUserIdEqualTo(userId);
                 cpyxdwStuAnswerMapper.deleteByExample(cpyxdwStuAnswerExample);
                 return new ResultEntity<>(HttpStatus.OK, "重新实训成功");
-            } else {
+
-                return new ResultEntity<>(HttpStatus.BAD_REQUEST, "重新实训失败");
-            }
         }
 
 

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

@@ -159,6 +159,15 @@ public class ProductPlanningController {
 
 
 
+            //太贵总结
+            String stuAnswerTooSum = stuAnswer.getTooSum();
+
+            String tooSum = answer.getTooSum();
+            //错误次数
+            int tooSumCount =compareListsUtil.compareErrorCount(stuAnswerTooSum, tooSum).getErrorCount();
+            count = count + tooSumCount;
+
+
             //有点贵百分百
             String stuTooExpensivePercentage = stuAnswer.getTooExpensivePercentage();
 
@@ -214,38 +223,32 @@ public class ProductPlanningController {
 
         if (Constant.MODULE_CPDJ.equals(module)) {
             Boolean b=scoreService.deleteScore(userId,Constant.PRO_CPGH,module);
-            if(b){
+
                 CpdjStuAnswerExample cpdjStuAnswerExample = new CpdjStuAnswerExample();
                 cpdjStuAnswerExample.createCriteria().andUserIdEqualTo(userId);
                 cpdjStuAnswerMapper.deleteByExample(cpdjStuAnswerExample);
                 return new ResultEntity<>(HttpStatus.OK, "重新实训成功");
-            }else {
+
-                return new ResultEntity<>(HttpStatus.BAD_REQUEST, "重新实训失败");
-            }
         }
 
         if (Constant.MODULE_CPCYHDW.equals(module)) {
             Boolean b=scoreService.deleteScore(userId,Constant.PRO_CPGH,module);
-            if(b){
+
                 CpcyhdwStuAnswerExample cpcyhdwStuAnswerExample = new CpcyhdwStuAnswerExample();
                 cpcyhdwStuAnswerExample.createCriteria().andUserIdEqualTo(userId);
                 cpcyhdwStuAnswerMapper.deleteByExample(cpcyhdwStuAnswerExample);
                 return new ResultEntity<>(HttpStatus.OK, "重新实训成功");
-            }else {
+
-                return new ResultEntity<>(HttpStatus.BAD_REQUEST, "重新实训失败");
-            }
         }
 
         if (Constant.MODULE_CPJGGH.equals(module)) {
             Boolean b=scoreService.deleteScore(userId,Constant.PRO_CPGH,module);
-            if(b){
+
                 CpjgghStuAnswerExample cpjgghStuAnswerExample = new CpjgghStuAnswerExample();
                 cpjgghStuAnswerExample.createCriteria().andUserIdEqualTo(userId);
                 cpjgghStuAnswerMapper.deleteByExample(cpjgghStuAnswerExample);
                 return new ResultEntity<>(HttpStatus.OK, "重新实训成功");
-            }else {
+
-                return new ResultEntity<>(HttpStatus.BAD_REQUEST, "重新实训失败");
-            }
         }
 
         return new ResultEntity<>(HttpStatus.BAD_REQUEST, "重新实训失败");

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

@@ -52,6 +52,9 @@ public class CpdjAnswer {
     @ApiModelProperty(notes = "步骤二 价格区间 （json格式存储）")
     private String priceRange;
 
+    @ApiModelProperty(notes = "太贵-累计总和(答案通过逗号隔开，没写就给空)")
+    private String tooSum;
+
     public String getId() {
         return id;
     }
@@ -163,4 +166,12 @@ public class CpdjAnswer {
     public void setPriceRange(String priceRange) {
         this.priceRange = priceRange == null ? null : priceRange.trim();
     }
+
+    public String getTooSum() {
+        return tooSum;
+    }
+
+    public void setTooSum(String tooSum) {
+        this.tooSum = tooSum == null ? null : tooSum.trim();
+    }
 }

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

@@ -58,6 +58,9 @@ public class CpdjStuAnswer {
     @ApiModelProperty(notes = "步骤二 价格区间 （json格式存储）")
     private String priceRange;
 
+    @ApiModelProperty(notes = "太贵-累计总和(答案通过逗号隔开，没写就给空)")
+    private String tooSum;
+
     public String getId() {
         return id;
     }
@@ -185,4 +188,12 @@ public class CpdjStuAnswer {
     public void setPriceRange(String priceRange) {
         this.priceRange = priceRange == null ? null : priceRange.trim();
     }
+
+    public String getTooSum() {
+        return tooSum;
+    }
+
+    public void setTooSum(String tooSum) {
+        this.tooSum = tooSum == null ? null : tooSum.trim();
+    }
 }

src/main/java/com/sztzjy/linkCommerce/service/impl/UserBehaviorProfilingAnaServiceImpl.java

@@ -63,7 +63,7 @@ public class UserBehaviorProfilingAnaServiceImpl implements UserBehaviorProfilin
 
             //只是自动保存了没有提交
             if (machineLearningList.get(0).getSubState() == 1) {
-                return new ResultEntity<>(HttpStatus.ACCEPTED, "请勿重复提交!");
+                return new ResultEntity<>(HttpStatus.OK, "请勿重复提交!");
             } else {
                 StuMachineLearning stuMachineLearning = machineLearningList.get(0);
                 Integer id = stuMachineLearning.getId();

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

@@ -89,6 +89,7 @@ public class CompareListsUtil {
         }
     }
     
+
     public Result compareErrorCount(String stulist, String answerList) {
         // 将字符串分割成数组
         String[] submitted = stulist.split(",");

src/main/resources/mappers/CpdjAnswerMapper.xml

@@ -18,6 +18,7 @@
     <result column="context" jdbcType="LONGVARCHAR" property="context" />
     <result column="too_expensive_percentage" jdbcType="LONGVARCHAR" property="tooExpensivePercentage" />
     <result column="price_range" jdbcType="LONGVARCHAR" property="priceRange" />
+    <result column="too_sum" jdbcType="LONGVARCHAR" property="tooSum" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -82,7 +83,7 @@
   </sql>
   <sql id="Blob_Column_List">
     cheap_sum, cheap_percentage, cost_effective_sum, cost_effective_percentage, expensive_sum, 
-    expensive_percentage, context, too_expensive_percentage, price_range
+    expensive_percentage, context, too_expensive_percentage, price_range, too_sum
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="com.sztzjy.linkCommerce.entity.CpdjAnswerExample" resultMap="ResultMapWithBLOBs">
     select
@@ -138,13 +139,13 @@
       cheap_percentage, cost_effective_sum, 
       cost_effective_percentage, expensive_sum, 
       expensive_percentage, context, too_expensive_percentage, 
-      price_range)
+      price_range, too_sum)
     values (#{id,jdbcType=VARCHAR}, #{optimalPrice,jdbcType=VARCHAR}, #{acceptablePrice,jdbcType=VARCHAR}, 
       #{acceptablePriceRange,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{cheapSum,jdbcType=LONGVARCHAR}, 
       #{cheapPercentage,jdbcType=LONGVARCHAR}, #{costEffectiveSum,jdbcType=LONGVARCHAR}, 
       #{costEffectivePercentage,jdbcType=LONGVARCHAR}, #{expensiveSum,jdbcType=LONGVARCHAR}, 
       #{expensivePercentage,jdbcType=LONGVARCHAR}, #{context,jdbcType=LONGVARCHAR}, #{tooExpensivePercentage,jdbcType=LONGVARCHAR}, 
-      #{priceRange,jdbcType=LONGVARCHAR})
+      #{priceRange,jdbcType=LONGVARCHAR}, #{tooSum,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.sztzjy.linkCommerce.entity.CpdjAnswer">
     insert into cpdj_answer
@@ -191,6 +192,9 @@
       <if test="priceRange != null">
         price_range,
       </if>
+      <if test="tooSum != null">
+        too_sum,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -235,6 +239,9 @@
       <if test="priceRange != null">
         #{priceRange,jdbcType=LONGVARCHAR},
       </if>
+      <if test="tooSum != null">
+        #{tooSum,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.sztzjy.linkCommerce.entity.CpdjAnswerExample" resultType="java.lang.Long">
@@ -288,6 +295,9 @@
       <if test="record.priceRange != null">
         price_range = #{record.priceRange,jdbcType=LONGVARCHAR},
       </if>
+      <if test="record.tooSum != null">
+        too_sum = #{record.tooSum,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -308,7 +318,8 @@
       expensive_percentage = #{record.expensivePercentage,jdbcType=LONGVARCHAR},
       context = #{record.context,jdbcType=LONGVARCHAR},
       too_expensive_percentage = #{record.tooExpensivePercentage,jdbcType=LONGVARCHAR},
-      price_range = #{record.priceRange,jdbcType=LONGVARCHAR}
+      price_range = #{record.priceRange,jdbcType=LONGVARCHAR},
+      too_sum = #{record.tooSum,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -366,6 +377,9 @@
       <if test="priceRange != null">
         price_range = #{priceRange,jdbcType=LONGVARCHAR},
       </if>
+      <if test="tooSum != null">
+        too_sum = #{tooSum,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -383,7 +397,8 @@
       expensive_percentage = #{expensivePercentage,jdbcType=LONGVARCHAR},
       context = #{context,jdbcType=LONGVARCHAR},
       too_expensive_percentage = #{tooExpensivePercentage,jdbcType=LONGVARCHAR},
-      price_range = #{priceRange,jdbcType=LONGVARCHAR}
+      price_range = #{priceRange,jdbcType=LONGVARCHAR},
+      too_sum = #{tooSum,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.sztzjy.linkCommerce.entity.CpdjAnswer">

src/main/resources/mappers/CpdjStuAnswerMapper.xml

@@ -20,6 +20,7 @@
     <result column="context" jdbcType="LONGVARCHAR" property="context" />
     <result column="too_expensive_percentage" jdbcType="LONGVARCHAR" property="tooExpensivePercentage" />
     <result column="price_range" jdbcType="LONGVARCHAR" property="priceRange" />
+    <result column="too_sum" jdbcType="LONGVARCHAR" property="tooSum" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -85,7 +86,7 @@
   </sql>
   <sql id="Blob_Column_List">
     cheap_sum, cheap_percentage, cost_effective_sum, cost_effective_percentage, expensive_sum, 
-    expensive_percentage, context, too_expensive_percentage, price_range
+    expensive_percentage, context, too_expensive_percentage, price_range, too_sum
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="com.sztzjy.linkCommerce.entity.CpdjStuAnswerExample" resultMap="ResultMapWithBLOBs">
     select
@@ -142,14 +143,14 @@
       cheap_percentage, cost_effective_sum, 
       cost_effective_percentage, expensive_sum, 
       expensive_percentage, context, too_expensive_percentage, 
-      price_range)
+      price_range, too_sum)
     values (#{id,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{optimalPrice,jdbcType=VARCHAR}, 
       #{acceptablePrice,jdbcType=VARCHAR}, #{acceptablePriceRange,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{displayStatus,jdbcType=INTEGER}, #{cheapSum,jdbcType=LONGVARCHAR}, 
       #{cheapPercentage,jdbcType=LONGVARCHAR}, #{costEffectiveSum,jdbcType=LONGVARCHAR}, 
       #{costEffectivePercentage,jdbcType=LONGVARCHAR}, #{expensiveSum,jdbcType=LONGVARCHAR}, 
       #{expensivePercentage,jdbcType=LONGVARCHAR}, #{context,jdbcType=LONGVARCHAR}, #{tooExpensivePercentage,jdbcType=LONGVARCHAR}, 
-      #{priceRange,jdbcType=LONGVARCHAR})
+      #{priceRange,jdbcType=LONGVARCHAR}, #{tooSum,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.sztzjy.linkCommerce.entity.CpdjStuAnswer">
     insert into cpdj_stu_answer
@@ -202,6 +203,9 @@
       <if test="priceRange != null">
         price_range,
       </if>
+      <if test="tooSum != null">
+        too_sum,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -252,6 +256,9 @@
       <if test="priceRange != null">
         #{priceRange,jdbcType=LONGVARCHAR},
       </if>
+      <if test="tooSum != null">
+        #{tooSum,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.sztzjy.linkCommerce.entity.CpdjStuAnswerExample" resultType="java.lang.Long">
@@ -311,6 +318,9 @@
       <if test="record.priceRange != null">
         price_range = #{record.priceRange,jdbcType=LONGVARCHAR},
       </if>
+      <if test="record.tooSum != null">
+        too_sum = #{record.tooSum,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -333,7 +343,8 @@
       expensive_percentage = #{record.expensivePercentage,jdbcType=LONGVARCHAR},
       context = #{record.context,jdbcType=LONGVARCHAR},
       too_expensive_percentage = #{record.tooExpensivePercentage,jdbcType=LONGVARCHAR},
-      price_range = #{record.priceRange,jdbcType=LONGVARCHAR}
+      price_range = #{record.priceRange,jdbcType=LONGVARCHAR},
+      too_sum = #{record.tooSum,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -399,6 +410,9 @@
       <if test="priceRange != null">
         price_range = #{priceRange,jdbcType=LONGVARCHAR},
       </if>
+      <if test="tooSum != null">
+        too_sum = #{tooSum,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -418,7 +432,8 @@
       expensive_percentage = #{expensivePercentage,jdbcType=LONGVARCHAR},
       context = #{context,jdbcType=LONGVARCHAR},
       too_expensive_percentage = #{tooExpensivePercentage,jdbcType=LONGVARCHAR},
-      price_range = #{priceRange,jdbcType=LONGVARCHAR}
+      price_range = #{priceRange,jdbcType=LONGVARCHAR},
+      too_sum = #{tooSum,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.sztzjy.linkCommerce.entity.CpdjStuAnswer">