diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/ConPurchase.java b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/ConPurchase.java index 738f4f5..0d46315 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/ConPurchase.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/ConPurchase.java @@ -174,6 +174,12 @@ public class ConPurchase extends BaseEntityAdd { @FieldNameApi(name = "媒体链条附件") private String mediaLink; + /** + * 检测照片附件 + */ + @FieldNameApi(name = "检测照片附件") + private String detectPicAttr; + /** * 是否逾期0否1是 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/ConSaleMedia.java b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/ConSaleMedia.java index 2eb5877..0101131 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/ConSaleMedia.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/ConSaleMedia.java @@ -1,5 +1,6 @@ package com.ruoyi.contract.domain; +import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.*; import com.ruoyi.common.annotation.FieldNameApi; import com.ruoyi.common.core.domain.BaseEntityAdd; @@ -147,4 +148,16 @@ public class ConSaleMedia extends BaseEntityAdd { */ @FieldNameApi(name ="其他返点金额") private Double otherReverMoney; + + /** + * 其他返点2 + */ + @FieldNameApi(name ="其他返点2") + private String otherReverPoit2; + + /** + * 其他返点金额2 + */ + @FieldNameApi(name ="其他返点金额2") + private Double otherReverMoney2; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/bo/ConPurchaseBo.java b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/bo/ConPurchaseBo.java index eb6c4fc..9d3003e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/bo/ConPurchaseBo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/bo/ConPurchaseBo.java @@ -209,6 +209,12 @@ public class ConPurchaseBo extends BaseEntity { @CustomBaenAnnotation(value = "媒体链条附件") private String mediaLink; + /** + * 检测照片附件 + */ + @CustomBaenAnnotation(value = "检测照片附件") + private String detectPicAttr; + /** * 状态 */ @@ -264,4 +270,5 @@ public class ConPurchaseBo extends BaseEntity { private String isOverdue; + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConPurchaseVo.java b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConPurchaseVo.java index 5bc80ce..cea2e66 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConPurchaseVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConPurchaseVo.java @@ -223,6 +223,12 @@ public class ConPurchaseVo { @ExcelProperty(value = "媒体链条附件") private String mediaLink; + /** + * 检测照片附件 + */ + @ExcelProperty(value = "检测照片附件") + private String detectPicAttr; + /** * 媒体链条附件地址集合 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConSaleMediaVo.java b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConSaleMediaVo.java index 2503e49..216f6a2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConSaleMediaVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConSaleMediaVo.java @@ -166,12 +166,24 @@ public class ConSaleMediaVo { /** * 其他返点 */ - @ExcelProperty(value = "其他返点") + @ExcelProperty(value = "其他返点1") private String otherReverPoit; /** * 其他返点金额 */ - @ExcelProperty(value = "其他返点金额") + @ExcelProperty(value = "其他返点金额1") private Double otherReverMoney; + + /** + * 其他返点2 + */ + @ExcelProperty(value = "其他返点2") + private String otherReverPoit2; + + /** + * 其他返点金额2 + */ + @ExcelProperty(value = "其他返点金额2") + private Double otherReverMoney2; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConBigScreenServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConBigScreenServiceImpl.java index ca9b039..205533a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConBigScreenServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConBigScreenServiceImpl.java @@ -696,7 +696,7 @@ public class ConBigScreenServiceImpl implements IConBigScreenService { double actualArrivalMoney=0d; if(CollUtil.isNotEmpty(conSaleVos)){ List list = conSaleVos.stream().map(ConSaleVo::getId).collect(Collectors.toList()); - List collects = conSaleCollectMapper.selectList(Wrappers.lambdaQuery().select(ConSaleCollect::getActualArrivalMoney).in(ConSaleCollect::getSaleId, list)); + List collects = conSaleCollectMapper.selectList(Wrappers.lambdaQuery().select(ConSaleCollect::getId).select(ConSaleCollect::getActualArrivalMoney).in(ConSaleCollect::getSaleId, list)); actualArrivalMoney = CollUtil.isNotEmpty(collects) ? collects.stream().filter(itx -> (ObjectUtil.isNotEmpty(itx) && ObjectUtil.isNotEmpty(itx.getActualArrivalMoney()))).mapToDouble(ConSaleCollect::getActualArrivalMoney).sum() : 0d; } //其他合同中实际回款金额汇总 diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConCityServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConCityServiceImpl.java index 3f84a4f..47b6327 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConCityServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConCityServiceImpl.java @@ -99,6 +99,9 @@ public class ConCityServiceImpl implements IConCityService { **/ @Override public List getTreeSelect() { + + List allList = this.getAllList(); + //Map> mapList = allList.stream().filter(item -> item.getParentId() != null).collect(Collectors.groupingBy(ConCityVo :: getParentId)); return buildTreeNode(getParentAreas()); } @@ -159,6 +162,24 @@ public class ConCityServiceImpl implements IConCityService { } return nodes; } + private List buildTreeNodeNew(List list,Map> mapList) { + List nodes = new ArrayList<>(); + if (list != null && list.size() > 0) { + list.forEach( + area -> { + ConCityVo vo = new ConCityVo(); + BeanUtils.copyProperties(area, vo); + vo.setChildren(null); + List childrenList = mapList.get(area.getId()); + if (childrenList != null && childrenList.size() > 0) { + List children = buildTreeNodeNew(childrenList,mapList); + vo.setChildren(children); + } + nodes.add(vo); + }); + } + return nodes; + } private List getChildrenSal(Long id) { return baseMapper.getChildByParentId(id); diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java index 962b09d..81bd3f0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java @@ -2102,6 +2102,11 @@ public class ConPurchaseServiceImpl implements IConPurchaseService { String stringByMds = localStorageService.getStringByMds(item.getMediaLink()); item.setMediaLink(stringByMds); } + //媒体联调附件 + if (StringUtils.isNotBlank(item.getDetectPicAttr())) { + String stringByMds = localStorageService.getStringByMds(item.getDetectPicAttr()); + item.setDetectPicAttr(stringByMds); + } } writerHashChildUpgrade(writer, indexStart, result, fieldName, fieldNameExtend, mediaFieldName); } diff --git a/script/sql/update/update_2025-1018.sql b/script/sql/update/update_2025-1018.sql new file mode 100644 index 0000000..5e4c283 --- /dev/null +++ b/script/sql/update/update_2025-1018.sql @@ -0,0 +1,7 @@ +ALTER TABLE `con_sale_media` + ADD COLUMN `other_rever_poit2` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '其他返点2' AFTER `other_rever_money`, +ADD COLUMN `other_rever_money2` double NULL DEFAULT NULL COMMENT '其他返点金额2' AFTER `other_rever_poit2`; + +-- 检测照片附件 +ALTER TABLE `con_purchase` + ADD COLUMN `detect_pic_attr` varchar(2000) NULL COMMENT '检测照片附件' AFTER `media_link`;