From 2497527c77df770f578a92cf60173232b80b7154 Mon Sep 17 00:00:00 2001 From: dfdg <2710245601@qq.com> Date: Mon, 13 Oct 2025 21:47:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/BusProjectServiceImpl.java | 13 +++++++------ .../org/dromara/xzd/domain/XzdDeductionItems.java | 6 ++++-- .../org/dromara/xzd/service/IXzdProjectService.java | 2 ++ .../xzd/service/IXzdSupplierInfoService.java | 1 + .../xzd/service/impl/XzdProjectServiceImpl.java | 6 ++++++ .../service/impl/XzdSupplierInfoServiceImpl.java | 6 ++++++ 6 files changed, 26 insertions(+), 8 deletions(-) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java index b9b6ed01..8e4936af 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java @@ -1191,13 +1191,14 @@ public class BusProjectServiceImpl extends ServiceImpl> getInfoData(TanchuangInfoReq req) { Map> map = new HashMap<>(); SubConstructionUser byUserId = constructionUserService.getByUserId(req.getId()); - SubContractor contractor = contractorService.getById(byUserId.getContractorId()); Map renyuan = new HashMap<>(); - renyuan.put("name", byUserId.getUserName()); - renyuan.put("teamName", byUserId.getTeamName()); - renyuan.put("phone", byUserId.getPhone()); - renyuan.put("typeOfWork", dictDataService.selectDictLabel("type_of_work", byUserId.getTypeOfWork())); - renyuan.put("contractorNmae", contractor.getName()); + if (byUserId != null){ + renyuan.put("name", byUserId.getUserName() != null ? byUserId.getUserName():""); + renyuan.put("teamName", byUserId.getTeamName() != null ? byUserId.getTeamName():""); + renyuan.put("phone", byUserId.getPhone() != null ? byUserId.getPhone():""); + renyuan.put("typeOfWork", dictDataService.selectDictLabel("type_of_work", byUserId.getTypeOfWork())); + renyuan.put("contractorNmae",byUserId.getContractorId() != null ? contractorService.getById(byUserId.getContractorId()).getName():""); + } map.put("renyuan", renyuan); return map; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdDeductionItems.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdDeductionItems.java index ab04cd79..f30fbd8f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdDeductionItems.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdDeductionItems.java @@ -4,6 +4,8 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.time.LocalDate; import java.util.Date; import java.io.Serial; @@ -86,12 +88,12 @@ public class XzdDeductionItems extends BaseEntity { /** * 归还时间 */ - private Date returnTime; + private LocalDate returnTime; /** * 变更归还时间 */ - private Date changeReturnTime; + private LocalDate changeReturnTime; /** * 申请扣除（0：否，1：是） diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdProjectService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdProjectService.java index 6edaee6e..95f8f5f9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdProjectService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdProjectService.java @@ -67,4 +67,6 @@ public interface IXzdProjectService extends IService{ * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + String queryNameById(Long projectId); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdSupplierInfoService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdSupplierInfoService.java index 9df420e6..52a5d29a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdSupplierInfoService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/IXzdSupplierInfoService.java @@ -73,4 +73,5 @@ public interface IXzdSupplierInfoService extends IService{ R> typeList(); + String queryNameById(Long id); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java index 1f09432e..54901eac 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java @@ -503,6 +503,12 @@ public class XzdProjectServiceImpl extends ServiceImpl 0; } + @Override + public String queryNameById(Long projectId) { + XzdProject xzdProject = baseMapper.selectById(projectId); + return xzdProject != null ? xzdProject.getProjectName() : ""; + } + private void setValue(XzdProjectVo entity){ //项目概况 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java index 17ae7c60..9bb4e0fe 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java @@ -630,6 +630,12 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl list){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();