From 9a61fc1ec069fb7d3b6506fc0dc4ccacccf6ab0d Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Fri, 7 Jun 2024 13:04:57 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E4=BF=AE=E6=94=B9=E5=87=BA=E5=B7=AE?=
 =?UTF-8?q?=E5=8D=95=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=BE=85=E5=8A=9Eid?=
 =?UTF-8?q?=E4=BA=8B=E9=A1=B9=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/domain/BaseEvectionForm.java  |  1 +
 .../mapper/system/BaseEvectionFormMapper.xml   |  4 ++--
 .../templates/system/baseEvectionForm/add.html | 18 ++++++++++++++++--
 .../system/baseEvectionForm/edit.html          | 13 +++++++++++++
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEvectionForm.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEvectionForm.java
index c2aa25e3..923fe339 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEvectionForm.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEvectionForm.java
@@ -138,6 +138,7 @@ public class BaseEvectionForm extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date applyTime;
 
+
     public String getInstanceId() {
         return instanceId;
     }
diff --git a/ruoyi-admin/src/main/resources/mapper/system/BaseEvectionFormMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/BaseEvectionFormMapper.xml
index b114083c..9fa62a42 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/BaseEvectionFormMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/BaseEvectionFormMapper.xml
@@ -50,14 +50,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                evection_causes,evection_begin_time,evection_end_time,dispatchlist_code,make_code,
                travel_mode,hotel,transportation_cost_budget,accommodation_budget,other_expenses_budget,
                reality_evenction_begin_time,reality_evenction_end_time,create_by,create_time,update_by,
-               update_time,remark,instance_id,instance_type,instance_type_name,submit_instance_id,cancel_instance_id,
+               update_time,remark,instance_id,instance_type,submit_instance_id,cancel_instance_id,
                restore_instance_id,apply_title,apply_user,apply_time
         from base_evection_form
     </sql>
 
     <select id="selectBaseEvectionFormList" parameterType="BaseEvectionForm" resultMap="BaseEvectionFormResult">
         <include refid="selectBaseEvectionFormVo"   />
-        <where>  
+        <where>
             <if test="auditStatus != null  and auditStatus != ''"> and audit_status = #{auditStatus}</if>
             <if test="useStatus != null  and useStatus != ''"> and use_status = #{useStatus}</if>
             <if test="evectionCode != null  and evectionCode != ''"> and evection_code = #{evectionCode}</if>
diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/add.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/add.html
index 67130611..98c88de5 100644
--- a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/add.html
@@ -140,8 +140,9 @@
     <th:block th:include="include :: datetimepicker-js" />
     <script th:inline="javascript">
         var prefix = ctx + "system/baseEvectionForm"
-        $("#form-baseEvectionForm-add").validate({
-            focusCleanup: true
+        $("#form-baseEvectionForm-add").validate({focusCleanup: true});
+        $(function() {
+            getSelections();
         });
 
         function submitHandler() {
@@ -166,6 +167,19 @@
             minView: "month",
             autoclose: true
         });
+        function getSelections(){
+            $.ajax({
+                url: ctx + "system/requisitioning/getEmpUserName",
+                type: "get",
+                dataType: "json",
+                success: function (data) {
+                    $("select[name='deptName']").append($('<option></option>').val(data.deptName).html(data.deptName));
+                    $("select[name='evectionBy']").append($('<option></option>').val(data.userName).html(data.userName));
+                    $("select[name='postName']").append($('<option></option>').val(data.postName).html(data.postName));
+                }
+            });
+
+        }
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/edit.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/edit.html
index 3fc484ea..62243b66 100644
--- a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/edit.html
@@ -110,6 +110,19 @@
             minView: "month",
             autoclose: true
         });
+        function getSelections(){
+            $.ajax({
+                url: ctx + "system/requisitioning/getEmpUserName",
+                type: "get",
+                dataType: "json",
+                success: function (data) {
+                    $("select[name='deptName']").append($('<option></option>').val(data.deptName).html(data.deptName));
+                    $("select[name='evectionBy']").append($('<option></option>').val(data.userName).html(data.userName));
+                    $("select[name='postName']").append($('<option></option>').val(data.postName).html(data.postName));
+                }
+            });
+
+        }
     </script>
 </body>
 </html>
\ No newline at end of file