From e892e0c892199edf1f230ff8c8c83697772b97a3 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Fri, 19 Jan 2024 14:36:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A=20?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89=E6=8E=AA=E6=96=BD=20?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=9C=80=E8=A6=81=E7=AD=BE=E5=AD=97=E7=9A=84?= =?UTF-8?q?=E6=8E=AA=E6=96=BD=20=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89?= =?UTF-8?q?=E7=AD=BE=E5=AD=97=E5=AE=8C=E6=88=90=E7=9A=84=E6=8E=AA=E6=96=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eightwork/AppHotworkController.java | 40 +++++++++++++++++++ .../datasource/eightwork/HotworkMapper.java | 2 + .../eightwork/HotworkToMeasuresMapper.java | 3 ++ .../service/eightwork/HotworkService.java | 3 +- .../eightwork/impl/HotworkServiceImpl.java | 17 ++++++++ .../datasource/eightwork/HighWorkMapper.xml | 7 ++++ .../eightwork/HotworkToMeasuresMapper.xml | 19 +++++++++ 7 files changed, 90 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java b/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java index c56691d..af8561e 100644 --- a/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java +++ b/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java @@ -145,4 +145,44 @@ public class AppHotworkController extends BaseController { map.put("result",errInfo); return map; } + + @RequestMapping("/listAllMeasures") + @ResponseBody + public Object listAllMeasures() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List measuresList = hotworkService.listAllMeasures(); + map.put("result",errInfo); + map.put("measuresList",measuresList); + return map; + } + + @RequestMapping("/listAllMeasuresForSign") + @ResponseBody + public Object listAllMeasuresForSign() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List measuresForSignList = hotworkService.listAllMeasuresForSign(pd); + map.put("result",errInfo); + map.put("measuresForSignList",measuresForSignList); + return map; + } + + @RequestMapping("/listSignFinishMeasures") + @ResponseBody + public Object listSignFinishMeasures() throws Exception { + Map map = new HashMap<>(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + List finishMeasuresList = hotworkService.listSignFinishMeasures(pd); + map.put("result",errInfo); + map.put("finishMeasuresList",finishMeasuresList); + return map; + } + } diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java index 1fab69d..5e27f28 100644 --- a/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java @@ -18,4 +18,6 @@ public interface HotworkMapper { void editStep(PageData pd); List datalistPage(Page page); void cancel(PageData pd); + List listAllMeasures(); + } diff --git a/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkToMeasuresMapper.java b/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkToMeasuresMapper.java index 0c29db5..3cca7a2 100644 --- a/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkToMeasuresMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkToMeasuresMapper.java @@ -51,5 +51,8 @@ public interface HotworkToMeasuresMapper { */ void deleteAll(String[] ArrayDATA_IDS); + List listAllMeasuresForSign(PageData pd); + + List listSignFinishMeasures(PageData pd); } diff --git a/src/main/java/com/zcloud/service/eightwork/HotworkService.java b/src/main/java/com/zcloud/service/eightwork/HotworkService.java index 3c9db8f..fcb9ee8 100644 --- a/src/main/java/com/zcloud/service/eightwork/HotworkService.java +++ b/src/main/java/com/zcloud/service/eightwork/HotworkService.java @@ -21,7 +21,8 @@ public interface HotworkService { void nextStep(PageData pd, MultipartFile file) throws Exception; void accept(PageData pd)throws Exception; - void cancel(PageData pd)throws Exception; + + void cancel(PageData pd) throws Exception; PageData findById(PageData pd) throws Exception; diff --git a/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java b/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java index 8b94514..b04b2fc 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java @@ -200,6 +200,23 @@ public class HotworkServiceImpl implements HotworkService { return pageData; } + @Override + public List listAllMeasures() throws Exception { + return hotworkMapper.listAllMeasures(); + + } + + @Override + public List listAllMeasuresForSign(PageData pd) throws Exception { + return hotworkToMeasuresMapper.listAllMeasuresForSign(pd); + + } + + @Override + public List listSignFinishMeasures(PageData pd) throws Exception { + return hotworkToMeasuresMapper.listSignFinishMeasures(pd); + } + private PageData getStep(Object TASK_ID, Object STEP_ID) throws Exception { PageData flow = new PageData(); flow.put("TASK_ID", TASK_ID); diff --git a/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml index d438b90..ee9243e 100644 --- a/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml @@ -335,4 +335,11 @@ and f. + + diff --git a/src/main/resources/mybatis/datasource/eightwork/HotworkToMeasuresMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HotworkToMeasuresMapper.xml index ec5adbd..390e949 100644 --- a/src/main/resources/mybatis/datasource/eightwork/HotworkToMeasuresMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/HotworkToMeasuresMapper.xml @@ -142,4 +142,23 @@ + + + + +