fix 前培次数

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassStudentController.java

@@ -186,4 +186,19 @@ public class ClassStudentController extends BaseController {
     public AjaxResult<Void> pushInfo(@RequestBody ClassGradeUserQueryBo  bo) {
         return toAjax(iClassGradeUserService.pushOfficialInfo(bo) ? 1 : 0);
     }
+
+    /**
+     * 官方信息推送
+     */
+    @ApiOperation("官方信息推送")
+    @PreAuthorize("@ss.hasPermi('app:user:edit')")
+    @PostMapping("/test")
+    public AjaxResult<Void> test(@RequestBody ClassGradeUserQueryBo  bo) {
+        /*ClassGradeUserQueryBo classGradeUserQueryBo = new ClassGradeUserQueryBo();
+        classGradeUserQueryBo.setUserId(bo.getUserId());
+        classGradeUserQueryBo.setGradeId(bo.getGradeId());
+        classGradeUserQueryBo.setGoodsId(bo.getGoodsId());*/
+        Integer gradePeriodStatus = iClassGradeUserService.updateUserPeriodStatus(bo);
+        return toAjax(gradePeriodStatus);
+    }
 }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/UserSubscribeController.java

@@ -319,9 +319,9 @@ public class UserSubscribeController extends BaseController {
     /**
      * 导出前培错误数据
      */
-    @ApiOperation("导出前培错误数据")
+    @ApiOperation("导出登记错误数据")
     @PreAuthorize("@ss.hasPermi('system:profile:export')")
-    @Log(title = "导出前培错误数据", businessType = BusinessType.EXPORT)
+    @Log(title = "导出登记错误数据", businessType = BusinessType.EXPORT)
     @PostMapping("/exportErrorUpdate")
     public AjaxResult<Map<String,Object>> exportErrorUpdate(@RequestBody List<UserSubscribeErrorImport> bo) {
         List<UserSubscribeErrorImport> errorList = bo;
@@ -329,4 +329,6 @@ public class UserSubscribeController extends BaseController {
         String timeStr= LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         return util.exportEasyExcel(util.exportEasyData(errorList), "导出登记错误数据"+timeStr);
     }
+
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserSubscribeMapper.java

@@ -20,6 +20,8 @@ public interface UserSubscribeMapper extends BaseMapper<UserSubscribe> {
 
     Long selectGoodsId(String code);
 
+    String selectGoodsName(String code);
+
     Long selectUserId(@Param("userName") String userName,@Param("idCard")  String idCard);
 
     Long selectBeforeId(String beforeName);

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -463,6 +463,14 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
+
+            String goodsName = baseMapper.selectGoodsName(userSubscribeImport.getCode());
+            if (!goodsName.equals(userSubscribeImport.getGoodsName())) {
+                userSubscribeImport.setCause("商品名称错误");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
+
             userSubscribeAddBo.setGoodsId(goodsId);
             //查询学员Id
             if (StringUtils.isEmpty(userSubscribeImport.getUserName()) || userSubscribeImport.getIdCard() == null) {
@@ -614,6 +622,14 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
+
+            String goodsName = baseMapper.selectGoodsName(userSubscribeImport.getCode());
+            if (!goodsName.equals(userSubscribeImport.getGoodsName())) {
+                userSubscribeImport.setCause("商品名称错误");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
+
             userSubscribeAddBo.setGoodsId(goodsId);
             //查询学员Id
             if (StringUtils.isEmpty(userSubscribeImport.getUserName()) || userSubscribeImport.getIdCard() == null) {
@@ -702,7 +718,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             }
 
 
-            if (userSubscribeImport.getApplySiteExamTime() != null) {
+            if (Validator.isNotEmpty(userSubscribeImport.getApplySiteExamTime())) {
                 userSubscribeAddBo.setApplySiteExamTime(Convert.toLong(DateUtils.dateTime("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTime()).getTime())/1000);
             } else {
                 userSubscribeImport.setCause("考试时间未填");
@@ -710,7 +726,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 continue;
             }
 
-            if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteTime())) {
+            if (Validator.isNotEmpty(userSubscribeImport.getApplySiteTime())) {
                 String[] split = userSubscribeImport.getApplySiteTime().split("-");
                 if (split.length < 2) {
                     userSubscribeImport.setCause("考试时间段错误");
@@ -725,7 +741,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeAddBo.setApplySiteStartTime(startTime);
                 userSubscribeAddBo.setApplySiteEndTime(endTime);
             } else {
-                userSubscribeImport.setCause("考试时间段未填");
+                userSubscribeImport.setCause("考试时间段错误");
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
@@ -803,6 +819,14 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
+
+            String goodsName = baseMapper.selectGoodsName(userSubscribeImport.getCode());
+            if (!goodsName.equals(userSubscribeImport.getGoodsName())) {
+                userSubscribeImport.setCause("商品名称错误");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
+
             userSbusciEditBo.setGoodsId(goodsId);
             //查询学员Id
             if (StringUtils.isEmpty(userSubscribeImport.getUserName()) || userSubscribeImport.getIdCard() == null) {

zhongzheng-system/src/main/resources/mapper/modules/user/UserCourseAnswerMapper.xml

@@ -105,5 +105,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND g.business_id = #{businessId}
             </if>
         </if>
+        order by uca.update_time desc
     </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -162,6 +162,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by us.create_time desc
     </select>
 
+    <select id="selectGoodsName" parameterType="string"  resultType="String">
+        SELECT g.goods_name FROM goods g where g.`code`=#{code} and g.status = 1
+    </select>
 
     <select id="selectGoodsId" parameterType="string"  resultType="Long">
         SELECT g.goods_id FROM goods g where g.`code`=#{code} and g.status = 1