APP端待办接口重构

颜惠青
1 parent 49af8eaf
Showing 1 changed file with 73 additions and 0 deletions
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
@@ -25,6 +25,7 @@ import com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant;
 import com.zteits.urbanops.module.workorder.api.workorder.WorkOrderApi;
 import com.zteits.urbanops.module.workorder.controller.admin.garden.vo.BpmGardenWorkOrderCreateReqVO;
 import com.zteits.urbanops.module.workorder.controller.admin.garden.vo.BpmGardenWorkOrderPageReqVO;
+import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoHasTaskPageReqVO;
 import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInfoPageReqVO;
 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.*;
 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.process.AppGardenApprovalDetailReqVO;
@@ -35,7 +36,9 @@ import com.zteits.urbanops.module.workorder.convert.garden.BpmGardenWorkOrderCon
 import com.zteits.urbanops.module.workorder.dal.dataobject.attachment.AttachmentDO;
 import com.zteits.urbanops.module.workorder.dal.dataobject.garden.BpmGardenWorkOrderDO;
 import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO;
+import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoExtDO;
 import com.zteits.urbanops.module.workorder.dal.mysql.attachment.AttachmentMapper;
+import com.zteits.urbanops.module.workorder.dal.mysql.maininfo.MainInfoExtMapper;
 import com.zteits.urbanops.module.workorder.dal.mysql.maininfo.MainInfoMapper;
 import jakarta.annotation.Resource;
 import org.flowable.engine.RuntimeService;
@@ -51,6 +54,8 @@ import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertSet;
@@ -70,6 +75,9 @@ public class BpmGardenServiceImpl implements BpmGardenService{
     private AttachmentMapper attachmentMapper;
     @Resource
     private MainInfoMapper workOrderMapper;
+
+    @Resource
+    private MainInfoExtMapper workOrderExtMapper;
     @Resource
     private BpmProcessInstanceApi processInstanceApi;
     @Resource
@@ -201,6 +209,71 @@ public class BpmGardenServiceImpl implements BpmGardenService{
     }
     @Override
+    public PageResult<AppGardenWorkOrderRespVO> getTaskDoneBuzSimplePage(AppGardenWorkOrderPageReqVO pageVO) {
+        MainInfoHasTaskPageReqVO taskBuzReqVO = new MainInfoHasTaskPageReqVO();
+        String type = pageVO.getType();
+        String content = pageVO.getSearchContent();
+        if(ObjectUtils.isNotAllEmpty(type)){
+            if("1".equals(type)){
+                if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setRoadName(content);}
+            } else
+            if("2".equals(type)){
+                if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setOrderName(content);}
+            }else
+            if("3".equals(type)){
+                if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setRemark(content);}
+            } else
+            if("4".equals(type)){
+                if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setOrderNo(content);}
+            }else {
+                if (ObjectUtils.isNotAllEmpty(content)) {
+                    taskBuzReqVO.setOrderName(content);
+                }
+            }
+        }else {//默认是工单名称
+            if (ObjectUtils.isNotAllEmpty(content)) {
+                taskBuzReqVO.setOrderName(content);
+            }
+        }
+        taskBuzReqVO.setUserId(SecurityFrameworkUtils.getLoginUserId());
+        PageResult<MainInfoExtDO> pageResult = workOrderExtMapper.selectWorkOrderDonePage(pageVO,taskBuzReqVO);
+        return AppGardenTaskConvert.INSTANCE.buildBuziTaskPage(pageResult,attachmentMapper);
+    }
+
+    @Override
+    public PageResult<AppGardenWorkOrderRespVO> getTaskTodoBuzSimplePage(AppGardenWorkOrderPageReqVO pageVO) {
+        MainInfoHasTaskPageReqVO taskBuzReqVO = new MainInfoHasTaskPageReqVO();
+        String type = pageVO.getType();
+        String content = pageVO.getSearchContent();
+        if(ObjectUtils.isNotAllEmpty(type)){
+            if("1".equals(type)){
+                if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setRoadName(content);}
+            } else
+            if("2".equals(type)){
+                if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setOrderName(content);}
+            }else
+            if("3".equals(type)){
+                if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setRemark(content);}
+            } else
+            if("4".equals(type)){
+                if(ObjectUtils.isNotAllEmpty(content)){taskBuzReqVO.setOrderNo(content);}
+            }else {
+                if (ObjectUtils.isNotAllEmpty(content)) {
+                    taskBuzReqVO.setOrderName(content);
+                }
+            }
+        }else {//默认是工单名称
+            if (ObjectUtils.isNotAllEmpty(content)) {
+                taskBuzReqVO.setOrderName(content);
+            }
+        }
+        taskBuzReqVO.setUserId(SecurityFrameworkUtils.getLoginUserId());
+        PageResult<MainInfoExtDO> pageResult = workOrderExtMapper.selectWorkOrderTodoPage(pageVO,taskBuzReqVO);
+
+        return AppGardenTaskConvert.INSTANCE.buildBuziTaskPage(pageResult,attachmentMapper);
+    }
+
+    @Override
     public PageResult<AppGardenTaskRespVO> getTaskDonePage(AppGardenTaskPageReqVO pageVO) {
         BpmTaskPageReqVO targetVO = BeanUtils.toBean(pageVO,BpmTaskPageReqVO.class);
         PageResult<HistoricTaskInstance> pageResult = taskService.getTaskDonePage(SecurityFrameworkUtils.getLoginUserId(), targetVO);