Przeglądaj źródła

假勤管理引进uspa

wangchao 4 lat temu
rodzic
commit
1e444ee9c4

+ 11 - 6
security-protection-service/src/main/java/com/ai/bss/security/protection/controller/WorkOrderManagementController.java

4
import java.util.List;
4
import java.util.List;
5
import java.util.Map;
5
import java.util.Map;
6
6
7
import com.ai.sso.util.LoginUserInfoUtil;
8
import com.alibaba.fastjson.JSONObject;
7
import org.apache.commons.lang.StringUtils;
9
import org.apache.commons.lang.StringUtils;
8
import org.springframework.beans.factory.annotation.Autowired;
10
import org.springframework.beans.factory.annotation.Autowired;
9
import org.springframework.stereotype.Controller;
11
import org.springframework.stereotype.Controller;
19
import com.ai.bss.security.protection.utils.EbcConstant;
21
import com.ai.bss.security.protection.utils.EbcConstant;
20
import com.ai.bss.work.task.model.common.WorkEvent;
22
import com.ai.bss.work.task.model.common.WorkEvent;
21
23
24
import javax.servlet.http.HttpServletRequest;
25
22
/**
26
/**
23
 * 工单管理
27
 * 工单管理
24
 */
28
 */
99
	 */
103
	 */
100
	@ResponseBody
104
	@ResponseBody
101
	@RequestMapping("/addWorkOrder")
105
	@RequestMapping("/addWorkOrder")
102
	public CommonResponse<Void> addWorkOrder(@RequestBody Map<String, String> params) throws Throwable {
106
	public CommonResponse<Void> addWorkOrder(@RequestBody Map<String, String> params, HttpServletRequest request) throws Throwable {
103
		if (params == null || StringUtils.isEmpty(params.get("approvalType"))|| StringUtils.isEmpty(params.get("beginTime"))) {
107
		if (params == null || StringUtils.isEmpty(params.get("approvalType"))|| StringUtils.isEmpty(params.get("beginTime"))) {
104
			return CommonResponse.fail("500", "未指定工单类型,申请失败");
108
			return CommonResponse.fail("500", "未指定工单类型,申请失败");
105
		}
109
		}
106
110
107
		WorkEvent workEvent=new WorkEvent();
111
		WorkEvent workEvent=new WorkEvent();
108
		//TODO 申请人ID和部门
109
		workEvent.setWorkEmployeeRoleId(EbcConstant.USPA_USER_STAFF_ID);
110
		workEvent.setWorkOrgRoleId(EbcConstant.USPA_USER_ORG_ID);
111
		//workEvent.setWorkEmployeeRoleId("6");
112
		//workEvent.setWorkOrgRoleId("81");
112
		// 申请人ID和部门
113
		JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
114
		//workEvent.setWorkEmployeeRoleId(EbcConstant.USPA_USER_STAFF_ID);
115
		//workEvent.setWorkOrgRoleId(EbcConstant.USPA_USER_ORG_ID);
116
		workEvent.setWorkEmployeeRoleId(userInfo.get("STAFF_ID").toString());
117
		workEvent.setWorkOrgRoleId(userInfo.get("USER_ORG_ID").toString());
113
		workEvent.setEventSpecId("APPROVAL_REQUEST");
118
		workEvent.setEventSpecId("APPROVAL_REQUEST");
114
		
119
		
115
		return workOrderManagementService.addWorkOrder(workEvent,params);
120
		return workOrderManagementService.addWorkOrder(workEvent,params);

+ 2 - 2
security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/WorkOrderManagementServiceImpl.java

170
	public CommonResponse<Void> addWorkOrder(WorkEvent workEvent, Map<String, String> params) throws Throwable {
170
	public CommonResponse<Void> addWorkOrder(WorkEvent workEvent, Map<String, String> params) throws Throwable {
171
		// 获取审批人ID
171
		// 获取审批人ID
172
		Map<String, String> checkEmployeeRequestMap = new HashMap<String, String>();
172
		Map<String, String> checkEmployeeRequestMap = new HashMap<String, String>();
173
		// checkEmployeeRequestMap.put("orgId", workEvent.getWorkOrgRoleId());
174
		checkEmployeeRequestMap.put("orgId", EbcConstant.USPA_USER_ORG_ID);
173
		checkEmployeeRequestMap.put("orgId", workEvent.getWorkOrgRoleId());
174
		//checkEmployeeRequestMap.put("orgId", EbcConstant.USPA_USER_ORG_ID);
175
		checkEmployeeRequestMap.put("roleCode", EbcConstant.WORK_ORDER_CHECK_ROLE_CODE);
175
		checkEmployeeRequestMap.put("roleCode", EbcConstant.WORK_ORDER_CHECK_ROLE_CODE);
176
		CommonRequest<Map<String, String>> checkEmployeeRequest = CommonRequest.<Map<String, String>>builder()
176
		CommonRequest<Map<String, String>> checkEmployeeRequest = CommonRequest.<Map<String, String>>builder()
177
				.data(checkEmployeeRequestMap).build();
177
				.data(checkEmployeeRequestMap).build();