提交bug

coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java

@@ -75,7 +75,7 @@ public class EmployeeTrainingDAO {
         statusList.add(3);
         Example example = new Example(EmployeeTrainingDO.class);
         example.createCriteria().andCondition("assessment_num = assessment_total_num").andEqualTo("theoretical_exam_status", 0)
-                .andIn("assessment_status", statusList);
+                .andIn("assessmentStatus", statusList);
         return employeeTrainingMapper.selectByExample(example);
     }
 
@@ -84,7 +84,7 @@ public class EmployeeTrainingDAO {
         statusList.add(0);
         statusList.add(1);
         Example example = new Example(EmployeeTrainingDO.class);
-        example.createCriteria().andIn("assessment_status", statusList);
+        example.createCriteria().andIn("assessmentStatus", statusList);
         return employeeTrainingMapper.selectCountByExample(example);
     }
 }

coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml

@@ -143,6 +143,12 @@
         <if test="shopId != null">
             and u.shop_id = #{shopId}
         </if>
+        <if test="status != null and status == 0">
+            and e.assessment_total_num > e.assessment_num
+        </if>
+        <if test="status != null and status == 1">
+            and e.assessment_total_num = e.assessment_num
+        </if>
     </select>
     <select id="assessmentUserList" resultType="com.cool.store.vo.EmployeeTrainingVO">
         select

coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java

@@ -568,6 +568,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
         employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void assessmentUserCommit(EmployeeAssessmentCommitListRequest request) {
         if (CollectionUtils.isEmpty(request.getList())) {