fix 时间格式

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

@@ -298,7 +298,7 @@ public class UserSubscribeController extends BaseController {
                     export.setResult("不通过");
                 }
             }
-            export.setApplySiteExamTime(DateUtils.timestampToDateFormat(vo.getApplySiteExamTime(),"yyyy/MM/dd"));
+            export.setApplySiteExamTime(DateUtils.timestampToDateFormat(vo.getApplySiteExamTime()));
             export.setApplySiteTime(vo.getApplySiteStartTime()+"-"+vo.getApplySiteEndTime());
             eList.add(export);
         }

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/DateUtils.java

@@ -95,14 +95,14 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         }
     }
 
-    public static String timestampToDateFormat(Long times,String format){
+    public static String timestampToDateFormat(Long times){
         if(Validator.isEmpty(times)){
             return "";
         }
         long t = times.longValue();
         t = t * 1000;
         Date date = new Date(t);
-        return DateFormatUtils.format(date,format);
+        return DateFormatUtils.format(date, "yyyy/MM/dd");
     }
 
     public static String timestampToDate(Long times){

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

@@ -310,6 +310,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditMoreBo(List<UserAppSubscribeEditBo> list) {
         boolean b = false;
         for(UserAppSubscribeEditBo editBo : list){
@@ -318,6 +319,21 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             UserSubscribe update = new UserSubscribe();
             update.setSubscribeId(subscribe);
             update.setSubscribeStatus(editBo.getSubscribeStatus());
+            if(editBo.getExamStatus().equals(1)){
+                update.setPerformance(editBo.getPerformance());
+                update.setCertificateCode(editBo.getCertificateCode());
+                update.setResult(editBo.getResult());
+            }else{
+                //非正常 考试【成绩、结果、证书】数据清零
+                LambdaUpdateWrapper<UserSubscribe> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+                objectLambdaUpdateWrapper.eq(UserSubscribe::getSubscribeId, subscribe);
+                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 (editBo.getSubscribeStatus() != null && editBo.getSubscribeStatus().equals(2)) {
                 UserSubscribeEditBo userSubscribeEditBo = new UserSubscribeEditBo();
                 Long[] s = new Long[]{

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserSubscribeExportVo.java

@@ -42,7 +42,7 @@ public class UserSubscribeExportVo {
 
 	/** 开始日期 */
 	@Excel(name = "*考试日期")
-	@ApiModelProperty("报考日期")
+	@ApiModelProperty("考试日期")
 	private String applySiteExamTime;
 
 	/** 考试开始时间段 */