评价模块调整

src/main/java/com/xjrsoft/module/evaluate/service/impl/EvaluateResultServiceImpl.java

@@ -310,20 +310,23 @@ public class EvaluateResultServiceImpl extends MPJBaseServiceImpl<EvaluateResult
             return "已经评价，请勿重复评价";
         }
 
-        //评价结果保存
-        List<AddEvaluateResultDto> resultList = dto.getResultList();
-        for (AddEvaluateResultDto addEvaluateResultDto : resultList) {
-            EvaluateResult evaluateResult = BeanUtil.toBean(addEvaluateResultDto, EvaluateResult.class);
-            evaluateResult.setEvaluatedObject(mobileResultPageVo.getEvaluateType());
-            evaluateResult.setUserId(Long.parseLong(mobileResultPageVo.getEvaluateUserId()));
-            evaluateResult.setEvaluatedObjectId(Long.parseLong(mobileResultPageVo.getEvaluateObjectId()));
-            evaluateResult.setDeleteMark(DeleteMark.NODELETE.getCode());
-            evaluateResult.setEnabledMark(EnabledMark.ENABLED.getCode());
-            evaluateResult.setCreateDate(createDate);
-            evaluateResult.setSubmitRecordId(mobileResultPageVo.getEvaluateSubmitRecordId());
-            evaluateResultMapper.insert(evaluateResult);
+        if(dto.getSubmitType() != null && dto.getSubmitType() == 1){
+            //评价结果保存
+            List<AddEvaluateResultDto> resultList = dto.getResultList();
+            for (AddEvaluateResultDto addEvaluateResultDto : resultList) {
+                EvaluateResult evaluateResult = BeanUtil.toBean(addEvaluateResultDto, EvaluateResult.class);
+                evaluateResult.setEvaluatedObject(mobileResultPageVo.getEvaluateType());
+                evaluateResult.setUserId(Long.parseLong(mobileResultPageVo.getEvaluateUserId()));
+                evaluateResult.setEvaluatedObjectId(Long.parseLong(mobileResultPageVo.getEvaluateObjectId()));
+                evaluateResult.setDeleteMark(DeleteMark.NODELETE.getCode());
+                evaluateResult.setEnabledMark(EnabledMark.ENABLED.getCode());
+                evaluateResult.setCreateDate(createDate);
+                evaluateResult.setSubmitRecordId(mobileResultPageVo.getEvaluateSubmitRecordId());
+                evaluateResultMapper.insert(evaluateResult);
+            }
         }
 
+
         //修改答题人状态
         evaluateExecuterMapper.updateById(new EvaluateExecuter(){{
             setId(Long.parseLong(mobileResultPageVo.getEvaluateUserId()));

src/main/resources/mapper/evaluate/EvaluateResultMapper.xml

@@ -194,7 +194,7 @@
         INNER JOIN evaluate_manage_item t2 ON t1.evaluate_item_id = t2.id
         INNER JOIN evaluate_manage t3 ON t3.id = t2.evaluate_manage_id
         INNER JOIN evaluate_template t4 ON t3.evaluate_template_id = t4.id
-        WHERE t1.delete_mark = 0 AND t2.delete_mark = 0 AND t3.delete_mark
+        WHERE t1.delete_mark = 0 AND t2.delete_mark = 0 AND t3.delete_mark = 0
         AND t4.delete_mark = 0
         AND t3.year = #{dto.year}
         AND t3.month = #{dto.month}

src/test/java/com/xjrsoft/module/job/JianyuekbScheduleTaskTest2.java

@@ -206,19 +206,19 @@ class JianyuekbScheduleTaskTest2 {
                 long between = ChronoUnit.DAYS.between(startDateObj, endDateObj);
                 int times = Integer.parseInt(((between / 7) + 1) + "");
 
-//                for (int index = 0; index < times; index ++) {
-//                    LocalDate statrTime = startDateObj.plusDays(index * 7L);
-//                    String startDate = statrTime.format(formatter);
-//                    LocalDate endTime = statrTime.plusDays(6L);
-//                    if(endTime.isAfter(endDateObj)){
-//                        endTime = endDateObj;
-//                    }
-//
-//                    String endDate = endTime.format(formatter);
-//                    //获取课表并存到数据库
-//                    JsonArray scheduleInfo = dataUtil.getScheduleInfoByGrade(eduYearSerialNo, startDate, endDate);
-//                    allScheduleInfo.addAll(scheduleInfo);
-//                }
+                for (int index = 0; index < times; index ++) {
+                    LocalDate statrTime = startDateObj.plusDays(index * 7L);
+                    String startDate = statrTime.format(formatter);
+                    LocalDate endTime = statrTime.plusDays(6L);
+                    if(endTime.isAfter(endDateObj)){
+                        endTime = endDateObj;
+                    }
+
+                    String endDate = endTime.format(formatter);
+                    //获取课表并存到数据库
+                    JsonArray scheduleInfo = dataUtil.getScheduleInfoByGrade(eduYearSerialNo, startDate, endDate);
+                    allScheduleInfo.addAll(scheduleInfo);
+                }
 
                 updSql = "update course_receive_msg set is_callback = 1 where id = " + receiveMsg.get("id").toString();
                 SqlRunnerAdapter.db().update(updSql);