huangxingxing 3 maanden geleden
bovenliggende
commit
9cb50da515

+ 3 - 3
dbscript/init/generate/01-appcodeInit.sql

@@ -79,9 +79,9 @@ INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_D
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attQualityType1','service','attQualityType', 'g', '0','克',1);
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attQualityType2','service','attQualityType', 'kg', '1','千克',2);
 -- 温度单位
-INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attTemperatureType1','service','attTemperatureType', '', '0','℃',1);
-INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attTemperatureType2','service','attTemperatureType', '', '1','℉',2);
-INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attTemperatureType3','service','attTemperatureType', 'K', '2','K',3);
+INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attTemperatureType1','service','attTemperatureType', 'Celsius', '0','℃',1);
+INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attTemperatureType2','service','attTemperatureType', 'Fahrenheit', '1','℉',2);
+INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attTemperatureType3','service','attTemperatureType', 'Kaiwen', '2','K',3);
 -- 属性值类型
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attValueType1','service','attValueType', 'v0', '0','固定值',1);
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attValueType2','service','attValueType', 'v1', '1','下拉值',2);

+ 3 - 3
definitionsrc/com/miniframe/generate/appcode/AttTemperatureType.java

@@ -5,9 +5,9 @@ package com.miniframe.generate.appcode;
  */
 public enum AttTemperatureType {
 
-	℃("℃", "0", "℃"),
-	℉("℉", "1", "℉"),
-	K("K", "2", "K");
+	Celsius("Celsius", "0", "℃"),
+	Fahrenheit("Fahrenheit", "1", "℉"),
+	Kaiwen("Kaiwen", "2", "K");
 
 	// 成员变量
 	private String index; // value

+ 1 - 1
src/main/java/com/miniframe/dbtransfer/EsProComConDbTransfer.java

@@ -5,7 +5,7 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
-import com.miniframe.model.system.EsProComCon;
+import com.miniframe.model.es.EsProComCon;
 
 /**
  * 实体列表,“ES_PRO_COM_CON”数据库数据转化逻辑处理(重新生成不覆盖)。

+ 3 - 3
系统设计/数据定义/标准数据/attTemperatureType(温度单位).csv

@@ -1,4 +1,4 @@
 序号,代码编号,代码值,代码名称
-"0","","0","℃"
-"1","","1","℉"
-"2","K","2","K"
+"0","Celsius","0","℃"
+"1","Fahrenheit","1","℉"
+"2","Kaiwen","2","K"