Merge remote-tracking branch 'origin/master'

danger-manage-admin/src/main/java/com/zehong/web/controller/safetyManagement/TSafetyCommitmentAnnouncementController.java

 package com.zehong.web.controller.safetyManagement;
 
-import java.util.List;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -45,6 +48,29 @@ public class TSafetyCommitmentAnnouncementController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 新增安全承诺公告验证
+     */
+    @GetMapping("/getCurrent")
+    public AjaxResult getCurrent(TSafetyCommitmentAnnouncement tSafetyCommitmentAnnouncement)
+    {
+        Calendar calender = Calendar.getInstance();
+        calender.setTime(new Date());
+        String endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(calender.getTime());
+
+        calender.set(Calendar.HOUR_OF_DAY, 0);
+        calender.set(Calendar.MINUTE, 0);
+        calender.set(Calendar.SECOND, 0);
+        String beginTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(calender.getTime());
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("beginTime", beginTime);
+        map.put("endTime", endTime);
+        tSafetyCommitmentAnnouncement.setParams(map);
+        List<TSafetyCommitmentAnnouncement> list = tSafetyCommitmentAnnouncementService.selectTSafetyCommitmentAnnouncementList(tSafetyCommitmentAnnouncement);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 导出安全承诺公告列表
      */

danger-manage-system/src/main/java/com/zehong/system/service/impl/TTrainCourseServiceImpl.java

@@ -196,7 +196,7 @@ public class TTrainCourseServiceImpl implements ITTrainCourseService
         }
         //新增考试人员
         List<JSONObject> personList = JSONObject.parseArray(course.getTestPersons(),JSONObject.class);
-        List<String> persons = personList.stream().map(item ->(String)item.get("staffId")).collect(Collectors.toList());
+        List<String> persons = personList.stream().map(item ->(String)item.get("peoPleId")).collect(Collectors.toList());
         tTrainCourseMapper.insertUserCourse(tTrainCourse.getCourseId(),persons,tTrainCourse.getPersonnelType());
         tTrainCourse.setStatus(1);
         tTrainCourse.setReleaseTime(new Date());

danger-manage-web/src/api/safetyManagement/announcement.js

@@ -9,6 +9,15 @@ export function listAnnouncement(query) {
   })
 }
 
+// 查询安全承诺公告详细
+export function getCurrent(query) {
+  return request({
+    url: '/safetyManagement/announcement/getCurrent',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询安全承诺公告详细
 export function getAnnouncement(id) {
   return request({