Merge branch 'master' of http://softwarescience.top:3000/RWA/RWAServer

# Conflicts:
#	DBScript/张奇凯/002-DML.sql

DBScript/张奇凯/002-DML.sql

@@ -11118,6 +11118,25 @@ INSERT INTO  sys_noun
 (NOUNITEM, NOUNVALUE, NOUNNAME, NOUNSUPER, NOUNLEVEL, NOUNORDER, NOUNMODULE, NOUNVALIDITY, READONLY, NOUNPROP, NOUNREMARKS, NOUNRELATION, ORGFLAG)
 VALUES('UNIT_STYLE_TYPE', '3', '数字', 'UNIT_STYLE_TYPE', 3.000000000000000000000000000000, 3.000000000000000000000000000000, NULL, '1', '0', NULL, NULL, '1', '0');
 
+
+
+-- 计算过程类型
+delete from sys_noun where NOUNITEM ='CALC_PROCESS_TYPE';
+INSERT INTO sys_noun (NOUNITEM, NOUNVALUE, NOUNNAME, NOUNSUPER, NOUNLEVEL, NOUNORDER, NOUNMODULE, NOUNVALIDITY, READONLY, NOUNPROP, NOUNREMARKS, NOUNRELATION, ORGFLAG) VALUES('CALC_PROCESS_TYPE', '01', '常量', 'CALC_PROCESS_TYPE', 3.000000000000000000000000000000, 1.000000000000000000000000000000, 'common', '1', '0', NULL, NULL, '1', '0');
+INSERT INTO sys_noun (NOUNITEM, NOUNVALUE, NOUNNAME, NOUNSUPER, NOUNLEVEL, NOUNORDER, NOUNMODULE, NOUNVALIDITY, READONLY, NOUNPROP, NOUNREMARKS, NOUNRELATION, ORGFLAG) VALUES('CALC_PROCESS_TYPE', '02', '实现类', 'CALC_PROCESS_TYPE', 3.000000000000000000000000000000, 2.000000000000000000000000000000, 'common', '1', '0', NULL, NULL, '1', '0');
+INSERT INTO sys_noun (NOUNITEM, NOUNVALUE, NOUNNAME, NOUNSUPER, NOUNLEVEL, NOUNORDER, NOUNMODULE, NOUNVALIDITY, READONLY, NOUNPROP, NOUNREMARKS, NOUNRELATION, ORGFLAG) VALUES('CALC_PROCESS_TYPE', '03', 'SQL语句', 'CALC_PROCESS_TYPE', 3.000000000000000000000000000000, 3.000000000000000000000000000000, 'common', '1', '0', NULL, NULL, '1', '0');
+INSERT INTO sys_noun (NOUNITEM, NOUNVALUE, NOUNNAME, NOUNSUPER, NOUNLEVEL, NOUNORDER, NOUNMODULE, NOUNVALIDITY, READONLY, NOUNPROP, NOUNREMARKS, NOUNRELATION, ORGFLAG) VALUES('CALC_PROCESS_TYPE', '04', 'SQL语句-查询结果是一个Map', 'CALC_PROCESS_TYPE', 3.000000000000000000000000000000, 4.000000000000000000000000000000, 'common', '1', '0', NULL, NULL, '1', '0');
+INSERT INTO sys_noun (NOUNITEM, NOUNVALUE, NOUNNAME, NOUNSUPER, NOUNLEVEL, NOUNORDER, NOUNMODULE, NOUNVALIDITY, READONLY, NOUNPROP, NOUNREMARKS, NOUNRELATION, ORGFLAG) VALUES('CALC_PROCESS_TYPE', '05', 'SQL语句-查询结果是一个MapList', 'CALC_PROCESS_TYPE', 3.000000000000000000000000000000, 5.000000000000000000000000000000, 'common', '1', '0', NULL, NULL, '1', '0');
+INSERT INTO sys_noun (NOUNITEM, NOUNVALUE, NOUNNAME, NOUNSUPER, NOUNLEVEL, NOUNORDER, NOUNMODULE, NOUNVALIDITY, READONLY, NOUNPROP, NOUNREMARKS, NOUNRELATION, ORGFLAG) VALUES('CALC_PROCESS_TYPE', '06', '其他报表来源公式', 'CALC_PROCESS_TYPE', 3.000000000000000000000000000000, 6.000000000000000000000000000000, 'common', '1', '0', NULL, NULL, '1', '0');
+INSERT INTO sys_noun (NOUNITEM, NOUNVALUE, NOUNNAME, NOUNSUPER, NOUNLEVEL, NOUNORDER, NOUNMODULE, NOUNVALIDITY, READONLY, NOUNPROP, NOUNREMARKS, NOUNRELATION, ORGFLAG) VALUES('CALC_PROCESS_TYPE', 'CALC_PROCESS_TYPE', '计算过程类型', 'BUSDICT', 2.000000000000000000000000000000, 0.000000000000000000000000000000, 'common', '0', '0', NULL, NULL, '1', '0');
+
+-- 附件参数配置
+delete from sys_noun where NOUNITEM ='ATTACHFUNCTYPE' and NOUNVALUE='reportuploadconfig';
+INSERT INTO sys_noun (NOUNITEM, NOUNVALUE, NOUNNAME, NOUNSUPER, NOUNLEVEL, NOUNORDER, NOUNMODULE, NOUNVALIDITY, READONLY, NOUNPROP, NOUNREMARKS, NOUNRELATION, ORGFLAG) VALUES('ATTACHFUNCTYPE', 'reportuploadconfig', '报表模板文件管理', 'ATTACHFUNCTYPE', 3.000000000000000000000000000000, 1.000000000000000000000000000000, 'common', '1', '1', 'no', '用于存放报表信息的对应文件', '1', '0');
+
+
+
+
 -- 单元格数据类型
 delete from sys_noun where NOUNITEM ='UNIT_DATA_TYPE';
 INSERT INTO  sys_noun