动火作业加入可跳过步骤

src/main/java/com/zcloud/controller/eightwork/AppHotworkController.java

@@ -298,7 +298,9 @@ public class AppHotworkController extends BaseController {
         String errInfo = "success";
         PageData pd = new PageData();
         pd = this.getPageData();
+        pd = hotworkService.findById(pd);
         List<PageData> flowList = hotworkService.getFlowList(pd);
+        map.put("flowingWork", pd);
         map.put("flowList", flowList);
         map.put("result", errInfo);				//返回结果
         return map;

src/main/java/com/zcloud/controller/eightwork/EightWorkController.java

@@ -0,0 +1,43 @@
+package com.zcloud.controller.eightwork;
+
+import com.zcloud.controller.base.BaseController;
+import com.zcloud.entity.PageData;
+import com.zcloud.service.corp.CorpInfoService;
+import com.zcloud.util.*;
+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.*;
+
+/**
+ * 说明：有限空间台账
+ * 作者：luoxiaobao
+ * 时间：2021-04-02
+ * 官网：www.zcloudchina.com
+ */
+@Controller
+@RequestMapping("/eightWork")
+public class EightWorkController extends BaseController {
+
+	@Autowired
+	private CorpInfoService corpInfoService;
+
+	/**新增
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/eightWorkBI")
+	@ResponseBody
+	public Object eightWorkBI() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 企业
+		PageData count = corpInfoService.eightWorkBI(pd);
+		map.put("count", count);
+		map.put("result", errInfo);
+		return map;
+	}
+}

src/main/java/com/zcloud/controller/eightwork/HotworkController.java

@@ -71,7 +71,9 @@ public class HotworkController extends BaseController {
         String errInfo = "success";
         PageData pd = new PageData();
         pd = this.getPageData();
+        pd = hotworkService.findById(pd);
         List<PageData> flowList = hotworkService.getFlowList(pd);
+        map.put("flowingWork", pd);
         map.put("flowList", flowList);
         map.put("result", errInfo);				//返回结果
         return map;

src/main/java/com/zcloud/controller/risk/RiskPointController.java

@@ -229,8 +229,8 @@ public class RiskPointController extends BaseController {
 		PageData pd = new PageData();
 		PageData npd = new PageData();
 		pd = this.getPageData();
-		System.out.println(page.getTotalResult());
 		String KEYWORDS = pd.getString("KEYWORDS");						//关键词检索条件
+		npd.putAll(pd);
 		if(Tools.notEmpty(KEYWORDS))npd.put("KEYWORDS", KEYWORDS.trim());
 		npd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
 		npd.put("ISMAIN", Jurisdiction.getIS_MAIN());

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

@@ -296,7 +296,6 @@ public class HotworkServiceImpl implements HotworkService {
 
     @Override
     public List<PageData> getFlowList(PageData pd) throws Exception {
-        pd=findById(pd);
         return hotworkMapper.getFlowList(pd);
     }
 

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

@@ -551,6 +551,8 @@
 
     <select id="getFlowList" resultType="pd">
         select
+            flow.CAN_SKIP,
+            flow.ACTOR_FIELD,
             step.STEP_NAME,
             user.NAME as ACT_USER_NAME,
             log.ACT_TIME,

src/main/resources/mybatis/datasource/system/DepartmentMapper.xml

@@ -96,7 +96,7 @@
         LEVEL = #{LEVEL},
         DEPARTMENT_ID = DEPARTMENT_ID,
         DEP_ORDER = #{DEP_ORDER},
-        ISSUPERVISE = #{ISSUPERVISE}
+        ISSUPERVISE = #{ISSUPERVISE},
         LEADER_CHARGE = #{LEADER_CHARGE},
         STATE = #{STATE},
         checkedIds = #{checkedIds},