lzm 3 年之前
父節點
當前提交
2080ea776e

+ 7 - 1
sp-server/src/main/java/com/pj/project/tb_item_type/TbItemType.java

@@ -1,6 +1,7 @@
 package com.pj.project.tb_item_type;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -47,7 +48,12 @@ public class TbItemType extends Model<TbItemType> implements Serializable {
 	/**
 	 * 名称 
 	 */
-	private String name;	
+	private String name;
+
+    /**
+     * 税率
+     */
+    private BigDecimal taxRate = new BigDecimal(0);
 
 	/**
 	 * 是否必须(0=否,1=是) 

+ 5 - 3
sp-server/src/main/java/com/pj/project/tb_item_type/TbItemTypeMapper.xml

@@ -5,8 +5,8 @@
 	<!-- 增 [G] -->
 	<insert id="add">
 		insert into 
-		tb_item_type (id, name, need)
-		values (#{id}, #{name}, #{need})
+		tb_item_type (id, name, need, tax_rate)
+		values (#{id}, #{name}, #{need}, #{taxRate})
 	</insert>
 
 	<!-- 删 -->
@@ -20,7 +20,8 @@
 		update tb_item_type set
 		id = #{id}, 
 		name = #{name}, 
-		need = #{need}, 
+		need = #{need},
+		tax_rate = #{taxRate},
 		where id = #{id}
 	</update>
 
@@ -33,6 +34,7 @@
 		<result property="id" column="id" />
 		<result property="name" column="name" />
 		<result property="need" column="need" />
+        <result property="taxRate" column="tax_rate" />
 		<collection property="items" ofType="com.pj.project.tb_item.TbItem" column="id" select="getItems"/>
 	</resultMap>
 	

+ 3 - 2
sp-server/src/main/resources/application-dev.yml

@@ -6,9 +6,9 @@ spring:
     # 数据源配置
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
-        url: jdbc:mysql://127.0.0.1:3306/pco_system?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=UTC
+        url: jdbc:mysql://127.0.0.1:3307/pco_system?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=UTC
         username: root
-        password: 123456
+        password: 1234
         # 是否打开sql监控台  (生产环境请务必关闭此选项)
         druid:
             stat-view-servlet:
@@ -53,6 +53,7 @@ part-config:
     night-end: 06:00:00 #夜间结束时间
     free-minutes: 30
     free-car-length: 4.2
+    tax-rate: 0.09
 car:
     max-length: 20
     max-weight: 50