diff --git a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java index 588ac3a6..69730387 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerControllerApi.java @@ -43,24 +43,12 @@ public interface CustomerControllerApi { @ApiOperation(value = "新增个人类型客户信息", notes = "新增个人类型客户信息") ResponseResult savePersonal(CustomerPersonalTOI customerPersonalTOI); - /** - * 新增企业类型客户信息 - */ - @ApiOperation(value = "新增企业类型客户信息", notes = "新增企业类型客户信息") - ResponseResult saveCompany(CustomerCompanyTOI customerCompanyTOI); - /** * 更新个人类型客户信息 */ @ApiOperation(value = "更新个人类型客户信息", notes = "更新个人类型客户信息") ResponseResult updatePersonal(CustomerPersonalTOU customerPersonalTOU); - /** - * 更新企业类型客户信息 - */ - @ApiOperation(value = "更新企业类型客户信息", notes = "更新企业类型客户信息") - ResponseResult updateCompany(CustomerCompanyTOU customerCompanyTOU); - /** * 导入excel数据 */ diff --git a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerWorkbenchControllerApi.java b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerWorkbenchControllerApi.java index 35864f87..2a1bb093 100644 --- a/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerWorkbenchControllerApi.java +++ b/dq-financial-api/src/main/java/com/daqing/financial/crms/CustomerWorkbenchControllerApi.java @@ -43,24 +43,12 @@ public interface CustomerWorkbenchControllerApi { @ApiOperation(value = "新增个人类型客户信息", notes = "新增个人类型客户信息") ResponseResult savePersonal(CustomerPersonalTOI customerPersonalTOI); - /** - * 新增企业 - */ - @ApiOperation(value = "新增企业类型客户信息", notes = "新增企业类型客户信息") - ResponseResult saveCompany(CustomerCompanyTOI customerCompanyTOI); - /** * 更新个人类型客户信息 */ @ApiOperation(value = "更新个人类型客户信息", notes = "更新个人类型客户信息") ResponseResult updatePersonal(CustomerPersonalTOU customerPersonalTOU); - /** - * 更新企业类型客户信息 - */ - @ApiOperation(value = "更新企业类型客户信息", notes = "更新企业类型客户信息") - ResponseResult updateCompany(CustomerCompanyTOU customerCompanyTOU); - /** * 通过审核 */ diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java index 269fff02..45b1e9c1 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java @@ -1,6 +1,7 @@ package com.daqing.financial.crms.controller; import com.daqing.financial.crms.CustomerControllerApi; +import com.daqing.financial.crms.model.request.CompanyCustomerRequest; import com.daqing.financial.crms.service.CustomerService; import com.daqing.framework.domain.crms.CompanyCustomerEntity; import com.daqing.framework.domain.crms.CustomerEntity; @@ -100,8 +101,8 @@ public class CustomerController implements CustomerControllerApi { * 保存企业类型客户信息 */ @PostMapping("/saveCompany") - public ResponseResult saveCompany(@RequestBody @Valid CustomerCompanyTOI customerCompanyTOI) { - boolean result = customerService.saveCustomerCompany(customerCompanyTOI); + public ResponseResult saveCompany(@RequestBody @Valid CompanyCustomerRequest companyCustomerRequest) { + boolean result = customerService.insertCompany(companyCustomerRequest); return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.SAVE_FAIL); } @@ -118,8 +119,8 @@ public class CustomerController implements CustomerControllerApi { * 更新企业类型客户信息 */ @PostMapping("/updateCompany") - public ResponseResult updateCompany(@RequestBody @Valid CustomerCompanyTOU customerCompanyTOU) { - boolean result = customerService.updateCustomerCompany(customerCompanyTOU); + public ResponseResult updateCompany(@RequestBody @Valid CompanyCustomerRequest companyCustomerRequest) { + boolean result = customerService.updateCompanyNew(companyCustomerRequest); return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.UPDATE_FAIL); } diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerWorkbenchController.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerWorkbenchController.java index 8dab38d6..bbb0c997 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerWorkbenchController.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerWorkbenchController.java @@ -79,7 +79,7 @@ public class CustomerWorkbenchController implements CustomerWorkbenchControllerA /** * 新增个人 */ - @PostMapping("/savePersonal") + @PostMapping("/savePersonal") // .................................. @Override public ResponseResult savePersonal(@RequestBody CustomerPersonalTOI customerPersonalTOI) { @@ -91,19 +91,19 @@ public class CustomerWorkbenchController implements CustomerWorkbenchControllerA /** * 新增企业 */ - @PostMapping("/saveCompany") + /*@PostMapping("/saveCompany") @Override public ResponseResult saveCompany(@RequestBody CustomerCompanyTOI customerCompanyTOI) { boolean result = customerWorkbenchService.saveCompany(customerCompanyTOI); return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.SAVE_FAIL); - } + }*/ /** * 修改个人 */ - @PostMapping("/updatePersonal") + @PostMapping("/updatePersonal") // .............................. @Override public ResponseResult updatePersonal(@RequestBody CustomerPersonalTOU customerPersonalTOU) { @@ -115,14 +115,14 @@ public class CustomerWorkbenchController implements CustomerWorkbenchControllerA /** * 修改企业 */ - @PostMapping("/updateCompany") + /*@PostMapping("/updateCompany") @Override public ResponseResult updateCompany(@RequestBody CustomerCompanyTOU customerCompanyTOU) { Boolean result = customerWorkbenchService.updateCompany(customerCompanyTOU); return result ? ResponseResult.SUCCESS() : new ResponseResult(CommonCode.UPDATE_FAIL); - } + }*/ /** * 通过审核 @@ -161,7 +161,7 @@ public class CustomerWorkbenchController implements CustomerWorkbenchControllerA /** * 新增企业(新) */ - @ApiOperation(value = "新增企业(新)") + @ApiOperation(value = "新增企业(新)") // ............................. @PostMapping("/insertCompany") public ResponseResult insertCompany(@RequestBody CompanyCustomerRequest companyCustomerReq) { @@ -173,7 +173,7 @@ public class CustomerWorkbenchController implements CustomerWorkbenchControllerA /** * 修改企业(新) */ - @ApiOperation(value = "修改企业(新)") + @ApiOperation(value = "修改企业(新)")// ...................................... @PostMapping("/updateCompanyNew") public ResponseResult updateCompanyNew(@RequestBody CompanyCustomerRequest companyCustomerReq) { diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java index 2e4c702a..e2188df1 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerService.java @@ -33,11 +33,11 @@ public interface CustomerService extends IService { boolean saveCustomerPersonal(CustomerPersonalTOI customerPersonalTOI); - boolean saveCustomerCompany(CustomerCompanyTOI customerCompanyTOI); + /*boolean saveCustomerCompany(CustomerCompanyTOI customerCompanyTOI);*/ boolean updateCustomerPersonal(CustomerPersonalTOU customerPersonalTOU); - boolean updateCustomerCompany(CustomerCompanyTOU customerCompanyTOU); + /*boolean updateCustomerCompany(CustomerCompanyTOU customerCompanyTOU);*/ void excelExportCustomer(HttpServletResponse response); diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerWorkbenchService.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerWorkbenchService.java index 82fca913..a2a7e453 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerWorkbenchService.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/CustomerWorkbenchService.java @@ -29,11 +29,11 @@ public interface CustomerWorkbenchService extends IService { Boolean savePersonal(CustomerPersonalTOI customerPersonalTOI); - Boolean saveCompany(CustomerCompanyTOI customerCompanyTOI); + /*Boolean saveCompany(CustomerCompanyTOI customerCompanyTOI);*/ Boolean updatePersonal(CustomerPersonalTOU customerPersonalTOU); - Boolean updateCompany(CustomerCompanyTOU customerCompanyTOU); + /*Boolean updateCompany(CustomerCompanyTOU customerCompanyTOU);*/ Boolean pass(Long id,Long manager); diff --git a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java index 34c101fc..51bf5f6c 100644 --- a/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java +++ b/dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java @@ -219,7 +219,7 @@ public class CustomerServiceImpl extends ServiceImpl { } public static ResponseResult FAIL(Object t) { - return new ResponseResult<>(false, 99999, t, "操作失败!"); + return new ResponseResult<>(false, 99999, t, "操作失败,请检查客户经理是否为公司已存在员工或者文件和数据格式!"); } public ResponseResult SUCCESS_DATA(T t){