fix 批量修改

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

@@ -150,15 +150,11 @@ public class UserSubscribeController extends BaseController {
     @ApiOperation("导入修改预约考试模板")
     @PreAuthorize("@ss.hasPermi('system:apply:import')")
     @PostMapping("/importUpdateData")
-    public AjaxResult<UserSubscribeImport> importUpdateData(MultipartFile file) throws Exception {
+    public AjaxResult<Map<String, Object>> importUpdateData(MultipartFile file) throws Exception {
         ExcelUtil<UserSubscribeImport> util = new ExcelUtil<UserSubscribeImport>(UserSubscribeImport.class);
         List<UserSubscribeImport> userSubscribeImportList = util.importExcel(file.getInputStream());
-        List<UserSubscribeImport> userSubscribeImport = iUserSubscribeService.importUpdateData(userSubscribeImportList);
-        if (!CollectionUtils.isEmpty(userSubscribeImport)) {
-            return util.exportExcel(userSubscribeImport, "导入失败原因，请勿将此excel修改后再次上传，请在导入模板修改上传");
-        }
-        UserSubscribeImport userSubscribeImport1 = null;
-        return AjaxResult.successNoMsg(userSubscribeImport1);
+        Map<String, Object> userSubscribeImport = iUserSubscribeService.importUpdateData(userSubscribeImportList);
+        return AjaxResult.success(userSubscribeImport);
     }
 
     /**

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

@@ -61,7 +61,7 @@ public interface IUserSubscribeService extends IService<UserSubscribe> {
 
 	Map<String,Object> importTrainData(List<UserSubscribeImport> userSubscribeImportList) throws ParseException;
 
-	List<UserSubscribeImport> importUpdateData(List<UserSubscribeImport> userSubscribeImportList);
+	Map<String, Object> importUpdateData(List<UserSubscribeImport> userSubscribeImportList);
 
 	List<UserSubscribeVo> timeSend();
 

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

@@ -5,10 +5,12 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.alisms.service.IAliSmsService;
+import com.zhongzheng.modules.course.domain.CourseBusiness;
 import com.zhongzheng.modules.exam.mapper.ExamApplyMapper;
 import com.zhongzheng.modules.exam.vo.ExamApplySiteTimeVo;
 import com.zhongzheng.modules.exam.vo.ExamApplySiteVo;
@@ -711,7 +713,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<UserSubscribeImport> importUpdateData(List<UserSubscribeImport> userSubscribeImportList) {
+    public Map<String, Object> importUpdateData(List<UserSubscribeImport> userSubscribeImportList) {
         if (CollectionUtils.isEmpty(userSubscribeImportList)) {
             throw new IllegalArgumentException("请勿导入空表格");
         }
@@ -784,6 +786,11 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 }
             }*/
 
+            if (StringUtils.isEmpty(userSubscribeImport.getExamStatus())) {
+                userSubscribeImport.setCause("考试登记未填");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
             if (!StringUtils.isEmpty(userSubscribeImport.getExamStatus())) {
                 if (userSubscribeImport.getExamStatus().equals("待登记")) {
                     userSbusciEditBo.setExamStatus(0);
@@ -830,7 +837,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             }
             userSbusciEditBo.setSubscribeId(subscribeId);
 
-            if (!StringUtils.isEmpty(userSubscribeImport.getStudentTypeName())) {
+/*            if (!StringUtils.isEmpty(userSubscribeImport.getStudentTypeName())) {
                 if (userSubscribeImport.getStudentTypeName().equals("非补考学员")) {
                     userSbusciEditBo.setStudentType(1);
                 } else {
@@ -840,7 +847,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImport.setCause("学员报名类型有误");
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
-            }
+            }*/
 
             if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteAddress())) {
                 userSbusciEditBo.setApplySiteAddress(userSubscribeImport.getApplySiteAddress());
@@ -879,15 +886,15 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             }
 
 
-            if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteAddressTrain())) {
+           /* if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteAddressTrain())) {
                 userSbusciEditBo.setApplySiteAddressTrain(userSubscribeImport.getApplySiteAddressTrain());
             }
 
             if (userSubscribeImport.getApplySiteExamTrainTime() != null) {
                 userSbusciEditBo.setApplySiteExamTrainTime(Convert.toLong(DateUtils.dateTime("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTrainTime()).getTime()/1000));
-            }
+            }*/
 
-            if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteTrainTime())) {
+           /* if (!StringUtils.isEmpty(userSubscribeImport.getApplySiteTrainTime())) {
                 String[] split = userSubscribeImport.getApplySiteTrainTime().split(":");
                 if (split.length < 2) {
                     userSubscribeImport.setCause("考试时间段错误");
@@ -896,22 +903,32 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 }
                 String startTime = split[0];
                 String endTime = split[1];
-               /* startTime = startTime.replace(":", "-");
-                endTime = endTime.replace(":", "-");*/
+               *//* startTime = startTime.replace(":", "-");
+                endTime = endTime.replace(":", "-");*//*
 
                 userSbusciEditBo.setApplySiteStartTrainTime(startTime);
                 userSbusciEditBo.setApplySiteEndTrainTime(endTime);
-            }
+            }*/
 
             userSbusciEditBo.setUpdateTime(DateUtils.getNowTime());
             this.updateById(userSbusciEditBo);
-
+            if(!userSubscribeImport.getExamStatus().equals("正常")){
+                //非正常 考试【成绩、结果、证书】数据清零
+                LambdaUpdateWrapper<UserSubscribe> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+                objectLambdaUpdateWrapper.eq(UserSubscribe::getSubscribeId, userSbusciEditBo.getSubscribeId());
+                objectLambdaUpdateWrapper.set(UserSubscribe::getPerformance, null);
+                objectLambdaUpdateWrapper.set(UserSubscribe::getResult,null);
+                objectLambdaUpdateWrapper.set(UserSubscribe::getCertificateCode,null);
+                objectLambdaUpdateWrapper.set(UserSubscribe::getUpdateTime,DateUtils.getNowTime());
+                this.update(null, objectLambdaUpdateWrapper);
+            }
             if (userSubscribeImport.getSubscribeStatus().equals("取消")) {
                 userSbusciEditBo.setSubscribeStatus(0);
                 UserSubscribeEditBo userSubscribeEditBo = new UserSubscribeEditBo();
                 Long[] s = new Long[]{
                         userSbusciEditBo.getSubscribeId()
                 };
+
                 userSubscribeEditBo.setSubscribeId(s);
                 sendExamcancel(userSubscribeEditBo);
             }
@@ -920,7 +937,10 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             }
             successImports.add(userSubscribeImport);
         }
-        return userSubscribeImports;
+        Map<String,Object> resultMap = new HashMap<>();
+        resultMap.put("errorList",userSubscribeImports);
+        resultMap.put("successList",successImports);
+        return resultMap;
     }
 
     private void sendExamPass(UserSubscribe bo) {