From a721c9ddcd853b9c5682c8d700ac9c614d116e36 Mon Sep 17 00:00:00 2001 From: chenxinying <1039655633@qq.com> Date: Thu, 1 Feb 2024 09:03:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A=E5=8F=97?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eightwork/ConfinedspaceController.java | 94 +++++++++++++++++++ .../impl/ConfinedspaceServiceImpl.java | 1 - .../eightwork/ConfinedspaceMapper.xml | 1 + .../ConfinedspaceToMeasuresMapper.xml | 3 + 4 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/zcloud/controller/eightwork/ConfinedspaceController.java diff --git a/src/main/java/com/zcloud/controller/eightwork/ConfinedspaceController.java b/src/main/java/com/zcloud/controller/eightwork/ConfinedspaceController.java new file mode 100644 index 0000000..7221004 --- /dev/null +++ b/src/main/java/com/zcloud/controller/eightwork/ConfinedspaceController.java @@ -0,0 +1,94 @@ +package com.zcloud.controller.eightwork; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.eightwork.ConfinedSpaceGasService; +import com.zcloud.service.eightwork.ConfinedspaceService; +import com.zcloud.util.Jurisdiction; +import com.zcloud.util.Tools; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 说明：受限作业 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/confinedspace") +public class ConfinedspaceController extends BaseController { + + @Autowired + private ConfinedspaceService confinedspaceService; + @Autowired + private ConfinedSpaceGasService confinedspaceGasService; + + /**列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @ResponseBody + @LogAnno(menuType= "高危作业管理",menuServer= "受限作业",instructionsOperate = "受限作业",instructionsType = "列表") + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); + pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + page.setPd(pd); + List varList = confinedspaceService.list(page); //列出confinedspace列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + + return map; + } + + /**获取受限作业流程 + * @param + * @throws Exception + */ + @RequestMapping(value="/getFlowList") + @ResponseBody + @LogAnno(menuType= "高危作业管理",menuServer= "受限作业",instructionsOperate = "受限作业",instructionsType = "获取受限作业流程") + public Object getFlowList() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List flowList = confinedspaceService.getFlowList(pd); + map.put("flowList", flowList); + map.put("result", errInfo); //返回结果 + return map; + } + + @RequestMapping("/findById") + @ResponseBody + @LogAnno(menuType= "高危作业管理",menuServer= "受限作业",instructionsOperate = "受限作业",instructionsType = "获取详情") + public Object findById() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = confinedspaceService.findById(pd); + PageData signs = confinedspaceService.listSignFinished(pd); + List finishMeasuresList = confinedspaceService.listSignFinishMeasures(pd); + map.put("gasList", confinedspaceGasService.listAll(pd)); + map.put("measuresList",finishMeasuresList); + map.put("signs",signs); + map.put("pd",pd); + map.put("result",errInfo); + return map; + } + +} diff --git a/src/main/java/com/zcloud/service/eightwork/impl/ConfinedspaceServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/ConfinedspaceServiceImpl.java index 6b5f171..6151ff4 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/ConfinedspaceServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/ConfinedspaceServiceImpl.java @@ -323,7 +323,6 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService { measure.put("ANSWER1", json.get("ANSWER1")); measure.put("ANSWER2", json.get("ANSWER2")); measure.put("ANSWER3", json.get("ANSWER3")); - measure.put("ANSWER4", json.get("ANSWER4")); measure.put("SIGN_PATH", json.get("SIGN_PATH")); measure.put("SIGN_TIME", json.get("SIGN_TIME")); measure.put("IMG_PATH", json.get("IMG_PATH")); diff --git a/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml b/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml index 4ad6cbb..7608496 100644 --- a/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml @@ -376,6 +376,7 @@ endo.`NAME` as WORK_END_DEPARTMENT_NAME, endu.`NAME` as WORK_END_USER_NAME, log.STEP_NAME, + log.NEXT_STEP_ID, log.NEXT_STEP_NAME, log.STATUS from diff --git a/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceToMeasuresMapper.xml b/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceToMeasuresMapper.xml index a9f2e05..d79c658 100644 --- a/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceToMeasuresMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceToMeasuresMapper.xml @@ -92,6 +92,9 @@ STATUS = #{STATUS}, SIGN_PATH = #{SIGN_PATH}, IMG_PATH = #{IMG_PATH}, + ANSWER1 = #{ANSWER1}, + ANSWER2 = #{ANSWER2}, + ANSWER3 = #{ANSWER3}, SIGN_TIME = #{SIGN_TIME} where CONFINEDSPACETOMEASURES_ID = #{CONFINEDSPACETOMEASURES_ID}