From 8a91faa45274ad253794cdfe59f56aa6674acb62 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Mon, 23 Sep 2024 13:55:25 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E4=BA=A7=E5=93=81=E5=9E=8B=E5=8F=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=8D=E8=83=BD=E6=A0=B9=E6=8D=AE=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=AE=9E=E7=8E=B0=E6=9F=A5=E8=AF=A2=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=E4=BA=A7=E5=93=81=E5=9E=8B=E5=8F=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88=E6=9F=A5=E8=AF=A2=EF=BC=9B=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=A0=B9=E6=8D=AE=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=99=8D=E5=BA=8F=E6=8E=92=E5=BA=8F=20=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E5=9E=8B=E5=8F=B7=E7=AE=A1=E7=90=86=E5=89=8D=E7=AB=AF=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BA=BA=E7=9A=84=E5=A7=93=E5=90=8D=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=BA=E5=B7=A5=E7=A8=8B=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/system/SysProductModelMapper.xml   | 19 ++++++++++---------
 .../resources/templates/system/model/add.html | 12 ++++++++++++
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysProductModelMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysProductModelMapper.xml
index 6fbf487c..0f902ab1 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysProductModelMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysProductModelMapper.xml
@@ -43,16 +43,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         )file
         on s.pid = file.rel_id
         <where>
-            <if test="pcode != null  and pcode != ''"> and pcode like  concat('%', #{pcode}, '%')</if>
-            <if test="equipModel != null  and equipModel != ''"> and equipModel like  concat('%', #{equipModel}, '%')</if>
-            <if test="equipName != null  and equipName != ''"> and equipName like concat('%', #{equipName}, '%')</if>
-            <if test="specification != null  and specification != ''"> and specification like concat('%', #{specification}, '%')  </if>
-            <if test="differences != null  and differences != ''"> and differences like concat('%', #{differences}, '%')</if>
+            <if test="pcode != null  and pcode != ''"> and s.pcode like  concat('%', #{pcode}, '%')</if>
+            <if test="equipModel != null  and equipModel != ''"> and s.equipModel like  concat('%', #{equipModel}, '%')</if>
+            <if test="equipName != null  and equipName != ''"> and s.equipName like concat('%', #{equipName}, '%')</if>
+            <if test="specification != null  and specification != ''"> and s.specification like concat('%', #{specification}, '%')  </if>
+            <if test="differences != null  and differences != ''"> and s.differences like concat('%', #{differences}, '%')</if>
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''">
-                and create_time between #{params.beginCreateTime} and #{params.endCreateTime}
+                and s.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
              </if>
-            <if test="engineer !=null and engineer != ''">engineer = #{engineer}</if>
+            <if test="engineer !=null and engineer != ''">and s.engineer = #{engineer}</if>
         </where>
+        order by s.create_time desc
     </select>
     
     <select id="selectSysProductModelById" parameterType="Long" resultMap="SysProductModelResult">
@@ -69,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="pcode != null">pcode,</if>
             <if test="createBy != null">create_by,</if>
+            <if test="engineer != null">engineer,</if>
             <if test="equipModel != null">equipModel,</if>
             <if test="equipName != null">equipName,</if>
             <if test="specification != null">specification,</if>
@@ -78,11 +80,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="photoUrl != null">photoUrl,</if>
-            use_status
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="pcode != null">#{pcode},</if>
             <if test="createBy != null">#{createBy},</if>
+            <if test="engineer != null">#{engineer},</if>
             <if test="equipModel != null">#{equipModel},</if>
             <if test="equipName != null">#{equipName},</if>
             <if test="specification != null">#{specification},</if>
@@ -92,7 +94,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="photoUrl != null">#{photoUrl},</if>
-            '1'
          </trim>
     </insert>
 
diff --git a/ruoyi-admin/src/main/resources/templates/system/model/add.html b/ruoyi-admin/src/main/resources/templates/system/model/add.html
index dc884ffd..dd0c202a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/model/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/model/add.html
@@ -32,6 +32,12 @@
                 <input name="differences" class="form-control" type="text" required>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-4 control-label is-required">工程员：</label>
+            <div class="col-sm-7">
+                <input name="engineer"   id="engineer_add" class="form-control m-b" readonly required />
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-4 control-label">备注：</label>
             <div class="col-sm-7">
@@ -64,6 +70,9 @@
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
 <script th:inline="javascript">
 
+    var loginName = [[${@permission.getPrincipalProperty('loginName')}]];
+    var userName = [[${@permission.getPrincipalProperty('userName')}]];
+
     new Vue({
         el: '#app',
         data: function() {
@@ -139,6 +148,9 @@
         }
     }
 
+    //添加工程员
+    $("#engineer_add").val(loginName);
+
 </script>
 </body>
 </html>
\ No newline at end of file