动火作业添加电子围栏

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

@@ -1,6 +1,7 @@
 package com.zcloud.controller.eightwork;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
@@ -135,4 +136,28 @@ public class AppEightWorkController extends BaseController {
         map.put("result",errorInfo);
         return map;
     }
+
+    /**
+     * @Description: 电子围栏 来自人员定位系统
+     * @Author: dearLin
+     * @Date: 2024/1/25/025 9:02
+     * @Param: [com.zcloud.entity.Page] [page]
+     * @Return: java.lang.Object
+     */
+    @RequestMapping(value = "/getPlsList")
+    @ResponseBody
+    public Object getPlsList(Page page) throws Exception {
+        ReturnMap returnMap = new ReturnMap();
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        JSONObject body = PLSUtil.getRyRegionList(pd.getString("CORPINFO_ID"),"",1,99999);
+
+        if (body != null) {
+            List<JSONObject> list = body.getJSONArray("rows").toJavaList(JSONObject.class);
+            returnMap.put("varList", list);
+            returnMap.put("page", page);
+            return returnMap;
+        }
+        return ReturnMap.error("查询失败");
+    }
 }

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

@@ -12,4 +12,6 @@ public interface EightWorkTaskMapper {
      * @throws Exception
      */
     void save(PageData pd);
+
+    PageData checkWorkCount(PageData pd);
 }

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

@@ -2,8 +2,7 @@ package com.zcloud.service.eightwork.impl;
 
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
-import com.zcloud.mapper.datasource.eightwork.EightWorkFlowLogMapper;
+import com.zcloud.mapper.datasource.eightwork.*;
-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;
@@ -22,7 +21,7 @@ public class EightWorkServiceImpl implements EightWorkService {
     @Autowired
     private EightWorkTaskFlowMapper eightWorkTaskFlowMapper;
     @Autowired
-    private EightWorkFlowLogMapper eightWorkFlowLogMapper;
+    private EightWorkTaskMapper eightWorkTaskMapper;
     @Autowired
     private EightWorkMapper eightworkMapper;
 
@@ -34,7 +33,7 @@ public class EightWorkServiceImpl implements EightWorkService {
 
     @Override
     public PageData checkWork(PageData pd) {
-        return null;
+        return eightWorkTaskMapper.checkWorkCount(pd);
     }
 
     /**列表

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

@@ -273,6 +273,7 @@ public class HotworkServiceImpl implements HotworkService {
             sign.put("DESCR", pd.get("DESCR"));
             hotworkSignMapper.edit(sign);
             //保存日志
+            work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
             saveLog(work,pd.getString("USER_ID"),"-2");
             work.put("STEP_ID",-1);
             hotworkMapper.editStep(work);

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

@@ -41,4 +41,8 @@
 		)
 	</insert>
 
+	<select id="checkWorkCount" parameterType="pd" resultType="pd" >
+		select (select count(1) COUNT from bus_hotwork_sign sign where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID}) HOTWORK_COUNT
+	</select>
+
 </mapper>

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

@@ -54,7 +54,9 @@
         f.WORK_START_USER_ID,
         f.WORK_END_DEPARTMENT_ID,
         f.WORK_END_USER_ID,
-        f.ACCEPT_TIME
+        f.ACCEPT_TIME,
+        f.PLS_ID,
+        f.PLS_NAME
     </sql>
 
     <!-- 字段用于新增 -->
@@ -105,7 +107,9 @@
         WORK_START_USER_ID,
         WORK_END_DEPARTMENT_ID,
         WORK_END_USER_ID,
-        ACCEPT_TIME
+        ACCEPT_TIME,
+        PLS_ID,
+        PLS_NAME
     </sql>
 
     <!-- 字段值 -->
@@ -156,7 +160,9 @@
         #{WORK_START_USER_ID},
         #{WORK_END_DEPARTMENT_ID},
         #{WORK_END_USER_ID},
-        #{ACCEPT_TIME}
+        #{ACCEPT_TIME},
+        #{PLS_ID},
+        #{PLS_NAME}
     </sql>
 
     <!-- 获取编码 -->
@@ -236,7 +242,9 @@
             WORK_START_USER_ID=#{WORK_START_USER_ID},
             WORK_END_DEPARTMENT_ID=#{WORK_END_DEPARTMENT_ID},
             WORK_END_USER_ID=#{WORK_END_USER_ID},
-            ACCEPT_TIME = #{ACCEPT_TIME}
+            ACCEPT_TIME = #{ACCEPT_TIME},
+            PLS_ID = #{PLS_ID},
+            PLS_NAME = #{PLS_NAME}
         where
             HOTWORK_ID = #{HOTWORK_ID}
     </update>
@@ -471,7 +479,7 @@
             )
         </if>
         <if test="pd.STEP_ID != null and pd.STEP_ID != ''"><!-- 关键词检索 -->
-            and log.NEXT_STEP_ID = #{pd.STEP_ID}
+            and log.NEXT_STEP_ID = #{pd.STEP_ID} and f.STEP_ID != -1
         </if>
         <if test="pd.CREATOR != null and pd.CREATOR != ''"><!-- 关键词检索 -->
             and f.CREATOR = #{pd.CREATOR}