工作台

platform-dao/src/main/java/com/platform/dao/mapper/workflow/WorkflowTaskBomMapper.java

@@ -2,6 +2,7 @@ package com.platform.dao.mapper.workflow;
 
 import com.platform.dao.dto.workflow.WorkflowTaskBomDTO;
 import com.platform.dao.config.MyMapper;
+import com.platform.dao.entity.workflow.WorkflowTask;
 import com.platform.dao.entity.workflow.WorkflowTaskBom;
 import com.platform.dao.vo.query.workflow.WorkflowTaskBomVO;
 import org.springframework.stereotype.Component;
@@ -24,4 +25,6 @@ public interface WorkflowTaskBomMapper extends MyMapper<WorkflowTaskBom> {
     List<WorkflowTaskBomVO> selectList(WorkflowTaskBomDTO dto);
 
     List<WorkflowTaskBomVO> selectWorkPlaceList(WorkflowTaskBomDTO dto);
+
+    WorkflowTaskBomVO getVOById(String id);
 }

platform-dao/src/main/java/com/platform/dao/vo/query/workflow/WorkflowTaskBomVO.java

@@ -1,5 +1,6 @@
 package com.platform.dao.vo.query.workflow;
 
+import com.alibaba.fastjson.JSONObject;
 import com.platform.common.bean.BaseVO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -74,6 +75,9 @@ public class WorkflowTaskBomVO extends BaseVO implements Serializable {
     private Integer reminderNum; // 催办次数
     private String currentUserName; // 当前处理人
     private Integer taskStatus;
+    private String linkType;
+    private JSONObject data;
+    private String formDataId;
    /* *//**
      * 自定义字段1
      *//*

platform-dao/src/main/resources/mapper/workflow/WorkflowTaskBomMapper.xml

@@ -123,4 +123,9 @@
             </if>
         </where>
     </select>
+
+    <select id="getVOById" parameterType="java.lang.String" resultType="com.platform.dao.vo.query.workflow.WorkflowTaskBomVO">
+        select bom.*,task.link_type,task.form_data_id from t_workflow_task_bom bom
+            join t_workflow_task task on task.id = bom.task_id where bom.id = #{id}
+    </select>
 </mapper>

platform-rest/src/main/java/com/platform/rest/controller/workplace/IndexController.java

@@ -0,0 +1,28 @@
+package com.platform.rest.controller.workplace;
+
+import com.platform.common.util.R;
+import com.platform.service.workplace.IndexService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description 待办事项 控制器
+ * @Author chenyuehu
+ * @Date 2020-02-21 23:46:03
+ * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/index/index")
+public class IndexController {
+
+    private final IndexService indexService;
+
+    @GetMapping("/getCommonMenuMineVO")
+    public R getCommonMenuMineVO(){
+        return new R<>(indexService.getCommonMenuMineVO());
+    }
+
+}

platform-service/src/main/java/com/platform/service/workflow/impl/WorkflowTaskBomServiceImpl.java

@@ -103,7 +103,7 @@ public class WorkflowTaskBomServiceImpl extends BaseServiceImpl<WorkflowTaskBomM
 
     @Override
     public WorkflowTaskBomVO getVOById(String id) {
-        WorkflowTaskBomVO vo = BeanConverterUtil.copyObjectProperties(mapper.selectByPrimaryKey(id), WorkflowTaskBomVO.class);
+        WorkflowTaskBomVO vo = mapper.getVOById(id);
         String userId = SecurityUtils.getUserInfo().getUserId();
         if (userId.equals(vo.getCreatedUserId())) {
             WorkflowTaskBom bom = new WorkflowTaskBom();
@@ -112,6 +112,8 @@ public class WorkflowTaskBomServiceImpl extends BaseServiceImpl<WorkflowTaskBomM
             mapper.updateByPrimaryKeySelective(bom);
         }
         // 获取详情数据
+        BomViewStrategy baseStrategy = bomViewStrategyList.stream().filter(strategy -> strategy.getType().equals(vo.getLinkType())).collect(Collectors.toList()).get(0);
+        vo.setData(baseStrategy.getVOById(vo.getFormDataId()));
         return vo;
     }
 

platform-service/src/main/java/com/platform/service/workflow/viewStrategy/impl/CustomFormViewStrategy.java

@@ -2,6 +2,7 @@ package com.platform.service.workflow.viewStrategy.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.platform.common.util.JsonUtils;
+import com.platform.dao.enums.LinkTypeEnum;
 import com.platform.service.custom.CustomFormBomService;
 import com.platform.service.workflow.viewStrategy.BomViewStrategy;
 import lombok.extern.slf4j.Slf4j;
@@ -19,7 +20,7 @@ public class CustomFormViewStrategy implements BomViewStrategy {
 
     @Override
     public String getType() {
-        return "custom_form";
+        return LinkTypeEnum.CUSTOM_FORM.getValue();
     }
 
     @Override

platform-service/src/main/java/com/platform/service/workplace/IndexService.java

@@ -2,6 +2,7 @@ package com.platform.service.workplace;
 
 import com.platform.common.util.R;
 import com.platform.dao.vo.query.store.OutStoreFormVO;
+import com.platform.dao.vo.query.upms.CommonMenuMineVO;
 import com.platform.dao.vo.repair.RepairApplicationFormVO;
 import com.platform.dao.vo.repair.WorkPlaceStatisticVO;
 
@@ -70,4 +71,5 @@ public interface IndexService {
 
     void printedTicket(String type,String id);
 
+    List<CommonMenuMineVO> getCommonMenuMineVO();
 }

platform-service/src/main/java/com/platform/service/workplace/impl/IndexServiceImpl.java

@@ -8,6 +8,7 @@ import com.platform.dao.dto.hidden.HiddenDangerDTO;
 import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.dto.store.OutStoreFormDTO;
+import com.platform.dao.dto.upms.CommonMenuMineDTO;
 import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.entity.store.OutStoreForm;
 import com.platform.dao.enums.*;
@@ -16,7 +17,10 @@ import com.platform.dao.mapper.hidden.HiddenDangerMapper;
 import com.platform.dao.mapper.sb.SbInfoMapper;
 import com.platform.dao.mapper.sb.SbPositionMapper;
 import com.platform.dao.mapper.store.OutStoreFormMapper;
+import com.platform.dao.mapper.upms.CommonMenuMapper;
+import com.platform.dao.mapper.upms.CommonMenuMineMapper;
 import com.platform.dao.vo.query.store.OutStoreFormVO;
+import com.platform.dao.vo.query.upms.CommonMenuMineVO;
 import com.platform.dao.vo.repair.IndexStatisticVO;
 import com.platform.dao.vo.repair.RepairApplicationFormVO;
 import com.platform.dao.vo.repair.WorkPlaceStatisticVO;
@@ -57,6 +61,10 @@ public class IndexServiceImpl implements IndexService {
     private OutStoreFormMapper outStoreFormMapper;
     @Resource
     private FillGatherTaskMapper fillGatherTaskMapper;
+    @Resource
+    private CommonMenuMapper commonMenuMapper;
+    @Resource
+    private CommonMenuMineMapper commonMenuMineMapper;
 
 
     @Override
@@ -291,6 +299,15 @@ public class IndexServiceImpl implements IndexService {
         }
     }
 
+    @Override
+    public List<CommonMenuMineVO> getCommonMenuMineVO() {
+        UserInfo userInfo = SecurityUtils.getUserInfo();
+        CommonMenuMineDTO menuMineDTO = new CommonMenuMineDTO();
+        menuMineDTO.setStatus(0);
+        menuMineDTO.setCreatedUserId(userInfo.getUserId());
+        return commonMenuMineMapper.selectList(menuMineDTO);
+    }
+
     /**
      * 处理区域负责人，超级，普通其他人员
      * @param result