diff --git a/sample-form-manager/db/base.sql b/sample-form-manager/db/base.sql
index 939b90b9e8c98ab602c69c5a4cb07bca1ec4b7f1..423e9cc5296d215289a01620ad56483ff8c7c106 100644
--- a/sample-form-manager/db/base.sql
+++ b/sample-form-manager/db/base.sql
@@ -2,21 +2,19 @@ DROP database if exists `sample-form-platform`;
CREATE database `sample-form-platform` default charset=utf8;
use `sample-form-platform`;
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for mortals_xhx_idgenerator
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_idgenerator`;
CREATE TABLE `mortals_xhx_idgenerator` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '搴忓彿锛屼富閿紝鑷闀�',
- `idType` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'id绫诲瀷',
- `idMaxValue` bigint(20) UNSIGNED NOT NULL COMMENT 'id鍊�',
- `remark` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '澶囨敞',
- `versionNum` bigint(20) UNSIGNED NOT NULL DEFAULT 0 COMMENT '鐗堟湰鍙凤紝榛樿0',
- `gmtModify` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '鏈€鍚庝慨鏀规椂闂�',
- PRIMARY KEY (`id`) USING BTREE
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '搴忓彿锛屼富閿紝鑷闀�',
+ `idType` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'id绫诲瀷',
+ `idMaxValue` bigint(20) UNSIGNED NOT NULL COMMENT 'id鍊�',
+ `remark` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '澶囨敞',
+ `versionNum` bigint(20) UNSIGNED NOT NULL DEFAULT 0 COMMENT '鐗堟湰鍙凤紝榛樿0',
+ `gmtModify` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '鏈€鍚庝慨鏀规椂闂�',
+ PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '涓婚敭Id鐢熸垚鍣�' ROW_FORMAT = Dynamic;
-- ----------------------------
@@ -29,25 +27,25 @@ INSERT INTO `mortals_xhx_idgenerator` VALUES (1, 'INFO_VERSION_KEY', 1, '鍩虹
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_menu`;
CREATE TABLE `mortals_xhx_menu` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '鑿滃崟ID锛屼富閿紝鑷闀�',
- `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鑿滃崟鍚嶇О',
- `url` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '杩炴帴鍦板潃',
- `parentId` bigint(20) NULL DEFAULT NULL COMMENT '鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1',
- `orderId` int(11) NULL DEFAULT NULL COMMENT '鎺掑簭缂栧彿',
- `status` tinyint(2) NULL DEFAULT 1 COMMENT '鑿滃崟鐘舵€侊紝0锛氱鐢紝1锛氬惎鐢紝榛樿1',
- `linkType` tinyint(2) NULL DEFAULT 0 COMMENT '閾炬帴鏂瑰紡锛�0锛氭櫘閫氾紝1锛氬脊鍑猴紝2锛氳剼鏈紙JavaScript锛夛紝榛樿0',
- `groupId` int(11) NULL DEFAULT 1 COMMENT '鍒嗙粍缂栧彿锛屼娇鐢ㄨ彍鍗曞垎闅旂鎸夎鍊煎垎闅旓紝榛樿1',
- `groupName` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
- `imgPath` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '涓昏彍鍗曞浘鏍囷紝涓昏彍鍗曞浘鏍囩殑css鏍峰紡鍚�',
- `buttonImgPath` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鎸夐挳鍥炬爣锛屾寜閽浘鏍囩殑css鏍峰紡鍚�',
- `imgCommPath` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '甯哥敤鑿滃崟鍥炬爣锛屽父鐢ㄨ彍鍗曞浘鏍囩殑css鏍峰紡鍚�',
- `commMenu` tinyint(2) NULL DEFAULT 0 COMMENT '鏄惁甯哥敤鑿滃崟锛�0锛氶潪甯哥敤锛�1锛氬父鐢紝榛樿0',
- `menuType` tinyint(2) NULL DEFAULT 0 COMMENT '鑿滃崟绫诲瀷锛�0锛氫富鑿滃崟锛�1锛氶潪涓昏彍鍗�(鍔熻兘鎿嶄綔缁�)锛岄粯璁�0',
- `authType` tinyint(2) NULL DEFAULT 3 COMMENT '鏉冮檺绫诲瀷锛�0锛氭棤闄愬埗锛�1锛氭棤闇€鐧诲綍鏌ョ湅锛�2锛氶渶瑕佺櫥褰曟煡鐪嬶紝3锛氶渶瑕佽鑹叉潈闄愭煡鐪嬶紝榛樿3',
- `createTime` datetime(0) NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
- `createUserId` bigint(20) NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛',
- `createUserName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛鍚嶇О',
- PRIMARY KEY (`id`) USING BTREE
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '鑿滃崟ID锛屼富閿紝鑷闀�',
+ `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鑿滃崟鍚嶇О',
+ `url` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '杩炴帴鍦板潃',
+ `parentId` bigint(20) NULL DEFAULT NULL COMMENT '鐖惰彍鍗旾D锛屼竴绾ц彍鍗曠殑璇ュ瓧娈靛€间负-1',
+ `orderId` int(11) NULL DEFAULT NULL COMMENT '鎺掑簭缂栧彿',
+ `status` tinyint(2) NULL DEFAULT 1 COMMENT '鑿滃崟鐘舵€侊紝0锛氱鐢紝1锛氬惎鐢紝榛樿1',
+ `linkType` tinyint(2) NULL DEFAULT 0 COMMENT '閾炬帴鏂瑰紡锛�0锛氭櫘閫氾紝1锛氬脊鍑猴紝2锛氳剼鏈紙JavaScript锛夛紝榛樿0',
+ `groupId` int(11) NULL DEFAULT 1 COMMENT '鍒嗙粍缂栧彿锛屼娇鐢ㄨ彍鍗曞垎闅旂鎸夎鍊煎垎闅旓紝榛樿1',
+ `groupName` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+ `imgPath` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '涓昏彍鍗曞浘鏍囷紝涓昏彍鍗曞浘鏍囩殑css鏍峰紡鍚�',
+ `buttonImgPath` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鎸夐挳鍥炬爣锛屾寜閽浘鏍囩殑css鏍峰紡鍚�',
+ `imgCommPath` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '甯哥敤鑿滃崟鍥炬爣锛屽父鐢ㄨ彍鍗曞浘鏍囩殑css鏍峰紡鍚�',
+ `commMenu` tinyint(2) NULL DEFAULT 0 COMMENT '鏄惁甯哥敤鑿滃崟锛�0锛氶潪甯哥敤锛�1锛氬父鐢紝榛樿0',
+ `menuType` tinyint(2) NULL DEFAULT 0 COMMENT '鑿滃崟绫诲瀷锛�0锛氫富鑿滃崟锛�1锛氶潪涓昏彍鍗�(鍔熻兘鎿嶄綔缁�)锛岄粯璁�0',
+ `authType` tinyint(2) NULL DEFAULT 3 COMMENT '鏉冮檺绫诲瀷锛�0锛氭棤闄愬埗锛�1锛氭棤闇€鐧诲綍鏌ョ湅锛�2锛氶渶瑕佺櫥褰曟煡鐪嬶紝3锛氶渶瑕佽鑹叉潈闄愭煡鐪嬶紝榛樿3',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
+ `createUserId` bigint(20) NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛',
+ `createUserName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛鍚嶇О',
+ PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '鑿滃崟淇℃伅' ROW_FORMAT = Dynamic;
-- ----------------------------
@@ -70,17 +68,17 @@ INSERT INTO `mortals_xhx_menu` VALUES (9107, '鎿嶄綔鏃ュ織', '/oper/log/list', 9
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_oper_log`;
CREATE TABLE `mortals_xhx_oper_log` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '搴忓彿锛屼富閿紝鑷闀�',
- `platformMark` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '骞冲彴鏍囪瘑',
- `userId` bigint(20) NULL DEFAULT NULL COMMENT '鐢ㄦ埛id',
- `userName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鐢ㄦ埛鍚嶇О',
- `loginName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鐢ㄦ埛鐧诲綍鍚�',
- `requestUrl` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '璇锋眰鍦板潃',
- `content` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鎿嶄綔鍐呭锛岃褰曟搷浣滃叿浣撲俊鎭紝濡備慨鏀瑰墠淇敼鎴栫殑鏁版嵁',
- `ip` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鎿嶄綔IP鍦板潃',
- `logDate` datetime(0) NULL DEFAULT NULL COMMENT '鎿嶄綔鏃堕棿',
- `operType` tinyint(2) NULL DEFAULT NULL COMMENT '鎿嶄綔绫诲瀷锛�0锛氭柊澧烇紝1锛氫慨鏀癸紝2锛氬垹闄�',
- PRIMARY KEY (`id`) USING BTREE
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '搴忓彿锛屼富閿紝鑷闀�',
+ `platformMark` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '骞冲彴鏍囪瘑',
+ `userId` bigint(20) NULL DEFAULT NULL COMMENT '鐢ㄦ埛id',
+ `userName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鐢ㄦ埛鍚嶇О',
+ `loginName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鐢ㄦ埛鐧诲綍鍚�',
+ `requestUrl` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '璇锋眰鍦板潃',
+ `content` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鎿嶄綔鍐呭锛岃褰曟搷浣滃叿浣撲俊鎭紝濡備慨鏀瑰墠淇敼鎴栫殑鏁版嵁',
+ `ip` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鎿嶄綔IP鍦板潃',
+ `logDate` datetime(0) NULL DEFAULT NULL COMMENT '鎿嶄綔鏃堕棿',
+ `operType` tinyint(2) NULL DEFAULT NULL COMMENT '鎿嶄綔绫诲瀷锛�0锛氭柊澧烇紝1锛氫慨鏀癸紝2锛氬垹闄�',
+ PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '鎿嶄綔鏃ュ織' ROW_FORMAT = Dynamic;
-- ----------------------------
@@ -88,20 +86,20 @@ CREATE TABLE `mortals_xhx_oper_log` (
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_param`;
CREATE TABLE `mortals_xhx_param` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '搴忓彿锛屼富閿紝鑷闀�',
- `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍙傛暟鍚嶇О',
- `firstOrganize` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '涓€绾х粍缁囷紝濡傦細骞冲彴閰嶇疆',
- `secondOrganize` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '浜岀骇缁勭粐锛屽锛氬熀纭€閰嶇疆',
- `paramKey` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍙傛暟閿紝鍏ㄥ眬鍞竴',
- `paramValue` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍙傛暟鍊�',
- `validStatus` tinyint(2) NULL DEFAULT 1 COMMENT '鍙傛暟鏈夋晥鐘舵€侊紝0锛氱鐢紝1锛氬惎鐢紝榛樿1',
- `modStatus` tinyint(2) NULL DEFAULT 4 COMMENT '鍙傛暟淇敼鐘舵€侊紝0锛氶殣钘忥紝1锛氶〉闈粎鏌ョ湅锛�2锛氶〉闈㈠彲淇敼锛�3锛氶〉闈㈠彲鍒犻櫎锛�4锛氶〉闈㈠彲淇敼鍒犻櫎锛岄粯璁�4',
- `displayType` tinyint(2) NULL DEFAULT 0 COMMENT '灞曠幇绫诲瀷锛�0锛氭櫘閫氭枃鏈锛�1锛氬琛屾枃鏈锛�2锛氬紑鍏筹紝3锛氬潡杈撳叆妗嗭紝榛樿锛�0',
- `remark` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '澶囨敞',
- `createTime` datetime(0) NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
- `createUserId` bigint(20) NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛',
- `createUserName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛鍚嶇О',
- PRIMARY KEY (`id`) USING BTREE
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '搴忓彿锛屼富閿紝鑷闀�',
+ `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍙傛暟鍚嶇О',
+ `firstOrganize` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '涓€绾х粍缁囷紝濡傦細骞冲彴閰嶇疆',
+ `secondOrganize` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '浜岀骇缁勭粐锛屽锛氬熀纭€閰嶇疆',
+ `paramKey` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍙傛暟閿紝鍏ㄥ眬鍞竴',
+ `paramValue` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍙傛暟鍊�',
+ `validStatus` tinyint(2) NULL DEFAULT 1 COMMENT '鍙傛暟鏈夋晥鐘舵€侊紝0锛氱鐢紝1锛氬惎鐢紝榛樿1',
+ `modStatus` tinyint(2) NULL DEFAULT 4 COMMENT '鍙傛暟淇敼鐘舵€侊紝0锛氶殣钘忥紝1锛氶〉闈粎鏌ョ湅锛�2锛氶〉闈㈠彲淇敼锛�3锛氶〉闈㈠彲鍒犻櫎锛�4锛氶〉闈㈠彲淇敼鍒犻櫎锛岄粯璁�4',
+ `displayType` tinyint(2) NULL DEFAULT 0 COMMENT '灞曠幇绫诲瀷锛�0锛氭櫘閫氭枃鏈锛�1锛氬琛屾枃鏈锛�2锛氬紑鍏筹紝3锛氬潡杈撳叆妗嗭紝榛樿锛�0',
+ `remark` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '澶囨敞',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
+ `createUserId` bigint(20) NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛',
+ `createUserName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛鍚嶇О',
+ PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '鍙傛暟淇℃伅' ROW_FORMAT = Dynamic;
-- ----------------------------
@@ -109,16 +107,16 @@ CREATE TABLE `mortals_xhx_param` (
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_resource`;
CREATE TABLE `mortals_xhx_resource` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '鑿滃崟ID锛屼富閿紝鑷闀�',
- `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍚嶇О',
- `url` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '杩炴帴鍦板潃锛屽涓湴鍧€浠ラ€楀彿鍒嗛殧',
- `authType` tinyint(2) NULL DEFAULT 3 COMMENT '鏉冮檺绫诲瀷锛�0锛氭棤闄愬埗锛�1锛氭棤闇€鐧诲綍鏌ョ湅锛�2锛氶渶瑕佺櫥褰曟煡鐪嬶紝3锛氶渶瑕佽鑹叉潈闄愭煡鐪嬶紝榛樿3',
- `sourceType` tinyint(2) NULL DEFAULT 0 COMMENT '璧勬簮绫诲瀷锛�0锛氱郴缁熻祫婧愶紝1锛氬紑鏀捐祫婧愶紝榛樿0',
- `createTime` datetime(0) NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
- `createUserId` bigint(20) NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛',
- `createUserName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛鍚嶇О',
- `userType` tinyint(2) NULL DEFAULT NULL COMMENT '鐢ㄦ埛绫诲瀷锛�0锛氱郴缁熺敤鎴� 1:浠ｇ悊鍟嗙敤鎴� 2:鍝佺墝鍟嗙敤鎴�',
- PRIMARY KEY (`id`) USING BTREE
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '鑿滃崟ID锛屼富閿紝鑷闀�',
+ `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍚嶇О',
+ `url` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '杩炴帴鍦板潃锛屽涓湴鍧€浠ラ€楀彿鍒嗛殧',
+ `authType` tinyint(2) NULL DEFAULT 3 COMMENT '鏉冮檺绫诲瀷锛�0锛氭棤闄愬埗锛�1锛氭棤闇€鐧诲綍鏌ョ湅锛�2锛氶渶瑕佺櫥褰曟煡鐪嬶紝3锛氶渶瑕佽鑹叉潈闄愭煡鐪嬶紝榛樿3',
+ `sourceType` tinyint(2) NULL DEFAULT 0 COMMENT '璧勬簮绫诲瀷锛�0锛氱郴缁熻祫婧愶紝1锛氬紑鏀捐祫婧愶紝榛樿0',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
+ `createUserId` bigint(20) NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛',
+ `createUserName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛鍚嶇О',
+ `userType` tinyint(2) NULL DEFAULT NULL COMMENT '鐢ㄦ埛绫诲瀷锛�0锛氱郴缁熺敤鎴� 1:浠ｇ悊鍟嗙敤鎴� 2:鍝佺墝鍟嗙敤鎴�',
+ PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '璧勬簮淇℃伅' ROW_FORMAT = Dynamic;
-- ----------------------------
@@ -147,16 +145,16 @@ INSERT INTO `mortals_xhx_resource` VALUES (150001, '鍏叡璧勬簮', '/area/list',
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_role`;
CREATE TABLE `mortals_xhx_role` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '搴忓彿锛屼富閿紝鑷闀�',
- `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '瑙掕壊鍚嶇О',
- `remark` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '澶囨敞',
- `roleType` tinyint(2) NULL DEFAULT 2 COMMENT '瑙掕壊绫诲瀷锛�0锛氱郴缁熷唴缃鑹诧紙涓嶅彲鍒犻櫎锛夛紝1锛氶粯璁ょ郴缁熻鑹诧紝2锛氭櫘閫氳鑹诧紝榛樿2',
- `customerId` bigint(20) NULL DEFAULT NULL COMMENT '褰掑睘瀹㈡埛ID',
- `createTime` datetime(0) NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
- `createUserId` bigint(20) NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛',
- `createUserName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛鍚嶇О',
- `userType` tinyint(2) NULL DEFAULT NULL COMMENT '鐢ㄦ埛绫诲瀷锛�0锛氱郴缁熺敤鎴� 1:浠ｇ悊鍟嗙敤鎴� 2:鍝佺墝鍟嗙敤鎴�',
- PRIMARY KEY (`id`) USING BTREE
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '搴忓彿锛屼富閿紝鑷闀�',
+ `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '瑙掕壊鍚嶇О',
+ `remark` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '澶囨敞',
+ `roleType` tinyint(2) NULL DEFAULT 2 COMMENT '瑙掕壊绫诲瀷锛�0锛氱郴缁熷唴缃鑹诧紙涓嶅彲鍒犻櫎锛夛紝1锛氶粯璁ょ郴缁熻鑹诧紝2锛氭櫘閫氳鑹诧紝榛樿2',
+ `customerId` bigint(20) NULL DEFAULT NULL COMMENT '褰掑睘瀹㈡埛ID',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
+ `createUserId` bigint(20) NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛',
+ `createUserName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛鍚嶇О',
+ `userType` tinyint(2) NULL DEFAULT NULL COMMENT '鐢ㄦ埛绫诲瀷锛�0锛氱郴缁熺敤鎴� 1:浠ｇ悊鍟嗙敤鎴� 2:鍝佺墝鍟嗙敤鎴�',
+ PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '瑙掕壊淇℃伅' ROW_FORMAT = Dynamic;
-- ----------------------------
@@ -169,10 +167,10 @@ INSERT INTO `mortals_xhx_role` VALUES (1, '绠＄悊鍛�', '绫讳技admin', 0, NULL, '
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_role_auth`;
CREATE TABLE `mortals_xhx_role_auth` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '搴忓彿锛屼富閿紝鑷闀�',
- `roleId` bigint(20) NULL DEFAULT NULL COMMENT '瑙掕壊ID',
- `resourceId` bigint(20) NULL DEFAULT NULL COMMENT '璧勬簮ID',
- PRIMARY KEY (`id`) USING BTREE
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '搴忓彿锛屼富閿紝鑷闀�',
+ `roleId` bigint(20) NULL DEFAULT NULL COMMENT '瑙掕壊ID',
+ `resourceId` bigint(20) NULL DEFAULT NULL COMMENT '璧勬簮ID',
+ PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '瑙掕壊璧勬簮鏉冮檺' ROW_FORMAT = Dynamic;
-- ----------------------------
@@ -180,10 +178,10 @@ CREATE TABLE `mortals_xhx_role_auth` (
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_role_user`;
CREATE TABLE `mortals_xhx_role_user` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '搴忓彿锛屼富閿紝鑷闀�',
- `roleId` bigint(20) NULL DEFAULT NULL COMMENT '瑙掕壊ID',
- `userId` bigint(20) NULL DEFAULT NULL COMMENT '鐢ㄦ埛ID',
- PRIMARY KEY (`id`) USING BTREE
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '搴忓彿锛屼富閿紝鑷闀�',
+ `roleId` bigint(20) NULL DEFAULT NULL COMMENT '瑙掕壊ID',
+ `userId` bigint(20) NULL DEFAULT NULL COMMENT '鐢ㄦ埛ID',
+ PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '瑙掕壊鐢ㄦ埛' ROW_FORMAT = Dynamic;
-- ----------------------------
@@ -191,29 +189,29 @@ CREATE TABLE `mortals_xhx_role_user` (
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_site`;
CREATE TABLE `mortals_xhx_site` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID锛屼富閿紝鑷闀�',
- `siteName` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '绔欑偣鍚�',
- `parentId` bigint(11) NOT NULL COMMENT '鐖剁骇id',
- `ancestors` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧',
- `address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '鍦板潃',
- `mobile` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '鐢佃瘽',
- `introduce` text CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '鍗曚綅浠嬬粛',
- `workday1` tinyint(1) NULL DEFAULT NULL COMMENT '鍛ㄤ竴 1涓婄彮 0涓嶄笂',
- `workday2` tinyint(1) NULL DEFAULT NULL COMMENT '鍛ㄤ簩 1涓婄彮 0涓嶄笂',
- `workday3` tinyint(1) NULL DEFAULT NULL COMMENT '鍛ㄤ笁 1涓婄彮 0涓嶄笂',
- `workday4` tinyint(1) NULL DEFAULT NULL COMMENT '鍛ㄥ洓 1涓婄彮 0涓嶄笂',
- `workday5` tinyint(1) NULL DEFAULT NULL COMMENT '鍛ㄤ簲 1涓婄彮 0涓嶄笂',
- `workday6` tinyint(1) NULL DEFAULT NULL COMMENT '鍛ㄥ叚 1涓婄彮 0涓嶄笂',
- `workday7` tinyint(1) NULL DEFAULT NULL COMMENT '鍛ㄦ棩 1涓婄彮 0涓嶄笂',
- `number` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '绔欑偣缂栧彿',
- `summary` text CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '涓績浠嬬粛',
- `orderNum` int(9) NULL DEFAULT 0 COMMENT '鎺掑簭瀛楁',
- `status` tinyint(2) NULL DEFAULT 1 COMMENT '绔欑偣鐘舵€� 锛�0锛屽仠鐢紝1锛屾甯� 榛樿1',
- `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '鍙樻洿鏃堕棿',
- `updateUser` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍙樻洿鐢ㄦ埛loginName',
- `createTime` datetime(0) NOT NULL COMMENT '鍒涘缓鏃堕棿',
- `createUser` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '鍒涘缓鐢ㄦ埛loginName',
- PRIMARY KEY (`id`) USING BTREE
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID锛屼富閿紝鑷闀�',
+ `siteName` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '绔欑偣鍚�',
+ `parentId` bigint(11) NOT NULL COMMENT '鐖剁骇id',
+ `ancestors` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '绁栫骇鍒楄〃锛岄€楀彿鍒嗛殧',
+ `address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '鍦板潃',
+ `mobile` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '鐢佃瘽',
+ `introduce` text CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '鍗曚綅浠嬬粛',
+ `workday1` tinyint(1) NULL DEFAULT NULL COMMENT '鍛ㄤ竴 1涓婄彮 0涓嶄笂',
+ `workday2` tinyint(1) NULL DEFAULT NULL COMMENT '鍛ㄤ簩 1涓婄彮 0涓嶄笂',
+ `workday3` tinyint(1) NULL DEFAULT NULL COMMENT '鍛ㄤ笁 1涓婄彮 0涓嶄笂',
+ `workday4` tinyint(1) NULL DEFAULT NULL COMMENT '鍛ㄥ洓 1涓婄彮 0涓嶄笂',
+ `workday5` tinyint(1) NULL DEFAULT NULL COMMENT '鍛ㄤ簲 1涓婄彮 0涓嶄笂',
+ `workday6` tinyint(1) NULL DEFAULT NULL COMMENT '鍛ㄥ叚 1涓婄彮 0涓嶄笂',
+ `workday7` tinyint(1) NULL DEFAULT NULL COMMENT '鍛ㄦ棩 1涓婄彮 0涓嶄笂',
+ `number` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '绔欑偣缂栧彿',
+ `summary` text CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '涓績浠嬬粛',
+ `orderNum` int(9) NULL DEFAULT 0 COMMENT '鎺掑簭瀛楁',
+ `status` tinyint(2) NULL DEFAULT 1 COMMENT '绔欑偣鐘舵€� 锛�0锛屽仠鐢紝1锛屾甯� 榛樿1',
+ `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '鍙樻洿鏃堕棿',
+ `updateUser` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍙樻洿鐢ㄦ埛loginName',
+ `createTime` datetime(0) NOT NULL COMMENT '鍒涘缓鏃堕棿',
+ `createUser` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '鍒涘缓鐢ㄦ埛loginName',
+ PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '绔欑偣淇℃伅琛�' ROW_FORMAT = Dynamic;
-- ----------------------------
@@ -221,11 +219,11 @@ CREATE TABLE `mortals_xhx_site` (
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_table_index`;
CREATE TABLE `mortals_xhx_table_index` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '鑿滃崟ID锛屼富閿紝鑷闀�',
- `tableName` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '琛ㄥ悕绉�',
- `tableMark` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '琛ㄦ爣璇�',
- `createTime` datetime(0) NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
- PRIMARY KEY (`id`) USING BTREE
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '鑿滃崟ID锛屼富閿紝鑷闀�',
+ `tableName` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '琛ㄥ悕绉�',
+ `tableMark` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '琛ㄦ爣璇�',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
+ PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '鍒嗚〃绱㈠紩淇℃伅' ROW_FORMAT = Dynamic;
-- ----------------------------
@@ -233,24 +231,24 @@ CREATE TABLE `mortals_xhx_table_index` (
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_task`;
CREATE TABLE `mortals_xhx_task` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '搴忓彿锛屼富閿紝鑷闀�',
- `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '浠诲姟鍚嶇О',
- `taskKey` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '浠诲姟鍏抽敭瀛楋紝鍖哄垎浠诲姟鎵ц娴佺▼',
- `status` tinyint(2) NULL DEFAULT 0 COMMENT '浠诲姟鐘舵€侊紝0锛氭湭鍚姩锛�1锛氭墽琛屼腑锛岄粯璁�0',
- `excuteService` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '浠诲姟鎵ц鏈嶅姟',
- `excuteParam` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '浠诲姟鎵ц鍙傛暟',
- `excuteHost` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '浠诲姟鎵ц涓绘満锛屼负绌鸿〃绀轰笉闄愬埗浠诲姟鐨勬墽琛屼富鏈猴紝澶氫釜鐢ㄩ€楀彿鍒嗛殧',
- `excuteStrategy` tinyint(2) NULL DEFAULT 1 COMMENT '鎵ц绛栫暐锛�1锛氭寜鏃ワ紝2锛氭寜鍛紝3锛氭寜鏈堬紝4锛氭寜闂撮殧鏃堕棿锛岄粯璁�1',
- `excuteDate` int(11) NULL DEFAULT 0 COMMENT '鎵ц鏃ユ湡锛屾寜鏃ワ細鍒欎负0锛涙寜鍛細鍒欎负1-7锛涙寜鏈堬細鍒欎负锛�1-31锛涙寜闂撮殧鏃堕棿锛氬垯涓洪棿闅旀椂闂达紝鍗曚綅锛氱锛涢粯璁�0',
- `excuteTime` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '00' COMMENT '鎵ц鏃堕棿锛屾牸寮忥細HH:mm锛岄粯璁わ細00:00',
- `remark` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '澶囨敞',
- `lastExcuteHost` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏈€鍚庢墽琛屼富鏈�',
- `lastExcuteTime` datetime(0) NULL DEFAULT NULL COMMENT '鏈€鍚庢墽琛屾椂闂�',
- `interimExcuteStatus` tinyint(2) NULL DEFAULT 0 COMMENT '涓存椂鎵ц鐘舵€侊紝0锛氭湭鍚敤锛�1锛氱珛鍗虫墽琛屽苟淇濈暀锛�2锛氱珛鍗虫墽琛屽苟鍒犻櫎锛岄粯璁�0',
- `createTime` datetime(0) NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
- `createUserId` bigint(20) NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛',
- `createUserName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛鍚嶇О',
- PRIMARY KEY (`id`) USING BTREE
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '搴忓彿锛屼富閿紝鑷闀�',
+ `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '浠诲姟鍚嶇О',
+ `taskKey` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '浠诲姟鍏抽敭瀛楋紝鍖哄垎浠诲姟鎵ц娴佺▼',
+ `status` tinyint(2) NULL DEFAULT 0 COMMENT '浠诲姟鐘舵€侊紝0锛氭湭鍚姩锛�1锛氭墽琛屼腑锛岄粯璁�0',
+ `excuteService` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '浠诲姟鎵ц鏈嶅姟',
+ `excuteParam` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '浠诲姟鎵ц鍙傛暟',
+ `excuteHost` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '浠诲姟鎵ц涓绘満锛屼负绌鸿〃绀轰笉闄愬埗浠诲姟鐨勬墽琛屼富鏈猴紝澶氫釜鐢ㄩ€楀彿鍒嗛殧',
+ `excuteStrategy` tinyint(2) NULL DEFAULT 1 COMMENT '鎵ц绛栫暐锛�1锛氭寜鏃ワ紝2锛氭寜鍛紝3锛氭寜鏈堬紝4锛氭寜闂撮殧鏃堕棿锛岄粯璁�1',
+ `excuteDate` int(11) NULL DEFAULT 0 COMMENT '鎵ц鏃ユ湡锛屾寜鏃ワ細鍒欎负0锛涙寜鍛細鍒欎负1-7锛涙寜鏈堬細鍒欎负锛�1-31锛涙寜闂撮殧鏃堕棿锛氬垯涓洪棿闅旀椂闂达紝鍗曚綅锛氱锛涢粯璁�0',
+ `excuteTime` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '00' COMMENT '鎵ц鏃堕棿锛屾牸寮忥細HH:mm锛岄粯璁わ細00:00',
+ `remark` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '澶囨敞',
+ `lastExcuteHost` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏈€鍚庢墽琛屼富鏈�',
+ `lastExcuteTime` datetime(0) NULL DEFAULT NULL COMMENT '鏈€鍚庢墽琛屾椂闂�',
+ `interimExcuteStatus` tinyint(2) NULL DEFAULT 0 COMMENT '涓存椂鎵ц鐘舵€侊紝0锛氭湭鍚敤锛�1锛氱珛鍗虫墽琛屽苟淇濈暀锛�2锛氱珛鍗虫墽琛屽苟鍒犻櫎锛岄粯璁�0',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
+ `createUserId` bigint(20) NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛',
+ `createUserName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛鍚嶇О',
+ PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '浠诲姟淇℃伅' ROW_FORMAT = Dynamic;
-- ----------------------------
@@ -263,13 +261,13 @@ INSERT INTO `mortals_xhx_task` VALUES (2, '鍒嗚〃鍒涘缓浠诲姟', 'tableIndexServi
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_uploadfile`;
CREATE TABLE `mortals_xhx_uploadfile` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID锛屼富閿紝鑷闀�',
- `fileName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏂囦欢鍚嶇О',
- `filePath` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏂囦欢璺緞',
- `fileType` tinyint(2) NULL DEFAULT NULL COMMENT '鏂囦欢绫诲瀷锛�1 excel ,2 img,3 zip, 4 pdf',
- `createTime` datetime(0) NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
- `createUser` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛',
- PRIMARY KEY (`id`) USING BTREE
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID锛屼富閿紝鑷闀�',
+ `fileName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏂囦欢鍚嶇О',
+ `filePath` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏂囦欢璺緞',
+ `fileType` tinyint(2) NULL DEFAULT NULL COMMENT '鏂囦欢绫诲瀷锛�1 excel ,2 img,3 zip, 4 pdf',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
+ `createUser` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛',
+ PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '涓婁紶鏂囦欢' ROW_FORMAT = Dynamic;
-- ----------------------------
@@ -277,25 +275,25 @@ CREATE TABLE `mortals_xhx_uploadfile` (
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_user`;
CREATE TABLE mortals_xhx_user(
- `id` bigint(20) AUTO_INCREMENT COMMENT '鐢ㄦ埛ID锛屼富閿紝鑷闀�',
- `loginName` varchar(50) COMMENT '鐧诲綍鍚�',
- `loginPwd` varchar(128) COMMENT '鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑',
- `loginLimitAddress` varchar(200) COMMENT '鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍',
- `realName` varchar(64) COMMENT '鐢ㄦ埛鍚�',
- `mobile` varchar(21) COMMENT '鐢ㄦ埛鎵嬫満鍙�',
- `phone` varchar(21) COMMENT '鐢ㄦ埛鑱旂郴鐢佃瘽',
- `email` varchar(50) COMMENT '鐢ㄦ埛閭',
- `qq` varchar(20) COMMENT 'QQ鍙风爜',
- `userType` tinyint(2) COMMENT '鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)',
- `siteIds` varchar(512) COMMENT '鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧',
- `areaCodes` varchar(512) COMMENT '鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧',
- `status` tinyint(2) COMMENT '鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)',
- `createTime` datetime COMMENT '鍒涘缓鏃堕棿',
- `createUserId` bigint(20) COMMENT '鍒涘缓鐢ㄦ埛',
- `createUserName` varchar(50) COMMENT '鍒涘缓鐢ㄦ埛鍚嶇О',
- `lastLoginTime` datetime COMMENT '鏈€鍚庝竴娆＄櫥褰曟椂闂�',
- `lastLoginAddress` varchar(21) COMMENT '鏈€鍚庝竴娆＄櫥褰曞湴鍧€',
-PRIMARY KEY (`id`)
+ `id` bigint(20) AUTO_INCREMENT COMMENT '鐢ㄦ埛ID锛屼富閿紝鑷闀�',
+ `loginName` varchar(50) COMMENT '鐧诲綍鍚�',
+ `loginPwd` varchar(128) COMMENT '鐧诲綍瀵嗙爜锛屼娇鐢╩d5鍙屾鍔犲瘑',
+ `loginLimitAddress` varchar(200) COMMENT '鐧诲綍闄愬埗鍦板潃锛屽涓狪P鍦板潃鐢ㄩ€楀彿鍒嗛殧锛屽彲浠ヤ娇鐢↖P娈靛尮閰嶏紝濡傦細172.17.*闈炵┖锛氬垯鍙兘璇ュ€煎唴鐨処P鍙互鐧诲綍',
+ `realName` varchar(64) COMMENT '鐢ㄦ埛鍚�',
+ `mobile` varchar(21) COMMENT '鐢ㄦ埛鎵嬫満鍙�',
+ `phone` varchar(21) COMMENT '鐢ㄦ埛鑱旂郴鐢佃瘽',
+ `email` varchar(50) COMMENT '鐢ㄦ埛閭',
+ `qq` varchar(20) COMMENT 'QQ鍙风爜',
+ `userType` tinyint(2) COMMENT '鐢ㄦ埛绫诲瀷(0.绯荤粺鐢ㄦ埛,1.鏅€氱敤鎴�,2.宸ヤ綔浜哄憳)',
+ `siteIds` varchar(512) COMMENT '鎵€灞炵珯鐐筰d,澶氫釜閫楀彿鍒嗛殧',
+ `areaCodes` varchar(512) COMMENT '鎵€灞炲尯鍩焎ode,澶氫釜閫楀彿鍒嗛殧',
+ `status` tinyint(2) COMMENT '鐢ㄦ埛鐘舵€�(0.鍋滅敤锛�1.姝ｅ父锛�2.鍐荤粨锛�3.閿€鎴凤紝4.绂昏亴)',
+ `createTime` datetime COMMENT '鍒涘缓鏃堕棿',
+ `createUserId` bigint(20) COMMENT '鍒涘缓鐢ㄦ埛',
+ `createUserName` varchar(50) COMMENT '鍒涘缓鐢ㄦ埛鍚嶇О',
+ `lastLoginTime` datetime COMMENT '鏈€鍚庝竴娆＄櫥褰曟椂闂�',
+ `lastLoginAddress` varchar(21) COMMENT '鏈€鍚庝竴娆＄櫥褰曞湴鍧€',
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='鐢ㄦ埛淇℃伅涓氬姟';
@@ -309,17 +307,17 @@ INSERT INTO `mortals_xhx_user`(`id`, `loginName`, `loginPwd`, `loginLimitAddress
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_valid_code`;
CREATE TABLE `mortals_xhx_valid_code` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '鑿滃崟ID锛屼富閿紝鑷闀�',
- `code` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '楠岃瘉鐮�',
- `url` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏍￠獙鍦板潃锛宔mail鏍￠獙浣跨敤',
- `mobile` varchar(21) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏍￠獙鎵嬫満鍙�',
- `email` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏍￠獙閭',
- `type` tinyint(2) NULL DEFAULT 0 COMMENT '鏍￠獙鏂瑰紡锛�0锛氬浘鐗囨牎楠岋紝1锛氭墜鏈烘牎楠岋紝2锛氶偖绠辨牎楠岋紝榛樿0',
- `sessionId` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '浼氳瘽ID',
- `ip` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'IP鍦板潃',
- `createTime` datetime(0) NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
- `lapseTime` datetime(0) NULL DEFAULT NULL COMMENT '澶辨晥鏃堕棿',
- PRIMARY KEY (`id`) USING BTREE
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '鑿滃崟ID锛屼富閿紝鑷闀�',
+ `code` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '楠岃瘉鐮�',
+ `url` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏍￠獙鍦板潃锛宔mail鏍￠獙浣跨敤',
+ `mobile` varchar(21) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏍￠獙鎵嬫満鍙�',
+ `email` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '鏍￠獙閭',
+ `type` tinyint(2) NULL DEFAULT 0 COMMENT '鏍￠獙鏂瑰紡锛�0锛氬浘鐗囨牎楠岋紝1锛氭墜鏈烘牎楠岋紝2锛氶偖绠辨牎楠岋紝榛樿0',
+ `sessionId` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '浼氳瘽ID',
+ `ip` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'IP鍦板潃',
+ `createTime` datetime(0) NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
+ `lapseTime` datetime(0) NULL DEFAULT NULL COMMENT '澶辨晥鏃堕棿',
+ PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '楠岃瘉鐮佷俊鎭�' ROW_FORMAT = Dynamic;
SET FOREIGN_KEY_CHECKS = 1;
@@ -331,20 +329,20 @@ SET FOREIGN_KEY_CHECKS = 1;
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_area`;
CREATE TABLE `mortals_xhx_area` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '涓婚敭,鑷闀�',
- `parentId` bigint(20) DEFAULT NULL COMMENT '涓婄骇鍖哄煙ID',
- `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '鍖哄煙鍚嶇О',
- `level` tinyint(4) DEFAULT NULL COMMENT '鍖哄煙绾у埆锛屾寜鎵€澶勬爲鐨勮妭鐐瑰眰娆�',
- `code` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '鍖哄煙缂栫爜锛屾寜鍏ㄥ浗鐪佸競缂栫爜',
- `contactsPeople` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '鍖哄煙璐熻矗浜�',
- `contactsMobile` varchar(21) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '鍖哄煙璐熻矗浜虹數璇�',
- `childSize` int(11) DEFAULT '0' COMMENT '瀛愬尯鍩熸暟閲忥紝榛樿0',
- `maxChildId` int(11) DEFAULT '0' COMMENT '瀛愬尯鍩熺殑鏈€澶D锛岄粯璁�0',
- `status` tinyint(4) DEFAULT '1' COMMENT '鐘舵€侊紝0鍋滅敤锛�1鍚敤',
- `remark` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '鎻忚堪',
- `createTime` datetime DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
- `updateTime` datetime DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
- `createUserId` bigint(20) DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛ID',
- `createUserName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛鍚嶇О',
- PRIMARY KEY (`id`) USING BTREE
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '涓婚敭,鑷闀�',
+ `parentId` bigint(20) DEFAULT NULL COMMENT '涓婄骇鍖哄煙ID',
+ `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '鍖哄煙鍚嶇О',
+ `level` tinyint(4) DEFAULT NULL COMMENT '鍖哄煙绾у埆锛屾寜鎵€澶勬爲鐨勮妭鐐瑰眰娆�',
+ `code` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '鍖哄煙缂栫爜锛屾寜鍏ㄥ浗鐪佸競缂栫爜',
+ `contactsPeople` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '鍖哄煙璐熻矗浜�',
+ `contactsMobile` varchar(21) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '鍖哄煙璐熻矗浜虹數璇�',
+ `childSize` int(11) DEFAULT '0' COMMENT '瀛愬尯鍩熸暟閲忥紝榛樿0',
+ `maxChildId` int(11) DEFAULT '0' COMMENT '瀛愬尯鍩熺殑鏈€澶D锛岄粯璁�0',
+ `status` tinyint(4) DEFAULT '1' COMMENT '鐘舵€侊紝0鍋滅敤锛�1鍚敤',
+ `remark` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '鎻忚堪',
+ `createTime` datetime DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
+ `updateTime` datetime DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
+ `createUserId` bigint(20) DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛ID',
+ `createUserName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛鍚嶇О',
+ PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='鍖哄煙淇℃伅';
diff --git a/sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterEntity.java b/sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterEntity.java
index debedc6939de502bb5e86280927d26fb96ba2da3..2155420d5823622645cb399e77341ebfe1ae52f8 100644
--- a/sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterEntity.java
+++ b/sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterEntity.java
@@ -1,16 +1,17 @@
package com.mortals.xhx.module.matter.model;
-
+import java.util.List;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.matter.model.vo.MatterVo;
+import com.mortals.xhx.module.matter.model.MatterDatumEntity;
/**
* 浜嬮」鐢宠鏉愭枡涓氬姟瀹炰綋瀵硅薄
*
* @author zxfei
- * @date 2022-11-10
+ * @date 2022-11-17
*/
public class MatterEntity extends MatterVo {
@@ -77,6 +78,10 @@ public class MatterEntity extends MatterVo {
*/
private Integer source;
+ /**
+ * 浜嬮」鐢宠鏉愭枡涓氬姟淇℃伅
+ */
+ private List<MatterDatumEntity> matterDatumList=new ArrayList<>();;
public MatterEntity(){}
@@ -292,6 +297,13 @@ public class MatterEntity extends MatterVo {
}
+ public List<MatterDatumEntity> getMatterDatumList(){
+ return matterDatumList;
+ }
+
+ public void setMatterDatumList(List<MatterDatumEntity> matterDatumList){
+ this.matterDatumList = matterDatumList;
+ }
@Override
diff --git a/sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterQuery.java b/sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterQuery.java
index 437c0445b39e92d7fba7d16f66f5969d702253a9..53c293b1f7154d5c79119c077479973c72207184 100644
--- a/sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterQuery.java
+++ b/sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterQuery.java
@@ -1,12 +1,13 @@
package com.mortals.xhx.module.matter.model;
+import java.util.List;
import java.util.List;
import com.mortals.xhx.module.matter.model.MatterEntity;
/**
* 浜嬮」鐢宠鏉愭枡涓氬姟鏌ヨ瀵硅薄
*
* @author zxfei
- * @date 2022-11-10
+ * @date 2022-11-17
*/
public class MatterQuery extends MatterEntity {
/** 寮€濮� 涓婚敭锛岃嚜澧為暱 */
diff --git a/sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterVo.java b/sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterVo.java
index 166360482bb36df6a6d4b33ea5b87e5a5743b3e2..e03a556a9c0991266b53a89a9b41747aab6b868e 100644
--- a/sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterVo.java
+++ b/sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterVo.java
@@ -18,6 +18,4 @@ public class MatterVo extends BaseEntityLong {
/** 鏉愭枡鏁伴噺 */
private Integer datumCount;
- private List<MatterDatumEntity> matterDatumList;
-
}
\ No newline at end of file
diff --git a/sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java b/sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
index 19d4462e80ecf41f98ecd34c28d6f44938aaf371..b64138c1c866289fdf390fcebd84d00da56daf5c 100644
--- a/sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
+++ b/sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -132,4 +133,11 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
this.update(matterEntity, context);
return Rest.ok(msg);
}
+
+ @Override
+ protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
+ List<MatterDatumEntity> matterDatumlist = matterDatumService.find(new MatterDatumQuery().matterIdList(Arrays.asList(ids)));
+ matterDatumService.removeList(matterDatumlist,context);
+ super.removeAfter(ids, context, result);
+ }
}
\ No newline at end of file
diff --git a/sample-form-manager/src/main/resources/sqlmap/module/matter/MatterMapper.xml b/sample-form-manager/src/main/resources/sqlmap/module/matter/MatterMapper.xml
index 56dc3d1a5e130da8b0a8823f1acc3b202698c59a..a26c66bdb5f7b062ac52bf08c379b8af61dd2ff1 100644
--- a/sample-form-manager/src/main/resources/sqlmap/module/matter/MatterMapper.xml
+++ b/sample-form-manager/src/main/resources/sqlmap/module/matter/MatterMapper.xml
@@ -1,93 +1,119 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+ "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.matter.dao.ibatis.MatterDaoImpl">
<!-- 瀛楁鍜屽睘鎬ф槧灏� -->
<resultMap type="MatterEntity" id="MatterEntity-Map">
- <id property="id" column="id" />
- <result property="siteId" column="siteId" />
- <result property="tid" column="tid" />
- <result property="tcode" column="tcode" />
- <result property="tname" column="tname" />
- <result property="matterName" column="matterName" />
- <result property="englishName" column="englishName" />
- <result property="matterNo" column="matterNo" />
- <result property="matterFullName" column="matterFullName" />
- <result property="deptId" column="deptId" />
- <result property="deptCode" column="deptCode" />
- <result property="deptName" column="deptName" />
- <result property="total" column="total" />
- <result property="sort" column="sort" />
- <result property="isRecommend" column="isRecommend" />
- <result property="source" column="source" />
- <result property="createTime" column="createTime" />
- <result property="createUserId" column="createUserId" />
- <result property="updateTime" column="updateTime" />
-
+ <id property="id" column="id" />
+ <result property="siteId" column="siteId" />
+ <result property="tid" column="tid" />
+ <result property="tcode" column="tcode" />
+ <result property="tname" column="tname" />
+ <result property="matterName" column="matterName" />
+ <result property="englishName" column="englishName" />
+ <result property="matterNo" column="matterNo" />
+ <result property="matterFullName" column="matterFullName" />
+ <result property="deptId" column="deptId" />
+ <result property="deptCode" column="deptCode" />
+ <result property="deptName" column="deptName" />
+ <result property="total" column="total" />
+ <result property="sort" column="sort" />
+ <result property="isRecommend" column="isRecommend" />
+ <result property="source" column="source" />
+ <result property="createTime" column="createTime" />
+ <result property="createUserId" column="createUserId" />
+ <result property="updateTime" column="updateTime" />
+ <collection property="matterDatumList" column="id" ofType="MatterDatumEntity" javaType="ArrayList" select="getMatterDatumByMatterId"></collection>
+ </resultMap>
+ <resultMap type="MatterDatumEntity" id="MatterDatumEntity-Map">
+ <result property="id" column="id" />
+ <result property="matterId" column="matterId" />
+ <result property="siteId" column="siteId" />
+ <result property="deptId" column="deptId" />
+ <result property="deptCode" column="deptCode" />
+ <result property="deptName" column="deptName" />
+ <result property="materialName" column="materialName" />
+ <result property="materiaFullName" column="materiaFullName" />
+ <result property="source" column="source" />
+ <result property="isRecommend" column="isRecommend" />
+ <result property="total" column="total" />
+ <result property="sort" column="sort" />
+ <result property="sampleName" column="sampleName" />
+ <result property="samplePath" column="samplePath" />
+ <result property="preViewPath" column="preViewPath" />
+ <result property="createTime" column="createTime" />
+ <result property="createUserId" column="createUserId" />
+ <result property="updateTime" column="updateTime" />
</resultMap>
<!-- 琛ㄦ墍鏈夊垪 -->
<sql id="_columns">
<trim suffixOverrides="," suffix="">
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
- a.id,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
- a.siteId,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('tid') or colPickMode == 1 and data.containsKey('tid')))">
- a.tid,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('tcode') or colPickMode == 1 and data.containsKey('tcode')))">
- a.tcode,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('tname') or colPickMode == 1 and data.containsKey('tname')))">
- a.tname,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterName') or colPickMode == 1 and data.containsKey('matterName')))">
- a.matterName,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('englishName') or colPickMode == 1 and data.containsKey('englishName')))">
- a.englishName,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterNo') or colPickMode == 1 and data.containsKey('matterNo')))">
- a.matterNo,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterFullName') or colPickMode == 1 and data.containsKey('matterFullName')))">
- a.matterFullName,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
- a.deptId,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptCode') or colPickMode == 1 and data.containsKey('deptCode')))">
- a.deptCode,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
- a.deptName,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('total') or colPickMode == 1 and data.containsKey('total')))">
- a.total,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sort') or colPickMode == 1 and data.containsKey('sort')))">
- a.sort,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isRecommend') or colPickMode == 1 and data.containsKey('isRecommend')))">
- a.isRecommend,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
- a.source,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
- a.createTime,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
- a.createUserId,
- </if>
- <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
- a.updateTime,
- </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+ a.id,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+ a.siteId,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('tid') or colPickMode == 1 and data.containsKey('tid')))">
+ a.tid,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('tcode') or colPickMode == 1 and data.containsKey('tcode')))">
+ a.tcode,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('tname') or colPickMode == 1 and data.containsKey('tname')))">
+ a.tname,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterName') or colPickMode == 1 and data.containsKey('matterName')))">
+ a.matterName,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('englishName') or colPickMode == 1 and data.containsKey('englishName')))">
+ a.englishName,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterNo') or colPickMode == 1 and data.containsKey('matterNo')))">
+ a.matterNo,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterFullName') or colPickMode == 1 and data.containsKey('matterFullName')))">
+ a.matterFullName,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
+ a.deptId,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptCode') or colPickMode == 1 and data.containsKey('deptCode')))">
+ a.deptCode,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
+ a.deptName,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('total') or colPickMode == 1 and data.containsKey('total')))">
+ a.total,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sort') or colPickMode == 1 and data.containsKey('sort')))">
+ a.sort,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isRecommend') or colPickMode == 1 and data.containsKey('isRecommend')))">
+ a.isRecommend,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
+ a.source,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+ a.createTime,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+ a.createUserId,
+ </if>
+ <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+ a.updateTime,
+ </if>
+ </trim>
+ </sql>
+ <!-- 瀛愯〃鎵€鏈夊垪 -->
+ <sql id="_columns_sub">
+ <trim suffixOverrides="," suffix="">
+ b.id,b.matterId,b.siteId,b.deptId,b.deptCode,b.deptName,b.materialName,b.materiaFullName,b.source,b.isRecommend,b.total,b.sort,b.sampleName,b.samplePath,b.preViewPath,b.createTime,b.createUserId,b.updateTime,
</trim>
</sql>
<!-- 鏂板 鍖哄垎涓婚敭鑷鍔犺繕鏄笟鍔℃彃鍏� -->
@@ -201,167 +227,167 @@
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_matter as a
<trim prefix="set" suffixOverrides=",">
- <trim prefix="siteId=(case" suffix="ELSE siteId end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
- when a.id=#{item.id} then #{item.siteId}
- </when>
- <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
- when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="tid=(case" suffix="ELSE tid end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('tid')) or (colPickMode==1 and !item.containsKey('tid'))">
- when a.id=#{item.id} then #{item.tid}
- </if>
- </foreach>
- </trim>
- <trim prefix="tcode=(case" suffix="ELSE tcode end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('tcode')) or (colPickMode==1 and !item.containsKey('tcode'))">
- when a.id=#{item.id} then #{item.tcode}
- </if>
- </foreach>
- </trim>
- <trim prefix="tname=(case" suffix="ELSE tname end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('tname')) or (colPickMode==1 and !item.containsKey('tname'))">
- when a.id=#{item.id} then #{item.tname}
- </if>
- </foreach>
- </trim>
- <trim prefix="matterName=(case" suffix="ELSE matterName end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('matterName')) or (colPickMode==1 and !item.containsKey('matterName'))">
- when a.id=#{item.id} then #{item.matterName}
- </if>
- </foreach>
- </trim>
- <trim prefix="englishName=(case" suffix="ELSE englishName end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('englishName')) or (colPickMode==1 and !item.containsKey('englishName'))">
- when a.id=#{item.id} then #{item.englishName}
- </if>
- </foreach>
- </trim>
- <trim prefix="matterNo=(case" suffix="ELSE matterNo end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('matterNo')) or (colPickMode==1 and !item.containsKey('matterNo'))">
- when a.id=#{item.id} then #{item.matterNo}
- </if>
- </foreach>
- </trim>
- <trim prefix="matterFullName=(case" suffix="ELSE matterFullName end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('matterFullName')) or (colPickMode==1 and !item.containsKey('matterFullName'))">
- when a.id=#{item.id} then #{item.matterFullName}
- </if>
- </foreach>
- </trim>
- <trim prefix="deptId=(case" suffix="ELSE deptId end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('deptId')) or (colPickMode==1 and !item.containsKey('deptId'))">
- when a.id=#{item.id} then #{item.deptId}
- </when>
- <when test="(colPickMode==0 and item.containsKey('deptIdIncrement')) or (colPickMode==1 and !item.containsKey('deptIdIncrement'))">
- when a.id=#{item.id} then ifnull(a.deptId,0) + #{item.deptIdIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="deptCode=(case" suffix="ELSE deptCode end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('deptCode')) or (colPickMode==1 and !item.containsKey('deptCode'))">
- when a.id=#{item.id} then #{item.deptCode}
- </if>
- </foreach>
- </trim>
- <trim prefix="deptName=(case" suffix="ELSE deptName end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('deptName')) or (colPickMode==1 and !item.containsKey('deptName'))">
- when a.id=#{item.id} then #{item.deptName}
- </if>
- </foreach>
- </trim>
- <trim prefix="total=(case" suffix="ELSE total end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('total')) or (colPickMode==1 and !item.containsKey('total'))">
- when a.id=#{item.id} then #{item.total}
- </when>
- <when test="(colPickMode==0 and item.containsKey('totalIncrement')) or (colPickMode==1 and !item.containsKey('totalIncrement'))">
- when a.id=#{item.id} then ifnull(a.total,0) + #{item.totalIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="sort=(case" suffix="ELSE sort end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('sort')) or (colPickMode==1 and !item.containsKey('sort'))">
- when a.id=#{item.id} then #{item.sort}
- </when>
- <when test="(colPickMode==0 and item.containsKey('sortIncrement')) or (colPickMode==1 and !item.containsKey('sortIncrement'))">
- when a.id=#{item.id} then ifnull(a.sort,0) + #{item.sortIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="isRecommend=(case" suffix="ELSE isRecommend end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('isRecommend')) or (colPickMode==1 and !item.containsKey('isRecommend'))">
- when a.id=#{item.id} then #{item.isRecommend}
- </when>
- <when test="(colPickMode==0 and item.containsKey('isRecommendIncrement')) or (colPickMode==1 and !item.containsKey('isRecommendIncrement'))">
- when a.id=#{item.id} then ifnull(a.isRecommend,0) + #{item.isRecommendIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="source=(case" suffix="ELSE source end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('source')) or (colPickMode==1 and !item.containsKey('source'))">
- when a.id=#{item.id} then #{item.source}
- </when>
- <when test="(colPickMode==0 and item.containsKey('sourceIncrement')) or (colPickMode==1 and !item.containsKey('sourceIncrement'))">
- when a.id=#{item.id} then ifnull(a.source,0) + #{item.sourceIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="createTime=(case" suffix="ELSE createTime end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
- when a.id=#{item.id} then #{item.createTime}
- </if>
- </foreach>
- </trim>
- <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <choose>
- <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
- when a.id=#{item.id} then #{item.createUserId}
- </when>
- <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
- when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
- </when>
- </choose>
- </foreach>
- </trim>
- <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
- <foreach collection="data.dataList" item="item" index="index" separator="" >
- <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
- when a.id=#{item.id} then #{item.updateTime}
- </if>
- </foreach>
- </trim>
+ <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+ when a.id=#{item.id} then #{item.siteId}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+ when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="tid=(case" suffix="ELSE tid end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('tid')) or (colPickMode==1 and !item.containsKey('tid'))">
+ when a.id=#{item.id} then #{item.tid}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="tcode=(case" suffix="ELSE tcode end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('tcode')) or (colPickMode==1 and !item.containsKey('tcode'))">
+ when a.id=#{item.id} then #{item.tcode}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="tname=(case" suffix="ELSE tname end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('tname')) or (colPickMode==1 and !item.containsKey('tname'))">
+ when a.id=#{item.id} then #{item.tname}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="matterName=(case" suffix="ELSE matterName end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('matterName')) or (colPickMode==1 and !item.containsKey('matterName'))">
+ when a.id=#{item.id} then #{item.matterName}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="englishName=(case" suffix="ELSE englishName end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('englishName')) or (colPickMode==1 and !item.containsKey('englishName'))">
+ when a.id=#{item.id} then #{item.englishName}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="matterNo=(case" suffix="ELSE matterNo end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('matterNo')) or (colPickMode==1 and !item.containsKey('matterNo'))">
+ when a.id=#{item.id} then #{item.matterNo}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="matterFullName=(case" suffix="ELSE matterFullName end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('matterFullName')) or (colPickMode==1 and !item.containsKey('matterFullName'))">
+ when a.id=#{item.id} then #{item.matterFullName}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="deptId=(case" suffix="ELSE deptId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('deptId')) or (colPickMode==1 and !item.containsKey('deptId'))">
+ when a.id=#{item.id} then #{item.deptId}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('deptIdIncrement')) or (colPickMode==1 and !item.containsKey('deptIdIncrement'))">
+ when a.id=#{item.id} then ifnull(a.deptId,0) + #{item.deptIdIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="deptCode=(case" suffix="ELSE deptCode end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('deptCode')) or (colPickMode==1 and !item.containsKey('deptCode'))">
+ when a.id=#{item.id} then #{item.deptCode}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="deptName=(case" suffix="ELSE deptName end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('deptName')) or (colPickMode==1 and !item.containsKey('deptName'))">
+ when a.id=#{item.id} then #{item.deptName}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="total=(case" suffix="ELSE total end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('total')) or (colPickMode==1 and !item.containsKey('total'))">
+ when a.id=#{item.id} then #{item.total}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('totalIncrement')) or (colPickMode==1 and !item.containsKey('totalIncrement'))">
+ when a.id=#{item.id} then ifnull(a.total,0) + #{item.totalIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="sort=(case" suffix="ELSE sort end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('sort')) or (colPickMode==1 and !item.containsKey('sort'))">
+ when a.id=#{item.id} then #{item.sort}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('sortIncrement')) or (colPickMode==1 and !item.containsKey('sortIncrement'))">
+ when a.id=#{item.id} then ifnull(a.sort,0) + #{item.sortIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="isRecommend=(case" suffix="ELSE isRecommend end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('isRecommend')) or (colPickMode==1 and !item.containsKey('isRecommend'))">
+ when a.id=#{item.id} then #{item.isRecommend}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('isRecommendIncrement')) or (colPickMode==1 and !item.containsKey('isRecommendIncrement'))">
+ when a.id=#{item.id} then ifnull(a.isRecommend,0) + #{item.isRecommendIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="source=(case" suffix="ELSE source end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('source')) or (colPickMode==1 and !item.containsKey('source'))">
+ when a.id=#{item.id} then #{item.source}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('sourceIncrement')) or (colPickMode==1 and !item.containsKey('sourceIncrement'))">
+ when a.id=#{item.id} then ifnull(a.source,0) + #{item.sourceIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+ when a.id=#{item.id} then #{item.createTime}
+ </if>
+ </foreach>
+ </trim>
+ <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <choose>
+ <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+ when a.id=#{item.id} then #{item.createUserId}
+ </when>
+ <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+ when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+ </when>
+ </choose>
+ </foreach>
+ </trim>
+ <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+ <foreach collection="data.dataList" item="item" index="index" separator="" >
+ <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+ when a.id=#{item.id} then #{item.updateTime}
+ </if>
+ </foreach>
+ </trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -407,6 +433,14 @@
</trim>
<include refid="_orderCols_"/>
</select>
+ <!-- 鑾峰彇瀛愬垪琛� -->
+ <select id="getMatterDatumByMatterId" parameterType="java.lang.Long" resultMap="MatterDatumEntity-Map">
+ select <include refid="_columns_sub"/>
+ from mortals_xhx_matter_datum as b
+ <trim suffixOverrides="where" suffix="">
+ where b.matterId = #{id}
+ </trim>
+ </select>
@@ -463,447 +497,447 @@
${_conditionType_} a.id=#{${_conditionParam_}.id}
</if>
</if>
- <if test="conditionParamRef.containsKey('id')">
- <if test="conditionParamRef.id != null ">
- ${_conditionType_} a.id = #{${_conditionParam_}.id}
- </if>
- <if test="conditionParamRef.id == null">
- ${_conditionType_} a.id is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('idList')">
- ${_conditionType_} a.id in
- <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
- ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+ <if test="conditionParamRef.containsKey('id')">
+ <if test="conditionParamRef.id != null ">
+ ${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
- <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
- ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+ <if test="conditionParamRef.id == null">
+ ${_conditionType_} a.id is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('idList')">
+ ${_conditionType_} a.id in
+ <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+ ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+ </if>
+ <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+ ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+ </if>
- <if test="conditionParamRef.containsKey('siteId')">
- <if test="conditionParamRef.siteId != null ">
- ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
- </if>
- <if test="conditionParamRef.siteId == null">
- ${_conditionType_} a.siteId is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('siteIdList')">
- ${_conditionType_} a.siteId in
- <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.containsKey('siteId')">
+ <if test="conditionParamRef.siteId != null ">
+ ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
- <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
- ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
- </if>
- <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
- ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+ <if test="conditionParamRef.siteId == null">
+ ${_conditionType_} a.siteId is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('siteIdList')">
+ ${_conditionType_} a.siteId in
+ <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
+ ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+ ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+ </if>
- <if test="conditionParamRef.containsKey('tid')">
- <if test="conditionParamRef.tid != null and conditionParamRef.tid != ''">
- ${_conditionType_} a.tid like #{${_conditionParam_}.tid}
- </if>
- <if test="conditionParamRef.tid == null">
- ${_conditionType_} a.tid is null
- </if>
+ <if test="conditionParamRef.containsKey('tid')">
+ <if test="conditionParamRef.tid != null and conditionParamRef.tid != ''">
+ ${_conditionType_} a.tid like #{${_conditionParam_}.tid}
</if>
- <if test="conditionParamRef.containsKey('tidList')">
- ${_conditionType_} a.tid in
- <foreach collection="conditionParamRef.tidList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.tid == null">
+ ${_conditionType_} a.tid is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('tidList')">
+ ${_conditionType_} a.tid in
+ <foreach collection="conditionParamRef.tidList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
- <if test="conditionParamRef.containsKey('tcode')">
- <if test="conditionParamRef.tcode != null and conditionParamRef.tcode != ''">
- ${_conditionType_} a.tcode like #{${_conditionParam_}.tcode}
- </if>
- <if test="conditionParamRef.tcode == null">
- ${_conditionType_} a.tcode is null
- </if>
+ <if test="conditionParamRef.containsKey('tcode')">
+ <if test="conditionParamRef.tcode != null and conditionParamRef.tcode != ''">
+ ${_conditionType_} a.tcode like #{${_conditionParam_}.tcode}
</if>
- <if test="conditionParamRef.containsKey('tcodeList')">
- ${_conditionType_} a.tcode in
- <foreach collection="conditionParamRef.tcodeList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.tcode == null">
+ ${_conditionType_} a.tcode is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('tcodeList')">
+ ${_conditionType_} a.tcode in
+ <foreach collection="conditionParamRef.tcodeList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
- <if test="conditionParamRef.containsKey('tname')">
- <if test="conditionParamRef.tname != null and conditionParamRef.tname != ''">
- ${_conditionType_} a.tname like #{${_conditionParam_}.tname}
- </if>
- <if test="conditionParamRef.tname == null">
- ${_conditionType_} a.tname is null
- </if>
+ <if test="conditionParamRef.containsKey('tname')">
+ <if test="conditionParamRef.tname != null and conditionParamRef.tname != ''">
+ ${_conditionType_} a.tname like #{${_conditionParam_}.tname}
</if>
- <if test="conditionParamRef.containsKey('tnameList')">
- ${_conditionType_} a.tname in
- <foreach collection="conditionParamRef.tnameList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.tname == null">
+ ${_conditionType_} a.tname is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('tnameList')">
+ ${_conditionType_} a.tname in
+ <foreach collection="conditionParamRef.tnameList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
- <if test="conditionParamRef.containsKey('matterName')">
- <if test="conditionParamRef.matterName != null and conditionParamRef.matterName != ''">
- ${_conditionType_} a.matterName like #{${_conditionParam_}.matterName}
- </if>
- <if test="conditionParamRef.matterName == null">
- ${_conditionType_} a.matterName is null
- </if>
+ <if test="conditionParamRef.containsKey('matterName')">
+ <if test="conditionParamRef.matterName != null and conditionParamRef.matterName != ''">
+ ${_conditionType_} a.matterName like #{${_conditionParam_}.matterName}
</if>
- <if test="conditionParamRef.containsKey('matterNameList')">
- ${_conditionType_} a.matterName in
- <foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.matterName == null">
+ ${_conditionType_} a.matterName is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('matterNameList')">
+ ${_conditionType_} a.matterName in
+ <foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
- <if test="conditionParamRef.containsKey('englishName')">
- <if test="conditionParamRef.englishName != null and conditionParamRef.englishName != ''">
- ${_conditionType_} a.englishName like #{${_conditionParam_}.englishName}
- </if>
- <if test="conditionParamRef.englishName == null">
- ${_conditionType_} a.englishName is null
- </if>
+ <if test="conditionParamRef.containsKey('englishName')">
+ <if test="conditionParamRef.englishName != null and conditionParamRef.englishName != ''">
+ ${_conditionType_} a.englishName like #{${_conditionParam_}.englishName}
</if>
- <if test="conditionParamRef.containsKey('englishNameList')">
- ${_conditionType_} a.englishName in
- <foreach collection="conditionParamRef.englishNameList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.englishName == null">
+ ${_conditionType_} a.englishName is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('englishNameList')">
+ ${_conditionType_} a.englishName in
+ <foreach collection="conditionParamRef.englishNameList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
- <if test="conditionParamRef.containsKey('matterNo')">
- <if test="conditionParamRef.matterNo != null and conditionParamRef.matterNo != ''">
- ${_conditionType_} a.matterNo like #{${_conditionParam_}.matterNo}
- </if>
- <if test="conditionParamRef.matterNo == null">
- ${_conditionType_} a.matterNo is null
- </if>
+ <if test="conditionParamRef.containsKey('matterNo')">
+ <if test="conditionParamRef.matterNo != null and conditionParamRef.matterNo != ''">
+ ${_conditionType_} a.matterNo like #{${_conditionParam_}.matterNo}
</if>
- <if test="conditionParamRef.containsKey('matterNoList')">
- ${_conditionType_} a.matterNo in
- <foreach collection="conditionParamRef.matterNoList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.matterNo == null">
+ ${_conditionType_} a.matterNo is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('matterNoList')">
+ ${_conditionType_} a.matterNo in
+ <foreach collection="conditionParamRef.matterNoList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
- <if test="conditionParamRef.containsKey('matterFullName')">
- <if test="conditionParamRef.matterFullName != null and conditionParamRef.matterFullName != ''">
- ${_conditionType_} a.matterFullName like #{${_conditionParam_}.matterFullName}
- </if>
- <if test="conditionParamRef.matterFullName == null">
- ${_conditionType_} a.matterFullName is null
- </if>
+ <if test="conditionParamRef.containsKey('matterFullName')">
+ <if test="conditionParamRef.matterFullName != null and conditionParamRef.matterFullName != ''">
+ ${_conditionType_} a.matterFullName like #{${_conditionParam_}.matterFullName}
</if>
- <if test="conditionParamRef.containsKey('matterFullNameList')">
- ${_conditionType_} a.matterFullName in
- <foreach collection="conditionParamRef.matterFullNameList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.matterFullName == null">
+ ${_conditionType_} a.matterFullName is null
</if>
- <if test="conditionParamRef.containsKey('deptId')">
- <if test="conditionParamRef.deptId != null ">
- ${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
- </if>
- <if test="conditionParamRef.deptId == null">
- ${_conditionType_} a.deptId is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('deptIdList')">
- ${_conditionType_} a.deptId in
- <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('deptIdStart') and conditionParamRef.deptIdStart != null">
- ${_conditionType_} a.deptId <![CDATA[ >= ]]> #{${_conditionParam_}.deptIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('matterFullNameList')">
+ ${_conditionType_} a.matterFullName in
+ <foreach collection="conditionParamRef.matterFullNameList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('deptId')">
+ <if test="conditionParamRef.deptId != null ">
+ ${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
</if>
- <if test="conditionParamRef.containsKey('deptIdEnd') and conditionParamRef.deptIdEnd != null">
- ${_conditionType_} a.deptId <![CDATA[ <= ]]> #{${_conditionParam_}.deptIdEnd}
+ <if test="conditionParamRef.deptId == null">
+ ${_conditionType_} a.deptId is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('deptIdList')">
+ ${_conditionType_} a.deptId in
+ <foreach collection="conditionParamRef.deptIdList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('deptIdStart') and conditionParamRef.deptIdStart != null">
+ ${_conditionType_} a.deptId <![CDATA[ >= ]]> #{${_conditionParam_}.deptIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('deptIdEnd') and conditionParamRef.deptIdEnd != null">
+ ${_conditionType_} a.deptId <![CDATA[ <= ]]> #{${_conditionParam_}.deptIdEnd}
+ </if>
- <if test="conditionParamRef.containsKey('deptCode')">
- <if test="conditionParamRef.deptCode != null and conditionParamRef.deptCode != ''">
- ${_conditionType_} a.deptCode like #{${_conditionParam_}.deptCode}
- </if>
- <if test="conditionParamRef.deptCode == null">
- ${_conditionType_} a.deptCode is null
- </if>
+ <if test="conditionParamRef.containsKey('deptCode')">
+ <if test="conditionParamRef.deptCode != null and conditionParamRef.deptCode != ''">
+ ${_conditionType_} a.deptCode like #{${_conditionParam_}.deptCode}
</if>
- <if test="conditionParamRef.containsKey('deptCodeList')">
- ${_conditionType_} a.deptCode in
- <foreach collection="conditionParamRef.deptCodeList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.deptCode == null">
+ ${_conditionType_} a.deptCode is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('deptCodeList')">
+ ${_conditionType_} a.deptCode in
+ <foreach collection="conditionParamRef.deptCodeList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
- <if test="conditionParamRef.containsKey('deptName')">
- <if test="conditionParamRef.deptName != null and conditionParamRef.deptName != ''">
- ${_conditionType_} a.deptName like #{${_conditionParam_}.deptName}
- </if>
- <if test="conditionParamRef.deptName == null">
- ${_conditionType_} a.deptName is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('deptNameList')">
- ${_conditionType_} a.deptName in
- <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('total')">
- <if test="conditionParamRef.total != null ">
- ${_conditionType_} a.total = #{${_conditionParam_}.total}
- </if>
- <if test="conditionParamRef.total == null">
- ${_conditionType_} a.total is null
- </if>
+ <if test="conditionParamRef.containsKey('deptName')">
+ <if test="conditionParamRef.deptName != null and conditionParamRef.deptName != ''">
+ ${_conditionType_} a.deptName like #{${_conditionParam_}.deptName}
</if>
- <if test="conditionParamRef.containsKey('totalList')">
- ${_conditionType_} a.total in
- <foreach collection="conditionParamRef.totalList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
+ <if test="conditionParamRef.deptName == null">
+ ${_conditionType_} a.deptName is null
</if>
- <if test="conditionParamRef.containsKey('totalStart') and conditionParamRef.totalStart != null">
- ${_conditionType_} a.total <![CDATA[ >= ]]> #{${_conditionParam_}.totalStart}
+ </if>
+ <if test="conditionParamRef.containsKey('deptNameList')">
+ ${_conditionType_} a.deptName in
+ <foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('total')">
+ <if test="conditionParamRef.total != null ">
+ ${_conditionType_} a.total = #{${_conditionParam_}.total}
</if>
- <if test="conditionParamRef.containsKey('totalEnd') and conditionParamRef.totalEnd != null">
- ${_conditionType_} a.total <![CDATA[ <= ]]> #{${_conditionParam_}.totalEnd}
+ <if test="conditionParamRef.total == null">
+ ${_conditionType_} a.total is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('totalList')">
+ ${_conditionType_} a.total in
+ <foreach collection="conditionParamRef.totalList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('totalStart') and conditionParamRef.totalStart != null">
+ ${_conditionType_} a.total <![CDATA[ >= ]]> #{${_conditionParam_}.totalStart}
+ </if>
+ <if test="conditionParamRef.containsKey('totalEnd') and conditionParamRef.totalEnd != null">
+ ${_conditionType_} a.total <![CDATA[ <= ]]> #{${_conditionParam_}.totalEnd}
+ </if>
- <if test="conditionParamRef.containsKey('sort')">
- <if test="conditionParamRef.sort != null ">
- ${_conditionType_} a.sort = #{${_conditionParam_}.sort}
- </if>
- <if test="conditionParamRef.sort == null">
- ${_conditionType_} a.sort is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('sortList')">
- ${_conditionType_} a.sort in
- <foreach collection="conditionParamRef.sortList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('sortStart') and conditionParamRef.sortStart != null">
- ${_conditionType_} a.sort <![CDATA[ >= ]]> #{${_conditionParam_}.sortStart}
+ <if test="conditionParamRef.containsKey('sort')">
+ <if test="conditionParamRef.sort != null ">
+ ${_conditionType_} a.sort = #{${_conditionParam_}.sort}
</if>
- <if test="conditionParamRef.containsKey('sortEnd') and conditionParamRef.sortEnd != null">
- ${_conditionType_} a.sort <![CDATA[ <= ]]> #{${_conditionParam_}.sortEnd}
+ <if test="conditionParamRef.sort == null">
+ ${_conditionType_} a.sort is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('sortList')">
+ ${_conditionType_} a.sort in
+ <foreach collection="conditionParamRef.sortList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('sortStart') and conditionParamRef.sortStart != null">
+ ${_conditionType_} a.sort <![CDATA[ >= ]]> #{${_conditionParam_}.sortStart}
+ </if>
+ <if test="conditionParamRef.containsKey('sortEnd') and conditionParamRef.sortEnd != null">
+ ${_conditionType_} a.sort <![CDATA[ <= ]]> #{${_conditionParam_}.sortEnd}
+ </if>
- <if test="conditionParamRef.containsKey('isRecommend')">
- <if test="conditionParamRef.isRecommend != null ">
- ${_conditionType_} a.isRecommend = #{${_conditionParam_}.isRecommend}
- </if>
- <if test="conditionParamRef.isRecommend == null">
- ${_conditionType_} a.isRecommend is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('isRecommendList')">
- ${_conditionType_} a.isRecommend in
- <foreach collection="conditionParamRef.isRecommendList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('isRecommendStart') and conditionParamRef.isRecommendStart != null">
- ${_conditionType_} a.isRecommend <![CDATA[ >= ]]> #{${_conditionParam_}.isRecommendStart}
+ <if test="conditionParamRef.containsKey('isRecommend')">
+ <if test="conditionParamRef.isRecommend != null ">
+ ${_conditionType_} a.isRecommend = #{${_conditionParam_}.isRecommend}
</if>
- <if test="conditionParamRef.containsKey('isRecommendEnd') and conditionParamRef.isRecommendEnd != null">
- ${_conditionType_} a.isRecommend <![CDATA[ <= ]]> #{${_conditionParam_}.isRecommendEnd}
+ <if test="conditionParamRef.isRecommend == null">
+ ${_conditionType_} a.isRecommend is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('isRecommendList')">
+ ${_conditionType_} a.isRecommend in
+ <foreach collection="conditionParamRef.isRecommendList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('isRecommendStart') and conditionParamRef.isRecommendStart != null">
+ ${_conditionType_} a.isRecommend <![CDATA[ >= ]]> #{${_conditionParam_}.isRecommendStart}
+ </if>
+ <if test="conditionParamRef.containsKey('isRecommendEnd') and conditionParamRef.isRecommendEnd != null">
+ ${_conditionType_} a.isRecommend <![CDATA[ <= ]]> #{${_conditionParam_}.isRecommendEnd}
+ </if>
- <if test="conditionParamRef.containsKey('source')">
- <if test="conditionParamRef.source != null ">
- ${_conditionType_} a.source = #{${_conditionParam_}.source}
- </if>
- <if test="conditionParamRef.source == null">
- ${_conditionType_} a.source is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('sourceList')">
- ${_conditionType_} a.source in
- <foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
- ${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
+ <if test="conditionParamRef.containsKey('source')">
+ <if test="conditionParamRef.source != null ">
+ ${_conditionType_} a.source = #{${_conditionParam_}.source}
</if>
- <if test="conditionParamRef.containsKey('sourceEnd') and conditionParamRef.sourceEnd != null">
- ${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
+ <if test="conditionParamRef.source == null">
+ ${_conditionType_} a.source is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('sourceList')">
+ ${_conditionType_} a.source in
+ <foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
+ ${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
+ </if>
+ <if test="conditionParamRef.containsKey('sourceEnd') and conditionParamRef.sourceEnd != null">
+ ${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
+ </if>
- <if test="conditionParamRef.containsKey('createTime')">
- <if test="conditionParamRef.createTime != null ">
- ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
- </if>
- <if test="conditionParamRef.createTime == null">
- ${_conditionType_} a.createTime is null
- </if>
+ <if test="conditionParamRef.containsKey('createTime')">
+ <if test="conditionParamRef.createTime != null ">
+ ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
- <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
- ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+ <if test="conditionParamRef.createTime == null">
+ ${_conditionType_} a.createTime is null
</if>
- <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
- ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('createUserId')">
- <if test="conditionParamRef.createUserId != null ">
- ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
- </if>
- <if test="conditionParamRef.createUserId == null">
- ${_conditionType_} a.createUserId is null
- </if>
- </if>
- <if test="conditionParamRef.containsKey('createUserIdList')">
- ${_conditionType_} a.createUserId in
- <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
- #{item}
- </foreach>
- </if>
- <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
- ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+ ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+ </if>
+ <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+ ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+ </if>
+ <if test="conditionParamRef.containsKey('createUserId')">
+ <if test="conditionParamRef.createUserId != null ">
+ ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
- <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
- ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+ <if test="conditionParamRef.createUserId == null">
+ ${_conditionType_} a.createUserId is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('createUserIdList')">
+ ${_conditionType_} a.createUserId in
+ <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+ ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+ </if>
+ <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+ ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+ </if>
- <if test="conditionParamRef.containsKey('updateTime')">
- <if test="conditionParamRef.updateTime != null ">
- ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
- </if>
- <if test="conditionParamRef.updateTime == null">
- ${_conditionType_} a.updateTime is null
- </if>
+ <if test="conditionParamRef.containsKey('updateTime')">
+ <if test="conditionParamRef.updateTime != null ">
+ ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
- <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
- ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
- </if>
- <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
- ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+ <if test="conditionParamRef.updateTime == null">
+ ${_conditionType_} a.updateTime is null
</if>
+ </if>
+ <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+ ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+ </if>
+ <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+ ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+ </if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
- ${item.colName} ${item.sortKind}
+ ${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
- <if test="orderCol.containsKey('id')">
- a.id
- <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('siteId')">
- a.siteId
- <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('tid')">
- a.tid
- <if test='orderCol.tid != null and "DESC".equalsIgnoreCase(orderCol.tid)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('tcode')">
- a.tcode
- <if test='orderCol.tcode != null and "DESC".equalsIgnoreCase(orderCol.tcode)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('tname')">
- a.tname
- <if test='orderCol.tname != null and "DESC".equalsIgnoreCase(orderCol.tname)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('matterName')">
- a.matterName
- <if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('englishName')">
- a.englishName
- <if test='orderCol.englishName != null and "DESC".equalsIgnoreCase(orderCol.englishName)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('matterNo')">
- a.matterNo
- <if test='orderCol.matterNo != null and "DESC".equalsIgnoreCase(orderCol.matterNo)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('matterFullName')">
- a.matterFullName
- <if test='orderCol.matterFullName != null and "DESC".equalsIgnoreCase(orderCol.matterFullName)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('deptId')">
- a.deptId
- <if test='orderCol.deptId != null and "DESC".equalsIgnoreCase(orderCol.deptId)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('deptCode')">
- a.deptCode
- <if test='orderCol.deptCode != null and "DESC".equalsIgnoreCase(orderCol.deptCode)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('deptName')">
- a.deptName
- <if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('total')">
- a.total
- <if test='orderCol.total != null and "DESC".equalsIgnoreCase(orderCol.total)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('sort')">
- a.sort
- <if test='orderCol.sort != null and "DESC".equalsIgnoreCase(orderCol.sort)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('isRecommend')">
- a.isRecommend
- <if test='orderCol.isRecommend != null and "DESC".equalsIgnoreCase(orderCol.isRecommend)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('source')">
- a.source
- <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('createTime')">
- a.createTime
- <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('createUserId')">
- a.createUserId
- <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
- ,
- </if>
- <if test="orderCol.containsKey('updateTime')">
- a.updateTime
- <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
- ,
- </if>
+ <if test="orderCol.containsKey('id')">
+ a.id
+ <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('siteId')">
+ a.siteId
+ <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('tid')">
+ a.tid
+ <if test='orderCol.tid != null and "DESC".equalsIgnoreCase(orderCol.tid)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('tcode')">
+ a.tcode
+ <if test='orderCol.tcode != null and "DESC".equalsIgnoreCase(orderCol.tcode)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('tname')">
+ a.tname
+ <if test='orderCol.tname != null and "DESC".equalsIgnoreCase(orderCol.tname)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('matterName')">
+ a.matterName
+ <if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('englishName')">
+ a.englishName
+ <if test='orderCol.englishName != null and "DESC".equalsIgnoreCase(orderCol.englishName)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('matterNo')">
+ a.matterNo
+ <if test='orderCol.matterNo != null and "DESC".equalsIgnoreCase(orderCol.matterNo)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('matterFullName')">
+ a.matterFullName
+ <if test='orderCol.matterFullName != null and "DESC".equalsIgnoreCase(orderCol.matterFullName)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('deptId')">
+ a.deptId
+ <if test='orderCol.deptId != null and "DESC".equalsIgnoreCase(orderCol.deptId)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('deptCode')">
+ a.deptCode
+ <if test='orderCol.deptCode != null and "DESC".equalsIgnoreCase(orderCol.deptCode)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('deptName')">
+ a.deptName
+ <if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('total')">
+ a.total
+ <if test='orderCol.total != null and "DESC".equalsIgnoreCase(orderCol.total)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('sort')">
+ a.sort
+ <if test='orderCol.sort != null and "DESC".equalsIgnoreCase(orderCol.sort)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('isRecommend')">
+ a.isRecommend
+ <if test='orderCol.isRecommend != null and "DESC".equalsIgnoreCase(orderCol.isRecommend)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('source')">
+ a.source
+ <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('createTime')">
+ a.createTime
+ <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('createUserId')">
+ a.createUserId
+ <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+ ,
+ </if>
+ <if test="orderCol.containsKey('updateTime')">
+ a.updateTime
+ <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+ ,
+ </if>
</trim>
</if>
</sql>