提交代码

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IFlowBusinessKeyService.java

@@ -66,4 +66,11 @@ public interface IFlowBusinessKeyService {
     public List<FlowTaskEntity> groupByUnitFinish(FlowTaskEntity where);
 
     public List<FlowTaskEntity> groupByProject(long deptId);
+
+    /**
+     * 根据条件查询安全类作业工作流列表
+     * @param flowTaskEntity
+     * @return
+     */
+    public List<FlowTaskEntity> findSafetyWorkList(FlowTaskEntity flowTaskEntity);
 }

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowBusinessKeyServiceImpl.java

@@ -133,4 +133,14 @@ public class FlowBusinessKeyServiceImpl implements IFlowBusinessKeyService {
     public List<FlowTaskEntity> groupByProject(long deptId) {
         return flowBusinessKeyMapper.groupByProject(deptId);
     }
+
+    /**
+     * 根据条件查询安全类作业工作流列表
+     * @param flowTaskEntity
+     * @return
+     */
+    @Override
+    public List<FlowTaskEntity> findSafetyWorkList(FlowTaskEntity flowTaskEntity) {
+        return flowBusinessKeyMapper.findSafetyWorkList(flowTaskEntity);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/FlowBusinessKeyMapper.java

@@ -58,4 +58,12 @@ public interface FlowBusinessKeyMapper {
     public List<FlowTaskEntity> groupByUnitFinish(FlowTaskEntity where);
 
     public List<FlowTaskEntity> groupByProject(long deptId);
+
+    /**
+     * 根据条件查询安全类作业工作流列表
+     * @param flowTaskEntity
+     * @return
+     */
+    public List<FlowTaskEntity> findSafetyWorkList(FlowTaskEntity flowTaskEntity);
+
 }

ruoyi-system/src/main/resources/mapper/flowable/FlowBusinessKeyMapper.xml

@@ -108,6 +108,7 @@
         <if test="params.beginDate != null and params.beginDate != '' and params.endDate != null and params.endDate != ''"> and fa.endTime between #{params.beginDate} and #{params.endDate}</if>
         order by fa.endTime desc
     </select>
+
     <select id="groupByCategory" parameterType="com.ruoyi.system.domain.FlowTaskEntity"  resultType="com.ruoyi.system.domain.FlowTaskEntity">
         SELECT a.dict_label taskName,b.cnt assigneeId,c.cnt procDefVersion FROM
                 ( SELECT * FROM sys_dict_data  WHERE dict_type = 'sys_process_category') a
@@ -342,4 +343,37 @@
         ORDER BY a.cnt DESC
 
     </select>
+
+    <select id="findSafetyWorkList" parameterType="com.ruoyi.system.domain.FlowTaskEntity" resultType="com.ruoyi.system.domain.FlowTaskEntity">
+        SELECT
+        fa.procInsId,
+        fa.deployId,
+        fa.createTime,
+        fa.finishTime,
+        fa.duration,
+        fa.procDefKey,
+        fa.procDefName,
+        fa.procDefVersion,
+        fa.category,
+        fa.businessKey,
+        fa.businessDeptId,
+        fa.businessKeyName,
+        fa.startUserId,
+        fa.startUserName,
+        fa.startDeptName,
+        fa.taskId,
+        fa.taskName,
+        fa.assigneeId,
+        fa.assigneeName,
+        fa.assigneeDeptName
+        FROM
+        vw_flow_all fa
+        <where>
+            <if test="procDefKey != null  and procDefKey != ''"> and fa.procDefKey = #{procDefKey}</if>
+            <if test="businessKey != null  and businessKey != ''"> and fa.businessKey = #{businessKey}</if>
+            <!-- 查询条件-项目部门 -->
+            <if test="projectDeptId != null "> and fa.businessDeptId = #{projectDeptId}</if>
+        </where>
+        order by fa.createTime desc
+    </select>
 </mapper>

ruoyi-ui/src/views/flowable/task/myProcess/detail/detailDrawer.vue

@@ -402,6 +402,8 @@ export default {
 }
 }
 .containers {
+  width: 100%;
+  height: 150px;
     .canvas {
       width: 100%;
       height: 100px;

ruoyi-ui/src/views/flowable/task/myProcess/detail/detailLeaveDrawer.vue

@@ -431,6 +431,8 @@
   }
   }
   .containers {
+    width: 100%;
+    height: 150px;
       .canvas {
         width: 100%;
         height: 100px;

ruoyi-ui/src/views/flowable/task/myProcess/editLeaveTaskDrawer.vue

@@ -380,6 +380,8 @@ export default {
 }
 .app-container{
   .containers {
+    width: 100%;
+    height: 150px;
     .canvas {
       width: 100%;
       height: 150px;

ruoyi-ui/src/views/flowable/task/myProcess/editTaskDrawer.vue

@@ -311,6 +311,8 @@
   }
   .app-container{
     .containers {
+      width: 100%;
+      height: 150px;
       .canvas {
         width: 100%;
         height: 150px;

ruoyi-ui/src/views/flowable/task/todo/detail/approveDrawer.vue

@@ -550,6 +550,8 @@ export default {
 }
 }
 .containers {
+  width: 100%;
+  height: 150px;
     .canvas {
       width: 100%;
       height: 100px;

ruoyi-ui/src/views/flowable/task/todo/detail/approveLeaveDrawer.vue

@@ -582,6 +582,8 @@ export default {
 }
 }
 .containers {
+  width: 100%;
+  height: 150px;
     .canvas {
       width: 100%;
       height: 100px;

yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/FloweController.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.flowable.service.IFlowBusinessKeyService;
 import com.ruoyi.system.domain.FlowTaskEntity;
+import com.yanzhu.jh.bigscreen.web.vo.FlowTypeMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -138,4 +139,38 @@ public class FloweController extends BaseController {
         return AjaxResult.success(list);
     }
 
+    /**
+     * 根据条件查询安全类作业工作流列表
+     * JiangYuQi
+     */
+    @GetMapping("/findSafetyWorkList")
+    public AjaxResult findSafetyWorkList(long deptId,long projectId,String flowType){
+        String key="bgscreen_flow_findSafetyWorkList_"+deptId+"_"+projectId+"_"+flowType;
+        Object obj=redisCache.getCacheObject(key);
+        if(obj!=null){
+            return AjaxResult.success(obj);
+        }
+        FlowTaskEntity where=new FlowTaskEntity();
+        if(deptId<=0){
+            if (SecurityUtils.isUserB()) {
+                where.setPrjIds(getProjectIds());
+            }
+        }
+        where.setProcDefKey(FlowTypeMapper.getFlowProcdefKey(flowType));
+        where.setProjectDeptId(deptId<1?"":""+deptId);
+        where.setBusinessKey(projectId<1?"":""+projectId);
+        List<FlowTaskEntity> list=flowBusinessKeyService.findSafetyWorkList(where);
+        redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 根据条件查询安全类作业工作流列表
+     * JiangYuQi
+     */
+    @GetMapping("/findFormDatasByProcInsId/{procInsId}")
+    public AjaxResult findFormDatasByProcInsId(@PathVariable("procInsId") String procInsId){
+        return AjaxResult.success(flowBusinessKeyService.selectFormDatasByProcInsId(procInsId));
+    }
+
 }

yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/vo/FlowTypeMapper.java

@@ -0,0 +1,25 @@
+package com.yanzhu.jh.bigscreen.web.vo;
+
+/**
+ * 流程定义转换
+ */
+public class FlowTypeMapper {
+
+    /**
+     * 获取流程定义
+     */
+    public static String getFlowProcdefKey(String type){
+        String procdefKey = "";
+        switch (type){
+            case "sxkj":procdefKey="flow_aql_sxkj";break;
+            case "ptzy":procdefKey="flow_aql_ptzy";break;
+            case "lsyd":procdefKey="flow_aql_lsyd";break;
+            case "gczy":procdefKey="flow_aql_gczy";break;
+            case "dzzy":procdefKey="flow_aql_dzzy";break;
+            case "dhzy":procdefKey="flow_aql_dhzy";break;
+            case "dlzy":procdefKey="flow_aql_dlzy";break;
+            default:break;
+        }
+        return procdefKey;
+    }
+}

yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml

@@ -210,6 +210,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) b
         ON a.dict_value=b.measure_info
     </select>
+
     <select id="getList"  parameterType="SurProjectMeasure" resultMap="SurProjectMeasureResult">
         SELECT spm.id, spm.project_id, spm.dept_id, spm.main_image, spm.image_urls, spm.measure_type, sdd1.dict_label AS measure_type_name, spm.measure_position, spm.measure_info, sdd2.dict_label AS measure_info_name, spm.measure_time, spm.measure_point_position, spm.measure_result, spm.measure_files, spm.quality_user, spm.quality_user_name, spm.supervise_user, spm.supervise_user_name, spm.is_del, spm.create_by, spm.create_time, spm.update_by, spm.update_time, spm.remark, spm.approve_status, sp.projectName, sd.dept_name ,u1.nick_name create_by_name,u2.nick_name update_by_name
         FROM sur_project_measure spm
@@ -237,4 +238,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND  spm.project_id=#{projectId}
         </if>
     </select>
+
 </mapper>