xignzi006 发布系统代码

app_CRM/src/interface/entity/account.ts

@@ -1301,4 +1301,12 @@ export interface Account {
      * @memberof Account
      */
     transactioncurrencyname?: any;
+
+    /**
+     * 相关客户数量
+     *
+     * @returns {*}
+     * @memberof Account
+     */
+    childaccountcount?: any;
 }
\ No newline at end of file

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

@@ -163,6 +163,7 @@ export default {
     preferredservicename: '首选服务',
     primarycontactname: '主要联系人',
     transactioncurrencyname: '货币',
+    childaccountcount: '相关客户数量',
   },
 	views: {
 		summary: {

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

@@ -162,6 +162,7 @@ export default {
     preferredservicename: '首选服务',
     primarycontactname: '主要联系人',
     transactioncurrencyname: '货币',
+    childaccountcount: '相关客户数量',
   },
 	views: {
 		summary: {

app_CRM/src/studio-core/view/MPickupViewBase.tsx

-import { ViewBase } from './ViewBase';
+import { PickupViewBase } from './PickupViewBase';
 
 /**
  * 多项数据选择视图基类
@@ -7,7 +7,7 @@ import { ViewBase } from './ViewBase';
  * @class MPickupViewBase
  * @extends {ViewBase}
  */
-export class MPickupViewBase extends ViewBase {
+export class MPickupViewBase extends PickupViewBase {
 
     /**
      * 是否单选

app_CRM/src/widgets/account/gradation-treeview/gradation-treeview-model.ts

@@ -501,6 +501,9 @@ export default class GradationModel {
       {
         name: 'transactioncurrencyname',
       },
+      {
+        name: 'childaccountcount',
+      },
     ]
   }
 

app_CRM/src/widgets/account/gradation-treeview/gradation-treeview-service.ts

@@ -223,6 +223,13 @@ export default class GradationService extends ControlService {
                         Object.assign(treeNode, { id: strNodeId });
                         Object.assign(treeNode, { expanded: filter.isautoexpand });
                         Object.assign(treeNode, { leaf: false });
+                        let objLeafFlag = entity.childaccountcount;
+                        if (objLeafFlag != null ) {
+                            let strLeafFlag: string = objLeafFlag.toString().toLowerCase();
+                            if (Object.is(strLeafFlag, '1') || Object.is(strLeafFlag, 'true')){
+                                Object.assign(treeNode, { leaf: true });
+                            }
+                        }
                         Object.assign(treeNode, { curData: entity });
                         Object.assign(treeNode, { nodeid: treeNode.srfkey });
                         Object.assign(treeNode, { nodeid2: filter.strRealNodeId });
@@ -413,6 +420,10 @@ export default class GradationService extends ControlService {
                 Object.assign(searchFilter, { n_parentaccountid_eq: filter.nodeid });
             }
 
+            if (Object.is(filter.strNodeType, this.TREENODE_CHILDACCOUNT)) {
+                Object.assign(searchFilter, { n_parentaccountid_eq: filter.nodeid });
+            }
+
             Object.assign(searchFilter, { total: false });
             let bFirst: boolean = true;
             let records: any[] = [];
@@ -436,7 +447,7 @@ export default class GradationService extends ControlService {
                         strNodeId += strId;
                         Object.assign(treeNode, { id: strNodeId });
                         Object.assign(treeNode, { expanded: filter.isautoexpand });
-                        Object.assign(treeNode, { leaf: true });
+                        Object.assign(treeNode, { leaf: false });
                         Object.assign(treeNode, { curData: entity });
                         Object.assign(treeNode, { nodeid: treeNode.srfkey });
                         Object.assign(treeNode, { nodeid2: filter.strRealNodeId });
@@ -523,7 +534,17 @@ export default class GradationService extends ControlService {
     @Errorlog
     public async fillChildaccountNodeChilds(context:any={}, filter: any, list: any[]): Promise<any> {
 		if (filter.srfnodefilter && !Object.is(filter.srfnodefilter,"")) {
+			// 填充ChildAccount
+            let ChildaccountRsNavContext:any = {};
+            let ChildaccountRsNavParams:any = {};
+            let ChildaccountRsParams:any = {};
+			await this.fillChildaccountNodes(context, filter, list ,ChildaccountRsNavContext,ChildaccountRsNavParams,ChildaccountRsParams);
 		} else {
+			// 填充ChildAccount
+            let ChildaccountRsNavContext:any = {};
+            let ChildaccountRsNavParams:any = {};
+            let ChildaccountRsParams:any = {};
+			await this.fillChildaccountNodes(context, filter, list ,ChildaccountRsNavContext,ChildaccountRsNavParams,ChildaccountRsParams);
 		}
 	}
 

app_CRM/src/widgets/account/gradationtreeexpbar-treeexpbar/gradationtreeexpbar-treeexpbar-model.ts

@@ -501,6 +501,9 @@ export default class GradationtreeexpbarModel {
       {
         name: 'transactioncurrencyname',
       },
+      {
+        name: 'childaccountcount',
+      },
     ]
   }
 

app_CRM/src/widgets/account/infotabexppanel-tabexppanel/infotabexppanel-tabexppanel-model.ts

@@ -501,6 +501,9 @@ export default class InfotabexppanelModel {
       {
         name: 'transactioncurrencyname',
       },
+      {
+        name: 'childaccountcount',
+      },
     ]
   }
 

app_CRM/src/widgets/account/infotabviewpanel-tabviewpanel/infotabviewpanel-tabviewpanel-model.ts

@@ -501,6 +501,9 @@ export default class InfotabviewpanelModel {
       {
         name: 'transactioncurrencyname',
       },
+      {
+        name: 'childaccountcount',
+      },
     ]
   }
 

app_CRM/src/widgets/account/infotabviewpanel2-tabviewpanel/infotabviewpanel2-tabviewpanel-model.ts

@@ -501,6 +501,9 @@ export default class Infotabviewpanel2Model {
       {
         name: 'transactioncurrencyname',
       },
+      {
+        name: 'childaccountcount',
+      },
     ]
   }
 

app_CRM/src/widgets/account/infotabviewpanel3-tabviewpanel/infotabviewpanel3-tabviewpanel-model.ts

@@ -501,6 +501,9 @@ export default class Infotabviewpanel3Model {
       {
         name: 'transactioncurrencyname',
       },
+      {
+        name: 'childaccountcount',
+      },
     ]
   }
 

app_CRM/src/widgets/account/infotabviewpanel4-tabviewpanel/infotabviewpanel4-tabviewpanel-model.ts

@@ -501,6 +501,9 @@ export default class Infotabviewpanel4Model {
       {
         name: 'transactioncurrencyname',
       },
+      {
+        name: 'childaccountcount',
+      },
     ]
   }
 

app_CRM/src/widgets/account/inner-pickup-viewpickupviewpanel-pickupviewpanel/inner-pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -501,6 +501,9 @@ export default class InnerPickupViewpickupviewpanelModel {
       {
         name: 'transactioncurrencyname',
       },
+      {
+        name: 'childaccountcount',
+      },
     ]
   }
 

app_CRM/src/widgets/account/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -501,6 +501,9 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'transactioncurrencyname',
       },
+      {
+        name: 'childaccountcount',
+      },
     ]
   }
 

app_CRM/src/widgets/account/summary-dashboard/summary-dashboard-model.ts

@@ -501,6 +501,9 @@ export default class SummaryModel {
       {
         name: 'transactioncurrencyname',
       },
+      {
+        name: 'childaccountcount',
+      },
     ]
   }
 

app_CRM/src/widgets/account/view-account-info-all-portlet/view-account-info-all-portlet-model.ts

@@ -501,6 +501,9 @@ export default class View_AccountInfoAllModel {
       {
         name: 'transactioncurrencyname',
       },
+      {
+        name: 'childaccountcount',
+      },
     ]
   }
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/domain/Account.java

@@ -1259,6 +1259,13 @@ public class Account extends EntityMP implements Serializable {
     @JSONField(name = "transactioncurrencyname")
     @JsonProperty("transactioncurrencyname")
     private String transactioncurrencyname;
+    /**
+     * 相关客户数量
+     */
+    @TableField(value = "childaccountcount")
+    @JSONField(name = "childaccountcount")
+    @JsonProperty("childaccountcount")
+    private Integer childaccountcount;
 
     /**
      * 
@@ -2640,6 +2647,14 @@ public class Account extends EntityMP implements Serializable {
         this.modify("transactioncurrencyname",transactioncurrencyname);
     }
 
+    /**
+     * 设置 [相关客户数量]
+     */
+    public void setChildaccountcount(Integer childaccountcount){
+        this.childaccountcount = childaccountcount ;
+        this.modify("childaccountcount",childaccountcount);
+    }
+
 
 }
 

businesscentral-core/src/main/resources/liquibase/h2_table.xml

@@ -4841,6 +4841,8 @@
                 </column>
                 <column name="TRANSACTIONCURRENCYNAME" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="CHILDACCOUNTCOUNT" remarks="" type="INT">
+                </column>
         </createTable>
     </changeSet>
 

businesscentral-provider/businesscentral-provider-centralapi/src/main/java/cn/ibizlab/businesscentral/centralapi/dto/AccountDTO.java

@@ -1326,6 +1326,14 @@ public class AccountDTO extends DTOBase implements Serializable {
     @JsonProperty("transactioncurrencyname")
     private String transactioncurrencyname;
 
+    /**
+     * 属性 [CHILDACCOUNTCOUNT]
+     *
+     */
+    @JSONField(name = "childaccountcount")
+    @JsonProperty("childaccountcount")
+    private Integer childaccountcount;
+
 
     /**
      * 设置 [ADDRESS1_PRIMARYCONTACTNAME]
@@ -2583,6 +2591,14 @@ public class AccountDTO extends DTOBase implements Serializable {
         this.modify("transactioncurrencyname",transactioncurrencyname);
     }
 
+    /**
+     * 设置 [CHILDACCOUNTCOUNT]
+     */
+    public void setChildaccountcount(Integer  childaccountcount){
+        this.childaccountcount = childaccountcount ;
+        this.modify("childaccountcount",childaccountcount);
+    }
+
 
 }