Merge remote-tracking branch 'origin/master_20240722' into lc_saas

yudao-module-customer/yudao-module-customer-biz/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/businessopportunity/CustomerBusinessOpportunityController.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.customer.controller.admin.businessopportunity;
 
+import cn.iocoder.yudao.module.customer.controller.admin.info.vo.CustomerInfoRespVO;
+import cn.iocoder.yudao.module.customer.service.info.CustomerInfoService;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -43,6 +45,8 @@ public class CustomerBusinessOpportunityController {
     private CustomerBusinessOpportunityService businessOpportunityService;
     @Resource
     private DeptApi deptApi;
+    @Resource
+    private CustomerInfoService customerInfoService;
 
     @PostMapping("/create")
     @Operation(summary = "创建客户商机")
@@ -87,11 +91,17 @@ public class CustomerBusinessOpportunityController {
                 // 部门
                 if (respVO.getDeptId() != null) {
                     DeptRespDTO dept = deptApi.getDept(respVO.getDeptId());
-                    respVO.setDeptName(dept.getName());
                     if (dept != null && StringUtils.isNotBlank(dept.getName())) {
                         respVO.setDeptName(dept.getName());
                     }
                 }
+                // 客户
+                if (respVO.getCustomerId() != null) {
+                    CustomerInfoRespVO infoRespVO = customerInfoService.getById(respVO.getCustomerId());
+                    if (infoRespVO != null && StringUtils.isNotBlank(infoRespVO.getCustomerName())) {
+                        respVO.setCustomerName(infoRespVO.getCustomerName());
+                    }
+                }
             });
         }
         return success(result);
@@ -105,9 +115,29 @@ public class CustomerBusinessOpportunityController {
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<CustomerBusinessOpportunityDO> list = businessOpportunityService.getBusinessOpportunityPage(pageReqVO).getList();
+        List<CustomerBusinessOpportunityRespVO> result = BeanUtils.toBean(list, CustomerBusinessOpportunityRespVO.class);
+        if (result != null && result.size() > 0) {
+            result.forEach(respVO -> {
+                // 部门
+                if (respVO.getDeptId() != null) {
+                    DeptRespDTO dept = deptApi.getDept(respVO.getDeptId());
+                    if (dept != null && StringUtils.isNotBlank(dept.getName())) {
+                        respVO.setDeptName(dept.getName());
+                    }
+                }
+                // 客户
+                if (respVO.getCustomerId() != null) {
+                    CustomerInfoRespVO infoRespVO = customerInfoService.getById(respVO.getCustomerId());
+                    if (infoRespVO != null && StringUtils.isNotBlank(infoRespVO.getCustomerName())) {
+                        respVO.setCustomerName(infoRespVO.getCustomerName());
+                    }
+                }
+            });
+        }
+
         // 导出 Excel
         ExcelUtils.write(response, "客户商机.xls", "数据", CustomerBusinessOpportunityRespVO.class,
-                        BeanUtils.toBean(list, CustomerBusinessOpportunityRespVO.class));
+                result);
     }
 
     @GetMapping("/getOpportunityCode")

yudao-module-customer/yudao-module-customer-biz/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/businessopportunity/vo/CustomerBusinessOpportunityPageReqVO.java

@@ -56,7 +56,7 @@ public class CustomerBusinessOpportunityPageReqVO extends PageParam {
     private String estimatedSuccessRate;
 
     @Schema(description = "预计进单时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDate[] estimatedDealTime;
 
     @Schema(description = "商机等级：1-潜在，2-可能，3-重点跟进")

yudao-module-customer/yudao-module-customer-biz/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/businessopportunity/vo/CustomerBusinessOpportunityRespVO.java

@@ -34,6 +34,10 @@ public class CustomerBusinessOpportunityRespVO {
     @ExcelProperty("客户id")
     private Long customerId;
 
+    @Schema(description = "客户名称", example = "人事部")
+    @ExcelProperty("客户名称")
+    private String customerName;
+
     @Schema(description = "商机名称", example = "王五")
     @ExcelProperty("商机名称")
     private String opportunityName;

yudao-module-customer/yudao-module-customer-biz/src/main/java/cn/iocoder/yudao/module/customer/controller/admin/info/CustomerInfoController.java

@@ -88,7 +88,6 @@ public class CustomerInfoController {
                 // 部门
                 if (respVO.getDeptId() != null) {
                     DeptRespDTO dept = deptApi.getDept(respVO.getDeptId());
-                    respVO.setDeptName(dept.getName());
                     if (dept != null && StringUtils.isNotBlank(dept.getName())) {
                         respVO.setDeptName(dept.getName());
                     }
@@ -138,7 +137,6 @@ public class CustomerInfoController {
                 // 部门
                 if (respVO.getDeptId() != null) {
                     DeptRespDTO dept = deptApi.getDept(respVO.getDeptId());
-                    respVO.setDeptName(dept.getName());
                     if (dept != null && StringUtils.isNotBlank(dept.getName())) {
                         respVO.setDeptName(dept.getName());
                     }

yudao-module-customer/yudao-module-customer-biz/src/main/java/cn/iocoder/yudao/module/customer/service/businessopportunity/CustomerBusinessOpportunityServiceImpl.java

@@ -4,6 +4,8 @@ import cn.hutool.core.util.IdUtil;
 import cn.iocoder.yudao.framework.security.core.LoginUser;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
+import cn.iocoder.yudao.module.customer.controller.admin.info.vo.CustomerInfoRespVO;
+import cn.iocoder.yudao.module.customer.service.info.CustomerInfoService;
 import cn.iocoder.yudao.module.employee.api.EmployeeApi;
 import cn.iocoder.yudao.module.employee.api.dto.EmployeeRespDTO;
 import cn.iocoder.yudao.module.infra.api.file.FileApi;
@@ -47,6 +49,8 @@ public class CustomerBusinessOpportunityServiceImpl implements CustomerBusinessO
     private DeptApi deptApi;
     @Resource
     private EmployeeApi employeeApi;
+    @Resource
+    private CustomerInfoService customerInfoService;
 
     @Override
     public Long createBusinessOpportunity(CustomerBusinessOpportunitySaveReqVO createReqVO) {
@@ -148,6 +152,13 @@ public class CustomerBusinessOpportunityServiceImpl implements CustomerBusinessO
                 respVO.setDeptName(dept.getName());
             }
         }
+        // 客户
+        if (opportunityDO.getCustomerId() != null) {
+            CustomerInfoRespVO infoRespVO = customerInfoService.getById(opportunityDO.getCustomerId());
+            if (infoRespVO != null && StringUtils.isNotBlank(infoRespVO.getCustomerName())) {
+                respVO.setCustomerName(infoRespVO.getCustomerName());
+            }
+        }
         // 第五步：返回VO对象
         return respVO;
     }

yudao-module-customer/yudao-module-customer-biz/src/main/java/cn/iocoder/yudao/module/customer/service/info/CustomerInfoServiceImpl.java

@@ -168,6 +168,7 @@ public class CustomerInfoServiceImpl implements CustomerInfoService {
     }
 
     @Override
+    @TenantIgnore
     public void updateOpenStatus(Long id, Integer status) {
         // 校验存在
         validateInfoExists(id);

yudao-module-finance/yudao-module-asset-biz/src/main/java/cn/iocoder/yudao/module/asset/controller/admin/assetinfo/vo/AssetInfoRespVO.java

@@ -60,7 +60,7 @@ public class AssetInfoRespVO {
 
     @Schema(description = "领用人姓名")
     @ExcelProperty("领用人姓名")
-    private Long receiveEmployeeName;
+    private String receiveEmployeeName;
 
     @Schema(description = "领用信息表主键id")
     @ExcelProperty("领用信息表主键id")

yudao-module-finance/yudao-module-asset-biz/src/main/java/cn/iocoder/yudao/module/asset/controller/admin/assetinfo/vo/AssetInfoRetireReqVO.java

@@ -12,7 +12,7 @@ public class AssetInfoRetireReqVO {
 
     @Schema(description = "资产信息主键自增id",requiredMode = Schema.RequiredMode.REQUIRED,example = "1")
     @NotNull(message = "资产信息主键自增id不能为空")
-    private Long id;
+    private Long assetInfoId;
 
     @Schema(description = "报废日期", requiredMode = Schema.RequiredMode.REQUIRED, example = "2024-08-08")
     @NotBlank(message = "报废日期不能为空")

yudao-module-finance/yudao-module-asset-biz/src/main/java/cn/iocoder/yudao/module/asset/service/assetinfo/AssetInfoServiceImpl.java

@@ -152,7 +152,7 @@ public class AssetInfoServiceImpl implements AssetInfoService {
 
     @Override
     public void retireInfo(AssetInfoRetireReqVO retireReqVO) {
-        Long id = retireReqVO.getId();
+        Long id = retireReqVO.getAssetInfoId();
         AssetInfoDO assetInfoDO = validateInfoExists(id);
         if (AssetStateEnum.OCCUPIED.getState().equals(assetInfoDO.getAssetState())) {
             throw exception(new ErrorCode(OCCUPIED_ASSET_NOT_ALLOWED_DELETE.getCode(), "资产正在使用，不能报废"));

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/controller/admin/business/AttendanceBusinessController.java

@@ -96,7 +96,6 @@ public class AttendanceBusinessController {
                 // 部门
                 if (respVO.getDeptId() != null) {
                     DeptRespDTO dept = deptApi.getDept(respVO.getDeptId());
-                    respVO.setDeptName(dept.getName());
                     if (dept != null && StringUtils.isNotBlank(dept.getName())) {
                         respVO.setDeptName(dept.getName());
                     }

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/controller/admin/leave/AttendanceLeaveController.java

@@ -97,7 +97,6 @@ public class AttendanceLeaveController {
                 // 部门
                 if (respVO.getDeptId() != null) {
                     DeptRespDTO dept = deptApi.getDept(respVO.getDeptId());
-                    respVO.setDeptName(dept.getName());
                     if (dept != null && StringUtils.isNotBlank(dept.getName())) {
                         respVO.setDeptName(dept.getName());
                     }

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/controller/admin/out/AttendanceOutController.java

@@ -97,7 +97,6 @@ public class AttendanceOutController {
                 // 部门
                 if (respVO.getDeptId() != null) {
                     DeptRespDTO dept = deptApi.getDept(respVO.getDeptId());
-                    respVO.setDeptName(dept.getName());
                     if (dept != null && StringUtils.isNotBlank(dept.getName())) {
                         respVO.setDeptName(dept.getName());
                     }

yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/controller/admin/conversion/RelationsConversionController.java

@@ -86,7 +86,6 @@ public class RelationsConversionController {
                 // 部门
                 if (respVO.getDeptId() != null) {
                     DeptRespDTO dept = deptApi.getDept(respVO.getDeptId());
-                    respVO.setDeptName(dept.getName());
                     if (dept != null && StringUtils.isNotBlank(dept.getName())) {
                         respVO.setDeptName(dept.getName());
                     }

yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/controller/admin/entry/RelationsEntryController.java

@@ -86,7 +86,6 @@ public class RelationsEntryController {
                 // 部门
                 if (respVO.getDeptId() != null) {
                     DeptRespDTO dept = deptApi.getDept(respVO.getDeptId());
-                    respVO.setDeptName(dept.getName());
                     if (dept != null && StringUtils.isNotBlank(dept.getName())) {
                         respVO.setDeptName(dept.getName());
                     }

yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/controller/admin/renew/RelationsRenewController.java

@@ -88,7 +88,6 @@ public class RelationsRenewController {
                 // 部门
                 if (respVO.getDeptId() != null) {
                     DeptRespDTO dept = deptApi.getDept(respVO.getDeptId());
-                    respVO.setDeptName(dept.getName());
                     if (dept != null && StringUtils.isNotBlank(dept.getName())) {
                         respVO.setDeptName(dept.getName());
                     }

yudao-module-personnel/yudao-module-relations-biz/src/main/java/cn/iocoder/yudao/module/relations/controller/admin/turnover/RelationsTurnoverController.java

@@ -87,7 +87,6 @@ public class RelationsTurnoverController {
                 // 部门
                 if (respVO.getDeptId() != null) {
                     DeptRespDTO dept = deptApi.getDept(respVO.getDeptId());
-                    respVO.setDeptName(dept.getName());
                     if (dept != null && StringUtils.isNotBlank(dept.getName())) {
                         respVO.setDeptName(dept.getName());
                     }