客户资源管理系统修复

dq-financial-crms/src/main/java/com/daqing/financial/crms/controller/CustomerController.java

@@ -126,6 +126,7 @@ public class CustomerController implements CustomerControllerApi {
     /**
      * 更新企业类型客户信息
      */
+    @ApiOperation(value = "更新企业类型客户信息", notes = "更新企业类型客户信息")
     @Log(detail = "更新企业类型客户信息",level = 4,operationUnit = OperationUnit.COMPANY,operationType = OperationType.UPDATE)
     @PostMapping("/updateCompany")
     public ResponseResult updateCompany(@RequestBody @Valid CompanyCustomerRequest companyCustomerRequest) {

dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerServiceImpl.java

@@ -666,7 +666,10 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
         customerEntity.setMotifyTime(new Date());
         customerEntity.setManager(companyCustomerReq.getManager());
         boolean customer = customerDao.updateCustomer(customerEntity);
-        companyCustomerEntity.setCustomerId(customerEntity.getId());
+        //根据id查询crms_company_customer表里面的customerId
+        CompanyCustomerEntity entity = companyCustomerDao.selectOne(new QueryWrapper<CompanyCustomerEntity>()
+                .eq("customer_id", customerEntity.getId()));
+        companyCustomerEntity.setCustomerId(entity.getId());
         int company = companyCustomerDao.update(companyCustomerEntity, new QueryWrapper<CompanyCustomerEntity>()
                 .eq("customer_id", companyCustomerEntity.getCustomerId()));
 
@@ -680,7 +683,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerDao, CustomerEntity
         for (int i = 0; i < intList.size(); i++) {
             CrmsCustomerRelated crmsCustomerRelated = new CrmsCustomerRelated();
             Integer integer = intList.get(i);
-            crmsCustomerRelated.setCustomerId(companyCustomerEntity.getId().intValue());//企业id
+            crmsCustomerRelated.setCustomerId(companyCustomerEntity.getCustomerId().intValue());//企业id  companyCustomerEntity.getId().intValue()
             crmsCustomerRelated.setRelatedId(integer);//关联人/企业id
             relatedList.add(crmsCustomerRelated);
         }

dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerWorkbenchServiceImpl.java

@@ -301,7 +301,7 @@ public class CustomerWorkbenchServiceImpl extends ServiceImpl<CustomerWorkbenchD
     @Transactional
     public Boolean updateCompanyNew(CompanyCustomerRequest companyCustomerReq) {
 
-        Long userId = Long.parseLong(this.getUserId());
+        Long userId = Long.parseLong("1");//this.getUserId()
         companyCustomerReq.setManager(userId);
         return customerService.updateCompanyNew(companyCustomerReq);
     }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlRepaymentEntryServiceImpl.java

@@ -137,7 +137,7 @@ public class AlRepaymentEntryServiceImpl extends ServiceImpl<AlRepaymentEntryMap
         map.put("overdueInterest",interestSum);
 
         //统计逾期额度（元）(计算状态为已逾期的所有本次还款的合计数)
-        map.put("overdueSum",currentSum);
+        map.put("currentSum",currentSum);
 
         //统计还款额度（元）(统计状态为已还款的本次还款)
         List<AlRepaymentEntry> list2 = this.baseMapper.selectList(new QueryWrapper<AlRepaymentEntry>()