企业修复

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerCompanyInfoForm.java

@@ -38,7 +38,7 @@ public class CustomerCompanyInfoForm extends BaseForm {
 
     private String condition;
 
-    private Integer customerType;
+    private String customerType;
 
     private String pid;
 

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CustomerInfoForm.java

@@ -18,6 +18,8 @@ public class CustomerInfoForm extends BaseForm {
 
     private String account;
 
+    private String companyType;
+
     private String passwd;
 
     private Integer customerType;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/bo/CompanyBO.java

@@ -13,6 +13,8 @@ public class CompanyBO {
 
     private String fkCustomerId;
 
+    private String companyType;
+
     private String companyName;
 
     private String orgCode;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/controller/CompanyController.java

@@ -46,9 +46,10 @@ public class CompanyController extends BaseController {
         log.info("前端的参数: {}", jsonObject.toJSONString());
         CustomerInfoForm customerInfoForm = jsonObject.getObject("customerInfoForm", CustomerInfoForm.class);
         CustomerCompanyInfoForm customerCompanyInfoForm = jsonObject.getObject("customerCompanyInfoForm", CustomerCompanyInfoForm.class);
-
         CustomerInfo customerInfo = BeanCopyUtil.convertBean(customerInfoForm, CustomerInfo.class);
         CustomerCompanyInfo customerCompanyInfo = BeanCopyUtil.convertBean(customerCompanyInfoForm, CustomerCompanyInfo.class);
+        String companyType = customerInfoForm.getCompanyType();
+        customerCompanyInfo.setCompanyType(companyType);
         int success = this.companyService.saveCompany(customerInfo, customerCompanyInfo);
         if (success>0){
             return responseResultSuccess();
@@ -62,10 +63,10 @@ public class CompanyController extends BaseController {
         log.info("前端的参数: {}", jsonObject.toJSONString());
         CustomerInfoForm customerInfoForm = jsonObject.getObject("customerInfoForm", CustomerInfoForm.class);
         CustomerCompanyInfoForm customerCompanyInfoForm = jsonObject.getObject("customerCompanyInfoForm", CustomerCompanyInfoForm.class);
-
         CustomerInfo customerInfo = BeanCopyUtil.convertBean(customerInfoForm, CustomerInfo.class);
         CustomerCompanyInfo customerCompanyInfo = BeanCopyUtil.convertBean(customerCompanyInfoForm, CustomerCompanyInfo.class);
-
+        String companyType = customerInfoForm.getCompanyType();
+        customerCompanyInfo.setCompanyType(companyType);
         int success = this.companyService.modifyCompany(customerInfo, customerCompanyInfo);
         if (success>0){
             return responseResultSuccess();
@@ -78,10 +79,8 @@ public class CompanyController extends BaseController {
         log.info("前端的参数: {}", jsonObject.toJSONString());
         CustomerInfoForm customerInfoForm = jsonObject.getObject("customerInfoForm", CustomerInfoForm.class);
         CustomerCompanyInfoForm customerCompanyInfoForm = jsonObject.getObject("customerCompanyInfoForm", CustomerCompanyInfoForm.class);
-
         CustomerInfo customerInfo = BeanCopyUtil.convertBean(customerInfoForm, CustomerInfo.class);
         CustomerCompanyInfo customerCompanyInfo = BeanCopyUtil.convertBean(customerCompanyInfoForm, CustomerCompanyInfo.class);
-
         int success = this.companyService.removeCompany(customerInfo, customerCompanyInfo);
         if (success>0){
             return responseResultSuccess();

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/CompanyServiceImpl.java

@@ -56,8 +56,8 @@ public class CompanyServiceImpl implements CompanyService {
     @Override
     public int modifyCompany(CustomerInfo customerInfo, CustomerCompanyInfo customerCompanyInfo) {
         int result = 0;
-        result = this.customerInfoMapper.updateByPrimaryKeySelective(customerInfo);
-        if (result < 0) throw new RuntimeException("更新customerInfo失败");
+//        result = this.customerInfoMapper.updateByPrimaryKeySelective(customerInfo);
+//        if (result < 0) throw new RuntimeException("更新customerInfo失败");
         result = this.customerCompanyInfoMapper.updateByPrimaryKeySelective(customerCompanyInfo);
         if (result < 0) throw new RuntimeException("更新customerCompanyInfo失败");
         return result;

carbon-back/carbon-back-service/src/main/resources/carbon/CustomerCompanyInfoMapper.xml

@@ -198,6 +198,7 @@
         ci.customer_type as customerType,
         cci.guid as guid,
         cci.fk_customer_id as fkCustomerId,
+        cci.company_type as companyType,
         cci.company_name as companyName,
         cci.org_code as orgCode,
         cci.principals as principals,
@@ -214,8 +215,8 @@
             <if test="companyName != null and companyName != ''">
                 and cci.company_name like concat('%', #{companyName,jdbcType=VARCHAR}, '%')
             </if>
-            <if test="customerType != null">
-                and ci.customer_type = #{customerType,jdbcType=INTEGER}
+            <if test="customerType != null and customerType != ''">
+                and cci.company_type = #{customerType,jdbcType=VARCHAR}
             </if>
             <if test="orgCode != null and orgCode != ''">
                 and cci.org_code like concat('%', #{orgCode,jdbcType=VARCHAR}, '%')