From 7eec6ad41adf25cde7733af06a16188096f67e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Sun, 25 Feb 2024 18:06:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/base/BaseAssetsTypeMapper.xml      |  4 +--
 .../mapper/project/ProProjectApplyMapper.xml  |  4 +--
 .../mapper/project/ProProjectInfoMapper.xml   |  4 +--
 yanzhu-ui/src/views/base/assetsType/index.vue | 28 +++++++++++++++++--
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/yanzhu-mapper/src/main/resources/mapper/base/BaseAssetsTypeMapper.xml b/yanzhu-mapper/src/main/resources/mapper/base/BaseAssetsTypeMapper.xml
index e35b4c1..e44cf6c 100644
--- a/yanzhu-mapper/src/main/resources/mapper/base/BaseAssetsTypeMapper.xml
+++ b/yanzhu-mapper/src/main/resources/mapper/base/BaseAssetsTypeMapper.xml
@@ -40,10 +40,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertBaseAssetsType" parameterType="BaseAssetsType">
+    <insert id="insertBaseAssetsType" parameterType="BaseAssetsType" useGeneratedKeys="true" keyProperty="id">
         insert into base_assets_type
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
             <if test="parentId != null">parent_id,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="type != null">type,</if>
@@ -57,7 +56,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
             <if test="parentId != null">#{parentId},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="type != null">#{type},</if>
diff --git a/yanzhu-mapper/src/main/resources/mapper/project/ProProjectApplyMapper.xml b/yanzhu-mapper/src/main/resources/mapper/project/ProProjectApplyMapper.xml
index 1042fe9..1218619 100644
--- a/yanzhu-mapper/src/main/resources/mapper/project/ProProjectApplyMapper.xml
+++ b/yanzhu-mapper/src/main/resources/mapper/project/ProProjectApplyMapper.xml
@@ -78,10 +78,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id = #{id}
     </select>
         
-    <insert id="insertProProjectApply" parameterType="ProProjectApply">
+    <insert id="insertProProjectApply" parameterType="ProProjectApply" useGeneratedKeys="true" keyProperty="id">
         insert into pro_project_apply
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="projId != null">proj_id,</if>
             <if test="projName != null">proj_name,</if>
@@ -100,7 +99,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="projId != null">#{projId},</if>
             <if test="projName != null">#{projName},</if>
diff --git a/yanzhu-mapper/src/main/resources/mapper/project/ProProjectInfoMapper.xml b/yanzhu-mapper/src/main/resources/mapper/project/ProProjectInfoMapper.xml
index 5a0bf55..862224e 100644
--- a/yanzhu-mapper/src/main/resources/mapper/project/ProProjectInfoMapper.xml
+++ b/yanzhu-mapper/src/main/resources/mapper/project/ProProjectInfoMapper.xml
@@ -47,10 +47,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertProProjectInfo" parameterType="ProProjectInfo">
+    <insert id="insertProProjectInfo" parameterType="ProProjectInfo" useGeneratedKeys="true" keyProperty="id">
         insert into pro_project_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
             <if test="name != null">name,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="address != null">address,</if>
@@ -69,7 +68,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unit != null">unit,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
             <if test="name != null">#{name},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="address != null">#{address},</if>
diff --git a/yanzhu-ui/src/views/base/assetsType/index.vue b/yanzhu-ui/src/views/base/assetsType/index.vue
index 1d0474a..93a63d2 100644
--- a/yanzhu-ui/src/views/base/assetsType/index.vue
+++ b/yanzhu-ui/src/views/base/assetsType/index.vue
@@ -17,6 +17,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="资产类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择资产类型" clearable>
+          <el-option
+            v-for="dict in dict.type.pro_assets_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="资产名称" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -100,7 +110,11 @@
       <el-table-column label="主键" align="center" prop="id" />
       <el-table-column label="父级分类" align="center" prop="parentId" />
       <el-table-column label="单位主键" align="center" prop="deptId" />
-      <el-table-column label="资产类型" align="center" prop="type" />
+      <el-table-column label="资产类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.pro_assets_type" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
       <el-table-column label="资产名称" align="center" prop="name" />
       <el-table-column label="资产单位" align="center" prop="unit" />
       <el-table-column label="是否删除" align="center" prop="isDel">
@@ -146,6 +160,16 @@
         <el-form-item label="单位主键" prop="deptId">
           <el-input v-model="form.deptId" placeholder="请输入单位主键" />
         </el-form-item>
+        <el-form-item label="资产类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择资产类型">
+            <el-option
+              v-for="dict in dict.type.pro_assets_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="资产名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入资产名称" />
         </el-form-item>
@@ -179,7 +203,7 @@ import { listAssetsType, getAssetsType, delAssetsType, addAssetsType, updateAsse
 
 export default {
   name: "AssetsType",
-  dicts: ['sys_is_del'],
+  dicts: ['pro_assets_type', 'sys_is_del'],
   data() {
     return {
       // 遮罩层