lab_gzf 发布系统代码

app_BusinessCentral/src/locale/lanres/entities/account/account_en_US.ts

@@ -271,57 +271,6 @@ export default {
       		title: "客户编辑视图",
 		},
 	},
-	edit_accountinfo_form: {
-		details: {
-			group1: "客户基本信息", 
-			formpage1: "基本信息", 
-			srfupdatedate: "更新时间", 
-			srforikey: "", 
-			srfkey: "客户", 
-			srfmajortext: "客户名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			accountname: "客户名称", 
-			telephone1: "主要电话", 
-			fax: "传真", 
-			websiteurl: "网站", 
-			parentaccountname: "上级客户", 
-			tickersymbol: "股票代号", 
-			customertypecode: "关系类型", 
-			defaultpricelevelname: "价目表", 
-			defaultpricelevelid: "价目表", 
-			parentaccountid: "上级单位", 
-			accountid: "客户", 
-		},
-		uiactions: {
-		},
-	},
-	edit_address_form: {
-		details: {
-			group1: "客户基本信息", 
-			formpage1: "基本信息", 
-			srfupdatedate: "更新时间", 
-			srforikey: "", 
-			srfkey: "客户", 
-			srfmajortext: "客户名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			address1_addressid: "地址 1: ID", 
-			address1_name: "地址 1: 名称", 
-			address1_addresstypecode: "地址 1: 地址类型", 
-			address1_country: "地址 1: 国家/地区", 
-			address1_stateorprovince: "地址 1: 省/市/自治区", 
-			address1_city: "地址 1: 市/县", 
-			address1_county: "地址 1: 县", 
-			accountid: "客户", 
-		},
-		uiactions: {
-		},
-	},
 	info_all_form: {
 		details: {
 			group1: "账户信息", 
@@ -373,10 +322,6 @@ export default {
 			accountid: "客户", 
 		},
 		uiactions: {
-        account_edit_accountinfo: "编辑",
-        account_edit_address: "编辑",
-        contact_quickcreate: "新建",
-        contact_openinfoview: "打开主信息界面",
 		},
 	},
 	quickcreate_form: {
@@ -532,6 +477,33 @@ export default {
 		uiactions: {
 		},
 	},
+	edit_accountinfo_form: {
+		details: {
+			group1: "客户基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "客户", 
+			srfmajortext: "客户名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			accountname: "客户名称", 
+			telephone1: "主要电话", 
+			fax: "传真", 
+			websiteurl: "网站", 
+			parentaccountname: "上级客户", 
+			tickersymbol: "股票代号", 
+			customertypecode: "关系类型", 
+			defaultpricelevelname: "价目表", 
+			defaultpricelevelid: "价目表", 
+			parentaccountid: "上级单位", 
+			accountid: "客户", 
+		},
+		uiactions: {
+		},
+	},
 	introduction_form: {
 		details: {
 			group1: "客户基本信息", 
@@ -640,6 +612,30 @@ export default {
 		uiactions: {
 		},
 	},
+	edit_address_form: {
+		details: {
+			group1: "客户基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "客户", 
+			srfmajortext: "客户名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			address1_addressid: "地址 1: ID", 
+			address1_name: "地址 1: 名称", 
+			address1_addresstypecode: "地址 1: 地址类型", 
+			address1_country: "地址 1: 国家/地区", 
+			address1_stateorprovince: "地址 1: 省/市/自治区", 
+			address1_city: "地址 1: 市/县", 
+			address1_county: "地址 1: 县", 
+			accountid: "客户", 
+		},
+		uiactions: {
+		},
+	},
 	info_majorcontact_form: {
 		details: {
 			druipart1: "", 

app_BusinessCentral/src/locale/lanres/entities/account/account_zh_CN.ts

@@ -270,57 +270,6 @@ export default {
       		title: "客户编辑视图",
 		},
 	},
-	edit_accountinfo_form: {
-		details: {
-			group1: "客户基本信息", 
-			formpage1: "基本信息", 
-			srfupdatedate: "更新时间", 
-			srforikey: "", 
-			srfkey: "客户", 
-			srfmajortext: "客户名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			accountname: "客户名称", 
-			telephone1: "主要电话", 
-			fax: "传真", 
-			websiteurl: "网站", 
-			parentaccountname: "上级客户", 
-			tickersymbol: "股票代号", 
-			customertypecode: "关系类型", 
-			defaultpricelevelname: "价目表", 
-			defaultpricelevelid: "价目表", 
-			parentaccountid: "上级单位", 
-			accountid: "客户", 
-		},
-		uiactions: {
-		},
-	},
-	edit_address_form: {
-		details: {
-			group1: "客户基本信息", 
-			formpage1: "基本信息", 
-			srfupdatedate: "更新时间", 
-			srforikey: "", 
-			srfkey: "客户", 
-			srfmajortext: "客户名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			address1_addressid: "地址 1: ID", 
-			address1_name: "地址 1: 名称", 
-			address1_addresstypecode: "地址 1: 地址类型", 
-			address1_country: "地址 1: 国家/地区", 
-			address1_stateorprovince: "地址 1: 省/市/自治区", 
-			address1_city: "地址 1: 市/县", 
-			address1_county: "地址 1: 县", 
-			accountid: "客户", 
-		},
-		uiactions: {
-		},
-	},
 	info_all_form: {
 		details: {
 			group1: "账户信息", 
@@ -372,10 +321,6 @@ export default {
 			accountid: "客户", 
 		},
 		uiactions: {
-			account_edit_accountinfo: "编辑",
-			account_edit_address: "编辑",
-			contact_quickcreate: "新建",
-			contact_openinfoview: "打开主信息界面",
 		},
 	},
 	quickcreate_form: {
@@ -531,6 +476,33 @@ export default {
 		uiactions: {
 		},
 	},
+	edit_accountinfo_form: {
+		details: {
+			group1: "客户基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "客户", 
+			srfmajortext: "客户名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			accountname: "客户名称", 
+			telephone1: "主要电话", 
+			fax: "传真", 
+			websiteurl: "网站", 
+			parentaccountname: "上级客户", 
+			tickersymbol: "股票代号", 
+			customertypecode: "关系类型", 
+			defaultpricelevelname: "价目表", 
+			defaultpricelevelid: "价目表", 
+			parentaccountid: "上级单位", 
+			accountid: "客户", 
+		},
+		uiactions: {
+		},
+	},
 	introduction_form: {
 		details: {
 			group1: "客户基本信息", 
@@ -639,6 +611,30 @@ export default {
 		uiactions: {
 		},
 	},
+	edit_address_form: {
+		details: {
+			group1: "客户基本信息", 
+			formpage1: "基本信息", 
+			srfupdatedate: "更新时间", 
+			srforikey: "", 
+			srfkey: "客户", 
+			srfmajortext: "客户名称", 
+			srftempmode: "", 
+			srfuf: "", 
+			srfdeid: "", 
+			srfsourcekey: "", 
+			address1_addressid: "地址 1: ID", 
+			address1_name: "地址 1: 名称", 
+			address1_addresstypecode: "地址 1: 地址类型", 
+			address1_country: "地址 1: 国家/地区", 
+			address1_stateorprovince: "地址 1: 省/市/自治区", 
+			address1_city: "地址 1: 市/县", 
+			address1_county: "地址 1: 县", 
+			accountid: "客户", 
+		},
+		uiactions: {
+		},
+	},
 	info_majorcontact_form: {
 		details: {
 			druipart1: "", 

app_BusinessCentral/src/locale/lanres/entities/contact/contact_en_US.ts

@@ -733,7 +733,11 @@ export default {
 		},
 	},
 	editviewtoolbar_toolbar: {
-		tbitem12: {
+		tbitem1: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
+		tbitem2: {
 			caption: "关闭",
 			tip: "关闭",
 		},

app_BusinessCentral/src/locale/lanres/entities/contact/contact_zh_CN.ts

@@ -732,7 +732,11 @@ export default {
 		},
 	},
 	editviewtoolbar_toolbar: {
-		tbitem12: {
+		tbitem1: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
+		tbitem2: {
 			caption: "关闭",
 			tip: "关闭",
 		},

app_BusinessCentral/src/pages/base/central/router.ts

@@ -8842,20 +8842,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/sales/competitor-edit-view/competitor-edit-view.vue'),
                 },
-                {
-                    path: 'accounts/:account?/edit_address/:edit_address?',
-                    meta: {
-                        caption: 'entities.account.views.edit_address.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'accounts', parameterName: 'account' },
-                            { pathName: 'edit_address', parameterName: 'edit_address' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/base/account-edit-address/account-edit-address.vue'),
-                },
                 {
                     path: 'accounts/:account?/contacts/:contact?/opportunities/:opportunity?/quotes/:quote?/gridview/:gridview?',
                     meta: {
@@ -11013,20 +10999,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/base/account-stop-grid-view/account-stop-grid-view.vue'),
                 },
-                {
-                    path: 'accounts/:account?/edit_accountinfo/:edit_accountinfo?',
-                    meta: {
-                        caption: 'entities.account.views.edit_accountinfo.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'central', parameterName: 'central' },
-                            { pathName: 'accounts', parameterName: 'account' },
-                            { pathName: 'edit_accountinfo', parameterName: 'edit_accountinfo' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/base/account-edit-account-info/account-edit-account-info.vue'),
-                },
                 {
                     path: 'incidents/:incident?/effectivegridview/:effectivegridview?',
                     meta: {

app_BusinessCentral/src/pages/base/contact-edit-view/contact-edit-view-base.tsx

@@ -99,7 +99,9 @@ export class ContactEditViewBase extends EditViewBase {
      * @memberof ContactEditView
      */
     public toolBarModels: any = {
-        tbitem12: { name: 'tbitem12', caption: '关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '', class: '' } },
+        tbitem1: { name: 'tbitem1', caption: '保存并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '保存并关闭', iconcls: 'fa fa-power-off', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '', class: '' } },
+
+        tbitem2: { name: 'tbitem2', caption: '关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '', class: '' } },
 
     };
 
@@ -149,8 +151,11 @@ export class ContactEditViewBase extends EditViewBase {
      * @memberof ContactEditViewBase
      */
     public toolbar_click($event: any, $event2?: any): void {
-        if (Object.is($event.tag, 'tbitem12')) {
-            this.toolbar_tbitem12_click(null, '', $event2);
+        if (Object.is($event.tag, 'tbitem1')) {
+            this.toolbar_tbitem1_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem2')) {
+            this.toolbar_tbitem2_click(null, '', $event2);
         }
     }
 
@@ -195,7 +200,35 @@ export class ContactEditViewBase extends EditViewBase {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem12_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"Contact");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem2_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -215,6 +248,39 @@ export class ContactEditViewBase extends EditViewBase {
         this.Exit(datas, contextJO,paramJO,  $event, xData,this,"Contact");
     }
 
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof ContactEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
     /**
      * 关闭
      *

app_BusinessCentral/src/store/modules/view-action/state.ts

@@ -846,9 +846,6 @@ export const viewstate: any = {
             refviews: [
                 '9224b0b14d2d99014e051f8035ba5cbf',
                 '2e9c7792c3a728896ca8902634f71983',
-                'e404dc93e70d6284d4e1a083017625ed',
-                'e4335da0a7c14a65376eecaabb771fd7',
-                '688201ee5642d41628dbf4deba002d17',
                 'fcdb236b65d78c4a8ae64e74f9483a63',
             ],
         },

app_BusinessCentral/src/uiservice/account/account-ui-service-base.ts

@@ -268,72 +268,6 @@ export default class AccountUIServiceBase extends UIService {
         backend();
     }
 
-    /**
-     * 编辑
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} context 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @param {*} [srfParentDeName] 父实体名称
-     * @returns {Promise<any>}
-     */
-    public async Account_Edit_Address(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-    
-        let data: any = {};
-        let parentContext:any = {};
-        let parentViewParam:any = {};
-        const _this: any = actionContext;
-        const _args: any[] = Util.deepCopy(args);
-        const actionTarget: string | null = 'SINGLEKEY';
-        Object.assign(context, { account: '%account%' });
-        Object.assign(params, { accountid: '%account%' });
-        Object.assign(params, { accountname: '%accountname%' });
-        if(_this.context){
-            parentContext = _this.context;
-        }
-        if(_this.viewparams){
-            parentViewParam = _this.viewparams;
-        }
-        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
-        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
-        context = Object.assign({},actionContext.context,context);
-        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
-        Object.assign(data,parentObj);
-        Object.assign(context,parentObj);
-        let deResParameters: any[] = [];
-        const parameters: any[] = [
-            { pathName: 'accounts', parameterName: 'account' },
-        ];
-            const openDrawer = (view: any, data: any) => {
-                let container: Subject<any> = actionContext.$appdrawer.openDrawer(view, context,data);
-                container.subscribe((result: any) => {
-                    if (!result || !Object.is(result.ret, 'OK')) {
-                        return;
-                    }
-                    const _this: any = actionContext;
-                    if (xData && xData.refresh && xData.refresh instanceof Function) {
-                        xData.refresh(args);
-                    }
-                    if(window.opener){
-                        window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
-                        window.close();
-                    }
-                    return result.datas;
-                });
-            }
-            const view: any = {
-                viewname: 'account-edit-address', 
-                height: 0, 
-                width: 450,  
-                title: actionContext.$t('entities.account.views.edit_address.title'),
-                placement: 'DRAWER_RIGHT',
-            };
-            openDrawer(view, data);
-    }
-
     /**
      * 头部信息编辑
      *
@@ -597,72 +531,6 @@ export default class AccountUIServiceBase extends UIService {
         backend();
     }
 
-    /**
-     * 编辑
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} context 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @param {*} [srfParentDeName] 父实体名称
-     * @returns {Promise<any>}
-     */
-    public async Account_Edit_AccountInfo(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-    
-        let data: any = {};
-        let parentContext:any = {};
-        let parentViewParam:any = {};
-        const _this: any = actionContext;
-        const _args: any[] = Util.deepCopy(args);
-        const actionTarget: string | null = 'SINGLEKEY';
-        Object.assign(context, { account: '%account%' });
-        Object.assign(params, { accountid: '%account%' });
-        Object.assign(params, { accountname: '%accountname%' });
-        if(_this.context){
-            parentContext = _this.context;
-        }
-        if(_this.viewparams){
-            parentViewParam = _this.viewparams;
-        }
-        context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
-        data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
-        context = Object.assign({},actionContext.context,context);
-        let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
-        Object.assign(data,parentObj);
-        Object.assign(context,parentObj);
-        let deResParameters: any[] = [];
-        const parameters: any[] = [
-            { pathName: 'accounts', parameterName: 'account' },
-        ];
-            const openDrawer = (view: any, data: any) => {
-                let container: Subject<any> = actionContext.$appdrawer.openDrawer(view, context,data);
-                container.subscribe((result: any) => {
-                    if (!result || !Object.is(result.ret, 'OK')) {
-                        return;
-                    }
-                    const _this: any = actionContext;
-                    if (xData && xData.refresh && xData.refresh instanceof Function) {
-                        xData.refresh(args);
-                    }
-                    if(window.opener){
-                        window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
-                        window.close();
-                    }
-                    return result.datas;
-                });
-            }
-            const view: any = {
-                viewname: 'account-edit-account-info', 
-                height: 0, 
-                width: 450,  
-                title: actionContext.$t('entities.account.views.edit_accountinfo.title'),
-                placement: 'DRAWER_RIGHT',
-            };
-            openDrawer(view, data);
-    }
-
     /**
      * 打开主信息界面
      *

app_BusinessCentral/src/widgets/account/info-all-form/info-all-form-base.tsx

@@ -4,7 +4,6 @@ import { Watch, EditFormControlBase } from '@/studio-core';
 import AccountService from '@/service/account/account-service';
 import Info_AllService from './info-all-form-service';
 import AccountUIService from '@/uiservice/account/account-ui-service';
-import ContactUIService from '@/uiservice/contact/contact-ui-service';
 import { FormButtonModel, FormPageModel, FormItemModel, FormDRUIPartModel, FormPartModel, FormGroupPanelModel, FormIFrameModel, FormRowItemModel, FormTabPageModel, FormTabPanelModel, FormUserControlModel } from '@/model/form-detail';
 
 
@@ -51,90 +50,6 @@ export class Info_AllEditFormBase extends EditFormControlBase {
      */
     protected appDeName: string = 'account';
 
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public form_group1_uc040f39_click(params: any = {}, tag?: any, $event?: any) {
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        let contextJO:any = {};
-        xData = this;
-        if (_this.getDatas && _this.getDatas instanceof Function) {
-            datas = [..._this.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        const curUIService:AccountUIService  = new AccountUIService();
-        curUIService.Account_Edit_AccountInfo(datas,contextJO, paramJO,  $event, xData,this,"Account");
-    }
-
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public form_grouppanel1_u2ccbfc9_click(params: any = {}, tag?: any, $event?: any) {
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        let contextJO:any = {};
-        xData = this;
-        if (_this.getDatas && _this.getDatas instanceof Function) {
-            datas = [..._this.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        const curUIService:AccountUIService  = new AccountUIService();
-        curUIService.Account_Edit_Address(datas,contextJO, paramJO,  $event, xData,this,"Account");
-    }
-
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public form_grouppanel4_u5a905ee_click(params: any = {}, tag?: any, $event?: any) {
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        let contextJO:any = {};
-        xData = this;
-        if (_this.getDatas && _this.getDatas instanceof Function) {
-            datas = [..._this.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        const curUIService:ContactUIService  = new ContactUIService();
-        curUIService.Contact_QuickCreate(datas,contextJO, paramJO,  $event, xData,this,"Account");
-    }
-
     /**
      * 界面UI服务对象
      *
@@ -228,7 +143,7 @@ export class Info_AllEditFormBase extends EditFormControlBase {
                     'tickersymbol',
                     'ownershipcode',
                     'defaultpricelevelname',
-        ], uiActionGroup: { caption: '编辑_账户信息', langbase: 'entities.account.info_all_form', extractMode: 'ITEM', details: [{ name: 'group1_uc040f39', caption: '编辑', uiactiontag: 'account_edit_accountinfo', icon: 'fa fa-pencil',isShowCaption:false,isShowIcon:true }] } }),
+        ], uiActionGroup: { caption: '', langbase: 'entities.account.info_all_form', extractMode: 'ITEM', details: [] } }),
 
         grouppanel1: new FormGroupPanelModel({ caption: '地址信息', detailType: 'GROUPPANEL', name: 'grouppanel1', visible: true, isShowCaption: true, form: this, showMoreMode: 2, anchorPoints: ['address1_country', ], controlledItems: [
                     'address1_addressid',
@@ -237,11 +152,11 @@ export class Info_AllEditFormBase extends EditFormControlBase {
                     'address1_county',
                     'address1_fax',
                     'address1_freighttermscode',
-        ], uiActionGroup: { caption: '编辑_地址信息', langbase: 'entities.account.info_all_form', extractMode: 'ITEM', details: [{ name: 'grouppanel1_u2ccbfc9', caption: '编辑', uiactiontag: 'account_edit_address', icon: 'fa fa-pencil',isShowCaption:false,isShowIcon:true }] } }),
+        ], uiActionGroup: { caption: '', langbase: 'entities.account.info_all_form', extractMode: 'ITEM', details: [] } }),
 
         druipart1: new FormDRUIPartModel({ caption: '', detailType: 'DRUIPART', name: 'druipart1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
 
-        grouppanel4: new FormGroupPanelModel({ caption: '联系人', detailType: 'GROUPPANEL', name: 'grouppanel4', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '添加联系人', langbase: 'entities.account.info_all_form', extractMode: 'ITEM', details: [{ name: 'grouppanel4_u5a905ee', caption: '新建', uiactiontag: 'contact_quickcreate', icon: 'fa fa-user-plus',isShowCaption:false,isShowIcon:true }] } }),
+        grouppanel4: new FormGroupPanelModel({ caption: '联系人', detailType: 'GROUPPANEL', name: 'grouppanel4', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.account.info_all_form', extractMode: 'ITEM', details: [] } }),
 
         grouppanel2: new FormGroupPanelModel({ caption: '联系人首选项', detailType: 'GROUPPANEL', name: 'grouppanel2', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.account.info_all_form', extractMode: 'ITEM', details: [] } }),
 
@@ -330,26 +245,4 @@ export class Info_AllEditFormBase extends EditFormControlBase {
         accountid: new FormItemModel({ caption: '客户', detailType: 'FORMITEM', name: 'accountid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
     };
-
-    /**
-     * 分组界面行为事件
-     *
-     * @param {*} $event
-     * @memberof Info_AllEditFormBase
-     */
-    public groupUIActionClick($event: any): void {
-        if (!$event) {
-            return;
-        }
-        const item: any = $event.item;
-        if (Object.is(item.name, 'group1_uc040f39')) {
-            this.form_group1_uc040f39_click(null, null, $event.event);
-        }
-        if (Object.is(item.name, 'grouppanel1_u2ccbfc9')) {
-            this.form_grouppanel1_u2ccbfc9_click(null, null, $event.event);
-        }
-        if (Object.is(item.name, 'grouppanel4_u5a905ee')) {
-            this.form_grouppanel4_u5a905ee_click(null, null, $event.event);
-        }
-    }
 }
\ No newline at end of file

businesscentral-app/businesscentral-app-businesscentral/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-app-businesscentral.jar
 
-EXPOSE 10320
+EXPOSE 8080
 
 ADD businesscentral-app-businesscentral.jar /businesscentral-app-businesscentral.jar

businesscentral-app/businesscentral-app-businesscentral/src/main/docker/businesscentral-app-businesscentral.yaml

@@ -3,23 +3,9 @@ services:
   businesscentral-app-businesscentral:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-businesscentral:latest
     ports:
-      - "10320:10320"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=10320
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
-      - SPRING_DATASOURCE_PASSWORD=b1@@@772
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
-      - CAS=https://passport.ibizlab.cn
-      - NACOS=172.16.240.110:8848
     deploy:
       resources:
            limits:

businesscentral-core/src/main/resources/mapper/base/account/AccountMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="AccountResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACCOUNTCATEGORYCODE`, t1.`ACCOUNTCLASSIFICATIONCODE`, t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`ACCOUNTNUMBER`, t1.`ACCOUNTRATINGCODE`, t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_FREIGHTTERMSCODE`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_PRIMARYCONTACTNAME`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_FREIGHTTERMSCODE`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_PRIMARYCONTACTNAME`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AGING30`, t1.`AGING30_BASE`, t1.`AGING60`, t1.`AGING60_BASE`, t1.`AGING90`, t1.`AGING90_BASE`, t1.`BUSINESSTYPECODE`, t1.`CHILDACCOUNTCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CREDITLIMIT`, t1.`CREDITLIMIT_BASE`, t1.`CREDITONHOLD`, t1.`CUSTOMERSIZECODE`, t1.`CUSTOMERTYPECODE`, t1.`DEFAULTPRICELEVELID`, t1.`DEFAULTPRICELEVELNAME`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTBULKPOSTALMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FOLLOWEMAIL`, t1.`FTPSITEURL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`MARKETCAP`, t1.`MARKETCAP_BASE`, t1.`MARKETINGONLY`, t1.`MASTERACCOUNTNAME`, t1.`MERGED`, t1.`NAME`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`OPENDEALS`, t1.`OPENDEALS_DATE`, t1.`OPENDEALS_STATE`, t1.`OPENREVENUE`, t1.`OPENREVENUE_BASE`, t1.`OPENREVENUE_DATE`, t1.`OPENREVENUE_STATE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERSHIPCODE`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PAYMENTTERMSCODE`, t1.`PREFERREDAPPOINTMENTDAYCODE`, t1.`PREFERREDAPPOINTMENTTIMECODE`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PREFERREDEQUIPMENTID`, t1.`PREFERREDEQUIPMENTNAME`, t1.`PREFERREDSERVICEID`, t1.`PREFERREDSERVICENAME`, t1.`PREFERREDSYSTEMUSERID`, t1.`PREFERREDSYSTEMUSERNAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIMARYSATORIID`, t1.`PRIMARYTWITTERID`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SHARESOUTSTANDING`, t1.`SHIPPINGMETHODCODE`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKEXCHANGE`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TERRITORYCODE`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `ACCOUNT` t1  ) t1 where accountid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACCOUNTCATEGORYCODE`, t1.`ACCOUNTCLASSIFICATIONCODE`, t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`ACCOUNTNUMBER`, t1.`ACCOUNTRATINGCODE`, t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_FREIGHTTERMSCODE`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_PRIMARYCONTACTNAME`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_FREIGHTTERMSCODE`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_PRIMARYCONTACTNAME`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AGING30`, t1.`AGING30_BASE`, t1.`AGING60`, t1.`AGING60_BASE`, t1.`AGING90`, t1.`AGING90_BASE`, t1.`BUSINESSTYPECODE`, t1.`CHILDACCOUNTCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CREDITLIMIT`, t1.`CREDITLIMIT_BASE`, t1.`CREDITONHOLD`, t1.`CURRENCYNAME`, t1.`CUSTOMERSIZECODE`, t1.`CUSTOMERTYPECODE`, t1.`DEFAULTPRICELEVELID`, t1.`DEFAULTPRICELEVELNAME`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTBULKPOSTALMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FOLLOWEMAIL`, t1.`FTPSITEURL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`MARKETCAP`, t1.`MARKETCAP_BASE`, t1.`MARKETINGONLY`, t1.`MASTERACCOUNTNAME`, t1.`MERGED`, t1.`NAME`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`OPENDEALS`, t1.`OPENDEALS_DATE`, t1.`OPENDEALS_STATE`, t1.`OPENREVENUE`, t1.`OPENREVENUE_BASE`, t1.`OPENREVENUE_DATE`, t1.`OPENREVENUE_STATE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERSHIPCODE`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PAYMENTTERMSCODE`, t1.`PREFERREDAPPOINTMENTDAYCODE`, t1.`PREFERREDAPPOINTMENTTIMECODE`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PREFERREDEQUIPMENTID`, t1.`PREFERREDEQUIPMENTNAME`, t1.`PREFERREDSERVICEID`, t1.`PREFERREDSERVICENAME`, t1.`PREFERREDSYSTEMUSERID`, t1.`PREFERREDSYSTEMUSERNAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIMARYSATORIID`, t1.`PRIMARYTWITTERID`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SHARESOUTSTANDING`, t1.`SHIPPINGMETHODCODE`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKEXCHANGE`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TERRITORYCODE`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `ACCOUNT` t1  ) t1 where accountid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -215,36 +215,36 @@
 
     <!--数据查询[ByParentKey]-->
     <sql id="ByParentKey" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTCATEGORYCODE`, t1.`ACCOUNTCLASSIFICATIONCODE`, t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`ACCOUNTNUMBER`, t1.`ACCOUNTRATINGCODE`, t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_FREIGHTTERMSCODE`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_PRIMARYCONTACTNAME`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_FREIGHTTERMSCODE`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_PRIMARYCONTACTNAME`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AGING30`, t1.`AGING30_BASE`, t1.`AGING60`, t1.`AGING60_BASE`, t1.`AGING90`, t1.`AGING90_BASE`, t1.`BUSINESSTYPECODE`, t1.`CHILDACCOUNTCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CREDITLIMIT`, t1.`CREDITLIMIT_BASE`, t1.`CREDITONHOLD`, t1.`CUSTOMERSIZECODE`, t1.`CUSTOMERTYPECODE`, t1.`DEFAULTPRICELEVELID`, t1.`DEFAULTPRICELEVELNAME`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTBULKPOSTALMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FOLLOWEMAIL`, t1.`FTPSITEURL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`MARKETCAP`, t1.`MARKETCAP_BASE`, t1.`MARKETINGONLY`, t1.`MASTERACCOUNTNAME`, t1.`MERGED`, t1.`NAME`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`OPENDEALS`, t1.`OPENDEALS_DATE`, t1.`OPENDEALS_STATE`, t1.`OPENREVENUE`, t1.`OPENREVENUE_BASE`, t1.`OPENREVENUE_DATE`, t1.`OPENREVENUE_STATE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERSHIPCODE`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PAYMENTTERMSCODE`, t1.`PREFERREDAPPOINTMENTDAYCODE`, t1.`PREFERREDAPPOINTMENTTIMECODE`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PREFERREDEQUIPMENTID`, t1.`PREFERREDEQUIPMENTNAME`, t1.`PREFERREDSERVICEID`, t1.`PREFERREDSERVICENAME`, t1.`PREFERREDSYSTEMUSERID`, t1.`PREFERREDSYSTEMUSERNAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIMARYSATORIID`, t1.`PRIMARYTWITTERID`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SHARESOUTSTANDING`, t1.`SHIPPINGMETHODCODE`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKEXCHANGE`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TERRITORYCODE`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `ACCOUNT` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTCATEGORYCODE`, t1.`ACCOUNTCLASSIFICATIONCODE`, t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`ACCOUNTNUMBER`, t1.`ACCOUNTRATINGCODE`, t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_FREIGHTTERMSCODE`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_PRIMARYCONTACTNAME`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_FREIGHTTERMSCODE`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_PRIMARYCONTACTNAME`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AGING30`, t1.`AGING30_BASE`, t1.`AGING60`, t1.`AGING60_BASE`, t1.`AGING90`, t1.`AGING90_BASE`, t1.`BUSINESSTYPECODE`, t1.`CHILDACCOUNTCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CREDITLIMIT`, t1.`CREDITLIMIT_BASE`, t1.`CREDITONHOLD`, t1.`CURRENCYNAME`, t1.`CUSTOMERSIZECODE`, t1.`CUSTOMERTYPECODE`, t1.`DEFAULTPRICELEVELID`, t1.`DEFAULTPRICELEVELNAME`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTBULKPOSTALMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FOLLOWEMAIL`, t1.`FTPSITEURL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`MARKETCAP`, t1.`MARKETCAP_BASE`, t1.`MARKETINGONLY`, t1.`MASTERACCOUNTNAME`, t1.`MERGED`, t1.`NAME`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`OPENDEALS`, t1.`OPENDEALS_DATE`, t1.`OPENDEALS_STATE`, t1.`OPENREVENUE`, t1.`OPENREVENUE_BASE`, t1.`OPENREVENUE_DATE`, t1.`OPENREVENUE_STATE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERSHIPCODE`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PAYMENTTERMSCODE`, t1.`PREFERREDAPPOINTMENTDAYCODE`, t1.`PREFERREDAPPOINTMENTTIMECODE`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PREFERREDEQUIPMENTID`, t1.`PREFERREDEQUIPMENTNAME`, t1.`PREFERREDSERVICEID`, t1.`PREFERREDSERVICENAME`, t1.`PREFERREDSYSTEMUSERID`, t1.`PREFERREDSYSTEMUSERNAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIMARYSATORIID`, t1.`PRIMARYTWITTERID`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SHARESOUTSTANDING`, t1.`SHIPPINGMETHODCODE`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKEXCHANGE`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TERRITORYCODE`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `ACCOUNT` t1  
 					 WHERE 	( t1.`PARENTACCOUNTID` =  #{srf.datacontext.srfparentkey} )
 			]]>
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTCATEGORYCODE`, t1.`ACCOUNTCLASSIFICATIONCODE`, t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`ACCOUNTNUMBER`, t1.`ACCOUNTRATINGCODE`, t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_FREIGHTTERMSCODE`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_PRIMARYCONTACTNAME`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_FREIGHTTERMSCODE`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_PRIMARYCONTACTNAME`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AGING30`, t1.`AGING30_BASE`, t1.`AGING60`, t1.`AGING60_BASE`, t1.`AGING90`, t1.`AGING90_BASE`, t1.`BUSINESSTYPECODE`, t1.`CHILDACCOUNTCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CREDITLIMIT`, t1.`CREDITLIMIT_BASE`, t1.`CREDITONHOLD`, t1.`CUSTOMERSIZECODE`, t1.`CUSTOMERTYPECODE`, t1.`DEFAULTPRICELEVELID`, t1.`DEFAULTPRICELEVELNAME`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTBULKPOSTALMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FOLLOWEMAIL`, t1.`FTPSITEURL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`MARKETCAP`, t1.`MARKETCAP_BASE`, t1.`MARKETINGONLY`, t1.`MASTERACCOUNTNAME`, t1.`MERGED`, t1.`NAME`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`OPENDEALS`, t1.`OPENDEALS_DATE`, t1.`OPENDEALS_STATE`, t1.`OPENREVENUE`, t1.`OPENREVENUE_BASE`, t1.`OPENREVENUE_DATE`, t1.`OPENREVENUE_STATE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERSHIPCODE`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PAYMENTTERMSCODE`, t1.`PREFERREDAPPOINTMENTDAYCODE`, t1.`PREFERREDAPPOINTMENTTIMECODE`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PREFERREDEQUIPMENTID`, t1.`PREFERREDEQUIPMENTNAME`, t1.`PREFERREDSERVICEID`, t1.`PREFERREDSERVICENAME`, t1.`PREFERREDSYSTEMUSERID`, t1.`PREFERREDSYSTEMUSERNAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIMARYSATORIID`, t1.`PRIMARYTWITTERID`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SHARESOUTSTANDING`, t1.`SHIPPINGMETHODCODE`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKEXCHANGE`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TERRITORYCODE`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `ACCOUNT` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTCATEGORYCODE`, t1.`ACCOUNTCLASSIFICATIONCODE`, t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`ACCOUNTNUMBER`, t1.`ACCOUNTRATINGCODE`, t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_FREIGHTTERMSCODE`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_PRIMARYCONTACTNAME`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_FREIGHTTERMSCODE`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_PRIMARYCONTACTNAME`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AGING30`, t1.`AGING30_BASE`, t1.`AGING60`, t1.`AGING60_BASE`, t1.`AGING90`, t1.`AGING90_BASE`, t1.`BUSINESSTYPECODE`, t1.`CHILDACCOUNTCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CREDITLIMIT`, t1.`CREDITLIMIT_BASE`, t1.`CREDITONHOLD`, t1.`CURRENCYNAME`, t1.`CUSTOMERSIZECODE`, t1.`CUSTOMERTYPECODE`, t1.`DEFAULTPRICELEVELID`, t1.`DEFAULTPRICELEVELNAME`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTBULKPOSTALMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FOLLOWEMAIL`, t1.`FTPSITEURL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`MARKETCAP`, t1.`MARKETCAP_BASE`, t1.`MARKETINGONLY`, t1.`MASTERACCOUNTNAME`, t1.`MERGED`, t1.`NAME`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`OPENDEALS`, t1.`OPENDEALS_DATE`, t1.`OPENDEALS_STATE`, t1.`OPENREVENUE`, t1.`OPENREVENUE_BASE`, t1.`OPENREVENUE_DATE`, t1.`OPENREVENUE_STATE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERSHIPCODE`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PAYMENTTERMSCODE`, t1.`PREFERREDAPPOINTMENTDAYCODE`, t1.`PREFERREDAPPOINTMENTTIMECODE`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PREFERREDEQUIPMENTID`, t1.`PREFERREDEQUIPMENTNAME`, t1.`PREFERREDSERVICEID`, t1.`PREFERREDSERVICENAME`, t1.`PREFERREDSYSTEMUSERID`, t1.`PREFERREDSYSTEMUSERNAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIMARYSATORIID`, t1.`PRIMARYTWITTERID`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SHARESOUTSTANDING`, t1.`SHIPPINGMETHODCODE`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKEXCHANGE`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TERRITORYCODE`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `ACCOUNT` t1  
 			]]>
     </sql>
     <!--数据查询[Root]-->
     <sql id="Root" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTCATEGORYCODE`, t1.`ACCOUNTCLASSIFICATIONCODE`, t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`ACCOUNTNUMBER`, t1.`ACCOUNTRATINGCODE`, t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_FREIGHTTERMSCODE`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_PRIMARYCONTACTNAME`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_FREIGHTTERMSCODE`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_PRIMARYCONTACTNAME`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AGING30`, t1.`AGING30_BASE`, t1.`AGING60`, t1.`AGING60_BASE`, t1.`AGING90`, t1.`AGING90_BASE`, t1.`BUSINESSTYPECODE`, t1.`CHILDACCOUNTCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CREDITLIMIT`, t1.`CREDITLIMIT_BASE`, t1.`CREDITONHOLD`, t1.`CUSTOMERSIZECODE`, t1.`CUSTOMERTYPECODE`, t1.`DEFAULTPRICELEVELID`, t1.`DEFAULTPRICELEVELNAME`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTBULKPOSTALMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FOLLOWEMAIL`, t1.`FTPSITEURL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`MARKETCAP`, t1.`MARKETCAP_BASE`, t1.`MARKETINGONLY`, t1.`MASTERACCOUNTNAME`, t1.`MERGED`, t1.`NAME`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`OPENDEALS`, t1.`OPENDEALS_DATE`, t1.`OPENDEALS_STATE`, t1.`OPENREVENUE`, t1.`OPENREVENUE_BASE`, t1.`OPENREVENUE_DATE`, t1.`OPENREVENUE_STATE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERSHIPCODE`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PAYMENTTERMSCODE`, t1.`PREFERREDAPPOINTMENTDAYCODE`, t1.`PREFERREDAPPOINTMENTTIMECODE`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PREFERREDEQUIPMENTID`, t1.`PREFERREDEQUIPMENTNAME`, t1.`PREFERREDSERVICEID`, t1.`PREFERREDSERVICENAME`, t1.`PREFERREDSYSTEMUSERID`, t1.`PREFERREDSYSTEMUSERNAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIMARYSATORIID`, t1.`PRIMARYTWITTERID`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SHARESOUTSTANDING`, t1.`SHIPPINGMETHODCODE`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKEXCHANGE`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TERRITORYCODE`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `ACCOUNT` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTCATEGORYCODE`, t1.`ACCOUNTCLASSIFICATIONCODE`, t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`ACCOUNTNUMBER`, t1.`ACCOUNTRATINGCODE`, t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_FREIGHTTERMSCODE`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_PRIMARYCONTACTNAME`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_FREIGHTTERMSCODE`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_PRIMARYCONTACTNAME`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AGING30`, t1.`AGING30_BASE`, t1.`AGING60`, t1.`AGING60_BASE`, t1.`AGING90`, t1.`AGING90_BASE`, t1.`BUSINESSTYPECODE`, t1.`CHILDACCOUNTCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CREDITLIMIT`, t1.`CREDITLIMIT_BASE`, t1.`CREDITONHOLD`, t1.`CURRENCYNAME`, t1.`CUSTOMERSIZECODE`, t1.`CUSTOMERTYPECODE`, t1.`DEFAULTPRICELEVELID`, t1.`DEFAULTPRICELEVELNAME`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTBULKPOSTALMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FOLLOWEMAIL`, t1.`FTPSITEURL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`MARKETCAP`, t1.`MARKETCAP_BASE`, t1.`MARKETINGONLY`, t1.`MASTERACCOUNTNAME`, t1.`MERGED`, t1.`NAME`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`OPENDEALS`, t1.`OPENDEALS_DATE`, t1.`OPENDEALS_STATE`, t1.`OPENREVENUE`, t1.`OPENREVENUE_BASE`, t1.`OPENREVENUE_DATE`, t1.`OPENREVENUE_STATE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERSHIPCODE`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PAYMENTTERMSCODE`, t1.`PREFERREDAPPOINTMENTDAYCODE`, t1.`PREFERREDAPPOINTMENTTIMECODE`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PREFERREDEQUIPMENTID`, t1.`PREFERREDEQUIPMENTNAME`, t1.`PREFERREDSERVICEID`, t1.`PREFERREDSERVICENAME`, t1.`PREFERREDSYSTEMUSERID`, t1.`PREFERREDSYSTEMUSERNAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIMARYSATORIID`, t1.`PRIMARYTWITTERID`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SHARESOUTSTANDING`, t1.`SHIPPINGMETHODCODE`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKEXCHANGE`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TERRITORYCODE`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `ACCOUNT` t1  
 					 WHERE 	( t1.`PARENTACCOUNTID` IS NULL )
 			]]>
     </sql>
     <!--数据查询[Stop]-->
     <sql id="Stop" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTCATEGORYCODE`, t1.`ACCOUNTCLASSIFICATIONCODE`, t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`ACCOUNTNUMBER`, t1.`ACCOUNTRATINGCODE`, t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_FREIGHTTERMSCODE`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_PRIMARYCONTACTNAME`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_FREIGHTTERMSCODE`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_PRIMARYCONTACTNAME`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AGING30`, t1.`AGING30_BASE`, t1.`AGING60`, t1.`AGING60_BASE`, t1.`AGING90`, t1.`AGING90_BASE`, t1.`BUSINESSTYPECODE`, t1.`CHILDACCOUNTCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CREDITLIMIT`, t1.`CREDITLIMIT_BASE`, t1.`CREDITONHOLD`, t1.`CUSTOMERSIZECODE`, t1.`CUSTOMERTYPECODE`, t1.`DEFAULTPRICELEVELID`, t1.`DEFAULTPRICELEVELNAME`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTBULKPOSTALMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FOLLOWEMAIL`, t1.`FTPSITEURL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`MARKETCAP`, t1.`MARKETCAP_BASE`, t1.`MARKETINGONLY`, t1.`MASTERACCOUNTNAME`, t1.`MERGED`, t1.`NAME`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`OPENDEALS`, t1.`OPENDEALS_DATE`, t1.`OPENDEALS_STATE`, t1.`OPENREVENUE`, t1.`OPENREVENUE_BASE`, t1.`OPENREVENUE_DATE`, t1.`OPENREVENUE_STATE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERSHIPCODE`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PAYMENTTERMSCODE`, t1.`PREFERREDAPPOINTMENTDAYCODE`, t1.`PREFERREDAPPOINTMENTTIMECODE`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PREFERREDEQUIPMENTID`, t1.`PREFERREDEQUIPMENTNAME`, t1.`PREFERREDSERVICEID`, t1.`PREFERREDSERVICENAME`, t1.`PREFERREDSYSTEMUSERID`, t1.`PREFERREDSYSTEMUSERNAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIMARYSATORIID`, t1.`PRIMARYTWITTERID`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SHARESOUTSTANDING`, t1.`SHIPPINGMETHODCODE`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKEXCHANGE`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TERRITORYCODE`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `ACCOUNT` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTCATEGORYCODE`, t1.`ACCOUNTCLASSIFICATIONCODE`, t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`ACCOUNTNUMBER`, t1.`ACCOUNTRATINGCODE`, t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_FREIGHTTERMSCODE`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_PRIMARYCONTACTNAME`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_FREIGHTTERMSCODE`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_PRIMARYCONTACTNAME`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AGING30`, t1.`AGING30_BASE`, t1.`AGING60`, t1.`AGING60_BASE`, t1.`AGING90`, t1.`AGING90_BASE`, t1.`BUSINESSTYPECODE`, t1.`CHILDACCOUNTCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CREDITLIMIT`, t1.`CREDITLIMIT_BASE`, t1.`CREDITONHOLD`, t1.`CURRENCYNAME`, t1.`CUSTOMERSIZECODE`, t1.`CUSTOMERTYPECODE`, t1.`DEFAULTPRICELEVELID`, t1.`DEFAULTPRICELEVELNAME`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTBULKPOSTALMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FOLLOWEMAIL`, t1.`FTPSITEURL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`MARKETCAP`, t1.`MARKETCAP_BASE`, t1.`MARKETINGONLY`, t1.`MASTERACCOUNTNAME`, t1.`MERGED`, t1.`NAME`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`OPENDEALS`, t1.`OPENDEALS_DATE`, t1.`OPENDEALS_STATE`, t1.`OPENREVENUE`, t1.`OPENREVENUE_BASE`, t1.`OPENREVENUE_DATE`, t1.`OPENREVENUE_STATE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERSHIPCODE`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PAYMENTTERMSCODE`, t1.`PREFERREDAPPOINTMENTDAYCODE`, t1.`PREFERREDAPPOINTMENTTIMECODE`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PREFERREDEQUIPMENTID`, t1.`PREFERREDEQUIPMENTNAME`, t1.`PREFERREDSERVICEID`, t1.`PREFERREDSERVICENAME`, t1.`PREFERREDSYSTEMUSERID`, t1.`PREFERREDSYSTEMUSERNAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIMARYSATORIID`, t1.`PRIMARYTWITTERID`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SHARESOUTSTANDING`, t1.`SHIPPINGMETHODCODE`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKEXCHANGE`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TERRITORYCODE`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `ACCOUNT` t1  
 					 WHERE 	( t1.`STATUSCODE` = 2 )
 			]]>
     </sql>
     <!--数据查询[Usable]-->
     <sql id="Usable" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTCATEGORYCODE`, t1.`ACCOUNTCLASSIFICATIONCODE`, t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`ACCOUNTNUMBER`, t1.`ACCOUNTRATINGCODE`, t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_FREIGHTTERMSCODE`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_PRIMARYCONTACTNAME`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_FREIGHTTERMSCODE`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_PRIMARYCONTACTNAME`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AGING30`, t1.`AGING30_BASE`, t1.`AGING60`, t1.`AGING60_BASE`, t1.`AGING90`, t1.`AGING90_BASE`, t1.`BUSINESSTYPECODE`, t1.`CHILDACCOUNTCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CREDITLIMIT`, t1.`CREDITLIMIT_BASE`, t1.`CREDITONHOLD`, t1.`CUSTOMERSIZECODE`, t1.`CUSTOMERTYPECODE`, t1.`DEFAULTPRICELEVELID`, t1.`DEFAULTPRICELEVELNAME`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTBULKPOSTALMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FOLLOWEMAIL`, t1.`FTPSITEURL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`MARKETCAP`, t1.`MARKETCAP_BASE`, t1.`MARKETINGONLY`, t1.`MASTERACCOUNTNAME`, t1.`MERGED`, t1.`NAME`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`OPENDEALS`, t1.`OPENDEALS_DATE`, t1.`OPENDEALS_STATE`, t1.`OPENREVENUE`, t1.`OPENREVENUE_BASE`, t1.`OPENREVENUE_DATE`, t1.`OPENREVENUE_STATE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERSHIPCODE`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PAYMENTTERMSCODE`, t1.`PREFERREDAPPOINTMENTDAYCODE`, t1.`PREFERREDAPPOINTMENTTIMECODE`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PREFERREDEQUIPMENTID`, t1.`PREFERREDEQUIPMENTNAME`, t1.`PREFERREDSERVICEID`, t1.`PREFERREDSERVICENAME`, t1.`PREFERREDSYSTEMUSERID`, t1.`PREFERREDSYSTEMUSERNAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIMARYSATORIID`, t1.`PRIMARYTWITTERID`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SHARESOUTSTANDING`, t1.`SHIPPINGMETHODCODE`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKEXCHANGE`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TERRITORYCODE`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `ACCOUNT` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTCATEGORYCODE`, t1.`ACCOUNTCLASSIFICATIONCODE`, t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`ACCOUNTNUMBER`, t1.`ACCOUNTRATINGCODE`, t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_FREIGHTTERMSCODE`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_PRIMARYCONTACTNAME`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_FREIGHTTERMSCODE`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_PRIMARYCONTACTNAME`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AGING30`, t1.`AGING30_BASE`, t1.`AGING60`, t1.`AGING60_BASE`, t1.`AGING90`, t1.`AGING90_BASE`, t1.`BUSINESSTYPECODE`, t1.`CHILDACCOUNTCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CREDITLIMIT`, t1.`CREDITLIMIT_BASE`, t1.`CREDITONHOLD`, t1.`CURRENCYNAME`, t1.`CUSTOMERSIZECODE`, t1.`CUSTOMERTYPECODE`, t1.`DEFAULTPRICELEVELID`, t1.`DEFAULTPRICELEVELNAME`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTBULKPOSTALMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FOLLOWEMAIL`, t1.`FTPSITEURL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`MARKETCAP`, t1.`MARKETCAP_BASE`, t1.`MARKETINGONLY`, t1.`MASTERACCOUNTNAME`, t1.`MERGED`, t1.`NAME`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`OPENDEALS`, t1.`OPENDEALS_DATE`, t1.`OPENDEALS_STATE`, t1.`OPENREVENUE`, t1.`OPENREVENUE_BASE`, t1.`OPENREVENUE_DATE`, t1.`OPENREVENUE_STATE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERSHIPCODE`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PAYMENTTERMSCODE`, t1.`PREFERREDAPPOINTMENTDAYCODE`, t1.`PREFERREDAPPOINTMENTTIMECODE`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PREFERREDEQUIPMENTID`, t1.`PREFERREDEQUIPMENTNAME`, t1.`PREFERREDSERVICEID`, t1.`PREFERREDSERVICENAME`, t1.`PREFERREDSYSTEMUSERID`, t1.`PREFERREDSYSTEMUSERNAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIMARYSATORIID`, t1.`PRIMARYTWITTERID`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SHARESOUTSTANDING`, t1.`SHIPPINGMETHODCODE`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKEXCHANGE`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TERRITORYCODE`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `ACCOUNT` t1  
 					 WHERE 	( t1.`STATUSCODE` = 1 )
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTCATEGORYCODE`, t1.`ACCOUNTCLASSIFICATIONCODE`, t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`ACCOUNTNUMBER`, t1.`ACCOUNTRATINGCODE`, t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_FREIGHTTERMSCODE`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_PRIMARYCONTACTNAME`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_FREIGHTTERMSCODE`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_PRIMARYCONTACTNAME`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AGING30`, t1.`AGING30_BASE`, t1.`AGING60`, t1.`AGING60_BASE`, t1.`AGING90`, t1.`AGING90_BASE`, t1.`BUSINESSTYPECODE`, t1.`CHILDACCOUNTCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CREDITLIMIT`, t1.`CREDITLIMIT_BASE`, t1.`CREDITONHOLD`, t1.`CUSTOMERSIZECODE`, t1.`CUSTOMERTYPECODE`, t1.`DEFAULTPRICELEVELID`, t1.`DEFAULTPRICELEVELNAME`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTBULKPOSTALMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FOLLOWEMAIL`, t1.`FTPSITEURL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`MARKETCAP`, t1.`MARKETCAP_BASE`, t1.`MARKETINGONLY`, t1.`MASTERACCOUNTNAME`, t1.`MERGED`, t1.`NAME`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`OPENDEALS`, t1.`OPENDEALS_DATE`, t1.`OPENDEALS_STATE`, t1.`OPENREVENUE`, t1.`OPENREVENUE_BASE`, t1.`OPENREVENUE_DATE`, t1.`OPENREVENUE_STATE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERSHIPCODE`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PAYMENTTERMSCODE`, t1.`PREFERREDAPPOINTMENTDAYCODE`, t1.`PREFERREDAPPOINTMENTTIMECODE`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PREFERREDEQUIPMENTID`, t1.`PREFERREDEQUIPMENTNAME`, t1.`PREFERREDSERVICEID`, t1.`PREFERREDSERVICENAME`, t1.`PREFERREDSYSTEMUSERID`, t1.`PREFERREDSYSTEMUSERNAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIMARYSATORIID`, t1.`PRIMARYTWITTERID`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SHARESOUTSTANDING`, t1.`SHIPPINGMETHODCODE`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKEXCHANGE`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TERRITORYCODE`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `ACCOUNT` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTCATEGORYCODE`, t1.`ACCOUNTCLASSIFICATIONCODE`, t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`ACCOUNTNUMBER`, t1.`ACCOUNTRATINGCODE`, t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_FREIGHTTERMSCODE`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_PRIMARYCONTACTNAME`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_FREIGHTTERMSCODE`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_PRIMARYCONTACTNAME`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AGING30`, t1.`AGING30_BASE`, t1.`AGING60`, t1.`AGING60_BASE`, t1.`AGING90`, t1.`AGING90_BASE`, t1.`BUSINESSTYPECODE`, t1.`CHILDACCOUNTCOUNT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CREDITLIMIT`, t1.`CREDITLIMIT_BASE`, t1.`CREDITONHOLD`, t1.`CURRENCYNAME`, t1.`CUSTOMERSIZECODE`, t1.`CUSTOMERTYPECODE`, t1.`DEFAULTPRICELEVELID`, t1.`DEFAULTPRICELEVELNAME`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTBULKPOSTALMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FOLLOWEMAIL`, t1.`FTPSITEURL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`MARKETCAP`, t1.`MARKETCAP_BASE`, t1.`MARKETINGONLY`, t1.`MASTERACCOUNTNAME`, t1.`MERGED`, t1.`NAME`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`OPENDEALS`, t1.`OPENDEALS_DATE`, t1.`OPENDEALS_STATE`, t1.`OPENREVENUE`, t1.`OPENREVENUE_BASE`, t1.`OPENREVENUE_DATE`, t1.`OPENREVENUE_STATE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERSHIPCODE`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PAYMENTTERMSCODE`, t1.`PREFERREDAPPOINTMENTDAYCODE`, t1.`PREFERREDAPPOINTMENTTIMECODE`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PREFERREDEQUIPMENTID`, t1.`PREFERREDEQUIPMENTNAME`, t1.`PREFERREDSERVICEID`, t1.`PREFERREDSERVICENAME`, t1.`PREFERREDSYSTEMUSERID`, t1.`PREFERREDSYSTEMUSERNAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIMARYSATORIID`, t1.`PRIMARYTWITTERID`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SHARESOUTSTANDING`, t1.`SHIPPINGMETHODCODE`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKEXCHANGE`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TERRITORYCODE`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `ACCOUNT` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/activitymimeattachment/ActivityMimeatTachmentMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="ActivityMimeatTachmentResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYID`, t1.`ACTIVITYMIMEATTACHMENTID`, t1.`ACTIVITYMIMEATTACHMENTIDUNIQUE`, t1.`ACTIVITYSUBJECT`, t1.`ANONYMOUSLINK`, t1.`ATTACHMENTCONTENTID`, t1.`ATTACHMENTID`, t1.`ATTACHMENTNUMBER`, t1.`BODY`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FILENAME`, t1.`FILESIZE`, t1.`FOLLOWED`, t1.`MANAGED`, t1.`MIMETYPE`, t1.`OBJECTID`, t1.`OBJECTTYPECODE`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`SOLUTIONID`, t1.`SUBJECT`, t1.`SUPPORTINGSOLUTIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `ACTIVITYMIMEATTACHMENT` t1  ) t1 where activitymimeattachmentid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYID`, t1.`ACTIVITYMIMEATTACHMENTID`, t1.`ACTIVITYMIMEATTACHMENTIDUNIQUE`, t1.`ACTIVITYSUBJECT`, t1.`ANONYMOUSLINK`, t1.`ATTACHMENTCONTENTID`, t1.`ATTACHMENTID`, t1.`ATTACHMENTNUMBER`, t1.`BODY`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FILENAME`, t1.`FILESIZE`, t1.`FOLLOWED`, t1.`MANAGED`, t1.`MIMETYPE`, t1.`OBJECTID`, t1.`OBJECTTYPECODE`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`SOLUTIONID`, t1.`SUBJECT`, t1.`SUPPORTINGSOLUTIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `ACTIVITYMIMEATTACHMENT` t1  ) t1 where activitymimeattachmentid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -27,12 +27,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYMIMEATTACHMENTID`, t1.`ACTIVITYMIMEATTACHMENTIDUNIQUE`, t1.`ACTIVITYSUBJECT`, t1.`ANONYMOUSLINK`, t1.`ATTACHMENTCONTENTID`, t1.`ATTACHMENTID`, t1.`ATTACHMENTNUMBER`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FILENAME`, t1.`FILESIZE`, t1.`FOLLOWED`, t1.`MANAGED`, t1.`MIMETYPE`, t1.`OBJECTID`, t1.`OBJECTTYPECODE`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`SOLUTIONID`, t1.`SUBJECT`, t1.`SUPPORTINGSOLUTIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `ACTIVITYMIMEATTACHMENT` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYMIMEATTACHMENTID`, t1.`ACTIVITYMIMEATTACHMENTIDUNIQUE`, t1.`ACTIVITYSUBJECT`, t1.`ANONYMOUSLINK`, t1.`ATTACHMENTCONTENTID`, t1.`ATTACHMENTID`, t1.`ATTACHMENTNUMBER`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FILENAME`, t1.`FILESIZE`, t1.`FOLLOWED`, t1.`MANAGED`, t1.`MIMETYPE`, t1.`OBJECTID`, t1.`OBJECTTYPECODE`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`SOLUTIONID`, t1.`SUBJECT`, t1.`SUPPORTINGSOLUTIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `ACTIVITYMIMEATTACHMENT` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYMIMEATTACHMENTID`, t1.`ACTIVITYMIMEATTACHMENTIDUNIQUE`, t1.`ACTIVITYSUBJECT`, t1.`ANONYMOUSLINK`, t1.`ATTACHMENTCONTENTID`, t1.`ATTACHMENTID`, t1.`ATTACHMENTNUMBER`, t1.`BODY`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FILENAME`, t1.`FILESIZE`, t1.`FOLLOWED`, t1.`MANAGED`, t1.`MIMETYPE`, t1.`OBJECTID`, t1.`OBJECTTYPECODE`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`SOLUTIONID`, t1.`SUBJECT`, t1.`SUPPORTINGSOLUTIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `ACTIVITYMIMEATTACHMENT` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYMIMEATTACHMENTID`, t1.`ACTIVITYMIMEATTACHMENTIDUNIQUE`, t1.`ACTIVITYSUBJECT`, t1.`ANONYMOUSLINK`, t1.`ATTACHMENTCONTENTID`, t1.`ATTACHMENTID`, t1.`ATTACHMENTNUMBER`, t1.`BODY`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FILENAME`, t1.`FILESIZE`, t1.`FOLLOWED`, t1.`MANAGED`, t1.`MIMETYPE`, t1.`OBJECTID`, t1.`OBJECTTYPECODE`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`SOLUTIONID`, t1.`SUBJECT`, t1.`SUPPORTINGSOLUTIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `ACTIVITYMIMEATTACHMENT` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/activityparty/ActivityPartyMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="ActivityPartyResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYID`, t1.`ACTIVITYPARTYID`, t1.`ADDRESSUSED`, t1.`ADDRESSUSEDEMAILCOLUMNNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`EFFORT`, t1.`EXCHANGEENTRYID`, t1.`INSTANCETYPECODE`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGUSER`, t1.`PARTICIPATIONTYPEMASK`, t1.`PARTYDELETED`, t1.`PARTYID`, t1.`PARTYIDNAME`, t1.`PARTYOBJECTTYPECODE`, t1.`RESOURCESPECID`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `ACTIVITYPARTY` t1  ) t1 where activitypartyid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYID`, t1.`ACTIVITYPARTYID`, t1.`ADDRESSUSED`, t1.`ADDRESSUSEDEMAILCOLUMNNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`EFFORT`, t1.`EXCHANGEENTRYID`, t1.`INSTANCETYPECODE`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGUSER`, t1.`PARTICIPATIONTYPEMASK`, t1.`PARTYDELETED`, t1.`PARTYID`, t1.`PARTYIDNAME`, t1.`PARTYOBJECTTYPECODE`, t1.`RESOURCESPECID`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `ACTIVITYPARTY` t1  ) t1 where activitypartyid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -47,12 +47,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYPARTYID`, t1.`ADDRESSUSED`, t1.`ADDRESSUSEDEMAILCOLUMNNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`EFFORT`, t1.`EXCHANGEENTRYID`, t1.`INSTANCETYPECODE`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGUSER`, t1.`PARTICIPATIONTYPEMASK`, t1.`PARTYDELETED`, t1.`PARTYID`, t1.`PARTYIDNAME`, t1.`PARTYOBJECTTYPECODE`, t1.`RESOURCESPECID`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `ACTIVITYPARTY` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYPARTYID`, t1.`ADDRESSUSED`, t1.`ADDRESSUSEDEMAILCOLUMNNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`EFFORT`, t1.`EXCHANGEENTRYID`, t1.`INSTANCETYPECODE`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGUSER`, t1.`PARTICIPATIONTYPEMASK`, t1.`PARTYDELETED`, t1.`PARTYID`, t1.`PARTYIDNAME`, t1.`PARTYOBJECTTYPECODE`, t1.`RESOURCESPECID`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `ACTIVITYPARTY` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYPARTYID`, t1.`ADDRESSUSED`, t1.`ADDRESSUSEDEMAILCOLUMNNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`EFFORT`, t1.`EXCHANGEENTRYID`, t1.`INSTANCETYPECODE`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGUSER`, t1.`PARTICIPATIONTYPEMASK`, t1.`PARTYDELETED`, t1.`PARTYID`, t1.`PARTYIDNAME`, t1.`PARTYOBJECTTYPECODE`, t1.`RESOURCESPECID`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `ACTIVITYPARTY` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYPARTYID`, t1.`ADDRESSUSED`, t1.`ADDRESSUSEDEMAILCOLUMNNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`EFFORT`, t1.`EXCHANGEENTRYID`, t1.`INSTANCETYPECODE`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGUSER`, t1.`PARTICIPATIONTYPEMASK`, t1.`PARTYDELETED`, t1.`PARTYID`, t1.`PARTYIDNAME`, t1.`PARTYOBJECTTYPECODE`, t1.`RESOURCESPECID`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `ACTIVITYPARTY` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/appointment/AppointmentMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="AppointmentResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ALLDAYEVENT`, t1.`ATTACHMENTCOUNT`, t1.`ATTACHMENTERRORS`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DRAFT`, t1.`EXCHANGERATE`, t1.`GLOBALOBJECTID`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LOCATION`, t1.`MAPIPRIVATE`, t1.`MODIFIEDFIELDSMASK`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`ORIGINALSTARTDATE`, t1.`OUTLOOKOWNERAPPTID`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`SAFEDESCRIPTION`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNSAFE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `APPOINTMENT` t1  ) t1 where activityid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ALLDAYEVENT`, t1.`ATTACHMENTCOUNT`, t1.`ATTACHMENTERRORS`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DRAFT`, t1.`EXCHANGERATE`, t1.`GLOBALOBJECTID`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LOCATION`, t1.`MAPIPRIVATE`, t1.`MODIFIEDFIELDSMASK`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`ORIGINALSTARTDATE`, t1.`OUTLOOKOWNERAPPTID`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`SAFEDESCRIPTION`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNSAFE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `APPOINTMENT` t1  ) t1 where activityid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -57,12 +57,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ALLDAYEVENT`, t1.`ATTACHMENTCOUNT`, t1.`ATTACHMENTERRORS`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DRAFT`, t1.`EXCHANGERATE`, t1.`GLOBALOBJECTID`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LOCATION`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`ORIGINALSTARTDATE`, t1.`OUTLOOKOWNERAPPTID`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNSAFE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `APPOINTMENT` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ALLDAYEVENT`, t1.`ATTACHMENTCOUNT`, t1.`ATTACHMENTERRORS`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DRAFT`, t1.`EXCHANGERATE`, t1.`GLOBALOBJECTID`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LOCATION`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`ORIGINALSTARTDATE`, t1.`OUTLOOKOWNERAPPTID`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNSAFE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `APPOINTMENT` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ALLDAYEVENT`, t1.`ATTACHMENTCOUNT`, t1.`ATTACHMENTERRORS`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DRAFT`, t1.`EXCHANGERATE`, t1.`GLOBALOBJECTID`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LOCATION`, t1.`MAPIPRIVATE`, t1.`MODIFIEDFIELDSMASK`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`ORIGINALSTARTDATE`, t1.`OUTLOOKOWNERAPPTID`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`SAFEDESCRIPTION`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNSAFE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `APPOINTMENT` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ALLDAYEVENT`, t1.`ATTACHMENTCOUNT`, t1.`ATTACHMENTERRORS`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DRAFT`, t1.`EXCHANGERATE`, t1.`GLOBALOBJECTID`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LOCATION`, t1.`MAPIPRIVATE`, t1.`MODIFIEDFIELDSMASK`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`ORIGINALSTARTDATE`, t1.`OUTLOOKOWNERAPPTID`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`SAFEDESCRIPTION`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNSAFE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `APPOINTMENT` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/category/CategoryMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="CategoryResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CATEGORYID`, t1.`CATEGORYNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`PARENTCATEGORYID`, t1.`SEQUENCENUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `CATEGORY` t1  ) t1 where categoryid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CATEGORYID`, t1.`CATEGORYNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`PARENTCATEGORYID`, t1.`SEQUENCENUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `CATEGORY` t1  ) t1 where categoryid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -47,12 +47,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CATEGORYID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`PARENTCATEGORYID`, t1.`SEQUENCENUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `CATEGORY` t1  
+		<![CDATA[ SELECT t1.`CATEGORYID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`PARENTCATEGORYID`, t1.`SEQUENCENUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `CATEGORY` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CATEGORYID`, t1.`CATEGORYNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`PARENTCATEGORYID`, t1.`SEQUENCENUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `CATEGORY` t1  
+		<![CDATA[ SELECT t1.`CATEGORYID`, t1.`CATEGORYNUMBER`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`PARENTCATEGORYID`, t1.`SEQUENCENUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `CATEGORY` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/customeraddress/CustomerAddressMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="CustomerAddressResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ADDRESSNUMBER`, t1.`ADDRESSTYPECODE`, t1.`CITY`, t1.`COMPOSITE`, t1.`COUNTRY`, t1.`COUNTY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERADDRESSID`, t1.`CUSTOMERADDRESSNAME`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LATITUDE`, t1.`LINE1`, t1.`LINE2`, t1.`LINE3`, t1.`LONGITUDE`, t1.`OBJECTTYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`PARENTID`, t1.`PARENTIDTYPECODE`, t1.`POSTALCODE`, t1.`POSTOFFICEBOX`, t1.`PRIMARYCONTACTNAME`, t1.`SHIPPINGMETHODCODE`, t1.`STATEORPROVINCE`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UPSZONE`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`UTCOFFSET`, t1.`VERSIONNUMBER` FROM `CUSTOMERADDRESS` t1  ) t1 where customeraddressid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ADDRESSNUMBER`, t1.`ADDRESSTYPECODE`, t1.`CITY`, t1.`COMPOSITE`, t1.`COUNTRY`, t1.`COUNTY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERADDRESSID`, t1.`CUSTOMERADDRESSNAME`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LATITUDE`, t1.`LINE1`, t1.`LINE2`, t1.`LINE3`, t1.`LONGITUDE`, t1.`OBJECTTYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`PARENTID`, t1.`PARENTTYPECODE`, t1.`POSTALCODE`, t1.`POSTOFFICEBOX`, t1.`PRIMARYCONTACTNAME`, t1.`SHIPPINGMETHODCODE`, t1.`STATEORPROVINCE`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UPSZONE`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`UTCOFFSET`, t1.`VERSIONNUMBER` FROM `CUSTOMERADDRESS` t1  ) t1 where customeraddressid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -37,12 +37,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ADDRESSNUMBER`, t1.`ADDRESSTYPECODE`, t1.`CITY`, t1.`COMPOSITE`, t1.`COUNTRY`, t1.`COUNTY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERADDRESSID`, t1.`CUSTOMERADDRESSNAME`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LATITUDE`, t1.`LINE1`, t1.`LINE2`, t1.`LINE3`, t1.`LONGITUDE`, t1.`OBJECTTYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`PARENTID`, t1.`PARENTIDTYPECODE`, t1.`POSTALCODE`, t1.`POSTOFFICEBOX`, t1.`PRIMARYCONTACTNAME`, t1.`SHIPPINGMETHODCODE`, t1.`STATEORPROVINCE`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UPSZONE`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`UTCOFFSET`, t1.`VERSIONNUMBER` FROM `CUSTOMERADDRESS` t1  
+		<![CDATA[ SELECT t1.`ADDRESSNUMBER`, t1.`ADDRESSTYPECODE`, t1.`CITY`, t1.`COMPOSITE`, t1.`COUNTRY`, t1.`COUNTY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERADDRESSID`, t1.`CUSTOMERADDRESSNAME`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LATITUDE`, t1.`LINE1`, t1.`LINE2`, t1.`LINE3`, t1.`LONGITUDE`, t1.`OBJECTTYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`PARENTID`, t1.`PARENTTYPECODE`, t1.`POSTALCODE`, t1.`POSTOFFICEBOX`, t1.`PRIMARYCONTACTNAME`, t1.`SHIPPINGMETHODCODE`, t1.`STATEORPROVINCE`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UPSZONE`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`UTCOFFSET`, t1.`VERSIONNUMBER` FROM `CUSTOMERADDRESS` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ADDRESSNUMBER`, t1.`ADDRESSTYPECODE`, t1.`CITY`, t1.`COMPOSITE`, t1.`COUNTRY`, t1.`COUNTY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERADDRESSID`, t1.`CUSTOMERADDRESSNAME`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LATITUDE`, t1.`LINE1`, t1.`LINE2`, t1.`LINE3`, t1.`LONGITUDE`, t1.`OBJECTTYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`PARENTID`, t1.`PARENTIDTYPECODE`, t1.`POSTALCODE`, t1.`POSTOFFICEBOX`, t1.`PRIMARYCONTACTNAME`, t1.`SHIPPINGMETHODCODE`, t1.`STATEORPROVINCE`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UPSZONE`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`UTCOFFSET`, t1.`VERSIONNUMBER` FROM `CUSTOMERADDRESS` t1  
+		<![CDATA[ SELECT t1.`ADDRESSNUMBER`, t1.`ADDRESSTYPECODE`, t1.`CITY`, t1.`COMPOSITE`, t1.`COUNTRY`, t1.`COUNTY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERADDRESSID`, t1.`CUSTOMERADDRESSNAME`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LATITUDE`, t1.`LINE1`, t1.`LINE2`, t1.`LINE3`, t1.`LONGITUDE`, t1.`OBJECTTYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`PARENTID`, t1.`PARENTTYPECODE`, t1.`POSTALCODE`, t1.`POSTOFFICEBOX`, t1.`PRIMARYCONTACTNAME`, t1.`SHIPPINGMETHODCODE`, t1.`STATEORPROVINCE`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UPSZONE`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`UTCOFFSET`, t1.`VERSIONNUMBER` FROM `CUSTOMERADDRESS` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/email/EmailMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="EmailResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ATTACHMENTCOUNT`, t1.`ATTACHMENTOPENCOUNT`, t1.`BASECONVERSATIONINDEXHASH`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMPRESSED`, t1.`CONVERSATIONINDEX`, t1.`CONVERSATIONTRACKINGID`, t1.`CORRELATIONMETHOD`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELAYEDEMAILSENDTIME`, t1.`DELIVERYATTEMPTS`, t1.`DELIVERYPRIORITYCODE`, t1.`DELIVERYRECEIPTREQUESTED`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EMAILFOLLOWED`, t1.`EMAILREMINDEREXPIRYTIME`, t1.`EMAILREMINDERSET`, t1.`EMAILREMINDERSTATUS`, t1.`EMAILREMINDERTEXT`, t1.`EMAILREMINDERTYPE`, t1.`EMAILSENDERNAME`, t1.`EMAILSENDEROBJECTTYPECODE`, t1.`EMAILTRACKINGID`, t1.`EXCHANGERATE`, t1.`FOLLOWEMAILUSERPREFERENCE`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INREPLYTO`, t1.`LASTONHOLDTIME`, t1.`LASTOPENEDTIME`, t1.`LINKSCLICKEDCOUNT`, t1.`MESSAGEID`, t1.`MESSAGEIDDUPCHECK`, t1.`MIMETYPE`, t1.`NOTIFICATIONS`, t1.`ONHOLDTIME`, t1.`OPENCOUNT`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARENTACTIVITYID`, t1.`POSTPONEEMAILPROCESSINGUNTIL`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`READRECEIPTREQUESTED`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REMINDERACTIONCARDID`, t1.`REPLYCOUNT`, t1.`SAFEDESCRIPTION`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENDER`, t1.`SENDERSACCOUNTNAME`, t1.`SENDERSACCOUNTOBJECTTYPECODE`, t1.`SENTON`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBMITTEDBY`, t1.`TEMPLATEID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TORECIPIENTS`, t1.`TRACKINGTOKEN`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNSAFE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `EMAIL` t1  ) t1 where activityid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ATTACHMENTCOUNT`, t1.`ATTACHMENTOPENCOUNT`, t1.`BASECONVERSATIONINDEXHASH`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMPRESSED`, t1.`CONVERSATIONINDEX`, t1.`CONVERSATIONTRACKINGID`, t1.`CORRELATIONMETHOD`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELAYEDEMAILSENDTIME`, t1.`DELIVERYATTEMPTS`, t1.`DELIVERYPRIORITYCODE`, t1.`DELIVERYRECEIPTREQUESTED`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EMAILFOLLOWED`, t1.`EMAILREMINDEREXPIRYTIME`, t1.`EMAILREMINDERSET`, t1.`EMAILREMINDERSTATUS`, t1.`EMAILREMINDERTEXT`, t1.`EMAILREMINDERTYPE`, t1.`EMAILSENDERNAME`, t1.`EMAILSENDEROBJECTTYPECODE`, t1.`EMAILTRACKINGID`, t1.`EXCHANGERATE`, t1.`FOLLOWEMAILUSERPREFERENCE`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INREPLYTO`, t1.`LASTONHOLDTIME`, t1.`LASTOPENEDTIME`, t1.`LINKSCLICKEDCOUNT`, t1.`MESSAGEID`, t1.`MESSAGEIDDUPCHECK`, t1.`MIMETYPE`, t1.`NOTIFICATIONS`, t1.`ONHOLDTIME`, t1.`OPENCOUNT`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTACTIVITYID`, t1.`POSTPONEEMAILPROCESSINGUNTIL`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`READRECEIPTREQUESTED`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REMINDERACTIONCARDID`, t1.`REPLYCOUNT`, t1.`SAFEDESCRIPTION`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENDER`, t1.`SENDERSACCOUNTNAME`, t1.`SENDERSACCOUNTOBJECTTYPECODE`, t1.`SENTON`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBMITTEDBY`, t1.`TEMPLATEID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TORECIPIENTS`, t1.`TRACKINGTOKEN`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNSAFE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `EMAIL` t1  ) t1 where activityid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -77,12 +77,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ATTACHMENTCOUNT`, t1.`ATTACHMENTOPENCOUNT`, t1.`BASECONVERSATIONINDEXHASH`, t1.`BILLED`, t1.`CATEGORY`, t1.`COMPRESSED`, t1.`CONVERSATIONTRACKINGID`, t1.`CORRELATIONMETHOD`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELAYEDEMAILSENDTIME`, t1.`DELIVERYATTEMPTS`, t1.`DELIVERYPRIORITYCODE`, t1.`DELIVERYRECEIPTREQUESTED`, t1.`DIRECTIONCODE`, t1.`EMAILFOLLOWED`, t1.`EMAILREMINDEREXPIRYTIME`, t1.`EMAILREMINDERSET`, t1.`EMAILREMINDERSTATUS`, t1.`EMAILREMINDERTEXT`, t1.`EMAILREMINDERTYPE`, t1.`EMAILSENDERNAME`, t1.`EMAILSENDEROBJECTTYPECODE`, t1.`EMAILTRACKINGID`, t1.`EXCHANGERATE`, t1.`FOLLOWEMAILUSERPREFERENCE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INREPLYTO`, t1.`LASTONHOLDTIME`, t1.`LASTOPENEDTIME`, t1.`LINKSCLICKEDCOUNT`, t1.`MESSAGEID`, t1.`MESSAGEIDDUPCHECK`, t1.`MIMETYPE`, t1.`NOTIFICATIONS`, t1.`ONHOLDTIME`, t1.`OPENCOUNT`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARENTACTIVITYID`, t1.`POSTPONEEMAILPROCESSINGUNTIL`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`READRECEIPTREQUESTED`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REMINDERACTIONCARDID`, t1.`REPLYCOUNT`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENDER`, t1.`SENDERSACCOUNTNAME`, t1.`SENDERSACCOUNTOBJECTTYPECODE`, t1.`SENTON`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBMITTEDBY`, t1.`TEMPLATEID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TORECIPIENTS`, t1.`TRACKINGTOKEN`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNSAFE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `EMAIL` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ATTACHMENTCOUNT`, t1.`ATTACHMENTOPENCOUNT`, t1.`BASECONVERSATIONINDEXHASH`, t1.`BILLED`, t1.`CATEGORY`, t1.`COMPRESSED`, t1.`CONVERSATIONTRACKINGID`, t1.`CORRELATIONMETHOD`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELAYEDEMAILSENDTIME`, t1.`DELIVERYATTEMPTS`, t1.`DELIVERYPRIORITYCODE`, t1.`DELIVERYRECEIPTREQUESTED`, t1.`DIRECTIONCODE`, t1.`EMAILFOLLOWED`, t1.`EMAILREMINDEREXPIRYTIME`, t1.`EMAILREMINDERSET`, t1.`EMAILREMINDERSTATUS`, t1.`EMAILREMINDERTEXT`, t1.`EMAILREMINDERTYPE`, t1.`EMAILSENDERNAME`, t1.`EMAILSENDEROBJECTTYPECODE`, t1.`EMAILTRACKINGID`, t1.`EXCHANGERATE`, t1.`FOLLOWEMAILUSERPREFERENCE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INREPLYTO`, t1.`LASTONHOLDTIME`, t1.`LASTOPENEDTIME`, t1.`LINKSCLICKEDCOUNT`, t1.`MESSAGEID`, t1.`MESSAGEIDDUPCHECK`, t1.`MIMETYPE`, t1.`NOTIFICATIONS`, t1.`ONHOLDTIME`, t1.`OPENCOUNT`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTACTIVITYID`, t1.`POSTPONEEMAILPROCESSINGUNTIL`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`READRECEIPTREQUESTED`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REMINDERACTIONCARDID`, t1.`REPLYCOUNT`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENDER`, t1.`SENDERSACCOUNTNAME`, t1.`SENDERSACCOUNTOBJECTTYPECODE`, t1.`SENTON`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBMITTEDBY`, t1.`TEMPLATEID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TORECIPIENTS`, t1.`TRACKINGTOKEN`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNSAFE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `EMAIL` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ATTACHMENTCOUNT`, t1.`ATTACHMENTOPENCOUNT`, t1.`BASECONVERSATIONINDEXHASH`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMPRESSED`, t1.`CONVERSATIONINDEX`, t1.`CONVERSATIONTRACKINGID`, t1.`CORRELATIONMETHOD`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELAYEDEMAILSENDTIME`, t1.`DELIVERYATTEMPTS`, t1.`DELIVERYPRIORITYCODE`, t1.`DELIVERYRECEIPTREQUESTED`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EMAILFOLLOWED`, t1.`EMAILREMINDEREXPIRYTIME`, t1.`EMAILREMINDERSET`, t1.`EMAILREMINDERSTATUS`, t1.`EMAILREMINDERTEXT`, t1.`EMAILREMINDERTYPE`, t1.`EMAILSENDERNAME`, t1.`EMAILSENDEROBJECTTYPECODE`, t1.`EMAILTRACKINGID`, t1.`EXCHANGERATE`, t1.`FOLLOWEMAILUSERPREFERENCE`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INREPLYTO`, t1.`LASTONHOLDTIME`, t1.`LASTOPENEDTIME`, t1.`LINKSCLICKEDCOUNT`, t1.`MESSAGEID`, t1.`MESSAGEIDDUPCHECK`, t1.`MIMETYPE`, t1.`NOTIFICATIONS`, t1.`ONHOLDTIME`, t1.`OPENCOUNT`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARENTACTIVITYID`, t1.`POSTPONEEMAILPROCESSINGUNTIL`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`READRECEIPTREQUESTED`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REMINDERACTIONCARDID`, t1.`REPLYCOUNT`, t1.`SAFEDESCRIPTION`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENDER`, t1.`SENDERSACCOUNTNAME`, t1.`SENDERSACCOUNTOBJECTTYPECODE`, t1.`SENTON`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBMITTEDBY`, t1.`TEMPLATEID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TORECIPIENTS`, t1.`TRACKINGTOKEN`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNSAFE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `EMAIL` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ATTACHMENTCOUNT`, t1.`ATTACHMENTOPENCOUNT`, t1.`BASECONVERSATIONINDEXHASH`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMPRESSED`, t1.`CONVERSATIONINDEX`, t1.`CONVERSATIONTRACKINGID`, t1.`CORRELATIONMETHOD`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELAYEDEMAILSENDTIME`, t1.`DELIVERYATTEMPTS`, t1.`DELIVERYPRIORITYCODE`, t1.`DELIVERYRECEIPTREQUESTED`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EMAILFOLLOWED`, t1.`EMAILREMINDEREXPIRYTIME`, t1.`EMAILREMINDERSET`, t1.`EMAILREMINDERSTATUS`, t1.`EMAILREMINDERTEXT`, t1.`EMAILREMINDERTYPE`, t1.`EMAILSENDERNAME`, t1.`EMAILSENDEROBJECTTYPECODE`, t1.`EMAILTRACKINGID`, t1.`EXCHANGERATE`, t1.`FOLLOWEMAILUSERPREFERENCE`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INREPLYTO`, t1.`LASTONHOLDTIME`, t1.`LASTOPENEDTIME`, t1.`LINKSCLICKEDCOUNT`, t1.`MESSAGEID`, t1.`MESSAGEIDDUPCHECK`, t1.`MIMETYPE`, t1.`NOTIFICATIONS`, t1.`ONHOLDTIME`, t1.`OPENCOUNT`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTACTIVITYID`, t1.`POSTPONEEMAILPROCESSINGUNTIL`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`READRECEIPTREQUESTED`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REMINDERACTIONCARDID`, t1.`REPLYCOUNT`, t1.`SAFEDESCRIPTION`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENDER`, t1.`SENDERSACCOUNTNAME`, t1.`SENDERSACCOUNTOBJECTTYPECODE`, t1.`SENTON`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBMITTEDBY`, t1.`TEMPLATEID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TORECIPIENTS`, t1.`TRACKINGTOKEN`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNSAFE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `EMAIL` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/fax/FaxMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="FaxResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`BILLINGCODE`, t1.`CATEGORY`, t1.`COVERPAGENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EXCHANGERATE`, t1.`FAXNUMBER`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`NUMBEROFPAGES`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`TSID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `FAX` t1  ) t1 where activityid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`BILLINGCODE`, t1.`CATEGORY`, t1.`COVERPAGENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EXCHANGERATE`, t1.`FAXNUMBER`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`NUMBEROFPAGES`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`TSID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `FAX` t1  ) t1 where activityid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -57,12 +57,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`BILLINGCODE`, t1.`CATEGORY`, t1.`COVERPAGENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EXCHANGERATE`, t1.`FAXNUMBER`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`NUMBEROFPAGES`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`TSID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `FAX` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`BILLINGCODE`, t1.`CATEGORY`, t1.`COVERPAGENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EXCHANGERATE`, t1.`FAXNUMBER`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`NUMBEROFPAGES`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`TSID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `FAX` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`BILLINGCODE`, t1.`CATEGORY`, t1.`COVERPAGENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EXCHANGERATE`, t1.`FAXNUMBER`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`NUMBEROFPAGES`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`TSID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `FAX` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`BILLINGCODE`, t1.`CATEGORY`, t1.`COVERPAGENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EXCHANGERATE`, t1.`FAXNUMBER`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`NUMBEROFPAGES`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`TSID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `FAX` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/feedback/FeedbackMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="FeedbackResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CLOSEDBYNAME`, t1.`CLOSEDON`, t1.`COMMENTS`, t1.`CREATEDATE`, t1.`CREATEDBYCONTACT`, t1.`CREATEDBYCONTACTNAME`, t1.`CREATEDONBEHALFBYCONTACT`, t1.`CREATEDONBEHALFBYCONTACTNAME`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`FEEDBACKID`, t1.`IMPORTSEQUENCENUMBER`, t1.`MAXRATING`, t1.`MINRATING`, t1.`NORMALIZEDRATING`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`RATING`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`SOURCE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `FEEDBACK` t1  ) t1 where feedbackid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CLOSEDBYNAME`, t1.`CLOSEDON`, t1.`COMMENTS`, t1.`CREATEDATE`, t1.`CREATEDBYCONTACT`, t1.`CREATEDBYCONTACTNAME`, t1.`CREATEDONBEHALFBYCONTACT`, t1.`CREATEDONBEHALFBYCONTACTNAME`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`FEEDBACKID`, t1.`IMPORTSEQUENCENUMBER`, t1.`MAXRATING`, t1.`MINRATING`, t1.`NORMALIZEDRATING`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`RATING`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`SOURCE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `FEEDBACK` t1  ) t1 where feedbackid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -57,12 +57,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CLOSEDBYNAME`, t1.`CLOSEDON`, t1.`COMMENTS`, t1.`CREATEDATE`, t1.`CREATEDBYCONTACT`, t1.`CREATEDBYCONTACTNAME`, t1.`CREATEDONBEHALFBYCONTACT`, t1.`CREATEDONBEHALFBYCONTACTNAME`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`FEEDBACKID`, t1.`IMPORTSEQUENCENUMBER`, t1.`MAXRATING`, t1.`MINRATING`, t1.`NORMALIZEDRATING`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`RATING`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`SOURCE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `FEEDBACK` t1  
+		<![CDATA[ SELECT t1.`CLOSEDBYNAME`, t1.`CLOSEDON`, t1.`COMMENTS`, t1.`CREATEDATE`, t1.`CREATEDBYCONTACT`, t1.`CREATEDBYCONTACTNAME`, t1.`CREATEDONBEHALFBYCONTACT`, t1.`CREATEDONBEHALFBYCONTACTNAME`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`FEEDBACKID`, t1.`IMPORTSEQUENCENUMBER`, t1.`MAXRATING`, t1.`MINRATING`, t1.`NORMALIZEDRATING`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`RATING`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`SOURCE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `FEEDBACK` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CLOSEDBYNAME`, t1.`CLOSEDON`, t1.`COMMENTS`, t1.`CREATEDATE`, t1.`CREATEDBYCONTACT`, t1.`CREATEDBYCONTACTNAME`, t1.`CREATEDONBEHALFBYCONTACT`, t1.`CREATEDONBEHALFBYCONTACTNAME`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`FEEDBACKID`, t1.`IMPORTSEQUENCENUMBER`, t1.`MAXRATING`, t1.`MINRATING`, t1.`NORMALIZEDRATING`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`RATING`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`SOURCE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `FEEDBACK` t1  
+		<![CDATA[ SELECT t1.`CLOSEDBYNAME`, t1.`CLOSEDON`, t1.`COMMENTS`, t1.`CREATEDATE`, t1.`CREATEDBYCONTACT`, t1.`CREATEDBYCONTACTNAME`, t1.`CREATEDONBEHALFBYCONTACT`, t1.`CREATEDONBEHALFBYCONTACTNAME`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`FEEDBACKID`, t1.`IMPORTSEQUENCENUMBER`, t1.`MAXRATING`, t1.`MINRATING`, t1.`NORMALIZEDRATING`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`RATING`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`SOURCE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `FEEDBACK` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/knowledgearticle/KnowledgeArticleMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="KnowledgeArticleResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ARTICLEPUBLICNUMBER`, t1.`CONTENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`EXPIRATIONDATE`, t1.`EXPIRATIONSTATEID`, t1.`EXPIRATIONSTATUSID`, t1.`EXPIREDREVIEWOPTIONS`, t1.`IMPORTSEQUENCENUMBER`, t1.`INTERNAL`, t1.`ISPRIMARY`, t1.`KEYWORDS`, t1.`KNOWLEDGEARTICLEID`, t1.`KNOWLEDGEARTICLEVIEWS`, t1.`KNOWLEDGEARTICLEVIEWS_DATE`, t1.`KNOWLEDGEARTICLEVIEWS_STATE`, t1.`LANGUAGELOCALEID`, t1.`LANGUAGELOCALEIDLOCALEID`, t1.`LANGUAGELOCALENAME`, t1.`LATESTVERSION`, t1.`MAJORVERSIONNUMBER`, t1.`MINORVERSIONNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTARTICLECONTENTID`, t1.`PARENTARTICLECONTENTNAME`, t1.`PREVIOUSARTICLECONTENTID`, t1.`PREVIOUSARTICLECONTENTNAME`, t1.`PRIMARYAUTHORID`, t1.`PRIMARYAUTHORIDNAME`, t1.`PROCESSID`, t1.`PUBLISHON`, t1.`PUBLISHSTATUSID`, t1.`RATING`, t1.`RATING_COUNT`, t1.`RATING_DATE`, t1.`RATING_STATE`, t1.`RATING_SUM`, t1.`READYFORREVIEW`, t1.`REVIEW`, t1.`ROOTARTICLE`, t1.`ROOTARTICLEID`, t1.`ROOTARTICLENAME`, t1.`SCHEDULEDSTATUSID`, t1.`SETCATEGORYASSOCIATIONS`, t1.`SETPRODUCTASSOCIATIONS`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTIDDSC`, t1.`SUBJECTNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATECONTENT`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `KNOWLEDGEARTICLE` t1  ) t1 where knowledgearticleid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ARTICLEPUBLICNUMBER`, t1.`CONTENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`EXPIRATIONDATE`, t1.`EXPIRATIONSTATEID`, t1.`EXPIRATIONSTATUSID`, t1.`EXPIREDREVIEWOPTIONS`, t1.`IMPORTSEQUENCENUMBER`, t1.`INTERNAL`, t1.`ISPRIMARY`, t1.`KEYWORDS`, t1.`KNOWLEDGEARTICLEID`, t1.`KNOWLEDGEARTICLEVIEWS`, t1.`KNOWLEDGEARTICLEVIEWS_DATE`, t1.`KNOWLEDGEARTICLEVIEWS_STATE`, t1.`LANGUAGELOCALEID`, t1.`LANGUAGELOCALEIDLOCALEID`, t1.`LANGUAGELOCALENAME`, t1.`LATESTVERSION`, t1.`MAJORVERSIONNUMBER`, t1.`MINORVERSIONNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTARTICLECONTENTID`, t1.`PARENTARTICLECONTENTNAME`, t1.`PREVIOUSARTICLECONTENTID`, t1.`PREVIOUSARTICLECONTENTNAME`, t1.`PRIMARYAUTHORID`, t1.`PRIMARYAUTHORIDNAME`, t1.`PROCESSID`, t1.`PUBLISHON`, t1.`PUBLISHSTATUSID`, t1.`RATING`, t1.`RATING_COUNT`, t1.`RATING_DATE`, t1.`RATING_STATE`, t1.`RATING_SUM`, t1.`READYFORREVIEW`, t1.`REVIEW`, t1.`ROOTARTICLE`, t1.`ROOTARTICLEID`, t1.`ROOTARTICLENAME`, t1.`SCHEDULEDSTATUSID`, t1.`SETCATEGORYASSOCIATIONS`, t1.`SETPRODUCTASSOCIATIONS`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTIDDSC`, t1.`SUBJECTNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATECONTENT`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `KNOWLEDGEARTICLE` t1  ) t1 where knowledgearticleid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -94,12 +94,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`EXPIRATIONDATE`, t1.`EXPIRATIONSTATEID`, t1.`EXPIRATIONSTATUSID`, t1.`EXPIREDREVIEWOPTIONS`, t1.`IMPORTSEQUENCENUMBER`, t1.`INTERNAL`, t1.`ISPRIMARY`, t1.`KNOWLEDGEARTICLEID`, t1.`KNOWLEDGEARTICLEVIEWS`, t1.`KNOWLEDGEARTICLEVIEWS_DATE`, t1.`KNOWLEDGEARTICLEVIEWS_STATE`, t1.`LANGUAGELOCALEID`, t1.`LANGUAGELOCALEIDLOCALEID`, t1.`LANGUAGELOCALENAME`, t1.`LATESTVERSION`, t1.`MAJORVERSIONNUMBER`, t1.`MINORVERSIONNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTARTICLECONTENTID`, t1.`PARENTARTICLECONTENTNAME`, t1.`PREVIOUSARTICLECONTENTID`, t1.`PREVIOUSARTICLECONTENTNAME`, t1.`PRIMARYAUTHORID`, t1.`PRIMARYAUTHORIDNAME`, t1.`PROCESSID`, t1.`PUBLISHON`, t1.`PUBLISHSTATUSID`, t1.`RATING`, t1.`RATING_COUNT`, t1.`RATING_DATE`, t1.`RATING_STATE`, t1.`RATING_SUM`, t1.`READYFORREVIEW`, t1.`REVIEW`, t1.`ROOTARTICLE`, t1.`ROOTARTICLEID`, t1.`ROOTARTICLENAME`, t1.`SCHEDULEDSTATUSID`, t1.`SETCATEGORYASSOCIATIONS`, t1.`SETPRODUCTASSOCIATIONS`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTIDDSC`, t1.`SUBJECTNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATECONTENT`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `KNOWLEDGEARTICLE` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`EXPIRATIONDATE`, t1.`EXPIRATIONSTATEID`, t1.`EXPIRATIONSTATUSID`, t1.`EXPIREDREVIEWOPTIONS`, t1.`IMPORTSEQUENCENUMBER`, t1.`INTERNAL`, t1.`ISPRIMARY`, t1.`KNOWLEDGEARTICLEID`, t1.`KNOWLEDGEARTICLEVIEWS`, t1.`KNOWLEDGEARTICLEVIEWS_DATE`, t1.`KNOWLEDGEARTICLEVIEWS_STATE`, t1.`LANGUAGELOCALEID`, t1.`LANGUAGELOCALEIDLOCALEID`, t1.`LANGUAGELOCALENAME`, t1.`LATESTVERSION`, t1.`MAJORVERSIONNUMBER`, t1.`MINORVERSIONNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTARTICLECONTENTID`, t1.`PARENTARTICLECONTENTNAME`, t1.`PREVIOUSARTICLECONTENTID`, t1.`PREVIOUSARTICLECONTENTNAME`, t1.`PRIMARYAUTHORID`, t1.`PRIMARYAUTHORIDNAME`, t1.`PROCESSID`, t1.`PUBLISHON`, t1.`PUBLISHSTATUSID`, t1.`RATING`, t1.`RATING_COUNT`, t1.`RATING_DATE`, t1.`RATING_STATE`, t1.`RATING_SUM`, t1.`READYFORREVIEW`, t1.`REVIEW`, t1.`ROOTARTICLE`, t1.`ROOTARTICLEID`, t1.`ROOTARTICLENAME`, t1.`SCHEDULEDSTATUSID`, t1.`SETCATEGORYASSOCIATIONS`, t1.`SETPRODUCTASSOCIATIONS`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTIDDSC`, t1.`SUBJECTNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATECONTENT`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `KNOWLEDGEARTICLE` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ARTICLEPUBLICNUMBER`, t1.`CONTENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`EXPIRATIONDATE`, t1.`EXPIRATIONSTATEID`, t1.`EXPIRATIONSTATUSID`, t1.`EXPIREDREVIEWOPTIONS`, t1.`IMPORTSEQUENCENUMBER`, t1.`INTERNAL`, t1.`ISPRIMARY`, t1.`KEYWORDS`, t1.`KNOWLEDGEARTICLEID`, t1.`KNOWLEDGEARTICLEVIEWS`, t1.`KNOWLEDGEARTICLEVIEWS_DATE`, t1.`KNOWLEDGEARTICLEVIEWS_STATE`, t1.`LANGUAGELOCALEID`, t1.`LANGUAGELOCALEIDLOCALEID`, t1.`LANGUAGELOCALENAME`, t1.`LATESTVERSION`, t1.`MAJORVERSIONNUMBER`, t1.`MINORVERSIONNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTARTICLECONTENTID`, t1.`PARENTARTICLECONTENTNAME`, t1.`PREVIOUSARTICLECONTENTID`, t1.`PREVIOUSARTICLECONTENTNAME`, t1.`PRIMARYAUTHORID`, t1.`PRIMARYAUTHORIDNAME`, t1.`PROCESSID`, t1.`PUBLISHON`, t1.`PUBLISHSTATUSID`, t1.`RATING`, t1.`RATING_COUNT`, t1.`RATING_DATE`, t1.`RATING_STATE`, t1.`RATING_SUM`, t1.`READYFORREVIEW`, t1.`REVIEW`, t1.`ROOTARTICLE`, t1.`ROOTARTICLEID`, t1.`ROOTARTICLENAME`, t1.`SCHEDULEDSTATUSID`, t1.`SETCATEGORYASSOCIATIONS`, t1.`SETPRODUCTASSOCIATIONS`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTIDDSC`, t1.`SUBJECTNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATECONTENT`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `KNOWLEDGEARTICLE` t1  
+		<![CDATA[ SELECT t1.`ARTICLEPUBLICNUMBER`, t1.`CONTENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`EXPIRATIONDATE`, t1.`EXPIRATIONSTATEID`, t1.`EXPIRATIONSTATUSID`, t1.`EXPIREDREVIEWOPTIONS`, t1.`IMPORTSEQUENCENUMBER`, t1.`INTERNAL`, t1.`ISPRIMARY`, t1.`KEYWORDS`, t1.`KNOWLEDGEARTICLEID`, t1.`KNOWLEDGEARTICLEVIEWS`, t1.`KNOWLEDGEARTICLEVIEWS_DATE`, t1.`KNOWLEDGEARTICLEVIEWS_STATE`, t1.`LANGUAGELOCALEID`, t1.`LANGUAGELOCALEIDLOCALEID`, t1.`LANGUAGELOCALENAME`, t1.`LATESTVERSION`, t1.`MAJORVERSIONNUMBER`, t1.`MINORVERSIONNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTARTICLECONTENTID`, t1.`PARENTARTICLECONTENTNAME`, t1.`PREVIOUSARTICLECONTENTID`, t1.`PREVIOUSARTICLECONTENTNAME`, t1.`PRIMARYAUTHORID`, t1.`PRIMARYAUTHORIDNAME`, t1.`PROCESSID`, t1.`PUBLISHON`, t1.`PUBLISHSTATUSID`, t1.`RATING`, t1.`RATING_COUNT`, t1.`RATING_DATE`, t1.`RATING_STATE`, t1.`RATING_SUM`, t1.`READYFORREVIEW`, t1.`REVIEW`, t1.`ROOTARTICLE`, t1.`ROOTARTICLEID`, t1.`ROOTARTICLENAME`, t1.`SCHEDULEDSTATUSID`, t1.`SETCATEGORYASSOCIATIONS`, t1.`SETPRODUCTASSOCIATIONS`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTIDDSC`, t1.`SUBJECTNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATECONTENT`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `KNOWLEDGEARTICLE` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/knowledgearticleviews/KnowledgeArticleViewsMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="KnowledgeArticleViewsResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`KNOWLEDGEARTICLEID`, t1.`KNOWLEDGEARTICLEVIEW`, t1.`KNOWLEDGEARTICLEVIEWSID`, t1.`LOCATION`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGUSER`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VIEWDATE` FROM `KNOWLEDGEARTICLEVIEWS` t1  ) t1 where knowledgearticleviewsid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`KNOWLEDGEARTICLEID`, t1.`KNOWLEDGEARTICLEVIEW`, t1.`KNOWLEDGEARTICLEVIEWSID`, t1.`LOCATION`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGUSER`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VIEWDATE` FROM `KNOWLEDGEARTICLEVIEWS` t1  ) t1 where knowledgearticleviewsid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -37,12 +37,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`KNOWLEDGEARTICLEID`, t1.`KNOWLEDGEARTICLEVIEW`, t1.`KNOWLEDGEARTICLEVIEWSID`, t1.`LOCATION`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGUSER`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VIEWDATE` FROM `KNOWLEDGEARTICLEVIEWS` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`KNOWLEDGEARTICLEID`, t1.`KNOWLEDGEARTICLEVIEW`, t1.`KNOWLEDGEARTICLEVIEWSID`, t1.`LOCATION`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGUSER`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VIEWDATE` FROM `KNOWLEDGEARTICLEVIEWS` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`KNOWLEDGEARTICLEID`, t1.`KNOWLEDGEARTICLEVIEW`, t1.`KNOWLEDGEARTICLEVIEWSID`, t1.`LOCATION`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGUSER`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VIEWDATE` FROM `KNOWLEDGEARTICLEVIEWS` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`KNOWLEDGEARTICLEID`, t1.`KNOWLEDGEARTICLEVIEW`, t1.`KNOWLEDGEARTICLEVIEWSID`, t1.`LOCATION`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGUSER`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VIEWDATE` FROM `KNOWLEDGEARTICLEVIEWS` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/letter/LetterMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="LetterResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ADDRESS`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EXCHANGERATE`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `LETTER` t1  ) t1 where activityid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ADDRESS`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EXCHANGERATE`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `LETTER` t1  ) t1 where activityid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -57,12 +57,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ADDRESS`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `LETTER` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ADDRESS`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `LETTER` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ADDRESS`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EXCHANGERATE`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `LETTER` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ADDRESS`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EXCHANGERATE`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `LETTER` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/personaldocumenttemplate/PersonalDocumentTemplateMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="PersonalDocumentTemplateResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ASSOCIATEDENTITYTYPECODE`, t1.`CLIENTDATA`, t1.`CONTENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DOCUMENTTYPE`, t1.`LANGUAGECODE`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`PERSONALDOCUMENTTEMPLATEID`, t1.`PERSONALDOCUMENTTEMPLATENAME`, t1.`STATUS`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `PERSONALDOCUMENTTEMPLATE` t1  ) t1 where personaldocumenttemplateid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ASSOCIATEDENTITYTYPECODE`, t1.`CLIENTDATA`, t1.`CONTENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DOCUMENTTYPE`, t1.`LANGUAGECODE`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`PERSONALDOCUMENTTEMPLATEID`, t1.`PERSONALDOCUMENTTEMPLATENAME`, t1.`STATUS`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `PERSONALDOCUMENTTEMPLATE` t1  ) t1 where personaldocumenttemplateid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -27,12 +27,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ASSOCIATEDENTITYTYPECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DOCUMENTTYPE`, t1.`LANGUAGECODE`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`PERSONALDOCUMENTTEMPLATEID`, t1.`PERSONALDOCUMENTTEMPLATENAME`, t1.`STATUS`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `PERSONALDOCUMENTTEMPLATE` t1  
+		<![CDATA[ SELECT t1.`ASSOCIATEDENTITYTYPECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DOCUMENTTYPE`, t1.`LANGUAGECODE`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`PERSONALDOCUMENTTEMPLATEID`, t1.`PERSONALDOCUMENTTEMPLATENAME`, t1.`STATUS`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `PERSONALDOCUMENTTEMPLATE` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ASSOCIATEDENTITYTYPECODE`, t1.`CLIENTDATA`, t1.`CONTENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DOCUMENTTYPE`, t1.`LANGUAGECODE`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`PERSONALDOCUMENTTEMPLATEID`, t1.`PERSONALDOCUMENTTEMPLATENAME`, t1.`STATUS`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `PERSONALDOCUMENTTEMPLATE` t1  
+		<![CDATA[ SELECT t1.`ASSOCIATEDENTITYTYPECODE`, t1.`CLIENTDATA`, t1.`CONTENT`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DOCUMENTTYPE`, t1.`LANGUAGECODE`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`PERSONALDOCUMENTTEMPLATEID`, t1.`PERSONALDOCUMENTTEMPLATENAME`, t1.`STATUS`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `PERSONALDOCUMENTTEMPLATE` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/phonecall/PhoneCallMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="PhoneCallResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EXCHANGERATE`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PHONENUMBER`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `PHONECALL` t1  ) t1 where activityid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EXCHANGERATE`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PHONENUMBER`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `PHONECALL` t1  ) t1 where activityid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -57,12 +57,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PHONENUMBER`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `PHONECALL` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PHONENUMBER`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `PHONECALL` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EXCHANGERATE`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PHONENUMBER`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `PHONECALL` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DIRECTIONCODE`, t1.`EXCHANGERATE`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PHONENUMBER`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `PHONECALL` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/post/PostMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="PostResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`POSTID`, t1.`POSTTOYAMMER`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTOWNERID`, t1.`REGARDINGOBJECTOWNERIDTYPE`, t1.`REGARDINGOBJECTTYPECODE`, t1.`SOURCE`, t1.`TEXT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`YAMMERPOSTSTATE`, t1.`YAMMERRETRYCOUNT` FROM `POST` t1  ) t1 where postid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`POSTID`, t1.`POSTTOYAMMER`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTOWNERID`, t1.`REGARDINGOBJECTOWNERTYPE`, t1.`REGARDINGOBJECTTYPECODE`, t1.`SOURCE`, t1.`TEXT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`YAMMERPOSTSTATE`, t1.`YAMMERRETRYCOUNT` FROM `POST` t1  ) t1 where postid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -27,12 +27,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`POSTID`, t1.`POSTTOYAMMER`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTOWNERID`, t1.`REGARDINGOBJECTOWNERIDTYPE`, t1.`REGARDINGOBJECTTYPECODE`, t1.`SOURCE`, t1.`TEXT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`YAMMERPOSTSTATE`, t1.`YAMMERRETRYCOUNT` FROM `POST` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`POSTID`, t1.`POSTTOYAMMER`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTOWNERID`, t1.`REGARDINGOBJECTOWNERTYPE`, t1.`REGARDINGOBJECTTYPECODE`, t1.`SOURCE`, t1.`TEXT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`YAMMERPOSTSTATE`, t1.`YAMMERRETRYCOUNT` FROM `POST` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`POSTID`, t1.`POSTTOYAMMER`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTOWNERID`, t1.`REGARDINGOBJECTOWNERIDTYPE`, t1.`REGARDINGOBJECTTYPECODE`, t1.`SOURCE`, t1.`TEXT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`YAMMERPOSTSTATE`, t1.`YAMMERRETRYCOUNT` FROM `POST` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`POSTID`, t1.`POSTTOYAMMER`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTOWNERID`, t1.`REGARDINGOBJECTOWNERTYPE`, t1.`REGARDINGOBJECTTYPECODE`, t1.`SOURCE`, t1.`TEXT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`YAMMERPOSTSTATE`, t1.`YAMMERRETRYCOUNT` FROM `POST` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/sla/SlaMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="SlaResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ALLOWPAUSERESUME`, t1.`APPLICABLEFROM`, t1.`APPLICABLEFROMPICKLIST`, t1.`BUSINESSHOURSID`, t1.`CHANGEDATTRIBUTELIST`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEFAULT`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`MANAGED`, t1.`OBJECTTYPECODE`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGTEAM`, t1.`OWNINGUSER`, t1.`PRIMARYENTITYOTC`, t1.`SLAID`, t1.`SLAIDUNIQUE`, t1.`SLANAME`, t1.`SLATYPE`, t1.`SOLUTIONID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUPPORTINGSOLUTIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER`, t1.`WORKFLOWID`, t1.`WORKFLOWIDNAME` FROM `SLA` t1  ) t1 where slaid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ALLOWPAUSERESUME`, t1.`APPLICABLEFROM`, t1.`APPLICABLEFROMPICKLIST`, t1.`BUSINESSHOURSID`, t1.`CHANGEDATTRIBUTELIST`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEFAULT`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`MANAGED`, t1.`OBJECTTYPECODE`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGTEAM`, t1.`OWNINGUSER`, t1.`PRIMARYENTITYOTC`, t1.`SLAID`, t1.`SLAIDUNIQUE`, t1.`SLANAME`, t1.`SLATYPE`, t1.`SOLUTIONID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUPPORTINGSOLUTIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER`, t1.`WORKFLOWID`, t1.`WORKFLOWIDNAME` FROM `SLA` t1  ) t1 where slaid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -58,12 +58,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ALLOWPAUSERESUME`, t1.`APPLICABLEFROM`, t1.`APPLICABLEFROMPICKLIST`, t1.`BUSINESSHOURSID`, t1.`CHANGEDATTRIBUTELIST`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEFAULT`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`MANAGED`, t1.`OBJECTTYPECODE`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGTEAM`, t1.`OWNINGUSER`, t1.`PRIMARYENTITYOTC`, t1.`SLAID`, t1.`SLAIDUNIQUE`, t1.`SLANAME`, t1.`SLATYPE`, t1.`SOLUTIONID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUPPORTINGSOLUTIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER`, t1.`WORKFLOWID`, t1.`WORKFLOWIDNAME` FROM `SLA` t1  
+		<![CDATA[ SELECT t1.`ALLOWPAUSERESUME`, t1.`APPLICABLEFROM`, t1.`APPLICABLEFROMPICKLIST`, t1.`BUSINESSHOURSID`, t1.`CHANGEDATTRIBUTELIST`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEFAULT`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`MANAGED`, t1.`OBJECTTYPECODE`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGTEAM`, t1.`OWNINGUSER`, t1.`PRIMARYENTITYOTC`, t1.`SLAID`, t1.`SLAIDUNIQUE`, t1.`SLANAME`, t1.`SLATYPE`, t1.`SOLUTIONID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUPPORTINGSOLUTIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER`, t1.`WORKFLOWID`, t1.`WORKFLOWIDNAME` FROM `SLA` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ALLOWPAUSERESUME`, t1.`APPLICABLEFROM`, t1.`APPLICABLEFROMPICKLIST`, t1.`BUSINESSHOURSID`, t1.`CHANGEDATTRIBUTELIST`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEFAULT`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`MANAGED`, t1.`OBJECTTYPECODE`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGTEAM`, t1.`OWNINGUSER`, t1.`PRIMARYENTITYOTC`, t1.`SLAID`, t1.`SLAIDUNIQUE`, t1.`SLANAME`, t1.`SLATYPE`, t1.`SOLUTIONID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUPPORTINGSOLUTIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER`, t1.`WORKFLOWID`, t1.`WORKFLOWIDNAME` FROM `SLA` t1  
+		<![CDATA[ SELECT t1.`ALLOWPAUSERESUME`, t1.`APPLICABLEFROM`, t1.`APPLICABLEFROMPICKLIST`, t1.`BUSINESSHOURSID`, t1.`CHANGEDATTRIBUTELIST`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEFAULT`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`MANAGED`, t1.`OBJECTTYPECODE`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGTEAM`, t1.`OWNINGUSER`, t1.`PRIMARYENTITYOTC`, t1.`SLAID`, t1.`SLAIDUNIQUE`, t1.`SLANAME`, t1.`SLATYPE`, t1.`SOLUTIONID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUPPORTINGSOLUTIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER`, t1.`WORKFLOWID`, t1.`WORKFLOWIDNAME` FROM `SLA` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/slaitem/SlaItemMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="SlaItemResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`APPLICABLEWHENXML`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`FAILUREAFTER`, t1.`MANAGED`, t1.`NAME`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNINGUSER`, t1.`RELATEDFIELD`, t1.`SEQUENCENUMBER`, t1.`SLAID`, t1.`SLAITEMID`, t1.`SLAITEMIDUNIQUE`, t1.`SOLUTIONID`, t1.`SUCCESSCONDITIONSXML`, t1.`SUPPORTINGSOLUTIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER`, t1.`WARNAFTER`, t1.`WORKFLOWID`, t1.`WORKFLOWIDNAME` FROM `SLAITEM` t1  ) t1 where slaitemid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`APPLICABLEWHENXML`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`FAILUREAFTER`, t1.`MANAGED`, t1.`NAME`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`OWNINGUSER`, t1.`RELATEDFIELD`, t1.`SEQUENCENUMBER`, t1.`SLAID`, t1.`SLAITEMID`, t1.`SLAITEMIDUNIQUE`, t1.`SOLUTIONID`, t1.`SUCCESSCONDITIONSXML`, t1.`SUPPORTINGSOLUTIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER`, t1.`WARNAFTER`, t1.`WORKFLOWID`, t1.`WORKFLOWIDNAME` FROM `SLAITEM` t1  ) t1 where slaitemid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -37,12 +37,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`FAILUREAFTER`, t1.`MANAGED`, t1.`NAME`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNINGUSER`, t1.`RELATEDFIELD`, t1.`SEQUENCENUMBER`, t1.`SLAID`, t1.`SLAITEMID`, t1.`SLAITEMIDUNIQUE`, t1.`SOLUTIONID`, t1.`SUPPORTINGSOLUTIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER`, t1.`WARNAFTER`, t1.`WORKFLOWID`, t1.`WORKFLOWIDNAME` FROM `SLAITEM` t1  
+		<![CDATA[ SELECT t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`FAILUREAFTER`, t1.`MANAGED`, t1.`NAME`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`OWNINGUSER`, t1.`RELATEDFIELD`, t1.`SEQUENCENUMBER`, t1.`SLAID`, t1.`SLAITEMID`, t1.`SLAITEMIDUNIQUE`, t1.`SOLUTIONID`, t1.`SUPPORTINGSOLUTIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER`, t1.`WARNAFTER`, t1.`WORKFLOWID`, t1.`WORKFLOWIDNAME` FROM `SLAITEM` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`APPLICABLEWHENXML`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`FAILUREAFTER`, t1.`MANAGED`, t1.`NAME`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNINGUSER`, t1.`RELATEDFIELD`, t1.`SEQUENCENUMBER`, t1.`SLAID`, t1.`SLAITEMID`, t1.`SLAITEMIDUNIQUE`, t1.`SOLUTIONID`, t1.`SUCCESSCONDITIONSXML`, t1.`SUPPORTINGSOLUTIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER`, t1.`WARNAFTER`, t1.`WORKFLOWID`, t1.`WORKFLOWIDNAME` FROM `SLAITEM` t1  
+		<![CDATA[ SELECT t1.`APPLICABLEWHENXML`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`FAILUREAFTER`, t1.`MANAGED`, t1.`NAME`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`OWNINGUSER`, t1.`RELATEDFIELD`, t1.`SEQUENCENUMBER`, t1.`SLAID`, t1.`SLAITEMID`, t1.`SLAITEMIDUNIQUE`, t1.`SOLUTIONID`, t1.`SUCCESSCONDITIONSXML`, t1.`SUPPORTINGSOLUTIONID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER`, t1.`WARNAFTER`, t1.`WORKFLOWID`, t1.`WORKFLOWIDNAME` FROM `SLAITEM` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/slakpiinstance/SlaKpiInstanceMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="SlaKpiInstanceResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`COMPUTEDFAILURETIME`, t1.`COMPUTEDWARNINGTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`FAILURETIME`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGTEAM`, t1.`OWNINGUSER`, t1.`REGARDING`, t1.`REGARDINGNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`SLAKPIINSTANCEID`, t1.`SLAKPIINSTANCENAME`, t1.`STATUS`, t1.`SUCCEEDEDON`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER`, t1.`WARNINGTIME`, t1.`WARNINGTIMEREACHED` FROM `SLAKPIINSTANCE` t1  ) t1 where slakpiinstanceid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`COMPUTEDFAILURETIME`, t1.`COMPUTEDWARNINGTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`FAILURETIME`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGTEAM`, t1.`OWNINGUSER`, t1.`REGARDING`, t1.`REGARDINGNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`SLAKPIINSTANCEID`, t1.`SLAKPIINSTANCENAME`, t1.`STATUS`, t1.`SUCCEEDEDON`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER`, t1.`WARNINGTIME`, t1.`WARNINGTIMEREACHED` FROM `SLAKPIINSTANCE` t1  ) t1 where slakpiinstanceid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -57,12 +57,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`COMPUTEDFAILURETIME`, t1.`COMPUTEDWARNINGTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`FAILURETIME`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGTEAM`, t1.`OWNINGUSER`, t1.`REGARDING`, t1.`REGARDINGNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`SLAKPIINSTANCEID`, t1.`SLAKPIINSTANCENAME`, t1.`STATUS`, t1.`SUCCEEDEDON`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER`, t1.`WARNINGTIME`, t1.`WARNINGTIMEREACHED` FROM `SLAKPIINSTANCE` t1  
+		<![CDATA[ SELECT t1.`COMPUTEDFAILURETIME`, t1.`COMPUTEDWARNINGTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`FAILURETIME`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGTEAM`, t1.`OWNINGUSER`, t1.`REGARDING`, t1.`REGARDINGNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`SLAKPIINSTANCEID`, t1.`SLAKPIINSTANCENAME`, t1.`STATUS`, t1.`SUCCEEDEDON`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER`, t1.`WARNINGTIME`, t1.`WARNINGTIMEREACHED` FROM `SLAKPIINSTANCE` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`COMPUTEDFAILURETIME`, t1.`COMPUTEDWARNINGTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`FAILURETIME`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGTEAM`, t1.`OWNINGUSER`, t1.`REGARDING`, t1.`REGARDINGNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`SLAKPIINSTANCEID`, t1.`SLAKPIINSTANCENAME`, t1.`STATUS`, t1.`SUCCEEDEDON`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER`, t1.`WARNINGTIME`, t1.`WARNINGTIMEREACHED` FROM `SLAKPIINSTANCE` t1  
+		<![CDATA[ SELECT t1.`COMPUTEDFAILURETIME`, t1.`COMPUTEDWARNINGTIME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`FAILURETIME`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGTEAM`, t1.`OWNINGUSER`, t1.`REGARDING`, t1.`REGARDINGNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`SLAKPIINSTANCEID`, t1.`SLAKPIINSTANCENAME`, t1.`STATUS`, t1.`SUCCEEDEDON`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER`, t1.`WARNINGTIME`, t1.`WARNINGTIMEREACHED` FROM `SLAKPIINSTANCE` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/task/TaskMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="TaskResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CRMTASKASSIGNEDUNIQUEID`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PERCENTCOMPLETE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `TASK` t1  ) t1 where activityid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CRMTASKASSIGNEDUNIQUEID`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PERCENTCOMPLETE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `TASK` t1  ) t1 where activityid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -57,12 +57,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CRMTASKASSIGNEDUNIQUEID`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PERCENTCOMPLETE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `TASK` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CRMTASKASSIGNEDUNIQUEID`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PERCENTCOMPLETE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `TASK` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CRMTASKASSIGNEDUNIQUEID`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PERCENTCOMPLETE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `TASK` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CRMTASKASSIGNEDUNIQUEID`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PERCENTCOMPLETE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `TASK` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/template/TemplateMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="TemplateResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`BODY`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMIZABLE`, t1.`DESCRIPTION`, t1.`GENERATIONTYPECODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INTRODUCEDVERSION`, t1.`LANGUAGECODE`, t1.`MANAGED`, t1.`MIMETYPE`, t1.`OPENCOUNT`, t1.`OPENRATE`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PERSONAL`, t1.`PRESENTATIONXML`, t1.`RECOMMENDED`, t1.`REPLYCOUNT`, t1.`REPLYRATE`, t1.`SOLUTIONID`, t1.`SUBJECT`, t1.`SUBJECTPRESENTATIONXML`, t1.`SUPPORTINGSOLUTIONID`, t1.`TEMPLATEID`, t1.`TEMPLATEIDUNIQUE`, t1.`TEMPLATETYPECODE`, t1.`TITLE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USEDCOUNT`, t1.`VERSIONNUMBER` FROM `TEMPLATE` t1  ) t1 where templateid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`BODY`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMIZABLE`, t1.`DESCRIPTION`, t1.`GENERATIONTYPECODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INTRODUCEDVERSION`, t1.`LANGUAGECODE`, t1.`MANAGED`, t1.`MIMETYPE`, t1.`OPENCOUNT`, t1.`OPENRATE`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PERSONAL`, t1.`PRESENTATIONXML`, t1.`RECOMMENDED`, t1.`REPLYCOUNT`, t1.`REPLYRATE`, t1.`SOLUTIONID`, t1.`SUBJECT`, t1.`SUBJECTPRESENTATIONXML`, t1.`SUPPORTINGSOLUTIONID`, t1.`TEMPLATEID`, t1.`TEMPLATEIDUNIQUE`, t1.`TEMPLATETYPECODE`, t1.`TITLE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USEDCOUNT`, t1.`VERSIONNUMBER` FROM `TEMPLATE` t1  ) t1 where templateid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -27,12 +27,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMIZABLE`, t1.`DESCRIPTION`, t1.`GENERATIONTYPECODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INTRODUCEDVERSION`, t1.`LANGUAGECODE`, t1.`MANAGED`, t1.`MIMETYPE`, t1.`OPENCOUNT`, t1.`OPENRATE`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PERSONAL`, t1.`RECOMMENDED`, t1.`REPLYCOUNT`, t1.`REPLYRATE`, t1.`SOLUTIONID`, t1.`SUBJECT`, t1.`SUPPORTINGSOLUTIONID`, t1.`TEMPLATEID`, t1.`TEMPLATEIDUNIQUE`, t1.`TEMPLATETYPECODE`, t1.`TITLE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USEDCOUNT`, t1.`VERSIONNUMBER` FROM `TEMPLATE` t1  
+		<![CDATA[ SELECT t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMIZABLE`, t1.`DESCRIPTION`, t1.`GENERATIONTYPECODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INTRODUCEDVERSION`, t1.`LANGUAGECODE`, t1.`MANAGED`, t1.`MIMETYPE`, t1.`OPENCOUNT`, t1.`OPENRATE`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PERSONAL`, t1.`RECOMMENDED`, t1.`REPLYCOUNT`, t1.`REPLYRATE`, t1.`SOLUTIONID`, t1.`SUBJECT`, t1.`SUPPORTINGSOLUTIONID`, t1.`TEMPLATEID`, t1.`TEMPLATEIDUNIQUE`, t1.`TEMPLATETYPECODE`, t1.`TITLE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USEDCOUNT`, t1.`VERSIONNUMBER` FROM `TEMPLATE` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BODY`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMIZABLE`, t1.`DESCRIPTION`, t1.`GENERATIONTYPECODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INTRODUCEDVERSION`, t1.`LANGUAGECODE`, t1.`MANAGED`, t1.`MIMETYPE`, t1.`OPENCOUNT`, t1.`OPENRATE`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PERSONAL`, t1.`PRESENTATIONXML`, t1.`RECOMMENDED`, t1.`REPLYCOUNT`, t1.`REPLYRATE`, t1.`SOLUTIONID`, t1.`SUBJECT`, t1.`SUBJECTPRESENTATIONXML`, t1.`SUPPORTINGSOLUTIONID`, t1.`TEMPLATEID`, t1.`TEMPLATEIDUNIQUE`, t1.`TEMPLATETYPECODE`, t1.`TITLE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USEDCOUNT`, t1.`VERSIONNUMBER` FROM `TEMPLATE` t1  
+		<![CDATA[ SELECT t1.`BODY`, t1.`COMPONENTSTATE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMIZABLE`, t1.`DESCRIPTION`, t1.`GENERATIONTYPECODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INTRODUCEDVERSION`, t1.`LANGUAGECODE`, t1.`MANAGED`, t1.`MIMETYPE`, t1.`OPENCOUNT`, t1.`OPENRATE`, t1.`OVERWRITETIME`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PERSONAL`, t1.`PRESENTATIONXML`, t1.`RECOMMENDED`, t1.`REPLYCOUNT`, t1.`REPLYRATE`, t1.`SOLUTIONID`, t1.`SUBJECT`, t1.`SUBJECTPRESENTATIONXML`, t1.`SUPPORTINGSOLUTIONID`, t1.`TEMPLATEID`, t1.`TEMPLATEIDUNIQUE`, t1.`TEMPLATETYPECODE`, t1.`TITLE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USEDCOUNT`, t1.`VERSIONNUMBER` FROM `TEMPLATE` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/base/territory/TerritoryMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="TerritoryResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MANAGERID`, t1.`MANAGERNAME`, t1.`OVERRIDDENCREATEDON`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t11.`CURRENCYNAME` AS `TRANSACTIONCURRENCYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `TERRITORY` t1  LEFT JOIN TRANSACTIONCURRENCY t11 ON t1.TRANSACTIONCURRENCYID = t11.TRANSACTIONCURRENCYID  ) t1 where territoryid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`CURRENCYNAME`, t1.`DESCRIPTION`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MANAGERID`, t1.`MANAGERNAME`, t1.`OVERRIDDENCREATEDON`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `TERRITORY` t1  LEFT JOIN TRANSACTIONCURRENCY t11 ON t1.TRANSACTIONCURRENCYID = t11.TRANSACTIONCURRENCYID  ) t1 where territoryid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -39,12 +39,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MANAGERID`, t1.`MANAGERNAME`, t1.`OVERRIDDENCREATEDON`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t11.`CURRENCYNAME` AS `TRANSACTIONCURRENCYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `TERRITORY` t1  LEFT JOIN TRANSACTIONCURRENCY t11 ON t1.TRANSACTIONCURRENCYID = t11.TRANSACTIONCURRENCYID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`CURRENCYNAME`, t1.`DESCRIPTION`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MANAGERID`, t1.`MANAGERNAME`, t1.`OVERRIDDENCREATEDON`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `TERRITORY` t1  LEFT JOIN TRANSACTIONCURRENCY t11 ON t1.TRANSACTIONCURRENCYID = t11.TRANSACTIONCURRENCYID  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MANAGERID`, t1.`MANAGERNAME`, t1.`OVERRIDDENCREATEDON`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t11.`CURRENCYNAME` AS `TRANSACTIONCURRENCYNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `TERRITORY` t1  LEFT JOIN TRANSACTIONCURRENCY t11 ON t1.TRANSACTIONCURRENCYID = t11.TRANSACTIONCURRENCYID  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t11.`CURRENCYNAME`, t1.`DESCRIPTION`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MANAGERID`, t1.`MANAGERNAME`, t1.`OVERRIDDENCREATEDON`, t1.`TERRITORYID`, t1.`TERRITORYNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `TERRITORY` t1  LEFT JOIN TRANSACTIONCURRENCY t11 ON t1.TRANSACTIONCURRENCYID = t11.TRANSACTIONCURRENCYID  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/finance/invoice/InvoiceMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="InvoiceResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEDELIVERED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`DUEDATE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INVOICEID`, t1.`INVOICENAME`, t1.`INVOICENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `INVOICE` t1  ) t1 where invoiceid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEDELIVERED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`DUEDATE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INVOICEID`, t1.`INVOICENAME`, t1.`INVOICENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `INVOICE` t1  ) t1 where invoiceid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -136,30 +136,30 @@
 
     <!--数据查询[ByParentKey]-->
     <sql id="ByParentKey" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEDELIVERED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`DUEDATE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INVOICEID`, t1.`INVOICENAME`, t1.`INVOICENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `INVOICE` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEDELIVERED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`DUEDATE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INVOICEID`, t1.`INVOICENAME`, t1.`INVOICENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `INVOICE` t1  
 					 WHERE 	( t1.`CUSTOMERID` =  #{srf.datacontext.srfparentkey} )
 			]]>
     </sql>
     <!--数据查询[Cancel]-->
     <sql id="Cancel" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEDELIVERED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`DUEDATE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INVOICEID`, t1.`INVOICENAME`, t1.`INVOICENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `INVOICE` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEDELIVERED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`DUEDATE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INVOICEID`, t1.`INVOICENAME`, t1.`INVOICENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `INVOICE` t1  
 					 WHERE 	( t1.`STATECODE` = 3 )
 			]]>
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEDELIVERED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`DUEDATE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INVOICEID`, t1.`INVOICENAME`, t1.`INVOICENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `INVOICE` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEDELIVERED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`DUEDATE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INVOICEID`, t1.`INVOICENAME`, t1.`INVOICENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `INVOICE` t1  
 			]]>
     </sql>
     <!--数据查询[Paid]-->
     <sql id="Paid" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEDELIVERED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`DUEDATE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INVOICEID`, t1.`INVOICENAME`, t1.`INVOICENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `INVOICE` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEDELIVERED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`DUEDATE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INVOICEID`, t1.`INVOICENAME`, t1.`INVOICENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `INVOICE` t1  
 					 WHERE 	( t1.`STATECODE` = 2 )
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEDELIVERED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`DUEDATE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INVOICEID`, t1.`INVOICENAME`, t1.`INVOICENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `INVOICE` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEDELIVERED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`DUEDATE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INVOICEID`, t1.`INVOICENAME`, t1.`INVOICENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `INVOICE` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/finance/invoicedetail/InvoiceDetailMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="InvoiceDetailResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACTUALDELIVERYON`, t1.`BASEAMOUNT`, t1.`BASEAMOUNT_BASE`, t1.`COPIED`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`EXTENDEDAMOUNT`, t1.`EXTENDEDAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INVOICEDETAILID`, t1.`INVOICEDETAILNAME`, t1.`INVOICEID`, t1.`INVOICEISPRICELOCKED`, t1.`INVOICESTATECODE`, t1.`LINEITEMNUMBER`, t1.`MANUALDISCOUNTAMOUNT`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARENTBUNDLEID`, t1.`PARENTBUNDLEIDREF`, t1.`PRICEOVERRIDDEN`, t1.`PRICEPERUNIT`, t1.`PRICEPERUNIT_BASE`, t1.`PRICINGERRORCODE`, t1.`PRODUCTASSOCIATIONID`, t1.`PRODUCTDESCRIPTION`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTOVERRIDDEN`, t1.`PRODUCTTYPECODE`, t1.`PROPERTYCONFIGURATIONSTATUS`, t1.`QUANTITY`, t1.`QUANTITYBACKORDERED`, t1.`QUANTITYCANCELLED`, t1.`QUANTITYSHIPPED`, t1.`SALESORDERDETAILID`, t1.`SALESREPID`, t1.`SALESREPNAME`, t1.`SEQUENCENUMBER`, t1.`SHIPPINGTRACKINGNUMBER`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SKIPPRICECALCULATION`, t1.`TAX`, t1.`TAX_BASE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UOMID`, t1.`UOMNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VOLUMEDISCOUNTAMOUNT`, t1.`VOLUMEDISCOUNTAMOUNT_BASE`, t1.`WILLCALL` FROM `INVOICEDETAIL` t1  ) t1 where invoicedetailid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTUALDELIVERYON`, t1.`BASEAMOUNT`, t1.`BASEAMOUNT_BASE`, t1.`COPIED`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`EXTENDEDAMOUNT`, t1.`EXTENDEDAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INVOICEDETAILID`, t1.`INVOICEDETAILNAME`, t1.`INVOICEID`, t1.`INVOICEISPRICELOCKED`, t1.`INVOICESTATECODE`, t1.`LINEITEMNUMBER`, t1.`MANUALDISCOUNTAMOUNT`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTBUNDLEID`, t1.`PARENTBUNDLEIDREF`, t1.`PRICEOVERRIDDEN`, t1.`PRICEPERUNIT`, t1.`PRICEPERUNIT_BASE`, t1.`PRICINGERRORCODE`, t1.`PRODUCTASSOCIATIONID`, t1.`PRODUCTDESCRIPTION`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTOVERRIDDEN`, t1.`PRODUCTTYPECODE`, t1.`PROPERTYCONFIGURATIONSTATUS`, t1.`QUANTITY`, t1.`QUANTITYBACKORDERED`, t1.`QUANTITYCANCELLED`, t1.`QUANTITYSHIPPED`, t1.`SALESORDERDETAILID`, t1.`SALESREPID`, t1.`SALESREPNAME`, t1.`SEQUENCENUMBER`, t1.`SHIPPINGTRACKINGNUMBER`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SKIPPRICECALCULATION`, t1.`TAX`, t1.`TAX_BASE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UOMID`, t1.`UOMNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VOLUMEDISCOUNTAMOUNT`, t1.`VOLUMEDISCOUNTAMOUNT_BASE`, t1.`WILLCALL` FROM `INVOICEDETAIL` t1  ) t1 where invoicedetailid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -103,12 +103,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTUALDELIVERYON`, t1.`BASEAMOUNT`, t1.`BASEAMOUNT_BASE`, t1.`COPIED`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`EXTENDEDAMOUNT`, t1.`EXTENDEDAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INVOICEDETAILID`, t1.`INVOICEDETAILNAME`, t1.`INVOICEID`, t1.`INVOICEISPRICELOCKED`, t1.`INVOICESTATECODE`, t1.`LINEITEMNUMBER`, t1.`MANUALDISCOUNTAMOUNT`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARENTBUNDLEID`, t1.`PARENTBUNDLEIDREF`, t1.`PRICEOVERRIDDEN`, t1.`PRICEPERUNIT`, t1.`PRICEPERUNIT_BASE`, t1.`PRICINGERRORCODE`, t1.`PRODUCTASSOCIATIONID`, t1.`PRODUCTDESCRIPTION`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTOVERRIDDEN`, t1.`PRODUCTTYPECODE`, t1.`PROPERTYCONFIGURATIONSTATUS`, t1.`QUANTITY`, t1.`QUANTITYBACKORDERED`, t1.`QUANTITYCANCELLED`, t1.`QUANTITYSHIPPED`, t1.`SALESORDERDETAILID`, t1.`SALESREPID`, t1.`SALESREPNAME`, t1.`SEQUENCENUMBER`, t1.`SHIPPINGTRACKINGNUMBER`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SKIPPRICECALCULATION`, t1.`TAX`, t1.`TAX_BASE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UOMID`, t1.`UOMNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VOLUMEDISCOUNTAMOUNT`, t1.`VOLUMEDISCOUNTAMOUNT_BASE`, t1.`WILLCALL` FROM `INVOICEDETAIL` t1  
+		<![CDATA[ SELECT t1.`ACTUALDELIVERYON`, t1.`BASEAMOUNT`, t1.`BASEAMOUNT_BASE`, t1.`COPIED`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`EXTENDEDAMOUNT`, t1.`EXTENDEDAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INVOICEDETAILID`, t1.`INVOICEDETAILNAME`, t1.`INVOICEID`, t1.`INVOICEISPRICELOCKED`, t1.`INVOICESTATECODE`, t1.`LINEITEMNUMBER`, t1.`MANUALDISCOUNTAMOUNT`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTBUNDLEID`, t1.`PARENTBUNDLEIDREF`, t1.`PRICEOVERRIDDEN`, t1.`PRICEPERUNIT`, t1.`PRICEPERUNIT_BASE`, t1.`PRICINGERRORCODE`, t1.`PRODUCTASSOCIATIONID`, t1.`PRODUCTDESCRIPTION`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTOVERRIDDEN`, t1.`PRODUCTTYPECODE`, t1.`PROPERTYCONFIGURATIONSTATUS`, t1.`QUANTITY`, t1.`QUANTITYBACKORDERED`, t1.`QUANTITYCANCELLED`, t1.`QUANTITYSHIPPED`, t1.`SALESORDERDETAILID`, t1.`SALESREPID`, t1.`SALESREPNAME`, t1.`SEQUENCENUMBER`, t1.`SHIPPINGTRACKINGNUMBER`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SKIPPRICECALCULATION`, t1.`TAX`, t1.`TAX_BASE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UOMID`, t1.`UOMNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VOLUMEDISCOUNTAMOUNT`, t1.`VOLUMEDISCOUNTAMOUNT_BASE`, t1.`WILLCALL` FROM `INVOICEDETAIL` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTUALDELIVERYON`, t1.`BASEAMOUNT`, t1.`BASEAMOUNT_BASE`, t1.`COPIED`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`EXTENDEDAMOUNT`, t1.`EXTENDEDAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INVOICEDETAILID`, t1.`INVOICEDETAILNAME`, t1.`INVOICEID`, t1.`INVOICEISPRICELOCKED`, t1.`INVOICESTATECODE`, t1.`LINEITEMNUMBER`, t1.`MANUALDISCOUNTAMOUNT`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARENTBUNDLEID`, t1.`PARENTBUNDLEIDREF`, t1.`PRICEOVERRIDDEN`, t1.`PRICEPERUNIT`, t1.`PRICEPERUNIT_BASE`, t1.`PRICINGERRORCODE`, t1.`PRODUCTASSOCIATIONID`, t1.`PRODUCTDESCRIPTION`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTOVERRIDDEN`, t1.`PRODUCTTYPECODE`, t1.`PROPERTYCONFIGURATIONSTATUS`, t1.`QUANTITY`, t1.`QUANTITYBACKORDERED`, t1.`QUANTITYCANCELLED`, t1.`QUANTITYSHIPPED`, t1.`SALESORDERDETAILID`, t1.`SALESREPID`, t1.`SALESREPNAME`, t1.`SEQUENCENUMBER`, t1.`SHIPPINGTRACKINGNUMBER`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SKIPPRICECALCULATION`, t1.`TAX`, t1.`TAX_BASE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UOMID`, t1.`UOMNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VOLUMEDISCOUNTAMOUNT`, t1.`VOLUMEDISCOUNTAMOUNT_BASE`, t1.`WILLCALL` FROM `INVOICEDETAIL` t1  
+		<![CDATA[ SELECT t1.`ACTUALDELIVERYON`, t1.`BASEAMOUNT`, t1.`BASEAMOUNT_BASE`, t1.`COPIED`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`EXTENDEDAMOUNT`, t1.`EXTENDEDAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INVOICEDETAILID`, t1.`INVOICEDETAILNAME`, t1.`INVOICEID`, t1.`INVOICEISPRICELOCKED`, t1.`INVOICESTATECODE`, t1.`LINEITEMNUMBER`, t1.`MANUALDISCOUNTAMOUNT`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTBUNDLEID`, t1.`PARENTBUNDLEIDREF`, t1.`PRICEOVERRIDDEN`, t1.`PRICEPERUNIT`, t1.`PRICEPERUNIT_BASE`, t1.`PRICINGERRORCODE`, t1.`PRODUCTASSOCIATIONID`, t1.`PRODUCTDESCRIPTION`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTOVERRIDDEN`, t1.`PRODUCTTYPECODE`, t1.`PROPERTYCONFIGURATIONSTATUS`, t1.`QUANTITY`, t1.`QUANTITYBACKORDERED`, t1.`QUANTITYCANCELLED`, t1.`QUANTITYSHIPPED`, t1.`SALESORDERDETAILID`, t1.`SALESREPID`, t1.`SALESREPNAME`, t1.`SEQUENCENUMBER`, t1.`SHIPPINGTRACKINGNUMBER`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SKIPPRICECALCULATION`, t1.`TAX`, t1.`TAX_BASE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UOMID`, t1.`UOMNAME`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VOLUMEDISCOUNTAMOUNT`, t1.`VOLUMEDISCOUNTAMOUNT_BASE`, t1.`WILLCALL` FROM `INVOICEDETAIL` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/marketing/campaign/CampaignMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="CampaignResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BUDGETEDCOST`, t1.`BUDGETEDCOST_BASE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CODENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPECTEDRESPONSE`, t1.`EXPECTEDREVENUE`, t1.`EXPECTEDREVENUE_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MESSAGE`, t1.`OBJECTIVE`, t1.`OTHERCOST`, t1.`OTHERCOST_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRICELISTID`, t1.`PRICELISTNAME`, t1.`PROCESSID`, t1.`PROMOTIONCODENAME`, t1.`PROPOSEDEND`, t1.`PROPOSEDSTART`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TEMPLATE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALACTUALCOST`, t1.`TOTALACTUALCOST_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CAMPAIGN` t1  ) t1 where campaignid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BUDGETEDCOST`, t1.`BUDGETEDCOST_BASE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CODENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPECTEDRESPONSE`, t1.`EXPECTEDREVENUE`, t1.`EXPECTEDREVENUE_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MESSAGE`, t1.`OBJECTIVE`, t1.`OTHERCOST`, t1.`OTHERCOST_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRICELISTID`, t1.`PRICELISTNAME`, t1.`PROCESSID`, t1.`PROMOTIONCODENAME`, t1.`PROPOSEDEND`, t1.`PROPOSEDSTART`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TEMPLATE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALACTUALCOST`, t1.`TOTALACTUALCOST_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CAMPAIGN` t1  ) t1 where campaignid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -71,24 +71,24 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BUDGETEDCOST`, t1.`BUDGETEDCOST_BASE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CODENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPECTEDRESPONSE`, t1.`EXPECTEDREVENUE`, t1.`EXPECTEDREVENUE_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MESSAGE`, t1.`OBJECTIVE`, t1.`OTHERCOST`, t1.`OTHERCOST_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRICELISTID`, t1.`PRICELISTNAME`, t1.`PROCESSID`, t1.`PROMOTIONCODENAME`, t1.`PROPOSEDEND`, t1.`PROPOSEDSTART`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TEMPLATE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALACTUALCOST`, t1.`TOTALACTUALCOST_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CAMPAIGN` t1  
+		<![CDATA[ SELECT t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BUDGETEDCOST`, t1.`BUDGETEDCOST_BASE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CODENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPECTEDRESPONSE`, t1.`EXPECTEDREVENUE`, t1.`EXPECTEDREVENUE_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MESSAGE`, t1.`OBJECTIVE`, t1.`OTHERCOST`, t1.`OTHERCOST_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRICELISTID`, t1.`PRICELISTNAME`, t1.`PROCESSID`, t1.`PROMOTIONCODENAME`, t1.`PROPOSEDEND`, t1.`PROPOSEDSTART`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TEMPLATE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALACTUALCOST`, t1.`TOTALACTUALCOST_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CAMPAIGN` t1  
 			]]>
     </sql>
     <!--数据查询[Effective]-->
     <sql id="Effective" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BUDGETEDCOST`, t1.`BUDGETEDCOST_BASE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CODENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPECTEDRESPONSE`, t1.`EXPECTEDREVENUE`, t1.`EXPECTEDREVENUE_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MESSAGE`, t1.`OBJECTIVE`, t1.`OTHERCOST`, t1.`OTHERCOST_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRICELISTID`, t1.`PRICELISTNAME`, t1.`PROCESSID`, t1.`PROMOTIONCODENAME`, t1.`PROPOSEDEND`, t1.`PROPOSEDSTART`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TEMPLATE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALACTUALCOST`, t1.`TOTALACTUALCOST_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CAMPAIGN` t1  
+		<![CDATA[ SELECT t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BUDGETEDCOST`, t1.`BUDGETEDCOST_BASE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CODENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPECTEDRESPONSE`, t1.`EXPECTEDREVENUE`, t1.`EXPECTEDREVENUE_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MESSAGE`, t1.`OBJECTIVE`, t1.`OTHERCOST`, t1.`OTHERCOST_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRICELISTID`, t1.`PRICELISTNAME`, t1.`PROCESSID`, t1.`PROMOTIONCODENAME`, t1.`PROPOSEDEND`, t1.`PROPOSEDSTART`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TEMPLATE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALACTUALCOST`, t1.`TOTALACTUALCOST_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CAMPAIGN` t1  
 					 WHERE 	( t1.`STATECODE` = 0 )
 			]]>
     </sql>
     <!--数据查询[Stop]-->
     <sql id="Stop" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BUDGETEDCOST`, t1.`BUDGETEDCOST_BASE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CODENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPECTEDRESPONSE`, t1.`EXPECTEDREVENUE`, t1.`EXPECTEDREVENUE_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MESSAGE`, t1.`OBJECTIVE`, t1.`OTHERCOST`, t1.`OTHERCOST_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRICELISTID`, t1.`PRICELISTNAME`, t1.`PROCESSID`, t1.`PROMOTIONCODENAME`, t1.`PROPOSEDEND`, t1.`PROPOSEDSTART`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TEMPLATE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALACTUALCOST`, t1.`TOTALACTUALCOST_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CAMPAIGN` t1  
+		<![CDATA[ SELECT t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BUDGETEDCOST`, t1.`BUDGETEDCOST_BASE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CODENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPECTEDRESPONSE`, t1.`EXPECTEDREVENUE`, t1.`EXPECTEDREVENUE_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MESSAGE`, t1.`OBJECTIVE`, t1.`OTHERCOST`, t1.`OTHERCOST_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRICELISTID`, t1.`PRICELISTNAME`, t1.`PROCESSID`, t1.`PROMOTIONCODENAME`, t1.`PROPOSEDEND`, t1.`PROPOSEDSTART`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TEMPLATE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALACTUALCOST`, t1.`TOTALACTUALCOST_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CAMPAIGN` t1  
 					 WHERE 	( t1.`STATECODE` = 1 )
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BUDGETEDCOST`, t1.`BUDGETEDCOST_BASE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CODENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPECTEDRESPONSE`, t1.`EXPECTEDREVENUE`, t1.`EXPECTEDREVENUE_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MESSAGE`, t1.`OBJECTIVE`, t1.`OTHERCOST`, t1.`OTHERCOST_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRICELISTID`, t1.`PRICELISTNAME`, t1.`PROCESSID`, t1.`PROMOTIONCODENAME`, t1.`PROPOSEDEND`, t1.`PROPOSEDSTART`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TEMPLATE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALACTUALCOST`, t1.`TOTALACTUALCOST_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CAMPAIGN` t1  
+		<![CDATA[ SELECT t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BUDGETEDCOST`, t1.`BUDGETEDCOST_BASE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CODENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPECTEDRESPONSE`, t1.`EXPECTEDREVENUE`, t1.`EXPECTEDREVENUE_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MESSAGE`, t1.`OBJECTIVE`, t1.`OTHERCOST`, t1.`OTHERCOST_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRICELISTID`, t1.`PRICELISTNAME`, t1.`PROCESSID`, t1.`PROMOTIONCODENAME`, t1.`PROPOSEDEND`, t1.`PROPOSEDSTART`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TEMPLATE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALACTUALCOST`, t1.`TOTALACTUALCOST_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CAMPAIGN` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/marketing/campaignactivity/CampaignActivityMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="CampaignActivityResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALCOST`, t1.`ACTUALCOST_BASE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`BUDGETEDCOST`, t1.`BUDGETEDCOST_BASE`, t1.`CATEGORY`, t1.`CC`, t1.`CHANNELTYPECODE`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`DONOTSENDONOPTOUT`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`EXCLUDEIFCONTACTEDINXDAYS`, t1.`FROM`, t1.`IGNOREINACTIVELISTMEMBERS`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRAVERSEDPATH`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `CAMPAIGNACTIVITY` t1  ) t1 where activityid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALCOST`, t1.`ACTUALCOST_BASE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`BUDGETEDCOST`, t1.`BUDGETEDCOST_BASE`, t1.`CATEGORY`, t1.`CC`, t1.`CHANNELTYPECODE`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`DONOTSENDONOPTOUT`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`EXCLUDEIFCONTACTEDINXDAYS`, t1.`FROM`, t1.`IGNOREINACTIVELISTMEMBERS`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRAVERSEDPATH`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `CAMPAIGNACTIVITY` t1  ) t1 where activityid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -48,18 +48,18 @@
 
     <!--数据查询[ByParentKey]-->
     <sql id="ByParentKey" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALCOST`, t1.`ACTUALCOST_BASE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`BUDGETEDCOST`, t1.`BUDGETEDCOST_BASE`, t1.`CATEGORY`, t1.`CHANNELTYPECODE`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`DONOTSENDONOPTOUT`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`EXCLUDEIFCONTACTEDINXDAYS`, t1.`IGNOREINACTIVELISTMEMBERS`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRAVERSEDPATH`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `CAMPAIGNACTIVITY` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALCOST`, t1.`ACTUALCOST_BASE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`BUDGETEDCOST`, t1.`BUDGETEDCOST_BASE`, t1.`CATEGORY`, t1.`CHANNELTYPECODE`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`DONOTSENDONOPTOUT`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`EXCLUDEIFCONTACTEDINXDAYS`, t1.`IGNOREINACTIVELISTMEMBERS`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRAVERSEDPATH`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `CAMPAIGNACTIVITY` t1  
 					 WHERE 	( t1.`REGARDINGOBJECTID` =  #{srf.datacontext.srfparentkey} )
 			]]>
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALCOST`, t1.`ACTUALCOST_BASE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`BUDGETEDCOST`, t1.`BUDGETEDCOST_BASE`, t1.`CATEGORY`, t1.`CHANNELTYPECODE`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`DONOTSENDONOPTOUT`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`EXCLUDEIFCONTACTEDINXDAYS`, t1.`IGNOREINACTIVELISTMEMBERS`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRAVERSEDPATH`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `CAMPAIGNACTIVITY` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALCOST`, t1.`ACTUALCOST_BASE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`BUDGETEDCOST`, t1.`BUDGETEDCOST_BASE`, t1.`CATEGORY`, t1.`CHANNELTYPECODE`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`DONOTSENDONOPTOUT`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`EXCLUDEIFCONTACTEDINXDAYS`, t1.`IGNOREINACTIVELISTMEMBERS`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRAVERSEDPATH`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `CAMPAIGNACTIVITY` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALCOST`, t1.`ACTUALCOST_BASE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`BUDGETEDCOST`, t1.`BUDGETEDCOST_BASE`, t1.`CATEGORY`, t1.`CC`, t1.`CHANNELTYPECODE`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`DONOTSENDONOPTOUT`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`EXCLUDEIFCONTACTEDINXDAYS`, t1.`FROM`, t1.`IGNOREINACTIVELISTMEMBERS`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRAVERSEDPATH`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `CAMPAIGNACTIVITY` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALCOST`, t1.`ACTUALCOST_BASE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`BUDGETEDCOST`, t1.`BUDGETEDCOST_BASE`, t1.`CATEGORY`, t1.`CC`, t1.`CHANNELTYPECODE`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`DONOTSENDONOPTOUT`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`EXCLUDEIFCONTACTEDINXDAYS`, t1.`FROM`, t1.`IGNOREINACTIVELISTMEMBERS`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRAVERSEDPATH`, t1.`TYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `CAMPAIGNACTIVITY` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/marketing/campaignresponse/CampaignResponseMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="CampaignResponseResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`CHANNELTYPECODE`, t1.`COMMUNITY`, t1.`COMPANYNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMER`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FAX`, t1.`FIRSTNAME`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTNAME`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`ORIGINATINGACTIVITYID`, t1.`ORIGINATINGACTIVITYIDTYPECODE`, t1.`ORIGINATINGACTIVITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARTNER`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PROMOTIONCODENAME`, t1.`RECEIVEDON`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`RESPONSECODE`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TELEPHONE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `CAMPAIGNRESPONSE` t1  ) t1 where activityid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`CHANNELTYPECODE`, t1.`COMMUNITY`, t1.`COMPANYNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMER`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FAX`, t1.`FIRSTNAME`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTNAME`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`ORIGINATINGACTIVITYID`, t1.`ORIGINATINGACTIVITYNAME`, t1.`ORIGINATINGACTIVITYTYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARTNER`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PROMOTIONCODENAME`, t1.`RECEIVEDON`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`RESPONSECODE`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TELEPHONE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `CAMPAIGNRESPONSE` t1  ) t1 where activityid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -56,18 +56,18 @@
 
     <!--数据查询[ByParentKey]-->
     <sql id="ByParentKey" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`CHANNELTYPECODE`, t1.`COMMUNITY`, t1.`COMPANYNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FAX`, t1.`FIRSTNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTNAME`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`ORIGINATINGACTIVITYID`, t1.`ORIGINATINGACTIVITYIDTYPECODE`, t1.`ORIGINATINGACTIVITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PROMOTIONCODENAME`, t1.`RECEIVEDON`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`RESPONSECODE`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TELEPHONE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `CAMPAIGNRESPONSE` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`CHANNELTYPECODE`, t1.`COMMUNITY`, t1.`COMPANYNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FAX`, t1.`FIRSTNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTNAME`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`ORIGINATINGACTIVITYID`, t1.`ORIGINATINGACTIVITYNAME`, t1.`ORIGINATINGACTIVITYTYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PROMOTIONCODENAME`, t1.`RECEIVEDON`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`RESPONSECODE`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TELEPHONE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `CAMPAIGNRESPONSE` t1  
 					 WHERE 	( t1.`REGARDINGOBJECTID` =  #{srf.datacontext.srfparentkey} )
 			]]>
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`CHANNELTYPECODE`, t1.`COMMUNITY`, t1.`COMPANYNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FAX`, t1.`FIRSTNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTNAME`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`ORIGINATINGACTIVITYID`, t1.`ORIGINATINGACTIVITYIDTYPECODE`, t1.`ORIGINATINGACTIVITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PROMOTIONCODENAME`, t1.`RECEIVEDON`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`RESPONSECODE`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TELEPHONE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `CAMPAIGNRESPONSE` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`CHANNELTYPECODE`, t1.`COMMUNITY`, t1.`COMPANYNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FAX`, t1.`FIRSTNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTNAME`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`ORIGINATINGACTIVITYID`, t1.`ORIGINATINGACTIVITYNAME`, t1.`ORIGINATINGACTIVITYTYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PROMOTIONCODENAME`, t1.`RECEIVEDON`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`RESPONSECODE`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TELEPHONE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `CAMPAIGNRESPONSE` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`CHANNELTYPECODE`, t1.`COMMUNITY`, t1.`COMPANYNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMER`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FAX`, t1.`FIRSTNAME`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTNAME`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`ORIGINATINGACTIVITYID`, t1.`ORIGINATINGACTIVITYIDTYPECODE`, t1.`ORIGINATINGACTIVITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARTNER`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PROMOTIONCODENAME`, t1.`RECEIVEDON`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`RESPONSECODE`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TELEPHONE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `CAMPAIGNRESPONSE` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`CHANNELTYPECODE`, t1.`COMMUNITY`, t1.`COMPANYNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMER`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FAX`, t1.`FIRSTNAME`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTNAME`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`ORIGINATINGACTIVITYID`, t1.`ORIGINATINGACTIVITYNAME`, t1.`ORIGINATINGACTIVITYTYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARTNER`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PROMOTIONCODENAME`, t1.`RECEIVEDON`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`RESPONSECODE`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TELEPHONE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `CAMPAIGNRESPONSE` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/marketing/ibizlist/IBizListMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="IBizListResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`COST`, t1.`COST_BASE`, t1.`CREATEDATE`, t1.`CREATEDFROMCODE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DONOTSENDONOPTOUT`, t1.`EXCHANGERATE`, t1.`IGNOREINACTIVELISTMEMBERS`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTUSEDON`, t1.`LISTID`, t1.`LISTNAME`, t1.`LOCKSTATUS`, t1.`MEMBERCOUNT`, t1.`MEMBERTYPE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`PURPOSE`, t1.`QUERY`, t1.`SOURCE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t11.`CURRENCYNAME` AS `TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `LIST` t1  LEFT JOIN TRANSACTIONCURRENCY t11 ON t1.TRANSACTIONCURRENCYID = t11.TRANSACTIONCURRENCYID  ) t1 where listid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`COST`, t1.`COST_BASE`, t1.`CREATEDATE`, t1.`CREATEDFROMCODE`, t1.`CREATEMAN`, t11.`CURRENCYNAME`, t1.`DESCRIPTION`, t1.`DONOTSENDONOPTOUT`, t1.`EXCHANGERATE`, t1.`IGNOREINACTIVELISTMEMBERS`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTUSEDON`, t1.`LISTID`, t1.`LISTNAME`, t1.`LOCKSTATUS`, t1.`MEMBERCOUNT`, t1.`MEMBERTYPE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`PURPOSE`, t1.`QUERY`, t1.`SOURCE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `LIST` t1  LEFT JOIN TRANSACTIONCURRENCY t11 ON t1.TRANSACTIONCURRENCYID = t11.TRANSACTIONCURRENCYID  ) t1 where listid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -56,24 +56,24 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`COST`, t1.`COST_BASE`, t1.`CREATEDATE`, t1.`CREATEDFROMCODE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DONOTSENDONOPTOUT`, t1.`EXCHANGERATE`, t1.`IGNOREINACTIVELISTMEMBERS`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTUSEDON`, t1.`LISTID`, t1.`LISTNAME`, t1.`LOCKSTATUS`, t1.`MEMBERCOUNT`, t1.`MEMBERTYPE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`PURPOSE`, t1.`SOURCE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t11.`CURRENCYNAME` AS `TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `LIST` t1  LEFT JOIN TRANSACTIONCURRENCY t11 ON t1.TRANSACTIONCURRENCYID = t11.TRANSACTIONCURRENCYID  
+		<![CDATA[ SELECT t1.`COST`, t1.`COST_BASE`, t1.`CREATEDATE`, t1.`CREATEDFROMCODE`, t1.`CREATEMAN`, t11.`CURRENCYNAME`, t1.`DESCRIPTION`, t1.`DONOTSENDONOPTOUT`, t1.`EXCHANGERATE`, t1.`IGNOREINACTIVELISTMEMBERS`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTUSEDON`, t1.`LISTID`, t1.`LISTNAME`, t1.`LOCKSTATUS`, t1.`MEMBERCOUNT`, t1.`MEMBERTYPE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`PURPOSE`, t1.`SOURCE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `LIST` t1  LEFT JOIN TRANSACTIONCURRENCY t11 ON t1.TRANSACTIONCURRENCYID = t11.TRANSACTIONCURRENCYID  
 			]]>
     </sql>
     <!--数据查询[Effective]-->
     <sql id="Effective" databaseId="mysql">
-		<![CDATA[ SELECT t1.`COST`, t1.`COST_BASE`, t1.`CREATEDATE`, t1.`CREATEDFROMCODE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DONOTSENDONOPTOUT`, t1.`EXCHANGERATE`, t1.`IGNOREINACTIVELISTMEMBERS`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTUSEDON`, t1.`LISTID`, t1.`LISTNAME`, t1.`LOCKSTATUS`, t1.`MEMBERCOUNT`, t1.`MEMBERTYPE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`PURPOSE`, t1.`SOURCE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t11.`CURRENCYNAME` AS `TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `LIST` t1  LEFT JOIN TRANSACTIONCURRENCY t11 ON t1.TRANSACTIONCURRENCYID = t11.TRANSACTIONCURRENCYID  
+		<![CDATA[ SELECT t1.`COST`, t1.`COST_BASE`, t1.`CREATEDATE`, t1.`CREATEDFROMCODE`, t1.`CREATEMAN`, t11.`CURRENCYNAME`, t1.`DESCRIPTION`, t1.`DONOTSENDONOPTOUT`, t1.`EXCHANGERATE`, t1.`IGNOREINACTIVELISTMEMBERS`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTUSEDON`, t1.`LISTID`, t1.`LISTNAME`, t1.`LOCKSTATUS`, t1.`MEMBERCOUNT`, t1.`MEMBERTYPE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`PURPOSE`, t1.`SOURCE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `LIST` t1  LEFT JOIN TRANSACTIONCURRENCY t11 ON t1.TRANSACTIONCURRENCYID = t11.TRANSACTIONCURRENCYID  
 					 WHERE 	( t1.`STATECODE` = 0 )
 			]]>
     </sql>
     <!--数据查询[Stop]-->
     <sql id="Stop" databaseId="mysql">
-		<![CDATA[ SELECT t1.`COST`, t1.`COST_BASE`, t1.`CREATEDATE`, t1.`CREATEDFROMCODE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DONOTSENDONOPTOUT`, t1.`EXCHANGERATE`, t1.`IGNOREINACTIVELISTMEMBERS`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTUSEDON`, t1.`LISTID`, t1.`LISTNAME`, t1.`LOCKSTATUS`, t1.`MEMBERCOUNT`, t1.`MEMBERTYPE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`PURPOSE`, t1.`SOURCE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t11.`CURRENCYNAME` AS `TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `LIST` t1  LEFT JOIN TRANSACTIONCURRENCY t11 ON t1.TRANSACTIONCURRENCYID = t11.TRANSACTIONCURRENCYID  
+		<![CDATA[ SELECT t1.`COST`, t1.`COST_BASE`, t1.`CREATEDATE`, t1.`CREATEDFROMCODE`, t1.`CREATEMAN`, t11.`CURRENCYNAME`, t1.`DESCRIPTION`, t1.`DONOTSENDONOPTOUT`, t1.`EXCHANGERATE`, t1.`IGNOREINACTIVELISTMEMBERS`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTUSEDON`, t1.`LISTID`, t1.`LISTNAME`, t1.`LOCKSTATUS`, t1.`MEMBERCOUNT`, t1.`MEMBERTYPE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`PURPOSE`, t1.`SOURCE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `LIST` t1  LEFT JOIN TRANSACTIONCURRENCY t11 ON t1.TRANSACTIONCURRENCYID = t11.TRANSACTIONCURRENCYID  
 					 WHERE 	( t1.`STATECODE` = 1 )
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`COST`, t1.`COST_BASE`, t1.`CREATEDATE`, t1.`CREATEDFROMCODE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`DONOTSENDONOPTOUT`, t1.`EXCHANGERATE`, t1.`IGNOREINACTIVELISTMEMBERS`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTUSEDON`, t1.`LISTID`, t1.`LISTNAME`, t1.`LOCKSTATUS`, t1.`MEMBERCOUNT`, t1.`MEMBERTYPE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`PURPOSE`, t1.`QUERY`, t1.`SOURCE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t11.`CURRENCYNAME` AS `TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `LIST` t1  LEFT JOIN TRANSACTIONCURRENCY t11 ON t1.TRANSACTIONCURRENCYID = t11.TRANSACTIONCURRENCYID  
+		<![CDATA[ SELECT t1.`COST`, t1.`COST_BASE`, t1.`CREATEDATE`, t1.`CREATEDFROMCODE`, t1.`CREATEMAN`, t11.`CURRENCYNAME`, t1.`DESCRIPTION`, t1.`DONOTSENDONOPTOUT`, t1.`EXCHANGERATE`, t1.`IGNOREINACTIVELISTMEMBERS`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTUSEDON`, t1.`LISTID`, t1.`LISTNAME`, t1.`LOCKSTATUS`, t1.`MEMBERCOUNT`, t1.`MEMBERTYPE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`PURPOSE`, t1.`QUERY`, t1.`SOURCE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `LIST` t1  LEFT JOIN TRANSACTIONCURRENCY t11 ON t1.TRANSACTIONCURRENCYID = t11.TRANSACTIONCURRENCYID  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/product/product/ProductMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="ProductResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  ) t1 where productid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  ) t1 where productid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -119,30 +119,30 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  
 			]]>
     </sql>
     <!--数据查询[Effective]-->
     <sql id="Effective" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  
 					 WHERE 	( t1.`STATECODE` = 0 )
 			]]>
     </sql>
     <!--数据查询[Revise]-->
     <sql id="Revise" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  
 					 WHERE 	( t1.`STATECODE` = 3 )
 			]]>
     </sql>
     <!--数据查询[Stop]-->
     <sql id="Stop" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  
 					 WHERE 	( t1.`STATECODE` = 1 )
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CURRENTCOST`, t1.`CURRENTCOST_BASE`, t1.`DEFAULTUOMID`, t1.`DEFAULTUOMNAME`, t1.`DEFAULTUOMSCHEDULEID`, t1.`DEFAULTUOMSCHEDULENAME`, t1.`DESCRIPTION`, t1.`DMTIMPORTSTATE`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`HIERARCHYPATH`, t1.`IMPORTSEQUENCENUMBER`, t1.`KIT`, t1.`OVERRIDDENCREATEDON`, t1.`PARENTPRODUCTID`, t1.`PARENTPRODUCTNAME`, t1.`PRICE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICE_BASE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTNUMBER`, t1.`PRODUCTSTRUCTURE`, t1.`PRODUCTTYPECODE`, t1.`PRODUCTURL`, t1.`QUANTITYDECIMAL`, t1.`QUANTITYONHAND`, t1.`REPARENTED`, t1.`SIZE`, t1.`STAGEID`, t1.`STANDARDCOST`, t1.`STANDARDCOST_BASE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STOCKITEM`, t1.`STOCKVOLUME`, t1.`STOCKWEIGHT`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`SUPPLIERNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALIDFROMDATE`, t1.`VALIDTODATE`, t1.`VENDORID`, t1.`VENDORNAME`, t1.`VENDORPARTNUMBER`, t1.`VERSIONNUMBER` FROM `PRODUCT` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/runtime/bulkdeletefailure/BulkDeleteFailureMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="BulkDeleteFailureResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`BULKDELETEFAILUREID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ERRORDESCRIPTION`, t1.`ERRORNUMBER`, t1.`ORDEREDQUERYINDEX`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGUSER`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `BULKDELETEFAILURE` t1  ) t1 where bulkdeletefailureid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`BULKDELETEFAILUREID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ERRORDESCRIPTION`, t1.`ERRORNUMBER`, t1.`ORDEREDQUERYINDEX`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGUSER`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `BULKDELETEFAILURE` t1  ) t1 where bulkdeletefailureid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -27,12 +27,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BULKDELETEFAILUREID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ERRORDESCRIPTION`, t1.`ERRORNUMBER`, t1.`ORDEREDQUERYINDEX`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGUSER`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `BULKDELETEFAILURE` t1  
+		<![CDATA[ SELECT t1.`BULKDELETEFAILUREID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ERRORDESCRIPTION`, t1.`ERRORNUMBER`, t1.`ORDEREDQUERYINDEX`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGUSER`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `BULKDELETEFAILURE` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BULKDELETEFAILUREID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ERRORDESCRIPTION`, t1.`ERRORNUMBER`, t1.`ORDEREDQUERYINDEX`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGUSER`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `BULKDELETEFAILURE` t1  
+		<![CDATA[ SELECT t1.`BULKDELETEFAILUREID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ERRORDESCRIPTION`, t1.`ERRORNUMBER`, t1.`ORDEREDQUERYINDEX`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`OWNINGBUSINESSUNIT`, t1.`OWNINGUSER`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `BULKDELETEFAILURE` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/runtime/bulkdeleteoperation/BulkDeleteOperationMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="BulkDeleteOperationResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`BULKDELETEOPERATIONID`, t1.`BULKDELETEOPERATIONNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FAILURECOUNT`, t1.`NEXTRUN`, t1.`ORDEREDQUERYSETXML`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`PROCESSINGQEINDEX`, t1.`RECURRING`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUCCESSCOUNT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE` FROM `BULKDELETEOPERATION` t1  ) t1 where bulkdeleteoperationid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`BULKDELETEOPERATIONID`, t1.`BULKDELETEOPERATIONNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FAILURECOUNT`, t1.`NEXTRUN`, t1.`ORDEREDQUERYSETXML`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`PROCESSINGQEINDEX`, t1.`RECURRING`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUCCESSCOUNT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE` FROM `BULKDELETEOPERATION` t1  ) t1 where bulkdeleteoperationid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -27,12 +27,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BULKDELETEOPERATIONID`, t1.`BULKDELETEOPERATIONNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FAILURECOUNT`, t1.`NEXTRUN`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`PROCESSINGQEINDEX`, t1.`RECURRING`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUCCESSCOUNT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE` FROM `BULKDELETEOPERATION` t1  
+		<![CDATA[ SELECT t1.`BULKDELETEOPERATIONID`, t1.`BULKDELETEOPERATIONNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FAILURECOUNT`, t1.`NEXTRUN`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`PROCESSINGQEINDEX`, t1.`RECURRING`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUCCESSCOUNT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE` FROM `BULKDELETEOPERATION` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BULKDELETEOPERATIONID`, t1.`BULKDELETEOPERATIONNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FAILURECOUNT`, t1.`NEXTRUN`, t1.`ORDEREDQUERYSETXML`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`PROCESSINGQEINDEX`, t1.`RECURRING`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUCCESSCOUNT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE` FROM `BULKDELETEOPERATION` t1  
+		<![CDATA[ SELECT t1.`BULKDELETEOPERATIONID`, t1.`BULKDELETEOPERATIONNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FAILURECOUNT`, t1.`NEXTRUN`, t1.`ORDEREDQUERYSETXML`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`PROCESSINGQEINDEX`, t1.`RECURRING`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUCCESSCOUNT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE` FROM `BULKDELETEOPERATION` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/runtime/bulkoperation/BulkOperationMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="BulkOperationResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`BULKOPERATIONNUMBER`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEDRECORDTYPECODE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`ERRORNUMBER`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FAILURECOUNT`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPERATIONTYPECODE`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARAMETERS`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECT`, t1.`SUCCESSCOUNT`, t1.`TARGETEDRECORDTYPECODE`, t1.`TARGETMEMBERSCOUNT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED`, t1.`WORKFLOWINFO` FROM `BULKOPERATION` t1  ) t1 where activityid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`BULKOPERATIONNUMBER`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEDRECORDTYPECODE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`ERRORNUMBER`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FAILURECOUNT`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPERATIONTYPECODE`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARAMETERS`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECT`, t1.`SUCCESSCOUNT`, t1.`TARGETEDRECORDTYPECODE`, t1.`TARGETMEMBERSCOUNT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED`, t1.`WORKFLOWINFO` FROM `BULKOPERATION` t1  ) t1 where activityid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -47,12 +47,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`BULKOPERATIONNUMBER`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEDRECORDTYPECODE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`ERRORNUMBER`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FAILURECOUNT`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPERATIONTYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECT`, t1.`SUCCESSCOUNT`, t1.`TARGETEDRECORDTYPECODE`, t1.`TARGETMEMBERSCOUNT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `BULKOPERATION` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`BULKOPERATIONNUMBER`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEDRECORDTYPECODE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`ERRORNUMBER`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FAILURECOUNT`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPERATIONTYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECT`, t1.`SUCCESSCOUNT`, t1.`TARGETEDRECORDTYPECODE`, t1.`TARGETMEMBERSCOUNT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `BULKOPERATION` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`BULKOPERATIONNUMBER`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEDRECORDTYPECODE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`ERRORNUMBER`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FAILURECOUNT`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPERATIONTYPECODE`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARAMETERS`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECT`, t1.`SUCCESSCOUNT`, t1.`TARGETEDRECORDTYPECODE`, t1.`TARGETMEMBERSCOUNT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED`, t1.`WORKFLOWINFO` FROM `BULKOPERATION` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`BULKOPERATIONNUMBER`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEDRECORDTYPECODE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`ERRORNUMBER`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FAILURECOUNT`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPERATIONTYPECODE`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARAMETERS`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECT`, t1.`SUCCESSCOUNT`, t1.`TARGETEDRECORDTYPECODE`, t1.`TARGETMEMBERSCOUNT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED`, t1.`WORKFLOWINFO` FROM `BULKOPERATION` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/runtime/bulkoperationlog/BulkOperationLogMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="BulkOperationLogResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ADDITIONALINFO`, t1.`BULKOPERATIONID`, t1.`BULKOPERATIONIDTYPE`, t1.`BULKOPERATIONLOGID`, t1.`BULKOPERATIONLOGNAME`, t1.`BULKOPERATIONNAME`, t1.`CREATEDATE`, t1.`CREATEDOBJECTID`, t1.`CREATEDOBJECTIDTYPECODE`, t1.`CREATEDOBJECTNAME`, t1.`CREATEMAN`, t1.`ERRORDESCRIPTIONFORMATTED`, t1.`ERRORNUMBER`, t1.`ERRORNUMBERFORMATTED`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDTYPECODE`, t1.`REGARDINGOBJECTNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BULKOPERATIONLOG` t1  ) t1 where bulkoperationlogid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ADDITIONALINFO`, t1.`BULKOPERATIONID`, t1.`BULKOPERATIONLOGID`, t1.`BULKOPERATIONLOGNAME`, t1.`BULKOPERATIONNAME`, t1.`BULKOPERATIONTYPE`, t1.`CREATEDATE`, t1.`CREATEDOBJECTID`, t1.`CREATEDOBJECTNAME`, t1.`CREATEDOBJECTTYPECODE`, t1.`CREATEMAN`, t1.`ERRORDESCRIPTIONFORMATTED`, t1.`ERRORNUMBER`, t1.`ERRORNUMBERFORMATTED`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BULKOPERATIONLOG` t1  ) t1 where bulkoperationlogid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -37,12 +37,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BULKOPERATIONID`, t1.`BULKOPERATIONIDTYPE`, t1.`BULKOPERATIONLOGID`, t1.`BULKOPERATIONLOGNAME`, t1.`CREATEDATE`, t1.`CREATEDOBJECTID`, t1.`CREATEDOBJECTIDTYPECODE`, t1.`CREATEMAN`, t1.`ERRORDESCRIPTIONFORMATTED`, t1.`ERRORNUMBER`, t1.`ERRORNUMBERFORMATTED`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDTYPECODE`, t1.`REGARDINGOBJECTNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BULKOPERATIONLOG` t1  
+		<![CDATA[ SELECT t1.`BULKOPERATIONID`, t1.`BULKOPERATIONLOGID`, t1.`BULKOPERATIONLOGNAME`, t1.`BULKOPERATIONTYPE`, t1.`CREATEDATE`, t1.`CREATEDOBJECTID`, t1.`CREATEDOBJECTTYPECODE`, t1.`CREATEMAN`, t1.`ERRORDESCRIPTIONFORMATTED`, t1.`ERRORNUMBER`, t1.`ERRORNUMBERFORMATTED`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BULKOPERATIONLOG` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ADDITIONALINFO`, t1.`BULKOPERATIONID`, t1.`BULKOPERATIONIDTYPE`, t1.`BULKOPERATIONLOGID`, t1.`BULKOPERATIONLOGNAME`, t1.`BULKOPERATIONNAME`, t1.`CREATEDATE`, t1.`CREATEDOBJECTID`, t1.`CREATEDOBJECTIDTYPECODE`, t1.`CREATEDOBJECTNAME`, t1.`CREATEMAN`, t1.`ERRORDESCRIPTIONFORMATTED`, t1.`ERRORNUMBER`, t1.`ERRORNUMBERFORMATTED`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDTYPECODE`, t1.`REGARDINGOBJECTNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BULKOPERATIONLOG` t1  
+		<![CDATA[ SELECT t1.`ADDITIONALINFO`, t1.`BULKOPERATIONID`, t1.`BULKOPERATIONLOGID`, t1.`BULKOPERATIONLOGNAME`, t1.`BULKOPERATIONNAME`, t1.`BULKOPERATIONTYPE`, t1.`CREATEDATE`, t1.`CREATEDOBJECTID`, t1.`CREATEDOBJECTNAME`, t1.`CREATEDOBJECTTYPECODE`, t1.`CREATEMAN`, t1.`ERRORDESCRIPTIONFORMATTED`, t1.`ERRORNUMBER`, t1.`ERRORNUMBERFORMATTED`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BULKOPERATIONLOG` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/runtime/callbackregistration/CallbackRegistrationMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="CallbackRegistrationResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CALLBACKREGISTRATIONID`, t1.`CALLBACKREGISTRATIONNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITYNAME`, t1.`FILTERINGATTRIBUTES`, t1.`MESSAGE`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNINGBUSINESSUNITNAME`, t1.`SCOPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`URL`, t1.`VERSION` FROM `CALLBACKREGISTRATION` t1  ) t1 where callbackregistrationid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CALLBACKREGISTRATIONID`, t1.`CALLBACKREGISTRATIONNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITYNAME`, t1.`FILTERINGATTRIBUTES`, t1.`MESSAGE`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`OWNINGBUSINESSUNITNAME`, t1.`SCOPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`URL`, t1.`VERSION` FROM `CALLBACKREGISTRATION` t1  ) t1 where callbackregistrationid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -27,12 +27,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CALLBACKREGISTRATIONID`, t1.`CALLBACKREGISTRATIONNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITYNAME`, t1.`MESSAGE`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNINGBUSINESSUNITNAME`, t1.`SCOPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`URL`, t1.`VERSION` FROM `CALLBACKREGISTRATION` t1  
+		<![CDATA[ SELECT t1.`CALLBACKREGISTRATIONID`, t1.`CALLBACKREGISTRATIONNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITYNAME`, t1.`MESSAGE`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`OWNINGBUSINESSUNITNAME`, t1.`SCOPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`URL`, t1.`VERSION` FROM `CALLBACKREGISTRATION` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CALLBACKREGISTRATIONID`, t1.`CALLBACKREGISTRATIONNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITYNAME`, t1.`FILTERINGATTRIBUTES`, t1.`MESSAGE`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNINGBUSINESSUNITNAME`, t1.`SCOPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`URL`, t1.`VERSION` FROM `CALLBACKREGISTRATION` t1  
+		<![CDATA[ SELECT t1.`CALLBACKREGISTRATIONID`, t1.`CALLBACKREGISTRATIONNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITYNAME`, t1.`FILTERINGATTRIBUTES`, t1.`MESSAGE`, t1.`OWNERID`, t1.`OWNERTYPE`, t1.`OWNINGBUSINESSUNITNAME`, t1.`SCOPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`URL`, t1.`VERSION` FROM `CALLBACKREGISTRATION` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/runtime/queue/QueueMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="QueueResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ALLOWEMAILCREDENTIALS`, t1.`BUSINESSUNITID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEFAULTMAILBOXNAME`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`EMAILPASSWORD`, t1.`EMAILROUTERACCESSAPPROVAL`, t1.`EMAILUSERNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAXQUEUE`, t1.`IGNOREUNSOLICITEDEMAIL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCOMINGEMAILDELIVERYMETHOD`, t1.`INCOMINGEMAILFILTERINGMETHOD`, t1.`NUMBEROFITEMS`, t1.`NUMBEROFMEMBERS`, t1.`OUTGOINGEMAILDELIVERYMETHOD`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIMARYUSERID`, t1.`PRIMARYUSERNAME`, t1.`QUEUEID`, t1.`QUEUENAME`, t1.`QUEUETYPECODE`, t1.`QUEUEVIEWTYPE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `QUEUE` t1  ) t1 where queueid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ALLOWEMAILCREDENTIALS`, t1.`BUSINESSUNITID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEFAULTMAILBOXNAME`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`EMAILPASSWORD`, t1.`EMAILROUTERACCESSAPPROVAL`, t1.`EMAILUSERNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAXQUEUE`, t1.`IGNOREUNSOLICITEDEMAIL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCOMINGEMAILDELIVERYMETHOD`, t1.`INCOMINGEMAILFILTERINGMETHOD`, t1.`NUMBEROFITEMS`, t1.`NUMBEROFMEMBERS`, t1.`OUTGOINGEMAILDELIVERYMETHOD`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIMARYUSERID`, t1.`PRIMARYUSERNAME`, t1.`QUEUEID`, t1.`QUEUENAME`, t1.`QUEUETYPECODE`, t1.`QUEUEVIEWTYPE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `QUEUE` t1  ) t1 where queueid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -49,12 +49,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ALLOWEMAILCREDENTIALS`, t1.`BUSINESSUNITID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEFAULTMAILBOXNAME`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`EMAILPASSWORD`, t1.`EMAILROUTERACCESSAPPROVAL`, t1.`EMAILUSERNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAXQUEUE`, t1.`IGNOREUNSOLICITEDEMAIL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCOMINGEMAILDELIVERYMETHOD`, t1.`INCOMINGEMAILFILTERINGMETHOD`, t1.`NUMBEROFITEMS`, t1.`NUMBEROFMEMBERS`, t1.`OUTGOINGEMAILDELIVERYMETHOD`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIMARYUSERID`, t1.`PRIMARYUSERNAME`, t1.`QUEUEID`, t1.`QUEUENAME`, t1.`QUEUETYPECODE`, t1.`QUEUEVIEWTYPE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `QUEUE` t1  
+		<![CDATA[ SELECT t1.`ALLOWEMAILCREDENTIALS`, t1.`BUSINESSUNITID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEFAULTMAILBOXNAME`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`EMAILPASSWORD`, t1.`EMAILROUTERACCESSAPPROVAL`, t1.`EMAILUSERNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAXQUEUE`, t1.`IGNOREUNSOLICITEDEMAIL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCOMINGEMAILDELIVERYMETHOD`, t1.`INCOMINGEMAILFILTERINGMETHOD`, t1.`NUMBEROFITEMS`, t1.`NUMBEROFMEMBERS`, t1.`OUTGOINGEMAILDELIVERYMETHOD`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIMARYUSERID`, t1.`PRIMARYUSERNAME`, t1.`QUEUEID`, t1.`QUEUENAME`, t1.`QUEUETYPECODE`, t1.`QUEUEVIEWTYPE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `QUEUE` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ALLOWEMAILCREDENTIALS`, t1.`BUSINESSUNITID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEFAULTMAILBOXNAME`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`EMAILPASSWORD`, t1.`EMAILROUTERACCESSAPPROVAL`, t1.`EMAILUSERNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAXQUEUE`, t1.`IGNOREUNSOLICITEDEMAIL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCOMINGEMAILDELIVERYMETHOD`, t1.`INCOMINGEMAILFILTERINGMETHOD`, t1.`NUMBEROFITEMS`, t1.`NUMBEROFMEMBERS`, t1.`OUTGOINGEMAILDELIVERYMETHOD`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIMARYUSERID`, t1.`PRIMARYUSERNAME`, t1.`QUEUEID`, t1.`QUEUENAME`, t1.`QUEUETYPECODE`, t1.`QUEUEVIEWTYPE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `QUEUE` t1  
+		<![CDATA[ SELECT t1.`ALLOWEMAILCREDENTIALS`, t1.`BUSINESSUNITID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DEFAULTMAILBOXNAME`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`EMAILPASSWORD`, t1.`EMAILROUTERACCESSAPPROVAL`, t1.`EMAILUSERNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FAXQUEUE`, t1.`IGNOREUNSOLICITEDEMAIL`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCOMINGEMAILDELIVERYMETHOD`, t1.`INCOMINGEMAILFILTERINGMETHOD`, t1.`NUMBEROFITEMS`, t1.`NUMBEROFMEMBERS`, t1.`OUTGOINGEMAILDELIVERYMETHOD`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIMARYUSERID`, t1.`PRIMARYUSERNAME`, t1.`QUEUEID`, t1.`QUEUENAME`, t1.`QUEUETYPECODE`, t1.`QUEUEVIEWTYPE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`VERSIONNUMBER` FROM `QUEUE` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/sales/competitor/CompetitorMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="CompetitorResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`COMPETITORID`, t1.`COMPETITORNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`KEYPRODUCT`, t1.`NAME`, t1.`OPPORTUNITIES`, t1.`OVERRIDDENCREATEDON`, t1.`OVERVIEW`, t1.`PROCESSID`, t1.`REFERENCEINFOURL`, t1.`REPORTEDREVENUE`, t1.`REPORTEDREVENUE_BASE`, t1.`REPORTINGQUARTER`, t1.`REPORTINGYEAR`, t1.`STAGEID`, t1.`STOCKEXCHANGE`, t1.`STRENGTHS`, t1.`THREATS`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEAKNESSES`, t1.`WEBSITEURL`, t1.`WINPERCENTAGE` FROM `COMPETITOR` t1  ) t1 where competitorid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`COMPETITORID`, t1.`COMPETITORNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`KEYPRODUCT`, t1.`NAME`, t1.`OPPORTUNITIES`, t1.`OVERRIDDENCREATEDON`, t1.`OVERVIEW`, t1.`PROCESSID`, t1.`REFERENCEINFOURL`, t1.`REPORTEDREVENUE`, t1.`REPORTEDREVENUE_BASE`, t1.`REPORTINGQUARTER`, t1.`REPORTINGYEAR`, t1.`STAGEID`, t1.`STOCKEXCHANGE`, t1.`STRENGTHS`, t1.`THREATS`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEAKNESSES`, t1.`WEBSITEURL`, t1.`WINPERCENTAGE` FROM `COMPETITOR` t1  ) t1 where competitorid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -84,12 +84,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`COMPETITORID`, t1.`COMPETITORNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`KEYPRODUCT`, t1.`NAME`, t1.`OPPORTUNITIES`, t1.`OVERRIDDENCREATEDON`, t1.`OVERVIEW`, t1.`PROCESSID`, t1.`REFERENCEINFOURL`, t1.`REPORTEDREVENUE`, t1.`REPORTEDREVENUE_BASE`, t1.`REPORTINGQUARTER`, t1.`REPORTINGYEAR`, t1.`STAGEID`, t1.`STOCKEXCHANGE`, t1.`STRENGTHS`, t1.`THREATS`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEAKNESSES`, t1.`WEBSITEURL`, t1.`WINPERCENTAGE` FROM `COMPETITOR` t1  
+		<![CDATA[ SELECT t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`COMPETITORID`, t1.`COMPETITORNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`KEYPRODUCT`, t1.`NAME`, t1.`OPPORTUNITIES`, t1.`OVERRIDDENCREATEDON`, t1.`OVERVIEW`, t1.`PROCESSID`, t1.`REFERENCEINFOURL`, t1.`REPORTEDREVENUE`, t1.`REPORTEDREVENUE_BASE`, t1.`REPORTINGQUARTER`, t1.`REPORTINGYEAR`, t1.`STAGEID`, t1.`STOCKEXCHANGE`, t1.`STRENGTHS`, t1.`THREATS`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEAKNESSES`, t1.`WEBSITEURL`, t1.`WINPERCENTAGE` FROM `COMPETITOR` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`COMPETITORID`, t1.`COMPETITORNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`KEYPRODUCT`, t1.`NAME`, t1.`OPPORTUNITIES`, t1.`OVERRIDDENCREATEDON`, t1.`OVERVIEW`, t1.`PROCESSID`, t1.`REFERENCEINFOURL`, t1.`REPORTEDREVENUE`, t1.`REPORTEDREVENUE_BASE`, t1.`REPORTINGQUARTER`, t1.`REPORTINGYEAR`, t1.`STAGEID`, t1.`STOCKEXCHANGE`, t1.`STRENGTHS`, t1.`THREATS`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEAKNESSES`, t1.`WEBSITEURL`, t1.`WINPERCENTAGE` FROM `COMPETITOR` t1  
+		<![CDATA[ SELECT t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`COMPETITORID`, t1.`COMPETITORNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`KEYPRODUCT`, t1.`NAME`, t1.`OPPORTUNITIES`, t1.`OVERRIDDENCREATEDON`, t1.`OVERVIEW`, t1.`PROCESSID`, t1.`REFERENCEINFOURL`, t1.`REPORTEDREVENUE`, t1.`REPORTEDREVENUE_BASE`, t1.`REPORTINGQUARTER`, t1.`REPORTINGYEAR`, t1.`STAGEID`, t1.`STOCKEXCHANGE`, t1.`STRENGTHS`, t1.`THREATS`, t1.`TICKERSYMBOL`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEAKNESSES`, t1.`WEBSITEURL`, t1.`WINPERCENTAGE` FROM `COMPETITOR` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/sales/goalrollupquery/GoalRollupQueryMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="GoalRollupQueryResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FETCHXML`, t1.`GOALROLLUPQUERYID`, t1.`GOALROLLUPQUERYNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`QUERYENTITYTYPE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `GOALROLLUPQUERY` t1  ) t1 where goalrollupqueryid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FETCHXML`, t1.`GOALROLLUPQUERYID`, t1.`GOALROLLUPQUERYNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`QUERYENTITYTYPE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `GOALROLLUPQUERY` t1  ) t1 where goalrollupqueryid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -27,12 +27,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GOALROLLUPQUERYID`, t1.`GOALROLLUPQUERYNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`QUERYENTITYTYPE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `GOALROLLUPQUERY` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`GOALROLLUPQUERYID`, t1.`GOALROLLUPQUERYNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`QUERYENTITYTYPE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `GOALROLLUPQUERY` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FETCHXML`, t1.`GOALROLLUPQUERYID`, t1.`GOALROLLUPQUERYNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`QUERYENTITYTYPE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `GOALROLLUPQUERY` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`FETCHXML`, t1.`GOALROLLUPQUERYID`, t1.`GOALROLLUPQUERYNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`QUERYENTITYTYPE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `GOALROLLUPQUERY` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/sales/lead/LeadMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="LeadResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AUTOCREATE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`COMPANYNAME`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESTIMATEDAMOUNT`, t1.`ESTIMATEDAMOUNT_BASE`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FIRSTNAME`, t1.`FOLLOWEMAIL`, t1.`FULLNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`INITIALCOMMUNICATION`, t1.`JOBTITLE`, t1.`LASTNAME`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`LEADID`, t1.`LEADQUALITYCODE`, t1.`LEADSOURCECODE`, t1.`MASTERLEADNAME`, t1.`MERGED`, t1.`MIDDLENAME`, t1.`MOBILEPHONE`, t1.`NEED`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`ORIGINATINGCASEID`, t1.`ORIGINATINGCASENAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAGER`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUALIFYINGOPPORTUNITYID`, t1.`QUALIFYINGOPPORTUNITYNAME`, t1.`RELATEDOBJECTID`, t1.`RELATEDOBJECTNAME`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SALUTATION`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECT`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `LEAD` t1  ) t1 where leadid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AUTOCREATE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`COMPANYNAME`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESTIMATEDAMOUNT`, t1.`ESTIMATEDAMOUNT_BASE`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FIRSTNAME`, t1.`FOLLOWEMAIL`, t1.`FULLNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`INITIALCOMMUNICATION`, t1.`JOBTITLE`, t1.`LASTNAME`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`LEADID`, t1.`LEADQUALITYCODE`, t1.`LEADSOURCECODE`, t1.`MASTERLEADNAME`, t1.`MERGED`, t1.`MIDDLENAME`, t1.`MOBILEPHONE`, t1.`NEED`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`ORIGINATINGCASEID`, t1.`ORIGINATINGCASENAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAGER`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUALIFYINGOPPORTUNITYID`, t1.`QUALIFYINGOPPORTUNITYNAME`, t1.`RELATEDOBJECTID`, t1.`RELATEDOBJECTNAME`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SALUTATION`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECT`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `LEAD` t1  ) t1 where leadid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -177,24 +177,24 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AUTOCREATE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`COMPANYNAME`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESTIMATEDAMOUNT`, t1.`ESTIMATEDAMOUNT_BASE`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FIRSTNAME`, t1.`FOLLOWEMAIL`, t1.`FULLNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`INITIALCOMMUNICATION`, t1.`JOBTITLE`, t1.`LASTNAME`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`LEADID`, t1.`LEADQUALITYCODE`, t1.`LEADSOURCECODE`, t1.`MASTERLEADNAME`, t1.`MERGED`, t1.`MIDDLENAME`, t1.`MOBILEPHONE`, t1.`NEED`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`ORIGINATINGCASEID`, t1.`ORIGINATINGCASENAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAGER`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUALIFYINGOPPORTUNITYID`, t1.`QUALIFYINGOPPORTUNITYNAME`, t1.`RELATEDOBJECTID`, t1.`RELATEDOBJECTNAME`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SALUTATION`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECT`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `LEAD` t1  
+		<![CDATA[ SELECT t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AUTOCREATE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`COMPANYNAME`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESTIMATEDAMOUNT`, t1.`ESTIMATEDAMOUNT_BASE`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FIRSTNAME`, t1.`FOLLOWEMAIL`, t1.`FULLNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`INITIALCOMMUNICATION`, t1.`JOBTITLE`, t1.`LASTNAME`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`LEADID`, t1.`LEADQUALITYCODE`, t1.`LEADSOURCECODE`, t1.`MASTERLEADNAME`, t1.`MERGED`, t1.`MIDDLENAME`, t1.`MOBILEPHONE`, t1.`NEED`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`ORIGINATINGCASEID`, t1.`ORIGINATINGCASENAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAGER`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUALIFYINGOPPORTUNITYID`, t1.`QUALIFYINGOPPORTUNITYNAME`, t1.`RELATEDOBJECTID`, t1.`RELATEDOBJECTNAME`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SALUTATION`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECT`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `LEAD` t1  
 			]]>
     </sql>
     <!--数据查询[Excluded]-->
     <sql id="Excluded" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AUTOCREATE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`COMPANYNAME`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESTIMATEDAMOUNT`, t1.`ESTIMATEDAMOUNT_BASE`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FIRSTNAME`, t1.`FOLLOWEMAIL`, t1.`FULLNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`INITIALCOMMUNICATION`, t1.`JOBTITLE`, t1.`LASTNAME`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`LEADID`, t1.`LEADQUALITYCODE`, t1.`LEADSOURCECODE`, t1.`MASTERLEADNAME`, t1.`MERGED`, t1.`MIDDLENAME`, t1.`MOBILEPHONE`, t1.`NEED`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`ORIGINATINGCASEID`, t1.`ORIGINATINGCASENAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAGER`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUALIFYINGOPPORTUNITYID`, t1.`QUALIFYINGOPPORTUNITYNAME`, t1.`RELATEDOBJECTID`, t1.`RELATEDOBJECTNAME`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SALUTATION`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECT`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `LEAD` t1  
+		<![CDATA[ SELECT t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AUTOCREATE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`COMPANYNAME`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESTIMATEDAMOUNT`, t1.`ESTIMATEDAMOUNT_BASE`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FIRSTNAME`, t1.`FOLLOWEMAIL`, t1.`FULLNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`INITIALCOMMUNICATION`, t1.`JOBTITLE`, t1.`LASTNAME`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`LEADID`, t1.`LEADQUALITYCODE`, t1.`LEADSOURCECODE`, t1.`MASTERLEADNAME`, t1.`MERGED`, t1.`MIDDLENAME`, t1.`MOBILEPHONE`, t1.`NEED`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`ORIGINATINGCASEID`, t1.`ORIGINATINGCASENAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAGER`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUALIFYINGOPPORTUNITYID`, t1.`QUALIFYINGOPPORTUNITYNAME`, t1.`RELATEDOBJECTID`, t1.`RELATEDOBJECTNAME`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SALUTATION`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECT`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `LEAD` t1  
 					 WHERE 	( ( t1.`STATUSCODE` = 4  OR  t1.`STATUSCODE` = 5  OR  t1.`STATUSCODE` = 6  OR  t1.`STATUSCODE` = 7 ) )
 			]]>
     </sql>
     <!--数据查询[On]-->
     <sql id="On" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AUTOCREATE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`COMPANYNAME`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESTIMATEDAMOUNT`, t1.`ESTIMATEDAMOUNT_BASE`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FIRSTNAME`, t1.`FOLLOWEMAIL`, t1.`FULLNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`INITIALCOMMUNICATION`, t1.`JOBTITLE`, t1.`LASTNAME`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`LEADID`, t1.`LEADQUALITYCODE`, t1.`LEADSOURCECODE`, t1.`MASTERLEADNAME`, t1.`MERGED`, t1.`MIDDLENAME`, t1.`MOBILEPHONE`, t1.`NEED`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`ORIGINATINGCASEID`, t1.`ORIGINATINGCASENAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAGER`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUALIFYINGOPPORTUNITYID`, t1.`QUALIFYINGOPPORTUNITYNAME`, t1.`RELATEDOBJECTID`, t1.`RELATEDOBJECTNAME`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SALUTATION`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECT`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `LEAD` t1  
+		<![CDATA[ SELECT t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AUTOCREATE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`COMPANYNAME`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESTIMATEDAMOUNT`, t1.`ESTIMATEDAMOUNT_BASE`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FIRSTNAME`, t1.`FOLLOWEMAIL`, t1.`FULLNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`INITIALCOMMUNICATION`, t1.`JOBTITLE`, t1.`LASTNAME`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`LEADID`, t1.`LEADQUALITYCODE`, t1.`LEADSOURCECODE`, t1.`MASTERLEADNAME`, t1.`MERGED`, t1.`MIDDLENAME`, t1.`MOBILEPHONE`, t1.`NEED`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`ORIGINATINGCASEID`, t1.`ORIGINATINGCASENAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAGER`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUALIFYINGOPPORTUNITYID`, t1.`QUALIFYINGOPPORTUNITYNAME`, t1.`RELATEDOBJECTID`, t1.`RELATEDOBJECTNAME`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SALUTATION`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECT`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `LEAD` t1  
 					 WHERE 	( ( t1.`STATUSCODE` = 2  OR  t1.`STATUSCODE` = 3 ) )
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AUTOCREATE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`COMPANYNAME`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESTIMATEDAMOUNT`, t1.`ESTIMATEDAMOUNT_BASE`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FIRSTNAME`, t1.`FOLLOWEMAIL`, t1.`FULLNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`INITIALCOMMUNICATION`, t1.`JOBTITLE`, t1.`LASTNAME`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`LEADID`, t1.`LEADQUALITYCODE`, t1.`LEADSOURCECODE`, t1.`MASTERLEADNAME`, t1.`MERGED`, t1.`MIDDLENAME`, t1.`MOBILEPHONE`, t1.`NEED`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`ORIGINATINGCASEID`, t1.`ORIGINATINGCASENAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAGER`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUALIFYINGOPPORTUNITYID`, t1.`QUALIFYINGOPPORTUNITYNAME`, t1.`RELATEDOBJECTID`, t1.`RELATEDOBJECTNAME`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SALUTATION`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECT`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `LEAD` t1  
+		<![CDATA[ SELECT t1.`ADDRESS1_ADDRESSID`, t1.`ADDRESS1_ADDRESSTYPECODE`, t1.`ADDRESS1_CITY`, t1.`ADDRESS1_COMPOSITE`, t1.`ADDRESS1_COUNTRY`, t1.`ADDRESS1_COUNTY`, t1.`ADDRESS1_FAX`, t1.`ADDRESS1_LATITUDE`, t1.`ADDRESS1_LINE1`, t1.`ADDRESS1_LINE2`, t1.`ADDRESS1_LINE3`, t1.`ADDRESS1_LONGITUDE`, t1.`ADDRESS1_NAME`, t1.`ADDRESS1_POSTALCODE`, t1.`ADDRESS1_POSTOFFICEBOX`, t1.`ADDRESS1_SHIPPINGMETHODCODE`, t1.`ADDRESS1_STATEORPROVINCE`, t1.`ADDRESS1_TELEPHONE1`, t1.`ADDRESS1_TELEPHONE2`, t1.`ADDRESS1_TELEPHONE3`, t1.`ADDRESS1_UPSZONE`, t1.`ADDRESS1_UTCOFFSET`, t1.`ADDRESS2_ADDRESSID`, t1.`ADDRESS2_ADDRESSTYPECODE`, t1.`ADDRESS2_CITY`, t1.`ADDRESS2_COMPOSITE`, t1.`ADDRESS2_COUNTRY`, t1.`ADDRESS2_COUNTY`, t1.`ADDRESS2_FAX`, t1.`ADDRESS2_LATITUDE`, t1.`ADDRESS2_LINE1`, t1.`ADDRESS2_LINE2`, t1.`ADDRESS2_LINE3`, t1.`ADDRESS2_LONGITUDE`, t1.`ADDRESS2_NAME`, t1.`ADDRESS2_POSTALCODE`, t1.`ADDRESS2_POSTOFFICEBOX`, t1.`ADDRESS2_SHIPPINGMETHODCODE`, t1.`ADDRESS2_STATEORPROVINCE`, t1.`ADDRESS2_TELEPHONE1`, t1.`ADDRESS2_TELEPHONE2`, t1.`ADDRESS2_TELEPHONE3`, t1.`ADDRESS2_UPSZONE`, t1.`ADDRESS2_UTCOFFSET`, t1.`AUTOCREATE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`COMPANYNAME`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DONOTBULKEMAIL`, t1.`DONOTEMAIL`, t1.`DONOTFAX`, t1.`DONOTPHONE`, t1.`DONOTPOSTALMAIL`, t1.`DONOTSENDMM`, t1.`EMAILADDRESS1`, t1.`EMAILADDRESS2`, t1.`EMAILADDRESS3`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESTIMATEDAMOUNT`, t1.`ESTIMATEDAMOUNT_BASE`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FAX`, t1.`FIRSTNAME`, t1.`FOLLOWEMAIL`, t1.`FULLNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`INDUSTRYCODE`, t1.`INITIALCOMMUNICATION`, t1.`JOBTITLE`, t1.`LASTNAME`, t1.`LASTONHOLDTIME`, t1.`LASTUSEDINCAMPAIGN`, t1.`LEADID`, t1.`LEADQUALITYCODE`, t1.`LEADSOURCECODE`, t1.`MASTERLEADNAME`, t1.`MERGED`, t1.`MIDDLENAME`, t1.`MOBILEPHONE`, t1.`NEED`, t1.`NUMBEROFEMPLOYEES`, t1.`ONHOLDTIME`, t1.`ORIGINATINGCASEID`, t1.`ORIGINATINGCASENAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAGER`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PREFERREDCONTACTMETHODCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUALIFYINGOPPORTUNITYID`, t1.`QUALIFYINGOPPORTUNITYNAME`, t1.`RELATEDOBJECTID`, t1.`RELATEDOBJECTNAME`, t1.`REVENUE`, t1.`REVENUE_BASE`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SALUTATION`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SIC`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECT`, t1.`TEAMSFOLLOWED`, t1.`TELEPHONE1`, t1.`TELEPHONE2`, t1.`TELEPHONE3`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WEBSITEURL` FROM `LEAD` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/sales/opportunity/OpportunityMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="OpportunityResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACCOUNTNAME`, t1.`ACTUALCLOSEDATE`, t1.`ACTUALVALUE`, t1.`ACTUALVALUE_BASE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CAPTUREPROPOSALFEEDBACK`, t1.`CLOSEPROBABILITY`, t1.`COMPLETEFINALPROPOSAL`, t1.`COMPLETEINTERNALREVIEW`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTSITUATION`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERNEED`, t1.`CUSTOMERPAINPOINTS`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DEVELOPPROPOSAL`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`ESTIMATEDVALUE_BASE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FILEDEBRIEF`, t1.`FINALDECISIONDATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IDENTIFYCOMPETITORS`, t1.`IDENTIFYCUSTOMERCONTACTS`, t1.`IDENTIFYPURSUITTEAM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INITIALCOMMUNICATION`, t1.`LASTONHOLDTIME`, t1.`NEED`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OPPORTUNITYRATINGCODE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PRESENTFINALPROPOSAL`, t1.`PRESENTPROPOSAL`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PROPOSEDSOLUTION`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`PURSUITDECISION`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUOTECOMMENTS`, t1.`RESOLVEFEEDBACK`, t1.`REVENUESYSTEMCALCULATED`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SCHEDULEPROPOSALMEETING`, t1.`SENDTHANKYOUNOTE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STEPID`, t1.`STEPNAME`, t1.`TEAMSFOLLOWED`, t1.`TIMELINE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `OPPORTUNITY` t1  ) t1 where opportunityid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACCOUNTNAME`, t1.`ACTUALCLOSEDATE`, t1.`ACTUALVALUE`, t1.`ACTUALVALUE_BASE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CAPTUREPROPOSALFEEDBACK`, t1.`CLOSEPROBABILITY`, t1.`COMPLETEFINALPROPOSAL`, t1.`COMPLETEINTERNALREVIEW`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CURRENTSITUATION`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERNEED`, t1.`CUSTOMERPAINPOINTS`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DEVELOPPROPOSAL`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`ESTIMATEDVALUE_BASE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FILEDEBRIEF`, t1.`FINALDECISIONDATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IDENTIFYCOMPETITORS`, t1.`IDENTIFYCUSTOMERCONTACTS`, t1.`IDENTIFYPURSUITTEAM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INITIALCOMMUNICATION`, t1.`LASTONHOLDTIME`, t1.`NEED`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OPPORTUNITYRATINGCODE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PRESENTFINALPROPOSAL`, t1.`PRESENTPROPOSAL`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PROPOSEDSOLUTION`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`PURSUITDECISION`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUOTECOMMENTS`, t1.`RESOLVEFEEDBACK`, t1.`REVENUESYSTEMCALCULATED`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SCHEDULEPROPOSALMEETING`, t1.`SENDTHANKYOUNOTE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STEPID`, t1.`STEPNAME`, t1.`TEAMSFOLLOWED`, t1.`TIMELINE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `OPPORTUNITY` t1  ) t1 where opportunityid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -137,28 +137,28 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTUALCLOSEDATE`, t1.`ACTUALVALUE`, t1.`ACTUALVALUE_BASE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CAPTUREPROPOSALFEEDBACK`, t1.`CLOSEPROBABILITY`, t1.`COMPLETEFINALPROPOSAL`, t1.`COMPLETEINTERNALREVIEW`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTSITUATION`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERNEED`, t1.`CUSTOMERPAINPOINTS`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DEVELOPPROPOSAL`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`ESTIMATEDVALUE_BASE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FILEDEBRIEF`, t1.`FINALDECISIONDATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IDENTIFYCOMPETITORS`, t1.`IDENTIFYCUSTOMERCONTACTS`, t1.`IDENTIFYPURSUITTEAM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INITIALCOMMUNICATION`, t1.`LASTONHOLDTIME`, t1.`NEED`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OPPORTUNITYRATINGCODE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PRESENTFINALPROPOSAL`, t1.`PRESENTPROPOSAL`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PROPOSEDSOLUTION`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`PURSUITDECISION`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUOTECOMMENTS`, t1.`RESOLVEFEEDBACK`, t1.`REVENUESYSTEMCALCULATED`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SCHEDULEPROPOSALMEETING`, t1.`SENDTHANKYOUNOTE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STEPID`, t1.`STEPNAME`, t1.`TEAMSFOLLOWED`, t1.`TIMELINE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `OPPORTUNITY` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTUALCLOSEDATE`, t1.`ACTUALVALUE`, t1.`ACTUALVALUE_BASE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CAPTUREPROPOSALFEEDBACK`, t1.`CLOSEPROBABILITY`, t1.`COMPLETEFINALPROPOSAL`, t1.`COMPLETEINTERNALREVIEW`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CURRENTSITUATION`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERNEED`, t1.`CUSTOMERPAINPOINTS`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DEVELOPPROPOSAL`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`ESTIMATEDVALUE_BASE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FILEDEBRIEF`, t1.`FINALDECISIONDATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IDENTIFYCOMPETITORS`, t1.`IDENTIFYCUSTOMERCONTACTS`, t1.`IDENTIFYPURSUITTEAM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INITIALCOMMUNICATION`, t1.`LASTONHOLDTIME`, t1.`NEED`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OPPORTUNITYRATINGCODE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PRESENTFINALPROPOSAL`, t1.`PRESENTPROPOSAL`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PROPOSEDSOLUTION`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`PURSUITDECISION`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUOTECOMMENTS`, t1.`RESOLVEFEEDBACK`, t1.`REVENUESYSTEMCALCULATED`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SCHEDULEPROPOSALMEETING`, t1.`SENDTHANKYOUNOTE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STEPID`, t1.`STEPNAME`, t1.`TEAMSFOLLOWED`, t1.`TIMELINE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `OPPORTUNITY` t1  
 			]]>
     </sql>
     <!--数据查询[Lost]-->
     <sql id="Lost" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTUALCLOSEDATE`, t1.`ACTUALVALUE`, t1.`ACTUALVALUE_BASE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CAPTUREPROPOSALFEEDBACK`, t1.`CLOSEPROBABILITY`, t1.`COMPLETEFINALPROPOSAL`, t1.`COMPLETEINTERNALREVIEW`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTSITUATION`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERNEED`, t1.`CUSTOMERPAINPOINTS`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DEVELOPPROPOSAL`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`ESTIMATEDVALUE_BASE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FILEDEBRIEF`, t1.`FINALDECISIONDATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IDENTIFYCOMPETITORS`, t1.`IDENTIFYCUSTOMERCONTACTS`, t1.`IDENTIFYPURSUITTEAM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INITIALCOMMUNICATION`, t1.`LASTONHOLDTIME`, t1.`NEED`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OPPORTUNITYRATINGCODE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PRESENTFINALPROPOSAL`, t1.`PRESENTPROPOSAL`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PROPOSEDSOLUTION`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`PURSUITDECISION`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUOTECOMMENTS`, t1.`RESOLVEFEEDBACK`, t1.`REVENUESYSTEMCALCULATED`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SCHEDULEPROPOSALMEETING`, t1.`SENDTHANKYOUNOTE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STEPID`, t1.`STEPNAME`, t1.`TEAMSFOLLOWED`, t1.`TIMELINE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `OPPORTUNITY` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTUALCLOSEDATE`, t1.`ACTUALVALUE`, t1.`ACTUALVALUE_BASE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CAPTUREPROPOSALFEEDBACK`, t1.`CLOSEPROBABILITY`, t1.`COMPLETEFINALPROPOSAL`, t1.`COMPLETEINTERNALREVIEW`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CURRENTSITUATION`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERNEED`, t1.`CUSTOMERPAINPOINTS`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DEVELOPPROPOSAL`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`ESTIMATEDVALUE_BASE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FILEDEBRIEF`, t1.`FINALDECISIONDATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IDENTIFYCOMPETITORS`, t1.`IDENTIFYCUSTOMERCONTACTS`, t1.`IDENTIFYPURSUITTEAM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INITIALCOMMUNICATION`, t1.`LASTONHOLDTIME`, t1.`NEED`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OPPORTUNITYRATINGCODE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PRESENTFINALPROPOSAL`, t1.`PRESENTPROPOSAL`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PROPOSEDSOLUTION`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`PURSUITDECISION`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUOTECOMMENTS`, t1.`RESOLVEFEEDBACK`, t1.`REVENUESYSTEMCALCULATED`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SCHEDULEPROPOSALMEETING`, t1.`SENDTHANKYOUNOTE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STEPID`, t1.`STEPNAME`, t1.`TEAMSFOLLOWED`, t1.`TIMELINE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `OPPORTUNITY` t1  
 					 WHERE 	( t1.`STATECODE` = 2 )
 			]]>
     </sql>
     <!--数据查询[Top5]-->
     <sql id="Top5" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTUALCLOSEDATE`, t1.`ACTUALVALUE`, t1.`ACTUALVALUE_BASE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CAPTUREPROPOSALFEEDBACK`, t1.`CLOSEPROBABILITY`, t1.`COMPLETEFINALPROPOSAL`, t1.`COMPLETEINTERNALREVIEW`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTSITUATION`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERNEED`, t1.`CUSTOMERPAINPOINTS`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DEVELOPPROPOSAL`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`ESTIMATEDVALUE_BASE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FILEDEBRIEF`, t1.`FINALDECISIONDATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IDENTIFYCOMPETITORS`, t1.`IDENTIFYCUSTOMERCONTACTS`, t1.`IDENTIFYPURSUITTEAM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INITIALCOMMUNICATION`, t1.`LASTONHOLDTIME`, t1.`NEED`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OPPORTUNITYRATINGCODE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PRESENTFINALPROPOSAL`, t1.`PRESENTPROPOSAL`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PROPOSEDSOLUTION`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`PURSUITDECISION`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUOTECOMMENTS`, t1.`RESOLVEFEEDBACK`, t1.`REVENUESYSTEMCALCULATED`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SCHEDULEPROPOSALMEETING`, t1.`SENDTHANKYOUNOTE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STEPID`, t1.`STEPNAME`, t1.`TEAMSFOLLOWED`, t1.`TIMELINE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `OPPORTUNITY` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTUALCLOSEDATE`, t1.`ACTUALVALUE`, t1.`ACTUALVALUE_BASE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CAPTUREPROPOSALFEEDBACK`, t1.`CLOSEPROBABILITY`, t1.`COMPLETEFINALPROPOSAL`, t1.`COMPLETEINTERNALREVIEW`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CURRENTSITUATION`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERNEED`, t1.`CUSTOMERPAINPOINTS`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DEVELOPPROPOSAL`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`ESTIMATEDVALUE_BASE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FILEDEBRIEF`, t1.`FINALDECISIONDATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IDENTIFYCOMPETITORS`, t1.`IDENTIFYCUSTOMERCONTACTS`, t1.`IDENTIFYPURSUITTEAM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INITIALCOMMUNICATION`, t1.`LASTONHOLDTIME`, t1.`NEED`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OPPORTUNITYRATINGCODE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PRESENTFINALPROPOSAL`, t1.`PRESENTPROPOSAL`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PROPOSEDSOLUTION`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`PURSUITDECISION`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUOTECOMMENTS`, t1.`RESOLVEFEEDBACK`, t1.`REVENUESYSTEMCALCULATED`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SCHEDULEPROPOSALMEETING`, t1.`SENDTHANKYOUNOTE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STEPID`, t1.`STEPNAME`, t1.`TEAMSFOLLOWED`, t1.`TIMELINE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `OPPORTUNITY` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTUALCLOSEDATE`, t1.`ACTUALVALUE`, t1.`ACTUALVALUE_BASE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CAPTUREPROPOSALFEEDBACK`, t1.`CLOSEPROBABILITY`, t1.`COMPLETEFINALPROPOSAL`, t1.`COMPLETEINTERNALREVIEW`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTSITUATION`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERNEED`, t1.`CUSTOMERPAINPOINTS`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DEVELOPPROPOSAL`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`ESTIMATEDVALUE_BASE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FILEDEBRIEF`, t1.`FINALDECISIONDATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IDENTIFYCOMPETITORS`, t1.`IDENTIFYCUSTOMERCONTACTS`, t1.`IDENTIFYPURSUITTEAM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INITIALCOMMUNICATION`, t1.`LASTONHOLDTIME`, t1.`NEED`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OPPORTUNITYRATINGCODE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PRESENTFINALPROPOSAL`, t1.`PRESENTPROPOSAL`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PROPOSEDSOLUTION`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`PURSUITDECISION`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUOTECOMMENTS`, t1.`RESOLVEFEEDBACK`, t1.`REVENUESYSTEMCALCULATED`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SCHEDULEPROPOSALMEETING`, t1.`SENDTHANKYOUNOTE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STEPID`, t1.`STEPNAME`, t1.`TEAMSFOLLOWED`, t1.`TIMELINE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `OPPORTUNITY` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTUALCLOSEDATE`, t1.`ACTUALVALUE`, t1.`ACTUALVALUE_BASE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CAPTUREPROPOSALFEEDBACK`, t1.`CLOSEPROBABILITY`, t1.`COMPLETEFINALPROPOSAL`, t1.`COMPLETEINTERNALREVIEW`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CURRENTSITUATION`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERNEED`, t1.`CUSTOMERPAINPOINTS`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DEVELOPPROPOSAL`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`ESTIMATEDVALUE_BASE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FILEDEBRIEF`, t1.`FINALDECISIONDATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IDENTIFYCOMPETITORS`, t1.`IDENTIFYCUSTOMERCONTACTS`, t1.`IDENTIFYPURSUITTEAM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INITIALCOMMUNICATION`, t1.`LASTONHOLDTIME`, t1.`NEED`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OPPORTUNITYRATINGCODE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PRESENTFINALPROPOSAL`, t1.`PRESENTPROPOSAL`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PROPOSEDSOLUTION`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`PURSUITDECISION`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUOTECOMMENTS`, t1.`RESOLVEFEEDBACK`, t1.`REVENUESYSTEMCALCULATED`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SCHEDULEPROPOSALMEETING`, t1.`SENDTHANKYOUNOTE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STEPID`, t1.`STEPNAME`, t1.`TEAMSFOLLOWED`, t1.`TIMELINE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `OPPORTUNITY` t1  
 			]]>
     </sql>
     <!--数据查询[Win]-->
     <sql id="Win" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTUALCLOSEDATE`, t1.`ACTUALVALUE`, t1.`ACTUALVALUE_BASE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CAPTUREPROPOSALFEEDBACK`, t1.`CLOSEPROBABILITY`, t1.`COMPLETEFINALPROPOSAL`, t1.`COMPLETEINTERNALREVIEW`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENTSITUATION`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERNEED`, t1.`CUSTOMERPAINPOINTS`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DEVELOPPROPOSAL`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`ESTIMATEDVALUE_BASE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FILEDEBRIEF`, t1.`FINALDECISIONDATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IDENTIFYCOMPETITORS`, t1.`IDENTIFYCUSTOMERCONTACTS`, t1.`IDENTIFYPURSUITTEAM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INITIALCOMMUNICATION`, t1.`LASTONHOLDTIME`, t1.`NEED`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OPPORTUNITYRATINGCODE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PRESENTFINALPROPOSAL`, t1.`PRESENTPROPOSAL`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PROPOSEDSOLUTION`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`PURSUITDECISION`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUOTECOMMENTS`, t1.`RESOLVEFEEDBACK`, t1.`REVENUESYSTEMCALCULATED`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SCHEDULEPROPOSALMEETING`, t1.`SENDTHANKYOUNOTE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STEPID`, t1.`STEPNAME`, t1.`TEAMSFOLLOWED`, t1.`TIMELINE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `OPPORTUNITY` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTUALCLOSEDATE`, t1.`ACTUALVALUE`, t1.`ACTUALVALUE_BASE`, t1.`BUDGETAMOUNT`, t1.`BUDGETAMOUNT_BASE`, t1.`BUDGETSTATUS`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CAPTUREPROPOSALFEEDBACK`, t1.`CLOSEPROBABILITY`, t1.`COMPLETEFINALPROPOSAL`, t1.`COMPLETEINTERNALREVIEW`, t1.`CONFIRMINTEREST`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CURRENTSITUATION`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERNEED`, t1.`CUSTOMERPAINPOINTS`, t1.`CUSTOMERTYPE`, t1.`DECISIONMAKER`, t1.`DESCRIPTION`, t1.`DEVELOPPROPOSAL`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ESTIMATEDCLOSEDATE`, t1.`ESTIMATEDVALUE`, t1.`ESTIMATEDVALUE_BASE`, t1.`EVALUATEFIT`, t1.`EXCHANGERATE`, t1.`FILEDEBRIEF`, t1.`FINALDECISIONDATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`IDENTIFYCOMPETITORS`, t1.`IDENTIFYCUSTOMERCONTACTS`, t1.`IDENTIFYPURSUITTEAM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INITIALCOMMUNICATION`, t1.`LASTONHOLDTIME`, t1.`NEED`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OPPORTUNITYRATINGCODE`, t1.`ORIGINATINGLEADID`, t1.`ORIGINATINGLEADNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTACCOUNTID`, t1.`PARENTACCOUNTNAME`, t1.`PARENTCONTACTID`, t1.`PARENTCONTACTNAME`, t1.`PARTICIPATESINWORKFLOW`, t1.`PRESENTFINALPROPOSAL`, t1.`PRESENTPROPOSAL`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PRIVATE`, t1.`PROCESSID`, t1.`PROPOSEDSOLUTION`, t1.`PURCHASEPROCESS`, t1.`PURCHASETIMEFRAME`, t1.`PURSUITDECISION`, t1.`QUALIFICATIONCOMMENTS`, t1.`QUOTECOMMENTS`, t1.`RESOLVEFEEDBACK`, t1.`REVENUESYSTEMCALCULATED`, t1.`SALESSTAGE`, t1.`SALESSTAGECODE`, t1.`SCHEDULEFOLLOWUP_PROSPECT`, t1.`SCHEDULEFOLLOWUP_QUALIFY`, t1.`SCHEDULEPROPOSALMEETING`, t1.`SENDTHANKYOUNOTE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`STEPID`, t1.`STEPNAME`, t1.`TEAMSFOLLOWED`, t1.`TIMELINE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `OPPORTUNITY` t1  
 					 WHERE 	( t1.`STATECODE` = 1 )
 			]]>
     </sql>

businesscentral-core/src/main/resources/mapper/sales/opportunityclose/OpportunityCloseMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="OpportunityCloseResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALREVENUE`, t1.`ACTUALREVENUE_BASE`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`COMPETITORID`, t1.`COMPETITORNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYIDTYPE`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `OPPORTUNITYCLOSE` t1  ) t1 where activityid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALREVENUE`, t1.`ACTUALREVENUE_BASE`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`COMPETITORID`, t1.`COMPETITORNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYTYPE`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `OPPORTUNITYCLOSE` t1  ) t1 where activityid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -78,12 +78,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALREVENUE`, t1.`ACTUALREVENUE_BASE`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`COMMUNITY`, t1.`COMPETITORID`, t1.`COMPETITORNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYIDTYPE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `OPPORTUNITYCLOSE` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALREVENUE`, t1.`ACTUALREVENUE_BASE`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`COMMUNITY`, t1.`COMPETITORID`, t1.`COMPETITORNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYTYPE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `OPPORTUNITYCLOSE` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALREVENUE`, t1.`ACTUALREVENUE_BASE`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`COMPETITORID`, t1.`COMPETITORNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYIDTYPE`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `OPPORTUNITYCLOSE` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALREVENUE`, t1.`ACTUALREVENUE_BASE`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`COMPETITORID`, t1.`COMPETITORNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYTYPE`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `OPPORTUNITYCLOSE` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/sales/opportunityproduct/OpportunityProductMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="OpportunityProductResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`BASEAMOUNT`, t1.`BASEAMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXTENDEDAMOUNT`, t1.`EXTENDEDAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LINEITEMNUMBER`, t1.`MANUALDISCOUNTAMOUNT`, t1.`MANUALDISCOUNTAMOUNT_BASE`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYPRODUCTID`, t1.`OPPORTUNITYPRODUCTNAME`, t1.`OPPORTUNITYSTATECODE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARENTBUNDLEID`, t1.`PARENTBUNDLEIDREF`, t1.`PRICEOVERRIDDEN`, t1.`PRICEPERUNIT`, t1.`PRICEPERUNIT_BASE`, t1.`PRICINGERRORCODE`, t1.`PRODUCTASSOCIATIONID`, t1.`PRODUCTDESCRIPTION`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTOVERRIDDEN`, t1.`PRODUCTTYPECODE`, t1.`PROPERTYCONFIGURATIONSTATUS`, t1.`QUANTITY`, t1.`SEQUENCENUMBER`, t1.`SKIPPRICECALCULATION`, t1.`TAX`, t1.`TAX_BASE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UOMID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VOLUMEDISCOUNTAMOUNT`, t1.`VOLUMEDISCOUNTAMOUNT_BASE` FROM `OPPORTUNITYPRODUCT` t1  ) t1 where opportunityproductid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`BASEAMOUNT`, t1.`BASEAMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXTENDEDAMOUNT`, t1.`EXTENDEDAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LINEITEMNUMBER`, t1.`MANUALDISCOUNTAMOUNT`, t1.`MANUALDISCOUNTAMOUNT_BASE`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYPRODUCTID`, t1.`OPPORTUNITYPRODUCTNAME`, t1.`OPPORTUNITYSTATECODE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTBUNDLEID`, t1.`PARENTBUNDLEIDREF`, t1.`PRICEOVERRIDDEN`, t1.`PRICEPERUNIT`, t1.`PRICEPERUNIT_BASE`, t1.`PRICINGERRORCODE`, t1.`PRODUCTASSOCIATIONID`, t1.`PRODUCTDESCRIPTION`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTOVERRIDDEN`, t1.`PRODUCTTYPECODE`, t1.`PROPERTYCONFIGURATIONSTATUS`, t1.`QUANTITY`, t1.`SEQUENCENUMBER`, t1.`SKIPPRICECALCULATION`, t1.`TAX`, t1.`TAX_BASE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UOMID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VOLUMEDISCOUNTAMOUNT`, t1.`VOLUMEDISCOUNTAMOUNT_BASE` FROM `OPPORTUNITYPRODUCT` t1  ) t1 where opportunityproductid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -85,12 +85,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BASEAMOUNT`, t1.`BASEAMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXTENDEDAMOUNT`, t1.`EXTENDEDAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LINEITEMNUMBER`, t1.`MANUALDISCOUNTAMOUNT`, t1.`MANUALDISCOUNTAMOUNT_BASE`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYPRODUCTID`, t1.`OPPORTUNITYPRODUCTNAME`, t1.`OPPORTUNITYSTATECODE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARENTBUNDLEID`, t1.`PARENTBUNDLEIDREF`, t1.`PRICEOVERRIDDEN`, t1.`PRICEPERUNIT`, t1.`PRICEPERUNIT_BASE`, t1.`PRICINGERRORCODE`, t1.`PRODUCTASSOCIATIONID`, t1.`PRODUCTDESCRIPTION`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTOVERRIDDEN`, t1.`PRODUCTTYPECODE`, t1.`PROPERTYCONFIGURATIONSTATUS`, t1.`QUANTITY`, t1.`SEQUENCENUMBER`, t1.`SKIPPRICECALCULATION`, t1.`TAX`, t1.`TAX_BASE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UOMID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VOLUMEDISCOUNTAMOUNT`, t1.`VOLUMEDISCOUNTAMOUNT_BASE` FROM `OPPORTUNITYPRODUCT` t1  
+		<![CDATA[ SELECT t1.`BASEAMOUNT`, t1.`BASEAMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXTENDEDAMOUNT`, t1.`EXTENDEDAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LINEITEMNUMBER`, t1.`MANUALDISCOUNTAMOUNT`, t1.`MANUALDISCOUNTAMOUNT_BASE`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYPRODUCTID`, t1.`OPPORTUNITYPRODUCTNAME`, t1.`OPPORTUNITYSTATECODE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTBUNDLEID`, t1.`PARENTBUNDLEIDREF`, t1.`PRICEOVERRIDDEN`, t1.`PRICEPERUNIT`, t1.`PRICEPERUNIT_BASE`, t1.`PRICINGERRORCODE`, t1.`PRODUCTASSOCIATIONID`, t1.`PRODUCTDESCRIPTION`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTOVERRIDDEN`, t1.`PRODUCTTYPECODE`, t1.`PROPERTYCONFIGURATIONSTATUS`, t1.`QUANTITY`, t1.`SEQUENCENUMBER`, t1.`SKIPPRICECALCULATION`, t1.`TAX`, t1.`TAX_BASE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UOMID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VOLUMEDISCOUNTAMOUNT`, t1.`VOLUMEDISCOUNTAMOUNT_BASE` FROM `OPPORTUNITYPRODUCT` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BASEAMOUNT`, t1.`BASEAMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXTENDEDAMOUNT`, t1.`EXTENDEDAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LINEITEMNUMBER`, t1.`MANUALDISCOUNTAMOUNT`, t1.`MANUALDISCOUNTAMOUNT_BASE`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYPRODUCTID`, t1.`OPPORTUNITYPRODUCTNAME`, t1.`OPPORTUNITYSTATECODE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARENTBUNDLEID`, t1.`PARENTBUNDLEIDREF`, t1.`PRICEOVERRIDDEN`, t1.`PRICEPERUNIT`, t1.`PRICEPERUNIT_BASE`, t1.`PRICINGERRORCODE`, t1.`PRODUCTASSOCIATIONID`, t1.`PRODUCTDESCRIPTION`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTOVERRIDDEN`, t1.`PRODUCTTYPECODE`, t1.`PROPERTYCONFIGURATIONSTATUS`, t1.`QUANTITY`, t1.`SEQUENCENUMBER`, t1.`SKIPPRICECALCULATION`, t1.`TAX`, t1.`TAX_BASE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UOMID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VOLUMEDISCOUNTAMOUNT`, t1.`VOLUMEDISCOUNTAMOUNT_BASE` FROM `OPPORTUNITYPRODUCT` t1  
+		<![CDATA[ SELECT t1.`BASEAMOUNT`, t1.`BASEAMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXTENDEDAMOUNT`, t1.`EXTENDEDAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LINEITEMNUMBER`, t1.`MANUALDISCOUNTAMOUNT`, t1.`MANUALDISCOUNTAMOUNT_BASE`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYPRODUCTID`, t1.`OPPORTUNITYPRODUCTNAME`, t1.`OPPORTUNITYSTATECODE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTBUNDLEID`, t1.`PARENTBUNDLEIDREF`, t1.`PRICEOVERRIDDEN`, t1.`PRICEPERUNIT`, t1.`PRICEPERUNIT_BASE`, t1.`PRICINGERRORCODE`, t1.`PRODUCTASSOCIATIONID`, t1.`PRODUCTDESCRIPTION`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTOVERRIDDEN`, t1.`PRODUCTTYPECODE`, t1.`PROPERTYCONFIGURATIONSTATUS`, t1.`QUANTITY`, t1.`SEQUENCENUMBER`, t1.`SKIPPRICECALCULATION`, t1.`TAX`, t1.`TAX_BASE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UOMID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VOLUMEDISCOUNTAMOUNT`, t1.`VOLUMEDISCOUNTAMOUNT_BASE` FROM `OPPORTUNITYPRODUCT` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/sales/orderclose/OrderCloseMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="OrderCloseResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORDERNUMBER`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`REVISION`, t1.`SALESORDERID`, t1.`SALESORDERIDTYPE`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `ORDERCLOSE` t1  ) t1 where activityid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORDERNUMBER`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`REVISION`, t1.`SALESORDERID`, t1.`SALESORDERTYPE`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `ORDERCLOSE` t1  ) t1 where activityid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -67,12 +67,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`ORDERNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REVISION`, t1.`SALESORDERID`, t1.`SALESORDERIDTYPE`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `ORDERCLOSE` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`ORDERNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REVISION`, t1.`SALESORDERID`, t1.`SALESORDERTYPE`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `ORDERCLOSE` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORDERNUMBER`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`REVISION`, t1.`SALESORDERID`, t1.`SALESORDERIDTYPE`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `ORDERCLOSE` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORDERNUMBER`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`REVISION`, t1.`SALESORDERID`, t1.`SALESORDERTYPE`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `ORDERCLOSE` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/sales/quote/QuoteMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="QuoteResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CLOSEDON`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EFFECTIVEFROM`, t1.`EFFECTIVETO`, t1.`EMAILADDRESS`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`QUOTENUMBER`, t1.`REQUESTDELIVERYBY`, t1.`REVISIONNUMBER`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UNIQUEDSCID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `QUOTE` t1  ) t1 where quoteid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CLOSEDON`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EFFECTIVEFROM`, t1.`EFFECTIVETO`, t1.`EMAILADDRESS`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`QUOTENUMBER`, t1.`REQUESTDELIVERYBY`, t1.`REVISIONNUMBER`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNIQUEDSCID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `QUOTE` t1  ) t1 where quoteid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -156,41 +156,41 @@
 
     <!--数据查询[ByParentKey]-->
     <sql id="ByParentKey" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CLOSEDON`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EFFECTIVEFROM`, t1.`EFFECTIVETO`, t1.`EMAILADDRESS`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`QUOTENUMBER`, t1.`REQUESTDELIVERYBY`, t1.`REVISIONNUMBER`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UNIQUEDSCID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `QUOTE` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CLOSEDON`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EFFECTIVEFROM`, t1.`EFFECTIVETO`, t1.`EMAILADDRESS`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`QUOTENUMBER`, t1.`REQUESTDELIVERYBY`, t1.`REVISIONNUMBER`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNIQUEDSCID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `QUOTE` t1  
 					 WHERE 	( t1.`CUSTOMERID` =  #{srf.datacontext.srfparentkey} )
 			]]>
     </sql>
     <!--数据查询[Closed]-->
     <sql id="Closed" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CLOSEDON`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EFFECTIVEFROM`, t1.`EFFECTIVETO`, t1.`EMAILADDRESS`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`QUOTENUMBER`, t1.`REQUESTDELIVERYBY`, t1.`REVISIONNUMBER`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UNIQUEDSCID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `QUOTE` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CLOSEDON`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EFFECTIVEFROM`, t1.`EFFECTIVETO`, t1.`EMAILADDRESS`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`QUOTENUMBER`, t1.`REQUESTDELIVERYBY`, t1.`REVISIONNUMBER`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNIQUEDSCID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `QUOTE` t1  
 					 WHERE 	( t1.`STATECODE` = 3 )
 			]]>
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CLOSEDON`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EFFECTIVEFROM`, t1.`EFFECTIVETO`, t1.`EMAILADDRESS`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`QUOTENUMBER`, t1.`REQUESTDELIVERYBY`, t1.`REVISIONNUMBER`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UNIQUEDSCID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `QUOTE` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CLOSEDON`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EFFECTIVEFROM`, t1.`EFFECTIVETO`, t1.`EMAILADDRESS`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`QUOTENUMBER`, t1.`REQUESTDELIVERYBY`, t1.`REVISIONNUMBER`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNIQUEDSCID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `QUOTE` t1  
 			]]>
     </sql>
     <!--数据查询[Draft]-->
     <sql id="Draft" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CLOSEDON`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EFFECTIVEFROM`, t1.`EFFECTIVETO`, t1.`EMAILADDRESS`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`QUOTENUMBER`, t1.`REQUESTDELIVERYBY`, t1.`REVISIONNUMBER`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UNIQUEDSCID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `QUOTE` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CLOSEDON`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EFFECTIVEFROM`, t1.`EFFECTIVETO`, t1.`EMAILADDRESS`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`QUOTENUMBER`, t1.`REQUESTDELIVERYBY`, t1.`REVISIONNUMBER`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNIQUEDSCID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `QUOTE` t1  
 					 WHERE 	( t1.`STATECODE` = 0 )
 			]]>
     </sql>
     <!--数据查询[Effective]-->
     <sql id="Effective" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CLOSEDON`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EFFECTIVEFROM`, t1.`EFFECTIVETO`, t1.`EMAILADDRESS`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`QUOTENUMBER`, t1.`REQUESTDELIVERYBY`, t1.`REVISIONNUMBER`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UNIQUEDSCID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `QUOTE` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CLOSEDON`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EFFECTIVEFROM`, t1.`EFFECTIVETO`, t1.`EMAILADDRESS`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`QUOTENUMBER`, t1.`REQUESTDELIVERYBY`, t1.`REVISIONNUMBER`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNIQUEDSCID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `QUOTE` t1  
 					 WHERE 	( t1.`STATECODE` = 1 )
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CLOSEDON`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EFFECTIVEFROM`, t1.`EFFECTIVETO`, t1.`EMAILADDRESS`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`QUOTENUMBER`, t1.`REQUESTDELIVERYBY`, t1.`REVISIONNUMBER`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UNIQUEDSCID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `QUOTE` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CLOSEDON`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EFFECTIVEFROM`, t1.`EFFECTIVETO`, t1.`EMAILADDRESS`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`QUOTENUMBER`, t1.`REQUESTDELIVERYBY`, t1.`REVISIONNUMBER`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNIQUEDSCID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `QUOTE` t1  
 			]]>
     </sql>
     <!--数据查询[Win]-->
     <sql id="Win" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CLOSEDON`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EFFECTIVEFROM`, t1.`EFFECTIVETO`, t1.`EMAILADDRESS`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`QUOTENUMBER`, t1.`REQUESTDELIVERYBY`, t1.`REVISIONNUMBER`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UNIQUEDSCID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `QUOTE` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CLOSEDON`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EFFECTIVEFROM`, t1.`EFFECTIVETO`, t1.`EMAILADDRESS`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICINGERRORCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`QUOTENUMBER`, t1.`REQUESTDELIVERYBY`, t1.`REVISIONNUMBER`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UNIQUEDSCID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `QUOTE` t1  
 					 WHERE 	( t1.`STATECODE` = 2 )
 			]]>
     </sql>

businesscentral-core/src/main/resources/mapper/sales/quoteclose/QuoteCloseMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="QuoteCloseResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTEIDTYPE`, t1.`QUOTENUMBER`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`REVISION`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `QUOTECLOSE` t1  ) t1 where activityid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENUMBER`, t1.`QUOTETYPE`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`REVISION`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `QUOTECLOSE` t1  ) t1 where activityid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -67,12 +67,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTEIDTYPE`, t1.`QUOTENUMBER`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REVISION`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `QUOTECLOSE` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENUMBER`, t1.`QUOTETYPE`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REVISION`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `QUOTECLOSE` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTEIDTYPE`, t1.`QUOTENUMBER`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`REVISION`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `QUOTECLOSE` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENUMBER`, t1.`QUOTETYPE`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`REVISION`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `QUOTECLOSE` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/sales/quotedetail/QuoteDetailMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="QuoteDetailResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`BASEAMOUNT`, t1.`BASEAMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`EXTENDEDAMOUNT`, t1.`EXTENDEDAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LINEITEMNUMBER`, t1.`MANUALDISCOUNTAMOUNT`, t1.`MANUALDISCOUNTAMOUNT_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARENTBUNDLEID`, t1.`PARENTBUNDLEIDREF`, t1.`PRICEOVERRIDDEN`, t1.`PRICEPERUNIT`, t1.`PRICEPERUNIT_BASE`, t1.`PRICINGERRORCODE`, t1.`PRODUCTASSOCIATIONID`, t1.`PRODUCTDESCRIPTION`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTOVERRIDDEN`, t1.`PRODUCTTYPECODE`, t1.`PROPERTYCONFIGURATIONSTATUS`, t1.`QUANTITY`, t1.`QUOTEDETAILID`, t1.`QUOTEDETAILNAME`, t1.`QUOTEID`, t1.`QUOTESTATECODE`, t1.`REQUESTDELIVERYBY`, t1.`SALESREPID`, t1.`SALESREPNAME`, t1.`SEQUENCENUMBER`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SKIPPRICECALCULATION`, t1.`TAX`, t1.`TAX_BASE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UOMID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VOLUMEDISCOUNTAMOUNT`, t1.`VOLUMEDISCOUNTAMOUNT_BASE`, t1.`WILLCALL` FROM `QUOTEDETAIL` t1  ) t1 where quotedetailid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`BASEAMOUNT`, t1.`BASEAMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`EXTENDEDAMOUNT`, t1.`EXTENDEDAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LINEITEMNUMBER`, t1.`MANUALDISCOUNTAMOUNT`, t1.`MANUALDISCOUNTAMOUNT_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTBUNDLEID`, t1.`PARENTBUNDLEIDREF`, t1.`PRICEOVERRIDDEN`, t1.`PRICEPERUNIT`, t1.`PRICEPERUNIT_BASE`, t1.`PRICINGERRORCODE`, t1.`PRODUCTASSOCIATIONID`, t1.`PRODUCTDESCRIPTION`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTOVERRIDDEN`, t1.`PRODUCTTYPECODE`, t1.`PROPERTYCONFIGURATIONSTATUS`, t1.`QUANTITY`, t1.`QUOTEDETAILID`, t1.`QUOTEDETAILNAME`, t1.`QUOTEID`, t1.`QUOTESTATECODE`, t1.`REQUESTDELIVERYBY`, t1.`SALESREPID`, t1.`SALESREPNAME`, t1.`SEQUENCENUMBER`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SKIPPRICECALCULATION`, t1.`TAX`, t1.`TAX_BASE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UOMID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VOLUMEDISCOUNTAMOUNT`, t1.`VOLUMEDISCOUNTAMOUNT_BASE`, t1.`WILLCALL` FROM `QUOTEDETAIL` t1  ) t1 where quotedetailid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -96,12 +96,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BASEAMOUNT`, t1.`BASEAMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`EXTENDEDAMOUNT`, t1.`EXTENDEDAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LINEITEMNUMBER`, t1.`MANUALDISCOUNTAMOUNT`, t1.`MANUALDISCOUNTAMOUNT_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARENTBUNDLEID`, t1.`PARENTBUNDLEIDREF`, t1.`PRICEOVERRIDDEN`, t1.`PRICEPERUNIT`, t1.`PRICEPERUNIT_BASE`, t1.`PRICINGERRORCODE`, t1.`PRODUCTASSOCIATIONID`, t1.`PRODUCTDESCRIPTION`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTOVERRIDDEN`, t1.`PRODUCTTYPECODE`, t1.`PROPERTYCONFIGURATIONSTATUS`, t1.`QUANTITY`, t1.`QUOTEDETAILID`, t1.`QUOTEDETAILNAME`, t1.`QUOTEID`, t1.`QUOTESTATECODE`, t1.`REQUESTDELIVERYBY`, t1.`SALESREPID`, t1.`SALESREPNAME`, t1.`SEQUENCENUMBER`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SKIPPRICECALCULATION`, t1.`TAX`, t1.`TAX_BASE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UOMID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VOLUMEDISCOUNTAMOUNT`, t1.`VOLUMEDISCOUNTAMOUNT_BASE`, t1.`WILLCALL` FROM `QUOTEDETAIL` t1  
+		<![CDATA[ SELECT t1.`BASEAMOUNT`, t1.`BASEAMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`EXTENDEDAMOUNT`, t1.`EXTENDEDAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LINEITEMNUMBER`, t1.`MANUALDISCOUNTAMOUNT`, t1.`MANUALDISCOUNTAMOUNT_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTBUNDLEID`, t1.`PARENTBUNDLEIDREF`, t1.`PRICEOVERRIDDEN`, t1.`PRICEPERUNIT`, t1.`PRICEPERUNIT_BASE`, t1.`PRICINGERRORCODE`, t1.`PRODUCTASSOCIATIONID`, t1.`PRODUCTDESCRIPTION`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTOVERRIDDEN`, t1.`PRODUCTTYPECODE`, t1.`PROPERTYCONFIGURATIONSTATUS`, t1.`QUANTITY`, t1.`QUOTEDETAILID`, t1.`QUOTEDETAILNAME`, t1.`QUOTEID`, t1.`QUOTESTATECODE`, t1.`REQUESTDELIVERYBY`, t1.`SALESREPID`, t1.`SALESREPNAME`, t1.`SEQUENCENUMBER`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SKIPPRICECALCULATION`, t1.`TAX`, t1.`TAX_BASE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UOMID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VOLUMEDISCOUNTAMOUNT`, t1.`VOLUMEDISCOUNTAMOUNT_BASE`, t1.`WILLCALL` FROM `QUOTEDETAIL` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BASEAMOUNT`, t1.`BASEAMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`EXTENDEDAMOUNT`, t1.`EXTENDEDAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LINEITEMNUMBER`, t1.`MANUALDISCOUNTAMOUNT`, t1.`MANUALDISCOUNTAMOUNT_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARENTBUNDLEID`, t1.`PARENTBUNDLEIDREF`, t1.`PRICEOVERRIDDEN`, t1.`PRICEPERUNIT`, t1.`PRICEPERUNIT_BASE`, t1.`PRICINGERRORCODE`, t1.`PRODUCTASSOCIATIONID`, t1.`PRODUCTDESCRIPTION`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTOVERRIDDEN`, t1.`PRODUCTTYPECODE`, t1.`PROPERTYCONFIGURATIONSTATUS`, t1.`QUANTITY`, t1.`QUOTEDETAILID`, t1.`QUOTEDETAILNAME`, t1.`QUOTEID`, t1.`QUOTESTATECODE`, t1.`REQUESTDELIVERYBY`, t1.`SALESREPID`, t1.`SALESREPNAME`, t1.`SEQUENCENUMBER`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SKIPPRICECALCULATION`, t1.`TAX`, t1.`TAX_BASE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UOMID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VOLUMEDISCOUNTAMOUNT`, t1.`VOLUMEDISCOUNTAMOUNT_BASE`, t1.`WILLCALL` FROM `QUOTEDETAIL` t1  
+		<![CDATA[ SELECT t1.`BASEAMOUNT`, t1.`BASEAMOUNT_BASE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`EXTENDEDAMOUNT`, t1.`EXTENDEDAMOUNT_BASE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LINEITEMNUMBER`, t1.`MANUALDISCOUNTAMOUNT`, t1.`MANUALDISCOUNTAMOUNT_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTBUNDLEID`, t1.`PARENTBUNDLEIDREF`, t1.`PRICEOVERRIDDEN`, t1.`PRICEPERUNIT`, t1.`PRICEPERUNIT_BASE`, t1.`PRICINGERRORCODE`, t1.`PRODUCTASSOCIATIONID`, t1.`PRODUCTDESCRIPTION`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTOVERRIDDEN`, t1.`PRODUCTTYPECODE`, t1.`PROPERTYCONFIGURATIONSTATUS`, t1.`QUANTITY`, t1.`QUOTEDETAILID`, t1.`QUOTEDETAILNAME`, t1.`QUOTEID`, t1.`QUOTESTATECODE`, t1.`REQUESTDELIVERYBY`, t1.`SALESREPID`, t1.`SALESREPNAME`, t1.`SEQUENCENUMBER`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SKIPPRICECALCULATION`, t1.`TAX`, t1.`TAX_BASE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UOMID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`VOLUMEDISCOUNTAMOUNT`, t1.`VOLUMEDISCOUNTAMOUNT_BASE`, t1.`WILLCALL` FROM `QUOTEDETAIL` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/sales/salesliterature/SalesLiteratureMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="SalesLiteratureResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERVIEWABLE`, t1.`DESCRIPTION`, t1.`EMPLOYEECONTACTID`, t1.`EMPLOYEECONTACTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPIRATIONDATE`, t1.`HASATTACHMENTS`, t1.`IMPORTSEQUENCENUMBER`, t1.`KEYWORDS`, t1.`LITERATURETYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`PROCESSID`, t1.`SALESLITERATUREID`, t1.`SALESLITERATURENAME`, t1.`STAGEID`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `SALESLITERATURE` t1  ) t1 where salesliteratureid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERVIEWABLE`, t1.`DESCRIPTION`, t1.`EMPLOYEECONTACTID`, t1.`EMPLOYEECONTACTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPIRATIONDATE`, t1.`HASATTACHMENTS`, t1.`IMPORTSEQUENCENUMBER`, t1.`KEYWORDS`, t1.`LITERATURETYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`PROCESSID`, t1.`SALESLITERATUREID`, t1.`SALESLITERATURENAME`, t1.`STAGEID`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `SALESLITERATURE` t1  ) t1 where salesliteratureid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -49,12 +49,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERVIEWABLE`, t1.`DESCRIPTION`, t1.`EMPLOYEECONTACTID`, t1.`EMPLOYEECONTACTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPIRATIONDATE`, t1.`HASATTACHMENTS`, t1.`IMPORTSEQUENCENUMBER`, t1.`LITERATURETYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`PROCESSID`, t1.`SALESLITERATUREID`, t1.`SALESLITERATURENAME`, t1.`STAGEID`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `SALESLITERATURE` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERVIEWABLE`, t1.`DESCRIPTION`, t1.`EMPLOYEECONTACTID`, t1.`EMPLOYEECONTACTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPIRATIONDATE`, t1.`HASATTACHMENTS`, t1.`IMPORTSEQUENCENUMBER`, t1.`LITERATURETYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`PROCESSID`, t1.`SALESLITERATUREID`, t1.`SALESLITERATURENAME`, t1.`STAGEID`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `SALESLITERATURE` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERVIEWABLE`, t1.`DESCRIPTION`, t1.`EMPLOYEECONTACTID`, t1.`EMPLOYEECONTACTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPIRATIONDATE`, t1.`HASATTACHMENTS`, t1.`IMPORTSEQUENCENUMBER`, t1.`KEYWORDS`, t1.`LITERATURETYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`PROCESSID`, t1.`SALESLITERATUREID`, t1.`SALESLITERATURENAME`, t1.`STAGEID`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `SALESLITERATURE` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERVIEWABLE`, t1.`DESCRIPTION`, t1.`EMPLOYEECONTACTID`, t1.`EMPLOYEECONTACTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPIRATIONDATE`, t1.`HASATTACHMENTS`, t1.`IMPORTSEQUENCENUMBER`, t1.`KEYWORDS`, t1.`LITERATURETYPECODE`, t1.`OVERRIDDENCREATEDON`, t1.`PROCESSID`, t1.`SALESLITERATUREID`, t1.`SALESLITERATURENAME`, t1.`STAGEID`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `SALESLITERATURE` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/sales/salesorder/SalesOrderMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="SalesOrderResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEFULFILLED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`ORDERNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`REQUESTDELIVERYBY`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBMITDATE`, t1.`SUBMITSTATUS`, t1.`SUBMITSTATUSDESCRIPTION`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `SALESORDER` t1  ) t1 where salesorderid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEFULFILLED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`ORDERNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`REQUESTDELIVERYBY`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBMITDATE`, t1.`SUBMITSTATUS`, t1.`SUBMITSTATUSDESCRIPTION`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `SALESORDER` t1  ) t1 where salesorderid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -159,36 +159,36 @@
 
     <!--数据查询[ByParentKey]-->
     <sql id="ByParentKey" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEFULFILLED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`ORDERNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`REQUESTDELIVERYBY`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBMITDATE`, t1.`SUBMITSTATUS`, t1.`SUBMITSTATUSDESCRIPTION`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `SALESORDER` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEFULFILLED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`ORDERNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`REQUESTDELIVERYBY`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBMITDATE`, t1.`SUBMITSTATUS`, t1.`SUBMITSTATUSDESCRIPTION`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `SALESORDER` t1  
 					 WHERE 	( t1.`CUSTOMERID` =  #{srf.datacontext.srfparentkey} )
 			]]>
     </sql>
     <!--数据查询[Cancel]-->
     <sql id="Cancel" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEFULFILLED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`ORDERNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`REQUESTDELIVERYBY`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBMITDATE`, t1.`SUBMITSTATUS`, t1.`SUBMITSTATUSDESCRIPTION`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `SALESORDER` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEFULFILLED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`ORDERNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`REQUESTDELIVERYBY`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBMITDATE`, t1.`SUBMITSTATUS`, t1.`SUBMITSTATUSDESCRIPTION`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `SALESORDER` t1  
 					 WHERE 	( t1.`STATECODE` = 2 )
 			]]>
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEFULFILLED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`ORDERNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`REQUESTDELIVERYBY`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBMITDATE`, t1.`SUBMITSTATUS`, t1.`SUBMITSTATUSDESCRIPTION`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `SALESORDER` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEFULFILLED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`ORDERNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`REQUESTDELIVERYBY`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBMITDATE`, t1.`SUBMITSTATUS`, t1.`SUBMITSTATUSDESCRIPTION`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `SALESORDER` t1  
 			]]>
     </sql>
     <!--数据查询[Finish]-->
     <sql id="Finish" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEFULFILLED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`ORDERNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`REQUESTDELIVERYBY`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBMITDATE`, t1.`SUBMITSTATUS`, t1.`SUBMITSTATUSDESCRIPTION`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `SALESORDER` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEFULFILLED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`ORDERNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`REQUESTDELIVERYBY`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBMITDATE`, t1.`SUBMITSTATUS`, t1.`SUBMITSTATUSDESCRIPTION`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `SALESORDER` t1  
 					 WHERE 	( t1.`STATECODE` = 3 )
 			]]>
     </sql>
     <!--数据查询[Invoiced]-->
     <sql id="Invoiced" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEFULFILLED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`ORDERNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`REQUESTDELIVERYBY`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBMITDATE`, t1.`SUBMITSTATUS`, t1.`SUBMITSTATUSDESCRIPTION`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `SALESORDER` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEFULFILLED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`ORDERNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`REQUESTDELIVERYBY`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBMITDATE`, t1.`SUBMITSTATUS`, t1.`SUBMITSTATUSDESCRIPTION`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `SALESORDER` t1  
 					 WHERE 	( t1.`STATECODE` = 4 )
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEFULFILLED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`ORDERNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`REQUESTDELIVERYBY`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBMITDATE`, t1.`SUBMITSTATUS`, t1.`SUBMITSTATUSDESCRIPTION`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `SALESORDER` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`BILLTO_ADDRESSID`, t1.`BILLTO_CITY`, t1.`BILLTO_COMPOSITE`, t1.`BILLTO_CONTACTNAME`, t1.`BILLTO_COUNTRY`, t1.`BILLTO_FAX`, t1.`BILLTO_LINE1`, t1.`BILLTO_LINE2`, t1.`BILLTO_LINE3`, t1.`BILLTO_NAME`, t1.`BILLTO_POSTALCODE`, t1.`BILLTO_STATEORPROVINCE`, t1.`BILLTO_TELEPHONE`, t1.`CAMPAIGNID`, t1.`CAMPAIGNNAME`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DATEFULFILLED`, t1.`DESCRIPTION`, t1.`DISCOUNTAMOUNT`, t1.`DISCOUNTAMOUNT_BASE`, t1.`DISCOUNTPERCENTAGE`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`FREIGHTAMOUNT`, t1.`FREIGHTAMOUNT_BASE`, t1.`FREIGHTTERMSCODE`, t1.`IMPORTSEQUENCENUMBER`, t1.`LASTBACKOFFICESUBMIT`, t1.`LASTONHOLDTIME`, t1.`ONHOLDTIME`, t1.`OPPORTUNITYID`, t1.`OPPORTUNITYNAME`, t1.`ORDERNUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PAYMENTTERMSCODE`, t1.`PRICELEVELID`, t1.`PRICELEVELNAME`, t1.`PRICELOCKED`, t1.`PRICINGERRORCODE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`QUOTEID`, t1.`QUOTENAME`, t1.`REQUESTDELIVERYBY`, t1.`SALESORDERID`, t1.`SALESORDERNAME`, t1.`SHIPPINGMETHODCODE`, t1.`SHIPTO_ADDRESSID`, t1.`SHIPTO_CITY`, t1.`SHIPTO_COMPOSITE`, t1.`SHIPTO_CONTACTNAME`, t1.`SHIPTO_COUNTRY`, t1.`SHIPTO_FAX`, t1.`SHIPTO_FREIGHTTERMSCODE`, t1.`SHIPTO_LINE1`, t1.`SHIPTO_LINE2`, t1.`SHIPTO_LINE3`, t1.`SHIPTO_NAME`, t1.`SHIPTO_POSTALCODE`, t1.`SHIPTO_STATEORPROVINCE`, t1.`SHIPTO_TELEPHONE`, t1.`SLAID`, t1.`SLANAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBMITDATE`, t1.`SUBMITSTATUS`, t1.`SUBMITSTATUSDESCRIPTION`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALAMOUNT`, t1.`TOTALAMOUNTLESSFREIGHT`, t1.`TOTALAMOUNTLESSFREIGHT_BASE`, t1.`TOTALAMOUNT_BASE`, t1.`TOTALDISCOUNTAMOUNT`, t1.`TOTALDISCOUNTAMOUNT_BASE`, t1.`TOTALLINEITEMAMOUNT`, t1.`TOTALLINEITEMAMOUNT_BASE`, t1.`TOTALLINEITEMDISCOUNTAMOUNT`, t1.`TOTALTAX`, t1.`TOTALTAX_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WILLCALL` FROM `SALESORDER` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/scheduling/bookableresource/BookableResourceMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="BookableResourceResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`BOOKABLERESID`, t1.`BOOKABLERESNAME`, t1.`CALENDARID`, t1.`CONTACTID`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PROCESSID`, t1.`RESOURCETYPE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERID`, t1.`USERNAME`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERES` t1  ) t1 where bookableresid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`BOOKABLERESID`, t1.`BOOKABLERESNAME`, t1.`CALENDARID`, t1.`CONTACTID`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`RESOURCETYPE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERID`, t1.`USERNAME`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERES` t1  ) t1 where bookableresid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -68,12 +68,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`BOOKABLERESID`, t1.`BOOKABLERESNAME`, t1.`CALENDARID`, t1.`CONTACTID`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PROCESSID`, t1.`RESOURCETYPE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERID`, t1.`USERNAME`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERES` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`BOOKABLERESID`, t1.`BOOKABLERESNAME`, t1.`CALENDARID`, t1.`CONTACTID`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`RESOURCETYPE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERID`, t1.`USERNAME`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERES` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`BOOKABLERESID`, t1.`BOOKABLERESNAME`, t1.`CALENDARID`, t1.`CONTACTID`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PROCESSID`, t1.`RESOURCETYPE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERID`, t1.`USERNAME`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERES` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTID`, t1.`ACCOUNTNAME`, t1.`BOOKABLERESID`, t1.`BOOKABLERESNAME`, t1.`CALENDARID`, t1.`CONTACTID`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`RESOURCETYPE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USERID`, t1.`USERNAME`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERES` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/scheduling/bookableresourcebooking/BookableResourceBookingMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="BookableResourceBookingResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`BOOKABLERESBOOKINGID`, t1.`BOOKABLERESBOOKINGNAME`, t1.`BOOKINGSTATUS`, t1.`BOOKINGSTATUSNAME`, t1.`BOOKINGTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DURATION`, t1.`ENDTIME`, t1.`EXCHANGERATE`, t1.`HEADER`, t1.`HEADERNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PROCESSID`, t1.`RESOURCE`, t1.`RESOURCENAME`, t1.`STAGEID`, t1.`STARTTIME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESBOOKING` t1  ) t1 where bookableresbookingid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`BOOKABLERESBOOKINGID`, t1.`BOOKABLERESBOOKINGNAME`, t1.`BOOKINGSTATUS`, t1.`BOOKINGSTATUSNAME`, t1.`BOOKINGTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DURATION`, t1.`ENDTIME`, t1.`EXCHANGERATE`, t1.`HEADER`, t1.`HEADERNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`RESOURCE`, t1.`RESOURCENAME`, t1.`STAGEID`, t1.`STARTTIME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESBOOKING` t1  ) t1 where bookableresbookingid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -68,12 +68,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BOOKABLERESBOOKINGID`, t1.`BOOKABLERESBOOKINGNAME`, t1.`BOOKINGSTATUS`, t1.`BOOKINGSTATUSNAME`, t1.`BOOKINGTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DURATION`, t1.`ENDTIME`, t1.`EXCHANGERATE`, t1.`HEADER`, t1.`HEADERNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PROCESSID`, t1.`RESOURCE`, t1.`RESOURCENAME`, t1.`STAGEID`, t1.`STARTTIME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESBOOKING` t1  
+		<![CDATA[ SELECT t1.`BOOKABLERESBOOKINGID`, t1.`BOOKABLERESBOOKINGNAME`, t1.`BOOKINGSTATUS`, t1.`BOOKINGSTATUSNAME`, t1.`BOOKINGTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DURATION`, t1.`ENDTIME`, t1.`EXCHANGERATE`, t1.`HEADER`, t1.`HEADERNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`RESOURCE`, t1.`RESOURCENAME`, t1.`STAGEID`, t1.`STARTTIME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESBOOKING` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BOOKABLERESBOOKINGID`, t1.`BOOKABLERESBOOKINGNAME`, t1.`BOOKINGSTATUS`, t1.`BOOKINGSTATUSNAME`, t1.`BOOKINGTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DURATION`, t1.`ENDTIME`, t1.`EXCHANGERATE`, t1.`HEADER`, t1.`HEADERNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PROCESSID`, t1.`RESOURCE`, t1.`RESOURCENAME`, t1.`STAGEID`, t1.`STARTTIME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESBOOKING` t1  
+		<![CDATA[ SELECT t1.`BOOKABLERESBOOKINGID`, t1.`BOOKABLERESBOOKINGNAME`, t1.`BOOKINGSTATUS`, t1.`BOOKINGSTATUSNAME`, t1.`BOOKINGTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DURATION`, t1.`ENDTIME`, t1.`EXCHANGERATE`, t1.`HEADER`, t1.`HEADERNAME`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`RESOURCE`, t1.`RESOURCENAME`, t1.`STAGEID`, t1.`STARTTIME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESBOOKING` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/scheduling/bookableresourcebookingheader/BookableResourceBookingHeaderMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="BookableResourceBookingHeaderResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`BOOKABLERESBOOKINGHEADERID`, t1.`BOOKABLERESBOOKINGHEADERNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DURATION`, t1.`ENDTIME`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PROCESSID`, t1.`STAGEID`, t1.`STARTTIME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESBOOKINGHEADER` t1  ) t1 where bookableresbookingheaderid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`BOOKABLERESBOOKINGHEADERID`, t1.`BOOKABLERESBOOKINGHEADERNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DURATION`, t1.`ENDTIME`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`STAGEID`, t1.`STARTTIME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESBOOKINGHEADER` t1  ) t1 where bookableresbookingheaderid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -38,12 +38,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BOOKABLERESBOOKINGHEADERID`, t1.`BOOKABLERESBOOKINGHEADERNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DURATION`, t1.`ENDTIME`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PROCESSID`, t1.`STAGEID`, t1.`STARTTIME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESBOOKINGHEADER` t1  
+		<![CDATA[ SELECT t1.`BOOKABLERESBOOKINGHEADERID`, t1.`BOOKABLERESBOOKINGHEADERNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DURATION`, t1.`ENDTIME`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`STAGEID`, t1.`STARTTIME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESBOOKINGHEADER` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BOOKABLERESBOOKINGHEADERID`, t1.`BOOKABLERESBOOKINGHEADERNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DURATION`, t1.`ENDTIME`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PROCESSID`, t1.`STAGEID`, t1.`STARTTIME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESBOOKINGHEADER` t1  
+		<![CDATA[ SELECT t1.`BOOKABLERESBOOKINGHEADERID`, t1.`BOOKABLERESBOOKINGHEADERNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DURATION`, t1.`ENDTIME`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`STAGEID`, t1.`STARTTIME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESBOOKINGHEADER` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/scheduling/bookableresourcecategory/BookableResourceCategoryMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="BookableResourceCategoryResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`BOOKABLERESCATEGORYID`, t1.`BOOKABLERESCATEGORYNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESCATEGORY` t1  ) t1 where bookablerescategoryid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`BOOKABLERESCATEGORYID`, t1.`BOOKABLERESCATEGORYNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESCATEGORY` t1  ) t1 where bookablerescategoryid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -38,12 +38,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BOOKABLERESCATEGORYID`, t1.`BOOKABLERESCATEGORYNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESCATEGORY` t1  
+		<![CDATA[ SELECT t1.`BOOKABLERESCATEGORYID`, t1.`BOOKABLERESCATEGORYNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESCATEGORY` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BOOKABLERESCATEGORYID`, t1.`BOOKABLERESCATEGORYNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESCATEGORY` t1  
+		<![CDATA[ SELECT t1.`BOOKABLERESCATEGORYID`, t1.`BOOKABLERESCATEGORYNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESCATEGORY` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/scheduling/bookableresourcecategoryassn/BookableResourceCategoryAssnMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="BookableResourceCategoryAssnResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`BOOKABLERESCATEGORYASSNID`, t1.`BOOKABLERESCATEGORYASSNNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`RESOURCE`, t1.`RESOURCECATEGORY`, t1.`RESOURCECATEGORYNAME`, t1.`RESOURCENAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESCATEGORYASSN` t1  ) t1 where bookablerescategoryassnid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`BOOKABLERESCATEGORYASSNID`, t1.`BOOKABLERESCATEGORYASSNNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`RESOURCE`, t1.`RESOURCECATEGORY`, t1.`RESOURCECATEGORYNAME`, t1.`RESOURCENAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESCATEGORYASSN` t1  ) t1 where bookablerescategoryassnid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -58,12 +58,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BOOKABLERESCATEGORYASSNID`, t1.`BOOKABLERESCATEGORYASSNNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`RESOURCE`, t1.`RESOURCECATEGORY`, t1.`RESOURCECATEGORYNAME`, t1.`RESOURCENAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESCATEGORYASSN` t1  
+		<![CDATA[ SELECT t1.`BOOKABLERESCATEGORYASSNID`, t1.`BOOKABLERESCATEGORYASSNNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`RESOURCE`, t1.`RESOURCECATEGORY`, t1.`RESOURCECATEGORYNAME`, t1.`RESOURCENAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESCATEGORYASSN` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BOOKABLERESCATEGORYASSNID`, t1.`BOOKABLERESCATEGORYASSNNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`RESOURCE`, t1.`RESOURCECATEGORY`, t1.`RESOURCECATEGORYNAME`, t1.`RESOURCENAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESCATEGORYASSN` t1  
+		<![CDATA[ SELECT t1.`BOOKABLERESCATEGORYASSNID`, t1.`BOOKABLERESCATEGORYASSNNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`RESOURCE`, t1.`RESOURCECATEGORY`, t1.`RESOURCECATEGORYNAME`, t1.`RESOURCENAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESCATEGORYASSN` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/scheduling/bookableresourcecharacteristic/BookableResourceCharacteristicMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="BookableResourceCharacteristicResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`BOOKABLERESCHARACTERISTICID`, t1.`BOOKABLERESCHARACTERISTICNAME`, t1.`CHARACTERISTIC`, t1.`CHARACTERISTICNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PROCESSID`, t1.`RATINGVALUE`, t1.`RATINGVALUENAME`, t1.`RESOURCE`, t1.`RESOURCENAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESCHARACTERISTIC` t1  ) t1 where bookablerescharacteristicid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`BOOKABLERESCHARACTERISTICID`, t1.`BOOKABLERESCHARACTERISTICNAME`, t1.`CHARACTERISTIC`, t1.`CHARACTERISTICNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`RATINGVALUE`, t1.`RATINGVALUENAME`, t1.`RESOURCE`, t1.`RESOURCENAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESCHARACTERISTIC` t1  ) t1 where bookablerescharacteristicid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -68,12 +68,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BOOKABLERESCHARACTERISTICID`, t1.`BOOKABLERESCHARACTERISTICNAME`, t1.`CHARACTERISTIC`, t1.`CHARACTERISTICNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PROCESSID`, t1.`RATINGVALUE`, t1.`RATINGVALUENAME`, t1.`RESOURCE`, t1.`RESOURCENAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESCHARACTERISTIC` t1  
+		<![CDATA[ SELECT t1.`BOOKABLERESCHARACTERISTICID`, t1.`BOOKABLERESCHARACTERISTICNAME`, t1.`CHARACTERISTIC`, t1.`CHARACTERISTICNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`RATINGVALUE`, t1.`RATINGVALUENAME`, t1.`RESOURCE`, t1.`RESOURCENAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESCHARACTERISTIC` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BOOKABLERESCHARACTERISTICID`, t1.`BOOKABLERESCHARACTERISTICNAME`, t1.`CHARACTERISTIC`, t1.`CHARACTERISTICNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PROCESSID`, t1.`RATINGVALUE`, t1.`RATINGVALUENAME`, t1.`RESOURCE`, t1.`RESOURCENAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESCHARACTERISTIC` t1  
+		<![CDATA[ SELECT t1.`BOOKABLERESCHARACTERISTICID`, t1.`BOOKABLERESCHARACTERISTICNAME`, t1.`CHARACTERISTIC`, t1.`CHARACTERISTICNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`RATINGVALUE`, t1.`RATINGVALUENAME`, t1.`RESOURCE`, t1.`RESOURCENAME`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESCHARACTERISTIC` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/scheduling/bookableresourcegroup/BookableResourceGroupMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="BookableResourceGroupResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`BOOKABLERESGROUPID`, t1.`BOOKABLERESGROUPNAME`, t1.`CHILDRESOURCE`, t1.`CHILDRESOURCENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`FROMDATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARENTRESOURCE`, t1.`PARENTRESOURCENAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TODATE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESGROUP` t1  ) t1 where bookableresgroupid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`BOOKABLERESGROUPID`, t1.`BOOKABLERESGROUPNAME`, t1.`CHILDRESOURCE`, t1.`CHILDRESOURCENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`FROMDATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTRESOURCE`, t1.`PARENTRESOURCENAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TODATE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESGROUP` t1  ) t1 where bookableresgroupid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -58,12 +58,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BOOKABLERESGROUPID`, t1.`BOOKABLERESGROUPNAME`, t1.`CHILDRESOURCE`, t1.`CHILDRESOURCENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`FROMDATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARENTRESOURCE`, t1.`PARENTRESOURCENAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TODATE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESGROUP` t1  
+		<![CDATA[ SELECT t1.`BOOKABLERESGROUPID`, t1.`BOOKABLERESGROUPNAME`, t1.`CHILDRESOURCE`, t1.`CHILDRESOURCENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`FROMDATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTRESOURCE`, t1.`PARENTRESOURCENAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TODATE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESGROUP` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BOOKABLERESGROUPID`, t1.`BOOKABLERESGROUPNAME`, t1.`CHILDRESOURCE`, t1.`CHILDRESOURCENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`FROMDATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARENTRESOURCE`, t1.`PARENTRESOURCENAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TODATE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESGROUP` t1  
+		<![CDATA[ SELECT t1.`BOOKABLERESGROUPID`, t1.`BOOKABLERESGROUPNAME`, t1.`CHILDRESOURCE`, t1.`CHILDRESOURCENAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`FROMDATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTRESOURCE`, t1.`PARENTRESOURCENAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TODATE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKABLERESGROUP` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/scheduling/bookingstatus/BookingStatusMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="BookingStatusResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`BOOKINGSTATUSID`, t1.`BOOKINGSTATUSNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`STATECODE`, t1.`STATUS`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKINGSTATUS` t1  ) t1 where bookingstatusid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`BOOKINGSTATUSID`, t1.`BOOKINGSTATUSNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`STATECODE`, t1.`STATUS`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKINGSTATUS` t1  ) t1 where bookingstatusid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -37,12 +37,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BOOKINGSTATUSID`, t1.`BOOKINGSTATUSNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`STATECODE`, t1.`STATUS`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKINGSTATUS` t1  
+		<![CDATA[ SELECT t1.`BOOKINGSTATUSID`, t1.`BOOKINGSTATUSNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`STATECODE`, t1.`STATUS`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKINGSTATUS` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`BOOKINGSTATUSID`, t1.`BOOKINGSTATUSNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`STATECODE`, t1.`STATUS`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKINGSTATUS` t1  
+		<![CDATA[ SELECT t1.`BOOKINGSTATUSID`, t1.`BOOKINGSTATUSNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`STATECODE`, t1.`STATUS`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `BOOKINGSTATUS` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/scheduling/characteristic/CharacteristicMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="CharacteristicResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CHARACTERISTICID`, t1.`CHARACTERISTICNAME`, t1.`CHARACTERISTICTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CHARACTERISTIC` t1  ) t1 where characteristicid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CHARACTERISTICID`, t1.`CHARACTERISTICNAME`, t1.`CHARACTERISTICTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CHARACTERISTIC` t1  ) t1 where characteristicid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -37,12 +37,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CHARACTERISTICID`, t1.`CHARACTERISTICNAME`, t1.`CHARACTERISTICTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CHARACTERISTIC` t1  
+		<![CDATA[ SELECT t1.`CHARACTERISTICID`, t1.`CHARACTERISTICNAME`, t1.`CHARACTERISTICTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CHARACTERISTIC` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CHARACTERISTICID`, t1.`CHARACTERISTICNAME`, t1.`CHARACTERISTICTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CHARACTERISTIC` t1  
+		<![CDATA[ SELECT t1.`CHARACTERISTICID`, t1.`CHARACTERISTICNAME`, t1.`CHARACTERISTICTYPE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DESCRIPTION`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CHARACTERISTIC` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/scheduling/ratingmodel/RatingModelMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="RatingModelResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MAXRATINGVALUE`, t1.`MINRATINGVALUE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`RATINGMODELID`, t1.`RATINGMODELNAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `RATINGMODEL` t1  ) t1 where ratingmodelid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MAXRATINGVALUE`, t1.`MINRATINGVALUE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`RATINGMODELID`, t1.`RATINGMODELNAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `RATINGMODEL` t1  ) t1 where ratingmodelid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -37,12 +37,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MAXRATINGVALUE`, t1.`MINRATINGVALUE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`RATINGMODELID`, t1.`RATINGMODELNAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `RATINGMODEL` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MAXRATINGVALUE`, t1.`MINRATINGVALUE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`RATINGMODELID`, t1.`RATINGMODELNAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `RATINGMODEL` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MAXRATINGVALUE`, t1.`MINRATINGVALUE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`RATINGMODELID`, t1.`RATINGMODELNAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `RATINGMODEL` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`MAXRATINGVALUE`, t1.`MINRATINGVALUE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`RATINGMODELID`, t1.`RATINGMODELNAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `RATINGMODEL` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/scheduling/ratingvalue/RatingValueMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="RatingValueResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`RATINGMODEL`, t1.`RATINGMODELNAME`, t1.`RATINGVALUEID`, t1.`RATINGVALUENAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALUE`, t1.`VERSIONNUMBER` FROM `RATINGVALUE` t1  ) t1 where ratingvalueid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`RATINGMODEL`, t1.`RATINGMODELNAME`, t1.`RATINGVALUEID`, t1.`RATINGVALUENAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALUE`, t1.`VERSIONNUMBER` FROM `RATINGVALUE` t1  ) t1 where ratingvalueid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -47,12 +47,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`RATINGMODEL`, t1.`RATINGMODELNAME`, t1.`RATINGVALUEID`, t1.`RATINGVALUENAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALUE`, t1.`VERSIONNUMBER` FROM `RATINGVALUE` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`RATINGMODEL`, t1.`RATINGMODELNAME`, t1.`RATINGVALUEID`, t1.`RATINGVALUENAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALUE`, t1.`VERSIONNUMBER` FROM `RATINGVALUE` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`RATINGMODEL`, t1.`RATINGMODELNAME`, t1.`RATINGVALUEID`, t1.`RATINGVALUENAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALUE`, t1.`VERSIONNUMBER` FROM `RATINGVALUE` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`RATINGMODEL`, t1.`RATINGMODELNAME`, t1.`RATINGVALUEID`, t1.`RATINGVALUENAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VALUE`, t1.`VERSIONNUMBER` FROM `RATINGVALUE` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/service/contract/ContractMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="ContractResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACCOUNTNAME`, t1.`ACTIVEON`, t1.`ALLOTMENTTYPECODE`, t1.`BILLINGACCOUNTNAME`, t1.`BILLINGCONTACTNAME`, t1.`BILLINGCUSTOMERID`, t1.`BILLINGCUSTOMERIDTYPE`, t1.`BILLINGCUSTOMERNAME`, t1.`BILLINGENDON`, t1.`BILLINGFREQUENCYCODE`, t1.`BILLINGSTARTON`, t1.`BILLTOADDRESS`, t1.`BILLTOADDRESSNAME`, t1.`CANCELON`, t1.`CONTACTNAME`, t1.`CONTRACTID`, t1.`CONTRACTLANGUAGE`, t1.`CONTRACTNUMBER`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CONTRACTTEMPLATEABBREVIATION`, t1.`CONTRACTTEMPLATEID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERIDTYPE`, t1.`CUSTOMERNAME`, t1.`DURATION`, t1.`EFFECTIVITYCALENDAR`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`IMPORTSEQUENCENUMBER`, t1.`NETPRICE`, t1.`NETPRICE_BASE`, t1.`ORIGINATINGCONTRACT`, t1.`ORIGINATINGCONTRACTNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`SERVICEADDRESS`, t1.`SERVICEADDRESSNAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TOTALDISCOUNT`, t1.`TOTALDISCOUNT_BASE`, t1.`TOTALPRICE`, t1.`TOTALPRICE_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USEDISCOUNTASPERCENTAGE`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CONTRACT` t1  ) t1 where contractid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACCOUNTNAME`, t1.`ACTIVEON`, t1.`ALLOTMENTTYPECODE`, t1.`BILLINGACCOUNTNAME`, t1.`BILLINGCONTACTNAME`, t1.`BILLINGCUSTOMERID`, t1.`BILLINGCUSTOMERNAME`, t1.`BILLINGCUSTOMERTYPE`, t1.`BILLINGENDON`, t1.`BILLINGFREQUENCYCODE`, t1.`BILLINGSTARTON`, t1.`BILLTOADDRESS`, t1.`BILLTOADDRESSNAME`, t1.`CANCELON`, t1.`CONTACTNAME`, t1.`CONTRACTID`, t1.`CONTRACTLANGUAGE`, t1.`CONTRACTNUMBER`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CONTRACTTEMPLATEABBREVIATION`, t1.`CONTRACTTEMPLATEID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DURATION`, t1.`EFFECTIVITYCALENDAR`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`IMPORTSEQUENCENUMBER`, t1.`NETPRICE`, t1.`NETPRICE_BASE`, t1.`ORIGINATINGCONTRACT`, t1.`ORIGINATINGCONTRACTNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`SERVICEADDRESS`, t1.`SERVICEADDRESSNAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TOTALDISCOUNT`, t1.`TOTALDISCOUNT_BASE`, t1.`TOTALPRICE`, t1.`TOTALPRICE_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USEDISCOUNTASPERCENTAGE`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CONTRACT` t1  ) t1 where contractid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -82,12 +82,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTIVEON`, t1.`ALLOTMENTTYPECODE`, t1.`BILLINGACCOUNTNAME`, t1.`BILLINGCONTACTNAME`, t1.`BILLINGCUSTOMERID`, t1.`BILLINGCUSTOMERIDTYPE`, t1.`BILLINGCUSTOMERNAME`, t1.`BILLINGENDON`, t1.`BILLINGFREQUENCYCODE`, t1.`BILLINGSTARTON`, t1.`BILLTOADDRESS`, t1.`BILLTOADDRESSNAME`, t1.`CANCELON`, t1.`CONTACTNAME`, t1.`CONTRACTID`, t1.`CONTRACTLANGUAGE`, t1.`CONTRACTNUMBER`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CONTRACTTEMPLATEABBREVIATION`, t1.`CONTRACTTEMPLATEID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERIDTYPE`, t1.`CUSTOMERNAME`, t1.`DURATION`, t1.`EFFECTIVITYCALENDAR`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`IMPORTSEQUENCENUMBER`, t1.`NETPRICE`, t1.`NETPRICE_BASE`, t1.`ORIGINATINGCONTRACT`, t1.`ORIGINATINGCONTRACTNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`SERVICEADDRESS`, t1.`SERVICEADDRESSNAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TOTALDISCOUNT`, t1.`TOTALDISCOUNT_BASE`, t1.`TOTALPRICE`, t1.`TOTALPRICE_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USEDISCOUNTASPERCENTAGE`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CONTRACT` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTIVEON`, t1.`ALLOTMENTTYPECODE`, t1.`BILLINGACCOUNTNAME`, t1.`BILLINGCONTACTNAME`, t1.`BILLINGCUSTOMERID`, t1.`BILLINGCUSTOMERNAME`, t1.`BILLINGCUSTOMERTYPE`, t1.`BILLINGENDON`, t1.`BILLINGFREQUENCYCODE`, t1.`BILLINGSTARTON`, t1.`BILLTOADDRESS`, t1.`BILLTOADDRESSNAME`, t1.`CANCELON`, t1.`CONTACTNAME`, t1.`CONTRACTID`, t1.`CONTRACTLANGUAGE`, t1.`CONTRACTNUMBER`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CONTRACTTEMPLATEABBREVIATION`, t1.`CONTRACTTEMPLATEID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DURATION`, t1.`EFFECTIVITYCALENDAR`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`IMPORTSEQUENCENUMBER`, t1.`NETPRICE`, t1.`NETPRICE_BASE`, t1.`ORIGINATINGCONTRACT`, t1.`ORIGINATINGCONTRACTNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`SERVICEADDRESS`, t1.`SERVICEADDRESSNAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TOTALDISCOUNT`, t1.`TOTALDISCOUNT_BASE`, t1.`TOTALPRICE`, t1.`TOTALPRICE_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USEDISCOUNTASPERCENTAGE`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CONTRACT` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTIVEON`, t1.`ALLOTMENTTYPECODE`, t1.`BILLINGACCOUNTNAME`, t1.`BILLINGCONTACTNAME`, t1.`BILLINGCUSTOMERID`, t1.`BILLINGCUSTOMERIDTYPE`, t1.`BILLINGCUSTOMERNAME`, t1.`BILLINGENDON`, t1.`BILLINGFREQUENCYCODE`, t1.`BILLINGSTARTON`, t1.`BILLTOADDRESS`, t1.`BILLTOADDRESSNAME`, t1.`CANCELON`, t1.`CONTACTNAME`, t1.`CONTRACTID`, t1.`CONTRACTLANGUAGE`, t1.`CONTRACTNUMBER`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CONTRACTTEMPLATEABBREVIATION`, t1.`CONTRACTTEMPLATEID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERIDTYPE`, t1.`CUSTOMERNAME`, t1.`DURATION`, t1.`EFFECTIVITYCALENDAR`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`IMPORTSEQUENCENUMBER`, t1.`NETPRICE`, t1.`NETPRICE_BASE`, t1.`ORIGINATINGCONTRACT`, t1.`ORIGINATINGCONTRACTNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`SERVICEADDRESS`, t1.`SERVICEADDRESSNAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TOTALDISCOUNT`, t1.`TOTALDISCOUNT_BASE`, t1.`TOTALPRICE`, t1.`TOTALPRICE_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USEDISCOUNTASPERCENTAGE`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CONTRACT` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTIVEON`, t1.`ALLOTMENTTYPECODE`, t1.`BILLINGACCOUNTNAME`, t1.`BILLINGCONTACTNAME`, t1.`BILLINGCUSTOMERID`, t1.`BILLINGCUSTOMERNAME`, t1.`BILLINGCUSTOMERTYPE`, t1.`BILLINGENDON`, t1.`BILLINGFREQUENCYCODE`, t1.`BILLINGSTARTON`, t1.`BILLTOADDRESS`, t1.`BILLTOADDRESSNAME`, t1.`CANCELON`, t1.`CONTACTNAME`, t1.`CONTRACTID`, t1.`CONTRACTLANGUAGE`, t1.`CONTRACTNUMBER`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CONTRACTTEMPLATEABBREVIATION`, t1.`CONTRACTTEMPLATEID`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DURATION`, t1.`EFFECTIVITYCALENDAR`, t1.`EMAILADDRESS`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`IMPORTSEQUENCENUMBER`, t1.`NETPRICE`, t1.`NETPRICE_BASE`, t1.`ORIGINATINGCONTRACT`, t1.`ORIGINATINGCONTRACTNAME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`SERVICEADDRESS`, t1.`SERVICEADDRESSNAME`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TOTALDISCOUNT`, t1.`TOTALDISCOUNT_BASE`, t1.`TOTALPRICE`, t1.`TOTALPRICE_BASE`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`USEDISCOUNTASPERCENTAGE`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CONTRACT` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/service/contractdetail/ContractDetailMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="ContractDetailResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACTIVEON`, t1.`ALLOTMENTSOVERAGE`, t1.`ALLOTMENTSREMAINING`, t1.`ALLOTMENTSUSED`, t1.`CONTRACTDETAILID`, t1.`CONTRACTID`, t1.`CONTRACTSTATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERIDTYPE`, t1.`CUSTOMERNAME`, t1.`DISCOUNT`, t1.`DISCOUNTPERCENTAGE`, t1.`DISCOUNT_BASE`, t1.`EFFECTIVITYCALENDAR`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`IMPORTSEQUENCENUMBER`, t1.`INITIALQUANTITY`, t1.`LINEITEMORDER`, t1.`NET`, t1.`NET_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRICE`, t1.`PRICE_BASE`, t1.`PRODUCTID`, t1.`PRODUCTSERIALNUMBER`, t1.`RATE`, t1.`RATE_BASE`, t1.`SERVICEADDRESS`, t1.`SERVICEADDRESSNAME`, t1.`SERVICECONTRACTUNITSCODE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TOTALALLOTMENTS`, t1.`UOMID`, t1.`UOMSCHEDULEID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CONTRACTDETAIL` t1  ) t1 where contractdetailid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVEON`, t1.`ALLOTMENTSOVERAGE`, t1.`ALLOTMENTSREMAINING`, t1.`ALLOTMENTSUSED`, t1.`CONTRACTDETAILID`, t1.`CONTRACTID`, t1.`CONTRACTSTATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DISCOUNT`, t1.`DISCOUNTPERCENTAGE`, t1.`DISCOUNT_BASE`, t1.`EFFECTIVITYCALENDAR`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`IMPORTSEQUENCENUMBER`, t1.`INITIALQUANTITY`, t1.`LINEITEMORDER`, t1.`NET`, t1.`NET_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRICE`, t1.`PRICE_BASE`, t1.`PRODUCTID`, t1.`PRODUCTSERIALNUMBER`, t1.`RATE`, t1.`RATE_BASE`, t1.`SERVICEADDRESS`, t1.`SERVICEADDRESSNAME`, t1.`SERVICECONTRACTUNITSCODE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TOTALALLOTMENTS`, t1.`UOMID`, t1.`UOMSCHEDULEID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CONTRACTDETAIL` t1  ) t1 where contractdetailid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -81,12 +81,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVEON`, t1.`ALLOTMENTSOVERAGE`, t1.`ALLOTMENTSREMAINING`, t1.`ALLOTMENTSUSED`, t1.`CONTRACTDETAILID`, t1.`CONTRACTID`, t1.`CONTRACTSTATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERIDTYPE`, t1.`CUSTOMERNAME`, t1.`DISCOUNT`, t1.`DISCOUNTPERCENTAGE`, t1.`DISCOUNT_BASE`, t1.`EFFECTIVITYCALENDAR`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`IMPORTSEQUENCENUMBER`, t1.`INITIALQUANTITY`, t1.`LINEITEMORDER`, t1.`NET`, t1.`NET_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRICE`, t1.`PRICE_BASE`, t1.`PRODUCTID`, t1.`PRODUCTSERIALNUMBER`, t1.`RATE`, t1.`RATE_BASE`, t1.`SERVICEADDRESS`, t1.`SERVICEADDRESSNAME`, t1.`SERVICECONTRACTUNITSCODE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TOTALALLOTMENTS`, t1.`UOMID`, t1.`UOMSCHEDULEID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CONTRACTDETAIL` t1  
+		<![CDATA[ SELECT t1.`ACTIVEON`, t1.`ALLOTMENTSOVERAGE`, t1.`ALLOTMENTSREMAINING`, t1.`ALLOTMENTSUSED`, t1.`CONTRACTDETAILID`, t1.`CONTRACTID`, t1.`CONTRACTSTATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DISCOUNT`, t1.`DISCOUNTPERCENTAGE`, t1.`DISCOUNT_BASE`, t1.`EFFECTIVITYCALENDAR`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`IMPORTSEQUENCENUMBER`, t1.`INITIALQUANTITY`, t1.`LINEITEMORDER`, t1.`NET`, t1.`NET_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRICE`, t1.`PRICE_BASE`, t1.`PRODUCTID`, t1.`PRODUCTSERIALNUMBER`, t1.`RATE`, t1.`RATE_BASE`, t1.`SERVICEADDRESS`, t1.`SERVICEADDRESSNAME`, t1.`SERVICECONTRACTUNITSCODE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TOTALALLOTMENTS`, t1.`UOMID`, t1.`UOMSCHEDULEID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CONTRACTDETAIL` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVEON`, t1.`ALLOTMENTSOVERAGE`, t1.`ALLOTMENTSREMAINING`, t1.`ALLOTMENTSUSED`, t1.`CONTRACTDETAILID`, t1.`CONTRACTID`, t1.`CONTRACTSTATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERIDTYPE`, t1.`CUSTOMERNAME`, t1.`DISCOUNT`, t1.`DISCOUNTPERCENTAGE`, t1.`DISCOUNT_BASE`, t1.`EFFECTIVITYCALENDAR`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`IMPORTSEQUENCENUMBER`, t1.`INITIALQUANTITY`, t1.`LINEITEMORDER`, t1.`NET`, t1.`NET_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRICE`, t1.`PRICE_BASE`, t1.`PRODUCTID`, t1.`PRODUCTSERIALNUMBER`, t1.`RATE`, t1.`RATE_BASE`, t1.`SERVICEADDRESS`, t1.`SERVICEADDRESSNAME`, t1.`SERVICECONTRACTUNITSCODE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TOTALALLOTMENTS`, t1.`UOMID`, t1.`UOMSCHEDULEID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CONTRACTDETAIL` t1  
+		<![CDATA[ SELECT t1.`ACTIVEON`, t1.`ALLOTMENTSOVERAGE`, t1.`ALLOTMENTSREMAINING`, t1.`ALLOTMENTSUSED`, t1.`CONTRACTDETAILID`, t1.`CONTRACTID`, t1.`CONTRACTSTATECODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DISCOUNT`, t1.`DISCOUNTPERCENTAGE`, t1.`DISCOUNT_BASE`, t1.`EFFECTIVITYCALENDAR`, t1.`EXCHANGERATE`, t1.`EXPIRESON`, t1.`IMPORTSEQUENCENUMBER`, t1.`INITIALQUANTITY`, t1.`LINEITEMORDER`, t1.`NET`, t1.`NET_BASE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRICE`, t1.`PRICE_BASE`, t1.`PRODUCTID`, t1.`PRODUCTSERIALNUMBER`, t1.`RATE`, t1.`RATE_BASE`, t1.`SERVICEADDRESS`, t1.`SERVICEADDRESSNAME`, t1.`SERVICECONTRACTUNITSCODE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TOTALALLOTMENTS`, t1.`UOMID`, t1.`UOMSCHEDULEID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `CONTRACTDETAIL` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/service/entitlement/EntitlementMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="EntitlementResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACCOUNTNAME`, t1.`ALLOCATIONTYPECODE`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERIDTYPE`, t1.`CUSTOMERNAME`, t1.`DECREASEREMAININGON`, t1.`DEFAULT`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENDDATE`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITLEMENTTEMPLATEID`, t1.`ENTITYTYPE`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`KBACCESSLEVEL`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PROCESSID`, t1.`REMAININGTERMS`, t1.`RESTRICTCASECREATION`, t1.`SLAID`, t1.`STAGEID`, t1.`STARTDATE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALTERMS`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `ENTITLEMENT` t1  ) t1 where entitlementid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACCOUNTNAME`, t1.`ALLOCATIONTYPECODE`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DECREASEREMAININGON`, t1.`DEFAULT`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENDDATE`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITLEMENTTEMPLATEID`, t1.`ENTITYTYPE`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`KBACCESSLEVEL`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`REMAININGTERMS`, t1.`RESTRICTCASECREATION`, t1.`SLAID`, t1.`STAGEID`, t1.`STARTDATE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALTERMS`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `ENTITLEMENT` t1  ) t1 where entitlementid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -58,12 +58,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ALLOCATIONTYPECODE`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERIDTYPE`, t1.`CUSTOMERNAME`, t1.`DECREASEREMAININGON`, t1.`DEFAULT`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENDDATE`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITLEMENTTEMPLATEID`, t1.`ENTITYTYPE`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`KBACCESSLEVEL`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PROCESSID`, t1.`REMAININGTERMS`, t1.`RESTRICTCASECREATION`, t1.`SLAID`, t1.`STAGEID`, t1.`STARTDATE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALTERMS`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `ENTITLEMENT` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ALLOCATIONTYPECODE`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DECREASEREMAININGON`, t1.`DEFAULT`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENDDATE`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITLEMENTTEMPLATEID`, t1.`ENTITYTYPE`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`KBACCESSLEVEL`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`REMAININGTERMS`, t1.`RESTRICTCASECREATION`, t1.`SLAID`, t1.`STAGEID`, t1.`STARTDATE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALTERMS`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `ENTITLEMENT` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ALLOCATIONTYPECODE`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERIDTYPE`, t1.`CUSTOMERNAME`, t1.`DECREASEREMAININGON`, t1.`DEFAULT`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENDDATE`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITLEMENTTEMPLATEID`, t1.`ENTITYTYPE`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`KBACCESSLEVEL`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PROCESSID`, t1.`REMAININGTERMS`, t1.`RESTRICTCASECREATION`, t1.`SLAID`, t1.`STAGEID`, t1.`STARTDATE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALTERMS`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `ENTITLEMENT` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ALLOCATIONTYPECODE`, t1.`CONTACTNAME`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE`, t1.`DECREASEREMAININGON`, t1.`DEFAULT`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENDDATE`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITLEMENTTEMPLATEID`, t1.`ENTITYTYPE`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`KBACCESSLEVEL`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PROCESSID`, t1.`REMAININGTERMS`, t1.`RESTRICTCASECREATION`, t1.`SLAID`, t1.`STAGEID`, t1.`STARTDATE`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALTERMS`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `ENTITLEMENT` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/service/entitlementchannel/EntitlementChannelMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="EntitlementChannelResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CHANNEL`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITLEMENTCHANNELID`, t1.`ENTITLEMENTCHANNELNAME`, t1.`ENTITLEMENTID`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`REMAININGTERMS`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALTERMS`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `ENTITLEMENTCHANNEL` t1  ) t1 where entitlementchannelid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CHANNEL`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITLEMENTCHANNELID`, t1.`ENTITLEMENTCHANNELNAME`, t1.`ENTITLEMENTID`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`REMAININGTERMS`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALTERMS`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `ENTITLEMENTCHANNEL` t1  ) t1 where entitlementchannelid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -47,12 +47,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CHANNEL`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITLEMENTCHANNELID`, t1.`ENTITLEMENTCHANNELNAME`, t1.`ENTITLEMENTID`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`REMAININGTERMS`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALTERMS`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `ENTITLEMENTCHANNEL` t1  
+		<![CDATA[ SELECT t1.`CHANNEL`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITLEMENTCHANNELID`, t1.`ENTITLEMENTCHANNELNAME`, t1.`ENTITLEMENTID`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`REMAININGTERMS`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALTERMS`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `ENTITLEMENTCHANNEL` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CHANNEL`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITLEMENTCHANNELID`, t1.`ENTITLEMENTCHANNELNAME`, t1.`ENTITLEMENTID`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`REMAININGTERMS`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALTERMS`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `ENTITLEMENTCHANNEL` t1  
+		<![CDATA[ SELECT t1.`CHANNEL`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`ENTITLEMENTCHANNELID`, t1.`ENTITLEMENTCHANNELNAME`, t1.`ENTITLEMENTID`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`REMAININGTERMS`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TOTALTERMS`, t1.`TRANSACTIONCURRENCYID`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `ENTITLEMENTCHANNEL` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/service/incident/IncidentMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="IncidentResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACCOUNTNAME`, t1.`ACTIVITIESCOMPLETE`, t1.`ACTUALSERVICEUNITS`, t1.`BILLEDSERVICEUNITS`, t1.`BLOCKEDPROFILE`, t1.`CASEORIGINCODE`, t1.`CASETYPECODE`, t1.`CHECKEMAIL`, t1.`CONTACTNAME`, t1.`CONTRACTDETAILID`, t1.`CONTRACTDETAILNAME`, t1.`CONTRACTID`, t1.`CONTRACTNAME`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERCONTACTED`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERSATISFACTIONCODE`, t1.`CUSTOMERTYPE`, t1.`DECREMENTENTITLEMENTTERM`, t1.`DECREMENTING`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESCALATED`, t1.`ESCALATEDON`, t1.`EXCHANGERATE`, t1.`EXISTINGCASE`, t1.`EXISTINGCASENAME`, t1.`FIRSTRESPONSEBYKPIID`, t1.`FIRSTRESPONSEBYKPINAME`, t1.`FIRSTRESPONSESENT`, t1.`FIRSTRESPONSESLASTATUS`, t1.`FOLLOWUPBY`, t1.`FOLLOWUPTASKCREATED`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTSTAGECODE`, t1.`INFLUENCESCORE`, t1.`KBARTICLEID`, t1.`LASTONHOLDTIME`, t1.`MASTERID`, t1.`MASTERNAME`, t1.`MERGED`, t1.`MESSAGETYPECODE`, t1.`NUMBEROFCHILDINCIDENTS`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTCASEID`, t1.`PARENTCASENAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTSERIALNUMBER`, t1.`RESOLVEBY`, t1.`RESOLVEBYKPIID`, t1.`RESOLVEBYKPINAME`, t1.`RESOLVEBYSLASTATUS`, t1.`RESPONSEBY`, t1.`RESPONSIBLECONTACTID`, t1.`RESPONSIBLECONTACTNAME`, t1.`ROUTECASE`, t1.`SENTIMENTVALUE`, t1.`SERVICESTAGE`, t1.`SEVERITYCODE`, t1.`SLAID`, t1.`SLANAME`, t1.`SOCIALPROFILEID`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TICKETNUMBER`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `INCIDENT` t1  ) t1 where incidentid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACCOUNTNAME`, t1.`ACTIVITIESCOMPLETE`, t1.`ACTUALSERVICEUNITS`, t1.`BILLEDSERVICEUNITS`, t1.`BLOCKEDPROFILE`, t1.`CASEORIGINCODE`, t1.`CASETYPECODE`, t1.`CHECKEMAIL`, t1.`CONTACTNAME`, t1.`CONTRACTDETAILID`, t1.`CONTRACTDETAILNAME`, t1.`CONTRACTID`, t1.`CONTRACTNAME`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERCONTACTED`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERSATISFACTIONCODE`, t1.`CUSTOMERTYPE`, t1.`DECREMENTENTITLEMENTTERM`, t1.`DECREMENTING`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESCALATED`, t1.`ESCALATEDON`, t1.`EXCHANGERATE`, t1.`EXISTINGCASE`, t1.`EXISTINGCASENAME`, t1.`FIRSTRESPONSEBYKPIID`, t1.`FIRSTRESPONSEBYKPINAME`, t1.`FIRSTRESPONSESENT`, t1.`FIRSTRESPONSESLASTATUS`, t1.`FOLLOWUPBY`, t1.`FOLLOWUPTASKCREATED`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTSTAGECODE`, t1.`INFLUENCESCORE`, t1.`KBARTICLEID`, t1.`LASTONHOLDTIME`, t1.`MASTERID`, t1.`MASTERNAME`, t1.`MERGED`, t1.`MESSAGETYPECODE`, t1.`NUMBEROFCHILDINCIDENTS`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTCASEID`, t1.`PARENTCASENAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTSERIALNUMBER`, t1.`RESOLVEBY`, t1.`RESOLVEBYKPIID`, t1.`RESOLVEBYKPINAME`, t1.`RESOLVEBYSLASTATUS`, t1.`RESPONSEBY`, t1.`RESPONSIBLECONTACTID`, t1.`RESPONSIBLECONTACTNAME`, t1.`ROUTECASE`, t1.`SENTIMENTVALUE`, t1.`SERVICESTAGE`, t1.`SEVERITYCODE`, t1.`SLAID`, t1.`SLANAME`, t1.`SOCIALPROFILEID`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TICKETNUMBER`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `INCIDENT` t1  ) t1 where incidentid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -215,36 +215,36 @@
 
     <!--数据查询[ByParentKey]-->
     <sql id="ByParentKey" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTIVITIESCOMPLETE`, t1.`ACTUALSERVICEUNITS`, t1.`BILLEDSERVICEUNITS`, t1.`BLOCKEDPROFILE`, t1.`CASEORIGINCODE`, t1.`CASETYPECODE`, t1.`CHECKEMAIL`, t1.`CONTACTNAME`, t1.`CONTRACTDETAILID`, t1.`CONTRACTDETAILNAME`, t1.`CONTRACTID`, t1.`CONTRACTNAME`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERCONTACTED`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERSATISFACTIONCODE`, t1.`CUSTOMERTYPE`, t1.`DECREMENTENTITLEMENTTERM`, t1.`DECREMENTING`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESCALATED`, t1.`ESCALATEDON`, t1.`EXCHANGERATE`, t1.`EXISTINGCASE`, t1.`EXISTINGCASENAME`, t1.`FIRSTRESPONSEBYKPIID`, t1.`FIRSTRESPONSEBYKPINAME`, t1.`FIRSTRESPONSESENT`, t1.`FIRSTRESPONSESLASTATUS`, t1.`FOLLOWUPBY`, t1.`FOLLOWUPTASKCREATED`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTSTAGECODE`, t1.`INFLUENCESCORE`, t1.`KBARTICLEID`, t1.`LASTONHOLDTIME`, t1.`MASTERID`, t1.`MASTERNAME`, t1.`MERGED`, t1.`MESSAGETYPECODE`, t1.`NUMBEROFCHILDINCIDENTS`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTCASEID`, t1.`PARENTCASENAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTSERIALNUMBER`, t1.`RESOLVEBY`, t1.`RESOLVEBYKPIID`, t1.`RESOLVEBYKPINAME`, t1.`RESOLVEBYSLASTATUS`, t1.`RESPONSEBY`, t1.`RESPONSIBLECONTACTID`, t1.`RESPONSIBLECONTACTNAME`, t1.`ROUTECASE`, t1.`SENTIMENTVALUE`, t1.`SERVICESTAGE`, t1.`SEVERITYCODE`, t1.`SLAID`, t1.`SLANAME`, t1.`SOCIALPROFILEID`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TICKETNUMBER`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `INCIDENT` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTIVITIESCOMPLETE`, t1.`ACTUALSERVICEUNITS`, t1.`BILLEDSERVICEUNITS`, t1.`BLOCKEDPROFILE`, t1.`CASEORIGINCODE`, t1.`CASETYPECODE`, t1.`CHECKEMAIL`, t1.`CONTACTNAME`, t1.`CONTRACTDETAILID`, t1.`CONTRACTDETAILNAME`, t1.`CONTRACTID`, t1.`CONTRACTNAME`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERCONTACTED`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERSATISFACTIONCODE`, t1.`CUSTOMERTYPE`, t1.`DECREMENTENTITLEMENTTERM`, t1.`DECREMENTING`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESCALATED`, t1.`ESCALATEDON`, t1.`EXCHANGERATE`, t1.`EXISTINGCASE`, t1.`EXISTINGCASENAME`, t1.`FIRSTRESPONSEBYKPIID`, t1.`FIRSTRESPONSEBYKPINAME`, t1.`FIRSTRESPONSESENT`, t1.`FIRSTRESPONSESLASTATUS`, t1.`FOLLOWUPBY`, t1.`FOLLOWUPTASKCREATED`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTSTAGECODE`, t1.`INFLUENCESCORE`, t1.`KBARTICLEID`, t1.`LASTONHOLDTIME`, t1.`MASTERID`, t1.`MASTERNAME`, t1.`MERGED`, t1.`MESSAGETYPECODE`, t1.`NUMBEROFCHILDINCIDENTS`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTCASEID`, t1.`PARENTCASENAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTSERIALNUMBER`, t1.`RESOLVEBY`, t1.`RESOLVEBYKPIID`, t1.`RESOLVEBYKPINAME`, t1.`RESOLVEBYSLASTATUS`, t1.`RESPONSEBY`, t1.`RESPONSIBLECONTACTID`, t1.`RESPONSIBLECONTACTNAME`, t1.`ROUTECASE`, t1.`SENTIMENTVALUE`, t1.`SERVICESTAGE`, t1.`SEVERITYCODE`, t1.`SLAID`, t1.`SLANAME`, t1.`SOCIALPROFILEID`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TICKETNUMBER`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `INCIDENT` t1  
 					 WHERE 	( t1.`LASTONHOLDTIME` = #{srf.datacontext.srfparentkey} )
 			]]>
     </sql>
     <!--数据查询[Cancel]-->
     <sql id="Cancel" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTIVITIESCOMPLETE`, t1.`ACTUALSERVICEUNITS`, t1.`BILLEDSERVICEUNITS`, t1.`BLOCKEDPROFILE`, t1.`CASEORIGINCODE`, t1.`CASETYPECODE`, t1.`CHECKEMAIL`, t1.`CONTACTNAME`, t1.`CONTRACTDETAILID`, t1.`CONTRACTDETAILNAME`, t1.`CONTRACTID`, t1.`CONTRACTNAME`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERCONTACTED`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERSATISFACTIONCODE`, t1.`CUSTOMERTYPE`, t1.`DECREMENTENTITLEMENTTERM`, t1.`DECREMENTING`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESCALATED`, t1.`ESCALATEDON`, t1.`EXCHANGERATE`, t1.`EXISTINGCASE`, t1.`EXISTINGCASENAME`, t1.`FIRSTRESPONSEBYKPIID`, t1.`FIRSTRESPONSEBYKPINAME`, t1.`FIRSTRESPONSESENT`, t1.`FIRSTRESPONSESLASTATUS`, t1.`FOLLOWUPBY`, t1.`FOLLOWUPTASKCREATED`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTSTAGECODE`, t1.`INFLUENCESCORE`, t1.`KBARTICLEID`, t1.`LASTONHOLDTIME`, t1.`MASTERID`, t1.`MASTERNAME`, t1.`MERGED`, t1.`MESSAGETYPECODE`, t1.`NUMBEROFCHILDINCIDENTS`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTCASEID`, t1.`PARENTCASENAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTSERIALNUMBER`, t1.`RESOLVEBY`, t1.`RESOLVEBYKPIID`, t1.`RESOLVEBYKPINAME`, t1.`RESOLVEBYSLASTATUS`, t1.`RESPONSEBY`, t1.`RESPONSIBLECONTACTID`, t1.`RESPONSIBLECONTACTNAME`, t1.`ROUTECASE`, t1.`SENTIMENTVALUE`, t1.`SERVICESTAGE`, t1.`SEVERITYCODE`, t1.`SLAID`, t1.`SLANAME`, t1.`SOCIALPROFILEID`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TICKETNUMBER`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `INCIDENT` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTIVITIESCOMPLETE`, t1.`ACTUALSERVICEUNITS`, t1.`BILLEDSERVICEUNITS`, t1.`BLOCKEDPROFILE`, t1.`CASEORIGINCODE`, t1.`CASETYPECODE`, t1.`CHECKEMAIL`, t1.`CONTACTNAME`, t1.`CONTRACTDETAILID`, t1.`CONTRACTDETAILNAME`, t1.`CONTRACTID`, t1.`CONTRACTNAME`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERCONTACTED`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERSATISFACTIONCODE`, t1.`CUSTOMERTYPE`, t1.`DECREMENTENTITLEMENTTERM`, t1.`DECREMENTING`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESCALATED`, t1.`ESCALATEDON`, t1.`EXCHANGERATE`, t1.`EXISTINGCASE`, t1.`EXISTINGCASENAME`, t1.`FIRSTRESPONSEBYKPIID`, t1.`FIRSTRESPONSEBYKPINAME`, t1.`FIRSTRESPONSESENT`, t1.`FIRSTRESPONSESLASTATUS`, t1.`FOLLOWUPBY`, t1.`FOLLOWUPTASKCREATED`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTSTAGECODE`, t1.`INFLUENCESCORE`, t1.`KBARTICLEID`, t1.`LASTONHOLDTIME`, t1.`MASTERID`, t1.`MASTERNAME`, t1.`MERGED`, t1.`MESSAGETYPECODE`, t1.`NUMBEROFCHILDINCIDENTS`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTCASEID`, t1.`PARENTCASENAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTSERIALNUMBER`, t1.`RESOLVEBY`, t1.`RESOLVEBYKPIID`, t1.`RESOLVEBYKPINAME`, t1.`RESOLVEBYSLASTATUS`, t1.`RESPONSEBY`, t1.`RESPONSIBLECONTACTID`, t1.`RESPONSIBLECONTACTNAME`, t1.`ROUTECASE`, t1.`SENTIMENTVALUE`, t1.`SERVICESTAGE`, t1.`SEVERITYCODE`, t1.`SLAID`, t1.`SLANAME`, t1.`SOCIALPROFILEID`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TICKETNUMBER`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `INCIDENT` t1  
 					 WHERE 	( t1.`STATECODE` = 2 )
 			]]>
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTIVITIESCOMPLETE`, t1.`ACTUALSERVICEUNITS`, t1.`BILLEDSERVICEUNITS`, t1.`BLOCKEDPROFILE`, t1.`CASEORIGINCODE`, t1.`CASETYPECODE`, t1.`CHECKEMAIL`, t1.`CONTACTNAME`, t1.`CONTRACTDETAILID`, t1.`CONTRACTDETAILNAME`, t1.`CONTRACTID`, t1.`CONTRACTNAME`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERCONTACTED`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERSATISFACTIONCODE`, t1.`CUSTOMERTYPE`, t1.`DECREMENTENTITLEMENTTERM`, t1.`DECREMENTING`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESCALATED`, t1.`ESCALATEDON`, t1.`EXCHANGERATE`, t1.`EXISTINGCASE`, t1.`EXISTINGCASENAME`, t1.`FIRSTRESPONSEBYKPIID`, t1.`FIRSTRESPONSEBYKPINAME`, t1.`FIRSTRESPONSESENT`, t1.`FIRSTRESPONSESLASTATUS`, t1.`FOLLOWUPBY`, t1.`FOLLOWUPTASKCREATED`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTSTAGECODE`, t1.`INFLUENCESCORE`, t1.`KBARTICLEID`, t1.`LASTONHOLDTIME`, t1.`MASTERID`, t1.`MASTERNAME`, t1.`MERGED`, t1.`MESSAGETYPECODE`, t1.`NUMBEROFCHILDINCIDENTS`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTCASEID`, t1.`PARENTCASENAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTSERIALNUMBER`, t1.`RESOLVEBY`, t1.`RESOLVEBYKPIID`, t1.`RESOLVEBYKPINAME`, t1.`RESOLVEBYSLASTATUS`, t1.`RESPONSEBY`, t1.`RESPONSIBLECONTACTID`, t1.`RESPONSIBLECONTACTNAME`, t1.`ROUTECASE`, t1.`SENTIMENTVALUE`, t1.`SERVICESTAGE`, t1.`SEVERITYCODE`, t1.`SLAID`, t1.`SLANAME`, t1.`SOCIALPROFILEID`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TICKETNUMBER`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `INCIDENT` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTIVITIESCOMPLETE`, t1.`ACTUALSERVICEUNITS`, t1.`BILLEDSERVICEUNITS`, t1.`BLOCKEDPROFILE`, t1.`CASEORIGINCODE`, t1.`CASETYPECODE`, t1.`CHECKEMAIL`, t1.`CONTACTNAME`, t1.`CONTRACTDETAILID`, t1.`CONTRACTDETAILNAME`, t1.`CONTRACTID`, t1.`CONTRACTNAME`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERCONTACTED`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERSATISFACTIONCODE`, t1.`CUSTOMERTYPE`, t1.`DECREMENTENTITLEMENTTERM`, t1.`DECREMENTING`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESCALATED`, t1.`ESCALATEDON`, t1.`EXCHANGERATE`, t1.`EXISTINGCASE`, t1.`EXISTINGCASENAME`, t1.`FIRSTRESPONSEBYKPIID`, t1.`FIRSTRESPONSEBYKPINAME`, t1.`FIRSTRESPONSESENT`, t1.`FIRSTRESPONSESLASTATUS`, t1.`FOLLOWUPBY`, t1.`FOLLOWUPTASKCREATED`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTSTAGECODE`, t1.`INFLUENCESCORE`, t1.`KBARTICLEID`, t1.`LASTONHOLDTIME`, t1.`MASTERID`, t1.`MASTERNAME`, t1.`MERGED`, t1.`MESSAGETYPECODE`, t1.`NUMBEROFCHILDINCIDENTS`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTCASEID`, t1.`PARENTCASENAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTSERIALNUMBER`, t1.`RESOLVEBY`, t1.`RESOLVEBYKPIID`, t1.`RESOLVEBYKPINAME`, t1.`RESOLVEBYSLASTATUS`, t1.`RESPONSEBY`, t1.`RESPONSIBLECONTACTID`, t1.`RESPONSIBLECONTACTNAME`, t1.`ROUTECASE`, t1.`SENTIMENTVALUE`, t1.`SERVICESTAGE`, t1.`SEVERITYCODE`, t1.`SLAID`, t1.`SLANAME`, t1.`SOCIALPROFILEID`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TICKETNUMBER`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `INCIDENT` t1  
 			]]>
     </sql>
     <!--数据查询[Effective]-->
     <sql id="Effective" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTIVITIESCOMPLETE`, t1.`ACTUALSERVICEUNITS`, t1.`BILLEDSERVICEUNITS`, t1.`BLOCKEDPROFILE`, t1.`CASEORIGINCODE`, t1.`CASETYPECODE`, t1.`CHECKEMAIL`, t1.`CONTACTNAME`, t1.`CONTRACTDETAILID`, t1.`CONTRACTDETAILNAME`, t1.`CONTRACTID`, t1.`CONTRACTNAME`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERCONTACTED`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERSATISFACTIONCODE`, t1.`CUSTOMERTYPE`, t1.`DECREMENTENTITLEMENTTERM`, t1.`DECREMENTING`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESCALATED`, t1.`ESCALATEDON`, t1.`EXCHANGERATE`, t1.`EXISTINGCASE`, t1.`EXISTINGCASENAME`, t1.`FIRSTRESPONSEBYKPIID`, t1.`FIRSTRESPONSEBYKPINAME`, t1.`FIRSTRESPONSESENT`, t1.`FIRSTRESPONSESLASTATUS`, t1.`FOLLOWUPBY`, t1.`FOLLOWUPTASKCREATED`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTSTAGECODE`, t1.`INFLUENCESCORE`, t1.`KBARTICLEID`, t1.`LASTONHOLDTIME`, t1.`MASTERID`, t1.`MASTERNAME`, t1.`MERGED`, t1.`MESSAGETYPECODE`, t1.`NUMBEROFCHILDINCIDENTS`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTCASEID`, t1.`PARENTCASENAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTSERIALNUMBER`, t1.`RESOLVEBY`, t1.`RESOLVEBYKPIID`, t1.`RESOLVEBYKPINAME`, t1.`RESOLVEBYSLASTATUS`, t1.`RESPONSEBY`, t1.`RESPONSIBLECONTACTID`, t1.`RESPONSIBLECONTACTNAME`, t1.`ROUTECASE`, t1.`SENTIMENTVALUE`, t1.`SERVICESTAGE`, t1.`SEVERITYCODE`, t1.`SLAID`, t1.`SLANAME`, t1.`SOCIALPROFILEID`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TICKETNUMBER`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `INCIDENT` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTIVITIESCOMPLETE`, t1.`ACTUALSERVICEUNITS`, t1.`BILLEDSERVICEUNITS`, t1.`BLOCKEDPROFILE`, t1.`CASEORIGINCODE`, t1.`CASETYPECODE`, t1.`CHECKEMAIL`, t1.`CONTACTNAME`, t1.`CONTRACTDETAILID`, t1.`CONTRACTDETAILNAME`, t1.`CONTRACTID`, t1.`CONTRACTNAME`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERCONTACTED`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERSATISFACTIONCODE`, t1.`CUSTOMERTYPE`, t1.`DECREMENTENTITLEMENTTERM`, t1.`DECREMENTING`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESCALATED`, t1.`ESCALATEDON`, t1.`EXCHANGERATE`, t1.`EXISTINGCASE`, t1.`EXISTINGCASENAME`, t1.`FIRSTRESPONSEBYKPIID`, t1.`FIRSTRESPONSEBYKPINAME`, t1.`FIRSTRESPONSESENT`, t1.`FIRSTRESPONSESLASTATUS`, t1.`FOLLOWUPBY`, t1.`FOLLOWUPTASKCREATED`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTSTAGECODE`, t1.`INFLUENCESCORE`, t1.`KBARTICLEID`, t1.`LASTONHOLDTIME`, t1.`MASTERID`, t1.`MASTERNAME`, t1.`MERGED`, t1.`MESSAGETYPECODE`, t1.`NUMBEROFCHILDINCIDENTS`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTCASEID`, t1.`PARENTCASENAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTSERIALNUMBER`, t1.`RESOLVEBY`, t1.`RESOLVEBYKPIID`, t1.`RESOLVEBYKPINAME`, t1.`RESOLVEBYSLASTATUS`, t1.`RESPONSEBY`, t1.`RESPONSIBLECONTACTID`, t1.`RESPONSIBLECONTACTNAME`, t1.`ROUTECASE`, t1.`SENTIMENTVALUE`, t1.`SERVICESTAGE`, t1.`SEVERITYCODE`, t1.`SLAID`, t1.`SLANAME`, t1.`SOCIALPROFILEID`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TICKETNUMBER`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `INCIDENT` t1  
 					 WHERE 	( t1.`STATECODE` = 0 )
 			]]>
     </sql>
     <!--数据查询[Resolved]-->
     <sql id="Resolved" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTIVITIESCOMPLETE`, t1.`ACTUALSERVICEUNITS`, t1.`BILLEDSERVICEUNITS`, t1.`BLOCKEDPROFILE`, t1.`CASEORIGINCODE`, t1.`CASETYPECODE`, t1.`CHECKEMAIL`, t1.`CONTACTNAME`, t1.`CONTRACTDETAILID`, t1.`CONTRACTDETAILNAME`, t1.`CONTRACTID`, t1.`CONTRACTNAME`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERCONTACTED`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERSATISFACTIONCODE`, t1.`CUSTOMERTYPE`, t1.`DECREMENTENTITLEMENTTERM`, t1.`DECREMENTING`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESCALATED`, t1.`ESCALATEDON`, t1.`EXCHANGERATE`, t1.`EXISTINGCASE`, t1.`EXISTINGCASENAME`, t1.`FIRSTRESPONSEBYKPIID`, t1.`FIRSTRESPONSEBYKPINAME`, t1.`FIRSTRESPONSESENT`, t1.`FIRSTRESPONSESLASTATUS`, t1.`FOLLOWUPBY`, t1.`FOLLOWUPTASKCREATED`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTSTAGECODE`, t1.`INFLUENCESCORE`, t1.`KBARTICLEID`, t1.`LASTONHOLDTIME`, t1.`MASTERID`, t1.`MASTERNAME`, t1.`MERGED`, t1.`MESSAGETYPECODE`, t1.`NUMBEROFCHILDINCIDENTS`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTCASEID`, t1.`PARENTCASENAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTSERIALNUMBER`, t1.`RESOLVEBY`, t1.`RESOLVEBYKPIID`, t1.`RESOLVEBYKPINAME`, t1.`RESOLVEBYSLASTATUS`, t1.`RESPONSEBY`, t1.`RESPONSIBLECONTACTID`, t1.`RESPONSIBLECONTACTNAME`, t1.`ROUTECASE`, t1.`SENTIMENTVALUE`, t1.`SERVICESTAGE`, t1.`SEVERITYCODE`, t1.`SLAID`, t1.`SLANAME`, t1.`SOCIALPROFILEID`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TICKETNUMBER`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `INCIDENT` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTIVITIESCOMPLETE`, t1.`ACTUALSERVICEUNITS`, t1.`BILLEDSERVICEUNITS`, t1.`BLOCKEDPROFILE`, t1.`CASEORIGINCODE`, t1.`CASETYPECODE`, t1.`CHECKEMAIL`, t1.`CONTACTNAME`, t1.`CONTRACTDETAILID`, t1.`CONTRACTDETAILNAME`, t1.`CONTRACTID`, t1.`CONTRACTNAME`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERCONTACTED`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERSATISFACTIONCODE`, t1.`CUSTOMERTYPE`, t1.`DECREMENTENTITLEMENTTERM`, t1.`DECREMENTING`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESCALATED`, t1.`ESCALATEDON`, t1.`EXCHANGERATE`, t1.`EXISTINGCASE`, t1.`EXISTINGCASENAME`, t1.`FIRSTRESPONSEBYKPIID`, t1.`FIRSTRESPONSEBYKPINAME`, t1.`FIRSTRESPONSESENT`, t1.`FIRSTRESPONSESLASTATUS`, t1.`FOLLOWUPBY`, t1.`FOLLOWUPTASKCREATED`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTSTAGECODE`, t1.`INFLUENCESCORE`, t1.`KBARTICLEID`, t1.`LASTONHOLDTIME`, t1.`MASTERID`, t1.`MASTERNAME`, t1.`MERGED`, t1.`MESSAGETYPECODE`, t1.`NUMBEROFCHILDINCIDENTS`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTCASEID`, t1.`PARENTCASENAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTSERIALNUMBER`, t1.`RESOLVEBY`, t1.`RESOLVEBYKPIID`, t1.`RESOLVEBYKPINAME`, t1.`RESOLVEBYSLASTATUS`, t1.`RESPONSEBY`, t1.`RESPONSIBLECONTACTID`, t1.`RESPONSIBLECONTACTNAME`, t1.`ROUTECASE`, t1.`SENTIMENTVALUE`, t1.`SERVICESTAGE`, t1.`SEVERITYCODE`, t1.`SLAID`, t1.`SLANAME`, t1.`SOCIALPROFILEID`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TICKETNUMBER`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `INCIDENT` t1  
 					 WHERE 	( t1.`STATECODE` = 1 )
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTIVITIESCOMPLETE`, t1.`ACTUALSERVICEUNITS`, t1.`BILLEDSERVICEUNITS`, t1.`BLOCKEDPROFILE`, t1.`CASEORIGINCODE`, t1.`CASETYPECODE`, t1.`CHECKEMAIL`, t1.`CONTACTNAME`, t1.`CONTRACTDETAILID`, t1.`CONTRACTDETAILNAME`, t1.`CONTRACTID`, t1.`CONTRACTNAME`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERCONTACTED`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERSATISFACTIONCODE`, t1.`CUSTOMERTYPE`, t1.`DECREMENTENTITLEMENTTERM`, t1.`DECREMENTING`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESCALATED`, t1.`ESCALATEDON`, t1.`EXCHANGERATE`, t1.`EXISTINGCASE`, t1.`EXISTINGCASENAME`, t1.`FIRSTRESPONSEBYKPIID`, t1.`FIRSTRESPONSEBYKPINAME`, t1.`FIRSTRESPONSESENT`, t1.`FIRSTRESPONSESLASTATUS`, t1.`FOLLOWUPBY`, t1.`FOLLOWUPTASKCREATED`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTSTAGECODE`, t1.`INFLUENCESCORE`, t1.`KBARTICLEID`, t1.`LASTONHOLDTIME`, t1.`MASTERID`, t1.`MASTERNAME`, t1.`MERGED`, t1.`MESSAGETYPECODE`, t1.`NUMBEROFCHILDINCIDENTS`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTCASEID`, t1.`PARENTCASENAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTSERIALNUMBER`, t1.`RESOLVEBY`, t1.`RESOLVEBYKPIID`, t1.`RESOLVEBYKPINAME`, t1.`RESOLVEBYSLASTATUS`, t1.`RESPONSEBY`, t1.`RESPONSIBLECONTACTID`, t1.`RESPONSIBLECONTACTNAME`, t1.`ROUTECASE`, t1.`SENTIMENTVALUE`, t1.`SERVICESTAGE`, t1.`SEVERITYCODE`, t1.`SLAID`, t1.`SLANAME`, t1.`SOCIALPROFILEID`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TICKETNUMBER`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRANSACTIONCURRENCYNAME`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `INCIDENT` t1  
+		<![CDATA[ SELECT t1.`ACCOUNTNAME`, t1.`ACTIVITIESCOMPLETE`, t1.`ACTUALSERVICEUNITS`, t1.`BILLEDSERVICEUNITS`, t1.`BLOCKEDPROFILE`, t1.`CASEORIGINCODE`, t1.`CASETYPECODE`, t1.`CHECKEMAIL`, t1.`CONTACTNAME`, t1.`CONTRACTDETAILID`, t1.`CONTRACTDETAILNAME`, t1.`CONTRACTID`, t1.`CONTRACTNAME`, t1.`CONTRACTSERVICELEVELCODE`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CURRENCYNAME`, t1.`CUSTOMERCONTACTED`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERSATISFACTIONCODE`, t1.`CUSTOMERTYPE`, t1.`DECREMENTENTITLEMENTTERM`, t1.`DECREMENTING`, t1.`DESCRIPTION`, t1.`EMAILADDRESS`, t1.`ENTITLEMENTID`, t1.`ENTITLEMENTNAME`, t1.`ENTITYIMAGE`, t1.`ENTITYIMAGEID`, t1.`ENTITYIMAGE_TIMESTAMP`, t1.`ENTITYIMAGE_URL`, t1.`ESCALATED`, t1.`ESCALATEDON`, t1.`EXCHANGERATE`, t1.`EXISTINGCASE`, t1.`EXISTINGCASENAME`, t1.`FIRSTRESPONSEBYKPIID`, t1.`FIRSTRESPONSEBYKPINAME`, t1.`FIRSTRESPONSESENT`, t1.`FIRSTRESPONSESLASTATUS`, t1.`FOLLOWUPBY`, t1.`FOLLOWUPTASKCREATED`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTSTAGECODE`, t1.`INFLUENCESCORE`, t1.`KBARTICLEID`, t1.`LASTONHOLDTIME`, t1.`MASTERID`, t1.`MASTERNAME`, t1.`MERGED`, t1.`MESSAGETYPECODE`, t1.`NUMBEROFCHILDINCIDENTS`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARENTCASEID`, t1.`PARENTCASENAME`, t1.`PRIMARYCONTACTID`, t1.`PRIMARYCONTACTNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`PRODUCTID`, t1.`PRODUCTNAME`, t1.`PRODUCTSERIALNUMBER`, t1.`RESOLVEBY`, t1.`RESOLVEBYKPIID`, t1.`RESOLVEBYKPINAME`, t1.`RESOLVEBYSLASTATUS`, t1.`RESPONSEBY`, t1.`RESPONSIBLECONTACTID`, t1.`RESPONSIBLECONTACTNAME`, t1.`ROUTECASE`, t1.`SENTIMENTVALUE`, t1.`SERVICESTAGE`, t1.`SEVERITYCODE`, t1.`SLAID`, t1.`SLANAME`, t1.`SOCIALPROFILEID`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBJECTID`, t1.`SUBJECTNAME`, t1.`TICKETNUMBER`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TITLE`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `INCIDENT` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/service/incidentresolution/IncidentreSolutionMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="IncidentreSolutionResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTIDTYPE`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMESPENT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `INCIDENTRESOLUTION` t1  ) t1 where activityid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTTYPE`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMESPENT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `INCIDENTRESOLUTION` t1  ) t1 where activityid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -67,12 +67,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTIDTYPE`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMESPENT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `INCIDENTRESOLUTION` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BILLED`, t1.`CATEGORY`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTTYPE`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMESPENT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `INCIDENTRESOLUTION` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTIDTYPE`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMESPENT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `INCIDENTRESOLUTION` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTTYPE`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTIDNAME`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`TIMESPENT`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `INCIDENTRESOLUTION` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/service/knowledgearticleincident/KnowledgeArticleIncidentMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="KnowledgeArticleIncidentResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTNAME`, t1.`KNOWLEDGEARTICLEID`, t1.`KNOWLEDGEARTICLEINCIDENTID`, t1.`KNOWLEDGEARTICLENAME`, t1.`KNOWLEDGEUSAGE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`SENTTOCUSTOMER`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `KNOWLEDGEARTICLEINCIDENT` t1  ) t1 where knowledgearticleincidentid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTNAME`, t1.`KNOWLEDGEARTICLEID`, t1.`KNOWLEDGEARTICLEINCIDENTID`, t1.`KNOWLEDGEARTICLENAME`, t1.`KNOWLEDGEUSAGE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`SENTTOCUSTOMER`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `KNOWLEDGEARTICLEINCIDENT` t1  ) t1 where knowledgearticleincidentid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -47,12 +47,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTNAME`, t1.`KNOWLEDGEARTICLEID`, t1.`KNOWLEDGEARTICLEINCIDENTID`, t1.`KNOWLEDGEUSAGE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`SENTTOCUSTOMER`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `KNOWLEDGEARTICLEINCIDENT` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTNAME`, t1.`KNOWLEDGEARTICLEID`, t1.`KNOWLEDGEARTICLEINCIDENTID`, t1.`KNOWLEDGEARTICLENAME`, t1.`KNOWLEDGEUSAGE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`SENTTOCUSTOMER`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `KNOWLEDGEARTICLEINCIDENT` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTNAME`, t1.`KNOWLEDGEARTICLEID`, t1.`KNOWLEDGEARTICLEINCIDENTID`, t1.`KNOWLEDGEARTICLENAME`, t1.`KNOWLEDGEUSAGE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`SENTTOCUSTOMER`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `KNOWLEDGEARTICLEINCIDENT` t1  
+		<![CDATA[ SELECT t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`EXCHANGERATE`, t1.`IMPORTSEQUENCENUMBER`, t1.`INCIDENTID`, t1.`INCIDENTNAME`, t1.`KNOWLEDGEARTICLEID`, t1.`KNOWLEDGEARTICLEINCIDENTID`, t1.`KNOWLEDGEARTICLENAME`, t1.`KNOWLEDGEUSAGE`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`SENTTOCUSTOMER`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER` FROM `KNOWLEDGEARTICLEINCIDENT` t1  
 			]]>
     </sql>
 </mapper>

businesscentral-core/src/main/resources/mapper/service/serviceappointment/ServiceAppointmentMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="ServiceAppointmentResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ALLDAYEVENT`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`LOCATION`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SITEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `SERVICEAPPOINTMENT` t1  ) t1 where activityid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ALLDAYEVENT`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`LOCATION`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SITEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `SERVICEAPPOINTMENT` t1  ) t1 where activityid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -67,12 +67,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ALLDAYEVENT`, t1.`BILLED`, t1.`CATEGORY`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`LOCATION`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SITEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `SERVICEAPPOINTMENT` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ALLDAYEVENT`, t1.`BILLED`, t1.`CATEGORY`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`LOCATION`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SITEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `SERVICEAPPOINTMENT` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ALLDAYEVENT`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`LOCATION`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERIDTYPE`, t1.`OWNERNAME`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SITEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `SERVICEAPPOINTMENT` t1  
+		<![CDATA[ SELECT t1.`ACTIVITYADDITIONALPARAMS`, t1.`ACTIVITYID`, t1.`ACTIVITYTYPECODE`, t1.`ACTUALDURATIONMINUTES`, t1.`ACTUALEND`, t1.`ACTUALSTART`, t1.`ALLDAYEVENT`, t1.`BCC`, t1.`BILLED`, t1.`CATEGORY`, t1.`CC`, t1.`COMMUNITY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`CUSTOMERS`, t1.`DELIVERYLASTATTEMPTEDON`, t1.`DELIVERYPRIORITYCODE`, t1.`DESCRIPTION`, t1.`EXCHANGEITEMID`, t1.`EXCHANGERATE`, t1.`EXCHANGEWEBLINK`, t1.`FROM`, t1.`IMPORTSEQUENCENUMBER`, t1.`INSTANCETYPECODE`, t1.`LASTONHOLDTIME`, t1.`LEFTVOICEMAIL`, t1.`LOCATION`, t1.`MAPIPRIVATE`, t1.`ONHOLDTIME`, t1.`OPTIONALATTENDEES`, t1.`ORGANIZER`, t1.`OVERRIDDENCREATEDON`, t1.`OWNERID`, t1.`OWNERNAME`, t1.`OWNERTYPE`, t1.`PARTNERS`, t1.`PRIORITYCODE`, t1.`PROCESSID`, t1.`REGARDINGOBJECTID`, t1.`REGARDINGOBJECTNAME`, t1.`REGARDINGOBJECTTYPECODE`, t1.`REGULARACTIVITY`, t1.`REQUIREDATTENDEES`, t1.`RESOURCES`, t1.`SCHEDULEDDURATIONMINUTES`, t1.`SCHEDULEDEND`, t1.`SCHEDULEDSTART`, t1.`SENTON`, t1.`SERIESID`, t1.`SERVICEID`, t1.`SITEID`, t1.`SLAID`, t1.`SLANAME`, t1.`SORTDATE`, t1.`STAGEID`, t1.`STATECODE`, t1.`STATUSCODE`, t1.`SUBCATEGORY`, t1.`SUBJECT`, t1.`SUBSCRIPTIONID`, t1.`TIMEZONERULEVERSIONNUMBER`, t1.`TO`, t1.`TRANSACTIONCURRENCYID`, t1.`TRAVERSEDPATH`, t1.`UPDATEDATE`, t1.`UPDATEMAN`, t1.`UTCCONVERSIONTIMEZONECODE`, t1.`VERSIONNUMBER`, t1.`WORKFLOWCREATED` FROM `SERVICEAPPOINTMENT` t1  
 			]]>
     </sql>
 </mapper>

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibizbusinesscentral/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibizbusinesscentral/
-      mvn clean package -Pbusinesscentral
-      cd businesscentral-app/businesscentral-app-businesscentral
-      mvn -Pbusinesscentral docker:build
-      mvn -Pbusinesscentral docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/businesscentral-app-businesscentral.yaml iBizEE --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>