动火作业

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

@@ -3,6 +3,7 @@ package com.zcloud.controller.eightwork;
 
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.PageData;
+import com.zcloud.service.eightwork.EightWorkService;
 import com.zcloud.util.*;
 import org.apache.fop.util.DataURLUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,9 +17,10 @@ import java.util.Map;
 @RequestMapping("/app/eightwork")
 public class AppEightWorkController extends BaseController {
 
-
     @Autowired
     private Smb smb;
+    @Autowired
+    private EightWorkService eightWorkService;
 
     @RequestMapping("/saveFile")
     @ResponseBody
@@ -49,4 +51,16 @@ public class AppEightWorkController extends BaseController {
         map.put("result",errorInfo);
         return map;
     }
+
+    @RequestMapping("/getTaskSetps")
+    @ResponseBody
+    public Object getTaskSetps() throws Exception{
+        Map<String,Object> map = new HashMap<>();
+        String errorInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        map.put("list",eightWorkService.getTaskSetps(pd));
+        map.put("result",errorInfo);
+        return map;
+    }
 }

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

@@ -145,4 +145,16 @@ public class AppHotworkController extends BaseController {
         map.put("result",errInfo);
         return map;
     }
+
+    @RequestMapping("/checkWorkCount")
+    @ResponseBody
+    public Object checkWorkCount() throws Exception{
+        Map<String,Object> map = new HashMap<>();
+        String errorInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        map.put("count",hotworkService.checkWorkCount(pd));
+        map.put("result",errorInfo);
+        return map;
+    }
 }

src/main/java/com/zcloud/controller/video/AppAudioOrVideoController.java

@@ -58,7 +58,7 @@ public class AppAudioOrVideoController  extends BaseController {
 		data.put("videoId",  resp.body.videoId);
 		map.put("data", data);
 		map.put("result", errInfo);
-		return resp;
+		return map;
 	}
     /**
      * 刷新音/视频上传凭证

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

@@ -2,6 +2,8 @@ package com.zcloud.mapper.datasource.eightwork;
 
 import com.zcloud.entity.PageData;
 
+import java.util.List;
+
 /**
  * @author fangjiakai
  * @date 2024/01/17 11:31
@@ -12,4 +14,5 @@ public interface EightWorkFlowLogMapper {
      * @throws Exception
      */
     void save(PageData pd);
+
 }

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

@@ -2,6 +2,8 @@ package com.zcloud.mapper.datasource.eightwork;
 
 import com.zcloud.entity.PageData;
 
+import java.util.List;
+
 /**
  * @author fangjiakai
  * @date 2024/01/17 11:31
@@ -14,4 +16,6 @@ public interface EightWorkTaskFlowMapper {
     void save(PageData pd);
 
     PageData getStep(PageData flow);
+
+    List<PageData> getTaskSetps(PageData pd);
 }

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

@@ -17,5 +17,5 @@ public interface HotworkMapper {
     void edit(PageData pd);
     void editStep(PageData pd);
     List<PageData> datalistPage(Page page);
-    void cancel(PageData pd);
+    List<PageData> checkWorkCount(PageData pd);
 }

src/main/java/com/zcloud/service/eightwork/EightWorkService.java

@@ -0,0 +1,13 @@
+package com.zcloud.service.eightwork;
+
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * @author fangjiakai
+ * @date 2024/01/19 14:34
+ */
+public interface EightWorkService {
+    public List<PageData> getTaskSetps(PageData pd);
+}

src/main/java/com/zcloud/service/eightwork/HotworkService.java

@@ -25,12 +25,14 @@ public interface HotworkService {
 
     PageData findById(PageData pd) throws Exception;
 
+    PageData checkWorkCount(PageData pd);
+
     //获取所有措施(bus_hotwork_measures)
-    List<PageData> listAllMeasures() throws Exception;
+//    List<PageData> listAllMeasures() throws Exception;
-
+//
-    //获取需要签字的措施(bus_hotworktomeasures)
+//    //获取需要签字的措施(bus_hotworktomeasures)
-    List<PageData> listAllMeasuresForSign(PageData pd) throws Exception;
+//    List<PageData> listAllMeasuresForSign(PageData pd) throws Exception;
-
+//
-    //获取所有签字完成的措施(bus_hotworktomeasures)
+//    //获取所有签字完成的措施(bus_hotworktomeasures)
-    List<PageData> listSignFinishMeasures(PageData pd) throws Exception;
+//    List<PageData> listSignFinishMeasures(PageData pd) throws Exception;
 }

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

@@ -0,0 +1,28 @@
+package com.zcloud.service.eightwork.impl;
+
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.eightwork.EightWorkFlowLogMapper;
+import com.zcloud.mapper.datasource.eightwork.EightWorkTaskFlowMapper;
+import com.zcloud.service.eightwork.EightWorkService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @author fangjiakai
+ * @date 2024/01/19 14:35
+ */
+@Service
+@Transactional //开启事物
+public class EightWorkServiceImpl implements EightWorkService {
+    @Autowired
+    private EightWorkTaskFlowMapper eightWorkTaskFlowMapper;
+    @Autowired
+    private EightWorkFlowLogMapper eightWorkFlowLogMapper;
+    @Override
+    public List<PageData> getTaskSetps(PageData pd) {
+        return eightWorkTaskFlowMapper.getTaskSetps(pd);
+    }
+}

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

@@ -20,6 +20,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.text.DecimalFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author fangjiakai
@@ -43,6 +44,7 @@ public class HotworkServiceImpl implements HotworkService {
     private Smb smb;
 
     private final static String primary_key = "HOTWORK_ID";
+    private final static String work_type = "HOTWORK";
     @Override
     @Transactional
     public void save(PageData pd) throws Exception {
@@ -64,9 +66,9 @@ public class HotworkServiceImpl implements HotworkService {
         hotworkMapper.save(pd);
 
         if (pd.get("APPLY_STATUS").equals("1")) {
-//            PageData flow = getStep(pd.get("TASK_ID"),"1");
+            PageData flow = getStep(pd.get("TASK_ID"),"1");
             saveLog(pd,pd.getString("CREATOR"),"1");
-//            saveNext(pd,flow);
+            saveNextSigner(pd,flow);
         }
     }
 
@@ -96,45 +98,51 @@ public class HotworkServiceImpl implements HotworkService {
         PageData sign = new PageData();
         sign.put(primary_key, pd.get(primary_key));
         sign.put("STEP_ID", pd.get("STEP_ID"));
-        sign.put("SIGN_USER_ID", pd.get("USER_ID"));
+        sign.put("SIGN_USER_ID", pd.get("SIGN_USER_ID"));
-        sign.put("SIGN_USER_DEPARTMENT_ID", pd.get("DEPARTMENT_ID"));
         sign.put("SIGN_TIME", DateUtil.date2Str(new Date()));
         sign.put("SIGN_PATH", filePath);
         sign.put("DESCR", pd.get("DESCR"));
 
         hotworkSignMapper.edit(sign);
 
-        if (pd.get("PREPARERS") != null && !pd.get("PREPARERS").equals("")) {
+        if (pd.get("MEASURES") != null && !pd.get("MEASURES").equals("")) { //安全措施确认步骤
-            savePreparers(pd);
-        }
-
-        if (pd.get("MEASURES") != null && !pd.get("MEASURES").equals("")) {
             saveMeasures(pd);
         }
 
         List<PageData> unsignedList = hotworkSignMapper.checkUnsigned(sign);//当前步骤未签名人列表
         if(unsignedList == null || unsignedList.size() == 0){//如果没有未签人 则跳转下一步
             PageData flow = getStep(pd.get("TASK_ID"), pd.get("STEP_ID"));
-            pd.put("STEP_ID",flow.get("NEXT_STEP_ID"));
             hotworkMapper.edit(pd);
 
+            if (pd.get("PREPARERS") != null && !pd.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤
+                savePreparers(pd,flow);
+            }
+
+            saveNextSigner(pd,flow);
+
+            //保存日志
+            saveLog(pd,pd.getString(flow.get("ACTOR_FIELD")),"1");
+        }
+    }
+
+    private void saveNextSigner(PageData pd,PageData flow) throws Exception {
+
+        pd.put("STEP_ID",flow.get("NEXT_STEP_ID"));
+
+        if(pd.get(flow.get("NEXT_ACTOR_FIELD")) == null || pd.get(flow.get("NEXT_ACTOR_FIELD")).equals("")){
+            return;
+        }
         //提前保存下一步签字人
         List<PageData> signers  = new ArrayList<>();
         PageData signer = new PageData();
         signer.put("HOTWORK_SIGN_ID", UuidUtil.get32UUID()); // 主键
         signer.put(primary_key, pd.get(primary_key));
         signer.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
-            signer.put("SIGN_USER_DEPARTMENT_ID", pd.get(flow.get("NEXT_ACTOR_FIELD")));
         signer.put("SIGN_USER_ID", pd.get(flow.get("NEXT_ACTOR_FIELD")));
         signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
         signers.add(signer);
-            if(signers.size() > 0){
         hotworkSignMapper.saveBatch(signers);
     }
-            //保存日志
-            saveLog(pd,pd.getString(flow.get("ACTOR_FIELD")),"1");
-        }
-    }
 
     private void saveMeasures(PageData pd) {
         List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("PREPARERS").toString());
@@ -155,7 +163,7 @@ public class HotworkServiceImpl implements HotworkService {
         }
     }
 
-    private void savePreparers(PageData pd) {
+    private void savePreparers(PageData pd,PageData flow) {
         List<PageData> signers = new ArrayList<>();
         List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("PREPARERS").toString());
         for (JSONObject json : list) {
@@ -171,6 +179,26 @@ public class HotworkServiceImpl implements HotworkService {
         }
         if(signers.size() > 0){
             hotworkToMeasuresMapper.saveBatch(signers);
+
+            //获取所有需要签名人
+            List<String> fieldList = signers.stream()
+                    .map(map -> map.getString("CONFIRM_ID"))
+                    .collect(Collectors.toList());
+            Set<String > fieldSet = new HashSet<>(fieldList); //去重
+
+            List<String> uniqueList = new ArrayList<>(fieldSet);
+            List<PageData> nextSigners  = new ArrayList<>();
+            uniqueList.forEach(item -> { // 保存下一步需要签名的人
+                PageData signer = new PageData();
+                signer.put("HOTWORK_SIGN_ID", UuidUtil.get32UUID()); // 主键
+                signer.put(primary_key, pd.get(primary_key));
+                signer.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
+                signer.put("SIGN_USER_ID", item);
+                signer.put("STEP_ID", flow.get("NEXT_STEP_ID"));
+                nextSigners.add(signer);
+            });
+
+            hotworkSignMapper.saveBatch(nextSigners);
         }
     }
 
@@ -188,10 +216,12 @@ public class HotworkServiceImpl implements HotworkService {
      * 取消
      */
     @Override
+    @Transactional
     public void cancel(PageData pd)throws Exception{
         PageData flow = getStep(pd.get("TASK_ID"), pd.get("STEP_ID"));
-        hotworkMapper.edit(pd);
         saveLog(pd,pd.getString(flow.get("ACTOR_FIELD")),"-1");
+        pd.put("STEP_ID", -1);
+        hotworkMapper.edit(pd);
     }
 
     @Override
@@ -200,6 +230,20 @@ public class HotworkServiceImpl implements HotworkService {
         return pageData;
     }
 
+    @Override
+    public PageData checkWorkCount(PageData pd) {
+        PageData rpd = new PageData();
+        List<PageData> varList = hotworkMapper.checkWorkCount(pd);
+
+        if (varList != null && !varList.isEmpty()) {
+            Map<String, String> newMap = varList.stream()
+                    .collect(Collectors.toMap(map -> map.getString("CODE"), map -> map.getString("COUNT")));
+
+            rpd.putAll(newMap);
+        }
+        return rpd;
+    }
+
     private PageData getStep(Object TASK_ID, Object STEP_ID) throws Exception {
         PageData flow = new PageData();
         flow.put("TASK_ID", TASK_ID);
@@ -217,6 +261,7 @@ public class HotworkServiceImpl implements HotworkService {
         log.put("ACT_USER", act_user);
         log.put("ACT_TIME", DateUtil.date2Str(new Date()));
         log.put("STATUS", status);
+        log.put("WORK_TYPE",work_type);
         eightWorkFlowLogMapper.save(log);
     }
 

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

@@ -20,7 +20,8 @@
 		f.STEP_ID,
 		f.ACT_USER,
 		f.ACT_TIME,
-		f.STATUS
+		f.STATUS,
+		f.WORK_TYPE
 	</sql>
 
 	<!-- 字段用于新增 -->
@@ -31,7 +32,8 @@
 		STEP_ID,
 		ACT_USER,
 		ACT_TIME,
-		STATUS
+		STATUS,
+		WORK_TYPE
 	</sql>
 
 	<!-- 字段值 -->
@@ -42,7 +44,8 @@
 		#{STEP_ID},
 		#{ACT_USER},
 		#{ACT_TIME},
-		#{STATUS}
+		#{STATUS},
+		#{WORK_TYPE}
 	</sql>
 
 	<!-- 新增-->
@@ -55,5 +58,4 @@
 	<include refid="FieldValue"></include>
 		)
 	</insert>
-
 </mapper>

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

@@ -56,7 +56,6 @@
 	<select id="getStep" parameterType="pd" resultType="pd" >
 		select
 			<include refid="Field"></include>,
-		    n.STEP_ID as NEXT_STEP_ID,
 		    n.ACTOR_FIELD as NEXT_ACTOR_FIELD
 		from
 			<include refid="tableName"></include> f
@@ -70,4 +69,16 @@
 			f.STEP_ID = #{STEP_ID}
 	</select>
 
+	<select id="getTaskSetps" parameterType="pd" resultType="pd" >
+		select
+		<include refid="Field"></include>,
+		step.STEP_NAME
+		from
+		<include refid="tableName"></include> f
+		left join bus_eightwork_step step on f.STEP_ID = step.STEP_ID
+		where
+		f.TASK_ID = #{TASK_ID}
+		order by f.ORDER_BY
+	</select>
+
 </mapper>

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

@@ -171,7 +171,7 @@
         set
             ISDELETE = '1'
         where
-            HIGHWORK_ID = #{HIGHWORK_ID}
+            HOTWORK_ID = #{HOTWORK_ID}
     </delete>
 
     <!-- 修改 -->
@@ -218,7 +218,7 @@
             ACCEPT_USER_ID = #{ACCEPT_USER_ID},
             ANALYZE_TIME=#{ANALYZE_TIME}
         where
-            HIGHWORK_ID = #{HIGHWORK_ID}
+            HOTWORK_ID = #{HOTWORK_ID}
     </update>
 
     <select id="findById" parameterType="pd" resultType="pd">
@@ -309,20 +309,80 @@
         set
             STEP_ID = #{pd.STEP_ID}
         where
-            HIGHWORK_ID = #{HIGHWORK_ID}
+            HOTWORK_ID = #{HOTWORK_ID}
     </update>
+
     <!-- 列表 -->
     <select id="datalistPage" parameterType="page" resultType="pd">
         select
-        <include refid="Field"></include>
+        <include refid="Field"></include>,
+        appo.`NAME` as APPLY_DEPARTMENT_NAME,
+        appu.`NAME` as APPLY_USER_NAME,
+        anao.`NAME` as ANALYZE_DEPARTMENT_NAME,
+        anau.`NAME` as ANALYZE_USER_NAME,
+        cono.`NAME` as CONFESS_DEPARTMENT_NAME,
+        conu.`NAME` as CONFESS_USER_NAME,
+        acco.`NAME` as ACCEPT_CONFESS_DEPARTMENT_NAME,
+        accu.`NAME` as ACCEPT_CONFESS_USER_NAME,
+        guao.`NAME` as GUARDIAN_DEPARTMENT_NAME,
+        guau.`NAME` as GUARDIAN_USER_NAME,
+        confo.`NAME` as CONFIRM_DEPARTMENT_NAME,
+        confu.`NAME` as CONFIRM_USER_NAME,
+        leao.`NAME` as LEADER_DEPARTMENT_NAME,
+        leau.`NAME` as LEADER_USER_NAME,
+        audo.`NAME` as AUDIT_DEPARTMENT_NAME,
+        audu.`NAME` as AUDIT_USER_NAME,
+        appro.`NAME` as APPROVE_DEPARTMENT_NAME,
+        appru.`NAME` as APPROVE_USER_NAME,
+        mono.`NAME` as MONITOR_DEPARTMENT_NAME,
+        monu.`NAME` as MONITOR_USER_NAME,
+        acceo.`NAME` as ACCEPT_DEPARTMENT_NAME,
+        acceu.`NAME` as ACCEPT_USER_NAME,
+        log.STEP_NAME,
+        log.NEXT_STEP_NAME,
+        log.STATUS
         from
         <include refid="tableName"></include> f
+        left join oa_department as appo on f.APPLY_DEPARTMENT_ID = appo.DEPARTMENT_ID
+        left join sys_user as appu on f.APPLY_USER_ID = appu.USER_ID
+
+        left join oa_department as anao on f.ANALYZE_DEPARTMENT_ID = anao.DEPARTMENT_ID
+        left join sys_user as anau on f.ANALYZE_USER_ID = anau.USER_ID
+
+        left join oa_department as cono on f.CONFESS_DEPARTMENT_ID = cono.DEPARTMENT_ID
+        left join sys_user as conu on f.CONFESS_USER_ID = conu.USER_ID
+
+        left join oa_department as acco on f.ACCEPT_CONFESS_DEPARTMENT_ID = acco.DEPARTMENT_ID
+        left join sys_user as accu on f.ACCEPT_CONFESS_USER_ID = accu.USER_ID
+
+        left join oa_department as guao on f.GUARDIAN_DEPARTMENT_ID = guao.DEPARTMENT_ID
+        left join sys_user as guau on f.GUARDIAN_USER_ID = guau.USER_ID
+
+        left join oa_department as confo on f.CONFIRM_DEPARTMENT_ID = confo.DEPARTMENT_ID
+        left join sys_user as confu on f.CONFIRM_USER_ID = confu.USER_ID
+
+        left join oa_department as leao on f.LEADER_DEPARTMENT_ID = leao.DEPARTMENT_ID
+        left join sys_user as leau on f.LEADER_USER_ID = leau.USER_ID
+
+        left join oa_department as audo on f.AUDIT_DEPARTMENT_ID = audo.DEPARTMENT_ID
+        left join sys_user as audu on f.AUDIT_USER_ID = audu.USER_ID
+
+        left join oa_department as appro on f.APPROVE_DEPARTMENT_ID = appro.DEPARTMENT_ID
+        left join sys_user as appru on f.APPROVE_USER_ID = appru.USER_ID
+
+        left join oa_department as mono on f.MONITOR_DEPARTMENT_ID = mono.DEPARTMENT_ID
+        left join sys_user as monu on f.MONITOR_USER_ID = monu.USER_ID
+
+        left join oa_department as acceo on f.ACCEPT_DEPARTMENT_ID = acceo.DEPARTMENT_ID
+        left join sys_user as acceu on f.ACCEPT_USER_ID = acceu.USER_ID
+
+        left join (select log.* from vi_eightwork_flow_log log order by log.ACT_TIME desc limit 1) log on log.WORK_ID = f.HOTWORK_ID
         where f.ISDELETE = '0'
         <if test="pd.STEP_NAME != null and pd.STEP_NAME != ''"><!-- 关键词检索 -->
             and exists (
                 select 1 from bus_hotwork_sign sign
                          left join bus_eightwork_step step on step.STEP_ID = sign.STEP_ID
-                where sign.HIGHWORK_ID = f.HIGHWORK_ID
+                where sign.HOTWORK_ID = f.HOTWORK_ID
                 and sign.SIGN_TIME is null
                 and sign.SIGN_USER_ID = #{pd.USER_ID}
                 and step.STEP_NAME = #{pd.STEP_NAME}
@@ -335,4 +395,17 @@
             and f.
         </if>
     </select>
+
+    <select id="checkWorkCount" parameterType="pd" resultType="pd" >
+        select
+            step.CODE,count(1) COUNT
+        from
+            bus_hotwork_sign sign
+        left join bus_eightwork_step step on step.STEP_ID = sign.STEP_ID
+        where
+            sign.SIGN_TIME is null
+        and
+            sign.SIGN_USER_ID = #{USER_ID}
+        group by step.CODE
+    </select>
 </mapper>

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

@@ -17,7 +17,6 @@
 		f.HOTWORK_SIGN_ID,
 		f.HOTWORK_ID,
 		f.CORPINFO_ID,
-		f.SIGN_USER_DEPARTMENT_ID,
 		f.SIGN_USER_ID,
 		f.SIGN_PATH,
 		f.SIGN_TIME,
@@ -30,7 +29,6 @@
 		HOTWORK_SIGN_ID,
 		HOTWORK_ID,
 		CORPINFO_ID,
-		SIGN_USER_DEPARTMENT_ID,
 		SIGN_USER_ID,
 		SIGN_PATH,
 		SIGN_TIME,
@@ -43,7 +41,6 @@
 		#{HOTWORK_SIGN_ID},
 		#{HOTWORK_ID},
 		#{CORPINFO_ID},
-		#{SIGN_USER_DEPARTMENT_ID},
 		#{SIGN_USER_ID},
 		#{SIGN_PATH},
 		#{SIGN_TIME},
@@ -69,7 +66,6 @@
 		HOTWORK_SIGN_ID,
 		HOTWORK_ID,
 		CORPINFO_ID,
-		SIGN_USER_DEPARTMENT_ID,
 		SIGN_USER_ID,
 		STEP_ID
 		) values
@@ -77,7 +73,6 @@
 		(#{item.HOTWORK_SIGN_ID},
 		#{item.HOTWORK_ID},
 		#{item.CORPINFO_ID},
-		#{item.SIGN_USER_DEPARTMENT_ID},
 		#{item.SIGN_USER_ID},
 		#{item.STEP_ID})
 		</foreach>