diff --git a/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java b/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java index f61d9b7..325dc28 100644 --- a/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java +++ b/src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java @@ -157,4 +157,44 @@ public class AppHotworkController extends BaseController { map.put("result",errorInfo); 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 6f14f80..9cadf16 100644 --- a/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java @@ -17,5 +17,8 @@ public interface HotworkMapper { void edit(PageData pd); void editStep(PageData pd); List datalistPage(Page page); + void cancel(PageData pd); + List listAllMeasures(); + List checkWorkCount(PageData pd); } 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 85d1a1c..9e5d8b1 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 784aad6..db1927e 100644 --- a/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java +++ b/src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java @@ -244,6 +244,23 @@ public class HotworkServiceImpl implements HotworkService { return rpd; } + @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/HotWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml index d343cc1..fff7c96 100644 --- a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml @@ -408,4 +408,11 @@ sign.SIGN_USER_ID = #{USER_ID} group by step.CODE + + 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 @@ + + + + +