From 910801b057e63e1868d427866c8efb3ec4b01e2b Mon Sep 17 00:00:00 2001 From: lg Date: Thu, 6 Nov 2025 16:46:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C=E5=88=86?= =?UTF-8?q?=E5=8C=85=E5=90=88=E5=90=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/bigscreen/domain/BusWjzx.java | 6 +++ .../bigscreen/domain/dto/BusWjzxBo.java | 5 ++ .../bigscreen/domain/vo/BusWjzxVo.java | 6 +++ .../service/impl/BusWjzxServiceImpl.java | 4 ++ ...XzdPurchaseContractSuspendServiceImpl.java | 10 +++- .../controller/XzdSubcontractController.java | 11 +++++ .../domain/XzdSubcontract.java | 7 +++ .../domain/bo/XzdSubcontractBo.java | 7 +++ .../domain/vo/XzdJdztVo.java | 27 ++++++++++ .../domain/vo/XzdSubcontractVo.java | 14 ++++++ .../service/IXzdSubcontractService.java | 4 ++ .../impl/XzdSubcontractServiceImpl.java | 42 +++++++++++++++- .../XzdSubcontractTerminationServiceImpl.java | 8 +++ ...PurchaseContractInformationController.java | 11 +++++ .../XzdPurchaseContractInformation.java | 6 +++ .../bo/XzdPurchaseContractInformationBo.java | 7 +++ .../domain/vo/XzdJdztCghtVo.java | 20 ++++++++ .../vo/XzdPurchaseContractInformationVo.java | 13 +++++ ...XzdPurchaseContractInformationService.java | 4 ++ ...urchaseContractInformationServiceImpl.java | 49 ++++++++++++++++--- .../java/org/dromara/xzd/enums/ZxdEnum.java | 8 ++- 21 files changed, 260 insertions(+), 9 deletions(-) create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdJdztVo.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdJdztCghtVo.java diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusWjzx.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusWjzx.java index 05a37172..4b9265dc 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusWjzx.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusWjzx.java @@ -37,6 +37,12 @@ public class BusWjzx extends BaseEntity { */ private String wjUrl; + + + /** + * 文件类型 + */ + private String wjlx; /** * 文件描述 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/BusWjzxBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/BusWjzxBo.java index fd0fe739..eaf37f18 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/BusWjzxBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/BusWjzxBo.java @@ -41,6 +41,11 @@ public class BusWjzxBo extends BaseEntity { */ private String gnms; + /** + * 文件类型 + */ + private String wjlx; + /** * 审核标志 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusWjzxVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusWjzxVo.java index 8e66aebb..f20b1ff3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusWjzxVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusWjzxVo.java @@ -51,6 +51,12 @@ public class BusWjzxVo implements Serializable { */ private String gnms; + + /** + * 文件类型 + */ + private String wjlx; + /** * 审核标志 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusWjzxServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusWjzxServiceImpl.java index 7aa7d863..922da07f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusWjzxServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusWjzxServiceImpl.java @@ -101,6 +101,10 @@ public class BusWjzxServiceImpl extends ServiceImpl impl public Boolean insertByBo(BusWjzxBo bo) { BusWjzx add = MapstructUtils.convert(bo, BusWjzx.class); validEntityBeforeSave(add); + if (add != null && StringUtils.isNotBlank(add.getWjm())){ + String[] split = add.getWjm().split("\\."); + add.setWjlx(split[split.length - 1]); + } boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setId(add.getId()); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java index 44c929cb..276f5a23 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java @@ -1,11 +1,13 @@ package org.dromara.xzd.contractManagement.caigoucontractTermination.service.impl; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.event.ProcessDeleteEvent; import org.dromara.common.core.domain.event.ProcessEvent; import org.dromara.common.core.domain.event.ProcessTaskEvent; +import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -18,6 +20,7 @@ import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.system.service.impl.SysOssServiceImpl; import org.dromara.xzd.biddingManagement.biaoqianlixiang.domain.vo.XzdBidPreProjectVo; import org.dromara.xzd.contractManagement.caigouhetongbiangeng.domain.XzdPurchaseContractAlteration; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.XzdSubcontract; import org.dromara.xzd.contractManagement.purchaseManagement.domain.XzdPurchaseContractInformation; import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo; import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; @@ -112,7 +115,7 @@ public class XzdPurchaseContractSuspendServiceImpl extends ServiceImpl queryPageList(XzdPurchaseContractSuspendBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - setValue(result.getRecords()); + setValue(result.getRecords()); return TableDataInfo.build(result); } @@ -242,6 +245,11 @@ public class XzdPurchaseContractSuspendServiceImpl extends ServiceImpl wrapper = new UpdateWrapper<>(); + wrapper.eq("id",vo.getContractInformationId()).set("sfzz","1"); + xzdPurchaseContractInformationService.getBaseMapper().update(wrapper); + } vo.setAuditStatus(processEvent.getStatus()); this.updateById(vo); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/controller/XzdSubcontractController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/controller/XzdSubcontractController.java index d04bcd86..750c3eb8 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/controller/XzdSubcontractController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/controller/XzdSubcontractController.java @@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdJdztVo; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.dromara.common.idempotent.annotation.RepeatSubmit; @@ -45,6 +46,16 @@ public class XzdSubcontractController extends BaseController { return xzdSubcontractService.queryPageList(bo, pageQuery); } + + /** + * 点击分包合同状态展示列表 + */ + @GetMapping("/listJdzt/{id}") + public XzdJdztVo listJdzt(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return xzdSubcontractService.listJdzt(id); + } + /** * 导出分包合同信息列表 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/XzdSubcontract.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/XzdSubcontract.java index 23321a94..2e1b439e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/XzdSubcontract.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/XzdSubcontract.java @@ -265,4 +265,11 @@ public class XzdSubcontract extends BaseEntity { private Long danjuId; + /** + * + * 是否终止 + */ + private String sfzz; + + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/bo/XzdSubcontractBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/bo/XzdSubcontractBo.java index 7e1392b7..4971d4f2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/bo/XzdSubcontractBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/bo/XzdSubcontractBo.java @@ -64,6 +64,13 @@ public class XzdSubcontractBo extends BaseEntity { private Long project; + + /** + * + * 是否终止 + */ + private String sfzz; + /** * 合同文本 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdJdztVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdJdztVo.java new file mode 100644 index 00000000..1e8ecb8f --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdJdztVo.java @@ -0,0 +1,27 @@ +package org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo; + + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import lombok.Data; +import org.dromara.xzd.contractManagement.fenbaohetongbiangg.domain.vo.XzdSubcontractChangeVo; +import org.dromara.xzd.contractManagement.fenbaohetongzhongzhi.domain.vo.XzdSubcontractTerminationVo; + +import java.util.List; + +@Data +@ExcelIgnoreUnannotated +public class XzdJdztVo { + + + private XzdSubcontractVo yslb; + + private List bglb; + + private List zzlb; + + + + + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java index c2e613e6..92be39ab 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java @@ -78,6 +78,20 @@ public class XzdSubcontractVo implements Serializable { */ private String contractText; + + /** + * + * 是否终止 + */ + private String sfzz; + + + + /** + * 阶段状态 + */ + private String jdzt; + /** * 项目 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/IXzdSubcontractService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/IXzdSubcontractService.java index 75cf06c4..25592300 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/IXzdSubcontractService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/IXzdSubcontractService.java @@ -1,5 +1,6 @@ package org.dromara.xzd.contractManagement.fenbaohetongxinxi.service; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdJdztVo; import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdSubcontractVo; import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.bo.XzdSubcontractBo; import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.XzdSubcontract; @@ -67,4 +68,7 @@ public interface IXzdSubcontractService extends IService{ * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + + XzdJdztVo listJdzt(Long id); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java index 54cd9fe4..17d0af12 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java @@ -6,6 +6,7 @@ import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.event.ProcessDeleteEvent; import org.dromara.common.core.domain.event.ProcessEvent; import org.dromara.common.core.domain.event.ProcessTaskEvent; +import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -18,6 +19,13 @@ import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.system.service.impl.SysOssServiceImpl; import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; import org.dromara.xzd.comprehensive.service.IXzdHtglHtbgqdService; +import org.dromara.xzd.contractManagement.fenbaohetongbiangg.domain.XzdSubcontractChange; +import org.dromara.xzd.contractManagement.fenbaohetongbiangg.domain.vo.XzdSubcontractChangeVo; +import org.dromara.xzd.contractManagement.fenbaohetongbiangg.service.IXzdSubcontractChangeService; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdJdztVo; +import org.dromara.xzd.contractManagement.fenbaohetongzhongzhi.domain.XzdSubcontractTermination; +import org.dromara.xzd.contractManagement.fenbaohetongzhongzhi.domain.vo.XzdSubcontractTerminationVo; +import org.dromara.xzd.contractManagement.fenbaohetongzhongzhi.service.IXzdSubcontractTerminationService; import org.dromara.xzd.contractManagement.purchaseManagement.domain.XzdPurchaseContractInformation; import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo; import org.dromara.xzd.domain.*; @@ -31,6 +39,7 @@ import org.dromara.xzd.service.IXzdDeductionItemsService; import org.dromara.xzd.service.impl.*; import org.dromara.xzd.utilS.AreaUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.bo.XzdSubcontractBo; @@ -75,6 +84,14 @@ public class XzdSubcontractServiceImpl extends ServiceImpl infos) { for (XzdSubcontractVo item : infos) { - // //合同文本-预收款项 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(XzdContractAdvanceInfo::getContractDetailsId, item.getId()); @@ -159,7 +175,17 @@ public class XzdSubcontractServiceImpl extends ServiceImpl list4 = xzdHtglHtbgqdService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(XzdHtglHtbgqd::getMainDocumentId, item.getId())); item.setHtbgqds(list4); +// 阶段状态 + item.setJdzt(ZxdEnum.HETONGZTYS.getTypeValue()); + Long l = xzdSubcontractChangeService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdSubcontractChange::getContractCode, item.getId())); + if (l > 0) { + item.setJdzt(ZxdEnum.HETONGZTBG.getTypeValue()); + } + Long l1 = xzdSubcontractTerminationService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdSubcontractTermination::getContractNumber, item.getId())); + if (l1 > 0) { + item.setJdzt(ZxdEnum.HETONGZTZZ.getTypeValue()); + } } } @@ -426,6 +452,20 @@ public class XzdSubcontractServiceImpl extends ServiceImpl 0; } + @Override + public XzdJdztVo listJdzt(Long id) { + XzdJdztVo res = new XzdJdztVo(); + + XzdSubcontractVo xzdSubcontractVo = this.queryById(id); + List xzdSubcontractChanges = xzdSubcontractChangeService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(XzdSubcontractChange::getContractCode, id)); + List xzdSubcontractTerminations = xzdSubcontractTerminationService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(XzdSubcontractTermination::getContractNumber, id)); + + res.setYslb(xzdSubcontractVo); + res.setBglb(MapstructUtils.convert(xzdSubcontractChanges, XzdSubcontractChangeVo.class)); + res.setZzlb(MapstructUtils.convert(xzdSubcontractTerminations, XzdSubcontractTerminationVo.class)); + + return res; + } /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/service/impl/XzdSubcontractTerminationServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/service/impl/XzdSubcontractTerminationServiceImpl.java index 7ddfb959..02cc396f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/service/impl/XzdSubcontractTerminationServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/service/impl/XzdSubcontractTerminationServiceImpl.java @@ -1,10 +1,12 @@ package org.dromara.xzd.contractManagement.fenbaohetongzhongzhi.service.impl; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.event.ProcessDeleteEvent; import org.dromara.common.core.domain.event.ProcessEvent; import org.dromara.common.core.domain.event.ProcessTaskEvent; +import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -18,6 +20,7 @@ import org.dromara.system.service.impl.SysOssServiceImpl; import org.dromara.xzd.contractManagement.caigoucontractTermination.domain.XzdPurchaseContractSuspend; import org.dromara.xzd.contractManagement.caigoucontractTermination.domain.vo.XzdPurchaseContractSuspendVo; import org.dromara.xzd.contractManagement.fenbaohetongbiangg.domain.XzdSubcontractChange; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.XzdSubcontract; import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdSubcontractVo; import org.dromara.xzd.contractManagement.fenbaohetongxinxi.service.IXzdSubcontractService; import org.dromara.xzd.utilS.AreaUtil; @@ -213,6 +216,11 @@ public class XzdSubcontractTerminationServiceImpl extends ServiceImpl wrapper = new UpdateWrapper<>(); + wrapper.eq("id",vo.getContractNumber()).set("sfzz","1"); + iXzdSubcontractService.getBaseMapper().update(wrapper); + } vo.setAuditStatus(processEvent.getStatus()); this.updateById(vo); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/controller/XzdPurchaseContractInformationController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/controller/XzdPurchaseContractInformationController.java index 69a3e1fa..bdfa5797 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/controller/XzdPurchaseContractInformationController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/controller/XzdPurchaseContractInformationController.java @@ -6,7 +6,9 @@ import lombok.RequiredArgsConstructor; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.*; import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.xzd.contractManagement.fenbaohetongxinxi.domain.vo.XzdJdztVo; import org.dromara.xzd.contractManagement.purchaseManagement.domain.bo.XzdPurchaseContractInformationBo; +import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdJdztCghtVo; import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo; import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService; import org.springframework.web.bind.annotation.*; @@ -69,6 +71,15 @@ public class XzdPurchaseContractInformationController extends BaseController { return R.ok(xzdPurchaseContractInformationService.queryById(id)); } + /** + * 点击采购合同状态展示列表 + */ + @GetMapping("/listJdzt/{id}") + public XzdJdztCghtVo listJdzt(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return xzdPurchaseContractInformationService.listJdzt(id); + } + /** * 新增采购合同信息 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/XzdPurchaseContractInformation.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/XzdPurchaseContractInformation.java index 3cfba853..fab7a0cd 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/XzdPurchaseContractInformation.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/XzdPurchaseContractInformation.java @@ -284,6 +284,12 @@ public class XzdPurchaseContractInformation extends BaseEntity { */ private String auditStatus; + /** + * + * 是否终止 + */ + private String sfzz; + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java index ba147354..cef4a412 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java @@ -275,6 +275,12 @@ public class XzdPurchaseContractInformationBo extends BaseEntity { */ private String fileId; + /** + * + * 是否终止 + */ + private String sfzz; + /** * 备注 */ @@ -325,6 +331,7 @@ public class XzdPurchaseContractInformationBo extends BaseEntity { */ private String contractText; + /** * 汇总数据 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdJdztCghtVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdJdztCghtVo.java new file mode 100644 index 00000000..efabad2c --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdJdztCghtVo.java @@ -0,0 +1,20 @@ +package org.dromara.xzd.contractManagement.purchaseManagement.domain.vo; + +import lombok.Data; +import org.dromara.xzd.contractManagement.caigoucontractTermination.domain.vo.XzdPurchaseContractSuspendVo; +import org.dromara.xzd.contractManagement.caigouhetongbiangeng.domain.vo.XzdPurchaseContractAlterationVo; +import org.springframework.scheduling.annotation.Scheduled; + +import java.util.List; + +@Data +public class XzdJdztCghtVo { + + private XzdPurchaseContractInformationVo yslb; + + private List bglb; + + private List zzlb; + + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java index 74b9c7df..95ee0e84 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java @@ -464,6 +464,17 @@ public class XzdPurchaseContractInformationVo implements Serializable { @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; + /** + * + * 是否终止 + */ + private String sfzz; + + /** + * 阶段状态 + */ + private String jdzt; + /** * 预收款项 */ @@ -502,4 +513,6 @@ public class XzdPurchaseContractInformationVo implements Serializable { + + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/IXzdPurchaseContractInformationService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/IXzdPurchaseContractInformationService.java index a777878b..2d05c6a9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/IXzdPurchaseContractInformationService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/IXzdPurchaseContractInformationService.java @@ -1,12 +1,14 @@ package org.dromara.xzd.contractManagement.purchaseManagement.service; +import jakarta.validation.constraints.NotNull; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; import org.dromara.xzd.contractManagement.purchaseManagement.domain.XzdPurchaseContractInformation; import org.dromara.xzd.contractManagement.purchaseManagement.domain.bo.XzdPurchaseContractInformationBo; +import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdJdztCghtVo; import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo; import java.util.Collection; @@ -72,4 +74,6 @@ public interface IXzdPurchaseContractInformationService extends IService xzdPurchaseContractAlterations = xzdPurchaseContractAlterationService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(XzdPurchaseContractAlteration::getContractInformationId, id)); + List xzdPurchaseContractSuspends = xzdPurchaseContractSuspendService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(XzdPurchaseContractSuspend::getContractInformationId, id)); + + res.setYslb(xzdPurchaseContractInformationVo); + res.setBglb(MapstructUtils.convert(xzdPurchaseContractAlterations, XzdPurchaseContractAlterationVo.class)); + res.setZzlb(MapstructUtils.convert(xzdPurchaseContractSuspends, XzdPurchaseContractSuspendVo.class)); + + return res; + } + public void setValue(List infos){ for (XzdPurchaseContractInformationVo item : infos) { @@ -448,6 +471,20 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl xzdHtglHthzsjs = xzdHtglHthzsjService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(XzdHtglHthzsj::getMainDocumentId, item.getId())); item.setHtghthzsjs(xzdHtglHthzsjs); + + + // 阶段状态 + item.setJdzt(ZxdEnum.HETONGZTYS.getTypeValue());; + + Long l = xzdPurchaseContractAlterationService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdPurchaseContractAlteration::getContractInformationId, item.getId())); + if (l > 0) { + item.setJdzt(ZxdEnum.HETONGZTBG.getTypeValue()); + } + Long l1 = xzdPurchaseContractSuspendService.getBaseMapper().selectCount(new LambdaQueryWrapper().eq(XzdPurchaseContractSuspend::getContractInformationId, item.getId())); + if (l1 > 0) { + item.setJdzt(ZxdEnum.HETONGZTZZ.getTypeValue()); + } + } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/enums/ZxdEnum.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/enums/ZxdEnum.java index d5036268..f5fbb50c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/enums/ZxdEnum.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/enums/ZxdEnum.java @@ -13,7 +13,13 @@ public enum ZxdEnum { PURCHASE_PREFIX("采购合同信息前缀","CCTEG(CWZ)"), SFWJSD_S("决算单","1"), SFWJSD_TZ("决算单调整","2"), - FENBAOHETONG_PREFIX("分包合同信息前缀","CCTEG(CSG)"); + FENBAOHETONG_PREFIX("分包合同信息前缀","CCTEG(CSG)"), + HETONGZTYS("合同状态","原始"), + HETONGZTBG("合同状态","变更"), + HETONGZTZZ("合同状态","终止"); + + + private final String TypeName;