fix 模考列表

zhongzheng-system/src/main/java/com/zhongzheng/modules/mock/service/impl/MockApplyServiceImpl.java

@@ -23,6 +23,8 @@ import com.github.pagehelper.Page;
 import com.zhongzheng.modules.mock.mapper.MockApplyMapper;
 import com.zhongzheng.modules.mock.vo.MockApplyVo;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -144,7 +146,11 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
                     mockMajorSubjectAddBo.getMockMajorSubjectTimeAddBoList().stream().forEach(mockMajorSubjectTimeAddBo -> {
                         MockMajorSubjectTimeAddBo bo4 = new MockMajorSubjectTimeAddBo();
                         bo4.setMockMajorSubjectId(mockMajorSubjectAdd.getMockMajorSubjectId());
-                        bo4.setExamTime(mockMajorSubjectTimeAddBo.getExamTime());
+                        try {
+                            bo4.setExamTime(formatTime(mockMajorSubjectTimeAddBo.getExamTime(), mockMajorSubjectTimeAddBo.getStartTime()));
+                        } catch (ParseException e) {
+                            e.printStackTrace();
+                        }
                         bo4.setStartTime(mockMajorSubjectTimeAddBo.getStartTime());
                         bo4.setEndTime(mockMajorSubjectTimeAddBo.getEndTime());
                         MockMajorSubjectTime mockMajorSubjectTime = BeanUtil.toBean(bo4, MockMajorSubjectTime.class);
@@ -167,6 +173,16 @@ public class MockApplyServiceImpl extends ServiceImpl<MockApplyMapper, MockApply
         return this.updateById(update);
     }
 
+    private Long formatTime(Long startTime, String addTime) throws ParseException {
+        Long times = startTime*1000;//时间戳
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        String dateString = formatter.format(times);
+        String dateForma =null;
+        dateForma = dateString+" "+addTime.replace("-", ":");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        return sdf.parse(dateForma).getTime() / 1000;
+    }
+
     /**
      * 保存前的数据校验
      *