From e6b51b0637f4ba7b2284f6ce5da7cf57bbe2e10e Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 15 Mar 2024 10:12:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=B9=E9=A1=B9=E7=9B=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BB=B7=E6=A0=BC=E4=B8=8E=E8=AE=A1=E9=87=8F=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/basic/BasicSkProjectEntity.java    |  6 +++++
 .../api/res/basic/BasicSkProjectResponse.java |  6 +++++
 .../mapper/basic/BasicSkProjectMapper.xml     | 22 -------------------
 src/main/resources/schemas/schema_v2.4.sql    |  8 +++++++
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkProjectEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicSkProjectEntity.java
index 166c7fc40..ce08c7e1d 100644
--- a/src/main/java/com/glxp/api/entity/basic/BasicSkProjectEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/BasicSkProjectEntity.java
@@ -90,4 +90,10 @@ public class BasicSkProjectEntity {
     @TableField(value = "type")
     @ApiModelProperty(value = "类型：1：定数包，内部使用；2：项目、组套外部关联")
     private Integer type;
+
+
+    @TableField(value = "unit")
+    private String unit;
+    @TableField(value = "price")
+    private String price;
 }
diff --git a/src/main/java/com/glxp/api/res/basic/BasicSkProjectResponse.java b/src/main/java/com/glxp/api/res/basic/BasicSkProjectResponse.java
index 6532cd24e..2055c7b3a 100644
--- a/src/main/java/com/glxp/api/res/basic/BasicSkProjectResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/BasicSkProjectResponse.java
@@ -2,6 +2,7 @@ package com.glxp.api.res.basic;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -41,6 +42,8 @@ public class BasicSkProjectResponse {
      */
     private String remark;
 
+    private BigDecimal price;
+
     private Date createTime;
 
     private String createUser;
@@ -56,5 +59,8 @@ public class BasicSkProjectResponse {
     private Integer type;
 
 
+    private String unit;
+    private String price;
+
     private List<BasicSkProjectDetailResponse> basicSkProjectDetailResponses;
 }
diff --git a/src/main/resources/mybatis/mapper/basic/BasicSkProjectMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicSkProjectMapper.xml
index bb510ea5e..2ed66d0fc 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicSkProjectMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicSkProjectMapper.xml
@@ -1,28 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.basic.BasicSkProjectMapper">
-    <resultMap id="BaseResultMap" type="com.glxp.api.entity.basic.BasicSkProjectEntity">
-        <!--@mbg.generated-->
-        <!--@Table basic_sk_project-->
-        <id column="id" jdbcType="BIGINT" property="id"/>
-        <result column="idCode" jdbcType="VARCHAR" property="idCode"/>
-        <result column="code" jdbcType="VARCHAR" property="code"/>
-        <result column="name" jdbcType="VARCHAR" property="name"/>
-        <result column="category" jdbcType="VARCHAR" property="category"/>
-        <result column="ggxh" jdbcType="VARCHAR" property="ggxh"/>
-        <result column="remark" jdbcType="VARCHAR" property="remark"/>
-        <result column="createTime" jdbcType="TIMESTAMP" property="createTime"/>
-        <result column="createUser" jdbcType="VARCHAR" property="createUser"/>
-        <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime"/>
-        <result column="updateUser" jdbcType="VARCHAR" property="updateUser"/>
-        <result column="type" jdbcType="INTEGER" property="type"/>
-    </resultMap>
-    <sql id="Base_Column_List">
-        <!--@mbg.generated-->
-        id, idCode, code, `name`, category, ggxh, remark, createTime, `createUser`, updateTime,
-        updateUser
-    </sql>
-
     <select id="filterList" parameterType="com.glxp.api.req.basic.BasicSkProjectRequest"
             resultType="com.glxp.api.res.basic.BasicSkProjectResponse">
         SELECT *, cb.userName as createByName
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index f0dc43052..c7ddd52e0 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -856,3 +856,11 @@ SET `configId` = 23, `type` = '1', `isShow` = 1, `columnName` = 'auditRemark', `
     `buttonRule` = '[{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"审核过程\",\"clickFuc\":\"showApprovalFlowDetail\"}]',
     `number` = NULL, `lineNumber` = NULL, `clickFuc` = NULL, `size` = NULL, `style` = NULL, `disabled` = NULL, `checkRules` = NULL,
     `inputType` = NULL, `disabledFuc` = NULL, `expression` = NULL, `dataFuc` = NULL, `isShowXx` = NULL WHERE `id` = 258;
+
+
+
+CALL Pro_Temp_ColumnWork('basic_sk_project', 'unit',
+                         ' varchar(30)  NULL DEFAULT NULL COMMENT ''单位'' AFTER `type`', 1);
+
+CALL Pro_Temp_ColumnWork('basic_sk_project', 'price',
+                         ' varchar(30)  NULL DEFAULT NULL COMMENT ''价格'' AFTER `type`', 1);