TroubleAndRisk.git

			@@ -1,5 +1,6 @@
			package com.ruoyi.project.tr.specialCheck.controller;

			import com.ruoyi.common.utils.BeanCopyUtils;
			import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
			import com.ruoyi.doublePrevention.service.baseService.PreventCJReportDangerInfoService;
			import com.ruoyi.doublePrevention.vo.ResultVO;
			@@ -8,10 +9,10 @@
			import com.ruoyi.framework.web.page.TableDataInfo;
			import com.ruoyi.project.tr.riskList.domain.RiskList;
			import com.ruoyi.project.tr.riskList.service.IRiskListService;
			import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
			import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogEditBO;
			import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogQueryBO;
			import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckScoreAndDangerLogDTO;
			import com.ruoyi.project.tr.specialCheck.domin.DTO.TbSpecialCheckScoreAndDangerLogRespDTO;
			import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
			import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckScoreAndDangerLog;
			import com.ruoyi.project.tr.specialCheck.service.SpecialCheckScoreAndDangerDangerLogService;
			import com.ruoyi.project.tr.specialCheck.service.TbBaseCheckService;
			@@ -20,6 +21,9 @@
			import org.springframework.ui.ModelMap;
			import org.springframework.web.bind.annotation.*;

			import java.sql.Date;
			import java.time.Instant;
			import java.time.ZoneId;
			import java.util.List;

			/**
			@@ -31,7 +35,7 @@
			@RequestMapping("/tr/TBSpecialCheckScoreAndDangerLog")
			public class TBSpecialCheckScoreAndDangerLogController extends BaseController
			{
			private String prefix = "tr/specialCheckScoreAndDangerLog";
			private String prefix = "tr/TBSpecialCheckScoreAndDangerLog";

			@Autowired
			private SpecialCheckScoreAndDangerDangerLogService scoreAndDangerDangerLogService;
			@@ -61,10 +65,26 @@
			{

			ResultVO<List<TbSpecialCheckScoreAndDangerLog>> resultVO = scoreAndDangerDangerLogService.selectSpecialCheckScoreAndDangerLogPage(scoreAndDangerLogBO);

			List<TbSpecialCheckScoreAndDangerLogRespDTO> data = (List<TbSpecialCheckScoreAndDangerLogRespDTO>) resultVO.getData();
			List<TbSpecialCheckScoreAndDangerLog> scoreList = (List<TbSpecialCheckScoreAndDangerLog>) resultVO.getData();
			List<TbSpecialCheckScoreAndDangerLogDTO> tbSpecialCheckScoreAndDangerLogDTOS = BeanCopyUtils.copyBeanList(data, TbSpecialCheckScoreAndDangerLogDTO.class);
			for (TbSpecialCheckScoreAndDangerLogDTO score : tbSpecialCheckScoreAndDangerLogDTOS) {
			for (TbSpecialCheckScoreAndDangerLog datum : scoreList) {
			if (datum.getId().equals(score.getId())){
			Instant checkDate = datum.getCheckDate().atZone(ZoneId.systemDefault()).toInstant();
			score.setCheckDate(Date.from(checkDate));

			Instant createDate = datum.getCreateDate().atZone(ZoneId.systemDefault()).toInstant();
			score.setCreateDate(Date.from(createDate));

			TableDataInfo dataTable = getDataTable(data);
			Instant updateDate = datum.getUpdateDate().atZone(ZoneId.systemDefault()).toInstant();
			score.setUpdateDate(Date.from(updateDate));
			}
			}
			}

			TableDataInfo dataTable = getDataTable(tbSpecialCheckScoreAndDangerLogDTOS);
			dataTable.setTotal(resultVO.getCount());

			return dataTable;
			@@ -73,8 +93,9 @@
			/**
			* 新增
			*/
			@GetMapping("/add")
			public String add(ModelMap mmap)
			@GetMapping("/add/{id}")
			// public String add(ModelMap mmap)
			public String add(@PathVariable("id") String id, ModelMap mmap)
			{
			List<RiskList> riskList = riskListService.listHazardSource();
			List<PreventCJReportDangerInfo> dangerList = preventCJReportDangerInfoService.getDangerListForCheckTask();
			@@ -89,9 +110,9 @@
			*/
			@PostMapping("/add")
			@ResponseBody
			public AjaxResult addSpecialItemDanger(TbSpecialCheckScoreAndDangerLog scoreAndDangerLog){
			public AjaxResult addSpecialItemDanger(TbSpecialCheckScoreAndDangerLogEditBO scoreAndDangerEditLog){

			ResultVO<TbSpecialCheckScoreAndDangerLog> resultVO = scoreAndDangerDangerLogService.addSpecialScoreAndDanger(scoreAndDangerLog);
			ResultVO<TbSpecialCheckScoreAndDangerLog> resultVO = scoreAndDangerDangerLogService.addSpecialScoreAndDanger(scoreAndDangerEditLog);
			String code = resultVO.getCode();
			if ("200".equals(code)){
			return toAjax(1);
			@@ -100,12 +121,25 @@
			}
			}

			@GetMapping("/edit/{id}")
			public String edit(@PathVariable("id") Long indexId, ModelMap mmap)
			@GetMapping("/edit/{indexId}")
			public String edit(@PathVariable("indexId") Long indexId, ModelMap mmap)
			{
			TbSpecialCheckScoreAndDangerLog specialCheckItem = scoreAndDangerDangerLogService.getSpecialCheckScoreAndDangerLogByIndexId(indexId);
			mmap.put("specialCheckItem",specialCheckItem);
			TbSpecialCheckScoreAndDangerLogDTO data = BeanCopyUtils.copyBean(specialCheckItem, TbSpecialCheckScoreAndDangerLogDTO.class);

			Instant checkDate = specialCheckItem.getCheckDate().atZone(ZoneId.systemDefault()).toInstant();
			data.setCheckDate(Date.from(checkDate));

			Instant createDate = specialCheckItem.getCreateDate().atZone(ZoneId.systemDefault()).toInstant();
			data.setCreateDate(Date.from(createDate));

			Instant updateDate = specialCheckItem.getUpdateDate().atZone(ZoneId.systemDefault()).toInstant();
			data.setUpdateDate(Date.from(updateDate));
			mmap.put("specialCheckItem",data);
			List<RiskList> riskList = riskListService.listHazardSource();
			List<PreventCJReportDangerInfo> dangerList = preventCJReportDangerInfoService.getDangerListForCheckTask();
			mmap.put("hazardList", riskList);
			mmap.put("dangerList", dangerList);
			// TbBaseCheckTaskBO tbBaseCheckTaskBO = new TbBaseCheckTaskBO();
			// ResultVO<List<TbBaseCheckTask>> listResultVO = tbBaseCheckService.selectTbBaseCheckTaskPage(tbBaseCheckTaskBO);
			// Object data = listResultVO.getData();
			@@ -113,14 +147,41 @@
			return prefix + "/edit";
			}

			@GetMapping("/detail/{indexId}")
			public String detail(@PathVariable("indexId") Long indexId, ModelMap mmap)
			{
			TbSpecialCheckScoreAndDangerLog specialCheckItem = scoreAndDangerDangerLogService.getSpecialCheckScoreAndDangerLogByIndexId(indexId);
			TbSpecialCheckScoreAndDangerLogDTO data = BeanCopyUtils.copyBean(specialCheckItem, TbSpecialCheckScoreAndDangerLogDTO.class);

			Instant checkDate = specialCheckItem.getCheckDate().atZone(ZoneId.systemDefault()).toInstant();
			data.setCheckDate(Date.from(checkDate));

			Instant createDate = specialCheckItem.getCreateDate().atZone(ZoneId.systemDefault()).toInstant();
			data.setCreateDate(Date.from(createDate));

			Instant updateDate = specialCheckItem.getUpdateDate().atZone(ZoneId.systemDefault()).toInstant();
			data.setUpdateDate(Date.from(updateDate));
			mmap.put("specialCheckItem",data);
			List<RiskList> riskList = riskListService.listHazardSource();
			List<PreventCJReportDangerInfo> dangerList = preventCJReportDangerInfoService.getDangerListForCheckTask();
			mmap.put("hazardList", riskList);
			mmap.put("dangerList", dangerList);

			// TbBaseCheckTaskBO tbBaseCheckTaskBO = new TbBaseCheckTaskBO();
			// ResultVO<List<TbBaseCheckTask>> listResultVO = tbBaseCheckService.selectTbBaseCheckTaskPage(tbBaseCheckTaskBO);
			// Object data = listResultVO.getData();
			// mmap.put("tbBaseCheckTask", data);
			return prefix + "/detail";
			}

			/**
			* 修改保存
			*/
			@PostMapping("/edit")
			@ResponseBody
			public AjaxResult editSave(TbSpecialCheckScoreAndDangerLog scoreAndDangerLog)
			public AjaxResult editSave(TbSpecialCheckScoreAndDangerLogEditBO scoreAndDangerEditLog)
			{
			ResultVO<TbSpecialCheckScoreAndDangerLog> resultVO = scoreAndDangerDangerLogService.updateSpecialCheckScoreAndDangerLog(scoreAndDangerLog);
			ResultVO<TbSpecialCheckScoreAndDangerLog> resultVO = scoreAndDangerDangerLogService.updateSpecialCheckScoreAndDangerLog(scoreAndDangerEditLog);
			String code = resultVO.getCode();
			if ("200".equals(code)){
			return toAjax(1);