工单申请修改用户和部门

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

@@ -110,8 +110,10 @@ public class WorkOrderManagementController {
		WorkEvent workEvent=new WorkEvent();
		//TODO 申请人ID和部门
		workEvent.setWorkEmployeeRoleId(EbcConstant.USPA_USER_STAFF_ID);
		workEvent.setWorkOrgRoleId(EbcConstant.USPA_USER_ORG_ID);
		//workEvent.setWorkEmployeeRoleId(EbcConstant.USPA_USER_STAFF_ID);
		//workEvent.setWorkOrgRoleId(EbcConstant.USPA_USER_ORG_ID);
		workEvent.setWorkEmployeeRoleId("6");
		workEvent.setWorkOrgRoleId("81");
		workEvent.setEventSpecId("APPROVAL_REQUEST");
		
		return workOrderManagementService.addWorkOrder(workEvent,params);

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

@@ -69,7 +69,8 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
		Map<String, String> allTypeMap = charSpecService.getCharSpecMap(EbcConstant.BUSINESS_SPEC_WORK_ORDER_TYPE);
		for (Map<String, Object> map : list) {
			map.put("approvalTypeName", allTypeMap.get(map.get("appovalSubType")==null?"":map.get("appovalSubType").toString()));
			map.put("approvalTypeName",
					allTypeMap.get(map.get("appovalSubType") == null ? "" : map.get("appovalSubType").toString()));
			JSONObject charValueJsonObj = JSONObject.parseObject(map.get("charValueSet").toString());
			map.put("reclockingTime", charValueJsonObj.getString("reclockingTime"));
@@ -158,7 +159,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", 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();
@@ -178,13 +180,13 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
			// 补卡
			params.put("approvalType", approvalType);
			params.put("approvalSubType", approvalType);
			params.put("reclockingTime", params.get("beginTime")); //补卡时间
			params.put("reclockingTime", params.get("beginTime")); // 补卡时间
		} else if (approvalType.startsWith(AttendanceTaskSpec.ASK_FOR_LEAVE_REQUEST_TYPE)) {
			// 请假
			params.put("approvalType", AttendanceTaskSpec.ASK_FOR_LEAVE_REQUEST_TYPE);
			params.put("approvalSubType", approvalType);
			params.put("leaveType", approvalType.substring(AttendanceTaskSpec.ASK_FOR_LEAVE_REQUEST_TYPE.length()+1));
			params.put("leaveType", approvalType.substring(AttendanceTaskSpec.ASK_FOR_LEAVE_REQUEST_TYPE.length() + 1));
		} else if (approvalType.startsWith(AttendanceTaskSpec.FIELD_WORK_REQUEST_TYPE)) {
			// 外勤
@@ -202,6 +204,8 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
		workEvent.setCharValueSet(JSON.toJSONString(params));
		log.debug("申请工单: "+JSON.toJSONString(workEvent));
		
		CommonRequest<WorkEvent> eventRequest = new CommonRequest<WorkEvent>(workEvent);
		CommonResponse response = eventHandleCommand.handleEvent(eventRequest);
		// ApprovalTask approvalTaskGoOffWork = (ApprovalTask) response.getData();
@@ -217,7 +221,8 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
	public CommonResponse<Void> checkWorkOrder(Map<String, String> params) throws Throwable {
		WorkOrder workOrder = new WorkOrder();
		workOrder.setWorkOrderId(params.get("orderId"));
		workOrder.setProcessResult(WorkOrder.SUCCESS_RESULT);
		workOrder.setProcessResult("1".equals(params.get("result")) ? WorkOrder.SUCCESS_RESULT : WorkOrder.FAIL_RESULT);
		workOrder.setStatus(WorkOrder.END_STATUS);
		Map<String, String> charValueMap = new HashMap<String, String>();
@@ -226,6 +231,8 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
		workOrder.setCharValueSet(JSON.toJSONString(charValueMap));
		log.debug("审核工单: "+JSON.toJSONString(workOrder));
		
		CommonRequest<WorkOrder> workOrderRequest = new CommonRequest<WorkOrder>(workOrder);
		CommonResponse<WorkTask> response = workOrderCommand.reportWorkOrderResult(workOrderRequest);
@@ -236,30 +243,25 @@ public class WorkOrderManagementServiceImpl implements WorkOrderManagementServic
		}
	}
    @Override
    public CommonResponse importAskLeaveOrder(MultipartFile file)  {
	@Override
	public CommonResponse importAskLeaveOrder(MultipartFile file) {
//        List<String> listTerminal = getFileData(file);
//        saveAskLeaveOrder(listTerminal, file.getOriginalFilename());
        return CommonResponse.OK_VOID;
    }
    private List<String> getFileData(MultipartFile file) throws IOException, ExcelException {
        List<String> dataList = new ArrayList<String>();
        BufferedReader br = null;
        List list = ExcelUtil.excelToList(file.getInputStream(),"1",null,null,null);
        return dataList;
    }
    private static int terminalInfoArrayLength = 6;
    private void saveAskLeaveOrder(List<String> dataList, String fileName)
    {
    }
	
	
	
	
		return CommonResponse.OK_VOID;
	}
	private List<String> getFileData(MultipartFile file) throws IOException, ExcelException {
		List<String> dataList = new ArrayList<String>();
		BufferedReader br = null;
		List list = ExcelUtil.excelToList(file.getInputStream(), "1", null, null, null);
		return dataList;
	}
	private static int terminalInfoArrayLength = 6;
	private void saveAskLeaveOrder(List<String> dataList, String fileName) {
	}
}