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

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

@@ -14,6 +14,16 @@ public class Result implements Serializable{
 	 * 
 	 */
 	private String message;
+	public Result(){}
+
+	public Result(String code) {
+		this.code = code;
+	}
+
+	public Result(String code, String message) {
+		this.code = code;
+		this.message = message;
+	}
 
 	public String getCode() {
 		return code;

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

@@ -18,6 +18,7 @@ public interface CustomerServiceProviderEnterpriseService {
     public Result insert(CustomerServiceProviderEnterpriseVO cs);
     public Result update(CustomerServiceProviderEnterpriseVO cs);
     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 Result insertBatch(List<CustomerServiceProviderEnterpriseVO> csVOList);

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

@@ -42,7 +42,7 @@ 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();
+        Result result = new Result(), result1 = new Result(), result2 = new Result("0");
         result1 = customerCompanyService.insert(company);
         if (serviceProviderId != null) {
             CustomerServiceProviderEnterpriseVO temp = new CustomerServiceProviderEnterpriseVO(IdWorker.generactorId().toString(), serviceProviderId, company.getCustomerId());
@@ -85,7 +85,7 @@ public class CompanyController {
     @Transactional
     public Result updateCompany(@RequestBody CustomerCompanyVO company, String serviceProviderId) {
         boolean flag1 = true, flag2 = true;
-        Result result = new Result(), result1 = new Result(), result2 = new Result();
+        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);
@@ -118,19 +118,20 @@ public class CompanyController {
     @ApiOperation(value = "删除企业/服务商", notes = "若删除企业，则需要填serviceProviderId")
     @GetMapping("/deleteCompanyByCompanyId")
     public Result deleteCompanyByCompanyId(@RequestParam String companyId, String serviceProviderId) {
-        Result result = new Result(), result1 = new Result(), result2 = new Result();
+        Result result = new Result(), result1, result2;
         result1 = customerCompanyService.delete(companyId);
-        if (serviceProviderId != null) {
+        if (serviceProviderId != null) { // 删除企业
             DataResult temp = csService.queryCsByCompanyIdAndServiceProviderId(companyId, serviceProviderId);
             if (temp.getCode().equals("0")) {
                 CustomerServiceProviderEnterpriseVO cs = (CustomerServiceProviderEnterpriseVO) temp.getData();
-                cs.setServiceProviderId(serviceProviderId);
                 result2 = csService.delete(cs.getId());
             } else {
                 result.setCode("-1");
                 result.setMessage(temp.getMessage());
                 return result;
             }
+        }else{ // 删除服务商
+            result2=csService.deleteByServiceProviderId(companyId);
         }
         if (result1.getCode().equals("0") && result2.getCode().equals("0")) {
             result.setCode("0");

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

@@ -282,4 +282,8 @@ public class CustomerCompany implements Serializable {
     public Short getStatus() {
         return status;
     }
+
+    public void setStatus(Short status) {
+        this.status = status;
+    }
 }

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

@@ -242,14 +242,14 @@ public class AccountServiceImpl implements AccountService {
 
     @Override
     public PageResult<AccountVO> queryAccountsPageByCompanyIdAndUserNameAndPhoneAndStatus(String companyId, String userName, String phone, Integer status, Long current, Integer size) {
-        PageResult<AccountVO> accountPage = new PageResult<>();
+        PageResult<AccountVO> result = new PageResult<>();
         IPage<Account> page = new Page<>(current, size);
         QueryWrapper<Account> wrapper = new QueryWrapper<>();
         try {
             if (companyId == null) {
-                accountPage.setCode("-1");
-                accountPage.setMessage("服务商/企业Id 不能为空");
-                return accountPage;
+                result.setCode("-1");
+                result.setMessage("服务商/企业Id 不能为空");
+                return result;
             }
             wrapper.eq("company_id", companyId);
             wrapper.orderByDesc("sys_create_time");
@@ -265,15 +265,15 @@ public class AccountServiceImpl implements AccountService {
                 BeanUtils.copyProperties(account, temp);
                 accountVOs.add(temp);
             }
-            accountPage.setCode("0");
-            accountPage.setDataList(accountVOs);
-            accountPage.setTotal(page.getTotal());
-            accountPage.setCurrent(current);
-            accountPage.setSize(size);
+            result.setCode("0");
+            result.setDataList(accountVOs);
+            result.setTotal(page.getTotal());
+            result.setCurrent(current);
+            result.setSize(size);
         } catch (Exception e) {
 
         }
-        return accountPage;
+        return result;
     }
 
     @Override

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

@@ -180,6 +180,7 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService {
                 BeanUtils.copyProperties(company, temp);
                 companyVOs.add(temp);
             }
+            result.setCode("0");
             result.setDataList(companyVOs);
             result.setTotal(page.getTotal());
             result.setCurrent(current);
@@ -231,6 +232,7 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService {
                 t.setServiceProviderId(csService.queryServiceProviderIdByCompanyId(company.getCustomerId()).getData());
                 companyVOs.add(t);
             }
+            result.setCode("0");
             result.setDataList(companyVOs);
             result.setTotal(page.getTotal());
             result.setCurrent(current);
@@ -254,6 +256,7 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService {
                 BeanUtils.copyProperties(companyAudit, temp);
                 companyAuditVOList.add(temp);
             }
+            result.setCode("0");
             result.setDataList(companyAuditVOList);
             result.setTotal(page.getTotal());
             result.setCurrent(current);
@@ -278,6 +281,7 @@ public class CustomerCompanyServiceImpl implements CustomerCompanyService {
                 BeanUtils.copyProperties(companyAudit, temp);
                 companyAuditVOList.add(temp);
             }
+            result.setCode("0");
             result.setDataList(companyAuditVOList);
             result.setTotal(page.getTotal());
             result.setCurrent(current);

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

@@ -15,7 +15,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -90,6 +92,25 @@ public class CustomerServiceProviderEnterpriseServiceImpl implements CustomerSer
         return result;
     }
 
+    @Override
+    public Result deleteByServiceProviderId(String serviceProviderId) {
+        Result result = new Result();
+        int flag=0;
+        Map<String, Object> map = new HashMap<>();
+        map.put("service_provider_id",serviceProviderId);
+        try{
+            flag=csMapper.deleteByMap(map);
+        }catch (Exception e){
+
+        }if (SqlHelper.retBool(flag)) {
+            result.setCode("0");
+        } else {
+            result.setCode("-1");
+            result.setMessage("删除失败");
+        }
+        return result;
+    }
+
     @Override
     public DataResult<CustomerServiceProviderEnterpriseVO> queryCsByCompanyIdAndServiceProviderId(String companyId, String serviceProviderId) {
         DataResult<CustomerServiceProviderEnterpriseVO> result = new DataResult<>();

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

@@ -162,6 +162,7 @@ public class StationServiceImpl implements StationService {
                 BeanUtils.copyProperties(station, temp);
                 stationVOList.add(temp);
             }
+            result.setCode("0");
             result.setDataList(stationVOList);
             result.setTotal(page.getTotal());
             result.setCurrent(current);