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

采购合同分包合同修改

Browse Source
This commit is contained in:
lg
2025-11-06 16:46:47 +08:00
parent 7aa9d519a0
commit 910801b057
21 changed files with 260 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/BusWjzx.java
View File

@ -37,6 +37,12 @@ public class BusWjzx extends BaseEntity {
*/
private String wjUrl;
/**
* 文件类型
*/
private String wjlx;
/**
* 文件描述
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/dto/BusWjzxBo.java
View File

@ -41,6 +41,11 @@ public class BusWjzxBo extends BaseEntity {
*/
private String gnms;
/**
* 文件类型
*/
private String wjlx;
/**
* 审核标志
*/

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/domain/vo/BusWjzxVo.java
View File

@ -51,6 +51,12 @@ public class BusWjzxVo implements Serializable {
*/
private String gnms;
/**
* 文件类型
*/
private String wjlx;
/**
* 审核标志
*/

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/BusWjzxServiceImpl.java
View File

@ -101,6 +101,10 @@ public class BusWjzxServiceImpl extends ServiceImpl<BusWjzxMapper, BusWjzx> 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());

10
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/caigoucontractTermination/service/impl/XzdPurchaseContractSuspendServiceImpl.java
View File

@ -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<XzdPurcha
public TableDataInfo<XzdPurchaseContractSuspendVo> queryPageList(XzdPurchaseContractSuspendBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<XzdPurchaseContractSuspend> lqw = buildQueryWrapper(bo);
Page<XzdPurchaseContractSuspendVo> 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<XzdPurcha
if (vo == null) {
return;
}
if (processEvent.getStatus().equals(BusinessStatusEnum.FINISH.getStatus())){
UpdateWrapper<XzdPurchaseContractInformation> wrapper = new UpdateWrapper<>();
wrapper.eq("id",vo.getContractInformationId()).set("sfzz","1");
xzdPurchaseContractInformationService.getBaseMapper().update(wrapper);
}
vo.setAuditStatus(processEvent.getStatus());
this.updateById(vo);
}

11
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/controller/XzdSubcontractController.java
View File

@ -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);
}
/**
* 导出分包合同信息列表
*/

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/XzdSubcontract.java
View File

@ -265,4 +265,11 @@ public class XzdSubcontract extends BaseEntity {
private Long danjuId;
/**
*
* 是否终止
*/
private String sfzz;
}

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/bo/XzdSubcontractBo.java
View File

@ -64,6 +64,13 @@ public class XzdSubcontractBo extends BaseEntity {
private Long project;
/**
*
* 是否终止
*/
private String sfzz;
/**
* 合同文本
*/

27
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdJdztVo.java Normal file
View File

@ -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<XzdSubcontractChangeVo> bglb;
private List<XzdSubcontractTerminationVo> zzlb;
}

14
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/domain/vo/XzdSubcontractVo.java
View File

@ -78,6 +78,20 @@ public class XzdSubcontractVo implements Serializable {
*/
private String contractText;
/**
*
* 是否终止
*/
private String sfzz;
/**
* 阶段状态
*/
private String jdzt;
/**
* 项目
*/

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/IXzdSubcontractService.java
View File

@ -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<XzdSubcontract>{
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
XzdJdztVo listJdzt(Long id);
}

42
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongxinxi/service/impl/XzdSubcontractServiceImpl.java
View File

@ -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<XzdSubcontractMapper,
@Autowired
private XzdSupplierInfoServiceImpl xzdSupplierInfoService;
@Autowired
@Lazy
private IXzdSubcontractChangeService xzdSubcontractChangeService;
@Autowired
@Lazy
private IXzdSubcontractTerminationService xzdSubcontractTerminationService;
private final IXzdContractAdvanceInfoService iXzdContractAdvanceInfoService;
private final IXzdDeductionItemsService iXzdDeductionItemsService;
@ -124,7 +141,6 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
private void setValue(List<XzdSubcontractVo> infos) {
for (XzdSubcontractVo item : infos) {
// //合同文本-预收款项
LambdaQueryWrapper<XzdContractAdvanceInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(XzdContractAdvanceInfo::getContractDetailsId, item.getId());
@ -159,7 +175,17 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
List<XzdHtglHtbgqd> list4 = xzdHtglHtbgqdService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdHtglHtbgqd>().eq(XzdHtglHtbgqd::getMainDocumentId, item.getId()));
item.setHtbgqds(list4);
// 阶段状态
item.setJdzt(ZxdEnum.HETONGZTYS.getTypeValue());
Long l = xzdSubcontractChangeService.getBaseMapper().selectCount(new LambdaQueryWrapper<XzdSubcontractChange>().eq(XzdSubcontractChange::getContractCode, item.getId()));
if (l > 0) {
item.setJdzt(ZxdEnum.HETONGZTBG.getTypeValue());
}
Long l1 = xzdSubcontractTerminationService.getBaseMapper().selectCount(new LambdaQueryWrapper<XzdSubcontractTermination>().eq(XzdSubcontractTermination::getContractNumber, item.getId()));
if (l1 > 0) {
item.setJdzt(ZxdEnum.HETONGZTZZ.getTypeValue());
}
}
}
@ -426,6 +452,20 @@ public class XzdSubcontractServiceImpl extends ServiceImpl<XzdSubcontractMapper,
return baseMapper.deleteByIds(ids) > 0;
}
@Override
public XzdJdztVo listJdzt(Long id) {
XzdJdztVo res = new XzdJdztVo();
XzdSubcontractVo xzdSubcontractVo = this.queryById(id);
List<XzdSubcontractChange> xzdSubcontractChanges = xzdSubcontractChangeService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdSubcontractChange>().eq(XzdSubcontractChange::getContractCode, id));
List<XzdSubcontractTermination> xzdSubcontractTerminations = xzdSubcontractTerminationService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdSubcontractTermination>().eq(XzdSubcontractTermination::getContractNumber, id));
res.setYslb(xzdSubcontractVo);
res.setBglb(MapstructUtils.convert(xzdSubcontractChanges, XzdSubcontractChangeVo.class));
res.setZzlb(MapstructUtils.convert(xzdSubcontractTerminations, XzdSubcontractTerminationVo.class));
return res;
}
/**

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/fenbaohetongzhongzhi/service/impl/XzdSubcontractTerminationServiceImpl.java
View File

@ -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<XzdSubcont
if (vo == null) {
return;
}
if (processEvent.getStatus().equals(BusinessStatusEnum.FINISH.getStatus())){
UpdateWrapper<XzdSubcontract> wrapper = new UpdateWrapper<>();
wrapper.eq("id",vo.getContractNumber()).set("sfzz","1");
iXzdSubcontractService.getBaseMapper().update(wrapper);
}
vo.setAuditStatus(processEvent.getStatus());
this.updateById(vo);
}

11
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/controller/XzdPurchaseContractInformationController.java
View File

@ -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);
}
/**
* 新增采购合同信息
*/

6
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/XzdPurchaseContractInformation.java
View File

@ -284,6 +284,12 @@ public class XzdPurchaseContractInformation extends BaseEntity {
*/
private String auditStatus;
/**
*
* 是否终止
*/
private String sfzz;

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/bo/XzdPurchaseContractInformationBo.java
View File

@ -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;
/**
* 汇总数据
*/

20
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdJdztCghtVo.java Normal file
View File

@ -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<XzdPurchaseContractAlterationVo> bglb;
private List<XzdPurchaseContractSuspendVo> zzlb;
}

13
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/domain/vo/XzdPurchaseContractInformationVo.java
View File

@ -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 {
}

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/IXzdPurchaseContractInformationService.java
View File

@ -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<XzdPurc
String queryCodeById(Long id);
XzdJdztCghtVo listJdzt(@NotNull(message = "主键不能为空") Long id);
}

49
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/purchaseManagement/service/impl/XzdPurchaseContractInformationServiceImpl.java
View File

@ -27,9 +27,17 @@ import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd;
import org.dromara.xzd.comprehensive.domain.XzdHtglHthzsj;
import org.dromara.xzd.comprehensive.service.IXzdHtglHtbgqdService;
import org.dromara.xzd.comprehensive.service.IXzdHtglHthzsjService;
import org.dromara.xzd.contractManagement.caigoucontractTermination.domain.XzdPurchaseContractSuspend;
import org.dromara.xzd.contractManagement.caigoucontractTermination.domain.vo.XzdPurchaseContractSuspendVo;
import org.dromara.xzd.contractManagement.caigoucontractTermination.service.IXzdPurchaseContractSuspendService;
import org.dromara.xzd.contractManagement.caigouhetongbiangeng.domain.XzdPurchaseContractAlteration;
import org.dromara.xzd.contractManagement.caigouhetongbiangeng.domain.vo.XzdPurchaseContractAlterationVo;
import org.dromara.xzd.contractManagement.caigouhetongbiangeng.service.IXzdPurchaseContractAlterationService;
import org.dromara.xzd.contractManagement.fenbaohetongbiangg.domain.XzdSubcontractChange;
import org.dromara.xzd.contractManagement.fenbaohetongzhongzhi.domain.XzdSubcontractTermination;
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 org.dromara.xzd.contractManagement.purchaseManagement.mapper.XzdPurchaseContractInformationMapper;
import org.dromara.xzd.contractManagement.purchaseManagement.service.IXzdPurchaseContractInformationService;
@ -47,6 +55,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;
@ -81,13 +90,13 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
private XzdContractDepositInfoServiceImpl xzdContractDepositInfoService;
@Autowired
private XzdProjectServiceImpl xzdProjectService;
@Lazy
private IXzdPurchaseContractAlterationService xzdPurchaseContractAlterationService;
@Autowired
private IXzdCorrespondentList iXzdCorrespondentList;
@Autowired
private XzdSupplierInfoServiceImpl xzdSupplierInfoService;
@Autowired
private XzdBusinessSealServiceImpl xzdBusinessSealService;
@Lazy
private IXzdPurchaseContractSuspendService xzdPurchaseContractSuspendService;
@Autowired
private SysOssServiceImpl sysOssService;
@Autowired
@ -410,6 +419,20 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
return vo !=null ? vo.getContractCode():"";
}
@Override
public XzdJdztCghtVo listJdzt(Long id) {
XzdJdztCghtVo res = new XzdJdztCghtVo();
XzdPurchaseContractInformationVo xzdPurchaseContractInformationVo = this.queryById(id);
List<XzdPurchaseContractAlteration> xzdPurchaseContractAlterations = xzdPurchaseContractAlterationService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdPurchaseContractAlteration>().eq(XzdPurchaseContractAlteration::getContractInformationId, id));
List<XzdPurchaseContractSuspend> xzdPurchaseContractSuspends = xzdPurchaseContractSuspendService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdPurchaseContractSuspend>().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<XzdPurchaseContractInformationVo> infos){
for (XzdPurchaseContractInformationVo item : infos) {
@ -448,6 +471,20 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
List<XzdHtglHthzsj> xzdHtglHthzsjs = xzdHtglHthzsjService.getBaseMapper().selectList(new LambdaQueryWrapper<XzdHtglHthzsj>().eq(XzdHtglHthzsj::getMainDocumentId, item.getId()));
item.setHtghthzsjs(xzdHtglHthzsjs);
// 阶段状态
item.setJdzt(ZxdEnum.HETONGZTYS.getTypeValue());;
Long l = xzdPurchaseContractAlterationService.getBaseMapper().selectCount(new LambdaQueryWrapper<XzdPurchaseContractAlteration>().eq(XzdPurchaseContractAlteration::getContractInformationId, item.getId()));
if (l > 0) {
item.setJdzt(ZxdEnum.HETONGZTBG.getTypeValue());
}
Long l1 = xzdPurchaseContractSuspendService.getBaseMapper().selectCount(new LambdaQueryWrapper<XzdPurchaseContractSuspend>().eq(XzdPurchaseContractSuspend::getContractInformationId, item.getId()));
if (l1 > 0) {
item.setJdzt(ZxdEnum.HETONGZTZZ.getTypeValue());
}
}
}

8
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/enums/ZxdEnum.java
View File

@ -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;