From 138d5f087e386c657d964e4e4c2b8ac65038e085 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 01 二月 2021 14:47:06 +0800
Subject: [PATCH] 优化 考勤任务上报
---
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java b/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java
index 287d4fb..c1d79d1 100644
--- a/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java
@@ -1,13 +1,16 @@
package com.java110.common.bmo.workflow.impl;
+import com.java110.common.bmo.workflow.IQueryWorkFlowFirstStaffBMO;
import com.java110.common.dao.IWorkflowServiceDao;
import com.java110.common.dao.IWorkflowStepServiceDao;
import com.java110.common.dao.IWorkflowStepStaffServiceDao;
-import com.java110.common.bmo.workflow.IQueryWorkFlowFirstStaffBMO;
-import com.java110.dto.user.StaffDto;
+import com.java110.dto.org.OrgDto;
import com.java110.dto.workflow.WorkflowDto;
+import com.java110.intf.user.IOrgInnerServiceSMO;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import java.util.HashMap;
@@ -26,8 +29,11 @@
@Autowired
private IWorkflowStepStaffServiceDao workflowStepStaffServiceDaoImpl;
+ @Autowired
+ private IOrgInnerServiceSMO orgInnerServiceSMOImpl;
+
@Override
- public StaffDto query(WorkflowDto workflowDto) {
+ public ResponseEntity<String> query(WorkflowDto workflowDto) {
List<Map> workflows = workflowServiceDaoImpl.getWorkflowInfo(BeanConvertUtil.beanCovertMap(workflowDto));
@@ -42,28 +48,40 @@
param.put("flowId", tmpWorkflowDto.getFlowId());
param.put("seq", "1");
param.put("communityId", tmpWorkflowDto.getCommunityId());
+ param.put("storeId", tmpWorkflowDto.getStoreId());
//鏌ヨ姝ラ
List<Map> workflowSteps = workflowStepServiceDaoImpl.getWorkflowStepInfo(param);
if (workflowSteps == null || workflowSteps.size() < 1) {
- return null;
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "鏈煡璇㈠埌娴佺▼瀹氫箟");
}
param = new HashMap();
param.put("statusCd", "0");
param.put("communityId", tmpWorkflowDto.getCommunityId());
param.put("stepId", workflowSteps.get(0).get("stepId"));
-
+ param.put("storeId", tmpWorkflowDto.getStoreId());
List<Map> workflowStepStaffs = workflowStepStaffServiceDaoImpl.getWorkflowStepStaffInfo(param);
if (workflowStepStaffs == null || workflowStepStaffs.size() < 1) {
- return null;
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "鏈煡璇㈠埌娴佺▼瀹氫箟");
}
+ Map staffInfo = workflowStepStaffs.get(0);
+ OrgDto orgDto = new OrgDto();
+ orgDto.setStaffId(staffInfo.get("staffId") + "");
+ List<OrgDto> orgDtos = orgInnerServiceSMOImpl.queryOrgs(orgDto);
- return null;
+ if (orgDtos == null || orgDtos.size() < 1) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "鏈煡璇㈠埌鍛樺伐缁勭粐淇℃伅");
+ }
+
+ orgDto = orgDtos.get(0);
+ orgDto.setStaffName(staffInfo.get("staffName") + "");
+
+ return ResultVo.createResponseEntity(orgDto);
}
}
--
Gitblit v1.8.0