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

@@ -4,6 +4,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.sso.util.LoginUserInfoUtil;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -19,6 +21,8 @@ import com.ai.bss.security.protection.service.interfaces.WorkOrderManagementServ
import com.ai.bss.security.protection.utils.EbcConstant;
import com.ai.bss.work.task.model.common.WorkEvent;
import javax.servlet.http.HttpServletRequest;
/**
 * 工单管理
 */
@@ -99,17 +103,18 @@ public class WorkOrderManagementController {
	 */
	@ResponseBody
	@RequestMapping("/addWorkOrder")
	public CommonResponse<Void> addWorkOrder(@RequestBody Map<String, String> params) throws Throwable {
	public CommonResponse<Void> addWorkOrder(@RequestBody Map<String, String> params, HttpServletRequest request) throws Throwable {
		if (params == null || StringUtils.isEmpty(params.get("approvalType"))|| StringUtils.isEmpty(params.get("beginTime"))) {
			return CommonResponse.fail("500", "未指定工单类型，申请失败");
		}
		WorkEvent workEvent=new WorkEvent();
		//TODO 申请人ID和部门
		workEvent.setWorkEmployeeRoleId(EbcConstant.USPA_USER_STAFF_ID);
		workEvent.setWorkOrgRoleId(EbcConstant.USPA_USER_ORG_ID);
		//workEvent.setWorkEmployeeRoleId("6");
		//workEvent.setWorkOrgRoleId("81");
		// 申请人ID和部门
		JSONObject userInfo = new LoginUserInfoUtil().getUserInfo(request);
		//workEvent.setWorkEmployeeRoleId(EbcConstant.USPA_USER_STAFF_ID);
		//workEvent.setWorkOrgRoleId(EbcConstant.USPA_USER_ORG_ID);
		workEvent.setWorkEmployeeRoleId(userInfo.get("STAFF_ID").toString());
		workEvent.setWorkOrgRoleId(userInfo.get("USER_ORG_ID").toString());
		workEvent.setEventSpecId("APPROVAL_REQUEST");
		
		return workOrderManagementService.addWorkOrder(workEvent,params);

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

@@ -170,8 +170,8 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
	public CommonResponse<Void> addWorkOrder(WorkEvent workEvent, Map<String, String> params) throws Throwable {
		// 获取审批人ID
		Map<String, String> checkEmployeeRequestMap = new HashMap<String, String>();
		// checkEmployeeRequestMap.put("orgId", workEvent.getWorkOrgRoleId());
		checkEmployeeRequestMap.put("orgId", EbcConstant.USPA_USER_ORG_ID);
		checkEmployeeRequestMap.put("orgId", workEvent.getWorkOrgRoleId());
		//checkEmployeeRequestMap.put("orgId", EbcConstant.USPA_USER_ORG_ID);
		checkEmployeeRequestMap.put("roleCode", EbcConstant.WORK_ORDER_CHECK_ROLE_CODE);
		CommonRequest<Map<String, String>> checkEmployeeRequest = CommonRequest.<Map<String, String>>builder()
				.data(checkEmployeeRequestMap).build();