From 4537506ae3f02402a3557db14fbe79ab50694fe4 Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Fri, 14 Mar 2025 18:21:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98=E3=80=81?= =?UTF-8?q?=E6=9D=90=E6=96=99=E3=80=81=E6=9C=BA=E6=A2=B0=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E3=80=81=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/project/domain/BusContractor.java | 5 +++ .../req/contractor/ContractorCreateReq.java | 6 +++ .../req/contractor/ContractorUpdateReq.java | 6 +++ .../project/domain/vo/BusContractorVo.java | 15 ++++--- .../impl/BusContractorServiceImpl.java | 43 ++++++++++++++----- 5 files changed, 58 insertions(+), 17 deletions(-) diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusContractor.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusContractor.java index 0a3c81f2..68b877af 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusContractor.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/BusContractor.java @@ -55,6 +55,11 @@ public class BusContractor extends BaseEntity { */ private String custodianPhone; + /** + * 公司相关文件 + */ + private String files; + /** * 备注 */ diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorCreateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorCreateReq.java index df60b683..71561bfc 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorCreateReq.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorCreateReq.java @@ -4,6 +4,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.util.Map; /** * @author lcj @@ -40,6 +41,11 @@ public class ContractorCreateReq implements Serializable { */ private String custodianPhone; + /** + * 公司相关文件 + */ + private Map fileMap; + /** * 备注 */ diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorUpdateReq.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorUpdateReq.java index 11602c72..b162061b 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorUpdateReq.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorUpdateReq.java @@ -4,6 +4,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.util.Map; /** * @author lcj @@ -45,6 +46,11 @@ public class ContractorUpdateReq implements Serializable { */ private String custodianPhone; + /** + * 公司相关文件 + */ + private Map fileMap; + /** * 备注 */ diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusContractorVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusContractorVo.java index 9bb922e2..1917eff0 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusContractorVo.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/BusContractorVo.java @@ -1,19 +1,14 @@ package org.dromara.project.domain.vo; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.project.domain.BusContractor; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -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.dromara.project.domain.BusContractor; import java.io.Serial; import java.io.Serializable; -import java.util.Date; - +import java.util.Map; /** @@ -66,6 +61,12 @@ public class BusContractorVo implements Serializable { @ExcelProperty(value = "管理人联系电话") private String custodianPhone; + /** + * 公司相关文件 + */ + @ExcelProperty(value = "公司相关文件") + private Map fileMap; + /** * 备注 */ diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java index 8bd2ad47..47bbe6b2 100644 --- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java +++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java @@ -2,6 +2,8 @@ package org.dromara.project.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -27,7 +29,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Collection; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 分包单位Service业务层处理 @@ -96,8 +100,12 @@ public class BusContractorServiceImpl extends ServiceImpl fileMap = req.getFileMap(); + String fileMapStr = JSONUtil.toJsonStr(fileMap); + contractor.setFiles(fileMapStr); // 数据校验 - validEntityBeforeSave(contractor); + validEntityBeforeSave(contractor, true); // 操作数据库 boolean save = this.save(contractor); if (!save) { @@ -117,8 +125,12 @@ public class BusContractorServiceImpl extends ServiceImpl fileMap = req.getFileMap(); + String fileMapStr = JSONUtil.toJsonStr(fileMap); + contractor.setFiles(fileMapStr); // 数据校验 - validEntityBeforeSave(contractor); + validEntityBeforeSave(contractor, false); // 判断是否存在 BusContractor oldContractor = this.getById(contractor.getId()); if (oldContractor == null) { @@ -131,15 +143,17 @@ public class BusContractorServiceImpl extends ServiceImpl fileMap = new HashMap<>(); + JSONObject parseObj = JSONUtil.parseObj(files); + parseObj.forEach((key, value) -> fileMap.put(key, (Long) value)); + contractorVo.setFileMap(fileMap); return contractorVo; }