吊装作业，断路作业，动土作业，盲板PC端

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

@@ -25,7 +25,7 @@ import java.util.Map;
  */
 @Controller
 @RequestMapping("/app/electricity")
-public class AppElertricityController extends BaseController {
+public class AppElectricityController extends BaseController {
 
     @Autowired
     private ElectricityService electricityService;

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

@@ -4,6 +4,7 @@ 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.BlindBoardInfoService;
 import com.zcloud.service.eightwork.BlindBoardService;
 import com.zcloud.util.Jurisdiction;
 import com.zcloud.util.Tools;
@@ -26,6 +27,8 @@ public class BlindBoardController extends BaseController {
 
     @Autowired
     private BlindBoardService blindboardService;
+    @Autowired
+    private BlindBoardInfoService blindBoardInfoService;
 
 
     /**列表
@@ -83,6 +86,7 @@ public class BlindBoardController extends BaseController {
         List<PageData> finishMeasuresList = blindboardService.listSignFinishMeasures(pd);
         map.put("measuresList",finishMeasuresList);
         map.put("signs",signs);
+        map.put("boardList", blindBoardInfoService.listAll(pd));
         map.put("pd",pd);
         map.put("result",errInfo);
         return map;

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

@@ -0,0 +1,91 @@
+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.CutRoadService;
+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("/cutroad")
+public class CutRoadController extends BaseController {
+
+    @Autowired
+    private CutRoadService cutroadService;
+
+
+    /**列表
+     * @param page
+     * @throws Exception
+     */
+    @RequestMapping(value="/list")
+    @ResponseBody
+	@LogAnno(menuType= "高危作业管理",menuServer= "断路作业",instructionsOperate = "断路作业",instructionsType = "列表")
+    public Object list(Page page) throws Exception{
+        Map<String,Object> map = new HashMap<String,Object>();
+        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<PageData>	varList = cutroadService.list(page);	//列出cutroad列表
+        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<String,Object> map = new HashMap<String,Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        List<PageData> flowList = cutroadService.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<String,Object> map = new HashMap<>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        pd = cutroadService.findById(pd);
+        PageData signs = cutroadService.listSignFinished(pd);
+        List<PageData> finishMeasuresList = cutroadService.listSignFinishMeasures(pd);
+        map.put("measuresList",finishMeasuresList);
+        map.put("signs",signs);
+        map.put("pd",pd);
+        map.put("result",errInfo);
+        return map;
+    }
+
+}

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

@@ -0,0 +1,97 @@
+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.ElectricityGasService;
+import com.zcloud.service.eightwork.ElectricityService;
+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("/electricity")
+public class ElectricityController extends BaseController {
+
+    @Autowired
+    private ElectricityService electricityService;
+    @Autowired
+    private ElectricityGasService electricityGasService;
+
+
+    /**列表
+     * @param page
+     * @throws Exception
+     */
+    @RequestMapping(value="/list")
+    @ResponseBody
+	@LogAnno(menuType= "高危作业管理",menuServer= "临时用电作业",instructionsOperate = "临时用电作业",instructionsType = "列表")
+    public Object list(Page page) throws Exception{
+        Map<String,Object> map = new HashMap<String,Object>();
+        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<PageData>	varList = electricityService.list(page);	//列出electricity列表
+        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<String,Object> map = new HashMap<String,Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        pd = electricityService.findById(pd);
+        List<PageData> flowList = electricityService.getFlowList(pd);
+        map.put("flowingWork", 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<String,Object> map = new HashMap<>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        pd = electricityService.findById(pd);
+        PageData signs = electricityService.listSignFinished(pd);
+        List<PageData> finishMeasuresList = electricityService.listSignFinishMeasures(pd);
+        map.put("measuresList",finishMeasuresList);
+        map.put("gasList", electricityGasService.listAll(pd));
+        map.put("signs",signs);
+        map.put("pd",pd);
+        map.put("result",errInfo);
+        return map;
+    }
+
+}

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

@@ -64,8 +64,10 @@ public class HighworkController extends BaseController {
         String errInfo = "success";
         PageData pd = new PageData();
         pd = this.getPageData();
+        pd = highworkService.findById(pd);
         List<PageData> flowList = highworkService.getFlowList(pd);
         map.put("flowList", flowList);
+        map.put("flowingWork", pd);
         map.put("result", errInfo);				//返回结果
         return map;
     }

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

@@ -17,6 +17,9 @@ public interface BlindBoardMapper {
     void edit(PageData pd);
     void editStep(PageData pd);
     void editContent(PageData pd);
+
+    void editVideo(PageData pd);
+
     List<PageData> datalistPage(Page page);
 
     List<PageData> listAllMeasures();

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

@@ -17,6 +17,9 @@ public interface BreakGroundMapper {
     void edit(PageData pd);
     void editStep(PageData pd);
     void editContent(PageData pd);
+
+    void editVideo(PageData pd);
+
     List<PageData> datalistPage(Page page);
 
     List<PageData> listAllMeasures();

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

@@ -17,6 +17,9 @@ public interface ConfinedspaceMapper {
     void edit(PageData pd);
     void editGasTime(PageData pd);
     void editStep(PageData pd);
+
+    void editVideo(PageData pd);
+
     void setPosition(PageData pd);
     List<PageData> datalistPage(Page page);
 

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

@@ -17,6 +17,9 @@ public interface CutRoadMapper {
     void edit(PageData pd);
     void editStep(PageData pd);
     void editContent(PageData pd);
+
+    void editVideo(PageData pd);
+
     List<PageData> datalistPage(Page page);
 
     List<PageData> listAllMeasures();

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

@@ -20,6 +20,9 @@ public interface ElectricityMapper {
 	void edit(PageData pd);
 	void editGasTime(PageData pd);
 	void editStep(PageData pd);
+
+	void editVideo(PageData pd);
+
 	void setPosition(PageData pd);
 	List<PageData> datalistPage(Page page);
 

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

@@ -16,6 +16,9 @@ public interface HighworkMapper {
     void delete(PageData pd);
     void edit(PageData pd);
     void editStep(PageData pd);
+
+    void editVideo(PageData pd);
+
     List<PageData> datalistPage(Page page);
 
     List<PageData> listAllMeasures();

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

@@ -16,6 +16,9 @@ public interface HoistingMapper {
     void delete(PageData pd);
     void edit(PageData pd);
     void editStep(PageData pd);
+
+    void editVideo(PageData pd);
+
     List<PageData> datalistPage(Page page);
 
     List<PageData> listAllMeasures();

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

@@ -40,6 +40,8 @@ public class BlindBoardServiceImpl implements BlindBoardService {
     private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper;
     @Autowired
     private Smb smb;
+    @Autowired
+    private SendMessageUtil sendMessageUtil;
 
     private final String primary_key = "BLINDBOARD_ID";
     private final String work_type = "BLINDBOARD";
@@ -55,7 +57,7 @@ public class BlindBoardServiceImpl implements BlindBoardService {
         pd2.put("CREATDATE",year + "-" + month + "-" + day);
         pd2.put("CORPINFO_ID",pd.get("CORPINFO_ID"));
         pd2 = blindboardMapper.getCode(pd2);    //根据ID读取
-        String code = "DT" + year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString()) + 1));
+        String code = "MB" + year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString()) + 1));
         pd.put("CHECK_NO", code);
         pd.put(primary_key, UuidUtil.get32UUID());    //主键
         pd.put("CREATTIME", DateUtil.date2Str(new Date()));    //添加时间
@@ -131,6 +133,7 @@ public class BlindBoardServiceImpl implements BlindBoardService {
         }
         PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
         work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
+        blindboardMapper.editVideo(work);
 
         //保存签名信息
         PageData sign = new PageData();
@@ -168,7 +171,7 @@ public class BlindBoardServiceImpl implements BlindBoardService {
 
             if("99".equals(currentflow.getString("NEXT_STEP_ID"))){
                 eightworkvideomanagerMapper.editStatus(work);
-
+                sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO"));
                 return;
             }
             if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤
@@ -182,9 +185,36 @@ public class BlindBoardServiceImpl implements BlindBoardService {
 
             work.put("STEP_ID",-1);
             blindboardMapper.editStep(work);
+            sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO"));
+
         }
     }
 
+    private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception {
+        PageData mes = new PageData();
+        mes.put("RECEIVER_ID", userId);// 收信人userid
+        mes.put("templateCode", template);// 短信模板编码
+        mes.put("CORPINFO_ID", corpinfo_id);// 企业id
+
+        // 参数集合
+        List<PageData> paramsList = new ArrayList<PageData>();
+        // 第1个参数
+        PageData params1 = new PageData();
+        params1.put("name", "number");// 存入短信模板中的参数名称
+        params1.put("value", number);// 存入上面参数名称所传递的值
+        paramsList.add(params1);
+
+        PageData params2 = new PageData();
+        params2.put("name", "type");// 存入短信模板中的参数名称
+        params2.put("value", "盲板作业");// 存入上面参数名称所传递的值
+        paramsList.add(params2);
+
+        try {
+            sendMessageUtil.sendMessages(mes, paramsList);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
     @Override
     public PageData findById(PageData pd) throws Exception {
         PageData pageData = blindboardMapper.findById(pd);
@@ -286,7 +316,39 @@ public class BlindBoardServiceImpl implements BlindBoardService {
         signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
         signers.add(signer);
         blindboardSignMapper.saveBatch(signers);
+        sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
+
     }
+    private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception {
+        PageData mes = new PageData();
+        mes.put("RECEIVER_ID", userId);// 收信人userid
+        mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码
+        mes.put("CORPINFO_ID", corpinfo_id);// 企业id
+
+        // 参数集合
+        List<PageData> paramsList = new ArrayList<PageData>();
+        // 第1个参数
+        PageData params1 = new PageData();
+        params1.put("name", "number");// 存入短信模板中的参数名称
+        params1.put("value", number);// 存入上面参数名称所传递的值
+        paramsList.add(params1);
+
+        PageData params2 = new PageData();
+        params2.put("name", "type");// 存入短信模板中的参数名称
+        params2.put("value", "盲板作业");// 存入上面参数名称所传递的值
+        paramsList.add(params2);
+
+        PageData params3 = new PageData();
+        params3.put("name", "flow");// 存入短信模板中的参数名称
+        params3.put("value", flow_name);// 存入上面参数名称所传递的值
+        paramsList.add(params3);
+        try {
+            sendMessageUtil.sendMessages(mes, paramsList);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
 
     private void saveMeasures(PageData pd) {
         List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("MEASURES").toString());
@@ -331,6 +393,11 @@ public class BlindBoardServiceImpl implements BlindBoardService {
                 signer.put("SIGN_USER_ID", item);
                 signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
                 nextSigners.add(signer);
+                try {
+                    sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
             });
 
             blindboardSignMapper.saveBatch(nextSigners);

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

@@ -38,6 +38,8 @@ public class BreakGroundServiceImpl implements BreakGroundService {
     private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper;
     @Autowired
     private Smb smb;
+    @Autowired
+    private SendMessageUtil sendMessageUtil;
 
     private final String primary_key = "BREAKGROUND_ID";
     private final String work_type = "BREAKGROUND";
@@ -114,6 +116,7 @@ public class BreakGroundServiceImpl implements BreakGroundService {
         }
         PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
         work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
+        breakgroundMapper.editVideo(work);
 
         //保存签名信息
         PageData sign = new PageData();
@@ -152,7 +155,7 @@ public class BreakGroundServiceImpl implements BreakGroundService {
 
             if("99".equals(currentflow.getString("NEXT_STEP_ID"))){
                 eightworkvideomanagerMapper.editStatus(work);
-
+                sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO"));
                 return;
             }
             if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤
@@ -166,6 +169,33 @@ public class BreakGroundServiceImpl implements BreakGroundService {
 
             work.put("STEP_ID",-1);
             breakgroundMapper.editStep(work);
+            sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO"));
+
+        }
+    }
+    private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception {
+        PageData mes = new PageData();
+        mes.put("RECEIVER_ID", userId);// 收信人userid
+        mes.put("templateCode", template);// 短信模板编码
+        mes.put("CORPINFO_ID", corpinfo_id);// 企业id
+
+        // 参数集合
+        List<PageData> paramsList = new ArrayList<PageData>();
+        // 第1个参数
+        PageData params1 = new PageData();
+        params1.put("name", "number");// 存入短信模板中的参数名称
+        params1.put("value", number);// 存入上面参数名称所传递的值
+        paramsList.add(params1);
+
+        PageData params2 = new PageData();
+        params2.put("name", "type");// 存入短信模板中的参数名称
+        params2.put("value", "动土作业");// 存入上面参数名称所传递的值
+        paramsList.add(params2);
+
+        try {
+            sendMessageUtil.sendMessages(mes, paramsList);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
     }
 
@@ -270,6 +300,37 @@ public class BreakGroundServiceImpl implements BreakGroundService {
         signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
         signers.add(signer);
         breakgroundSignMapper.saveBatch(signers);
+        sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
+
+    }
+    private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception {
+        PageData mes = new PageData();
+        mes.put("RECEIVER_ID", userId);// 收信人userid
+        mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码
+        mes.put("CORPINFO_ID", corpinfo_id);// 企业id
+
+        // 参数集合
+        List<PageData> paramsList = new ArrayList<PageData>();
+        // 第1个参数
+        PageData params1 = new PageData();
+        params1.put("name", "number");// 存入短信模板中的参数名称
+        params1.put("value", number);// 存入上面参数名称所传递的值
+        paramsList.add(params1);
+
+        PageData params2 = new PageData();
+        params2.put("name", "type");// 存入短信模板中的参数名称
+        params2.put("value", "动土作业");// 存入上面参数名称所传递的值
+        paramsList.add(params2);
+
+        PageData params3 = new PageData();
+        params3.put("name", "flow");// 存入短信模板中的参数名称
+        params3.put("value", flow_name);// 存入上面参数名称所传递的值
+        paramsList.add(params3);
+        try {
+            sendMessageUtil.sendMessages(mes, paramsList);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
     private void saveMeasures(PageData pd) {
@@ -315,6 +376,11 @@ public class BreakGroundServiceImpl implements BreakGroundService {
                 signer.put("SIGN_USER_ID", item);
                 signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
                 nextSigners.add(signer);
+                try {
+                    sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
             });
 
             breakgroundSignMapper.saveBatch(nextSigners);

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

@@ -40,6 +40,8 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService {
     private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper;
     @Autowired
     private Smb smb;
+    @Autowired
+    private SendMessageUtil sendMessageUtil;
 
     private final String primary_key = "CONFINEDSPACE_ID";
     private final String work_type = "CONFINEDSPACE";
@@ -116,7 +118,7 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService {
         }
         PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
         work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
-
+        confinedspaceMapper.editVideo(work);
 
         //保存签名信息
         PageData sign = new PageData();
@@ -146,6 +148,7 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService {
 
             if("99".equals(currentflow.getString("NEXT_STEP_ID"))){
                 eightworkvideomanagerMapper.editStatus(work);
+                sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO"));
 
                 return;
             }
@@ -160,6 +163,33 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService {
 
             work.put("STEP_ID",-1);
             confinedspaceMapper.editStep(work);
+            sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO"));
+
+        }
+    }
+    private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception {
+        PageData mes = new PageData();
+        mes.put("RECEIVER_ID", userId);// 收信人userid
+        mes.put("templateCode", template);// 短信模板编码
+        mes.put("CORPINFO_ID", corpinfo_id);// 企业id
+
+        // 参数集合
+        List<PageData> paramsList = new ArrayList<PageData>();
+        // 第1个参数
+        PageData params1 = new PageData();
+        params1.put("name", "number");// 存入短信模板中的参数名称
+        params1.put("value", number);// 存入上面参数名称所传递的值
+        paramsList.add(params1);
+
+        PageData params2 = new PageData();
+        params2.put("name", "type");// 存入短信模板中的参数名称
+        params2.put("value", "受限作业");// 存入上面参数名称所传递的值
+        paramsList.add(params2);
+
+        try {
+            sendMessageUtil.sendMessages(mes, paramsList);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
     }
 
@@ -285,7 +315,7 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService {
             saveLog(work,pd.getString("USER_ID"),"-2");
             work.put("STEP_ID",-1);
             confinedspaceMapper.editStep(work);
-
+            sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO"));
         }
     }
 
@@ -321,6 +351,37 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService {
         signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
         signers.add(signer);
         confinedspaceSignMapper.saveBatch(signers);
+        sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
+
+    }
+    private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception {
+        PageData mes = new PageData();
+        mes.put("RECEIVER_ID", userId);// 收信人userid
+        mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码
+        mes.put("CORPINFO_ID", corpinfo_id);// 企业id
+
+        // 参数集合
+        List<PageData> paramsList = new ArrayList<PageData>();
+        // 第1个参数
+        PageData params1 = new PageData();
+        params1.put("name", "number");// 存入短信模板中的参数名称
+        params1.put("value", number);// 存入上面参数名称所传递的值
+        paramsList.add(params1);
+
+        PageData params2 = new PageData();
+        params2.put("name", "type");// 存入短信模板中的参数名称
+        params2.put("value", "受限作业");// 存入上面参数名称所传递的值
+        paramsList.add(params2);
+
+        PageData params3 = new PageData();
+        params3.put("name", "flow");// 存入短信模板中的参数名称
+        params3.put("value", flow_name);// 存入上面参数名称所传递的值
+        paramsList.add(params3);
+        try {
+            sendMessageUtil.sendMessages(mes, paramsList);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
     private void saveMeasures(PageData pd) {
@@ -369,6 +430,11 @@ public class ConfinedspaceServiceImpl implements ConfinedspaceService {
                 signer.put("SIGN_USER_ID", item);
                 signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
                 nextSigners.add(signer);
+                try {
+                    sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
             });
 
             confinedspaceSignMapper.saveBatch(nextSigners);

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

@@ -38,6 +38,8 @@ public class CutRoadServiceImpl implements CutRoadService {
     private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper;
     @Autowired
     private Smb smb;
+    @Autowired
+    private SendMessageUtil sendMessageUtil;
 
     private final String primary_key = "CUTROAD_ID";
     private final String work_type = "CUTROAD";
@@ -114,6 +116,7 @@ public class CutRoadServiceImpl implements CutRoadService {
         }
         PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
         work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
+        cutroadMapper.editVideo(work);
 
         //保存签名信息
         PageData sign = new PageData();
@@ -152,6 +155,7 @@ public class CutRoadServiceImpl implements CutRoadService {
 
             if("99".equals(currentflow.getString("NEXT_STEP_ID"))){
                 eightworkvideomanagerMapper.editStatus(work);
+                sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO"));
 
                 return;
             }
@@ -166,6 +170,8 @@ public class CutRoadServiceImpl implements CutRoadService {
 
             work.put("STEP_ID",-1);
             cutroadMapper.editStep(work);
+            sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO"));
+
         }
     }
 
@@ -270,6 +276,8 @@ public class CutRoadServiceImpl implements CutRoadService {
         signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
         signers.add(signer);
         cutroadSignMapper.saveBatch(signers);
+        sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
+
     }
 
     private void saveMeasures(PageData pd) {
@@ -315,6 +323,11 @@ public class CutRoadServiceImpl implements CutRoadService {
                 signer.put("SIGN_USER_ID", item);
                 signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
                 nextSigners.add(signer);
+                try {
+                    sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
             });
 
             cutroadSignMapper.saveBatch(nextSigners);
@@ -352,5 +365,59 @@ public class CutRoadServiceImpl implements CutRoadService {
         pd.put("WORK_POSITION", String.join(",",positions));
         cutroadMapper.setPosition(pd);
     }
+    private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception {
+        PageData mes = new PageData();
+        mes.put("RECEIVER_ID", userId);// 收信人userid
+        mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码
+        mes.put("CORPINFO_ID", corpinfo_id);// 企业id
 
+        // 参数集合
+        List<PageData> paramsList = new ArrayList<PageData>();
+        // 第1个参数
+        PageData params1 = new PageData();
+        params1.put("name", "number");// 存入短信模板中的参数名称
+        params1.put("value", number);// 存入上面参数名称所传递的值
+        paramsList.add(params1);
+
+        PageData params2 = new PageData();
+        params2.put("name", "type");// 存入短信模板中的参数名称
+        params2.put("value", "断路作业");// 存入上面参数名称所传递的值
+        paramsList.add(params2);
+
+        PageData params3 = new PageData();
+        params3.put("name", "flow");// 存入短信模板中的参数名称
+        params3.put("value", flow_name);// 存入上面参数名称所传递的值
+        paramsList.add(params3);
+        try {
+            sendMessageUtil.sendMessages(mes, paramsList);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception {
+        PageData mes = new PageData();
+        mes.put("RECEIVER_ID", userId);// 收信人userid
+        mes.put("templateCode", template);// 短信模板编码
+        mes.put("CORPINFO_ID", corpinfo_id);// 企业id
+
+        // 参数集合
+        List<PageData> paramsList = new ArrayList<PageData>();
+        // 第1个参数
+        PageData params1 = new PageData();
+        params1.put("name", "number");// 存入短信模板中的参数名称
+        params1.put("value", number);// 存入上面参数名称所传递的值
+        paramsList.add(params1);
+
+        PageData params2 = new PageData();
+        params2.put("name", "type");// 存入短信模板中的参数名称
+        params2.put("value", "断路作业");// 存入上面参数名称所传递的值
+        paramsList.add(params2);
+
+        try {
+            sendMessageUtil.sendMessages(mes, paramsList);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

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

@@ -40,6 +40,8 @@ public class ElectricityServiceImpl implements ElectricityService {
     private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper;
     @Autowired
     private Smb smb;
+    @Autowired
+    private SendMessageUtil sendMessageUtil;
 
     private final String primary_key = "ELECTRICITY_ID";
     private final String work_type = "ELECTRICITY";
@@ -121,7 +123,7 @@ public class ElectricityServiceImpl implements ElectricityService {
         }
         PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
         work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
-
+        electricityMapper.editVideo(work);
 
         //保存签名信息
         PageData sign = new PageData();
@@ -151,7 +153,7 @@ public class ElectricityServiceImpl implements ElectricityService {
 
             if("99".equals(currentflow.getString("NEXT_STEP_ID"))){
                 eightworkvideomanagerMapper.editStatus(work);
-
+                sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO"));
                 return;
             }
             if (work.get("PREPARERS") != null && !work.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤
@@ -165,6 +167,8 @@ public class ElectricityServiceImpl implements ElectricityService {
 
             work.put("STEP_ID",-1);
             electricityMapper.editStep(work);
+            sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO"));
+
         }
     }
 
@@ -290,6 +294,7 @@ public class ElectricityServiceImpl implements ElectricityService {
             saveLog(work,pd.getString("USER_ID"),"-2");
             work.put("STEP_ID",-1);
             electricityMapper.editStep(work);
+            sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO"));
 
         }
     }
@@ -326,6 +331,8 @@ public class ElectricityServiceImpl implements ElectricityService {
         signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
         signers.add(signer);
         electricitySignMapper.saveBatch(signers);
+        sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
+
     }
 
     private void saveMeasures(PageData pd) {
@@ -374,6 +381,12 @@ public class ElectricityServiceImpl implements ElectricityService {
                 signer.put("SIGN_USER_ID", item);
                 signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
                 nextSigners.add(signer);
+
+                try {
+                    sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
             });
 
             electricitySignMapper.saveBatch(nextSigners);
@@ -424,5 +437,59 @@ public class ElectricityServiceImpl implements ElectricityService {
         pd.put("WORK_POSITION", String.join(",",positions));
         electricityMapper.setPosition(pd);
     }
+    private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception {
+        PageData mes = new PageData();
+        mes.put("RECEIVER_ID", userId);// 收信人userid
+        mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码
+        mes.put("CORPINFO_ID", corpinfo_id);// 企业id
 
+        // 参数集合
+        List<PageData> paramsList = new ArrayList<PageData>();
+        // 第1个参数
+        PageData params1 = new PageData();
+        params1.put("name", "number");// 存入短信模板中的参数名称
+        params1.put("value", number);// 存入上面参数名称所传递的值
+        paramsList.add(params1);
+
+        PageData params2 = new PageData();
+        params2.put("name", "type");// 存入短信模板中的参数名称
+        params2.put("value", "临时用电作业");// 存入上面参数名称所传递的值
+        paramsList.add(params2);
+
+        PageData params3 = new PageData();
+        params3.put("name", "flow");// 存入短信模板中的参数名称
+        params3.put("value", flow_name);// 存入上面参数名称所传递的值
+        paramsList.add(params3);
+        try {
+            sendMessageUtil.sendMessages(mes, paramsList);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception {
+        PageData mes = new PageData();
+        mes.put("RECEIVER_ID", userId);// 收信人userid
+        mes.put("templateCode", template);// 短信模板编码
+        mes.put("CORPINFO_ID", corpinfo_id);// 企业id
+
+        // 参数集合
+        List<PageData> paramsList = new ArrayList<PageData>();
+        // 第1个参数
+        PageData params1 = new PageData();
+        params1.put("name", "number");// 存入短信模板中的参数名称
+        params1.put("value", number);// 存入上面参数名称所传递的值
+        paramsList.add(params1);
+
+        PageData params2 = new PageData();
+        params2.put("name", "type");// 存入短信模板中的参数名称
+        params2.put("value", "临时用电作业");// 存入上面参数名称所传递的值
+        paramsList.add(params2);
+
+        try {
+            sendMessageUtil.sendMessages(mes, paramsList);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

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

@@ -39,6 +39,8 @@ public class HighworkServiceImpl implements HighworkService {
     private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper;
     @Autowired
     private Smb smb;
+    @Autowired
+    private SendMessageUtil sendMessageUtil;
 
     private final String primary_key = "HIGHWORK_ID";
     private final String work_type = "HIGHWORK";
@@ -115,6 +117,7 @@ public class HighworkServiceImpl implements HighworkService {
         }
         PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
         work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
+        highworkMapper.editVideo(work);
 
         //保存签名信息
         PageData sign = new PageData();
@@ -141,6 +144,7 @@ public class HighworkServiceImpl implements HighworkService {
 
             if("99".equals(currentflow.getString("NEXT_STEP_ID"))){
                 eightworkvideomanagerMapper.editStatus(work);
+                sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO"));
 
                 return;
             }
@@ -155,6 +159,8 @@ public class HighworkServiceImpl implements HighworkService {
 
             work.put("STEP_ID",-1);
             highworkMapper.editStep(work);
+            sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_ACCEPT",work.getString("CHECK_NO"));
+
         }
     }
 
@@ -254,6 +260,8 @@ public class HighworkServiceImpl implements HighworkService {
         signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
         signers.add(signer);
         highworkSignMapper.saveBatch(signers);
+        sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
+
     }
 
     private void saveMeasures(PageData pd) {
@@ -299,6 +307,11 @@ public class HighworkServiceImpl implements HighworkService {
                 signer.put("SIGN_USER_ID", item);
                 signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
                 nextSigners.add(signer);
+                try {
+                    sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
             });
 
             highworkSignMapper.saveBatch(nextSigners);
@@ -336,5 +349,59 @@ public class HighworkServiceImpl implements HighworkService {
         pd.put("WORK_POSITION", String.join(",",positions));
         highworkMapper.setPosition(pd);
     }
+    private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception {
+        PageData mes = new PageData();
+        mes.put("RECEIVER_ID", userId);// 收信人userid
+        mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码
+        mes.put("CORPINFO_ID", corpinfo_id);// 企业id
 
+        // 参数集合
+        List<PageData> paramsList = new ArrayList<PageData>();
+        // 第1个参数
+        PageData params1 = new PageData();
+        params1.put("name", "number");// 存入短信模板中的参数名称
+        params1.put("value", number);// 存入上面参数名称所传递的值
+        paramsList.add(params1);
+
+        PageData params2 = new PageData();
+        params2.put("name", "type");// 存入短信模板中的参数名称
+        params2.put("value", "高处作业");// 存入上面参数名称所传递的值
+        paramsList.add(params2);
+
+        PageData params3 = new PageData();
+        params3.put("name", "flow");// 存入短信模板中的参数名称
+        params3.put("value", flow_name);// 存入上面参数名称所传递的值
+        paramsList.add(params3);
+        try {
+            sendMessageUtil.sendMessages(mes, paramsList);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception {
+        PageData mes = new PageData();
+        mes.put("RECEIVER_ID", userId);// 收信人userid
+        mes.put("templateCode", template);// 短信模板编码
+        mes.put("CORPINFO_ID", corpinfo_id);// 企业id
+
+        // 参数集合
+        List<PageData> paramsList = new ArrayList<PageData>();
+        // 第1个参数
+        PageData params1 = new PageData();
+        params1.put("name", "number");// 存入短信模板中的参数名称
+        params1.put("value", number);// 存入上面参数名称所传递的值
+        paramsList.add(params1);
+
+        PageData params2 = new PageData();
+        params2.put("name", "type");// 存入短信模板中的参数名称
+        params2.put("value", "高处作业");// 存入上面参数名称所传递的值
+        paramsList.add(params2);
+
+        try {
+            sendMessageUtil.sendMessages(mes, paramsList);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

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

@@ -38,6 +38,8 @@ public class HoistingServiceImpl implements HoistingService {
     private com.zcloud.mapper.datasource.eightWork.EightWorkVideoManagerMapper eightworkvideomanagerMapper;
     @Autowired
     private Smb smb;
+    @Autowired
+    private SendMessageUtil sendMessageUtil;
 
     private final String primary_key = "HOISTING_ID";
     private final String work_type = "HOISTING";
@@ -114,6 +116,7 @@ public class HoistingServiceImpl implements HoistingService {
         }
         PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
         work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
+        hoistingMapper.editVideo(work);
 
         //保存签名信息
         PageData sign = new PageData();
@@ -140,6 +143,7 @@ public class HoistingServiceImpl implements HoistingService {
 
             if("99".equals(currentflow.getString("NEXT_STEP_ID"))){
                 eightworkvideomanagerMapper.editStatus(work);
+                sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO"));
 
                 return;
             }
@@ -154,6 +158,8 @@ public class HoistingServiceImpl implements HoistingService {
 
             work.put("STEP_ID",-1);
             hoistingMapper.editStep(work);
+            sendMessageForFinished(work.getString("CORPINFO_ID"),work.getString("CREATOR"),"EIGHTWORK_REJECT",work.getString("CHECK_NO"));
+
         }
     }
 
@@ -253,6 +259,8 @@ public class HoistingServiceImpl implements HoistingService {
         signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
         signers.add(signer);
         hoistingSignMapper.saveBatch(signers);
+        sendMessageForNext(pd.getString("CORPINFO_ID"),pd.getString(flow.get("NEXT_ACTOR_FIELD")),pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
+
     }
 
     private void saveMeasures(PageData pd) {
@@ -298,6 +306,11 @@ public class HoistingServiceImpl implements HoistingService {
                 signer.put("SIGN_USER_ID", item);
                 signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
                 nextSigners.add(signer);
+                try {
+                    sendMessageForNext(pd.getString("CORPINFO_ID"),item,pd.getString("CHECK_NO"),flow.getString("NEXT_STEP_NAME"));
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
             });
 
             hoistingSignMapper.saveBatch(nextSigners);
@@ -335,5 +348,59 @@ public class HoistingServiceImpl implements HoistingService {
         pd.put("WORK_POSITION", String.join(",",positions));
         hoistingMapper.setPosition(pd);
     }
+    private void sendMessageForNext(String corpinfo_id,String userId,String number,String flow_name) throws Exception {
+        PageData mes = new PageData();
+        mes.put("RECEIVER_ID", userId);// 收信人userid
+        mes.put("templateCode", "EIGHTWORK_REMINDER");// 短信模板编码
+        mes.put("CORPINFO_ID", corpinfo_id);// 企业id
 
+        // 参数集合
+        List<PageData> paramsList = new ArrayList<PageData>();
+        // 第1个参数
+        PageData params1 = new PageData();
+        params1.put("name", "number");// 存入短信模板中的参数名称
+        params1.put("value", number);// 存入上面参数名称所传递的值
+        paramsList.add(params1);
+
+        PageData params2 = new PageData();
+        params2.put("name", "type");// 存入短信模板中的参数名称
+        params2.put("value", "动火作业");// 存入上面参数名称所传递的值
+        paramsList.add(params2);
+
+        PageData params3 = new PageData();
+        params3.put("name", "flow");// 存入短信模板中的参数名称
+        params3.put("value", flow_name);// 存入上面参数名称所传递的值
+        paramsList.add(params3);
+        try {
+            sendMessageUtil.sendMessages(mes, paramsList);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void sendMessageForFinished(String corpinfo_id,String userId,String template,String number) throws Exception {
+        PageData mes = new PageData();
+        mes.put("RECEIVER_ID", userId);// 收信人userid
+        mes.put("templateCode", template);// 短信模板编码
+        mes.put("CORPINFO_ID", corpinfo_id);// 企业id
+
+        // 参数集合
+        List<PageData> paramsList = new ArrayList<PageData>();
+        // 第1个参数
+        PageData params1 = new PageData();
+        params1.put("name", "number");// 存入短信模板中的参数名称
+        params1.put("value", number);// 存入上面参数名称所传递的值
+        paramsList.add(params1);
+
+        PageData params2 = new PageData();
+        params2.put("name", "type");// 存入短信模板中的参数名称
+        params2.put("value", "动火作业");// 存入上面参数名称所传递的值
+        paramsList.add(params2);
+
+        try {
+            sendMessageUtil.sendMessages(mes, paramsList);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

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

@@ -49,7 +49,9 @@
         f.PLS_NAME,
         f.WORK_POSITION,
         f.VIDEO_PATH,
-        f.BOARD_PATH
+        f.BOARD_PATH,
+        f.WORKSHOP_DEPARTMENT_ID,
+        f.WORKSHOP_USER_ID
     </sql>
 
     <!-- 字段用于新增 -->
@@ -95,7 +97,9 @@
         PLS_NAME,
         WORK_POSITION,
         VIDEO_PATH,
-        BOARD_PATH
+        BOARD_PATH,
+        WORKSHOP_DEPARTMENT_ID,
+        WORKSHOP_USER_ID
     </sql>
 
     <!-- 字段值 -->
@@ -141,7 +145,9 @@
         #{PLS_NAME},
         #{WORK_POSITION},
         #{VIDEO_PATH},
-        #{BOARD_PATH}
+        #{BOARD_PATH},
+        #{WORKSHOP_DEPARTMENT_ID},
+        #{WORKSHOP_USER_ID}
     </sql>
 
     <!-- 获取编码 -->
@@ -219,7 +225,9 @@
         PLS_ID = #{PLS_ID},
         PLS_NAME = #{PLS_NAME},
         WORK_POSITION = #{WORK_POSITION},
-        VIDEO_PATH = #{VIDEO_PATH}
+        VIDEO_PATH = #{VIDEO_PATH},
+        WORKSHOP_DEPARTMENT_ID = #{WORKSHOP_DEPARTMENT_ID},
+        WORKSHOP_USER_ID = #{WORKSHOP_USER_ID}
         where
             BLINDBOARD_ID = #{BLINDBOARD_ID}
     </update>
@@ -233,6 +241,8 @@
             f.WORK_START_DATE,
             f.SPECIAL_WORK,
             f.RISK_IDENTIFICATION,
+        worko.`NAME` as WORKSHOP_DEPARTMENT_NAME,
+        worku.`NAME` as WORKSHOP_USER_NAME,
             woro.`NAME` as WORK_USER_DEPARTMENT_NAME,
             woru.`NAME` as WORK_USER_NAME,
             cono.`NAME` as CONFESS_DEPARTMENT_NAME,
@@ -254,6 +264,9 @@
             left join oa_department as appo on f.APPLY_DEPARTMENT_ID = appo.DEPARTMENT_ID
             left join sys_user as appu on f.APPLY_USER_ID = appu.USER_ID
 
+        left join oa_department as worko on f.WORKSHOP_DEPARTMENT_ID = worko.DEPARTMENT_ID
+        left join sys_user as worku on f.WORKSHOP_USER_ID = worku.USER_ID
+
             left join oa_department as woro on f.WORK_USER_DEPARTMENT_ID = woro.DEPARTMENT_ID
             left join sys_user as woru on f.WORK_USER_ID = woru.USER_ID
 
@@ -308,6 +321,15 @@
         BLINDBOARD_ID = #{BLINDBOARD_ID}
     </update>
 
+    <update id="editVideo" parameterType="pd">
+        update
+        <include refid="tableName"></include>
+        set
+        VIDEO_PATH = #{VIDEO_PATH}
+        where
+        BLINDBOARD_ID = #{BLINDBOARD_ID}
+    </update>
+
     <!-- 列表 -->
     <select id="datalistPage" parameterType="page" resultType="pd">
         select
@@ -330,6 +352,8 @@
         stau.`NAME` as WORK_START_USER_NAME,
         woro.`NAME` as WORK_USER_DEPARTMENT_NAME,
         woru.`NAME` as WORK_USER_NAME,
+        worko.`NAME` as WORKSHOP_DEPARTMENT_NAME,
+        worku.`NAME` as WORKSHOP_USER_NAME,
         log.STEP_NAME,
         log.NEXT_STEP_ID,
         log.NEXT_STEP_NAME,
@@ -339,6 +363,9 @@
         left join oa_department as appo on f.APPLY_DEPARTMENT_ID = appo.DEPARTMENT_ID
         left join sys_user as appu on f.APPLY_USER_ID = appu.USER_ID
 
+        left join oa_department as worko on f.WORKSHOP_DEPARTMENT_ID = worko.DEPARTMENT_ID
+        left join sys_user as worku on f.WORKSHOP_USER_ID = worku.USER_ID
+
         left join oa_department as woro on f.WORK_USER_DEPARTMENT_ID = woro.DEPARTMENT_ID
         left join sys_user as woru on f.WORK_USER_ID = woru.USER_ID
 

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

@@ -346,6 +346,14 @@
         where
         BREAKGROUND_ID = #{BREAKGROUND_ID}
     </update>
+    <update id="editVideo" parameterType="pd">
+        update
+        <include refid="tableName"></include>
+        set
+        VIDEO_PATH = #{VIDEO_PATH}
+        where
+        BREAKGROUND_ID = #{BREAKGROUND_ID}
+    </update>
 
     <!-- 列表 -->
     <select id="datalistPage" parameterType="page" resultType="pd">

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

@@ -315,7 +315,14 @@
 
         WHERE f.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
     </select>
-
+    <update id="editVideo" parameterType="pd">
+        update
+        <include refid="tableName"></include>
+        set
+        VIDEO_PATH = #{VIDEO_PATH}
+        where
+        CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
+    </update>
     <!-- 修改 -->
     <update id="editStep" parameterType="pd">
         update

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

@@ -347,6 +347,15 @@
         CUTROAD_ID = #{CUTROAD_ID}
     </update>
 
+    <update id="editVideo" parameterType="pd">
+        update
+        <include refid="tableName"></include>
+        set
+        VIDEO_PATH = #{VIDEO_PATH}
+        where
+        CUTROAD_ID = #{CUTROAD_ID}
+    </update>
+
     <!-- 列表 -->
     <select id="datalistPage" parameterType="page" resultType="pd">
         select

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

@@ -376,6 +376,14 @@
 			f.ELECTRICITY_ID = #{ELECTRICITY_ID}
 	</select>
 
+	<update id="editVideo" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+		VIDEO_PATH = #{VIDEO_PATH}
+		where
+		ELECTRICITY_ID = #{ELECTRICITY_ID}
+	</update>
 
 	<!-- 修改 -->
 	<update id="editStep" parameterType="pd">

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

@@ -314,7 +314,14 @@
 
         WHERE f.HIGHWORK_ID = #{HIGHWORK_ID}
     </select>
-
+    <update id="editVideo" parameterType="pd">
+        update
+        <include refid="tableName"></include>
+        set
+        VIDEO_PATH = #{VIDEO_PATH}
+        where
+        HIGHWORK_ID = #{HIGHWORK_ID}
+    </update>
     <!-- 修改 -->
     <update id="editStep" parameterType="pd">
         update

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

@@ -57,7 +57,9 @@
         f.PLS_ID,
         f.PLS_NAME,
         f.WORK_POSITION,
-        f.VIDEO_PATH
+        f.VIDEO_PATH,
+        f.APPLY_DEPARTMENT_ID,
+        f.APPLY_USER_ID
     </sql>
 
     <!-- 字段用于新增 -->
@@ -111,7 +113,9 @@
         PLS_ID,
         PLS_NAME,
         WORK_POSITION,
-        VIDEO_PATH
+        VIDEO_PATH,
+        APPLY_DEPARTMENT_ID,
+        APPLY_USER_ID
     </sql>
 
     <!-- 字段值 -->
@@ -165,7 +169,9 @@
         #{PLS_ID},
         #{PLS_NAME},
         #{WORK_POSITION},
-        #{VIDEO_PATH}
+        #{VIDEO_PATH},
+        #{APPLY_DEPARTMENT_ID},
+        #{APPLY_USER_ID}
     </sql>
 
     <!-- 获取编码 -->
@@ -252,7 +258,9 @@
         PLS_ID = #{PLS_ID},
         PLS_NAME = #{PLS_NAME},
         WORK_POSITION = #{WORK_POSITION},
-        VIDEO_PATH = #{VIDEO_PATH}
+        VIDEO_PATH = #{VIDEO_PATH},
+        APPLY_DEPARTMENT_ID = #{APPLY_DEPARTMENT_ID},
+        APPLY_USER_ID = #{APPLY_USER_ID}
         where
             HOISTING_ID = #{HOISTING_ID}
     </update>
@@ -261,13 +269,15 @@
     <select id="findById" parameterType="pd" resultType="pd">
         SELECT
             <include refid="Field"></include>,
-            appo.`NAME` as SISUO_DEPARTMENT_NAME,
-            appu.`NAME` as SISUO_USER_NAME,
+            siso.`NAME` as SISUO_DEPARTMENT_NAME,
+            sisu.`NAME` as SISUO_USER_NAME,
             f.WORK_LEVEL,
             f.WORK_START_DATE,
             f.WORK_END_DATE,
             f.SPECIAL_WORK,
             f.RISK_IDENTIFICATION,
+            appo.`NAME` as APPLY_DEPARTMENT_NAME,
+            appu.`NAME` as APPLY_USER_NAME,
             woro.`NAME` as WORK_USER_DEPARTMENT_NAME,
             woru.`NAME` as WORK_USER_NAME,
             cono.`NAME` as CONFESS_DEPARTMENT_NAME,
@@ -294,11 +304,14 @@
             prou.`NAME` as PROJECT_MANAGER_USER_NAME
         FROM
             bus_hoisting AS f
-            left join oa_department as appo on f.SISUO_DEPARTMENT_ID = appo.DEPARTMENT_ID
-            left join sys_user as appu on f.SISUO_USER_ID = appu.USER_ID
+            left join oa_department as siso on f.SISUO_DEPARTMENT_ID = siso.DEPARTMENT_ID
+            left join sys_user as sisu on f.SISUO_USER_ID = sisu.USER_ID
 
-        left join oa_department as woro on f.WORK_USER_DEPARTMENT_ID = woro.DEPARTMENT_ID
-        left join sys_user as woru on f.WORK_USER_ID = woru.USER_ID
+            left join oa_department as appo on f.APPLY_DEPARTMENT_ID = appo.DEPARTMENT_ID
+            left join sys_user as appu on f.APPLY_USER_ID = appu.USER_ID
+
+            left join oa_department as woro on f.WORK_USER_DEPARTMENT_ID = woro.DEPARTMENT_ID
+            left join sys_user as woru on f.WORK_USER_ID = woru.USER_ID
 
             left join oa_department as proo on f.PROJECT_MANAGER_DEPARTMENT_ID = proo.DEPARTMENT_ID
             left join sys_user as prou on f.PROJECT_MANAGER_USER_ID = prou.USER_ID
@@ -336,6 +349,15 @@
         WHERE f.HOISTING_ID = #{HOISTING_ID}
     </select>
 
+    <update id="editVideo" parameterType="pd">
+        update
+        <include refid="tableName"></include>
+        set
+        VIDEO_PATH = #{VIDEO_PATH}
+        where
+        HOISTING_ID = #{HOISTING_ID}
+    </update>
+
     <!-- 修改 -->
     <update id="editStep" parameterType="pd">
         update
@@ -359,8 +381,8 @@
     <select id="datalistPage" parameterType="page" resultType="pd">
         select
         <include refid="Field"></include>,
-        appo.`NAME` as SISUO_DEPARTMENT_NAME,
-        appu.`NAME` as SISUO_USER_NAME,
+        siso.`NAME` as SISUO_DEPARTMENT_NAME,
+        sisu.`NAME` as SISUO_USER_NAME,
         cono.`NAME` as CONFESS_DEPARTMENT_NAME,
         conu.`NAME` as CONFESS_USER_NAME,
         acco.`NAME` as ACCEPT_CONFESS_DEPARTMENT_NAME,
@@ -385,14 +407,19 @@
         prou.`NAME` as PROJECT_MANAGER_USER_NAME,
         woro.`NAME` as WORK_USER_DEPARTMENT_NAME,
         woru.`NAME` as WORK_USER_NAME,
+        appo.`NAME` as APPLY_DEPARTMENT_NAME,
+        appu.`NAME` as APPLY_USER_NAME,
         log.STEP_NAME,
         log.NEXT_STEP_ID,
         log.NEXT_STEP_NAME,
         log.STATUS
         from
         <include refid="tableName"></include> f
-        left join oa_department as appo on f.SISUO_DEPARTMENT_ID = appo.DEPARTMENT_ID
-        left join sys_user as appu on f.SISUO_USER_ID = appu.USER_ID
+        left join oa_department as siso on f.SISUO_DEPARTMENT_ID = siso.DEPARTMENT_ID
+        left join sys_user as sisu on f.SISUO_USER_ID = sisu.USER_ID
+
+        left join oa_department as appo on f.APPLY_DEPARTMENT_ID = appo.DEPARTMENT_ID
+        left join sys_user as appu on f.APPLY_USER_ID = appu.USER_ID
 
         left join oa_department as woro on f.WORK_USER_DEPARTMENT_ID = woro.DEPARTMENT_ID
         left join sys_user as woru on f.WORK_USER_ID = woru.USER_ID