外出用车信息修改

pom.xml

@@ -969,6 +969,13 @@
             <artifactId>bce-java-sdk</artifactId>
             <version>0.10.87</version>
         </dependency>
+
+
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.8.1</version>
+        </dependency>
     </dependencies>
 
 </project>

src/main/java/com/jeeplus/modules/filePreview/OSSRequestSigner.java

@@ -5,8 +5,6 @@ import com.aliyun.oss.common.auth.Credentials;
 import com.aliyun.oss.common.auth.RequestSigner;
 import com.aliyun.oss.common.auth.ServiceSignature;
 import com.aliyun.oss.common.comm.RequestMessage;
-import com.aliyun.oss.internal.OSSHeaders;
-import com.aliyun.oss.internal.OSSUtils;
 import com.aliyun.oss.internal.SignUtils;
 
 public class OSSRequestSigner  implements RequestSigner{
@@ -30,7 +28,7 @@ public class OSSRequestSigner  implements RequestSigner{
         if (accessKeyId.length() > 0 && secretAccessKey.length() > 0) {
             String canonicalString = SignUtils.buildCanonicalString(httpMethod, resourcePath, request, null);
             String signature = ServiceSignature.create().computeSignature(secretAccessKey, canonicalString);
-            request.addHeader(OSSHeaders.AUTHORIZATION, OSSUtils.composeRequestAuthorization(accessKeyId, signature));
+            //request.addHeader(OSSHeaders.AUTHORIZATION, OSSUtils.composeRequestAuthorization(accessKeyId, signature));
         }
     }
 }

src/main/java/com/jeeplus/modules/workgooutapply/entity/WorkGoOutInfo.java

@@ -30,7 +30,24 @@ public class WorkGoOutInfo extends ActEntity<WorkGoOutInfo> {
     private String home;
     private ProjectRecords project;
     private String ext;
+    private String car;
+    private String carNum;
 
+    public String getCar() {
+        return car;
+    }
+
+    public void setCar(String car) {
+        this.car = car;
+    }
+
+    public String getCarNum() {
+        return carNum;
+    }
+
+    public void setCarNum(String carNum) {
+        this.carNum = carNum;
+    }
 
     public String getExt() {
         return ext;

src/main/java/com/jeeplus/modules/workgooutapply/web/WorkGoOutController.java

@@ -12,7 +12,9 @@ import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.projectrecord.enums.ProjectStatusEnum;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workgooutapply.entity.WorkGoOutInfo;
 import com.jeeplus.modules.workgooutapply.service.WorkGoOutService;
@@ -87,6 +89,13 @@ public class WorkGoOutController  extends BaseController {
     @RequiresPermissions(value={"workgoout:workGoOut:view"},logical= Logical.OR)
     @RequestMapping(value = "view")
     public String view(WorkGoOutInfo workGoOutInfo, Model model) {
+        List<MainDictDetail> cardTypes = DictUtils.getMainDictList("card_type");
+        for (MainDictDetail mainDictDetail: cardTypes) {
+            if (mainDictDetail.getValue().equals(workGoOutInfo.getCar())) {
+                workGoOutInfo.setCar(mainDictDetail.getLabel());
+                break;
+            }
+        }
         model.addAttribute("workGoOut", workGoOutInfo);
         return "modules/workgoout/workGoOutView";
     }

src/main/java/com/jeeplus/modules/workleave/web/WorkLeaveController.java

@@ -12,9 +12,11 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
+import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
 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.sysmtree.service.SysMtreeService;
 import com.jeeplus.modules.workactivity.service.ActivityService;
@@ -135,6 +137,13 @@ public class WorkLeaveController extends BaseController {
 			workStaffBasicInfo = workStaffBasicInfoService.getByUserOffice(workStaffBasicInfo);
 			workLeave.setWorkStaffBasicInfo(workStaffBasicInfo);
 		}
+		List<MainDictDetail> cardTypes = DictUtils.getMainDictList("card_type");
+		for (MainDictDetail mainDictDetail: cardTypes) {
+			if (mainDictDetail.getValue().equals(workLeave.getCar())) {
+				workLeave.setCar(mainDictDetail.getLabel());
+				break;
+			}
+		}
 		model.addAttribute("workLeave", workLeave);
 		return "modules/workleave/"+view;
 	}

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

@@ -1155,6 +1155,13 @@ public class WorkProjectNotifyController extends BaseController {
 					Act act = getByAct(workGoOut.getProcessInstanceId());
 					workGoOut.setAct(act);
 					workGoOut.setHome("home");
+					List<MainDictDetail> cardTypes = DictUtils.getMainDictList("card_type");
+					for (MainDictDetail mainDictDetail: cardTypes) {
+						if (mainDictDetail.getValue().equals(workGoOut.getCar())) {
+							workGoOut.setCar(mainDictDetail.getLabel());
+							break;
+						}
+					}
 					model.addAttribute("workGoOut", workGoOut);
 					if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/workgoout/workGoOutAudit";

src/main/resources/mappings/modules/workgooutapply/WorkGoOutDao.xml

@@ -19,6 +19,8 @@
 		a.submit_date AS "submitDate",
 		a.state AS "state",
 		a.process_instance_id AS "processInstanceId",
+		a.car as "car",
+		a.car_num as "carNum",
 		u1.name AS "submiter.name",
 		o.name AS "office.name",
 		p.project_name AS "project.projectName",
@@ -102,7 +104,7 @@
         state,
         project_id,
         ext,
-        process_instance_id
+        process_instance_id,car,car_num
         ) VALUES (
         #{id},
         #{createBy.id},
@@ -120,7 +122,9 @@
         #{state},
         #{project.id},
         #{ext},
-        #{processInstanceId}
+        #{processInstanceId},
+        #{car},
+        #{carNum}
         )
     </insert>
 

src/main/webapp/webpage/modules/workgoout/workGoOutAudit.jsp

@@ -112,6 +112,18 @@
                                    value="<fmt:formatDate value="${workGoOut.submitDate}" pattern="yyyy-MM-dd"/>"/>
                         </div>
                     </div>
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">用车情况：</label>
+                        <div class="layui-input-block">
+                            <form:input  path="car" htmlEscape="false" readonly="true"  class="form-control  layui-input"/>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">车牌号：</label>
+                        <div class="layui-input-block">
+                            <form:input  path="carNum" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+                        </div>
+                    </div>
                     <div class="layui-item layui-col-sm12 with-textarea">
                         <label class="layui-form-label">说    明：</label>
                         <div class="layui-input-block">

src/main/webapp/webpage/modules/workgoout/workGoOutForm.jsp

@@ -151,6 +151,21 @@
                                    value="<fmt:formatDate value="${workGoOut.submitDate}" pattern="yyyy-MM-dd"/>"/>
                         </div>
                     </div>
+                    <div class="layui-item layui-col-sm6 ">
+                        <label class="layui-form-label">用车情况：</label>
+                        <div class="layui-input-block">
+                            <form:select path="car" class="form-control simple-select" id="car">
+                                <form:option value="" label="--请选择用车类型--"/>
+                                <form:options items="${fns:getMainDictList('card_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                            </form:select>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">车牌号：</label>
+                        <div class="layui-input-block">
+                            <form:input  path="carNum" htmlEscape="false"  class="form-control  layui-input"/>
+                        </div>
+                    </div>
                     <div class="layui-item layui-col-sm12 with-textarea">
                         <label class="layui-form-label">说    明：</label>
                         <div class="layui-input-block">

src/main/webapp/webpage/modules/workgoout/workGoOutModifyApply.jsp

@@ -159,6 +159,22 @@
                                    value="<fmt:formatDate value="${workGoOut.submitDate}" pattern="yyyy-MM-dd"/>"/>
                         </div>
                     </div>
+
+                    <div class="layui-item layui-col-sm6 ">
+                        <label class="layui-form-label">用车情况：</label>
+                        <div class="layui-input-block">
+                            <form:select path="car" cssClass="form-control simple-select">
+                                <form:option value="" label=""/>
+                                <form:options items="${fns:getMainDictList('card_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                            </form:select>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">车牌号：</label>
+                        <div class="layui-input-block">
+                            <form:input  path="carNum" htmlEscape="false"  class="form-control  layui-input"/>
+                        </div>
+                    </div>
                     <div class="layui-item layui-col-sm12 with-textarea">
                         <label class="layui-form-label">说    明：</label>
                         <div class="layui-input-block">

src/main/webapp/webpage/modules/workgoout/workGoOutView.jsp

@@ -62,6 +62,18 @@
                                    value="<fmt:formatDate value="${workGoOut.submitDate}" pattern="yyyy-MM-dd"/>"/>
                         </div>
                     </div>
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">用车情况：</label>
+                        <div class="layui-input-block">
+                            <form:input  path="car" htmlEscape="false" readonly="true"  class="form-control layui-input"/>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6">
+                        <label class="layui-form-label">车牌号：</label>
+                        <div class="layui-input-block">
+                            <form:input  path="carNum" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+                        </div>
+                    </div>
                     <div class="layui-item layui-col-sm12 with-textarea">
                         <label class="layui-form-label">说    明：</label>
                         <div class="layui-input-block">