Merge branch 'master_20240722' of http://git.dgtis.com/15896567520/oneportal_saas into master_20240722

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/meeting/reserve/vo/OaMeetingReserveRespVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.bpm.controller.admin.meeting.reserve.vo;
 
+import cn.iocoder.yudao.framework.common.util.date.DateUtils;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -25,7 +26,7 @@ public class OaMeetingReserveRespVO {
     // @ExcelProperty("会议室id")
     private Long roomId;
 
-    @Schema(description = "会议室名称", example = "上海会议室")
+    @Schema(description = "会议室名称")
     @ExcelProperty("会议室名称")
     private String roomName;
 
@@ -46,11 +47,11 @@ public class OaMeetingReserveRespVO {
     private Long applyEmployeeId;
 
     @Schema(description = "申请人名字")
-    @ExcelProperty("申请人名字")
+    @ExcelProperty("申请人")
     private String applyEmployeeName;
 
     @Schema(description = "申请人手机号")
-    @ExcelProperty("申请人手机号")
+    @ExcelProperty("手机号")
     private String applyEmployeePhone;
 
     @Schema(description = "申请人部门")
@@ -58,7 +59,7 @@ public class OaMeetingReserveRespVO {
     private Long deptId;
 
     @Schema(description = "申请人部门名称")
-    @ExcelProperty("申请人部门名称")
+    @ExcelProperty("申请部门")
     private String depName;
 
     @Schema(description = "参会人数")
@@ -82,15 +83,16 @@ public class OaMeetingReserveRespVO {
     private String status;
 
     @Schema(description = "会议预定状态描述：1未开始 2进行中 3已结束 4已取消", example = "2")
-    @ExcelProperty("会议预定状态描述：1未开始 2进行中 3已结束 4已取消")
+    @ExcelProperty("状态")
     private String statusDesc;
 
     @Schema(description = "会议内容")
-    @ExcelProperty("会议内容")
+    // @ExcelProperty("会议内容")
     private String meetingContent;
 
     @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
+    @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime createTime;
 
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/business/vo/OaBusinessRespVO.java

@@ -76,7 +76,7 @@ public class OaBusinessRespVO {
     private String day;
 
     @Schema(description = "出差预算费用，单位（元）")
-    @ExcelProperty("出差预算费用，单位（元）")
+    @ExcelProperty("出差预算费用（元）")
     private BigDecimal estimatedCost;
 
     @Schema(description = "申请人id")

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/expense/vo/OaExpenseRespVO.java

@@ -69,7 +69,7 @@ public class OaExpenseRespVO {
     private String expenseMonth;
 
     @Schema(description = "报销总金额，单位（元）")
-    @ExcelProperty("报销总金额，单位（元）")
+    @ExcelProperty("报销总金额（元）")
     private BigDecimal totalMoney;
 
     @Schema(description = "备注")

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/purchase/vo/OaPurchaseRespVO.java

@@ -57,7 +57,7 @@ public class OaPurchaseRespVO {
     private String employeePhone;
 
     @Schema(description = "总预算金额，单位（元）")
-    @ExcelProperty("总预算金额，单位（元）")
+    @ExcelProperty("总预算金额（元）")
     private BigDecimal totalBudget;
 
     @Schema(description = "预期供应商")

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/stamp/stampinfo/vo/OaStampInfoRespVO.java

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.bpm.controller.admin.stamp.stampinfo.vo;
 
+import cn.iocoder.yudao.framework.common.util.date.DateUtils;
 import cn.iocoder.yudao.module.infra.api.file.dto.FileDTO;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -98,8 +100,9 @@ public class OaStampInfoRespVO {
     @ExcelProperty("创建人")
     private String createEmployeeName;
 
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
+    @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime createTime;
 
     @Schema(description = "附件列表")

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/stamp/stampseal/vo/OaStampSealRespVO.java

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.bpm.controller.admin.stamp.stampseal.vo;
 
+import cn.iocoder.yudao.framework.common.util.date.DateUtils;
 import cn.iocoder.yudao.module.infra.api.file.dto.FileDTO;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -15,11 +17,11 @@ import java.util.List;
 public class OaStampSealRespVO {
 
     @Schema(description = "主键")
-    @ExcelProperty("主键")
+    // @ExcelProperty("主键")
     private Long id;
 
     @Schema(description = "类型：1印章，目前只有印章")
-    @ExcelProperty("类型：1印章，目前只有印章")
+    // @ExcelProperty("类型：1印章，目前只有印章")
     private String type;
 
     @Schema(description = "印章名称", example = "李四")
@@ -27,11 +29,11 @@ public class OaStampSealRespVO {
     private String sealName;
 
     @Schema(description = "状态，1打开 2关闭")
-    @ExcelProperty("状态，1打开 2关闭")
+    // @ExcelProperty("状态，1打开 2关闭")
     private String status;
 
     @Schema(description = "状态描述，1打开 2关闭")
-    @ExcelProperty("状态描述，1打开 2关闭")
+    @ExcelProperty("状态")
     private String statusDesc;
 
     @Schema(description = "有效期起")
@@ -43,19 +45,20 @@ public class OaStampSealRespVO {
     private String endDate;
 
     @Schema(description = "备注")
-    @ExcelProperty("备注")
+    // @ExcelProperty("备注")
     private String remarks;
 
-    @Schema(description = "创建员工姓名", example = "创建员工姓名")
-    @ExcelProperty("创建员工姓名")
+    @Schema(description = "创建员工姓名")
+    @ExcelProperty("创建人")
     private String createEmployeeName;
 
-    @Schema(description = "创建员工id", example = "创建员工id")
-    @ExcelProperty("创建员工id")
+    @Schema(description = "创建员工id")
+    // @ExcelProperty("创建员工id")
     private Long creator;
 
     @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
+    @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime createTime;
 
     @Schema(description = "附件列表")

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

@@ -23,7 +23,7 @@ public class AssetInfoRespVO {
     private String name;
 
     @Schema(description = "资产编号：年月日+uuid")
-    @ExcelProperty("资产编号：年月日+uuid")
+    @ExcelProperty("资产编号")
     private String assetInfoUuid;
 
     @Schema(description = "资产型号")
@@ -43,7 +43,7 @@ public class AssetInfoRespVO {
     private String capitalizationDate;
 
     @Schema(description = "折旧年限(大于0的自然数)")
-    @ExcelProperty("折旧年限(大于0的自然数)")
+    @ExcelProperty("折旧年限")
     private Integer depreciationYear;
 
     @Schema(description = "资产状态：0可用 1占用 2报废")
@@ -106,7 +106,7 @@ public class AssetInfoRespVO {
     // @ExcelProperty("备注")
     private String remarks;
 
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "创建时间")
     // @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 

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

@@ -11,43 +11,43 @@ import lombok.Data;
 public class AssetReceiveInfoRespVO {
 
     @Schema(description = "主键自增id")
-    @ExcelProperty("主键自增id")
+    // @ExcelProperty("主键自增id")
     private Long id;
 
     @Schema(description = "领用编号uuid")
-    @ExcelProperty("领用编号uuid")
+    // @ExcelProperty("领用编号uuid")
     private String receiveInfoUuid;
 
     @Schema(description = "领用人id")
-    @ExcelProperty("领用人id")
+    // @ExcelProperty("领用人id")
     private Long employeeId;
 
     @Schema(description = "领用人姓名")
-    @ExcelProperty("领用人姓名")
+    @ExcelProperty("领用人")
     private String employeeName;
 
     @Schema(description = "领用人手机号")
-    @ExcelProperty("领用人手机号")
+    @ExcelProperty("手机号")
     private String employeePhone;
 
     @Schema(description = "部门id")
-    @ExcelProperty("部门id")
+    // @ExcelProperty("部门id")
     private Long deptId;
 
     @Schema(description = "部门名称")
-    @ExcelProperty("部门名称")
+    @ExcelProperty("部门")
     private String deptName;
 
     @Schema(description = "职位id")
-    @ExcelProperty("职位id")
+    // @ExcelProperty("职位id")
     private Long postId;
 
     @Schema(description = "职位名称")
-    @ExcelProperty("职位名称")
+    @ExcelProperty("职位")
     private String position;
 
     @Schema(description = "固定资产信息表主键id")
-    @ExcelProperty("固定资产信息表主键id")
+    // @ExcelProperty("固定资产信息表主键id")
     private Long assetInfoId;
 
     @Schema(description = "固定资产名称")
@@ -63,11 +63,11 @@ public class AssetReceiveInfoRespVO {
     private String reason;
 
     @Schema(description = "是否归还：0未归还，1已归还")
-    @ExcelProperty("是否归还：0未归还，1已归还")
+    // @ExcelProperty("是否归还：0未归还，1已归还")
     private Integer returned;
 
     @Schema(description = "是否归还描述：0未归还，1已归还")
-    @ExcelProperty("是否归还描述：0未归还，1已归还")
+    @ExcelProperty("是否归还")
     private String returnedDesc;
 
     @Schema(description = "归还日期")
@@ -79,15 +79,15 @@ public class AssetReceiveInfoRespVO {
     private String returnReason;
 
     @Schema(description = "创建者")
-    @ExcelProperty("创建者")
+    // @ExcelProperty("创建者")
     private Long creator;
 
     @Schema(description = "更新者")
-    @ExcelProperty("更新者")
+    // @ExcelProperty("更新者")
     private Long updater;
 
     @Schema(description = "操作人姓名")
-    @ExcelProperty("操作人姓名")
+    @ExcelProperty("操作人")
     private String operatorName;
 
 }

yudao-module-finance/yudao-module-cash-biz/src/main/java/cn/iocoder/yudao/module/cash/controller/admin/paymentinfo/vo/PaymentInfoRespVO.java

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.cash.controller.admin.paymentinfo.vo;
 
+import cn.iocoder.yudao.framework.common.util.date.DateUtils;
 import cn.iocoder.yudao.module.infra.api.file.dto.FileDTO;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -63,8 +65,9 @@ public class PaymentInfoRespVO {
     @ExcelProperty("创建人")
     private String creatorName;
 
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
+    @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime createTime;
 
     @Schema(description = "附件列表")

yudao-module-finance/yudao-module-cash-biz/src/main/java/cn/iocoder/yudao/module/cash/controller/admin/refundinfo/vo/RefundInfoRespVO.java

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.cash.controller.admin.refundinfo.vo;
 
+import cn.iocoder.yudao.framework.common.util.date.DateUtils;
 import cn.iocoder.yudao.module.infra.api.file.dto.FileDTO;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -87,8 +89,9 @@ public class RefundInfoRespVO {
     @ExcelProperty("创建人")
     private String creatorName;
 
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
+    @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime createTime;
 
     @Schema(description = "附件列表")

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

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.contract.controller.admin.customercontract.vo;
 
+import cn.iocoder.yudao.framework.common.util.date.DateUtils;
 import cn.iocoder.yudao.module.infra.api.file.dto.FileDTO;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -72,7 +74,7 @@ public class CustomerContractRespVO {
     private Long deptId;
 
     @Schema(description = "负责人部门名称")
-    @ExcelProperty("负责人部门名称")
+    @ExcelProperty("负责人部门")
     private String deptName;
 
     @Schema(description = "合同状态：0、未归档；1、已归档；2、已完结")
@@ -129,6 +131,7 @@ public class CustomerContractRespVO {
 
     @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
+    @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime createTime;
 
     @Schema(description = "附件列表")

yudao-module-finance/yudao-module-contract-biz/src/main/java/cn/iocoder/yudao/module/contract/controller/admin/suppliercontract/vo/SupplierContractRespVO.java

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.contract.controller.admin.suppliercontract.vo;
 
+import cn.iocoder.yudao.framework.common.util.date.DateUtils;
 import cn.iocoder.yudao.module.infra.api.file.dto.FileDTO;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -129,6 +131,7 @@ public class SupplierContractRespVO {
 
     @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
+    @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime createTime;
 
     @Schema(description = "附件列表")

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

@@ -76,7 +76,7 @@ public class CustomerContractServiceImpl implements CustomerContractService {
         }
         String customerContractCode = createReqVO.getCustomerContractCode();
         if (StrUtil.isNotBlank(customerContractCode)) {
-            validateCustomerContractCode(customerContractCode);
+            validateCustomerContractCode(customerContractCode, createReqVO.getId());
         }
         String customerContractName = createReqVO.getCustomerContractName();
         if (StrUtil.isNotBlank(customerContractName)) {
@@ -137,9 +137,13 @@ public class CustomerContractServiceImpl implements CustomerContractService {
         }
     }
 
-    private void validateCustomerContractCode(String customerContractCode) {
-        Long aLong = customerContractMapper.selectCount(CustomerContractDO::getCustomerContractCode, customerContractCode);
-        if (aLong > 0) {
+    private void validateCustomerContractCode(String customerContractCode, Long id) {
+        LambdaQueryWrapper<CustomerContractDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(CustomerContractDO::getCustomerContractCode, customerContractCode);
+        if (Objects.nonNull(id)) {
+            lambdaQueryWrapper.ne(CustomerContractDO::getId, id);
+        }
+        if (customerContractMapper.selectCount(lambdaQueryWrapper) > 0) {
             throw exception(CUSTOMER_CONTRACT_CODE_EXISTS);
         }
     }
@@ -148,6 +152,10 @@ public class CustomerContractServiceImpl implements CustomerContractService {
     public void updateCustomerContract(CustomerContractSaveReqVO updateReqVO) {
         // 校验存在
         CustomerContractDO customerContractDO = validateCustomerContractExists(updateReqVO.getId());
+        String customerContractCode = updateReqVO.getCustomerContractCode();
+        if (StrUtil.isNotBlank(customerContractCode)) {
+            validateCustomerContractCode(customerContractCode, updateReqVO.getId());
+        }
         String customerContractName = updateReqVO.getCustomerContractName();
         if (StrUtil.isNotBlank(customerContractName)) {
             validateCustomerContractName(customerContractName, updateReqVO.getId());

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

@@ -25,7 +25,7 @@ public interface SupplierContractService {
 
     /**
      * 创建采购合同信息
-     *
+     *【
      * @param createReqVO 创建信息
      * @return 编号
      */

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

@@ -73,7 +73,7 @@ public class SupplierContractServiceImpl implements SupplierContractService {
         }
         String supplierContractCode = createReqVO.getSupplierContractCode();
         if (StrUtil.isNotBlank(supplierContractCode)) {
-            validateSupplierContractCode(supplierContractCode);
+            validateSupplierContractCode(supplierContractCode, createReqVO.getId());
         }
         String supplierContractName = createReqVO.getSupplierContractName();
         if (StrUtil.isNotBlank(supplierContractName)) {
@@ -134,9 +134,13 @@ public class SupplierContractServiceImpl implements SupplierContractService {
         }
     }
 
-    private void validateSupplierContractCode(String supplierContractCode) {
-        Long aLong = supplierContractMapper.selectCount(SupplierContractDO::getSupplierContractCode, supplierContractCode);
-        if (aLong > 0) {
+    private void validateSupplierContractCode(String supplierContractCode, Long id) {
+        LambdaQueryWrapper<SupplierContractDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(SupplierContractDO::getSupplierContractCode, supplierContractCode);
+        if (Objects.nonNull(id)) {
+            lambdaQueryWrapper.ne(SupplierContractDO::getId, id);
+        }
+        if (supplierContractMapper.selectCount(lambdaQueryWrapper) > 0) {
             throw exception(SUPPLIER_CONTRACT_CODE_EXISTS);
         }
     }
@@ -149,6 +153,10 @@ public class SupplierContractServiceImpl implements SupplierContractService {
         if (StrUtil.isNotBlank(supplierContractName)) {
             validateSupplierContractName(supplierContractName, updateReqVO.getId());
         }
+        String supplierContractCode = updateReqVO.getSupplierContractCode();
+        if (StrUtil.isNotBlank(supplierContractCode)) {
+            validateSupplierContractCode(supplierContractCode, updateReqVO.getId());
+        }
         String startDate = updateReqVO.getStartDate();
         String endDate = updateReqVO.getEndDate();
         if (StrUtil.isNotBlank(startDate) && StrUtil.isNotBlank(endDate)) {

yudao-module-finance/yudao-module-expense-biz/src/main/java/cn/iocoder/yudao/module/expense/controller/admin/expenseinfo/vo/ExpenseInfoRespVO.java

@@ -79,7 +79,7 @@ public class ExpenseInfoRespVO {
     private String expenseMonth;
 
     @Schema(description = "总预算金额，单位（元）")
-    @ExcelProperty("总预算金额，单位（元）")
+    @ExcelProperty("总预算金额，（元）")
     private BigDecimal totalMoney;
 
     @Schema(description = "备注")