1、合同开启清空关闭原因

2、历史合同详情显示客户名称

yudao-module-finance/yudao-module-contract-biz/src/main/java/cn/iocoder/yudao/module/contract/controller/admin/customercontract/CustomerContractController.java

@@ -294,6 +294,14 @@ public class CustomerContractController {
         if (Objects.nonNull(ownerDept)) {
             customerContractRespVO.setDeptName(ownerDept.getName());
         }
+        // 客户名称
+        Long customerId = customerContractHistory.getCustomerId();
+        if (customerId != null) {
+            CustomerInfoDTO customerInfo = customerInfoApi.getCustomerInfo(customerId);
+            if (customerInfo != null) {
+                customerContractRespVO.setCustomerName(customerInfo.getCustomerName());
+            }
+        }
         // 合同状态描述
         Map<String, String> contractStatusMap = Arrays.stream(ContractStatusEnum.values())
                 .collect(Collectors.toMap(ContractStatusEnum::getStatus, ContractStatusEnum::getDesc));

yudao-module-finance/yudao-module-contract-biz/src/main/java/cn/iocoder/yudao/module/contract/service/customercontract/CustomerContractServiceImpl.java

@@ -19,6 +19,7 @@ import cn.iocoder.yudao.module.employee.api.dto.EmployeeRespDTO;
 import cn.iocoder.yudao.module.infra.api.file.FileApi;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -251,11 +252,11 @@ public class CustomerContractServiceImpl implements CustomerContractService {
         if (GeneralStatusEnum.NO.getStatus().equals(customerContractDO.getClosed())) {
             throw exception(CUSTOMER_CONTRACT_NOT_CLOSED);
         }
-        CustomerContractDO build = CustomerContractDO.builder()
-                .id(id)
-                .closed(GeneralStatusEnum.NO.getStatus())
-                .build();
-        return customerContractMapper.updateById(build);
+        LambdaUpdateWrapper<CustomerContractDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        lambdaUpdateWrapper.set(CustomerContractDO::getClosed, GeneralStatusEnum.NO.getStatus())
+                .set(CustomerContractDO::getCloseReason, null)
+                .eq(CustomerContractDO::getId, id);
+        return customerContractMapper.update(lambdaUpdateWrapper);
     }
 
     @Override

yudao-module-finance/yudao-module-contract-biz/src/main/java/cn/iocoder/yudao/module/contract/service/suppliercontract/SupplierContractServiceImpl.java

@@ -19,6 +19,7 @@ import cn.iocoder.yudao.module.employee.api.dto.EmployeeRespDTO;
 import cn.iocoder.yudao.module.infra.api.file.FileApi;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -229,11 +230,11 @@ public class SupplierContractServiceImpl implements SupplierContractService {
         if (GeneralStatusEnum.NO.getStatus().equals(supplierContractDO.getClosed())) {
             throw exception(SUPPLIER_CONTRACT_NOT_CLOSED);
         }
-        SupplierContractDO build = SupplierContractDO.builder()
-                .id(id)
-                .closed(GeneralStatusEnum.NO.getStatus())
-                .build();
-        return supplierContractMapper.updateById(build);
+        LambdaUpdateWrapper<SupplierContractDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        lambdaUpdateWrapper.set(SupplierContractDO::getClosed, GeneralStatusEnum.NO.getStatus())
+                .set(SupplierContractDO::getCloseReason, null)
+                .eq(SupplierContractDO::getId, id);
+        return supplierContractMapper.update(lambdaUpdateWrapper);
     }
 
     @Override