diff --git a/src/main/java/com/zcloud/controller/gf/AppWorkBackController.java b/src/main/java/com/zcloud/controller/gf/AppWorkBackController.java
new file mode 100644
index 00000000..edd3a2a1
--- /dev/null
+++ b/src/main/java/com/zcloud/controller/gf/AppWorkBackController.java
@@ -0,0 +1,48 @@
+package com.zcloud.controller.gf;
+
+import com.zcloud.controller.base.BaseController;
+import com.zcloud.entity.PageData;
+import com.zcloud.service.gf.AppWorkBackService;
+import com.zcloud.util.ReturnMap;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+
+/**
+ * 八项作业退回上一步
+ *
+ * @author lin
+ */
+@Controller
+@RequestMapping("/app/eightWork")
+public class AppWorkBackController extends BaseController {
+
+    @Resource
+    private AppWorkBackService appWorkBackService;
+
+    /**
+     * 除去动火外 其他作业退回上一步
+     *
+     * @author lin
+     */
+    @RequestMapping(value = "/backWork")
+    @ResponseBody
+
+    public ReturnMap backWork() throws Exception {
+        PageData pageData = this.getPageData();
+        return appWorkBackService.backOtherWork(pageData);
+    }
+
+    /**
+     * 动火退回上一步
+     *
+     * @author lin
+     */
+    @RequestMapping(value = "/backHotWork")
+    @ResponseBody
+    public String backHotWork() throws Exception {
+        return "gf/gf_limit_space_back";
+    }
+}
diff --git a/src/main/java/com/zcloud/mapper/datasource/gf/GFHighWorkMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFHighWorkMapper.java
index 66e165c0..b7868a98 100644
--- a/src/main/java/com/zcloud/mapper/datasource/gf/GFHighWorkMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFHighWorkMapper.java
@@ -73,5 +73,32 @@ public interface GFHighWorkMapper{
 	PageData countCheck(PageData pd);
 
     PageData getCode(PageData pd);
+
+	void clearMasterTable(PageData pd);
+
+	void clearMeasures(PageData pd);
+
+	void clearAcceptUser(PageData pd);
+
+	PageData getInfoById(PageData pd);
+
+	void back5to2(PageData pd);
+
+	void back5to4(PageData pd);
+
+	void back5to3(PageData pd);
+
+	void back3to2(PageData pd);
+
+	void back4to3(PageData pd);
+
+	void back4to2(PageData pd);
+
+	void blindboardBack4to1(PageData pd);
+	void blindboardBack5to4(PageData pd);
+
+	void clearGasMonitoring(PageData pd);
+
+	void clearGasWhMonitoring(PageData pd);
 }
 
diff --git a/src/main/java/com/zcloud/service/gf/AppWorkBackService.java b/src/main/java/com/zcloud/service/gf/AppWorkBackService.java
new file mode 100644
index 00000000..5e1908cc
--- /dev/null
+++ b/src/main/java/com/zcloud/service/gf/AppWorkBackService.java
@@ -0,0 +1,11 @@
+package com.zcloud.service.gf;
+
+import com.zcloud.entity.PageData;
+import com.zcloud.util.ReturnMap;
+
+public interface AppWorkBackService {
+
+
+    ReturnMap backHotWork(PageData pd) throws Exception;
+    ReturnMap backOtherWork(PageData pd) throws Exception;
+}
diff --git a/src/main/java/com/zcloud/service/gf/impl/AppWorkBackServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/AppWorkBackServiceImpl.java
new file mode 100644
index 00000000..83cd4284
--- /dev/null
+++ b/src/main/java/com/zcloud/service/gf/impl/AppWorkBackServiceImpl.java
@@ -0,0 +1,194 @@
+package com.zcloud.service.gf.impl;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.gf.GFHighWorkMapper;
+import com.zcloud.service.gf.AppWorkBackService;
+import com.zcloud.util.InitPageDataUtil;
+import com.zcloud.util.ReturnMap;
+import com.zcloud.util.Tools;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class AppWorkBackServiceImpl implements AppWorkBackService {
+
+    static Map<String, String> tablePrimaryKey = new HashMap<String, String>() {{
+        // 高处
+        put("gf_highwork", "HIGHWORK_ID");
+        // 动土
+        put("gf_breakground", "BREAKGROUND_ID");
+        // 盲板
+        put("gf_blindboard", "BLINDBOARD_ID");
+        // 有限空间
+        put("gf_confinedspace", "CONFINEDSPACE_ID");
+        // 吊装
+        put("gf_hoisting", "HOISTING_ID");
+        // 用电
+        put("gf_electricity", "ELECTRICITY_ID");
+        // 断路
+        put("gf_cutroad", "CUTROAD_ID");
+    }};
+
+    @Resource
+    private GFHighWorkMapper gfHighWorkMapper;
+    @Resource
+    private InitPageDataUtil initPageDataUtil;
+
+    @Override
+    public ReturnMap backHotWork(PageData pd) throws Exception {
+        return ReturnMap.ok();
+    }
+
+    @Override
+    @Transactional
+    public ReturnMap backOtherWork(PageData pd) throws Exception {
+        if ("1".equals(pd.getString("APPLY_STATUS"))) return ReturnMap.error("审核中，无法撤回到上一步！");
+        if ("6".equals(pd.getString("APPLY_STATUS"))) return ReturnMap.error("已归档，无法撤回到上一步！");
+        pd.put("TABLE_ID_NAME", tablePrimaryKey.get(pd.getString("TYPE")));
+        PageData workInfo = gfHighWorkMapper.getInfoById(pd);
+        // 撤回上一步
+        if ("gf_highwork".equals(pd.getString("TYPE"))
+                || "gf_breakground".equals(pd.getString("TYPE"))
+                || "gf_hoisting".equals(pd.getString("TYPE"))
+                || "gf_electricity".equals(pd.getString("TYPE"))
+                || "gf_cutroad".equals(pd.getString("TYPE"))
+        ) {
+            if ("2".equals(workInfo.getString("APPLY_STATUS"))) {
+                if ("gf_electricity".equals(pd.getString("TYPE")) && "1".equals(workInfo.getString("ISANALYZE"))) {
+                    //  临时用电， 撤销 气体分析
+                    clearGasMonitoring(pd);
+                }
+                back2to1(pd);
+                return ReturnMap.ok();
+            }
+            if ("5".equals(workInfo.getString("APPLY_STATUS"))) {
+                // 现在有3种情况
+                // 1.如有APPROVE_USER_ID和 AUDIT_USER_ID 则APPLY_STATUS变为4（审批部门）
+                if (Tools.notEmpty(workInfo.getString("APPROVE_USER_ID")) && Tools.notEmpty(workInfo.getString("AUDIT_USER_ID"))) {
+                    back5to4(pd);
+                    return ReturnMap.ok();
+                }
+                // 2.如有APPROVE_USER_ID 但是没AUDIT_USER_ID  则APPLY_STATUS变为3（审核部门）
+                if (Tools.notEmpty(workInfo.getString("APPROVE_USER_ID"))) {
+                    back5to3(pd);
+                    return ReturnMap.ok();
+                }
+                // 3.如没有APPROVE_USER_ID和AUDIT_USER_ID  则APPLY_STATUS变为2
+                if (Tools.isEmpty(workInfo.getString("APPROVE_USER_ID")) && Tools.isEmpty(workInfo.getString("AUDIT_USER_ID"))) {
+                    back5to2(pd);
+                    return ReturnMap.ok();
+                }
+            }
+            if ("4".equals(workInfo.getString("APPLY_STATUS"))) {
+                // 现在有2种情况
+                // 1.AUDIT_USER_ID
+                if (Tools.notEmpty(workInfo.getString("AUDIT_USER_ID"))) {
+                    back4to3(pd);
+                    return ReturnMap.ok();
+                }
+                back4to2(pd);
+                return ReturnMap.ok();
+            }
+            if ("3".equals(workInfo.getString("APPLY_STATUS"))) {
+                back3to2(pd);
+                return ReturnMap.ok();
+            }
+        }
+        // 盲板
+        if ("gf_blindboard".equals(pd.getString("TYPE"))) {
+            // 1-》 作业负责人待审核 4-》 所在单位待审核 5-》待验收
+            if ("4".equals(workInfo.getString("APPLY_STATUS"))) {
+                blindboardBack4to1(pd);
+                return ReturnMap.ok();
+            }
+            if ("5".equals(workInfo.getString("APPLY_STATUS"))) {
+                blindboardBack5to4(pd);
+                return ReturnMap.ok();
+            }
+        }
+        // 受限空间
+        if ("gf_confinedspace".equals(pd.getString("TYPE"))) {
+            // 1-》 作业负责人待审核 4-》 所在单位待审核 5-》待验收
+            if ("4".equals(workInfo.getString("APPLY_STATUS"))) {
+                // 清理 气体监测 数据
+                blindboardBack4to1(pd);
+                clearGasMonitoring(pd);
+                clearGasWhMonitoring(pd);
+                return ReturnMap.ok();
+            }
+            if ("5".equals(workInfo.getString("APPLY_STATUS"))) {
+                blindboardBack5to4(pd);
+                return ReturnMap.ok();
+            }
+        }
+
+        return ReturnMap.ok();
+    }
+
+    @Transactional
+    public void clearGasWhMonitoring(PageData pd) {
+        gfHighWorkMapper.clearGasWhMonitoring(pd);
+    }
+
+    @Transactional
+    public void clearGasMonitoring(PageData pd) {
+        gfHighWorkMapper.clearGasMonitoring(pd);
+    }
+
+    @Transactional
+    public void blindboardBack4to1(PageData pd) {
+        gfHighWorkMapper.blindboardBack4to1(pd);
+    }
+
+    @Transactional
+    public void blindboardBack5to4(PageData pd) {
+        gfHighWorkMapper.blindboardBack5to4(pd);
+    }
+
+    @Transactional
+    public void back3to2(PageData pd) {
+        gfHighWorkMapper.back3to2(pd);
+    }
+
+    @Transactional
+    public void back4to2(PageData pd) {
+        gfHighWorkMapper.back4to2(pd);
+
+    }
+
+    @Transactional
+    public void back4to3(PageData pd) {
+        gfHighWorkMapper.back4to3(pd);
+    }
+
+    @Transactional
+    public void back5to3(PageData pd) {
+        gfHighWorkMapper.back5to3(pd);
+
+    }
+
+    @Transactional
+    public void back5to4(PageData pd) {
+        gfHighWorkMapper.back5to4(pd);
+    }
+
+
+    @Transactional
+    public void back5to2(PageData pd) {
+        gfHighWorkMapper.back5to2(pd);
+    }
+
+
+    @Transactional
+    public void back2to1(PageData pd) {
+        gfHighWorkMapper.clearMasterTable(pd);
+        gfHighWorkMapper.clearMeasures(pd);
+        gfHighWorkMapper.clearAcceptUser(pd);
+    }
+}
diff --git a/src/main/resources/mybatis/datasource/gf/HighWorkMapper.xml b/src/main/resources/mybatis/datasource/gf/HighWorkMapper.xml
index cd583107..bb0f4711 100644
--- a/src/main/resources/mybatis/datasource/gf/HighWorkMapper.xml
+++ b/src/main/resources/mybatis/datasource/gf/HighWorkMapper.xml
@@ -2,19 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zcloud.mapper.datasource.gf.GFHighWorkMapper">
 
-	<!--表名 -->
-	<sql id="tableName">
-		GF_HIGHWORK
-	</sql>
+    <!--表名 -->
+    <sql id="tableName">
+        GF_HIGHWORK
+    </sql>
 
-	<!--数据字典表名 -->
-	<sql id="dicTableName">
-		SYS_DICTIONARIES
-	</sql>
+    <!--数据字典表名 -->
+    <sql id="dicTableName">
+        SYS_DICTIONARIES
+    </sql>
 
-	<!-- 字段 -->
-	<sql id="Field">
-		f.CORPINFO_ID,
+    <!-- 字段 -->
+    <sql id="Field">
+        f
+        .
+        CORPINFO_ID
+        ,
 		f.APPLY_DEPARTMENT_ID,
 		f.APPLY_USER,
 		f.ISDELETE,
@@ -79,11 +82,12 @@
 		f.ACCEPT_CONFESS_USER_SIGNER_TIME,
 		f.WORK_LONGITUDE,
 		f.WORK_LATITUDE
-</sql>
+    </sql>
 
-	<!-- 字段用于新增 -->
-	<sql id="Field2">
-		CORPINFO_ID,
+    <!-- 字段用于新增 -->
+    <sql id="Field2">
+        CORPINFO_ID
+        ,
 		APPLY_DEPARTMENT_ID,
 		APPLY_USER,
 		ISDELETE,
@@ -148,1231 +152,1377 @@
 		ACCEPT_CONFESS_USER_SIGNER_TIME,
 		WORK_LONGITUDE,
 		WORK_LATITUDE
-	</sql>
-
-	<!-- 字段值 -->
-	<sql id="FieldValue">
-		#{CORPINFO_ID},
-		#{APPLY_DEPARTMENT_ID},
-		#{APPLY_USER},
-		#{ISDELETE},
-		#{CREATTIME},
-		#{CREATOR},
-		#{OPERATTIME},
-		#{OPERATOR},
-		#{CHECK_NO},
-		#{PROJECT_MANAGER},
-		#{WORK_CONTENT},
-		#{WORK_START_DATE},
-		#{WORK_END_DATE},
-		#{CONSTRUCTION_DEPARTMENT_ID},
-		#{CONSTRUCTION_USER_ID},
-		#{CONSTRUCTION_USER_SIGNER_PATH},
-		#{CONSTRUCTION_USER_SIGNER_TIME},
-		#{AUDIT_DEPARTMENT_ID},
-		#{AUDIT_USER_ID},
-		#{AUDIT_USER_SIGNER_PATH},
-		#{AUDIT_USER_SIGNER_TIME},
-		#{APPROVE_DEPARTMENT_ID},
-		#{APPROVE_USER_ID},
-		#{APPROVE_USER_SIGNER_PATH},
-		#{APPROVE_USER_SIGNER_TIME},
-		#{ACCEPT_DEPARTMENT_ID},
-		#{ACCEPT_USER_ID},
-		#{ACCEPT_USER_SIGNER_PATH},
-		#{ACCEPT_USER_SIGNER_TIME},
-		#{APPLY_STATUS},
-		#{CONSTRUCTION_CONTENT},
-		#{AUDIT_CONTENT},
-		#{APPROVE_CONTENT},
-		#{ACCEPT_CONTENT},
-		#{OTHER_PROTECTIVE_MEASURES},
-		#{HAZARD_IDENTIFICATION},
-		#{BELONGING_CORP},
-		#{WORK_CORP},
-		#{WORK_PLACE},
-		#{LEADER_DEPARTMENT_ID},
-		#{LEADER_USER_ID},
-		#{LEADER_CONTENT},
-		#{LEADER_USER_SIGNER_PATH},
-		#{LEADER_USER_SIGNER_TIME},
-		#{CONFESS_USER},
-		#{ACCEPT_CONFESS_USER},
-		#{SPECIAL_WORK},
-		#{GUARDIAN_USER},
-		#{WORK_HIGH},
-		#{WORK_LEVEL},
-		#{HIGHWORK_ID},
-		#{GUARDIAN_DEPARTMENT_ID},
-		#{GUARDIAN_USER_ID},
-		#{GUARDIAN_USER_SIGNER_PATH},
-		#{GUARDIAN_USER_SIGNER_TIME},
-		#{CONFESS_DEPARTMENT_ID},
-		#{CONFESS_USER_ID},
-		#{CONFESS_USER_SIGNER_PATH},
-		#{CONFESS_USER_SIGNER_TIME},
-		#{ACCEPT_CONFESS_DEPARTMENT_ID},
-		#{ACCEPT_CONFESS_USER_ID},
-		#{ACCEPT_CONFESS_USER_SIGNER_PATH},
-		#{ACCEPT_CONFESS_USER_SIGNER_TIME},
-		#{WORK_LONGITUDE},
-		#{WORK_LATITUDE}
-	</sql>
-
-	<!-- 新增-->
-	<insert id="save" parameterType="pd">
-		insert into
-	<include refid="tableName"></include>
-		(
-	<include refid="Field2"></include>
-		) values (
-	<include refid="FieldValue"></include>
-		)
-	</insert>
-
-	<!-- 删除-->
-	<delete id="delete" parameterType="pd">
-		update
-		<include refid="tableName"></include>
-		set
-			ISDELETE = '1'
-		where
-			HIGHWORK_ID = #{HIGHWORK_ID}
-	</delete>
-
-	<!-- 修改 -->
-	<update id="edit" parameterType="pd">
-		update
-		<include refid="tableName"></include>
-		set
-			CORPINFO_ID = #{CORPINFO_ID},
-			APPLY_DEPARTMENT_ID = #{APPLY_DEPARTMENT_ID},
-			APPLY_USER = #{APPLY_USER},
-			ISDELETE = #{ISDELETE},
-			CREATTIME = #{CREATTIME},
-			CREATOR = #{CREATOR},
-			OPERATTIME = #{OPERATTIME},
-			OPERATOR = #{OPERATOR},
-			CHECK_NO = #{CHECK_NO},
-			PROJECT_MANAGER = #{PROJECT_MANAGER},
-			WORK_CONTENT = #{WORK_CONTENT},
-			WORK_START_DATE = #{WORK_START_DATE},
-			WORK_END_DATE = #{WORK_END_DATE},
-			CONSTRUCTION_DEPARTMENT_ID = #{CONSTRUCTION_DEPARTMENT_ID},
-			CONSTRUCTION_USER_ID = #{CONSTRUCTION_USER_ID},
-			CONSTRUCTION_USER_SIGNER_PATH = #{CONSTRUCTION_USER_SIGNER_PATH},
-			CONSTRUCTION_USER_SIGNER_TIME = #{CONSTRUCTION_USER_SIGNER_TIME},
-			AUDIT_DEPARTMENT_ID = #{AUDIT_DEPARTMENT_ID},
-			AUDIT_USER_ID = #{AUDIT_USER_ID},
-			AUDIT_USER_SIGNER_PATH = #{AUDIT_USER_SIGNER_PATH},
-			AUDIT_USER_SIGNER_TIME = #{AUDIT_USER_SIGNER_TIME},
-			APPROVE_DEPARTMENT_ID = #{APPROVE_DEPARTMENT_ID},
-			APPROVE_USER_ID = #{APPROVE_USER_ID},
-			APPROVE_USER_SIGNER_PATH = #{APPROVE_USER_SIGNER_PATH},
-			APPROVE_USER_SIGNER_TIME = #{APPROVE_USER_SIGNER_TIME},
-			ACCEPT_DEPARTMENT_ID = #{ACCEPT_DEPARTMENT_ID},
-			ACCEPT_USER_ID = #{ACCEPT_USER_ID},
-			ACCEPT_USER_SIGNER_PATH = #{ACCEPT_USER_SIGNER_PATH},
-			ACCEPT_USER_SIGNER_TIME = #{ACCEPT_USER_SIGNER_TIME},
-			APPLY_STATUS = #{APPLY_STATUS},
-			CONSTRUCTION_CONTENT = #{CONSTRUCTION_CONTENT},
-			AUDIT_CONTENT = #{AUDIT_CONTENT},
-			APPROVE_CONTENT = #{APPROVE_CONTENT},
-			ACCEPT_CONTENT = #{ACCEPT_CONTENT},
-			OTHER_PROTECTIVE_MEASURES = #{OTHER_PROTECTIVE_MEASURES},
-			HAZARD_IDENTIFICATION = #{HAZARD_IDENTIFICATION},
-			BELONGING_CORP = #{BELONGING_CORP},
-			WORK_CORP = #{WORK_CORP},
-			WORK_PLACE = #{WORK_PLACE},
-			LEADER_DEPARTMENT_ID = #{LEADER_DEPARTMENT_ID},
-			LEADER_USER_ID = #{LEADER_USER_ID},
-			LEADER_CONTENT = #{LEADER_CONTENT},
-			LEADER_USER_SIGNER_PATH = #{LEADER_USER_SIGNER_PATH},
-			LEADER_USER_SIGNER_TIME = #{LEADER_USER_SIGNER_TIME},
-			CONFESS_USER = #{CONFESS_USER},
-			SPECIAL_WORK = #{SPECIAL_WORK},
-			GUARDIAN_USER = #{GUARDIAN_USER},
-			WORK_HIGH = #{WORK_HIGH},
-			WORK_LEVEL = #{WORK_LEVEL},
-			HIGHWORK_ID = HIGHWORK_ID,
-			GUARDIAN_DEPARTMENT_ID = #{GUARDIAN_DEPARTMENT_ID},
-			GUARDIAN_USER_ID = #{GUARDIAN_USER_ID},
-			GUARDIAN_USER_SIGNER_PATH = #{GUARDIAN_USER_SIGNER_PATH},
-			GUARDIAN_USER_SIGNER_TIME = #{GUARDIAN_USER_SIGNER_TIME},
-			CONFESS_DEPARTMENT_ID = #{CONFESS_DEPARTMENT_ID},
-			CONFESS_USER_ID = #{CONFESS_USER_ID},
-			CONFESS_USER_SIGNER_PATH = #{CONFESS_USER_SIGNER_PATH},
-			CONFESS_USER_SIGNER_TIME = #{CONFESS_USER_SIGNER_TIME},
-			ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID},
-			ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID},
-			ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH},
-			ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME},
-		WORK_LONGITUDE = #{WORK_LONGITUDE},
-		WORK_LATITUDE = #{WORK_LATITUDE}
-		where
-			HIGHWORK_ID = #{HIGHWORK_ID}
-	</update>
-
-	<!-- 通过ID获取数据 -->
-	<select id="findById" parameterType="pd" resultType="pd">
-		select
-		f.CORPINFO_ID,
-		f.APPLY_DEPARTMENT_ID,
-		f.APPLY_USER,
-		f.ISDELETE,
-		f.CREATTIME,
-		f.CREATOR,
-		f.OPERATTIME,
-		f.OPERATOR,
-		f.CHECK_NO,
-		f.PROJECT_MANAGER,
-		f.WORK_CONTENT,
-		replace(f.WORK_START_DATE,'-','/') as WORK_START_DATE,
-		replace(f.WORK_END_DATE,'-','/') as WORK_END_DATE,
-		f.CONSTRUCTION_DEPARTMENT_ID,
-		f.CONSTRUCTION_USER_ID,
-		f.CONSTRUCTION_USER_SIGNER_PATH,
-		f.CONSTRUCTION_USER_SIGNER_TIME,
-		f.AUDIT_DEPARTMENT_ID,
-		f.AUDIT_USER_ID,
-		f.AUDIT_USER_SIGNER_PATH,
-		f.AUDIT_USER_SIGNER_TIME,
-		f.APPROVE_DEPARTMENT_ID,
-		f.APPROVE_USER_ID,
-		f.APPROVE_USER_SIGNER_PATH,
-		f.APPROVE_USER_SIGNER_TIME,
-		f.ACCEPT_DEPARTMENT_ID,
-		f.ACCEPT_USER_ID,
-		f.ACCEPT_USER_SIGNER_PATH,
-		f.ACCEPT_USER_SIGNER_TIME,
-		f.APPLY_STATUS,
-		IFNULL(f.CONSTRUCTION_CONTENT,'无') as CONSTRUCTION_CONTENT,
-		IFNULL(f.AUDIT_CONTENT,'无') as AUDIT_CONTENT,
-		IFNULL(f.APPROVE_CONTENT,'无') as APPROVE_CONTENT,
-		IFNULL(f.ACCEPT_CONTENT,'无') as ACCEPT_CONTENT,
-		f.OTHER_PROTECTIVE_MEASURES,
-		f.HAZARD_IDENTIFICATION,
-		f.BELONGING_CORP,
-		f.WORK_CORP,
-		f.WORK_PLACE,
-		f.LEADER_DEPARTMENT_ID,
-		f.LEADER_USER_ID,
-		IFNULL(f.LEADER_CONTENT,'无') as LEADER_CONTENT,
-		f.LEADER_USER_SIGNER_PATH,
-		f.LEADER_USER_SIGNER_TIME,
-		f.CONFESS_USER,
-		f.ACCEPT_CONFESS_USER,
-		IFNULL(f.SPECIAL_WORK,'无') as SPECIAL_WORK,
-		f.GUARDIAN_USER,
-		f.WORK_HIGH,
-		f.WORK_LEVEL,
-		f.HIGHWORK_ID,
-		f.GUARDIAN_DEPARTMENT_ID,
-		f.GUARDIAN_USER_ID,
-		f.GUARDIAN_USER_SIGNER_PATH,
-		f.GUARDIAN_USER_SIGNER_TIME,
-		f.CONFESS_DEPARTMENT_ID,
-		f.CONFESS_USER_ID,
-		f.CONFESS_USER_SIGNER_PATH,
-		f.CONFESS_USER_SIGNER_TIME,
-		f.ACCEPT_CONFESS_DEPARTMENT_ID,
-		f.ACCEPT_CONFESS_USER_ID,
-		f.ACCEPT_CONFESS_USER_SIGNER_PATH,
-		f.ACCEPT_CONFESS_USER_SIGNER_TIME,
-		f.WORK_LATITUDE,
-		f.WORK_LONGITUDE,
-
-		ad.NAME as APPLY_DEPARTMENT_NAME,
-		getFullName(ad.DEPARTMENT_ID) APPLY_DEPARTMENT_ALL,
-
-		cd.NAME as CONSTRUCTION_DEPARTMENT_NAME,
-		cu.NAME as CONSTRUCTION_USER_NAME,
-
-		ld.NAME as LEADER_DEPARTMENT_NAME,
-		lu.NAME as LEADER_USER_NAME,
-
-		aud.NAME as AUDIT_DEPARTMENT_NAME,
-		auu.NAME as AUDIT_USER_NAME,
-
-		apd.NAME as APPROVE_DEPARTMENT_NAME,
-		apu.NAME as APPROVE_USER_NAME,
-
-		acd.NAME as ACCEPT_DEPARTMENT_NAME,
-		acu.NAME as ACCEPT_USER_NAME,
-
-		ac.NAME as CONFESS_DEPARTMENT_NAME,
-		accu.NAME as CONFESS_USER_NAME,
-
-		aac.NAME as ACCEPT_CONFESS_DEPARTMENT_NAME,
-		aacu.NAME as ACCEPT_CONFESS_USER_NAME,
-
-		bc.NAME as GUARDIAN_DEPARTMENT_NAME,
-		bcu.NAME as GUARDIAN_USER_NAME
-		from
-		<include refid="tableName"></include> f
-
-		left join OA_DEPARTMENT bc on bc.DEPARTMENT_ID = f.GUARDIAN_DEPARTMENT_ID
-		left join SYS_USER bcu on bcu.USER_ID = f.GUARDIAN_USER_ID
-
-		left join OA_DEPARTMENT aac on aac.DEPARTMENT_ID = f.ACCEPT_CONFESS_DEPARTMENT_ID
-		left join SYS_USER aacu on aacu.USER_ID = f.ACCEPT_CONFESS_USER_ID
-
-		left join OA_DEPARTMENT ac on ac.DEPARTMENT_ID = f.CONFESS_DEPARTMENT_ID
-		left join SYS_USER accu on accu.USER_ID = f.CONFESS_USER_ID
-
-		left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID
-
-		left join OA_DEPARTMENT cd on cd.DEPARTMENT_ID = f.CONSTRUCTION_DEPARTMENT_ID
-		left join SYS_USER cu on cu.USER_ID = f.CONSTRUCTION_USER_ID
-
-		left join OA_DEPARTMENT ld on ld.DEPARTMENT_ID = f.LEADER_DEPARTMENT_ID
-		left join SYS_USER lu on lu.USER_ID = f.LEADER_USER_ID
-
-		left join OA_DEPARTMENT aud on aud.DEPARTMENT_ID = f.AUDIT_DEPARTMENT_ID
-		left join SYS_USER auu on auu.USER_ID = f.AUDIT_USER_ID
-
-		left join OA_DEPARTMENT apd on apd.DEPARTMENT_ID = f.APPROVE_DEPARTMENT_ID
-		left join SYS_USER apu on apu.USER_ID = f.APPROVE_USER_ID
-
-		left join OA_DEPARTMENT acd on acd.DEPARTMENT_ID = f.ACCEPT_DEPARTMENT_ID
-		left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID
-		where
-			f.HIGHWORK_ID = #{HIGHWORK_ID}
-	</select>
-
-	<!-- 列表 -->
-	<select id="datalistPage" parameterType="page" resultType="pd">
-		select
-		f.CORPINFO_ID,
-		f.APPLY_DEPARTMENT_ID,
-		f.APPLY_USER,
-		f.ISDELETE,
-		f.CREATTIME,
-		f.CREATOR,
-		f.OPERATTIME,
-		f.OPERATOR,
-		f.CHECK_NO,
-		f.PROJECT_MANAGER,
-		f.WORK_CONTENT,
-		f.WORK_START_DATE,
-		f.WORK_END_DATE,
-		f.CONSTRUCTION_DEPARTMENT_ID,
-		f.CONSTRUCTION_USER_ID,
-		f.CONSTRUCTION_USER_SIGNER_PATH,
-		f.CONSTRUCTION_USER_SIGNER_TIME,
-		f.AUDIT_DEPARTMENT_ID,
-		f.AUDIT_USER_ID,
-		f.AUDIT_USER_SIGNER_PATH,
-		f.AUDIT_USER_SIGNER_TIME,
-		f.APPROVE_DEPARTMENT_ID,
-		f.APPROVE_USER_ID,
-		f.APPROVE_USER_SIGNER_PATH,
-		f.APPROVE_USER_SIGNER_TIME,
-		f.ACCEPT_DEPARTMENT_ID,
-		f.ACCEPT_USER_ID,
-		f.ACCEPT_USER_SIGNER_PATH,
-		f.ACCEPT_USER_SIGNER_TIME,
-		f.APPLY_STATUS,
-		f.CONSTRUCTION_CONTENT,
-		f.AUDIT_CONTENT,
-		f.APPROVE_CONTENT,
-		f.ACCEPT_CONTENT,
-		f.OTHER_PROTECTIVE_MEASURES,
-		f.HAZARD_IDENTIFICATION,
-		f.BELONGING_CORP,
-		f.WORK_CORP,
-		f.WORK_PLACE,
-		f.LEADER_DEPARTMENT_ID,
-		f.LEADER_USER_ID,
-		f.LEADER_CONTENT,
-		f.LEADER_USER_SIGNER_PATH,
-		f.LEADER_USER_SIGNER_TIME,
-		f.CONFESS_USER,
-		f.ACCEPT_CONFESS_USER,
-		f.SPECIAL_WORK,
-		f.GUARDIAN_USER,
-		f.WORK_HIGH,
-		f.WORK_LEVEL,
-		f.HIGHWORK_ID,
-		f.GUARDIAN_DEPARTMENT_ID,
-		f.GUARDIAN_USER_ID,
-		f.GUARDIAN_USER_SIGNER_PATH,
-		f.GUARDIAN_USER_SIGNER_TIME,
-		f.CONFESS_DEPARTMENT_ID,
-		f.CONFESS_USER_ID,
-		f.CONFESS_USER_SIGNER_PATH,
-		f.CONFESS_USER_SIGNER_TIME,
-		f.ACCEPT_CONFESS_DEPARTMENT_ID,
-		f.ACCEPT_CONFESS_USER_ID,
-		f.ACCEPT_CONFESS_USER_SIGNER_PATH,
-		f.WORK_LONGITUDE,
-		f.WORK_LATITUDE,
-
-		(SELECT a.ACCEPT_CONFESS_USER_SIGNER_TIME from GF_HIGHWORK_ACCEPTUSER a where a.ISDELETE = '0'
-		AND a.HIGHWORK_ID = f.HIGHWORK_ID
-		ORDER BY
-		a.ACCEPT_CONFESS_USER_SIGNER_TIME DESC LIMIT 1) as ACCEPT_CONFESS_USER_SIGNER_TIME,
-		ad.NAME as APPLY_DEPARTMENT_NAME,
-		getFullName(ad.DEPARTMENT_ID) APPLY_DEPARTMENT_ALL,
-
-		cd.NAME as CONSTRUCTION_DEPARTMENT_NAME,
-		cu.NAME as CONSTRUCTION_USER_NAME,
-
-		ld.NAME as LEADER_DEPARTMENT_NAME,
-		lu.NAME as LEADER_USER_NAME,
-
-		aud.NAME as AUDIT_DEPARTMENT_NAME,
-		auu.NAME as AUDIT_USER_NAME,
-
-		apd.NAME as APPROVE_DEPARTMENT_NAME,
-		apu.NAME as APPROVE_USER_NAME,
-
-		acd.NAME as ACCEPT_DEPARTMENT_NAME,
-		acu.NAME as ACCEPT_USER_NAME,
-
-		ac.NAME as CONFESS_DEPARTMENT_NAME,
-		accu.NAME as CONFESS_USER_NAME,
-
-		aac.NAME as ACCEPT_CONFESS_DEPARTMENT_NAME,
-		aacu.NAME as ACCEPT_CONFESS_USER_NAME,
-
-		bc.NAME as GUARDIAN_DEPARTMENT_NAME,
-		bcu.NAME as GUARDIAN_USER_NAME
-		from
-		<include refid="tableName"></include> f
-		left join OA_DEPARTMENT bc on bc.DEPARTMENT_ID = f.GUARDIAN_DEPARTMENT_ID
-		left join SYS_USER bcu on bcu.USER_ID = f.GUARDIAN_USER_ID
-
-		left join OA_DEPARTMENT aac on aac.DEPARTMENT_ID = f.ACCEPT_CONFESS_DEPARTMENT_ID
-		left join SYS_USER aacu on aacu.USER_ID = f.ACCEPT_CONFESS_USER_ID
-
-		left join OA_DEPARTMENT ac on ac.DEPARTMENT_ID = f.CONFESS_DEPARTMENT_ID
-		left join SYS_USER accu on accu.USER_ID = f.CONFESS_USER_ID
-
-		left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID
-
-		left join OA_DEPARTMENT cd on cd.DEPARTMENT_ID = f.CONSTRUCTION_DEPARTMENT_ID
-		left join SYS_USER cu on cu.USER_ID = f.CONSTRUCTION_USER_ID
-
-		left join OA_DEPARTMENT ld on ld.DEPARTMENT_ID = f.LEADER_DEPARTMENT_ID
-		left join SYS_USER lu on lu.USER_ID = f.LEADER_USER_ID
-
-		left join OA_DEPARTMENT aud on aud.DEPARTMENT_ID = f.AUDIT_DEPARTMENT_ID
-		left join SYS_USER auu on auu.USER_ID = f.AUDIT_USER_ID
-
-		left join OA_DEPARTMENT apd on apd.DEPARTMENT_ID = f.APPROVE_DEPARTMENT_ID
-		left join SYS_USER apu on apu.USER_ID = f.APPROVE_USER_ID
-
-		left join OA_DEPARTMENT acd on acd.DEPARTMENT_ID = f.ACCEPT_DEPARTMENT_ID
-		left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID
-		where f.ISDELETE = '0'
-		<if test="pd.APPLY_STATUS != null and pd.APPLY_STATUS != ''">
-			and f.APPLY_STATUS = #{pd.APPLY_STATUS}
-		</if>
-
-		<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
-			and f.CORPINFO_ID = #{pd.CORPINFO_ID}
-		</if>
-
-		<if test="pd.CREATOR != null and pd.CREATOR != ''">
-			and f.CREATOR = #{pd.CREATOR}
-		</if>
-
-		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
-			and
-			(
-			f.CHECK_NO LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
-			)
-		</if>
-
-		<if test="pd.CONSTRUCTION_USER_ID != null and pd.CONSTRUCTION_USER_ID != ''">
-			and f.CONSTRUCTION_USER_ID = #{pd.CONSTRUCTION_USER_ID}
-		</if>
-
-		<if test="pd.LEADER_USER_ID != null and pd.LEADER_USER_ID != ''">
-			and f.LEADER_USER_ID = #{pd.LEADER_USER_ID}
-		</if>
-
-		<if test="pd.AUDIT_USER_ID != null and pd.AUDIT_USER_ID != ''">
-			and f.AUDIT_USER_ID = #{pd.AUDIT_USER_ID}
-		</if>
-		<if test="pd.GUARDIAN_USER_ID != null and pd.GUARDIAN_USER_ID != ''">
-			and f.GUARDIAN_USER_ID = #{pd.GUARDIAN_USER_ID}
-		</if>
-		<if test="pd.CONFESS_USER_ID != null and pd.CONFESS_USER_ID != ''">
-			and f.CONFESS_USER_ID = #{pd.CONFESS_USER_ID}
-		</if>
-		<if test="pd.ACCEPT_CONFESS_USER_ID != null and pd.ACCEPT_CONFESS_USER_ID != ''">
-			and f.ACCEPT_CONFESS_USER_ID = #{pd.ACCEPT_CONFESS_USER_ID}
-		</if>
-		<if test="pd.APPROVE_USER_ID != null and pd.APPROVE_USER_ID != ''">
-			and f.APPROVE_USER_ID = #{pd.APPROVE_USER_ID}
-		</if>
-
-		<if test="pd.ACCEPT_USER_ID != null and pd.ACCEPT_USER_ID != ''">
-			and f.ACCEPT_USER_ID = #{pd.ACCEPT_USER_ID}
-		</if>
-		<choose>
-			<when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
-				<if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
-					and
-					f.APPLY_DEPARTMENT_ID in
-					<foreach item="item" index="index"
-							 collection="pd.DEPT_IDS" open="(" separator="," close=")">
-						'${item}'
-					</foreach>
-				</if>
-			</when>
-			<otherwise>
-				<choose>
-					<when test='pd.ISSUPERVISE != null and pd.ISSUPERVISE != "" and pd.ISSUPERVISE == "1"'>
-						<choose>
-							<when test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
-								and
-								f.APPLY_DEPARTMENT_ID in
-								<foreach item="item" index="index"
-										 collection="pd.DEPT_IDS" open="(" separator="," close=")">
-									'${item}'
-								</foreach>
-							</when>
-							<otherwise>
-								and
-								f.APPLY_DEPARTMENT_ID in (
-								select
-								SUB_DEPARTMENT_ID
-								from
-								oa_supervision_department osd
-								where
-								osd.SUP_DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
-								and osd.ISDELETE = '0'
-								and osd.CORPINFO_ID  = #{pd.CORPINFO_ID}
-								)
-							</otherwise>
-						</choose>
-					</when>
-					<when test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
-						and f.APPLY_DEPARTMENT_ID=#{pd.DEPARTMENT_ID}
-					</when>
-					<otherwise>
-					</otherwise>
-				</choose>
-			</otherwise>
-		</choose>
-		ORDER BY f.APPLY_STATUS,f.CREATTIME DESC
-	</select>
-	<select id="aqdatalistPage" parameterType="page" resultType="pd">
-		select
-		f.CORPINFO_ID,
-		f.APPLY_DEPARTMENT_ID,
-		f.APPLY_USER,
-		f.ISDELETE,
-		f.CREATTIME,
-		f.CREATOR,
-		f.OPERATTIME,
-		f.OPERATOR,
-		f.CHECK_NO,
-		f.PROJECT_MANAGER,
-		f.WORK_CONTENT,
-		f.WORK_START_DATE,
-		f.WORK_END_DATE,
-		f.CONSTRUCTION_DEPARTMENT_ID,
-		f.CONSTRUCTION_USER_ID,
-		f.CONSTRUCTION_USER_SIGNER_PATH,
-		f.CONSTRUCTION_USER_SIGNER_TIME,
-		f.AUDIT_DEPARTMENT_ID,
-		f.AUDIT_USER_ID,
-		f.AUDIT_USER_SIGNER_PATH,
-		f.AUDIT_USER_SIGNER_TIME,
-		f.APPROVE_DEPARTMENT_ID,
-		f.APPROVE_USER_ID,
-		f.APPROVE_USER_SIGNER_PATH,
-		f.APPROVE_USER_SIGNER_TIME,
-		f.ACCEPT_DEPARTMENT_ID,
-		f.ACCEPT_USER_ID,
-		f.ACCEPT_USER_SIGNER_PATH,
-		f.ACCEPT_USER_SIGNER_TIME,
-		f.APPLY_STATUS,
-		f.CONSTRUCTION_CONTENT,
-		f.AUDIT_CONTENT,
-		f.APPROVE_CONTENT,
-		f.ACCEPT_CONTENT,
-		f.OTHER_PROTECTIVE_MEASURES,
-		f.HAZARD_IDENTIFICATION,
-		f.BELONGING_CORP,
-		f.WORK_CORP,
-		f.WORK_PLACE,
-		f.LEADER_DEPARTMENT_ID,
-		f.LEADER_USER_ID,
-		f.LEADER_CONTENT,
-		f.LEADER_USER_SIGNER_PATH,
-		f.LEADER_USER_SIGNER_TIME,
-		f.CONFESS_USER,
-		f.ACCEPT_CONFESS_USER,
-		f.SPECIAL_WORK,
-		f.GUARDIAN_USER,
-		f.WORK_HIGH,
-		f.WORK_LEVEL,
-		f.HIGHWORK_ID,
-		f.GUARDIAN_DEPARTMENT_ID,
-		f.GUARDIAN_USER_ID,
-		f.GUARDIAN_USER_SIGNER_PATH,
-		f.GUARDIAN_USER_SIGNER_TIME,
-		f.CONFESS_DEPARTMENT_ID,
-		f.CONFESS_USER_ID,
-		f.CONFESS_USER_SIGNER_PATH,
-		f.CONFESS_USER_SIGNER_TIME,
-		f.ACCEPT_CONFESS_DEPARTMENT_ID,
-		f.ACCEPT_CONFESS_USER_ID,
-		f.ACCEPT_CONFESS_USER_SIGNER_PATH,
-		f.WORK_LONGITUDE,
-		f.WORK_LATITUDE,
-		(SELECT a.ACCEPT_CONFESS_USER_SIGNER_TIME from GF_HIGHWORK_ACCEPTUSER a where a.ISDELETE = '0'
-		AND a.HIGHWORK_ID = f.HIGHWORK_ID
-		ORDER BY
-		a.ACCEPT_CONFESS_USER_SIGNER_TIME DESC LIMIT 1) as ACCEPT_CONFESS_USER_SIGNER_TIME,
-		ad.NAME as APPLY_DEPARTMENT_NAME,
-		getFullName(ad.DEPARTMENT_ID) APPLY_DEPARTMENT_ALL,
-
-		cd.NAME as CONSTRUCTION_DEPARTMENT_NAME,
-		cu.NAME as CONSTRUCTION_USER_NAME,
-
-		ld.NAME as LEADER_DEPARTMENT_NAME,
-		lu.NAME as LEADER_USER_NAME,
-
-		aud.NAME as AUDIT_DEPARTMENT_NAME,
-		auu.NAME as AUDIT_USER_NAME,
-
-		apd.NAME as APPROVE_DEPARTMENT_NAME,
-		apu.NAME as APPROVE_USER_NAME,
-
-		acd.NAME as ACCEPT_DEPARTMENT_NAME,
-		acu.NAME as ACCEPT_USER_NAME,
-
-		ac.NAME as CONFESS_DEPARTMENT_NAME,
-		accu.NAME as CONFESS_USER_NAME,
-
-		aac.NAME as ACCEPT_CONFESS_DEPARTMENT_NAME,
-		aacu.NAME as ACCEPT_CONFESS_USER_NAME,
-
-		bc.NAME as GUARDIAN_DEPARTMENT_NAME,
-		bcu.NAME as GUARDIAN_USER_NAME
-		from
-		<include refid="tableName"></include> f
-		left join OA_DEPARTMENT bc on bc.DEPARTMENT_ID = f.GUARDIAN_DEPARTMENT_ID
-		left join SYS_USER bcu on bcu.USER_ID = f.GUARDIAN_USER_ID
-
-		left join OA_DEPARTMENT aac on aac.DEPARTMENT_ID = f.ACCEPT_CONFESS_DEPARTMENT_ID
-		left join SYS_USER aacu on aacu.USER_ID = f.ACCEPT_CONFESS_USER_ID
-
-		left join OA_DEPARTMENT ac on ac.DEPARTMENT_ID = f.CONFESS_DEPARTMENT_ID
-		left join SYS_USER accu on accu.USER_ID = f.CONFESS_USER_ID
-
-		left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID
-
-		left join OA_DEPARTMENT cd on cd.DEPARTMENT_ID = f.CONSTRUCTION_DEPARTMENT_ID
-		left join SYS_USER cu on cu.USER_ID = f.CONSTRUCTION_USER_ID
-
-		left join OA_DEPARTMENT ld on ld.DEPARTMENT_ID = f.LEADER_DEPARTMENT_ID
-		left join SYS_USER lu on lu.USER_ID = f.LEADER_USER_ID
-
-		left join OA_DEPARTMENT aud on aud.DEPARTMENT_ID = f.AUDIT_DEPARTMENT_ID
-		left join SYS_USER auu on auu.USER_ID = f.AUDIT_USER_ID
-
-		left join OA_DEPARTMENT apd on apd.DEPARTMENT_ID = f.APPROVE_DEPARTMENT_ID
-		left join SYS_USER apu on apu.USER_ID = f.APPROVE_USER_ID
-
-		left join OA_DEPARTMENT acd on acd.DEPARTMENT_ID = f.ACCEPT_DEPARTMENT_ID
-		left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID
-		where f.ISDELETE = '0'
-		and f.APPLY_STATUS &lt; 6 and f.CONFESS_USER_SIGNER_TIME is null and f.APPLY_STATUS &gt; 0
-
-		<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
-			and f.CORPINFO_ID = #{pd.CORPINFO_ID}
-		</if>
-
-		<if test="pd.CREATOR != null and pd.CREATOR != ''">
-			and f.CREATOR = #{pd.CREATOR}
-		</if>
-
-		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
-			and
-			(
-			f.CHECK_NO LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
-			)
-		</if>
-
-		<if test="pd.CONSTRUCTION_USER_ID != null and pd.CONSTRUCTION_USER_ID != ''">
-			and f.CONSTRUCTION_USER_ID = #{pd.CONSTRUCTION_USER_ID}
-		</if>
-
-		<if test="pd.LEADER_USER_ID != null and pd.LEADER_USER_ID != ''">
-			and f.LEADER_USER_ID = #{pd.LEADER_USER_ID}
-		</if>
-
-		<if test="pd.AUDIT_USER_ID != null and pd.AUDIT_USER_ID != ''">
-			and f.AUDIT_USER_ID = #{pd.AUDIT_USER_ID}
-		</if>
-		<if test="pd.GUARDIAN_USER_ID != null and pd.GUARDIAN_USER_ID != ''">
-			and f.GUARDIAN_USER_ID = #{pd.GUARDIAN_USER_ID}
-		</if>
-		<if test="pd.CONFESS_USER_ID != null and pd.CONFESS_USER_ID != ''">
-			and f.CONFESS_USER_ID = #{pd.CONFESS_USER_ID}
-		</if>
-		<if test="pd.ACCEPT_CONFESS_USER_ID != null and pd.ACCEPT_CONFESS_USER_ID != ''">
-			and f.ACCEPT_CONFESS_USER_ID = #{pd.ACCEPT_CONFESS_USER_ID}
-		</if>
-		<if test="pd.APPROVE_USER_ID != null and pd.APPROVE_USER_ID != ''">
-			and f.APPROVE_USER_ID = #{pd.APPROVE_USER_ID}
-		</if>
-
-		<if test="pd.ACCEPT_USER_ID != null and pd.ACCEPT_USER_ID != ''">
-			and f.ACCEPT_USER_ID = #{pd.ACCEPT_USER_ID}
-		</if>
-		<choose>
-			<when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
-				<if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
-					and
-					f.APPLY_DEPARTMENT_ID in
-					<foreach item="item" index="index"
-							 collection="pd.DEPT_IDS" open="(" separator="," close=")">
-						'${item}'
-					</foreach>
-				</if>
-			</when>
-			<otherwise>
-				<choose>
-					<when test='pd.ISSUPERVISE != null and pd.ISSUPERVISE != "" and pd.ISSUPERVISE == "1"'>
-						<choose>
-							<when test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
-								and
-								f.APPLY_DEPARTMENT_ID in
-								<foreach item="item" index="index"
-										 collection="pd.DEPT_IDS" open="(" separator="," close=")">
-									'${item}'
-								</foreach>
-							</when>
-							<otherwise>
-								and
-								f.APPLY_DEPARTMENT_ID in (
-								select
-								SUB_DEPARTMENT_ID
-								from
-								oa_supervision_department osd
-								where
-								osd.SUP_DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
-								and osd.ISDELETE = '0'
-								and osd.CORPINFO_ID  = #{pd.CORPINFO_ID}
-								)
-							</otherwise>
-						</choose>
-					</when>
-					<when test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
-						and f.APPLY_DEPARTMENT_ID=#{pd.DEPARTMENT_ID}
-					</when>
-					<otherwise>
-					</otherwise>
-				</choose>
-			</otherwise>
-		</choose>
-		ORDER BY f.APPLY_STATUS,f.CREATTIME DESC
-	</select>
-	<select id="jhdatalistPage" parameterType="page" resultType="pd">
-		select
-		f.CORPINFO_ID,
-		f.APPLY_DEPARTMENT_ID,
-		f.APPLY_USER,
-		f.ISDELETE,
-		f.CREATTIME,
-		f.CREATOR,
-		f.OPERATTIME,
-		f.OPERATOR,
-		f.CHECK_NO,
-		f.PROJECT_MANAGER,
-		f.WORK_CONTENT,
-		f.WORK_START_DATE,
-		f.WORK_END_DATE,
-		f.CONSTRUCTION_DEPARTMENT_ID,
-		f.CONSTRUCTION_USER_ID,
-		f.CONSTRUCTION_USER_SIGNER_PATH,
-		f.CONSTRUCTION_USER_SIGNER_TIME,
-		f.AUDIT_DEPARTMENT_ID,
-		f.AUDIT_USER_ID,
-		f.AUDIT_USER_SIGNER_PATH,
-		f.AUDIT_USER_SIGNER_TIME,
-		f.APPROVE_DEPARTMENT_ID,
-		f.APPROVE_USER_ID,
-		f.APPROVE_USER_SIGNER_PATH,
-		f.APPROVE_USER_SIGNER_TIME,
-		f.ACCEPT_DEPARTMENT_ID,
-		f.ACCEPT_USER_ID,
-		f.ACCEPT_USER_SIGNER_PATH,
-		f.ACCEPT_USER_SIGNER_TIME,
-		f.APPLY_STATUS,
-		f.CONSTRUCTION_CONTENT,
-		f.AUDIT_CONTENT,
-		f.APPROVE_CONTENT,
-		f.ACCEPT_CONTENT,
-		f.OTHER_PROTECTIVE_MEASURES,
-		f.HAZARD_IDENTIFICATION,
-		f.BELONGING_CORP,
-		f.WORK_CORP,
-		f.WORK_PLACE,
-		f.LEADER_DEPARTMENT_ID,
-		f.LEADER_USER_ID,
-		f.LEADER_CONTENT,
-		f.LEADER_USER_SIGNER_PATH,
-		f.LEADER_USER_SIGNER_TIME,
-		f.CONFESS_USER,
-		f.ACCEPT_CONFESS_USER,
-		f.SPECIAL_WORK,
-		f.GUARDIAN_USER,
-		f.WORK_HIGH,
-		f.WORK_LEVEL,
-		f.HIGHWORK_ID,
-		f.GUARDIAN_DEPARTMENT_ID,
-		f.GUARDIAN_USER_ID,
-		f.GUARDIAN_USER_SIGNER_PATH,
-		f.GUARDIAN_USER_SIGNER_TIME,
-		f.CONFESS_DEPARTMENT_ID,
-		f.CONFESS_USER_ID,
-		f.CONFESS_USER_SIGNER_PATH,
-		f.CONFESS_USER_SIGNER_TIME,
-		f.ACCEPT_CONFESS_DEPARTMENT_ID,
-		f.ACCEPT_CONFESS_USER_ID,
-		f.ACCEPT_CONFESS_USER_SIGNER_PATH,
-		f.WORK_LONGITUDE,
-		f.WORK_LATITUDE,
-		(SELECT a.ACCEPT_CONFESS_USER_SIGNER_TIME from GF_HIGHWORK_ACCEPTUSER a where a.ISDELETE = '0'
-		AND a.HIGHWORK_ID = f.HIGHWORK_ID
-		ORDER BY
-		a.ACCEPT_CONFESS_USER_SIGNER_TIME DESC LIMIT 1) as ACCEPT_CONFESS_USER_SIGNER_TIME,
-		ad.NAME as APPLY_DEPARTMENT_NAME,
-		getFullName(ad.DEPARTMENT_ID) APPLY_DEPARTMENT_ALL,
-
-		cd.NAME as CONSTRUCTION_DEPARTMENT_NAME,
-		cu.NAME as CONSTRUCTION_USER_NAME,
-
-		ld.NAME as LEADER_DEPARTMENT_NAME,
-		lu.NAME as LEADER_USER_NAME,
-
-		aud.NAME as AUDIT_DEPARTMENT_NAME,
-		auu.NAME as AUDIT_USER_NAME,
-
-		apd.NAME as APPROVE_DEPARTMENT_NAME,
-		apu.NAME as APPROVE_USER_NAME,
-
-		acd.NAME as ACCEPT_DEPARTMENT_NAME,
-		acu.NAME as ACCEPT_USER_NAME,
-
-		ac.NAME as CONFESS_DEPARTMENT_NAME,
-		accu.NAME as CONFESS_USER_NAME,
-
-		aac.NAME as ACCEPT_CONFESS_DEPARTMENT_NAME,
-		aacu.NAME as ACCEPT_CONFESS_USER_NAME,
-
-		bc.NAME as GUARDIAN_DEPARTMENT_NAME,
-		bcu.NAME as GUARDIAN_USER_NAME
-		from
-		<include refid="tableName"></include> f
-		left join OA_DEPARTMENT bc on bc.DEPARTMENT_ID = f.GUARDIAN_DEPARTMENT_ID
-		left join SYS_USER bcu on bcu.USER_ID = f.GUARDIAN_USER_ID
-
-		left join OA_DEPARTMENT aac on aac.DEPARTMENT_ID = f.ACCEPT_CONFESS_DEPARTMENT_ID
-		left join SYS_USER aacu on aacu.USER_ID = f.ACCEPT_CONFESS_USER_ID
-
-		left join OA_DEPARTMENT ac on ac.DEPARTMENT_ID = f.CONFESS_DEPARTMENT_ID
-		left join SYS_USER accu on accu.USER_ID = f.CONFESS_USER_ID
-
-		left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID
-
-		left join OA_DEPARTMENT cd on cd.DEPARTMENT_ID = f.CONSTRUCTION_DEPARTMENT_ID
-		left join SYS_USER cu on cu.USER_ID = f.CONSTRUCTION_USER_ID
-
-		left join OA_DEPARTMENT ld on ld.DEPARTMENT_ID = f.LEADER_DEPARTMENT_ID
-		left join SYS_USER lu on lu.USER_ID = f.LEADER_USER_ID
-
-		left join OA_DEPARTMENT aud on aud.DEPARTMENT_ID = f.AUDIT_DEPARTMENT_ID
-		left join SYS_USER auu on auu.USER_ID = f.AUDIT_USER_ID
-
-		left join OA_DEPARTMENT apd on apd.DEPARTMENT_ID = f.APPROVE_DEPARTMENT_ID
-		left join SYS_USER apu on apu.USER_ID = f.APPROVE_USER_ID
-
-		left join OA_DEPARTMENT acd on acd.DEPARTMENT_ID = f.ACCEPT_DEPARTMENT_ID
-		left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID
-		where f.ISDELETE = '0'
-		and f.APPLY_STATUS &lt; 6 and f.GUARDIAN_USER_SIGNER_TIME is null and f.APPLY_STATUS &gt; 0
-		<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
-			and f.CORPINFO_ID = #{pd.CORPINFO_ID}
-		</if>
-
-		<if test="pd.CREATOR != null and pd.CREATOR != ''">
-			and f.CREATOR = #{pd.CREATOR}
-		</if>
-
-		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
-			and
-			(
-			f.CHECK_NO LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
-			)
-		</if>
-
-		<if test="pd.CONSTRUCTION_USER_ID != null and pd.CONSTRUCTION_USER_ID != ''">
-			and f.CONSTRUCTION_USER_ID = #{pd.CONSTRUCTION_USER_ID}
-		</if>
-
-		<if test="pd.LEADER_USER_ID != null and pd.LEADER_USER_ID != ''">
-			and f.LEADER_USER_ID = #{pd.LEADER_USER_ID}
-		</if>
-
-		<if test="pd.AUDIT_USER_ID != null and pd.AUDIT_USER_ID != ''">
-			and f.AUDIT_USER_ID = #{pd.AUDIT_USER_ID}
-		</if>
-		<if test="pd.GUARDIAN_USER_ID != null and pd.GUARDIAN_USER_ID != ''">
-			and f.GUARDIAN_USER_ID = #{pd.GUARDIAN_USER_ID}
-		</if>
-		<if test="pd.CONFESS_USER_ID != null and pd.CONFESS_USER_ID != ''">
-			and f.CONFESS_USER_ID = #{pd.CONFESS_USER_ID}
-		</if>
-		<if test="pd.ACCEPT_CONFESS_USER_ID != null and pd.ACCEPT_CONFESS_USER_ID != ''">
-			and f.ACCEPT_CONFESS_USER_ID = #{pd.ACCEPT_CONFESS_USER_ID}
-		</if>
-		<if test="pd.APPROVE_USER_ID != null and pd.APPROVE_USER_ID != ''">
-			and f.APPROVE_USER_ID = #{pd.APPROVE_USER_ID}
-		</if>
-
-		<if test="pd.ACCEPT_USER_ID != null and pd.ACCEPT_USER_ID != ''">
-			and f.ACCEPT_USER_ID = #{pd.ACCEPT_USER_ID}
-		</if>
-		<choose>
-			<when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
-				<if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
-					and
-					f.APPLY_DEPARTMENT_ID in
-					<foreach item="item" index="index"
-							 collection="pd.DEPT_IDS" open="(" separator="," close=")">
-						'${item}'
-					</foreach>
-				</if>
-			</when>
-			<otherwise>
-				<choose>
-					<when test='pd.ISSUPERVISE != null and pd.ISSUPERVISE != "" and pd.ISSUPERVISE == "1"'>
-						<choose>
-							<when test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
-								and
-								f.APPLY_DEPARTMENT_ID in
-								<foreach item="item" index="index"
-										 collection="pd.DEPT_IDS" open="(" separator="," close=")">
-									'${item}'
-								</foreach>
-							</when>
-							<otherwise>
-								and
-								f.APPLY_DEPARTMENT_ID in (
-								select
-								SUB_DEPARTMENT_ID
-								from
-								oa_supervision_department osd
-								where
-								osd.SUP_DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
-								and osd.ISDELETE = '0'
-								and osd.CORPINFO_ID  = #{pd.CORPINFO_ID}
-								)
-							</otherwise>
-						</choose>
-					</when>
-					<when test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
-						and f.APPLY_DEPARTMENT_ID=#{pd.DEPARTMENT_ID}
-					</when>
-					<otherwise>
-					</otherwise>
-				</choose>
-			</otherwise>
-		</choose>
-		ORDER BY f.APPLY_STATUS,f.CREATTIME DESC
-	</select>
-	<select id="jsdatalistPage" parameterType="page" resultType="pd">
-		select
-		f.CORPINFO_ID,
-		f.APPLY_DEPARTMENT_ID,
-		f.APPLY_USER,
-		f.ISDELETE,
-		f.CREATTIME,
-		f.CREATOR,
-		f.OPERATTIME,
-		f.OPERATOR,
-		f.CHECK_NO,
-		f.PROJECT_MANAGER,
-		f.WORK_CONTENT,
-		f.WORK_START_DATE,
-		f.WORK_END_DATE,
-		f.CONSTRUCTION_DEPARTMENT_ID,
-		f.CONSTRUCTION_USER_ID,
-		f.CONSTRUCTION_USER_SIGNER_PATH,
-		f.CONSTRUCTION_USER_SIGNER_TIME,
-		f.AUDIT_DEPARTMENT_ID,
-		f.AUDIT_USER_ID,
-		f.AUDIT_USER_SIGNER_PATH,
-		f.AUDIT_USER_SIGNER_TIME,
-		f.APPROVE_DEPARTMENT_ID,
-		f.APPROVE_USER_ID,
-		f.APPROVE_USER_SIGNER_PATH,
-		f.APPROVE_USER_SIGNER_TIME,
-		f.ACCEPT_DEPARTMENT_ID,
-		f.ACCEPT_USER_ID,
-		f.ACCEPT_USER_SIGNER_PATH,
-		f.ACCEPT_USER_SIGNER_TIME,
-		f.APPLY_STATUS,
-		f.CONSTRUCTION_CONTENT,
-		f.AUDIT_CONTENT,
-		f.APPROVE_CONTENT,
-		f.ACCEPT_CONTENT,
-		f.OTHER_PROTECTIVE_MEASURES,
-		f.HAZARD_IDENTIFICATION,
-		f.BELONGING_CORP,
-		f.WORK_CORP,
-		f.WORK_PLACE,
-		f.LEADER_DEPARTMENT_ID,
-		f.LEADER_USER_ID,
-		f.LEADER_CONTENT,
-		f.LEADER_USER_SIGNER_PATH,
-		f.LEADER_USER_SIGNER_TIME,
-		f.CONFESS_USER,
-		f.ACCEPT_CONFESS_USER,
-		f.SPECIAL_WORK,
-		f.GUARDIAN_USER,
-		f.WORK_HIGH,
-		f.WORK_LEVEL,
-		f.HIGHWORK_ID,
-		f.GUARDIAN_DEPARTMENT_ID,
-		f.GUARDIAN_USER_ID,
-		f.GUARDIAN_USER_SIGNER_PATH,
-		f.GUARDIAN_USER_SIGNER_TIME,
-		f.CONFESS_DEPARTMENT_ID,
-		f.CONFESS_USER_ID,
-		f.CONFESS_USER_SIGNER_PATH,
-		f.CONFESS_USER_SIGNER_TIME,
-		f.ACCEPT_CONFESS_DEPARTMENT_ID,
-		f.ACCEPT_CONFESS_USER_ID,
-		f.ACCEPT_CONFESS_USER_SIGNER_PATH,
-		f.WORK_LONGITUDE,
-		f.WORK_LATITUDE,
-		(SELECT a.ACCEPT_CONFESS_USER_SIGNER_TIME from GF_HIGHWORK_ACCEPTUSER a where a.ISDELETE = '0'
-		AND a.HIGHWORK_ID = f.HIGHWORK_ID
-		ORDER BY
-		a.ACCEPT_CONFESS_USER_SIGNER_TIME DESC LIMIT 1) as ACCEPT_CONFESS_USER_SIGNER_TIME,
-		ad.NAME as APPLY_DEPARTMENT_NAME,
-		getFullName(ad.DEPARTMENT_ID) APPLY_DEPARTMENT_ALL,
-
-		cd.NAME as CONSTRUCTION_DEPARTMENT_NAME,
-		cu.NAME as CONSTRUCTION_USER_NAME,
-
-		ld.NAME as LEADER_DEPARTMENT_NAME,
-		lu.NAME as LEADER_USER_NAME,
-
-		aud.NAME as AUDIT_DEPARTMENT_NAME,
-		auu.NAME as AUDIT_USER_NAME,
-
-		apd.NAME as APPROVE_DEPARTMENT_NAME,
-		apu.NAME as APPROVE_USER_NAME,
-
-		acd.NAME as ACCEPT_DEPARTMENT_NAME,
-		acu.NAME as ACCEPT_USER_NAME,
-
-		ac.NAME as CONFESS_DEPARTMENT_NAME,
-		accu.NAME as CONFESS_USER_NAME,
-
-		aac.NAME as ACCEPT_CONFESS_DEPARTMENT_NAME,
-		aacu.NAME as ACCEPT_CONFESS_USER_NAME,
-
-		bc.NAME as GUARDIAN_DEPARTMENT_NAME,
-		bcu.NAME as GUARDIAN_USER_NAME
-		from
-		<include refid="tableName"></include> f
-		left join OA_DEPARTMENT bc on bc.DEPARTMENT_ID = f.GUARDIAN_DEPARTMENT_ID
-		left join SYS_USER bcu on bcu.USER_ID = f.GUARDIAN_USER_ID
-
-		left join OA_DEPARTMENT aac on aac.DEPARTMENT_ID = f.ACCEPT_CONFESS_DEPARTMENT_ID
-		left join SYS_USER aacu on aacu.USER_ID = f.ACCEPT_CONFESS_USER_ID
-
-		left join OA_DEPARTMENT ac on ac.DEPARTMENT_ID = f.CONFESS_DEPARTMENT_ID
-		left join SYS_USER accu on accu.USER_ID = f.CONFESS_USER_ID
-
-		left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID
-
-		left join OA_DEPARTMENT cd on cd.DEPARTMENT_ID = f.CONSTRUCTION_DEPARTMENT_ID
-		left join SYS_USER cu on cu.USER_ID = f.CONSTRUCTION_USER_ID
-
-		left join OA_DEPARTMENT ld on ld.DEPARTMENT_ID = f.LEADER_DEPARTMENT_ID
-		left join SYS_USER lu on lu.USER_ID = f.LEADER_USER_ID
-
-		left join OA_DEPARTMENT aud on aud.DEPARTMENT_ID = f.AUDIT_DEPARTMENT_ID
-		left join SYS_USER auu on auu.USER_ID = f.AUDIT_USER_ID
-
-		left join OA_DEPARTMENT apd on apd.DEPARTMENT_ID = f.APPROVE_DEPARTMENT_ID
-		left join SYS_USER apu on apu.USER_ID = f.APPROVE_USER_ID
-
-		left join OA_DEPARTMENT acd on acd.DEPARTMENT_ID = f.ACCEPT_DEPARTMENT_ID
-		left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID
-		where f.ISDELETE = '0'
-		and f.APPLY_STATUS &lt; 6
-		and not exists(select 1 from GF_HIGHWORK_ACCEPTUSER m where m.HIGHWORK_ID = f.HIGHWORK_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID)
-
-		and f.APPLY_STATUS &gt; 0
-
-		<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
-			and f.CORPINFO_ID = #{pd.CORPINFO_ID}
-		</if>
-
-		<if test="pd.CREATOR != null and pd.CREATOR != ''">
-			and f.CREATOR = #{pd.CREATOR}
-		</if>
-
-		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
-			and
-			(
-			f.CHECK_NO LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
-			)
-		</if>
-
-		<if test="pd.CONSTRUCTION_USER_ID != null and pd.CONSTRUCTION_USER_ID != ''">
-			and f.CONSTRUCTION_USER_ID = #{pd.CONSTRUCTION_USER_ID}
-		</if>
-
-		<if test="pd.LEADER_USER_ID != null and pd.LEADER_USER_ID != ''">
-			and f.LEADER_USER_ID = #{pd.LEADER_USER_ID}
-		</if>
-
-		<if test="pd.AUDIT_USER_ID != null and pd.AUDIT_USER_ID != ''">
-			and f.AUDIT_USER_ID = #{pd.AUDIT_USER_ID}
-		</if>
-		<if test="pd.GUARDIAN_USER_ID != null and pd.GUARDIAN_USER_ID != ''">
-			and f.GUARDIAN_USER_ID = #{pd.GUARDIAN_USER_ID}
-		</if>
-		<if test="pd.CONFESS_USER_ID != null and pd.CONFESS_USER_ID != ''">
-			and f.CONFESS_USER_ID = #{pd.CONFESS_USER_ID}
-		</if>
-		<if test="pd.ACCEPT_CONFESS_USER_ID != null and pd.ACCEPT_CONFESS_USER_ID != ''">
-			and f.ACCEPT_CONFESS_USER_ID = #{pd.ACCEPT_CONFESS_USER_ID}
-		</if>
-		<if test="pd.APPROVE_USER_ID != null and pd.APPROVE_USER_ID != ''">
-			and f.APPROVE_USER_ID = #{pd.APPROVE_USER_ID}
-		</if>
-
-		<if test="pd.ACCEPT_USER_ID != null and pd.ACCEPT_USER_ID != ''">
-			and f.ACCEPT_USER_ID = #{pd.ACCEPT_USER_ID}
-		</if>
-		<choose>
-			<when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
-				<if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
-					and
-					f.APPLY_DEPARTMENT_ID in
-					<foreach item="item" index="index"
-							 collection="pd.DEPT_IDS" open="(" separator="," close=")">
-						'${item}'
-					</foreach>
-				</if>
-			</when>
-			<otherwise>
-				<choose>
-					<when test='pd.ISSUPERVISE != null and pd.ISSUPERVISE != "" and pd.ISSUPERVISE == "1"'>
-						<choose>
-							<when test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
-								and
-								f.APPLY_DEPARTMENT_ID in
-								<foreach item="item" index="index"
-										 collection="pd.DEPT_IDS" open="(" separator="," close=")">
-									'${item}'
-								</foreach>
-							</when>
-							<otherwise>
-								and
-								f.APPLY_DEPARTMENT_ID in (
-								select
-								SUB_DEPARTMENT_ID
-								from
-								oa_supervision_department osd
-								where
-								osd.SUP_DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
-								and osd.ISDELETE = '0'
-								and osd.CORPINFO_ID  = #{pd.CORPINFO_ID}
-								)
-							</otherwise>
-						</choose>
-					</when>
-					<when test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
-						and f.APPLY_DEPARTMENT_ID=#{pd.DEPARTMENT_ID}
-					</when>
-					<otherwise>
-					</otherwise>
-				</choose>
-			</otherwise>
-		</choose>
-		ORDER BY f.APPLY_STATUS,f.CREATTIME DESC
-	</select>
-
-	<!-- 列表(全部) -->
-	<select id="listAllMeasures" parameterType="pd" resultType="pd">
-		select
-		f.*
-		<if test="APPLY_STATUS != '1' and APPLY_STATUS != 1">
-			,eo.STATUS,eo.CONFIRM_NAME
-		</if>
-		from
-		GF_HIGHWORK_MEASURES f
-		<if test="APPLY_STATUS != '1' and APPLY_STATUS != 1">
-			left join GF_HIGHWORKTOMEASURES eo on eo.BUS_HIGHWORK_MEASURES_ID = f.HIGHWORK_MEASURES_ID
-		</if>
-		where f.ISDELETE = '0'
-		<if test="APPLY_STATUS != '1' and APPLY_STATUS != 1">
-			and eo.HIGHWORK_ID = #{HIGHWORK_ID}
-		</if>
-		order by f.ORDER
-	</select>
-
-	<!-- 列表(全部) -->
-	<select id="listAll" parameterType="pd" resultType="pd">
-		select
-		<include refid="Field"></include>
-		from
-		<include refid="tableName"></include> f
-	</select>
-
-	<!-- 批量删除 -->
-	<delete id="deleteAll" parameterType="String">
-		update
-		<include refid="tableName"></include>
-		set
-			ISDELETE = '1'
-		where
-			HIGHWORK_ID in
-		<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
-                 #{item}
-		</foreach>
-	</delete>
-
-	<!-- 待办作业数 -->
-	<select id="countCheck" parameterType="pd" resultType="pd">
-		SELECT
-		COUNT(CASE WHEN (f.APPLY_STATUS+0) &lt; 1 AND f.CREATOR = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTBACK,
-		COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTCONSTRUCTION,
-		COUNT(CASE WHEN f.APPLY_STATUS = '2' AND f.LEADER_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTLEADER,
-		COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTAUDIT,
-		COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTAPPROVE,
-		COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTACCEPT,
-		COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and f.GUARDIAN_USER_SIGNER_TIME is null THEN f.HIGHWORK_ID END) COUNTGUARDIAN,
-		COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.CONFESS_USER_ID = #{USER_ID} and f.CONFESS_USER_SIGNER_TIME is null THEN f.HIGHWORK_ID END) COUNTCONFESS,
-		COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and not exists(select 1 from GF_HIGHWORK_ACCEPTUSER m where m.HIGHWORK_ID = f.HIGHWORK_ID and m.CORPINFO_ID = f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.HIGHWORK_ID END) COUNTACCEPTCONFESS
-		FROM <include refid="tableName"></include> f
-		WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
-	</select>
-
-	<!-- 获取编码 -->
-	<select id="getCode" parameterType="pd" resultType="pd">
-		SELECT
-		COUNT(1) as code
-		FROM <include refid="tableName"></include> f
-		WHERE f.CORPINFO_ID = #{CORPINFO_ID}
-		and f.CREATTIME LIKE CONCAT(#{CREATDATE},'%')
-	</select>
+    </sql>
+
+    <!-- 字段值 -->
+    <sql id="FieldValue">
+        #{CORPINFO_ID}
+        ,
+        #{APPLY_DEPARTMENT_ID},
+        #{APPLY_USER},
+        #{ISDELETE},
+        #{CREATTIME},
+        #{CREATOR},
+        #{OPERATTIME},
+        #{OPERATOR},
+        #{CHECK_NO},
+        #{PROJECT_MANAGER},
+        #{WORK_CONTENT},
+        #{WORK_START_DATE},
+        #{WORK_END_DATE},
+        #{CONSTRUCTION_DEPARTMENT_ID},
+        #{CONSTRUCTION_USER_ID},
+        #{CONSTRUCTION_USER_SIGNER_PATH},
+        #{CONSTRUCTION_USER_SIGNER_TIME},
+        #{AUDIT_DEPARTMENT_ID},
+        #{AUDIT_USER_ID},
+        #{AUDIT_USER_SIGNER_PATH},
+        #{AUDIT_USER_SIGNER_TIME},
+        #{APPROVE_DEPARTMENT_ID},
+        #{APPROVE_USER_ID},
+        #{APPROVE_USER_SIGNER_PATH},
+        #{APPROVE_USER_SIGNER_TIME},
+        #{ACCEPT_DEPARTMENT_ID},
+        #{ACCEPT_USER_ID},
+        #{ACCEPT_USER_SIGNER_PATH},
+        #{ACCEPT_USER_SIGNER_TIME},
+        #{APPLY_STATUS},
+        #{CONSTRUCTION_CONTENT},
+        #{AUDIT_CONTENT},
+        #{APPROVE_CONTENT},
+        #{ACCEPT_CONTENT},
+        #{OTHER_PROTECTIVE_MEASURES},
+        #{HAZARD_IDENTIFICATION},
+        #{BELONGING_CORP},
+        #{WORK_CORP},
+        #{WORK_PLACE},
+        #{LEADER_DEPARTMENT_ID},
+        #{LEADER_USER_ID},
+        #{LEADER_CONTENT},
+        #{LEADER_USER_SIGNER_PATH},
+        #{LEADER_USER_SIGNER_TIME},
+        #{CONFESS_USER},
+        #{ACCEPT_CONFESS_USER},
+        #{SPECIAL_WORK},
+        #{GUARDIAN_USER},
+        #{WORK_HIGH},
+        #{WORK_LEVEL},
+        #{HIGHWORK_ID},
+        #{GUARDIAN_DEPARTMENT_ID},
+        #{GUARDIAN_USER_ID},
+        #{GUARDIAN_USER_SIGNER_PATH},
+        #{GUARDIAN_USER_SIGNER_TIME},
+        #{CONFESS_DEPARTMENT_ID},
+        #{CONFESS_USER_ID},
+        #{CONFESS_USER_SIGNER_PATH},
+        #{CONFESS_USER_SIGNER_TIME},
+        #{ACCEPT_CONFESS_DEPARTMENT_ID},
+        #{ACCEPT_CONFESS_USER_ID},
+        #{ACCEPT_CONFESS_USER_SIGNER_PATH},
+        #{ACCEPT_CONFESS_USER_SIGNER_TIME},
+        #{WORK_LONGITUDE},
+        #{WORK_LATITUDE}
+    </sql>
+
+    <!-- 新增-->
+    <insert id="save" parameterType="pd">
+        insert into
+        <include refid="tableName"></include>
+        (
+        <include refid="Field2"></include>
+        ) values (
+        <include refid="FieldValue"></include>
+        )
+    </insert>
+
+    <!-- 删除-->
+    <delete id="delete" parameterType="pd">
+        update
+        <include refid="tableName"></include>
+        set
+        ISDELETE = '1'
+        where
+        HIGHWORK_ID = #{HIGHWORK_ID}
+    </delete>
+
+    <!-- 修改 -->
+    <update id="edit" parameterType="pd">
+        update
+        <include refid="tableName"></include>
+        set
+        CORPINFO_ID = #{CORPINFO_ID},
+        APPLY_DEPARTMENT_ID = #{APPLY_DEPARTMENT_ID},
+        APPLY_USER = #{APPLY_USER},
+        ISDELETE = #{ISDELETE},
+        CREATTIME = #{CREATTIME},
+        CREATOR = #{CREATOR},
+        OPERATTIME = #{OPERATTIME},
+        OPERATOR = #{OPERATOR},
+        CHECK_NO = #{CHECK_NO},
+        PROJECT_MANAGER = #{PROJECT_MANAGER},
+        WORK_CONTENT = #{WORK_CONTENT},
+        WORK_START_DATE = #{WORK_START_DATE},
+        WORK_END_DATE = #{WORK_END_DATE},
+        CONSTRUCTION_DEPARTMENT_ID = #{CONSTRUCTION_DEPARTMENT_ID},
+        CONSTRUCTION_USER_ID = #{CONSTRUCTION_USER_ID},
+        CONSTRUCTION_USER_SIGNER_PATH = #{CONSTRUCTION_USER_SIGNER_PATH},
+        CONSTRUCTION_USER_SIGNER_TIME = #{CONSTRUCTION_USER_SIGNER_TIME},
+        AUDIT_DEPARTMENT_ID = #{AUDIT_DEPARTMENT_ID},
+        AUDIT_USER_ID = #{AUDIT_USER_ID},
+        AUDIT_USER_SIGNER_PATH = #{AUDIT_USER_SIGNER_PATH},
+        AUDIT_USER_SIGNER_TIME = #{AUDIT_USER_SIGNER_TIME},
+        APPROVE_DEPARTMENT_ID = #{APPROVE_DEPARTMENT_ID},
+        APPROVE_USER_ID = #{APPROVE_USER_ID},
+        APPROVE_USER_SIGNER_PATH = #{APPROVE_USER_SIGNER_PATH},
+        APPROVE_USER_SIGNER_TIME = #{APPROVE_USER_SIGNER_TIME},
+        ACCEPT_DEPARTMENT_ID = #{ACCEPT_DEPARTMENT_ID},
+        ACCEPT_USER_ID = #{ACCEPT_USER_ID},
+        ACCEPT_USER_SIGNER_PATH = #{ACCEPT_USER_SIGNER_PATH},
+        ACCEPT_USER_SIGNER_TIME = #{ACCEPT_USER_SIGNER_TIME},
+        APPLY_STATUS = #{APPLY_STATUS},
+        CONSTRUCTION_CONTENT = #{CONSTRUCTION_CONTENT},
+        AUDIT_CONTENT = #{AUDIT_CONTENT},
+        APPROVE_CONTENT = #{APPROVE_CONTENT},
+        ACCEPT_CONTENT = #{ACCEPT_CONTENT},
+        OTHER_PROTECTIVE_MEASURES = #{OTHER_PROTECTIVE_MEASURES},
+        HAZARD_IDENTIFICATION = #{HAZARD_IDENTIFICATION},
+        BELONGING_CORP = #{BELONGING_CORP},
+        WORK_CORP = #{WORK_CORP},
+        WORK_PLACE = #{WORK_PLACE},
+        LEADER_DEPARTMENT_ID = #{LEADER_DEPARTMENT_ID},
+        LEADER_USER_ID = #{LEADER_USER_ID},
+        LEADER_CONTENT = #{LEADER_CONTENT},
+        LEADER_USER_SIGNER_PATH = #{LEADER_USER_SIGNER_PATH},
+        LEADER_USER_SIGNER_TIME = #{LEADER_USER_SIGNER_TIME},
+        CONFESS_USER = #{CONFESS_USER},
+        SPECIAL_WORK = #{SPECIAL_WORK},
+        GUARDIAN_USER = #{GUARDIAN_USER},
+        WORK_HIGH = #{WORK_HIGH},
+        WORK_LEVEL = #{WORK_LEVEL},
+        HIGHWORK_ID = HIGHWORK_ID,
+        GUARDIAN_DEPARTMENT_ID = #{GUARDIAN_DEPARTMENT_ID},
+        GUARDIAN_USER_ID = #{GUARDIAN_USER_ID},
+        GUARDIAN_USER_SIGNER_PATH = #{GUARDIAN_USER_SIGNER_PATH},
+        GUARDIAN_USER_SIGNER_TIME = #{GUARDIAN_USER_SIGNER_TIME},
+        CONFESS_DEPARTMENT_ID = #{CONFESS_DEPARTMENT_ID},
+        CONFESS_USER_ID = #{CONFESS_USER_ID},
+        CONFESS_USER_SIGNER_PATH = #{CONFESS_USER_SIGNER_PATH},
+        CONFESS_USER_SIGNER_TIME = #{CONFESS_USER_SIGNER_TIME},
+        ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID},
+        ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID},
+        ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH},
+        ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME},
+        WORK_LONGITUDE = #{WORK_LONGITUDE},
+        WORK_LATITUDE = #{WORK_LATITUDE}
+        where
+        HIGHWORK_ID = #{HIGHWORK_ID}
+    </update>
+    <update id="clearMasterTable">
+        update
+            ${TYPE}
+        set GUARDIAN_USER_SIGNER_PATH       = null,
+            GUARDIAN_USER_SIGNER_TIME       = null,
+            CONFESS_USER_SIGNER_PATH        = null,
+            CONFESS_USER_SIGNER_TIME        = null,
+            ACCEPT_CONFESS_USER_SIGNER_PATH = null,
+            ACCEPT_CONFESS_USER_SIGNER_TIME = null,
+            CONSTRUCTION_USER_SIGNER_PATH   = null,
+            CONSTRUCTION_USER_SIGNER_TIME   = null,
+            OTHER_PROTECTIVE_MEASURES       = '',
+            APPLY_STATUS                    = 1,
+            OPERATOR                        = #{OPERATOR},
+            OPERATTIME                      = #{OPERATTIME}
+        where ${TABLE_ID_NAME} = #{ID}
+    </update>
+    <update id="clearMeasures">
+        delete
+        FROM ${TYPE}tomeasures
+        where ${TABLE_ID_NAME} = #{ID}
+    </update>
+
+    <!-- 通过ID获取数据 -->
+    <select id="findById" parameterType="pd" resultType="pd">
+        select
+        f.CORPINFO_ID,
+        f.APPLY_DEPARTMENT_ID,
+        f.APPLY_USER,
+        f.ISDELETE,
+        f.CREATTIME,
+        f.CREATOR,
+        f.OPERATTIME,
+        f.OPERATOR,
+        f.CHECK_NO,
+        f.PROJECT_MANAGER,
+        f.WORK_CONTENT,
+        replace(f.WORK_START_DATE,'-','/') as WORK_START_DATE,
+        replace(f.WORK_END_DATE,'-','/') as WORK_END_DATE,
+        f.CONSTRUCTION_DEPARTMENT_ID,
+        f.CONSTRUCTION_USER_ID,
+        f.CONSTRUCTION_USER_SIGNER_PATH,
+        f.CONSTRUCTION_USER_SIGNER_TIME,
+        f.AUDIT_DEPARTMENT_ID,
+        f.AUDIT_USER_ID,
+        f.AUDIT_USER_SIGNER_PATH,
+        f.AUDIT_USER_SIGNER_TIME,
+        f.APPROVE_DEPARTMENT_ID,
+        f.APPROVE_USER_ID,
+        f.APPROVE_USER_SIGNER_PATH,
+        f.APPROVE_USER_SIGNER_TIME,
+        f.ACCEPT_DEPARTMENT_ID,
+        f.ACCEPT_USER_ID,
+        f.ACCEPT_USER_SIGNER_PATH,
+        f.ACCEPT_USER_SIGNER_TIME,
+        f.APPLY_STATUS,
+        IFNULL(f.CONSTRUCTION_CONTENT,'无') as CONSTRUCTION_CONTENT,
+        IFNULL(f.AUDIT_CONTENT,'无') as AUDIT_CONTENT,
+        IFNULL(f.APPROVE_CONTENT,'无') as APPROVE_CONTENT,
+        IFNULL(f.ACCEPT_CONTENT,'无') as ACCEPT_CONTENT,
+        f.OTHER_PROTECTIVE_MEASURES,
+        f.HAZARD_IDENTIFICATION,
+        f.BELONGING_CORP,
+        f.WORK_CORP,
+        f.WORK_PLACE,
+        f.LEADER_DEPARTMENT_ID,
+        f.LEADER_USER_ID,
+        IFNULL(f.LEADER_CONTENT,'无') as LEADER_CONTENT,
+        f.LEADER_USER_SIGNER_PATH,
+        f.LEADER_USER_SIGNER_TIME,
+        f.CONFESS_USER,
+        f.ACCEPT_CONFESS_USER,
+        IFNULL(f.SPECIAL_WORK,'无') as SPECIAL_WORK,
+        f.GUARDIAN_USER,
+        f.WORK_HIGH,
+        f.WORK_LEVEL,
+        f.HIGHWORK_ID,
+        f.GUARDIAN_DEPARTMENT_ID,
+        f.GUARDIAN_USER_ID,
+        f.GUARDIAN_USER_SIGNER_PATH,
+        f.GUARDIAN_USER_SIGNER_TIME,
+        f.CONFESS_DEPARTMENT_ID,
+        f.CONFESS_USER_ID,
+        f.CONFESS_USER_SIGNER_PATH,
+        f.CONFESS_USER_SIGNER_TIME,
+        f.ACCEPT_CONFESS_DEPARTMENT_ID,
+        f.ACCEPT_CONFESS_USER_ID,
+        f.ACCEPT_CONFESS_USER_SIGNER_PATH,
+        f.ACCEPT_CONFESS_USER_SIGNER_TIME,
+        f.WORK_LATITUDE,
+        f.WORK_LONGITUDE,
+
+        ad.NAME as APPLY_DEPARTMENT_NAME,
+        getFullName(ad.DEPARTMENT_ID) APPLY_DEPARTMENT_ALL,
+
+        cd.NAME as CONSTRUCTION_DEPARTMENT_NAME,
+        cu.NAME as CONSTRUCTION_USER_NAME,
+
+        ld.NAME as LEADER_DEPARTMENT_NAME,
+        lu.NAME as LEADER_USER_NAME,
+
+        aud.NAME as AUDIT_DEPARTMENT_NAME,
+        auu.NAME as AUDIT_USER_NAME,
+
+        apd.NAME as APPROVE_DEPARTMENT_NAME,
+        apu.NAME as APPROVE_USER_NAME,
+
+        acd.NAME as ACCEPT_DEPARTMENT_NAME,
+        acu.NAME as ACCEPT_USER_NAME,
+
+        ac.NAME as CONFESS_DEPARTMENT_NAME,
+        accu.NAME as CONFESS_USER_NAME,
+
+        aac.NAME as ACCEPT_CONFESS_DEPARTMENT_NAME,
+        aacu.NAME as ACCEPT_CONFESS_USER_NAME,
+
+        bc.NAME as GUARDIAN_DEPARTMENT_NAME,
+        bcu.NAME as GUARDIAN_USER_NAME
+        from
+        <include refid="tableName"></include>
+        f
+
+        left join OA_DEPARTMENT bc on bc.DEPARTMENT_ID = f.GUARDIAN_DEPARTMENT_ID
+        left join SYS_USER bcu on bcu.USER_ID = f.GUARDIAN_USER_ID
+
+        left join OA_DEPARTMENT aac on aac.DEPARTMENT_ID = f.ACCEPT_CONFESS_DEPARTMENT_ID
+        left join SYS_USER aacu on aacu.USER_ID = f.ACCEPT_CONFESS_USER_ID
+
+        left join OA_DEPARTMENT ac on ac.DEPARTMENT_ID = f.CONFESS_DEPARTMENT_ID
+        left join SYS_USER accu on accu.USER_ID = f.CONFESS_USER_ID
+
+        left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID
+
+        left join OA_DEPARTMENT cd on cd.DEPARTMENT_ID = f.CONSTRUCTION_DEPARTMENT_ID
+        left join SYS_USER cu on cu.USER_ID = f.CONSTRUCTION_USER_ID
+
+        left join OA_DEPARTMENT ld on ld.DEPARTMENT_ID = f.LEADER_DEPARTMENT_ID
+        left join SYS_USER lu on lu.USER_ID = f.LEADER_USER_ID
+
+        left join OA_DEPARTMENT aud on aud.DEPARTMENT_ID = f.AUDIT_DEPARTMENT_ID
+        left join SYS_USER auu on auu.USER_ID = f.AUDIT_USER_ID
+
+        left join OA_DEPARTMENT apd on apd.DEPARTMENT_ID = f.APPROVE_DEPARTMENT_ID
+        left join SYS_USER apu on apu.USER_ID = f.APPROVE_USER_ID
+
+        left join OA_DEPARTMENT acd on acd.DEPARTMENT_ID = f.ACCEPT_DEPARTMENT_ID
+        left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID
+        where
+        f.HIGHWORK_ID = #{HIGHWORK_ID}
+    </select>
+
+    <!-- 列表 -->
+    <select id="datalistPage" parameterType="page" resultType="pd">
+        select
+        f.CORPINFO_ID,
+        f.APPLY_DEPARTMENT_ID,
+        f.APPLY_USER,
+        f.ISDELETE,
+        f.CREATTIME,
+        f.CREATOR,
+        f.OPERATTIME,
+        f.OPERATOR,
+        f.CHECK_NO,
+        f.PROJECT_MANAGER,
+        f.WORK_CONTENT,
+        f.WORK_START_DATE,
+        f.WORK_END_DATE,
+        f.CONSTRUCTION_DEPARTMENT_ID,
+        f.CONSTRUCTION_USER_ID,
+        f.CONSTRUCTION_USER_SIGNER_PATH,
+        f.CONSTRUCTION_USER_SIGNER_TIME,
+        f.AUDIT_DEPARTMENT_ID,
+        f.AUDIT_USER_ID,
+        f.AUDIT_USER_SIGNER_PATH,
+        f.AUDIT_USER_SIGNER_TIME,
+        f.APPROVE_DEPARTMENT_ID,
+        f.APPROVE_USER_ID,
+        f.APPROVE_USER_SIGNER_PATH,
+        f.APPROVE_USER_SIGNER_TIME,
+        f.ACCEPT_DEPARTMENT_ID,
+        f.ACCEPT_USER_ID,
+        f.ACCEPT_USER_SIGNER_PATH,
+        f.ACCEPT_USER_SIGNER_TIME,
+        f.APPLY_STATUS,
+        f.CONSTRUCTION_CONTENT,
+        f.AUDIT_CONTENT,
+        f.APPROVE_CONTENT,
+        f.ACCEPT_CONTENT,
+        f.OTHER_PROTECTIVE_MEASURES,
+        f.HAZARD_IDENTIFICATION,
+        f.BELONGING_CORP,
+        f.WORK_CORP,
+        f.WORK_PLACE,
+        f.LEADER_DEPARTMENT_ID,
+        f.LEADER_USER_ID,
+        f.LEADER_CONTENT,
+        f.LEADER_USER_SIGNER_PATH,
+        f.LEADER_USER_SIGNER_TIME,
+        f.CONFESS_USER,
+        f.ACCEPT_CONFESS_USER,
+        f.SPECIAL_WORK,
+        f.GUARDIAN_USER,
+        f.WORK_HIGH,
+        f.WORK_LEVEL,
+        f.HIGHWORK_ID,
+        f.GUARDIAN_DEPARTMENT_ID,
+        f.GUARDIAN_USER_ID,
+        f.GUARDIAN_USER_SIGNER_PATH,
+        f.GUARDIAN_USER_SIGNER_TIME,
+        f.CONFESS_DEPARTMENT_ID,
+        f.CONFESS_USER_ID,
+        f.CONFESS_USER_SIGNER_PATH,
+        f.CONFESS_USER_SIGNER_TIME,
+        f.ACCEPT_CONFESS_DEPARTMENT_ID,
+        f.ACCEPT_CONFESS_USER_ID,
+        f.ACCEPT_CONFESS_USER_SIGNER_PATH,
+        f.WORK_LONGITUDE,
+        f.WORK_LATITUDE,
+
+        (SELECT a.ACCEPT_CONFESS_USER_SIGNER_TIME from GF_HIGHWORK_ACCEPTUSER a where a.ISDELETE = '0'
+        AND a.HIGHWORK_ID = f.HIGHWORK_ID
+        ORDER BY
+        a.ACCEPT_CONFESS_USER_SIGNER_TIME DESC LIMIT 1) as ACCEPT_CONFESS_USER_SIGNER_TIME,
+        ad.NAME as APPLY_DEPARTMENT_NAME,
+        getFullName(ad.DEPARTMENT_ID) APPLY_DEPARTMENT_ALL,
+
+        cd.NAME as CONSTRUCTION_DEPARTMENT_NAME,
+        cu.NAME as CONSTRUCTION_USER_NAME,
+
+        ld.NAME as LEADER_DEPARTMENT_NAME,
+        lu.NAME as LEADER_USER_NAME,
+
+        aud.NAME as AUDIT_DEPARTMENT_NAME,
+        auu.NAME as AUDIT_USER_NAME,
+
+        apd.NAME as APPROVE_DEPARTMENT_NAME,
+        apu.NAME as APPROVE_USER_NAME,
+
+        acd.NAME as ACCEPT_DEPARTMENT_NAME,
+        acu.NAME as ACCEPT_USER_NAME,
+
+        ac.NAME as CONFESS_DEPARTMENT_NAME,
+        accu.NAME as CONFESS_USER_NAME,
+
+        aac.NAME as ACCEPT_CONFESS_DEPARTMENT_NAME,
+        aacu.NAME as ACCEPT_CONFESS_USER_NAME,
+
+        bc.NAME as GUARDIAN_DEPARTMENT_NAME,
+        bcu.NAME as GUARDIAN_USER_NAME
+        from
+        <include refid="tableName"></include>
+        f
+        left join OA_DEPARTMENT bc on bc.DEPARTMENT_ID = f.GUARDIAN_DEPARTMENT_ID
+        left join SYS_USER bcu on bcu.USER_ID = f.GUARDIAN_USER_ID
+
+        left join OA_DEPARTMENT aac on aac.DEPARTMENT_ID = f.ACCEPT_CONFESS_DEPARTMENT_ID
+        left join SYS_USER aacu on aacu.USER_ID = f.ACCEPT_CONFESS_USER_ID
+
+        left join OA_DEPARTMENT ac on ac.DEPARTMENT_ID = f.CONFESS_DEPARTMENT_ID
+        left join SYS_USER accu on accu.USER_ID = f.CONFESS_USER_ID
+
+        left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID
+
+        left join OA_DEPARTMENT cd on cd.DEPARTMENT_ID = f.CONSTRUCTION_DEPARTMENT_ID
+        left join SYS_USER cu on cu.USER_ID = f.CONSTRUCTION_USER_ID
+
+        left join OA_DEPARTMENT ld on ld.DEPARTMENT_ID = f.LEADER_DEPARTMENT_ID
+        left join SYS_USER lu on lu.USER_ID = f.LEADER_USER_ID
+
+        left join OA_DEPARTMENT aud on aud.DEPARTMENT_ID = f.AUDIT_DEPARTMENT_ID
+        left join SYS_USER auu on auu.USER_ID = f.AUDIT_USER_ID
+
+        left join OA_DEPARTMENT apd on apd.DEPARTMENT_ID = f.APPROVE_DEPARTMENT_ID
+        left join SYS_USER apu on apu.USER_ID = f.APPROVE_USER_ID
+
+        left join OA_DEPARTMENT acd on acd.DEPARTMENT_ID = f.ACCEPT_DEPARTMENT_ID
+        left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID
+        where f.ISDELETE = '0'
+        <if test="pd.APPLY_STATUS != null and pd.APPLY_STATUS != ''">
+            and f.APPLY_STATUS = #{pd.APPLY_STATUS}
+        </if>
+
+        <if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
+            and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+        </if>
+
+        <if test="pd.CREATOR != null and pd.CREATOR != ''">
+            and f.CREATOR = #{pd.CREATOR}
+        </if>
+
+        <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
+            and
+            (
+            f.CHECK_NO LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+            )
+        </if>
+
+        <if test="pd.CONSTRUCTION_USER_ID != null and pd.CONSTRUCTION_USER_ID != ''">
+            and f.CONSTRUCTION_USER_ID = #{pd.CONSTRUCTION_USER_ID}
+        </if>
+
+        <if test="pd.LEADER_USER_ID != null and pd.LEADER_USER_ID != ''">
+            and f.LEADER_USER_ID = #{pd.LEADER_USER_ID}
+        </if>
+
+        <if test="pd.AUDIT_USER_ID != null and pd.AUDIT_USER_ID != ''">
+            and f.AUDIT_USER_ID = #{pd.AUDIT_USER_ID}
+        </if>
+        <if test="pd.GUARDIAN_USER_ID != null and pd.GUARDIAN_USER_ID != ''">
+            and f.GUARDIAN_USER_ID = #{pd.GUARDIAN_USER_ID}
+        </if>
+        <if test="pd.CONFESS_USER_ID != null and pd.CONFESS_USER_ID != ''">
+            and f.CONFESS_USER_ID = #{pd.CONFESS_USER_ID}
+        </if>
+        <if test="pd.ACCEPT_CONFESS_USER_ID != null and pd.ACCEPT_CONFESS_USER_ID != ''">
+            and f.ACCEPT_CONFESS_USER_ID = #{pd.ACCEPT_CONFESS_USER_ID}
+        </if>
+        <if test="pd.APPROVE_USER_ID != null and pd.APPROVE_USER_ID != ''">
+            and f.APPROVE_USER_ID = #{pd.APPROVE_USER_ID}
+        </if>
+
+        <if test="pd.ACCEPT_USER_ID != null and pd.ACCEPT_USER_ID != ''">
+            and f.ACCEPT_USER_ID = #{pd.ACCEPT_USER_ID}
+        </if>
+        <choose>
+            <when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
+                <if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
+                    and
+                    f.APPLY_DEPARTMENT_ID in
+                    <foreach item="item" index="index"
+                             collection="pd.DEPT_IDS" open="(" separator="," close=")">
+                        '${item}'
+                    </foreach>
+                </if>
+            </when>
+            <otherwise>
+                <choose>
+                    <when test='pd.ISSUPERVISE != null and pd.ISSUPERVISE != "" and pd.ISSUPERVISE == "1"'>
+                        <choose>
+                            <when test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
+                                and
+                                f.APPLY_DEPARTMENT_ID in
+                                <foreach item="item" index="index"
+                                         collection="pd.DEPT_IDS" open="(" separator="," close=")">
+                                    '${item}'
+                                </foreach>
+                            </when>
+                            <otherwise>
+                                and
+                                f.APPLY_DEPARTMENT_ID in (
+                                select
+                                SUB_DEPARTMENT_ID
+                                from
+                                oa_supervision_department osd
+                                where
+                                osd.SUP_DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
+                                and osd.ISDELETE = '0'
+                                and osd.CORPINFO_ID = #{pd.CORPINFO_ID}
+                                )
+                            </otherwise>
+                        </choose>
+                    </when>
+                    <when test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
+                        and f.APPLY_DEPARTMENT_ID=#{pd.DEPARTMENT_ID}
+                    </when>
+                    <otherwise>
+                    </otherwise>
+                </choose>
+            </otherwise>
+        </choose>
+        ORDER BY f.APPLY_STATUS,f.CREATTIME DESC
+    </select>
+    <select id="aqdatalistPage" parameterType="page" resultType="pd">
+        select
+        f.CORPINFO_ID,
+        f.APPLY_DEPARTMENT_ID,
+        f.APPLY_USER,
+        f.ISDELETE,
+        f.CREATTIME,
+        f.CREATOR,
+        f.OPERATTIME,
+        f.OPERATOR,
+        f.CHECK_NO,
+        f.PROJECT_MANAGER,
+        f.WORK_CONTENT,
+        f.WORK_START_DATE,
+        f.WORK_END_DATE,
+        f.CONSTRUCTION_DEPARTMENT_ID,
+        f.CONSTRUCTION_USER_ID,
+        f.CONSTRUCTION_USER_SIGNER_PATH,
+        f.CONSTRUCTION_USER_SIGNER_TIME,
+        f.AUDIT_DEPARTMENT_ID,
+        f.AUDIT_USER_ID,
+        f.AUDIT_USER_SIGNER_PATH,
+        f.AUDIT_USER_SIGNER_TIME,
+        f.APPROVE_DEPARTMENT_ID,
+        f.APPROVE_USER_ID,
+        f.APPROVE_USER_SIGNER_PATH,
+        f.APPROVE_USER_SIGNER_TIME,
+        f.ACCEPT_DEPARTMENT_ID,
+        f.ACCEPT_USER_ID,
+        f.ACCEPT_USER_SIGNER_PATH,
+        f.ACCEPT_USER_SIGNER_TIME,
+        f.APPLY_STATUS,
+        f.CONSTRUCTION_CONTENT,
+        f.AUDIT_CONTENT,
+        f.APPROVE_CONTENT,
+        f.ACCEPT_CONTENT,
+        f.OTHER_PROTECTIVE_MEASURES,
+        f.HAZARD_IDENTIFICATION,
+        f.BELONGING_CORP,
+        f.WORK_CORP,
+        f.WORK_PLACE,
+        f.LEADER_DEPARTMENT_ID,
+        f.LEADER_USER_ID,
+        f.LEADER_CONTENT,
+        f.LEADER_USER_SIGNER_PATH,
+        f.LEADER_USER_SIGNER_TIME,
+        f.CONFESS_USER,
+        f.ACCEPT_CONFESS_USER,
+        f.SPECIAL_WORK,
+        f.GUARDIAN_USER,
+        f.WORK_HIGH,
+        f.WORK_LEVEL,
+        f.HIGHWORK_ID,
+        f.GUARDIAN_DEPARTMENT_ID,
+        f.GUARDIAN_USER_ID,
+        f.GUARDIAN_USER_SIGNER_PATH,
+        f.GUARDIAN_USER_SIGNER_TIME,
+        f.CONFESS_DEPARTMENT_ID,
+        f.CONFESS_USER_ID,
+        f.CONFESS_USER_SIGNER_PATH,
+        f.CONFESS_USER_SIGNER_TIME,
+        f.ACCEPT_CONFESS_DEPARTMENT_ID,
+        f.ACCEPT_CONFESS_USER_ID,
+        f.ACCEPT_CONFESS_USER_SIGNER_PATH,
+        f.WORK_LONGITUDE,
+        f.WORK_LATITUDE,
+        (SELECT a.ACCEPT_CONFESS_USER_SIGNER_TIME from GF_HIGHWORK_ACCEPTUSER a where a.ISDELETE = '0'
+        AND a.HIGHWORK_ID = f.HIGHWORK_ID
+        ORDER BY
+        a.ACCEPT_CONFESS_USER_SIGNER_TIME DESC LIMIT 1) as ACCEPT_CONFESS_USER_SIGNER_TIME,
+        ad.NAME as APPLY_DEPARTMENT_NAME,
+        getFullName(ad.DEPARTMENT_ID) APPLY_DEPARTMENT_ALL,
+
+        cd.NAME as CONSTRUCTION_DEPARTMENT_NAME,
+        cu.NAME as CONSTRUCTION_USER_NAME,
+
+        ld.NAME as LEADER_DEPARTMENT_NAME,
+        lu.NAME as LEADER_USER_NAME,
+
+        aud.NAME as AUDIT_DEPARTMENT_NAME,
+        auu.NAME as AUDIT_USER_NAME,
+
+        apd.NAME as APPROVE_DEPARTMENT_NAME,
+        apu.NAME as APPROVE_USER_NAME,
+
+        acd.NAME as ACCEPT_DEPARTMENT_NAME,
+        acu.NAME as ACCEPT_USER_NAME,
+
+        ac.NAME as CONFESS_DEPARTMENT_NAME,
+        accu.NAME as CONFESS_USER_NAME,
+
+        aac.NAME as ACCEPT_CONFESS_DEPARTMENT_NAME,
+        aacu.NAME as ACCEPT_CONFESS_USER_NAME,
+
+        bc.NAME as GUARDIAN_DEPARTMENT_NAME,
+        bcu.NAME as GUARDIAN_USER_NAME
+        from
+        <include refid="tableName"></include>
+        f
+        left join OA_DEPARTMENT bc on bc.DEPARTMENT_ID = f.GUARDIAN_DEPARTMENT_ID
+        left join SYS_USER bcu on bcu.USER_ID = f.GUARDIAN_USER_ID
+
+        left join OA_DEPARTMENT aac on aac.DEPARTMENT_ID = f.ACCEPT_CONFESS_DEPARTMENT_ID
+        left join SYS_USER aacu on aacu.USER_ID = f.ACCEPT_CONFESS_USER_ID
+
+        left join OA_DEPARTMENT ac on ac.DEPARTMENT_ID = f.CONFESS_DEPARTMENT_ID
+        left join SYS_USER accu on accu.USER_ID = f.CONFESS_USER_ID
+
+        left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID
+
+        left join OA_DEPARTMENT cd on cd.DEPARTMENT_ID = f.CONSTRUCTION_DEPARTMENT_ID
+        left join SYS_USER cu on cu.USER_ID = f.CONSTRUCTION_USER_ID
+
+        left join OA_DEPARTMENT ld on ld.DEPARTMENT_ID = f.LEADER_DEPARTMENT_ID
+        left join SYS_USER lu on lu.USER_ID = f.LEADER_USER_ID
+
+        left join OA_DEPARTMENT aud on aud.DEPARTMENT_ID = f.AUDIT_DEPARTMENT_ID
+        left join SYS_USER auu on auu.USER_ID = f.AUDIT_USER_ID
+
+        left join OA_DEPARTMENT apd on apd.DEPARTMENT_ID = f.APPROVE_DEPARTMENT_ID
+        left join SYS_USER apu on apu.USER_ID = f.APPROVE_USER_ID
+
+        left join OA_DEPARTMENT acd on acd.DEPARTMENT_ID = f.ACCEPT_DEPARTMENT_ID
+        left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID
+        where f.ISDELETE = '0'
+        and f.APPLY_STATUS &lt; 6 and f.CONFESS_USER_SIGNER_TIME is null and f.APPLY_STATUS &gt; 0
+
+        <if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
+            and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+        </if>
+
+        <if test="pd.CREATOR != null and pd.CREATOR != ''">
+            and f.CREATOR = #{pd.CREATOR}
+        </if>
+
+        <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
+            and
+            (
+            f.CHECK_NO LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+            )
+        </if>
+
+        <if test="pd.CONSTRUCTION_USER_ID != null and pd.CONSTRUCTION_USER_ID != ''">
+            and f.CONSTRUCTION_USER_ID = #{pd.CONSTRUCTION_USER_ID}
+        </if>
+
+        <if test="pd.LEADER_USER_ID != null and pd.LEADER_USER_ID != ''">
+            and f.LEADER_USER_ID = #{pd.LEADER_USER_ID}
+        </if>
+
+        <if test="pd.AUDIT_USER_ID != null and pd.AUDIT_USER_ID != ''">
+            and f.AUDIT_USER_ID = #{pd.AUDIT_USER_ID}
+        </if>
+        <if test="pd.GUARDIAN_USER_ID != null and pd.GUARDIAN_USER_ID != ''">
+            and f.GUARDIAN_USER_ID = #{pd.GUARDIAN_USER_ID}
+        </if>
+        <if test="pd.CONFESS_USER_ID != null and pd.CONFESS_USER_ID != ''">
+            and f.CONFESS_USER_ID = #{pd.CONFESS_USER_ID}
+        </if>
+        <if test="pd.ACCEPT_CONFESS_USER_ID != null and pd.ACCEPT_CONFESS_USER_ID != ''">
+            and f.ACCEPT_CONFESS_USER_ID = #{pd.ACCEPT_CONFESS_USER_ID}
+        </if>
+        <if test="pd.APPROVE_USER_ID != null and pd.APPROVE_USER_ID != ''">
+            and f.APPROVE_USER_ID = #{pd.APPROVE_USER_ID}
+        </if>
+
+        <if test="pd.ACCEPT_USER_ID != null and pd.ACCEPT_USER_ID != ''">
+            and f.ACCEPT_USER_ID = #{pd.ACCEPT_USER_ID}
+        </if>
+        <choose>
+            <when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
+                <if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
+                    and
+                    f.APPLY_DEPARTMENT_ID in
+                    <foreach item="item" index="index"
+                             collection="pd.DEPT_IDS" open="(" separator="," close=")">
+                        '${item}'
+                    </foreach>
+                </if>
+            </when>
+            <otherwise>
+                <choose>
+                    <when test='pd.ISSUPERVISE != null and pd.ISSUPERVISE != "" and pd.ISSUPERVISE == "1"'>
+                        <choose>
+                            <when test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
+                                and
+                                f.APPLY_DEPARTMENT_ID in
+                                <foreach item="item" index="index"
+                                         collection="pd.DEPT_IDS" open="(" separator="," close=")">
+                                    '${item}'
+                                </foreach>
+                            </when>
+                            <otherwise>
+                                and
+                                f.APPLY_DEPARTMENT_ID in (
+                                select
+                                SUB_DEPARTMENT_ID
+                                from
+                                oa_supervision_department osd
+                                where
+                                osd.SUP_DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
+                                and osd.ISDELETE = '0'
+                                and osd.CORPINFO_ID = #{pd.CORPINFO_ID}
+                                )
+                            </otherwise>
+                        </choose>
+                    </when>
+                    <when test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
+                        and f.APPLY_DEPARTMENT_ID=#{pd.DEPARTMENT_ID}
+                    </when>
+                    <otherwise>
+                    </otherwise>
+                </choose>
+            </otherwise>
+        </choose>
+        ORDER BY f.APPLY_STATUS,f.CREATTIME DESC
+    </select>
+    <select id="jhdatalistPage" parameterType="page" resultType="pd">
+        select
+        f.CORPINFO_ID,
+        f.APPLY_DEPARTMENT_ID,
+        f.APPLY_USER,
+        f.ISDELETE,
+        f.CREATTIME,
+        f.CREATOR,
+        f.OPERATTIME,
+        f.OPERATOR,
+        f.CHECK_NO,
+        f.PROJECT_MANAGER,
+        f.WORK_CONTENT,
+        f.WORK_START_DATE,
+        f.WORK_END_DATE,
+        f.CONSTRUCTION_DEPARTMENT_ID,
+        f.CONSTRUCTION_USER_ID,
+        f.CONSTRUCTION_USER_SIGNER_PATH,
+        f.CONSTRUCTION_USER_SIGNER_TIME,
+        f.AUDIT_DEPARTMENT_ID,
+        f.AUDIT_USER_ID,
+        f.AUDIT_USER_SIGNER_PATH,
+        f.AUDIT_USER_SIGNER_TIME,
+        f.APPROVE_DEPARTMENT_ID,
+        f.APPROVE_USER_ID,
+        f.APPROVE_USER_SIGNER_PATH,
+        f.APPROVE_USER_SIGNER_TIME,
+        f.ACCEPT_DEPARTMENT_ID,
+        f.ACCEPT_USER_ID,
+        f.ACCEPT_USER_SIGNER_PATH,
+        f.ACCEPT_USER_SIGNER_TIME,
+        f.APPLY_STATUS,
+        f.CONSTRUCTION_CONTENT,
+        f.AUDIT_CONTENT,
+        f.APPROVE_CONTENT,
+        f.ACCEPT_CONTENT,
+        f.OTHER_PROTECTIVE_MEASURES,
+        f.HAZARD_IDENTIFICATION,
+        f.BELONGING_CORP,
+        f.WORK_CORP,
+        f.WORK_PLACE,
+        f.LEADER_DEPARTMENT_ID,
+        f.LEADER_USER_ID,
+        f.LEADER_CONTENT,
+        f.LEADER_USER_SIGNER_PATH,
+        f.LEADER_USER_SIGNER_TIME,
+        f.CONFESS_USER,
+        f.ACCEPT_CONFESS_USER,
+        f.SPECIAL_WORK,
+        f.GUARDIAN_USER,
+        f.WORK_HIGH,
+        f.WORK_LEVEL,
+        f.HIGHWORK_ID,
+        f.GUARDIAN_DEPARTMENT_ID,
+        f.GUARDIAN_USER_ID,
+        f.GUARDIAN_USER_SIGNER_PATH,
+        f.GUARDIAN_USER_SIGNER_TIME,
+        f.CONFESS_DEPARTMENT_ID,
+        f.CONFESS_USER_ID,
+        f.CONFESS_USER_SIGNER_PATH,
+        f.CONFESS_USER_SIGNER_TIME,
+        f.ACCEPT_CONFESS_DEPARTMENT_ID,
+        f.ACCEPT_CONFESS_USER_ID,
+        f.ACCEPT_CONFESS_USER_SIGNER_PATH,
+        f.WORK_LONGITUDE,
+        f.WORK_LATITUDE,
+        (SELECT a.ACCEPT_CONFESS_USER_SIGNER_TIME from GF_HIGHWORK_ACCEPTUSER a where a.ISDELETE = '0'
+        AND a.HIGHWORK_ID = f.HIGHWORK_ID
+        ORDER BY
+        a.ACCEPT_CONFESS_USER_SIGNER_TIME DESC LIMIT 1) as ACCEPT_CONFESS_USER_SIGNER_TIME,
+        ad.NAME as APPLY_DEPARTMENT_NAME,
+        getFullName(ad.DEPARTMENT_ID) APPLY_DEPARTMENT_ALL,
+
+        cd.NAME as CONSTRUCTION_DEPARTMENT_NAME,
+        cu.NAME as CONSTRUCTION_USER_NAME,
+
+        ld.NAME as LEADER_DEPARTMENT_NAME,
+        lu.NAME as LEADER_USER_NAME,
+
+        aud.NAME as AUDIT_DEPARTMENT_NAME,
+        auu.NAME as AUDIT_USER_NAME,
+
+        apd.NAME as APPROVE_DEPARTMENT_NAME,
+        apu.NAME as APPROVE_USER_NAME,
+
+        acd.NAME as ACCEPT_DEPARTMENT_NAME,
+        acu.NAME as ACCEPT_USER_NAME,
+
+        ac.NAME as CONFESS_DEPARTMENT_NAME,
+        accu.NAME as CONFESS_USER_NAME,
+
+        aac.NAME as ACCEPT_CONFESS_DEPARTMENT_NAME,
+        aacu.NAME as ACCEPT_CONFESS_USER_NAME,
+
+        bc.NAME as GUARDIAN_DEPARTMENT_NAME,
+        bcu.NAME as GUARDIAN_USER_NAME
+        from
+        <include refid="tableName"></include>
+        f
+        left join OA_DEPARTMENT bc on bc.DEPARTMENT_ID = f.GUARDIAN_DEPARTMENT_ID
+        left join SYS_USER bcu on bcu.USER_ID = f.GUARDIAN_USER_ID
+
+        left join OA_DEPARTMENT aac on aac.DEPARTMENT_ID = f.ACCEPT_CONFESS_DEPARTMENT_ID
+        left join SYS_USER aacu on aacu.USER_ID = f.ACCEPT_CONFESS_USER_ID
+
+        left join OA_DEPARTMENT ac on ac.DEPARTMENT_ID = f.CONFESS_DEPARTMENT_ID
+        left join SYS_USER accu on accu.USER_ID = f.CONFESS_USER_ID
+
+        left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID
+
+        left join OA_DEPARTMENT cd on cd.DEPARTMENT_ID = f.CONSTRUCTION_DEPARTMENT_ID
+        left join SYS_USER cu on cu.USER_ID = f.CONSTRUCTION_USER_ID
+
+        left join OA_DEPARTMENT ld on ld.DEPARTMENT_ID = f.LEADER_DEPARTMENT_ID
+        left join SYS_USER lu on lu.USER_ID = f.LEADER_USER_ID
+
+        left join OA_DEPARTMENT aud on aud.DEPARTMENT_ID = f.AUDIT_DEPARTMENT_ID
+        left join SYS_USER auu on auu.USER_ID = f.AUDIT_USER_ID
+
+        left join OA_DEPARTMENT apd on apd.DEPARTMENT_ID = f.APPROVE_DEPARTMENT_ID
+        left join SYS_USER apu on apu.USER_ID = f.APPROVE_USER_ID
+
+        left join OA_DEPARTMENT acd on acd.DEPARTMENT_ID = f.ACCEPT_DEPARTMENT_ID
+        left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID
+        where f.ISDELETE = '0'
+        and f.APPLY_STATUS &lt; 6 and f.GUARDIAN_USER_SIGNER_TIME is null and f.APPLY_STATUS &gt; 0
+        <if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
+            and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+        </if>
+
+        <if test="pd.CREATOR != null and pd.CREATOR != ''">
+            and f.CREATOR = #{pd.CREATOR}
+        </if>
+
+        <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
+            and
+            (
+            f.CHECK_NO LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+            )
+        </if>
+
+        <if test="pd.CONSTRUCTION_USER_ID != null and pd.CONSTRUCTION_USER_ID != ''">
+            and f.CONSTRUCTION_USER_ID = #{pd.CONSTRUCTION_USER_ID}
+        </if>
+
+        <if test="pd.LEADER_USER_ID != null and pd.LEADER_USER_ID != ''">
+            and f.LEADER_USER_ID = #{pd.LEADER_USER_ID}
+        </if>
+
+        <if test="pd.AUDIT_USER_ID != null and pd.AUDIT_USER_ID != ''">
+            and f.AUDIT_USER_ID = #{pd.AUDIT_USER_ID}
+        </if>
+        <if test="pd.GUARDIAN_USER_ID != null and pd.GUARDIAN_USER_ID != ''">
+            and f.GUARDIAN_USER_ID = #{pd.GUARDIAN_USER_ID}
+        </if>
+        <if test="pd.CONFESS_USER_ID != null and pd.CONFESS_USER_ID != ''">
+            and f.CONFESS_USER_ID = #{pd.CONFESS_USER_ID}
+        </if>
+        <if test="pd.ACCEPT_CONFESS_USER_ID != null and pd.ACCEPT_CONFESS_USER_ID != ''">
+            and f.ACCEPT_CONFESS_USER_ID = #{pd.ACCEPT_CONFESS_USER_ID}
+        </if>
+        <if test="pd.APPROVE_USER_ID != null and pd.APPROVE_USER_ID != ''">
+            and f.APPROVE_USER_ID = #{pd.APPROVE_USER_ID}
+        </if>
+
+        <if test="pd.ACCEPT_USER_ID != null and pd.ACCEPT_USER_ID != ''">
+            and f.ACCEPT_USER_ID = #{pd.ACCEPT_USER_ID}
+        </if>
+        <choose>
+            <when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
+                <if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
+                    and
+                    f.APPLY_DEPARTMENT_ID in
+                    <foreach item="item" index="index"
+                             collection="pd.DEPT_IDS" open="(" separator="," close=")">
+                        '${item}'
+                    </foreach>
+                </if>
+            </when>
+            <otherwise>
+                <choose>
+                    <when test='pd.ISSUPERVISE != null and pd.ISSUPERVISE != "" and pd.ISSUPERVISE == "1"'>
+                        <choose>
+                            <when test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
+                                and
+                                f.APPLY_DEPARTMENT_ID in
+                                <foreach item="item" index="index"
+                                         collection="pd.DEPT_IDS" open="(" separator="," close=")">
+                                    '${item}'
+                                </foreach>
+                            </when>
+                            <otherwise>
+                                and
+                                f.APPLY_DEPARTMENT_ID in (
+                                select
+                                SUB_DEPARTMENT_ID
+                                from
+                                oa_supervision_department osd
+                                where
+                                osd.SUP_DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
+                                and osd.ISDELETE = '0'
+                                and osd.CORPINFO_ID = #{pd.CORPINFO_ID}
+                                )
+                            </otherwise>
+                        </choose>
+                    </when>
+                    <when test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
+                        and f.APPLY_DEPARTMENT_ID=#{pd.DEPARTMENT_ID}
+                    </when>
+                    <otherwise>
+                    </otherwise>
+                </choose>
+            </otherwise>
+        </choose>
+        ORDER BY f.APPLY_STATUS,f.CREATTIME DESC
+    </select>
+    <select id="jsdatalistPage" parameterType="page" resultType="pd">
+        select
+        f.CORPINFO_ID,
+        f.APPLY_DEPARTMENT_ID,
+        f.APPLY_USER,
+        f.ISDELETE,
+        f.CREATTIME,
+        f.CREATOR,
+        f.OPERATTIME,
+        f.OPERATOR,
+        f.CHECK_NO,
+        f.PROJECT_MANAGER,
+        f.WORK_CONTENT,
+        f.WORK_START_DATE,
+        f.WORK_END_DATE,
+        f.CONSTRUCTION_DEPARTMENT_ID,
+        f.CONSTRUCTION_USER_ID,
+        f.CONSTRUCTION_USER_SIGNER_PATH,
+        f.CONSTRUCTION_USER_SIGNER_TIME,
+        f.AUDIT_DEPARTMENT_ID,
+        f.AUDIT_USER_ID,
+        f.AUDIT_USER_SIGNER_PATH,
+        f.AUDIT_USER_SIGNER_TIME,
+        f.APPROVE_DEPARTMENT_ID,
+        f.APPROVE_USER_ID,
+        f.APPROVE_USER_SIGNER_PATH,
+        f.APPROVE_USER_SIGNER_TIME,
+        f.ACCEPT_DEPARTMENT_ID,
+        f.ACCEPT_USER_ID,
+        f.ACCEPT_USER_SIGNER_PATH,
+        f.ACCEPT_USER_SIGNER_TIME,
+        f.APPLY_STATUS,
+        f.CONSTRUCTION_CONTENT,
+        f.AUDIT_CONTENT,
+        f.APPROVE_CONTENT,
+        f.ACCEPT_CONTENT,
+        f.OTHER_PROTECTIVE_MEASURES,
+        f.HAZARD_IDENTIFICATION,
+        f.BELONGING_CORP,
+        f.WORK_CORP,
+        f.WORK_PLACE,
+        f.LEADER_DEPARTMENT_ID,
+        f.LEADER_USER_ID,
+        f.LEADER_CONTENT,
+        f.LEADER_USER_SIGNER_PATH,
+        f.LEADER_USER_SIGNER_TIME,
+        f.CONFESS_USER,
+        f.ACCEPT_CONFESS_USER,
+        f.SPECIAL_WORK,
+        f.GUARDIAN_USER,
+        f.WORK_HIGH,
+        f.WORK_LEVEL,
+        f.HIGHWORK_ID,
+        f.GUARDIAN_DEPARTMENT_ID,
+        f.GUARDIAN_USER_ID,
+        f.GUARDIAN_USER_SIGNER_PATH,
+        f.GUARDIAN_USER_SIGNER_TIME,
+        f.CONFESS_DEPARTMENT_ID,
+        f.CONFESS_USER_ID,
+        f.CONFESS_USER_SIGNER_PATH,
+        f.CONFESS_USER_SIGNER_TIME,
+        f.ACCEPT_CONFESS_DEPARTMENT_ID,
+        f.ACCEPT_CONFESS_USER_ID,
+        f.ACCEPT_CONFESS_USER_SIGNER_PATH,
+        f.WORK_LONGITUDE,
+        f.WORK_LATITUDE,
+        (SELECT a.ACCEPT_CONFESS_USER_SIGNER_TIME from GF_HIGHWORK_ACCEPTUSER a where a.ISDELETE = '0'
+        AND a.HIGHWORK_ID = f.HIGHWORK_ID
+        ORDER BY
+        a.ACCEPT_CONFESS_USER_SIGNER_TIME DESC LIMIT 1) as ACCEPT_CONFESS_USER_SIGNER_TIME,
+        ad.NAME as APPLY_DEPARTMENT_NAME,
+        getFullName(ad.DEPARTMENT_ID) APPLY_DEPARTMENT_ALL,
+
+        cd.NAME as CONSTRUCTION_DEPARTMENT_NAME,
+        cu.NAME as CONSTRUCTION_USER_NAME,
+
+        ld.NAME as LEADER_DEPARTMENT_NAME,
+        lu.NAME as LEADER_USER_NAME,
+
+        aud.NAME as AUDIT_DEPARTMENT_NAME,
+        auu.NAME as AUDIT_USER_NAME,
+
+        apd.NAME as APPROVE_DEPARTMENT_NAME,
+        apu.NAME as APPROVE_USER_NAME,
+
+        acd.NAME as ACCEPT_DEPARTMENT_NAME,
+        acu.NAME as ACCEPT_USER_NAME,
+
+        ac.NAME as CONFESS_DEPARTMENT_NAME,
+        accu.NAME as CONFESS_USER_NAME,
+
+        aac.NAME as ACCEPT_CONFESS_DEPARTMENT_NAME,
+        aacu.NAME as ACCEPT_CONFESS_USER_NAME,
+
+        bc.NAME as GUARDIAN_DEPARTMENT_NAME,
+        bcu.NAME as GUARDIAN_USER_NAME
+        from
+        <include refid="tableName"></include>
+        f
+        left join OA_DEPARTMENT bc on bc.DEPARTMENT_ID = f.GUARDIAN_DEPARTMENT_ID
+        left join SYS_USER bcu on bcu.USER_ID = f.GUARDIAN_USER_ID
+
+        left join OA_DEPARTMENT aac on aac.DEPARTMENT_ID = f.ACCEPT_CONFESS_DEPARTMENT_ID
+        left join SYS_USER aacu on aacu.USER_ID = f.ACCEPT_CONFESS_USER_ID
+
+        left join OA_DEPARTMENT ac on ac.DEPARTMENT_ID = f.CONFESS_DEPARTMENT_ID
+        left join SYS_USER accu on accu.USER_ID = f.CONFESS_USER_ID
+
+        left join OA_DEPARTMENT ad on ad.DEPARTMENT_ID = f.APPLY_DEPARTMENT_ID
+
+        left join OA_DEPARTMENT cd on cd.DEPARTMENT_ID = f.CONSTRUCTION_DEPARTMENT_ID
+        left join SYS_USER cu on cu.USER_ID = f.CONSTRUCTION_USER_ID
+
+        left join OA_DEPARTMENT ld on ld.DEPARTMENT_ID = f.LEADER_DEPARTMENT_ID
+        left join SYS_USER lu on lu.USER_ID = f.LEADER_USER_ID
+
+        left join OA_DEPARTMENT aud on aud.DEPARTMENT_ID = f.AUDIT_DEPARTMENT_ID
+        left join SYS_USER auu on auu.USER_ID = f.AUDIT_USER_ID
+
+        left join OA_DEPARTMENT apd on apd.DEPARTMENT_ID = f.APPROVE_DEPARTMENT_ID
+        left join SYS_USER apu on apu.USER_ID = f.APPROVE_USER_ID
+
+        left join OA_DEPARTMENT acd on acd.DEPARTMENT_ID = f.ACCEPT_DEPARTMENT_ID
+        left join SYS_USER acu on acu.USER_ID = f.ACCEPT_USER_ID
+        where f.ISDELETE = '0'
+        and f.APPLY_STATUS &lt; 6
+        and not exists(select 1 from GF_HIGHWORK_ACCEPTUSER m where m.HIGHWORK_ID = f.HIGHWORK_ID and m.CORPINFO_ID =
+        f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID)
+
+        and f.APPLY_STATUS &gt; 0
+
+        <if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
+            and f.CORPINFO_ID = #{pd.CORPINFO_ID}
+        </if>
+
+        <if test="pd.CREATOR != null and pd.CREATOR != ''">
+            and f.CREATOR = #{pd.CREATOR}
+        </if>
+
+        <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
+            and
+            (
+            f.CHECK_NO LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
+            )
+        </if>
+
+        <if test="pd.CONSTRUCTION_USER_ID != null and pd.CONSTRUCTION_USER_ID != ''">
+            and f.CONSTRUCTION_USER_ID = #{pd.CONSTRUCTION_USER_ID}
+        </if>
+
+        <if test="pd.LEADER_USER_ID != null and pd.LEADER_USER_ID != ''">
+            and f.LEADER_USER_ID = #{pd.LEADER_USER_ID}
+        </if>
+
+        <if test="pd.AUDIT_USER_ID != null and pd.AUDIT_USER_ID != ''">
+            and f.AUDIT_USER_ID = #{pd.AUDIT_USER_ID}
+        </if>
+        <if test="pd.GUARDIAN_USER_ID != null and pd.GUARDIAN_USER_ID != ''">
+            and f.GUARDIAN_USER_ID = #{pd.GUARDIAN_USER_ID}
+        </if>
+        <if test="pd.CONFESS_USER_ID != null and pd.CONFESS_USER_ID != ''">
+            and f.CONFESS_USER_ID = #{pd.CONFESS_USER_ID}
+        </if>
+        <if test="pd.ACCEPT_CONFESS_USER_ID != null and pd.ACCEPT_CONFESS_USER_ID != ''">
+            and f.ACCEPT_CONFESS_USER_ID = #{pd.ACCEPT_CONFESS_USER_ID}
+        </if>
+        <if test="pd.APPROVE_USER_ID != null and pd.APPROVE_USER_ID != ''">
+            and f.APPROVE_USER_ID = #{pd.APPROVE_USER_ID}
+        </if>
+
+        <if test="pd.ACCEPT_USER_ID != null and pd.ACCEPT_USER_ID != ''">
+            and f.ACCEPT_USER_ID = #{pd.ACCEPT_USER_ID}
+        </if>
+        <choose>
+            <when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
+                <if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
+                    and
+                    f.APPLY_DEPARTMENT_ID in
+                    <foreach item="item" index="index"
+                             collection="pd.DEPT_IDS" open="(" separator="," close=")">
+                        '${item}'
+                    </foreach>
+                </if>
+            </when>
+            <otherwise>
+                <choose>
+                    <when test='pd.ISSUPERVISE != null and pd.ISSUPERVISE != "" and pd.ISSUPERVISE == "1"'>
+                        <choose>
+                            <when test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
+                                and
+                                f.APPLY_DEPARTMENT_ID in
+                                <foreach item="item" index="index"
+                                         collection="pd.DEPT_IDS" open="(" separator="," close=")">
+                                    '${item}'
+                                </foreach>
+                            </when>
+                            <otherwise>
+                                and
+                                f.APPLY_DEPARTMENT_ID in (
+                                select
+                                SUB_DEPARTMENT_ID
+                                from
+                                oa_supervision_department osd
+                                where
+                                osd.SUP_DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
+                                and osd.ISDELETE = '0'
+                                and osd.CORPINFO_ID = #{pd.CORPINFO_ID}
+                                )
+                            </otherwise>
+                        </choose>
+                    </when>
+                    <when test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
+                        and f.APPLY_DEPARTMENT_ID=#{pd.DEPARTMENT_ID}
+                    </when>
+                    <otherwise>
+                    </otherwise>
+                </choose>
+            </otherwise>
+        </choose>
+        ORDER BY f.APPLY_STATUS,f.CREATTIME DESC
+    </select>
+
+    <!-- 列表(全部) -->
+    <select id="listAllMeasures" parameterType="pd" resultType="pd">
+        select
+        f.*
+        <if test="APPLY_STATUS != '1' and APPLY_STATUS != 1">
+            ,eo.STATUS,eo.CONFIRM_NAME
+        </if>
+        from
+        GF_HIGHWORK_MEASURES f
+        <if test="APPLY_STATUS != '1' and APPLY_STATUS != 1">
+            left join GF_HIGHWORKTOMEASURES eo on eo.BUS_HIGHWORK_MEASURES_ID = f.HIGHWORK_MEASURES_ID
+        </if>
+        where f.ISDELETE = '0'
+        <if test="APPLY_STATUS != '1' and APPLY_STATUS != 1">
+            and eo.HIGHWORK_ID = #{HIGHWORK_ID}
+        </if>
+        order by f.ORDER
+    </select>
+
+    <!-- 列表(全部) -->
+    <select id="listAll" parameterType="pd" resultType="pd">
+        select
+        <include refid="Field"></include>
+        from
+        <include refid="tableName"></include>
+        f
+    </select>
+
+    <!-- 批量删除 -->
+    <delete id="deleteAll" parameterType="String">
+        update
+        <include refid="tableName"></include>
+        set
+        ISDELETE = '1'
+        where
+        HIGHWORK_ID in
+        <foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <delete id="clearGasMonitoring">
+        delete from ${TYPE}gas where ${TABLE_ID_NAME} = #{ID}
+    </delete>
+    <delete id="clearGasWhMonitoring">
+        delete from ${TYPE}gaswh where ${TABLE_ID_NAME} = #{ID}
+    </delete>
+
+    <!-- 待办作业数 -->
+    <select id="countCheck" parameterType="pd" resultType="pd">
+        SELECT
+        COUNT(CASE WHEN (f.APPLY_STATUS+0) &lt; 1 AND f.CREATOR = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTBACK,
+        COUNT(CASE WHEN f.APPLY_STATUS = '1' AND f.CONSTRUCTION_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END)
+        COUNTCONSTRUCTION,
+        COUNT(CASE WHEN f.APPLY_STATUS = '2' AND f.LEADER_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTLEADER,
+        COUNT(CASE WHEN f.APPLY_STATUS = '3' AND f.AUDIT_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTAUDIT,
+        COUNT(CASE WHEN f.APPLY_STATUS = '4' AND f.APPROVE_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTAPPROVE,
+        COUNT(CASE WHEN f.APPLY_STATUS = '5' AND f.ACCEPT_USER_ID = #{USER_ID} THEN f.HIGHWORK_ID END) COUNTACCEPT,
+        COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.GUARDIAN_USER_ID = #{USER_ID} and
+        f.GUARDIAN_USER_SIGNER_TIME is null THEN f.HIGHWORK_ID END) COUNTGUARDIAN,
+        COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.CONFESS_USER_ID = #{USER_ID} and
+        f.CONFESS_USER_SIGNER_TIME is null THEN f.HIGHWORK_ID END) COUNTCONFESS,
+        COUNT(CASE WHEN f.APPLY_STATUS &lt; '6' AND f.APPLY_STATUS &gt; 0 AND f.ACCEPT_CONFESS_USER_ID = #{USER_ID} and
+        not exists(select 1 from GF_HIGHWORK_ACCEPTUSER m where m.HIGHWORK_ID = f.HIGHWORK_ID and m.CORPINFO_ID =
+        f.CORPINFO_ID and f.ACCEPT_CONFESS_USER_ID = m.ACCEPT_CONFESS_USER_ID) THEN f.HIGHWORK_ID END)
+        COUNTACCEPTCONFESS
+        FROM <include refid="tableName"></include> f
+        WHERE f.ISDELETE = '0' AND f.CORPINFO_ID = #{CORPINFO_ID}
+    </select>
+
+    <!-- 获取编码 -->
+    <select id="getCode" parameterType="pd" resultType="pd">
+        SELECT
+        COUNT(1) as code
+        FROM <include refid="tableName"></include> f
+        WHERE f.CORPINFO_ID = #{CORPINFO_ID}
+        and f.CREATTIME LIKE CONCAT(#{CREATDATE},'%')
+    </select>
+    <select id="getInfoById" resultType="com.zcloud.entity.PageData">
+        select *
+        from ${TYPE}
+        where ${TABLE_ID_NAME} = #{ID}
+    </select>
+    <update id="clearAcceptUser">
+        update
+            ${TYPE}_acceptuser
+        set ACCEPT_CONFESS_DEPARTMENT_ID    = null,
+            ACCEPT_CONFESS_USER_ID          = null,
+            ACCEPT_CONFESS_USER_SIGNER_PATH = null,
+            ACCEPT_CONFESS_USER_SIGNER_TIME = null
+        where ${TABLE_ID_NAME} = #{ID}
+    </update>
+    <update id="back5to2">
+        update
+            ${TYPE}
+        set APPLY_STATUS            = 2,
+            LEADER_USER_SIGNER_PATH = null,
+            LEADER_USER_SIGNER_TIME = null,
+            LEADER_CONTENT          = null,
+            OPERATOR                = #{OPERATOR},
+            OPERATTIME              = #{OPERATTIME}
+        where ${TABLE_ID_NAME} = #{ID}
+    </update>
+    <update id="back5to3">
+        update
+            ${TYPE}
+        set APPLY_STATUS            = 3,
+            AUDIT_USER_SIGNER_PATH = null,
+            AUDIT_USER_SIGNER_TIME = null,
+            OPERATOR                = #{OPERATOR},
+            OPERATTIME              = #{OPERATTIME}
+        where ${TABLE_ID_NAME} = #{ID}
+    </update>
+
+    <update id="back5to4">
+        update
+            ${TYPE}
+        set APPLY_STATUS            = 4,
+            APPROVE_USER_SIGNER_PATH = null,
+            APPROVE_USER_SIGNER_TIME = null,
+            OPERATOR                = #{OPERATOR},
+            OPERATTIME              = #{OPERATTIME}
+        where ${TABLE_ID_NAME} = #{ID}
+    </update>
+    <update id="back3to2">
+        update
+            ${TYPE}
+        set APPLY_STATUS            = 2,
+            LEADER_USER_SIGNER_PATH = null,
+            LEADER_USER_SIGNER_TIME = null,
+            LEADER_CONTENT          = null,
+            OPERATOR                = #{OPERATOR},
+            OPERATTIME              = #{OPERATTIME}
+        where ${TABLE_ID_NAME} = #{ID}
+    </update>
+    <update id="back4to3">
+        update
+            ${TYPE}
+        set APPLY_STATUS            = 3,
+            AUDIT_USER_SIGNER_PATH = null,
+            AUDIT_USER_SIGNER_TIME = null,
+            AUDIT_CONTENT          = null,
+            OPERATOR                = #{OPERATOR},
+            OPERATTIME              = #{OPERATTIME}
+        where ${TABLE_ID_NAME} = #{ID}
+    </update>
+    <update id="back4to2">
+        update
+            ${TYPE}
+        set APPLY_STATUS            = 2,
+            AUDIT_USER_SIGNER_PATH = null,
+            AUDIT_USER_SIGNER_TIME = null,
+            AUDIT_CONTENT          = null,
+            OPERATOR                = #{OPERATOR},
+            OPERATTIME              = #{OPERATTIME}
+        where ${TABLE_ID_NAME} = #{ID}
+    </update>
+    <update id="blindboardBack4to1">
+        update
+            ${TYPE}
+        set
+            APPLY_STATUS            = 1,
+            GUARDIAN_USER_SIGNER_PATH = null,
+            GUARDIAN_USER_SIGNER_TIME = null,
+            CONFESS_USER_SIGNER_PATH = null,
+            CONFESS_USER_SIGNER_TIME = null,
+            ACCEPT_CONFESS_USER_SIGNER_PATH = null,
+            ACCEPT_CONFESS_USER_SIGNER_TIME = null,
+            OPERATOR                = #{OPERATOR},
+            OPERATTIME              = #{OPERATTIME}
+        where ${TABLE_ID_NAME} = #{ID}
+    </update>
+    <update id="blindboardBack5to4">
+        update
+            ${TYPE}
+        set APPLY_STATUS            = 4,
+            APPROVE_USER_SIGNER_PATH = null,
+            APPROVE_USER_SIGNER_TIME = null,
+            OPERATOR                = #{OPERATOR},
+            OPERATTIME              = #{OPERATTIME}
+        where ${TABLE_ID_NAME} = #{ID}
+    </update>
 </mapper>
diff --git a/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml b/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml
index 9ced2a3d..9cee37b2 100644
--- a/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml
+++ b/src/main/resources/mybatis/dsno2/fireresources/CzksFireResourcesMapper.xml
@@ -432,6 +432,7 @@
             LEFT JOIN `qa-cmt-prevention`.sys_dictionaries dic ON d.FIRE_DEVICE_TYPE_ID = dic.BIANMA
         WHERE
             d.ISDELETE = 0 and p.isdelete = 0
+        <!--用与app 查询 消防设备类型-->
         <if test="pd.FIRE_DEVICE_TYPE_ID != null and pd.FIRE_DEVICE_TYPE_ID != ''">
             and d.FIRE_DEVICE_TYPE_ID = #{pd.FIRE_DEVICE_TYPE_ID}
         </if>
diff --git a/src/main/test/TestDemo.java b/src/main/test/TestDemo.java
new file mode 100644
index 00000000..b683225e
--- /dev/null
+++ b/src/main/test/TestDemo.java
@@ -0,0 +1,46 @@
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.zcloud.FHmainApplication;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.bus.ListManagerMapper;
+import com.zcloud.service.gf.AppWorkBackService;
+import com.zcloud.service.system.UsersService;
+import com.zcloud.util.DateUtil;
+import com.zcloud.util.HttpRequestUtil;
+import com.zcloud.util.ReturnMap;
+import com.zcloud.util.SpringUtil;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = FHmainApplication.class)
+public class TestDemo {
+
+    @Resource
+    private AppWorkBackService appWorkBackService;
+
+    // gf_highwork  高处作业
+    // gf_breakground  动土作业
+    @Test
+    public void test() throws Exception {
+        PageData pageData = new PageData();
+        // 当前状态 回根据实际变成上一步
+        pageData.put("APPLY_STATUS",4);
+        pageData.put("TYPE","gf_electricity");
+        pageData.put("ID","275872ca47824d19ab659792f89bce85");
+        pageData.put("OPERATTIME", DateUtil.date2Str(new Date()));
+        pageData.put("OPERATOR","123");
+
+        appWorkBackService.backOtherWork(pageData);
+    }
+
+}