Merge branch 'dev' of http://www.lockingos.org:3000/yeqd/user-parent into dev

user-client/src/main/java/com/hp/user/client/entity/CompanyAuditVO.java

@@ -110,6 +110,10 @@ public class CompanyAuditVO {
      * 跟进状态；0：未跟进；1：跟进
      */
     private Short follow;
+    /**
+     * 审核人姓名
+     */
+    private String checkName;
 
     public String getName() {
         return name;
@@ -318,4 +322,12 @@ public class CompanyAuditVO {
     public void setCountCode(String countCode) {
         this.countCode = countCode;
     }
+
+    public String getCheckName() {
+        return checkName;
+    }
+
+    public void setCheckName(String checkName) {
+        this.checkName = checkName;
+    }
 }

user-client/src/main/java/com/hp/user/client/entity/StationVO.java

@@ -36,6 +36,18 @@ public class StationVO {
      * 地址
      */
     private String address;
+    /**
+     * 省份编码
+     */
+    private String provinceCode;
+    /**
+     * 城市编码
+     */
+    private String cityCode;
+    /**
+     * 区县编码
+     */
+    private String countCode;
     /**
      * 变压器容量
      */
@@ -63,13 +75,16 @@ public class StationVO {
 
     public StationVO(){}
 
-    public StationVO(String stationId, String name, String enterpriseId, String stationContact, String phone, String address, BigDecimal capacity, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater, Short sysDeleted) {
+    public StationVO(String stationId, String name, String enterpriseId, String stationContact, String phone, String address, String provinceCode, String cityCode, String countCode, BigDecimal capacity, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater, Short sysDeleted) {
         this.stationId = stationId;
         this.name = name;
         this.enterpriseId = enterpriseId;
         this.stationContact = stationContact;
         this.phone = phone;
         this.address = address;
+        this.provinceCode = provinceCode;
+        this.cityCode = cityCode;
+        this.countCode = countCode;
         this.capacity = capacity;
         this.sysCreateTime = sysCreateTime;
         this.sysCreator = sysCreator;
@@ -126,6 +141,30 @@ public class StationVO {
         this.address = address;
     }
 
+    public String getProvinceCode() {
+        return provinceCode;
+    }
+
+    public void setProvinceCode(String provinceCode) {
+        this.provinceCode = provinceCode;
+    }
+
+    public String getCityCode() {
+        return cityCode;
+    }
+
+    public void setCityCode(String cityCode) {
+        this.cityCode = cityCode;
+    }
+
+    public String getCountCode() {
+        return countCode;
+    }
+
+    public void setCountCode(String countCode) {
+        this.countCode = countCode;
+    }
+
     public BigDecimal getCapacity() {
         return capacity;
     }

user-client/src/main/java/com/hp/user/client/service/AccountService.java

@@ -14,6 +14,7 @@ import java.util.List;
  */
 public interface AccountService {
 	public Result insert(AccountVO account);
+	public DataResult<AccountVO> queryByUserId(String userId);
 	public Result delete(String userId);
 	public Result update(AccountVO account);
 	public PageResult<AccountVO> queryAccountsPageByCompanyIdAndUserNameAndPhoneAndStatus(String companyId, String userName, String phone, Integer status, Long current, Integer size);

user-client/src/main/java/com/hp/user/client/service/AuditService.java

@@ -6,5 +6,6 @@ import com.hp.user.client.entity.Result;
 
 public interface AuditService {
     public Result insert(AuditVO audit);
+    public Result update(AuditVO audit);
     public DataResult<AuditVO> queryAuditByAuditId(String auditId);
 }

user-client/src/main/java/com/hp/user/client/service/CustomerServiceProviderEnterpriseService.java

@@ -20,7 +20,7 @@ public interface CustomerServiceProviderEnterpriseService {
     public Result delete(String csId);
     public Result deleteByServiceProviderId(String serviceProviderId);
     public DataResult<CustomerServiceProviderEnterpriseVO> queryCsByCompanyIdAndServiceProviderId(String companyId, String serviceProviderId);
-    public DataResult<String> queryServiceProviderIdByCompanyId(String companyId);
+    public DataResult<CustomerServiceProviderEnterpriseVO> queryCsByCompanyId(String companyId);
     public Result insertBatch(List<CustomerServiceProviderEnterpriseVO> csVOList);
     public Result deleteBatch(List<String> enterpriseIdList);
 

user-client/src/main/java/com/hp/user/client/service/StationService.java

@@ -16,6 +16,6 @@ public interface StationService {
     public Result update(StationVO station);
     public DataResult<StationVO> queryStationByStationId(String stationId);
     public DataResult<StationVO> queryStationByStationName(String name);
-    public PageResult<StationVO> getStationsPage(Long current, Integer size);
+    public PageResult<StationVO> queryAllStationsPageByCompanyIdAndStationName(String companyId,String stationName,Long current, Integer size);
 
 }

user-service/src/main/java/com/hp/user/service/controller/AuditController.java

@@ -1,13 +1,14 @@
 package com.hp.user.service.controller;
 
-import com.hp.user.client.entity.AuditVO;
-import com.hp.user.client.entity.Result;
+import com.hp.user.client.entity.*;
 import com.hp.user.client.service.AuditService;
+import com.hp.user.client.service.CustomerCompanyService;
 import com.hp.user.service.utils.IdWorker;
 import com.hp.user.service.utils.HttpResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 @Api(tags = "企业审核接口")
@@ -16,11 +17,35 @@ import org.springframework.web.bind.annotation.*;
 public class AuditController {
     @Autowired
     private AuditService auditService;
+    @Autowired
+    private CustomerCompanyService companyService;
 
     @ApiOperation(value = "是否通过企业审核",notes = "若操作成功会返回新的审核记录Id")
     @PostMapping("/passCompanyAudit")
+    @Transactional
     public Result passCompanyAudit(@RequestBody AuditVO audit){
-        audit.setAuditId(IdWorker.generactorId().toString());
-        return auditService.insert(audit);
+        Result result = new Result();
+        Result temp1 = auditService.update(audit);
+        if(temp1.getCode().equals("-1")){
+            result.setCode("-1");
+            result.setMessage(temp1.getMessage());
+            return result;
+        }
+        DataResult<CustomerCompanyVO> temp2 = companyService.queryCompanyByCompanyId(audit.getUserId());
+        if(temp2.getCode().equals("-1")){
+            result.setCode("-1");
+            result.setMessage(temp2.getMessage());
+            return result;
+        }
+        CustomerCompanyVO companyVO = temp2.getData();
+        companyVO.setStatus(audit.getStatus());
+        temp1 = companyService.update(companyVO);
+        if(temp1.getCode().equals("-1")){
+            result.setCode("-1");
+            result.setMessage(temp1.getMessage());
+            return result;
+        }
+        result.setCode("0");
+        return result;
     }
 }

user-service/src/main/java/com/hp/user/service/controller/CompanyController.java

@@ -42,13 +42,19 @@ public class CompanyController {
     @Transactional
     public Result addCompany(@RequestBody CustomerCompanyVO company, String serviceProviderId) {
         company.setCustomerId(IdWorker.generactorId().toString());
-        Result result = new Result(), result1 = new Result(), result2 = new Result("0");
+        Result result = new Result(), result1 = new Result(), result2 = new Result("0"), result3 = new Result("0");
         result1 = customerCompanyService.insert(company);
-        if (serviceProviderId != null) {
+        if (serviceProviderId != null) { // 是企业
             CustomerServiceProviderEnterpriseVO temp = new CustomerServiceProviderEnterpriseVO(IdWorker.generactorId().toString(), serviceProviderId, company.getCustomerId());
             result2 = csService.insert(temp);
+            AuditVO audit = new AuditVO();
+            audit.setAuditId(IdWorker.generactorId().toString());
+            audit.setUserId(company.getCustomerId());
+            audit.setVipLevel((short) 1); // 普通会员
+            audit.setStatus(company.getStatus());
+            result3 = auditService.insert(audit);
         }
-        if (result1.getCode().equals("0") && result2.getCode().equals("0")) {
+        if (result1.getCode().equals("0") && result2.getCode().equals("0") && result3.getCode().equals("0")) {
             result.setCode("0");
             return result;
         } else {
@@ -88,11 +94,14 @@ public class CompanyController {
         Result result = new Result(), result1 = new Result(), result2 = new Result("0");
         result1 = customerCompanyService.update(company);
         if (serviceProviderId != null) {
-            DataResult temp = csService.queryCsByCompanyIdAndServiceProviderId(company.getCustomerId(), serviceProviderId);
+            DataResult temp = csService.queryCsByCompanyId(company.getCustomerId());
             if (temp.getCode().equals("0")) {
                 CustomerServiceProviderEnterpriseVO cs = (CustomerServiceProviderEnterpriseVO) temp.getData();
                 cs.setServiceProviderId(serviceProviderId);
                 result2 = csService.update(cs);
+            } else if (temp.getMessage().equals("未查找到企业对应的服务商关系")) {
+                CustomerServiceProviderEnterpriseVO tt = new CustomerServiceProviderEnterpriseVO(IdWorker.generactorId().toString(), serviceProviderId, company.getCustomerId());
+                result2 = csService.insert(tt);
             } else {
                 result.setCode("-1");
                 result.setMessage(temp.getMessage());
@@ -130,8 +139,8 @@ public class CompanyController {
                 result.setMessage(temp.getMessage());
                 return result;
             }
-        }else{ // 删除服务商
-            result2=csService.deleteByServiceProviderId(companyId);
+        } else { // 删除服务商
+            result2 = csService.deleteByServiceProviderId(companyId);
         }
         if (result1.getCode().equals("0") && result2.getCode().equals("0")) {
             result.setCode("0");
@@ -155,9 +164,14 @@ public class CompanyController {
         DataResult<CustomerCompanyVO> result = customerCompanyService.queryCompanyByCompanyId(companyId);
         if (result.getCode().equals("0") && type == 1) {
             CustomerCompanyVO temp = result.getData();
-            DataResult<String> t = csService.queryServiceProviderIdByCompanyId(companyId);
+            DataResult<CustomerServiceProviderEnterpriseVO> t = csService.queryCsByCompanyId(companyId);
             if (t.getCode().equals("0")) {
-                temp.setServiceProviderId(t.getData());
+                temp.setServiceProviderId(t.getData().getServiceProviderId());
+                result.setCode("0");
+                result.setData(temp);
+            } else if (t.getMessage().equals("未查找到企业对应的服务商关系")) {
+                temp.setServiceProviderId(null);
+                result.setCode("0");
                 result.setData(temp);
             } else {
                 result.setCode("-1");
@@ -222,7 +236,7 @@ public class CompanyController {
     @ApiOperation(value = "成为合同用户", notes = "添加成功会返回添加的企业Id")
     @PostMapping("/becomeContractUser")
     @Transactional
-    public Result becomeContractUser(@RequestBody CustomerCompanyVO company, @RequestBody boolean willing) {
+    public Result becomeContractUser(@RequestBody CustomerCompanyVO company, @RequestParam boolean willing) {
         company.setCustomerId(IdWorker.generactorId().toString());
         company.setType((short) 1); // 企业
         company.setStatus((short) 1); // 未审核
@@ -234,7 +248,7 @@ public class CompanyController {
         // 愿意成为合同用户
         if (willing) audit.setVipLevel((short) 1); // 普通会员
         else audit.setVipLevel((short) 2); // 意向用户
-        Result result=new Result();
+        Result result = new Result();
         Result result1 = customerCompanyService.insert(company);
         Result result2 = auditService.insert(audit);
         if (result1.getCode().equals("0") && result2.getCode().equals("0")) {

user-service/src/main/java/com/hp/user/service/controller/StationController.java

@@ -88,9 +88,9 @@ public class StationController {
      * @param size    一页的行数
      * @return PageResult
      */
-    @ApiOperation(value = "分页查询所有站点", notes = "输入的current为要查询的页数，size为一页的行数，返回的total为总行数")
-    @GetMapping("/queryAllStationByPage")
-    public PageResult<StationVO> queryAllStationByPage(@RequestParam Long current, @RequestParam Integer size) {
-        return stationService.getStationsPage(current, size);
+    @ApiOperation(value = "根据企业Id、站点名称分页查询所有站点", notes = "输入的current为要查询的页数，size为一页的行数，返回的total为总行数")
+    @GetMapping("/queryStationsPageByCompanyIdAndStationName")
+    public PageResult<StationVO> queryStationsPageByCompanyIdAndStationName(@RequestParam String companyId,String stationName,@RequestParam Long current, @RequestParam Integer size) {
+        return stationService.queryAllStationsPageByCompanyIdAndStationName(companyId,stationName,current, size);
     }
 }

user-service/src/main/java/com/hp/user/service/controller/UserController.java

@@ -1,9 +1,6 @@
 package com.hp.user.service.controller;
 
-import com.hp.user.client.entity.AccountPage;
-import com.hp.user.client.entity.AccountVO;
-import com.hp.user.client.entity.PageResult;
-import com.hp.user.client.entity.Result;
+import com.hp.user.client.entity.*;
 import com.hp.user.client.service.AccountService;
 import com.hp.user.service.utils.HttpResult;
 import com.hp.user.service.utils.IdWorker;
@@ -44,6 +41,17 @@ public class UserController {
         return accountService.update(user);
     }
 
+    /**
+     * 根据用户Id查询用户信息
+     * @param userId 用户Id
+     * @return DataResult
+     */
+    @ApiOperation(value = "根据用户Id查询用户信息")
+    @GetMapping("/queryUserByUserId")
+    public DataResult<AccountVO> queryUserByUserId(String userId){
+        return accountService.queryByUserId(userId);
+    }
+
     /**
      * 根据用户Id删除用户
      *

user-service/src/main/java/com/hp/user/service/entity/CompanyAudit.java

@@ -112,6 +112,10 @@ public class CompanyAudit {
      * 跟进状态；0：未跟进；1：跟进
      */
     private Short follow;
+    /**
+     * 审核人姓名
+     */
+    private String checkName;
 
     public String getName() {
         return name;
@@ -320,4 +324,12 @@ public class CompanyAudit {
     public void setCountCode(String countCode) {
         this.countCode = countCode;
     }
+
+    public String getCheckName() {
+        return checkName;
+    }
+
+    public void setCheckName(String checkName) {
+        this.checkName = checkName;
+    }
 }

user-service/src/main/java/com/hp/user/service/entity/Station.java

@@ -46,6 +46,18 @@ public class Station implements Serializable {
      * 地址
      */
     private String address;
+    /**
+     * 省份编码
+     */
+    private String provinceCode;
+    /**
+     * 城市编码
+     */
+    private String cityCode;
+    /**
+     * 区县编码
+     */
+    private String countCode;
     /**
      * 变压器容量
      */
@@ -74,13 +86,16 @@ public class Station implements Serializable {
 
     public Station(){}
 
-    public Station(String stationId, String name, String enterpriseId, String stationContact, String phone, String address, BigDecimal capacity, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater, Short sysDeleted) {
+    public Station(String stationId, String name, String enterpriseId, String stationContact, String phone, String address, String provinceCode, String cityCode, String countCode, BigDecimal capacity, Date sysCreateTime, String sysCreator, Date sysUpdateTime, String sysUpdater, Short sysDeleted) {
         this.stationId = stationId;
         this.name = name;
         this.enterpriseId = enterpriseId;
         this.stationContact = stationContact;
         this.phone = phone;
         this.address = address;
+        this.provinceCode = provinceCode;
+        this.cityCode = cityCode;
+        this.countCode = countCode;
         this.capacity = capacity;
         this.sysCreateTime = sysCreateTime;
         this.sysCreator = sysCreator;
@@ -137,6 +152,30 @@ public class Station implements Serializable {
         this.address = address;
     }
 
+    public String getProvinceCode() {
+        return provinceCode;
+    }
+
+    public void setProvinceCode(String provinceCode) {
+        this.provinceCode = provinceCode;
+    }
+
+    public String getCityCode() {
+        return cityCode;
+    }
+
+    public void setCityCode(String cityCode) {
+        this.cityCode = cityCode;
+    }
+
+    public String getCountCode() {
+        return countCode;
+    }
+
+    public void setCountCode(String countCode) {
+        this.countCode = countCode;
+    }
+
     public BigDecimal getCapacity() {
         return capacity;
     }

user-service/src/main/java/com/hp/user/service/impl/AccountServiceImpl.java

@@ -11,6 +11,7 @@ import com.hp.user.client.service.AccountService;
 import com.hp.user.client.service.MessageService;
 import com.hp.user.service.dao.AccountMapper;
 import com.hp.user.service.entity.Account;
+import com.hp.user.service.entity.CustomerCompany;
 import com.hp.user.service.utils.WeixinSignUtil;
 
 import java.util.ArrayList;
@@ -222,6 +223,29 @@ public class AccountServiceImpl implements AccountService {
         return result;
     }
 
+    @Override
+    public DataResult<AccountVO> queryByUserId(String userId) {
+        AccountVO accountVO = new AccountVO();
+        DataResult<AccountVO> result = new DataResult<>();
+        try{
+            Account temp = accountMapper.selectById(userId);
+            // 这个已经被删除
+            if (temp == null || temp.getSysDeleted() == 1){
+                result.setCode("-1");
+                result.setMessage("账号不存在/已删除");
+                return result;
+            }
+            else {
+                BeanUtils.copyProperties(temp, accountVO);
+                result.setCode("0");
+                result.setData(accountVO);
+            }
+        }catch(Exception e){
+
+        }
+        return result;
+    }
+
     @Override
     public Result delete(String userId) {
         Account temp;

user-service/src/main/java/com/hp/user/service/impl/AuditServiceImpl.java

@@ -6,6 +6,7 @@ import com.hp.user.client.entity.DataResult;
 import com.hp.user.client.entity.Result;
 import com.hp.user.client.service.AuditService;
 import com.hp.user.service.dao.AuditMapper;
+import com.hp.user.service.entity.Account;
 import com.hp.user.service.entity.Audit;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +45,26 @@ public class AuditServiceImpl implements AuditService {
         return result;
     }
 
+    @Override
+    public Result update(AuditVO audit) {
+        Result result = new Result();
+        Audit temp = new Audit();
+        int flag = 0;
+        try {
+            BeanUtils.copyProperties(audit, temp);
+            flag = auditMapper.updateById(temp);
+        } catch (Exception e) {
+
+        }
+        if (SqlHelper.retBool(flag)) {
+            result.setCode("0");
+        } else {
+            result.setCode("-1");
+            result.setMessage("更新失败");
+        }
+        return result;
+    }
+
     @Override
     public DataResult<AuditVO> queryAuditByAuditId(String auditId) {
         AuditVO auditVO = new AuditVO();

user-service/src/main/java/com/hp/user/service/impl/CustomerCompanyServiceImpl.java

@@ -226,10 +226,14 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService {
             customerCompanyMapper.selectPage(page, wrapper);
             List<CustomerCompany> companys = page.getRecords();
             CustomerCompanyVO t;
+            DataResult<CustomerServiceProviderEnterpriseVO> tt;
             for (CustomerCompany company : companys) {
                 t = new CustomerCompanyVO();
                 BeanUtils.copyProperties(company, t);
-                t.setServiceProviderId(csService.queryServiceProviderIdByCompanyId(company.getCustomerId()).getData());
+                tt=csService.queryCsByCompanyId(company.getCustomerId());
+                if (tt.getCode().equals("0")) {
+                    t.setServiceProviderId(tt.getData().getServiceProviderId());
+                }
                 companyVOs.add(t);
             }
             result.setCode("0");

user-service/src/main/java/com/hp/user/service/impl/CustomerServiceProviderEnterpriseServiceImpl.java

@@ -141,8 +141,8 @@ public class CustomerServiceProviderEnterpriseServiceImpl implements CustomerSer
     }
 
     @Override
-    public DataResult<String> queryServiceProviderIdByCompanyId(String companyId) {
-        DataResult<String> result = new DataResult<>();
+    public DataResult<CustomerServiceProviderEnterpriseVO> queryCsByCompanyId(String companyId){
+        DataResult<CustomerServiceProviderEnterpriseVO> result = new DataResult<>();
         QueryWrapper<CustomerServiceProviderEnterprise> wrapper = new QueryWrapper<>();
         try {
             if (companyId == null){
@@ -152,14 +152,16 @@ public class CustomerServiceProviderEnterpriseServiceImpl implements CustomerSer
             }
             wrapper.eq("enterprise_id", companyId);
             CustomerServiceProviderEnterprise cs = csMapper.selectOne(wrapper);
+            CustomerServiceProviderEnterpriseVO temp = new CustomerServiceProviderEnterpriseVO();
             if (cs == null) {
                 result.setCode("-1");
-                result.setMessage("未查找到企业对应的服务商Id");
+                result.setMessage("未查找到企业对应的服务商关系");
                 return result;
             }
             else {
+                BeanUtils.copyProperties(cs, temp);
                 result.setCode("0");
-                result.setData(cs.getServiceProviderId());
+                result.setData(temp);
             }
         } catch (Exception e) {
 

user-service/src/main/java/com/hp/user/service/impl/StationServiceImpl.java

@@ -146,12 +146,19 @@ public class StationServiceImpl implements StationService {
     }
 
     @Override
-    public PageResult<StationVO> getStationsPage(Long current, Integer size) {
+    public PageResult<StationVO> queryAllStationsPageByCompanyIdAndStationName(String companyId,String stationName,Long current, Integer size){
         PageResult<StationVO> result = new PageResult<>();
         List<StationVO> stationVOList = new ArrayList<>();
         IPage<Station> page = new Page<>(current, size);
         QueryWrapper<Station> wrapper = new QueryWrapper<>();
         try{
+            if(companyId==null){
+                result.setCode("-1");
+                result.setMessage("企业Id 不能为空");
+                return result;
+            }
+            wrapper.eq("enterprise_id", companyId);
+            if (stationName != null) wrapper.like("name", stationName);
             wrapper.orderByDesc("sys_create_time");
             wrapper.eq("sys_deleted", 0);
             stationMapper.selectPage(page, wrapper);

user-service/src/main/resources/mapper/CustomerCompanyMapper.xml

@@ -3,13 +3,27 @@
 <mapper namespace="com.hp.user.service.dao.CustomerCompanyMapper">
 
     <select id="selectCompanyAuditPage" resultType="com.hp.user.service.entity.CompanyAudit">
-        select a.name,a.type,a.industry_code,a.longitude,a.latitude,a.enterprise_tax_number,a.business_license,a.business_contact,a.phone_number,a.address,a.province_code,a.city_code,a.count_code,b.* from tb_customer_company as a,tb_customer_audit as b
+--         select a.name,a.type,a.industry_code,a.longitude,a.latitude,a.enterprise_tax_number,a.business_license,a.business_contact,a.phone_number,a.address,a.province_code,a.city_code,a.count_code,b.* from tb_customer_company as a,tb_customer_audit as b
+--         where a.customer_id = b.user_id and a.sys_deleted = 0 and a.type = 1 ORDER BY a.name,b.sys_create_time DESC
+--          select a.name,a.type,a.industry_code,a.longitude,a.latitude,a.enterprise_tax_number,a.business_license,a.business_contact,a.phone_number,a.address,a.province_code,a.city_code,a.count_code,b.*,c.user_name check_name
+--         from tb_customer_company as a,tb_customer_audit as b,tb_account as c
+--         where a.customer_id = b.user_id and b.sys_creator = c.user_id and a.sys_deleted = 0 and a.type = 1 ORDER BY a.name,b.sys_create_time DESC
+        select a.name,a.type,a.industry_code,a.longitude,a.latitude,a.enterprise_tax_number,a.business_license,a.business_contact,a.phone_number,a.address,a.province_code,a.city_code,a.count_code,b.*,c.user_name check_name
+        from tb_customer_company as a,tb_customer_audit as b left join tb_account as c on b.sys_creator = c.user_id
         where a.customer_id = b.user_id and a.sys_deleted = 0 and a.type = 1 ORDER BY a.name,b.sys_create_time DESC
     </select>
     <select id="queryCompanyAuditPageByNameAndStatusAndCreateTime" resultType="com.hp.user.service.entity.CompanyAudit">
-        select a.name,a.type,a.industry_code,a.longitude,a.latitude,a.enterprise_tax_number,a.business_license,a.business_contact,a.phone_number,a.address,a.province_code,a.city_code,a.count_code,b.* from tb_customer_company as a,tb_customer_audit as b
+<!--        select a.name,a.type,a.industry_code,a.longitude,a.latitude,a.enterprise_tax_number,a.business_license,a.business_contact,a.phone_number,a.address,a.province_code,a.city_code,a.count_code,b.* from tb_customer_company as a,tb_customer_audit as b-->
+<!--        where a.customer_id = b.user_id and a.sys_deleted = 0 and a.type = 1-->
+<!--        <if test="name != null"> and a.name = #{name} </if>-->
+<!--        <if test="status != 0"> and b.status = #{status} </if>-->
+<!--        <if test="startTime != null"> and b.sys_create_time  &gt;= #{startTime} </if>-->
+<!--        <if test="endTime != null"> and b.sys_create_time &lt;= #{endTime} </if>-->
+<!--        ORDER BY a.name,b.sys_create_time DESC-->
+        select a.name,a.type,a.industry_code,a.longitude,a.latitude,a.enterprise_tax_number,a.business_license,a.business_contact,a.phone_number,a.address,a.province_code,a.city_code,a.count_code,b.*,c.user_name checkname
+        from tb_customer_company as a,tb_customer_audit as b left join tb_account as c on b.sys_creator = c.user_id
         where a.customer_id = b.user_id and a.sys_deleted = 0 and a.type = 1
-        <if test="name != null"> and a.name = #{name} </if>
+        <if test="name != null"> and a.name like concat('%', #{name}, '%')</if>
         <if test="status != 0"> and b.status = #{status} </if>
         <if test="startTime != null"> and b.sys_create_time  &gt;= #{startTime} </if>
         <if test="endTime != null"> and b.sys_create_time &lt;= #{endTime} </if>