商品管理，品名管理优化，将分类ID改成名称；

platform-admin/src/main/java/com/platform/entity/TbCfDescripitonEntityExtends.java

+package com.platform.entity;
+
+import java.io.Serializable;
+
+public class TbCfDescripitonEntityExtends extends TbCfDescripitonEntity implements Serializable {
+    private String title;
+    private String goodtype;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getGoodtype() {
+        return goodtype;
+    }
+
+    public void setGoodtype(String goodtype) {
+        this.goodtype = goodtype;
+    }
+}

platform-admin/src/main/java/com/platform/entity/TbCfStationItemEntityExtends.java

+package com.platform.entity;
+
+import java.io.Serializable;
+
+public class TbCfStationItemEntityExtends extends TbCfStationItemEntity implements Serializable {
+    private String dname;
+    private String title;
+    private String goodtype;
+
+    public String getDname() {
+        return dname;
+    }
+
+    public void setDname(String dname) {
+        this.dname = dname;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getGoodtype() {
+        return goodtype;
+    }
+
+    public void setGoodtype(String goodtype) {
+        this.goodtype = goodtype;
+    }
+}

platform-admin/src/main/resources/com/platform/dao/TbCfDescripitonDao.xml

@@ -3,12 +3,14 @@
 
 <mapper namespace="com.platform.dao.TbCfDescripitonDao">
 
-    <resultMap type="com.platform.entity.TbCfDescripitonEntity" id="tbCfDescripitonMap">
+    <resultMap type="com.platform.entity.TbCfDescripitonEntityExtends" id="tbCfDescripitonMap">
         <result property="descripitionId" column="descripition_id"/>
         <result property="descripitionName" column="descripition_name"/>
         <result property="descripitionCode" column="descripition_code"/>
         <result property="goodstypeId" column="goodstype_id"/>
         <result property="goodstwotypeId" column="goodstwotype_id"/>
+		<result property="goodtype" column="goodstype_title"/>
+		<result property="title" column="goodstwotype_title"/>
     </resultMap>
 
 	<select id="queryObject" resultType="com.platform.entity.TbCfDescripitonEntity">
@@ -31,14 +33,15 @@
 		from tb_cf_descripiton
 		where goodstwotype_id = #{id}
 	</select>
-	<select id="queryList" resultType="com.platform.entity.TbCfDescripitonEntity">
-		select
-    		`descripition_id`,
-    		`descripition_name`,
-    		`descripition_code`,
-    		`goodstype_id`,
-    		`goodstwotype_id`
-		from tb_cf_descripiton
+	<select id="queryList" resultMap="tbCfDescripitonMap">
+		SELECT
+		d.*,
+		t.goodstwotype_title,
+		o.goodstype_title
+		FROM
+		tb_cf_descripiton d
+		LEFT JOIN tb_cf_goodstwotype t ON t.goodstwotype_id = d.goodstwotype_id
+		LEFT JOIN tb_cf_goodstype o ON o.goodstype_id = t.goodstype_id
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
 			AND name LIKE concat('%',#{name},'%')

platform-admin/src/main/resources/com/platform/dao/TbCfStationItemDao.xml

@@ -40,23 +40,17 @@
 		where item_id = #{id}
 	</select>
 
-	<select id="queryList" resultType="com.platform.entity.TbCfStationItemEntity">
-		select
-    		`item_id`,
-    		`item_code`,
-    		`item_name`,
-    		`item_brief`,
-    		`item_category`,
-    		`item_price`,
-    		`item_url`,
-    		`item_img`,
-    		`platform_code`,
-    		`platform_name`,
-    		`enable_flag`,
-    		`create_time`,
-    		`item_categorytwo`,
-    		`item_descrition_id`
-		from tb_cf_station_item
+	<select id="queryList" resultType="com.platform.entity.TbCfStationItemEntityExtends">
+		SELECT
+		i.*,
+		d.descripition_name dname,
+		t.goodstwotype_title title,
+		o.goodstype_title goodtype
+		FROM
+		tb_cf_station_item i
+		LEFT JOIN tb_cf_descripiton d ON i.item_descrition_id = d.descripition_id
+		LEFT JOIN tb_cf_goodstwotype t ON t.goodstwotype_id = d.goodstwotype_id
+		LEFT JOIN tb_cf_goodstype o ON o.goodstype_id = t.goodstype_id
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
 			AND name LIKE concat('%',#{name},'%')

platform-admin/src/main/webapp/js/sys/tbcfdescripiton.js

@@ -5,8 +5,8 @@ $(function () {
 			{label: 'descripitionId', name: 'descripitionId', index: 'descripition_id', key: true, hidden: true},
 			{label: '品名名字', name: 'descripitionName', index: 'descripition_name', width: 80},
 			{label: '海关编码', name: 'descripitionCode', index: 'descripition_code', width: 80},
-			{label: '一级分类Id', name: 'goodstypeId', index: 'goodstype_id', width: 80},
-			{label: '二级分类Id', name: 'goodstwotypeId', index: 'goodstwotype_id', width: 80}]
+			{label: '一级分类', name: 'goodtype', index: 'goodtype', width: 80},
+			{label: '二级分类', name: 'title', index: 'title', width: 80}]
     });
 });
 

platform-admin/src/main/webapp/js/sys/tbcfstationitem.js

@@ -13,9 +13,9 @@ $(function () {
 			{label: '平台名', name: 'platformName', index: 'platform_name', width: 80},
 			{label: '启用状态', name: 'enableFlag', index: 'enable_flag', width: 80},
 			{label: '创建日期', name: 'createTime', index: 'create_time', width: 80},
-			{label: '商品一级分类', name: 'itemCategory', index: 'item_category', width: 80},
-			{label: '商品二级分类', name: 'itemCategorytwo', index: 'item_categorytwo', width: 80},
-			{label: '商品品名', name: 'itemDescritionId', index: 'item_descrition_id', width: 80}]
+			{label: '商品一级分类', name: 'goodtype', index: 'goodtype', width: 80},
+			{label: '商品二级分类', name: 'title', index: 'title', width: 80},
+			{label: '商品品名', name: 'dname', index: 'dname', width: 80}]
     });
 });
 

platform-common/src/main/java/com/platform/utils/DateUtils.java

@@ -3,6 +3,7 @@ package com.platform.utils;
 import org.apache.log4j.Logger;
 import org.springframework.util.StringUtils;
 
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -134,7 +135,13 @@ public class DateUtils {
 
 
     public static void main(String[] args) {
-        Date date = strToDate("2019-09-18 14:42:44");
-        System.out.println(date.getTime()/1000);
+//        Date date = strToDate("2019-09-18 14:42:44");
+//        System.out.println(date.getTime()/1000);
+
+        BigDecimal b=new BigDecimal("699");
+        BigDecimal div=new BigDecimal("100");
+        BigDecimal divide = b.divide(div, 2, BigDecimal.ROUND_DOWN);
+        System.out.println(divide);
+
     }
 }