Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java
#	src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java
#	src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java
#	src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml

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<String,Object> map = new HashMap<>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        List<PageData> measuresList = hotworkService.listAllMeasures();
+        map.put("result",errInfo);
+        map.put("measuresList",measuresList);
+        return map;
+    }
+
+    @RequestMapping("/listAllMeasuresForSign")
+    @ResponseBody
+    public Object listAllMeasuresForSign() throws Exception {
+        Map<String,Object> map = new HashMap<>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        List<PageData> measuresForSignList = hotworkService.listAllMeasuresForSign(pd);
+        map.put("result",errInfo);
+        map.put("measuresForSignList",measuresForSignList);
+        return map;
+    }
+
+    @RequestMapping("/listSignFinishMeasures")
+    @ResponseBody
+    public Object listSignFinishMeasures() throws Exception {
+        Map<String,Object> map = new HashMap<>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        List<PageData> finishMeasuresList = hotworkService.listSignFinishMeasures(pd);
+        map.put("result",errInfo);
+        map.put("finishMeasuresList",finishMeasuresList);
+        return map;
+    }
+
 }

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<PageData> datalistPage(Page page);
+    void cancel(PageData pd);
+    List<PageData> listAllMeasures();
+
     List<PageData> checkWorkCount(PageData pd);
 }

src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkToMeasuresMapper.java

@@ -51,5 +51,8 @@ public interface HotworkToMeasuresMapper {
 	 */
 	void deleteAll(String[] ArrayDATA_IDS);
 
+	List<PageData> listAllMeasuresForSign(PageData pd);
+
+	List<PageData> listSignFinishMeasures(PageData pd);
 }
 

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;
 

src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java

@@ -244,6 +244,23 @@ public class HotworkServiceImpl implements HotworkService {
         return rpd;
     }
 
+    @Override
+    public List<PageData> listAllMeasures() throws Exception {
+        return hotworkMapper.listAllMeasures();
+
+    }
+
+    @Override
+    public List<PageData> listAllMeasuresForSign(PageData pd) throws Exception {
+        return hotworkToMeasuresMapper.listAllMeasuresForSign(pd);
+
+    }
+
+    @Override
+    public List<PageData> 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);

src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml

@@ -408,4 +408,11 @@
             sign.SIGN_USER_ID = #{USER_ID}
         group by step.CODE
     </select>
+
+    <select id="listAllMeasures" resultType="pd">
+        select
+        *
+        from
+        BUS_HOTWORK_MEASURES
+    </select>
 </mapper>

src/main/resources/mybatis/datasource/eightwork/HotworkToMeasuresMapper.xml

@@ -142,4 +142,23 @@
 		</foreach>
 	</delete>
 
+
+	<select id="listAllMeasuresForSign" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where
+		f.HOTWORK_ID = #{HOTWORK_ID} and f.CONFIRM_ID = #{CONFIRM_ID}
+	</select>
+
+	<select id="listSignFinishMeasures" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where
+		f.HOTWORK_ID = #{HOTWORK_ID}
+	</select>
+
 </mapper>