xignzi006 发布系统代码

app_CRM/src/interface/entity/incident-customer.ts

@@ -29,4 +29,12 @@ export interface IncidentCustomer {
      * @memberof IncidentCustomer
      */
     customername?: any;
+
+    /**
+     * 商业类型
+     *
+     * @returns {*}
+     * @memberof IncidentCustomer
+     */
+    businesstypecode?: any;
 }
\ No newline at end of file

app_CRM/src/locale/lanres/entities/incident-customer/incident-customer_en_US.ts

@@ -4,6 +4,7 @@ export default {
     customerid: "客户",
     customertype: "客户类型",
     customername: "客户",
+    businesstypecode: "商业类型",
   },
 	views: {
 		pickupview: {

app_CRM/src/locale/lanres/entities/incident-customer/incident-customer_zh_CN.ts

@@ -3,6 +3,7 @@ export default {
     customerid: "客户",
     customertype: "客户类型",
     customername: "客户",
+    businesstypecode: "商业类型",
   },
 	views: {
 		pickupview: {

app_CRM/src/widgets/incident-customer/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -24,6 +24,9 @@ export default class MPickupViewpickupviewpanelModel {
       {
         name: 'customername',
       },
+      {
+        name: 'businesstypecode',
+      },
     ]
   }
 

app_CRM/src/widgets/incident-customer/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -24,6 +24,9 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'customername',
       },
+      {
+        name: 'businesstypecode',
+      },
     ]
   }
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/service/domain/IncidentCustomer.java

@@ -61,6 +61,13 @@ public class IncidentCustomer extends EntityMP implements Serializable {
     @JSONField(name = "customername")
     @JsonProperty("customername")
     private String customername;
+    /**
+     * 商业类型
+     */
+    @TableField(exist = false)
+    @JSONField(name = "businesstypecode")
+    @JsonProperty("businesstypecode")
+    private String businesstypecode;
 
 
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/service/filter/IncidentCustomerSearchContext.java

@@ -41,6 +41,13 @@ public class IncidentCustomerSearchContext extends QueryWrapperContext<IncidentC
             this.getSearchCond().like("customername", n_customername_like);
         }
     }
+	private String n_businesstypecode_eq;//[商业类型]
+	public void setN_businesstypecode_eq(String n_businesstypecode_eq) {
+        this.n_businesstypecode_eq = n_businesstypecode_eq;
+        if(!ObjectUtils.isEmpty(this.n_businesstypecode_eq)){
+            this.getSearchCond().eq("businesstypecode", n_businesstypecode_eq);
+        }
+    }
 
     /**
 	 * 启用快速搜索

businesscentral-core/src/main/resources/mapper/service/incidentcustomer/IncidentCustomerMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="IncidentCustomerResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE` FROM (SELECT 'ACCOUNT' AS `CUSTOMERTYPE`,v1.`ACCOUNTID` AS `CUSTOMERID` ,v1.`ACCOUNTNAME` AS `CUSTOMERNAME` FROM (SELECT t1.`ACCOUNTID`, t1.`ACCOUNTNAME` FROM `ACCOUNT` t1  ) v1 UNION ALL SELECT 'CONTACT' AS `CUSTOMERTYPE`,v2.`CONTACTID` AS `CUSTOMERID` ,v2.`FULLNAME` AS `CUSTOMERNAME` FROM (SELECT t1.`CONTACTID`, t1.`FULLNAME` FROM `CONTACT` t1  ) v2 ) t1  ) t1 where customerid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`BUSINESSTYPECODE`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE` FROM (SELECT 'ACCOUNT' AS `CUSTOMERTYPE`,v1.`ACCOUNTID` AS `CUSTOMERID` ,v1.`ACCOUNTNAME` AS `CUSTOMERNAME` ,NULL AS `BUSINESSTYPECODE` FROM (SELECT t1.`ACCOUNTID`, t1.`ACCOUNTNAME` FROM `ACCOUNT` t1  ) v1 UNION ALL SELECT 'CONTACT' AS `CUSTOMERTYPE`,v2.`CONTACTID` AS `CUSTOMERID` ,v2.`FULLNAME` AS `CUSTOMERNAME` ,NULL AS `BUSINESSTYPECODE` FROM (SELECT t1.`CONTACTID`, t1.`FULLNAME` FROM `CONTACT` t1  ) v2 ) t1  ) t1 where customerid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -37,12 +37,12 @@
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE` FROM (SELECT 'ACCOUNT' AS `CUSTOMERTYPE`,v1.`ACCOUNTID` AS `CUSTOMERID` ,v1.`ACCOUNTNAME` AS `CUSTOMERNAME` FROM (SELECT t1.`ACCOUNTID`, t1.`ACCOUNTNAME` FROM `ACCOUNT` t1  ) v1 UNION ALL SELECT 'CONTACT' AS `CUSTOMERTYPE`,v2.`CONTACTID` AS `CUSTOMERID` ,v2.`FULLNAME` AS `CUSTOMERNAME` FROM (SELECT t1.`CONTACTID`, t1.`FULLNAME` FROM `CONTACT` t1  ) v2 ) t1  
+		<![CDATA[ SELECT t1.`BUSINESSTYPECODE`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE` FROM (SELECT 'ACCOUNT' AS `CUSTOMERTYPE`,v1.`ACCOUNTID` AS `CUSTOMERID` ,v1.`ACCOUNTNAME` AS `CUSTOMERNAME` ,NULL AS `BUSINESSTYPECODE` FROM (SELECT t1.`ACCOUNTID`, t1.`ACCOUNTNAME` FROM `ACCOUNT` t1  ) v1 UNION ALL SELECT 'CONTACT' AS `CUSTOMERTYPE`,v2.`CONTACTID` AS `CUSTOMERID` ,v2.`FULLNAME` AS `CUSTOMERNAME` ,NULL AS `BUSINESSTYPECODE` FROM (SELECT t1.`CONTACTID`, t1.`FULLNAME` FROM `CONTACT` t1  ) v2 ) t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE` FROM (SELECT 'ACCOUNT' AS `CUSTOMERTYPE`,v1.`ACCOUNTID` AS `CUSTOMERID` ,v1.`ACCOUNTNAME` AS `CUSTOMERNAME` FROM (SELECT t1.`ACCOUNTID`, t1.`ACCOUNTNAME` FROM `ACCOUNT` t1  ) v1 UNION ALL SELECT 'CONTACT' AS `CUSTOMERTYPE`,v2.`CONTACTID` AS `CUSTOMERID` ,v2.`FULLNAME` AS `CUSTOMERNAME` FROM (SELECT t1.`CONTACTID`, t1.`FULLNAME` FROM `CONTACT` t1  ) v2 ) t1  
+		<![CDATA[ SELECT t1.`BUSINESSTYPECODE`, t1.`CUSTOMERID`, t1.`CUSTOMERNAME`, t1.`CUSTOMERTYPE` FROM (SELECT 'ACCOUNT' AS `CUSTOMERTYPE`,v1.`ACCOUNTID` AS `CUSTOMERID` ,v1.`ACCOUNTNAME` AS `CUSTOMERNAME` ,NULL AS `BUSINESSTYPECODE` FROM (SELECT t1.`ACCOUNTID`, t1.`ACCOUNTNAME` FROM `ACCOUNT` t1  ) v1 UNION ALL SELECT 'CONTACT' AS `CUSTOMERTYPE`,v2.`CONTACTID` AS `CUSTOMERID` ,v2.`FULLNAME` AS `CUSTOMERNAME` ,NULL AS `BUSINESSTYPECODE` FROM (SELECT t1.`CONTACTID`, t1.`FULLNAME` FROM `CONTACT` t1  ) v2 ) t1  
 			]]>
     </sql>
 </mapper>

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

@@ -47,6 +47,14 @@ public class IncidentCustomerDTO extends DTOBase implements Serializable {
     @JsonProperty("customername")
     private String customername;
 
+    /**
+     * 属性 [BUSINESSTYPECODE]
+     *
+     */
+    @JSONField(name = "businesstypecode")
+    @JsonProperty("businesstypecode")
+    private String businesstypecode;
+
 
 
 }