diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractChange.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractChange.java index 98c3386d..93b77e24 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractChange.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractChange.java @@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.io.Serial; +import java.math.BigDecimal; import java.time.LocalDate; /** @@ -99,22 +100,22 @@ public class XzdContractChange extends BaseEntity { /** * 原合同造价 */ - private Long originalContractCost; + private BigDecimal originalContractCost; /** * 变更合同造价 */ - private Long changedContractCost; + private BigDecimal changedContractCost; /** * 变更后总造价 */ - private Long postChangeTotalCost; + private BigDecimal postChangeTotalCost; /** * 累计变更金额 */ - private Long cumulativeChangeAmount; + private BigDecimal cumulativeChangeAmount; /** * 变更原合同单项已结工程量 @@ -184,7 +185,7 @@ public class XzdContractChange extends BaseEntity { /** * 合同累计变更金额 */ - private Long contractCumulativeChangeAmount; + private BigDecimal contractCumulativeChangeAmount; /** * 附件ID（多个逗号分隔） diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractDetails.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractDetails.java index d65db457..6d3ed288 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractDetails.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdContractDetails.java @@ -149,7 +149,7 @@ public class XzdContractDetails extends BaseEntity { /** * 印章名称 */ - private Long sealName; + private String sealName; /** * 大写合同含税合计 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java index fbd8357f..bd6b4737 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdContractDetailsBo.java @@ -160,8 +160,8 @@ public class XzdContractDetailsBo extends BaseEntity { /** * 印章名称 */ - @NotNull(message = "印章名称不能为空", groups = { AddGroup.class, EditGroup.class }) - private Long sealName; + @NotNull(message = "印章不能为空", groups = { AddGroup.class, EditGroup.class }) + private String sealName; /** * 大写合同含税合计 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractChangeVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractChangeVo.java index a204d081..a74c83a5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractChangeVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractChangeVo.java @@ -261,7 +261,7 @@ public class XzdContractChangeVo implements Serializable { * 合同累计变更金额 */ @ExcelProperty(value = "合同累计变更金额") - private Long contractCumulativeChangeAmount; + private BigDecimal contractCumulativeChangeAmount; /** * 附件ID（多个逗号分隔） diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java index 65b1d5eb..b6c8b8b2 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractDetailsVo.java @@ -223,12 +223,12 @@ public class XzdContractDetailsVo implements Serializable { * 印章名称 */ @ExcelProperty(value = "印章名称") - private Long sealName; + private String sealName; /** * 印章名称详情 */ - private String sealNameDetail; + private List sealNameDetail; /** * 大写合同含税合计 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdContractDetailsMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdContractDetailsMapper.java index fe73a8f7..9769a820 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdContractDetailsMapper.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/mapper/XzdContractDetailsMapper.java @@ -1,8 +1,11 @@ package org.dromara.xzd.mapper; -import org.dromara.xzd.domain.XzdContractDetails; -import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.xzd.domain.XzdContractDetails; +import org.dromara.xzd.domain.bo.XzdContractDetailsBo; +import org.dromara.xzd.domain.vo.XzdContractDetailsVo; + +import java.util.List; /** * 承包合同信息Mapper接口 @@ -12,4 +15,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface XzdContractDetailsMapper extends BaseMapperPlus { + List search(XzdContractDetailsBo bo); + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java index d38061da..ed755ff4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java @@ -23,7 +23,6 @@ import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd; import org.dromara.xzd.comprehensive.service.IXzdHtglHtbgqdService; import org.dromara.xzd.domain.*; import org.dromara.xzd.domain.bo.XzdContractDetailsBo; -import org.dromara.xzd.domain.vo.XzdBusinessSealVo; import org.dromara.xzd.domain.vo.XzdContractDetailsVo; import org.dromara.xzd.domain.vo.XzdProjectTypeVo; import org.dromara.xzd.domain.vo.XzdSupplierInfoVo; @@ -35,10 +34,7 @@ import org.springframework.context.event.EventListener; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 承包合同信息Service业务层处理 @@ -84,6 +80,8 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl xzdBusinessInfos = new ArrayList<>(); + String[] ids = info.getSealName().split(","); + for (String id : ids) { + XzdBusinessSeal byId = xzdBusinessSealService.getById(id); + if (byId != null){ + xzdBusinessInfos.add(byId); + } } + info.setSealNameDetail(xzdBusinessInfos); } //签约组织(供应商) if (info.getSigningOrganization() != null) { @@ -577,6 +580,16 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl lambdaQueryWrapper5 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper5.eq(XzdContractChange::getContractCodeId, info.getId()); + lambdaQueryWrapper5.orderByDesc(XzdContractChange::getCreateTime); + List list5 = xzdContractChangeService.list(lambdaQueryWrapper5); + if (list5 != null && !list5.isEmpty()){ + info.setContractAmount(list5.getFirst().getPostChangeTotalCost()); + } + } } 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 1e96c06d..edcae153 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 @@ -678,7 +678,10 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl xzdCustomertypeInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); xzdCustomertypeInfoLambdaQueryWrapper.eq(XzdCustomertypeInfo::getType,"2"); xzdCustomertypeInfoLambdaQueryWrapper.eq(XzdCustomertypeInfo::getCustomerinformationId, id); - xzdCustomertypeInfoService.remove(xzdCustomertypeInfoLambdaQueryWrapper); + List list = xzdCustomertypeInfoService.list(xzdCustomertypeInfoLambdaQueryWrapper); + if (!list.isEmpty()) { + xzdCustomertypeInfoService.removeByIds(list); + } //处理供应物料 LambdaQueryWrapper xzdSupplyMaterialsLambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdContractDetailsMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdContractDetailsMapper.xml new file mode 100644 index 00000000..b77c0870 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdContractDetailsMapper.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml index ddc9bfab..66e5b226 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml @@ -21,8 +21,8 @@ supplement.responsible_department as fgbm, supplement.responsible_salesman as fgywy, supplement.supplier_status as gyszt, - (select tp.customer_type FROM xzd_customertype_info ti LEFT JOIN xzd_customertype tp on ti.customertype_id = tp.id WHERE ti.primary_class like '1' LIMIT 1) as gyslx, -# type.customer_type as gyslx, + (select ct.customer_type from (select info.id,ti.type,ti.primary_class,ti.customertype_id,info.unit_code from xzd_customertype_info ti left join xzd_supplier_info info on ti.customerinformation_id = info.id and ti.type like '2' where info.id is not NULL) as temp left join xzd_customertype ct on temp.customertype_id = ct.id where temp.id = info.id and temp.primary_class like '1') as gyslx, + # type.customer_type as gyslx, supplement.supplier_level as gysdj, info.is_group_supplier as isGroupSupplier, info.is_blacklist as isBlacklist,