xignzi006 发布系统代码

app_CRM/src/widgets/incident-customer/main-grid/main-grid-model.ts

@@ -36,11 +36,6 @@ export default class MainModel {
           prop: 'customername',
           dataType: 'TEXT',
         },
-        {
-          name: 'srfdatatype',
-          prop: 'customertype',
-          dataType: 'SSCODELIST',
-        },
         {
           name: 'srfdataaccaction',
           prop: 'customerid',

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/service/impl/AccountServiceImpl.java

@@ -101,7 +101,6 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
     @Transactional
     public boolean create(Account et) {
         fillParentData(et);
-        createIndexMajorEntityData(et);
         if(!this.retBool(this.baseMapper.insert(et)))
             return false;
         CachedBeanCopier.copy(get(et.getAccountid()),et);
@@ -118,7 +117,6 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
     @Transactional
     public boolean update(Account et) {
         fillParentData(et);
-        incidentcustomerService.update(accountInheritMapping.toIncidentcustomer(et));
         if(!update(et,(Wrapper) et.getUpdateWrapper(true).eq("accountid",et.getAccountid())))
             return false;
         CachedBeanCopier.copy(get(et.getAccountid()),et);
@@ -135,7 +133,6 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
     @Transactional
     public boolean remove(String key) {
         boolean result=removeById(key);
-        incidentcustomerService.remove(key);
         return result ;
     }
 
@@ -459,23 +456,6 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
 
 
 
-    @Autowired
-    cn.ibizlab.businesscentral.core.base.mapping.AccountInheritMapping accountInheritMapping;
-    @Autowired
-    @Lazy
-    protected cn.ibizlab.businesscentral.core.service.service.IIncidentCustomerService incidentcustomerService;
-
-    /**
-     * 创建索引主实体数据
-     * @param et
-     */
-    private void createIndexMajorEntityData(Account et){
-        if(ObjectUtils.isEmpty(et.getAccountid()))
-            et.setAccountid((String)et.getDefaultKey(true));
-        cn.ibizlab.businesscentral.core.service.domain.IncidentCustomer incidentcustomer =accountInheritMapping.toIncidentcustomer(et);
-        incidentcustomer.set("customertype","ACCOUNT");
-        incidentcustomerService.create(incidentcustomer);
-    }
 
     @Override
     public List<JSONObject> select(String sql, Map param){

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[ACCOUNT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-account-615-1">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-account-616-1">
         <createTable tableName="ACCOUNT">
                 <column name="ADDRESS1_PRIMARYCONTACTNAME" remarks="" type="VARCHAR(100)">
                 </column>
@@ -10975,31 +10975,31 @@
     </changeSet>
 
         <!--输出实体[ACCOUNT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-615-134">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-616-134">
        <addForeignKeyConstraint baseColumnNames="PARENTACCOUNTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__ACCOUNT__PARENT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCOUNTID" referencedTableName="ACCOUNT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-615-135">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-616-135">
        <addForeignKeyConstraint baseColumnNames="PRIMARYCONTACTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__CONTACT__PRIMAR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-615-136">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-616-136">
        <addForeignKeyConstraint baseColumnNames="PREFERREDEQUIPMENTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__EQUIPMENT__PREF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EQUIPMENTID" referencedTableName="EQUIPMENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-615-137">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-616-137">
        <addForeignKeyConstraint baseColumnNames="ORIGINATINGLEADID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__LEAD__ORIGINATI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="LEADID" referencedTableName="LEAD" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-615-138">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-616-138">
        <addForeignKeyConstraint baseColumnNames="DEFAULTPRICELEVELID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__PRICELEVEL__DEF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-615-139">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-616-139">
        <addForeignKeyConstraint baseColumnNames="PREFERREDSERVICEID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__SERVICE__PREFER" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SERVICEID" referencedTableName="SERVICE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-615-140">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-616-140">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-615-141">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-616-141">
        <addForeignKeyConstraint baseColumnNames="TERRITORYID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__TERRITORY__TERR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TERRITORYID" referencedTableName="TERRITORY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-615-142">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-616-142">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__TRANSACTIONCURR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[ACTIVITYMIMEATTACHMENT]外键关系 -->