lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10-22-bug修复

Browse Source
This commit is contained in:
青云
2025-10-23 11:14:21 +08:00
parent 48ab59c67d
commit 4ecee185bf
16 changed files with 71 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
xinnengyuan/ruoyi-admin/src/main/resources/application.yml
View File

@ -304,6 +304,7 @@ xss:
- /system/notice
- /warm-flow/save-xml
- /project/project
- /xzd/**
# 全局线程池相关配置
# 如使用JDK21请直接使用虚拟线程 不要开启此配置

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractChange.java
View File

@ -193,5 +193,9 @@ public class XzdContractChange extends BaseEntity {
*/
private Long danjuId;
/**
* 合同文本
*/
private String htwb;
}

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractDetails.java
View File

@ -230,5 +230,9 @@ public class XzdContractDetails extends BaseEntity {
*/
private String fileId;
/**
* 合同文本
*/
private String htwb;
}

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierEvaluation.java
View File

@ -6,6 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial;
@ -57,6 +58,8 @@ public class XzdSupplierEvaluation extends BaseEntity {
/**
* 评价时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date evaluationTime;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierSupplement.java
View File

@ -68,6 +68,8 @@ public class XzdSupplierSupplement extends BaseEntity {
/**
* 创建日期
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date createDate;
/**

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractChangeBo.java
View File

@ -225,4 +225,9 @@ public class XzdContractChangeBo extends BaseEntity {
*/
private List<XzdHtglHtbgqd> htbgqds;
/**
* 合同文本
*/
private String htwb;
}

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java
View File

@ -272,4 +272,9 @@ public class XzdContractDetailsBo extends BaseEntity {
*/
private List<XzdHtglHtbgqd> htbgqds;
/**
* 合同文本
*/
private String htwb;
}

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierEvaluationBo.java
View File

@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 供应商评价业务对象 xzd_supplier_evaluation
@ -61,6 +62,8 @@ public class XzdSupplierEvaluationBo extends BaseEntity {
* 评价时间
*/
@NotNull(message = "评价时间不能为空", groups = { AddGroup.class, EditGroup.class })
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date evaluationTime;

2
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierInfoBo.java
View File

@ -33,7 +33,7 @@ public class XzdSupplierInfoBo extends BaseEntity {
/**
* 单位编号
*/
@NotBlank(message = "单位编号不能为空", groups = { AddGroup.class, EditGroup.class })
// @NotBlank(message = "单位编号不能为空", groups = { AddGroup.class, EditGroup.class })
private String unitCode;
/**

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractChangeVo.java
View File

@ -296,4 +296,9 @@ public class XzdContractChangeVo implements Serializable {
*/
private List<XzdHtglHtbgqd> htbgqds;
/**
* 合同文本
*/
private String htwb;
}

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java
View File

@ -364,5 +364,9 @@ public class XzdContractDetailsVo implements Serializable {
*/
private List<XzdHtglHtbgqd> htbgqds;
/**
* 合同文本
*/
private String htwb;
}

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierEvaluationVo.java
View File

@ -9,6 +9,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serial;
import java.io.Serializable;
@ -69,6 +70,8 @@ public class XzdSupplierEvaluationVo implements Serializable {
* 评价时间
*/
@ExcelProperty(value = "评价时间")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date evaluationTime;

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierInfoVo.java
View File

@ -397,7 +397,11 @@ public class XzdSupplierInfoVo implements Serializable {
*/
private String createByUser;
private Long createBy;
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date updateTime;
/**

31
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectManagerApprovalServiceImpl.java
View File

@ -121,23 +121,26 @@ public class XzdProjectManagerApprovalServiceImpl extends ServiceImpl<XzdProject
@Override
public Boolean updateByBo(XzdProjectManagerApprovalBo bo) {
//先通过BO中ID获取老数据的文件ID
XzdProjectManagerApprovalVo oldVo = baseMapper.selectVoById(bo.getId());
List<String> list = Arrays.stream(oldVo.getFileId().split(",")).toList();
XzdProjectManagerApprovalVo old = baseMapper.selectVoById(bo.getId());
List<String> news = Arrays.stream(bo.getFileId().split(",")).toList();
List<Long> deleteIds = new ArrayList<>();
for (String id : list) {
if (!news.contains(id)){
deleteIds.add(Long.valueOf(id));
//更新文件
if (bo.getFileId() != null && !bo.getFileId().isEmpty()){
if (old.getFileId() != null && !old.getFileId().isEmpty()) {
List<Long> oldFileId = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList();
List<Long> nowFileId = Arrays.stream(bo.getFileId().split(",")).map(Long::valueOf).toList();
for (Long l : oldFileId) {
if (!nowFileId.contains(l)) {
sysOssService.deleteWithValidByIds(List.of(l), false);
}
}
}
}else {
if (old.getFileId()!= null && !old.getFileId().isEmpty()){
List<Long> deleteIds = Arrays.stream(old.getFileId().split(",")).map(Long::valueOf).toList();
sysOssService.deleteWithValidByIds(deleteIds, false);
}
}
sysOssService.deleteWithValidByIds(deleteIds, false);
//
// if (!oldVo.getFileId().equals(bo.getFileId())){
// //如果不一样则先删除旧的再更新
// sysOssService.deleteWithValidByIds(List.of(Long.valueOf(oldVo.getFileId())), false);
// }
XzdProjectManagerApproval update = MapstructUtils.convert(bo, XzdProjectManagerApproval.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java
View File

@ -218,6 +218,7 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
bo.getSupplement().setSupplierId(add.getId());
if (LoginHelper.getLoginUser() != null){
bo.getSupplement().setCreator(LoginHelper.getLoginUser().getNickname());
bo.getSupplement().setCreateDate(new Date());
}else {
bo.getSupplement().setCreator("暂无");
}

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml
View File

@ -8,11 +8,13 @@
SELECT
info.id,info.unit_code,info.unit_name,info.unified_social_credit_code,
supplement.belonging_organization as sszz,
settlement.opening_bank as khyh,
settlement.account_number as khhzh,
# settlement.opening_bank as khyh,
# settlement.account_number as khhzh,
bank.open_bank as khyh,
bank.account as khhzh,
supplement.creator as createByUser,
supplement.create_date as createTime,
supplement.update_time as updateTime,
info.create_time as createTime,
info.update_time as updateTime,
supplement.responsible_department as fgbm,
supplement.responsible_salesman as fgywy,
supplement.supplier_status as gyszt,
@ -31,9 +33,9 @@
LEFT JOIN xzd_supplier_supplement as supplement ON info.id = supplement.supplier_id
LEFT JOIN xzd_settlement_info as settlement ON info.id = settlement.customerinformation_id
# LEFT JOIN xzd_customertype_info as typeInfo ON typeInfo.type like '2' AND info.id = typeInfo.customerinformation_id
# LEFT JOIN xzd_customertype as type ON typeInfo.customertype_id = type.id AND type.is_main_type = 1
LEFT JOIN xzd_contact as contact ON info.id = contact.customerinformation_id AND contact.type like '2' AND contact.is_main_contact = 1
LEFT JOIN xzd_supplier_open_bank as bank ON info.id = bank.Supplier_id AND bank.is_default = 1
<where>
<if test='bo.unifiedSocialCreditCode != null and bo.unifiedSocialCreditCode != ""'>
AND info.unified_social_credit_code = #{bo.unifiedSocialCreditCode}
@ -88,6 +90,7 @@
</if>
</where>
ORDER BY info.create_time DESC
<if test='bo.pageNum != null and bo.pageSize != null'>
LIMIT #{bo.pageSize} OFFSET #{bo.offset}
</if>