修改用车申请，审核时用车信息展示问题

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -7,18 +7,15 @@ import com.google.common.collect.Lists;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.DateUtils;
-import com.jeeplus.common.utils.IdGen;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
-import com.jeeplus.common.websocket.onchat.ChatServerPool;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.caseinfo.entity.CaseInfo;
 import com.jeeplus.modules.caseinfo.service.CaseInfoService;
-import com.jeeplus.modules.hr.entity.UserInfo;
 import com.jeeplus.modules.iim.entity.MailBox;
 import com.jeeplus.modules.iim.entity.MailPage;
 import com.jeeplus.modules.iim.service.MailBoxService;
@@ -39,7 +36,6 @@ import com.jeeplus.modules.oabuy.service.OaBuyService;
 import com.jeeplus.modules.oaperformance.entity.OaPerformance;
 import com.jeeplus.modules.oaperformance.service.OaPerformanceService;
 import com.jeeplus.modules.officeintroduce.dao.OfficeintroduceDao;
-import com.jeeplus.modules.officeintroduce.entity.Officeintroduce;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportData;
 import com.jeeplus.modules.projectcontentinfo.entity.ProjectReportRecord;
 import com.jeeplus.modules.projectcontentinfo.entity.Projectcontentinfo;
@@ -55,6 +51,7 @@ import com.jeeplus.modules.serialnum.service.SerialNumTplService;
 import com.jeeplus.modules.sys.entity.*;
 import com.jeeplus.modules.sys.service.CompanyService;
 import com.jeeplus.modules.sys.service.OfficeService;
+import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.sysuseroffice.entity.Useroffice;
 import com.jeeplus.modules.sysuseroffice.service.UserofficeService;
@@ -106,7 +103,6 @@ import com.jeeplus.modules.workfulldesignchange.entity.WorkFullDesignchange;
 import com.jeeplus.modules.workfulldesignchange.service.WorkFullDesignchangeService;
 import com.jeeplus.modules.workfullexecute.entity.WorkFullExecute;
 import com.jeeplus.modules.workfullexecute.service.WorkFullExecuteService;
-import com.jeeplus.modules.workfullmanage.entity.WorkFullManage;
 import com.jeeplus.modules.workfullmanage.entity.WorkFullPay;
 import com.jeeplus.modules.workfullmanage.entity.WorkFullRecord;
 import com.jeeplus.modules.workfullmanage.service.WorkFullManageService;
@@ -156,7 +152,6 @@ import com.jeeplus.modules.workpayment.entity.WorkPayment;
 import com.jeeplus.modules.workpayment.service.WorkPaymentService;
 import com.jeeplus.modules.workpettycash.entity.WorkPettyCash;
 import com.jeeplus.modules.workpettycash.service.WorkPettyCashService;
-import com.jeeplus.modules.workproject.entity.WorkProject;
 import com.jeeplus.modules.workproject.service.WorkProjectService;
 import com.jeeplus.modules.workprojectcompletion.entity.WorkProjectCompletionInfo;
 import com.jeeplus.modules.workprojectcompletion.service.WorkProjectCompletionService;
@@ -182,9 +177,7 @@ import com.jeeplus.modules.workrepay.entity.WorkRepay;
 import com.jeeplus.modules.workrepay.service.WorkRepayService;
 import com.jeeplus.modules.workresignation.entity.WorkResignation;
 import com.jeeplus.modules.workresignation.service.WorkResignationService;
-import com.jeeplus.modules.workresignationtemplate.entity.WorkResignationTemplate;
 import com.jeeplus.modules.workreview.entity.WorkReviewAudit;
-import com.jeeplus.modules.workreview.entity.WorkReviewStandard;
 import com.jeeplus.modules.workreview.service.WorkReviewStandardService;
 import com.jeeplus.modules.workscrap.entity.WorkScrap;
 import com.jeeplus.modules.workscrap.service.WorkScrapService;
@@ -206,7 +199,6 @@ import org.activiti.engine.HistoryService;
 import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
-import org.java_websocket.WebSocket;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -217,7 +209,10 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.ConstraintViolationException;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 通知Controller
@@ -1447,6 +1442,13 @@ public class WorkProjectNotifyController extends BaseController {
 
 				} else if ("102".equals(workProjectNotify.getType())) {  //出差
 					WorkLeave workLeave = workLeaveService.get(workProjectNotify.getNotifyId());
+					List<MainDictDetail> cardTypes = DictUtils.getMainDictList("card_type");
+					for (MainDictDetail mainDictDetail: cardTypes) {
+						if (mainDictDetail.getValue().equals(workLeave.getCar())) {
+                            workLeave.setCar(mainDictDetail.getLabel());
+                            break;
+                        }
+					}
 					workLeave.setHome("home");
 					workLeave.setAct(getByAct(workLeave.getProcessInstanceId()));
 					model.addAttribute("workLeave", workLeave);