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

添加id转name注解方法

Browse Source
This commit is contained in:
dfdg
2025-10-24 11:55:19 +08:00
parent 08de61e455
commit cdcd665d43
43 changed files with 341 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdCustomerinformationService.java Normal file
View File

@ -0,0 +1,6 @@
package org.dromara.common.core.service;
public interface XzdCustomerinformationService {
String selectNmaeByIds(String id);
}

6
xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdProjectService.java Normal file
View File

@ -0,0 +1,6 @@
package org.dromara.common.core.service;
public interface XzdProjectService {
String selectNmaeByIds(String ids);
}

5
xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdPurchaseContractInformationService.java Normal file
View File

@ -0,0 +1,5 @@
package org.dromara.common.core.service;
public interface XzdPurchaseContractInformationService {
String selectNameByIds(String ids);
}

6
xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdSupplierInfoService.java Normal file
View File

@ -0,0 +1,6 @@
package org.dromara.common.core.service;
public interface XzdSupplierInfoService {
String selectNmaeByIds(String ids);
}

12
xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java
View File

@ -41,12 +41,20 @@ public interface TransConstant {
/**
* 客户id转名称
*/
String KHXX_ID_TO_NAME = "khxx_id_to_name";
String XZD_KHXX_ID_TO_NAME = "khxx_id_to_name";
/**
* 供应商id转名称
*/
String GYSXX_ID_TO_NAME = "gysxx_id_to_name";
String XZD_GYSXX_ID_TO_NAME = "gysxx_id_to_name";
/**
* 新中大项目id转名称
*/
String XZD_PROJECT_ID_TO_NAME = "xzd_project_id_to_name";
/**
* 采购合同id转名称
*/
String XZD_PURCHASE_CONTRACT_ID_TO_NAME = "xzd_purchase_contract_id_to_name";
}

24
xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/XzdCustomerinformationImpl.java Normal file
View File

@ -0,0 +1,24 @@
package org.dromara.common.translation.core.impl;
import lombok.AllArgsConstructor;
import org.dromara.common.core.service.XzdCustomerinformationService;
import org.dromara.common.translation.annotation.TranslationType;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.common.translation.core.TranslationInterface;
@AllArgsConstructor
@TranslationType(type = TransConstant.XZD_KHXX_ID_TO_NAME)
public class XzdCustomerinformationImpl implements TranslationInterface<String> {
private final XzdCustomerinformationService xzdCustomerinformationService;
@Override
public String translation(Object key, String other) {
if (key instanceof String ids) {
return xzdCustomerinformationService.selectNmaeByIds(ids);
} else if (key instanceof Long id) {
return xzdCustomerinformationService.selectNmaeByIds(id.toString());
}
return null;
}
}

23
xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/XzdProjectImpl.java Normal file
View File

@ -0,0 +1,23 @@
package org.dromara.common.translation.core.impl;
import lombok.AllArgsConstructor;
import org.dromara.common.core.service.XzdProjectService;
import org.dromara.common.translation.annotation.TranslationType;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.common.translation.core.TranslationInterface;
@AllArgsConstructor
@TranslationType(type = TransConstant.XZD_PROJECT_ID_TO_NAME)
public class XzdProjectImpl implements TranslationInterface<String> {
private final XzdProjectService xzdProjectService;
@Override
public String translation(Object key, String other) {
if (key instanceof String ids) {
return xzdProjectService.selectNmaeByIds(ids);
} else if (key instanceof Long id) {
return xzdProjectService.selectNmaeByIds(id.toString());
}
return null;
}
}

26
xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/XzdPurchaseContractInformationImpl.java Normal file
View File

@ -0,0 +1,26 @@
package org.dromara.common.translation.core.impl;
import lombok.AllArgsConstructor;
import org.dromara.common.core.service.XzdPurchaseContractInformationService;
import org.dromara.common.translation.annotation.TranslationType;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.common.translation.core.TranslationInterface;
@AllArgsConstructor
@TranslationType(type = TransConstant.XZD_PURCHASE_CONTRACT_ID_TO_NAME)
public class XzdPurchaseContractInformationImpl implements TranslationInterface<String> {
private XzdPurchaseContractInformationService xzdCustomerinformationService;
@Override
public String translation(Object key, String other) {
if (key instanceof String ids) {
return xzdCustomerinformationService.selectNameByIds(ids);
} else if (key instanceof Long id) {
return xzdCustomerinformationService.selectNameByIds(id.toString());
}
return null;
}
}

24
xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/XzdSupplierInfoImpl.java Normal file
View File

@ -0,0 +1,24 @@
package org.dromara.common.translation.core.impl;
import lombok.AllArgsConstructor;
import org.dromara.common.core.service.XzdSupplierInfoService;
import org.dromara.common.translation.annotation.TranslationType;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.common.translation.core.TranslationInterface;
@AllArgsConstructor
@TranslationType(type = TransConstant.XZD_GYSXX_ID_TO_NAME)
public class XzdSupplierInfoImpl implements TranslationInterface<String> {
private final XzdSupplierInfoService xzdSupplierInfoService;
@Override
public String translation(Object key, String other) {
if (key instanceof String ids) {
return xzdSupplierInfoService.selectNmaeByIds(ids);
} else if (key instanceof Long id) {
return xzdSupplierInfoService.selectNmaeByIds(id.toString());
}
return null;
}
}

4
xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@ -5,3 +5,7 @@ org.dromara.common.translation.core.impl.OssUrlTranslationImpl
org.dromara.common.translation.core.impl.UserNameTranslationImpl
org.dromara.common.translation.core.impl.NicknameTranslationImpl
org.dromara.common.translation.core.impl.ProjectNameTranslationImpl
org.dromara.common.translation.core.impl.XzdCustomerinformationImpl
org.dromara.common.translation.core.impl.XzdProjectImpl
org.dromara.common.translation.core.impl.XzdPurchaseContractInformationImpl
org.dromara.common.translation.core.impl.XzdSupplierInfoImpl

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/XzdCsContractChange.java
View File

@ -192,6 +192,11 @@ public class XzdCsContractChange extends BaseEntity {
*/
private BigDecimal contractCumulativeChangeAmount;
/**
* 部门id
*/
private Long deptId;
/**
* 合同文本
*/

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/XzdCsContractInformation.java
View File

@ -175,7 +175,7 @@ public class XzdCsContractInformation extends BaseEntity {
/**
* WBS编码
*/
private Long wbs;
private String wbs;
/**
* 备案状态（如：未备案、已备案）
@ -242,5 +242,10 @@ public class XzdCsContractInformation extends BaseEntity {
*/
private String fileId;
/**
* 部门id
*/
private Long deptId;
}

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/XzdCsContractSuspend.java
View File

@ -118,5 +118,10 @@ public class XzdCsContractSuspend extends BaseEntity {
*/
private String auditStatus;
/**
* 部门id
*/
private Long deptId;
}

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractChangeBo.java
View File

@ -205,6 +205,11 @@ public class XzdCsContractChangeBo extends BaseEntity {
* 单据引用
*/
private String documentReference;
/**
* 部门id
*/
private Long deptId;
/**
* 合同文本
*/

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractInformationBo.java
View File

@ -192,7 +192,7 @@ public class XzdCsContractInformationBo extends BaseEntity {
/**
* WBS编码
*/
private Long wbs;
private String wbs;
/**
* 备案状态（如：未备案、已备案）
@ -250,6 +250,11 @@ public class XzdCsContractInformationBo extends BaseEntity {
*/
private String contractText;
/**
* 部门id
*/
private Long deptId;
/**
* 单据引用
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractSuspendBo.java
View File

@ -112,6 +112,11 @@ public class XzdCsContractSuspendBo extends BaseEntity {
*/
private BigDecimal cumulativePaymentAmount;
/**
* 部门id
*/
private Long deptId;
/**
* 文件ID
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractChangeVo.java
View File

@ -254,6 +254,11 @@ public class XzdCsContractChangeVo implements Serializable {
*/
private String contractText;
/**
* 部门id
*/
private Long deptId;
/**
* 单据引用
*/

18
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractInformationVo.java
View File

@ -2,8 +2,9 @@ package org.dromara.xzd.comprehensive.domain.vo;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.xzd.comprehensive.domain.XzdCsContractInformation;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
@ -15,11 +16,9 @@ import org.dromara.xzd.comprehensive.domain.XzdCsContractSuspendZfkx;
import org.dromara.xzd.comprehensive.domain.XzdHtglHtbgqd;
import org.dromara.xzd.domain.XzdContractClause;
import org.dromara.xzd.domain.XzdDeductionItems;
import org.dromara.xzd.domain.XzdSettlementRules;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
@ -93,6 +92,8 @@ public class XzdCsContractInformationVo implements Serializable {
*/
@ExcelProperty(value = "甲方单位")
private Long partyA;
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "partyA")
private String partyAName;
/**
@ -113,6 +114,7 @@ public class XzdCsContractInformationVo implements Serializable {
*/
@ExcelProperty(value = "乙方单位")
private Long partyB;
@Translation(type = TransConstant.XZD_GYSXX_ID_TO_NAME, mapper = "partyB")
private String partyBName;
/**
@ -127,6 +129,7 @@ public class XzdCsContractInformationVo implements Serializable {
@ExcelProperty(value = "部门ID", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "关=联部门表")
private Long departmentId;
@Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "departmentId")
private String departmentName;
/**
@ -229,7 +232,7 @@ public class XzdCsContractInformationVo implements Serializable {
* WBS编码
*/
@ExcelProperty(value = "WBS编码")
private Long wbs;
private String wbs;
/**
* 备案状态（如：未备案、已备案）
@ -304,6 +307,11 @@ public class XzdCsContractInformationVo implements Serializable {
*/
private String contractText;
/**
* 部门id
*/
private Long deptId;
/**
* 单据引用
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractSuspendVo.java
View File

@ -120,6 +120,11 @@ public class XzdCsContractSuspendVo implements Serializable {
@ExcelProperty(value = "累计结算金额")
private BigDecimal cumulativeSettlementAmount;
/**
* 部门id
*/
private Long deptId;
/**
* 累计付款金额
*/

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java
View File

@ -130,6 +130,7 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl<XzdCsContractCha
lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdCsContractChange::getTitle, bo.getTitle());
lqw.eq(bo.getDocDate() != null, XzdCsContractChange::getDocDate, bo.getDocDate());
lqw.eq(bo.getContractCode() != null, XzdCsContractChange::getContractCode, bo.getContractCode());
lqw.eq(bo.getDeptId() != null, XzdCsContractChange::getDeptId, bo.getDeptId());
lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdCsContractChange::getContractName, bo.getContractName());
lqw.eq(StringUtils.isNotBlank(bo.getContractType()), XzdCsContractChange::getContractType, bo.getContractType());
lqw.eq(bo.getChangeType() != null, XzdCsContractChange::getChangeType, bo.getChangeType());

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractInformationServiceImpl.java
View File

@ -225,6 +225,7 @@ public class XzdCsContractInformationServiceImpl extends ServiceImpl<XzdCsContra
lqw.eq(StringUtils.isNotBlank(bo.getContractCode()), XzdCsContractInformation::getContractCode, bo.getContractCode());
lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdCsContractInformation::getContractName, bo.getContractName());
lqw.eq(bo.getDocumentDate() != null, XzdCsContractInformation::getDocumentDate, bo.getDocumentDate());
lqw.eq(bo.getDeptId() != null, XzdCsContractInformation::getDeptId, bo.getDeptId());
lqw.eq(StringUtils.isNotBlank(bo.getContractType()), XzdCsContractInformation::getContractType, bo.getContractType());
lqw.eq(bo.getProjectId() != null, XzdCsContractInformation::getProjectId, bo.getProjectId());
lqw.eq(StringUtils.isNotBlank(bo.getBusinessMode()), XzdCsContractInformation::getBusinessMode, bo.getBusinessMode());

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractSuspendServiceImpl.java
View File

@ -104,6 +104,7 @@ public class XzdCsContractSuspendServiceImpl extends ServiceImpl<XzdCsContractSu
lqw.eq(StringUtils.isNotBlank(bo.getReceiptsCode()), XzdCsContractSuspend::getReceiptsCode, bo.getReceiptsCode());
lqw.eq(StringUtils.isNotBlank(bo.getTitle()), XzdCsContractSuspend::getTitle, bo.getTitle());
lqw.eq(bo.getDocumentDate() != null, XzdCsContractSuspend::getDocumentDate, bo.getDocumentDate());
lqw.eq(bo.getDeptId() != null, XzdCsContractSuspend::getDeptId, bo.getDeptId());
lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdCsContractSuspend::getContractName, bo.getContractName());
lqw.eq(bo.getTerminationDate() != null, XzdCsContractSuspend::getTerminationDate, bo.getTerminationDate());
lqw.eq(bo.getProject()!=null, XzdCsContractSuspend::getProject, bo.getProject());

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

@ -62,7 +62,7 @@ public class XzdPurchaseContractInformationController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("contractManagement:purchaseContractInformation:query")
// @SaCheckPermission("contractManagement:purchaseContractInformation:query")
@GetMapping("/{id}")
public R<XzdPurchaseContractInformationVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {

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

@ -1,10 +1,14 @@
package org.dromara.xzd.contractManagement.purchaseManagement.service.impl;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.github.linpeilie.annotations.AutoMapper;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.service.XzdPurchaseContractInformationService;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
@ -52,7 +56,7 @@ import java.util.*;
*/
@RequiredArgsConstructor
@Service
public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPurchaseContractInformationMapper, XzdPurchaseContractInformation> implements IXzdPurchaseContractInformationService {
public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPurchaseContractInformationMapper, XzdPurchaseContractInformation> implements IXzdPurchaseContractInformationService, XzdPurchaseContractInformationService {
private final XzdPurchaseContractInformationMapper baseMapper;
@ -507,4 +511,28 @@ public class XzdPurchaseContractInformationServiceImpl extends ServiceImpl<XzdPu
}
}
@Override
public String selectNameByIds(String ids) {
List<String> list = new ArrayList<>();
for (Long id : StringUtils.splitTo(ids, Convert::toLong)) {
XzdPurchaseContractInformationVo vo = SpringUtils.getAopProxy(this).getBaseMapper().selectVoById(id);
if (ObjectUtil.isNotNull(vo)) {
list.add(vo.getContractCode());
}
}
return String.join(StringUtils.SEPARATOR, list);
}
// @Override
// public String selectCodeByIds(String ids) {
// List<String> list = new ArrayList<>();
// for (Long id : StringUtils.splitTo(ids, Convert::toLong)) {
// XzdPurchaseContractInformationVo vo = SpringUtils.getAopProxy(this).getBaseMapper().selectVoById(id);
// if (ObjectUtil.isNotNull(vo)) {
// list.add(vo.getContractName());
// }
// }
// return String.join(StringUtils.SEPARATOR, list);
// }
}

20
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCustomerinformationServiceImpl.java
View File

@ -1,7 +1,11 @@
package org.dromara.xzd.service.impl;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.dromara.common.core.service.XzdCustomerinformationService;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
@ -9,6 +13,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.system.domain.vo.SysDeptVo;
import org.springframework.stereotype.Service;
import org.dromara.xzd.domain.bo.XzdCustomerinformationBo;
import org.dromara.xzd.domain.vo.XzdCustomerinformationVo;
@ -16,6 +21,7 @@ import org.dromara.xzd.domain.XzdCustomerinformation;
import org.dromara.xzd.mapper.XzdCustomerinformationMapper;
import org.dromara.xzd.service.IXzdCustomerinformationService;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Collection;
@ -28,7 +34,7 @@ import java.util.Collection;
*/
@RequiredArgsConstructor
@Service
public class XzdCustomerinformationServiceImpl extends ServiceImpl<XzdCustomerinformationMapper, XzdCustomerinformation> implements IXzdCustomerinformationService {
public class XzdCustomerinformationServiceImpl extends ServiceImpl<XzdCustomerinformationMapper, XzdCustomerinformation> implements IXzdCustomerinformationService, XzdCustomerinformationService {
private final XzdCustomerinformationMapper baseMapper;
@ -170,4 +176,16 @@ public class XzdCustomerinformationServiceImpl extends ServiceImpl<XzdCustomerin
}
return baseMapper.deleteByIds(ids) > 0;
}
@Override
public String selectNmaeByIds(String ids) {
List<String> list = new ArrayList<>();
for (Long id : StringUtils.splitTo(ids, Convert::toLong)) {
XzdCustomerinformationVo vo = SpringUtils.getAopProxy(this).getBaseMapper().selectVoById(id);
if (ObjectUtil.isNotNull(vo)) {
list.add(vo.getUnitName());
}
}
return String.join(StringUtils.SEPARATOR, list);
}
}

17
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java
View File

@ -1,12 +1,16 @@
package org.dromara.xzd.service.impl;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.service.XzdProjectService;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@ -39,7 +43,7 @@ import java.util.*;
@Slf4j
@RequiredArgsConstructor
@Service
public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProject> implements IXzdProjectService {
public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProject> implements IXzdProjectService, XzdProjectService {
private final XzdProjectMapper baseMapper;
@ -660,4 +664,15 @@ public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProj
}
}
@Override
public String selectNmaeByIds(String ids) {
List<String> list = new ArrayList<>();
for (Long id : StringUtils.splitTo(ids, Convert::toLong)) {
XzdProjectVo vo = SpringUtils.getAopProxy(this).getBaseMapper().selectVoById(id);
if (ObjectUtil.isNotNull(vo)) {
list.add(vo.getProjectName());
}
}
return String.join(StringUtils.SEPARATOR, list);
}
}

18
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java
View File

@ -1,11 +1,15 @@
package org.dromara.xzd.service.impl;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.service.XzdSupplierInfoService;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@ -14,6 +18,7 @@ import org.dromara.common.utils.BatchNumberGenerator;
import org.dromara.system.domain.vo.SysUserVo;
import org.dromara.system.service.impl.SysOssServiceImpl;
import org.dromara.system.service.impl.SysUserServiceImpl;
import org.dromara.xzd.contractManagement.purchaseManagement.domain.vo.XzdPurchaseContractInformationVo;
import org.dromara.xzd.domain.*;
import org.dromara.xzd.domain.bo.XzdSupplierInfoBo;
import org.dromara.xzd.domain.vo.XzdCustomertypeVo;
@ -35,7 +40,7 @@ import java.util.*;
*/
@RequiredArgsConstructor
@Service
public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMapper, XzdSupplierInfo> implements IXzdSupplierInfoService {
public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMapper, XzdSupplierInfo> implements IXzdSupplierInfoService, XzdSupplierInfoService {
private final XzdSupplierInfoMapper baseMapper;
@ -827,4 +832,15 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
}
@Override
public String selectNmaeByIds(String ids) {
List<String> list = new ArrayList<>();
for (Long id : StringUtils.splitTo(ids, Convert::toLong)) {
XzdSupplierInfoVo vo = SpringUtils.getAopProxy(this).getBaseMapper().selectVoById(id);
if (ObjectUtil.isNotNull(vo)) {
list.add(vo.getUnitName());
}
}
return String.join(StringUtils.SEPARATOR, list);
}
}

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdJsCgJindu.java
View File

@ -29,6 +29,11 @@ public class XzdJsCgJindu extends BaseEntity {
@TableId(value = "id")
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码（带*，必填）
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdJsCgJungon.java
View File

@ -29,6 +29,11 @@ public class XzdJsCgJungon extends BaseEntity {
@TableId(value = "id")
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编号（带*，必填）
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdJsCgJungonEdit.java
View File

@ -29,6 +29,11 @@ public class XzdJsCgJungonEdit extends BaseEntity {
@TableId(value = "id")
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编号（带*，必填）
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/XzdJsZhfwJindu.java
View File

@ -32,6 +32,11 @@ public class XzdJsZhfwJindu extends BaseEntity {
@TableId(value = "id")
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码（带*，必填）
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCgJinduBo.java
View File

@ -31,6 +31,11 @@ public class XzdJsCgJinduBo extends BaseEntity {
@NotNull(message = "主键ID，自增不能为空", groups = { EditGroup.class })
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码（带*，必填）
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCgJungonBo.java
View File

@ -32,6 +32,11 @@ public class XzdJsCgJungonBo extends BaseEntity {
@NotNull(message = "主键ID，自增不能为空", groups = { EditGroup.class })
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编号（带*，必填）
*/

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsCgJungonEditBo.java
View File

@ -31,6 +31,10 @@ public class XzdJsCgJungonEditBo extends BaseEntity {
*/
@NotNull(message = "主键ID，自增不能为空", groups = { EditGroup.class })
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编号（带*，必填）

4
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/bo/XzdJsZhfwJinduBo.java
View File

@ -32,6 +32,10 @@ public class XzdJsZhfwJinduBo extends BaseEntity {
@NotNull(message = "主键ID，自增不能为空", groups = { EditGroup.class })
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码（带*，必填）
*/

11
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJinduVo.java
View File

@ -2,6 +2,8 @@ package org.dromara.xzd.settlement.domain.vo;
import java.math.BigDecimal;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
import org.dromara.xzd.settlement.domain.*;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
@ -13,7 +15,6 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
@ -37,6 +38,11 @@ public class XzdJsCgJinduVo implements Serializable {
@ExcelProperty(value = "主键ID，自增")
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码（带*，必填）
*/
@ -64,6 +70,7 @@ public class XzdJsCgJinduVo implements Serializable {
@ExcelProperty(value = "合同编码", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "带=查询，关联合同表")
private Long contractCode;
@Translation(type = TransConstant.XZD_PURCHASE_CONTRACT_ID_TO_NAME, mapper = "contractCode")
private String contractCodeName;
/**
@ -93,6 +100,7 @@ public class XzdJsCgJinduVo implements Serializable {
@ExcelProperty(value = "项目", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "带=*，必填")
private Long project;
@Translation(type = TransConstant.XZD_PROJECT_ID_TO_NAME, mapper = "project")
private String projectName;
/**
@ -115,6 +123,7 @@ public class XzdJsCgJinduVo implements Serializable {
@ExcelProperty(value = "结算单位", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "带=查询，关联单位表")
private Long settlementUnit;
@Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "settlementUnit")
private String settlementUnitName;
/**

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJungonEditVo.java
View File

@ -38,6 +38,11 @@ public class XzdJsCgJungonEditVo implements Serializable {
@ExcelProperty(value = "主键ID，自增")
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编号（带*，必填）
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsCgJungonVo.java
View File

@ -38,6 +38,11 @@ public class XzdJsCgJungonVo implements Serializable {
@ExcelProperty(value = "主键ID，自增")
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编号（带*，必填）
*/

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/domain/vo/XzdJsZhfwJinduVo.java
View File

@ -40,6 +40,11 @@ public class XzdJsZhfwJinduVo implements Serializable {
@ExcelProperty(value = "主键ID，自增")
private Long id;
/**
* 部门id
*/
private Long deptId;
/**
* 单据编码（带*，必填）
*/

33
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJinduServiceImpl.java
View File

@ -84,7 +84,6 @@ public class XzdJsCgJinduServiceImpl extends ServiceImpl<XzdJsCgJinduMapper, Xzd
@Override
public XzdJsCgJinduVo queryById(Long id){
XzdJsCgJinduVo xzdJsCgJinduVo = baseMapper.selectVoById(id);
getName(xzdJsCgJinduVo);
getHttk(xzdJsCgJinduVo);
return xzdJsCgJinduVo;
}
@ -100,7 +99,6 @@ public class XzdJsCgJinduServiceImpl extends ServiceImpl<XzdJsCgJinduMapper, Xzd
public TableDataInfo<XzdJsCgJinduVo> queryPageList(XzdJsCgJinduBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<XzdJsCgJindu> lqw = buildQueryWrapper(bo);
Page<XzdJsCgJinduVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
result.getRecords().forEach(this::getName);
return TableDataInfo.build(result);
}
@ -114,7 +112,6 @@ public class XzdJsCgJinduServiceImpl extends ServiceImpl<XzdJsCgJinduMapper, Xzd
public List<XzdJsCgJinduVo> queryList(XzdJsCgJinduBo bo) {
LambdaQueryWrapper<XzdJsCgJindu> lqw = buildQueryWrapper(bo);
List<XzdJsCgJinduVo> xzdJsCgJinduVos = baseMapper.selectVoList(lqw);
xzdJsCgJinduVos.forEach(this::getName);
return xzdJsCgJinduVos;
}
@ -125,6 +122,7 @@ public class XzdJsCgJinduServiceImpl extends ServiceImpl<XzdJsCgJinduMapper, Xzd
lqw.eq(StringUtils.isNotBlank(bo.getDocCode()), XzdJsCgJindu::getDocCode, bo.getDocCode());
lqw.like(StringUtils.isNotBlank(bo.getTitle()), XzdJsCgJindu::getTitle, bo.getTitle());
lqw.eq(bo.getDocDate() != null, XzdJsCgJindu::getDocDate, bo.getDocDate());
lqw.eq(bo.getDeptId() != null, XzdJsCgJindu::getDeptId, bo.getDeptId());
lqw.eq(bo.getContractCode() != null, XzdJsCgJindu::getContractCode, bo.getContractCode());
lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdJsCgJindu::getContractName, bo.getContractName());
lqw.eq(StringUtils.isNotBlank(bo.getStatCycle()), XzdJsCgJindu::getStatCycle, bo.getStatCycle());
@ -295,35 +293,6 @@ public class XzdJsCgJinduServiceImpl extends ServiceImpl<XzdJsCgJinduMapper, Xzd
return baseMapper.deleteByIds(ids) > 0;
}
/**
* 获取部分字段名称
* @param item
*/
private void getName(XzdJsCgJinduVo item) {
//项目名称
if (item.getProject() != null){
String projectName = xzdProjectService.queryNameById(item.getProject());
if (projectName != null){
item.setProjectName(projectName);
}
}
//合同编码
if (item.getContractCode() != null){
String code = xzdPurchaseContractInformationService.queryCodeById(item.getContractCode());
if (code != null){
item.setContractCodeName(code);
}
}
//结算单位(客户信息列表)
if (item.getSettlementUnit() != null){
String name = iXzdCorrespondentList.queryNameById(item.getSettlementUnit());
if (name!=null){
item.setSettlementUnitName(name);
}
}
}
/**
* 获取结算扣款与奖励项内容
* @param vo

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJungonEditServiceImpl.java
View File

@ -117,6 +117,7 @@ public class XzdJsCgJungonEditServiceImpl extends ServiceImpl<XzdJsCgJungonEditM
lqw.eq(StringUtils.isNotBlank(bo.getDocCode()), XzdJsCgJungonEdit::getDocCode, bo.getDocCode());
lqw.like(StringUtils.isNotBlank(bo.getTitle()), XzdJsCgJungonEdit::getTitle, bo.getTitle());
lqw.eq(bo.getDocDate() != null, XzdJsCgJungonEdit::getDocDate, bo.getDocDate());
lqw.eq(bo.getDeptId() != null, XzdJsCgJungonEdit::getDeptId, bo.getDeptId());
lqw.eq(bo.getFinalAccountCode() != null, XzdJsCgJungonEdit::getFinalAccountCode, bo.getFinalAccountCode());
lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdJsCgJungonEdit::getContractName, bo.getContractName());
lqw.eq(bo.getContractCode() != null, XzdJsCgJungonEdit::getContractCode, bo.getContractCode());

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsCgJungonServiceImpl.java
View File

@ -116,6 +116,7 @@ public class XzdJsCgJungonServiceImpl extends ServiceImpl<XzdJsCgJungonMapper, X
lqw.eq(StringUtils.isNotBlank(bo.getDocCode()), XzdJsCgJungon::getDocCode, bo.getDocCode());
lqw.like(StringUtils.isNotBlank(bo.getTitle()), XzdJsCgJungon::getTitle, bo.getTitle());
lqw.eq(bo.getDocDate() != null, XzdJsCgJungon::getDocDate, bo.getDocDate());
lqw.eq(bo.getDeptId() != null, XzdJsCgJungon::getDeptId, bo.getDeptId());
lqw.eq(bo.getContractCode() != null, XzdJsCgJungon::getContractCode, bo.getContractCode());
lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdJsCgJungon::getContractName, bo.getContractName());
lqw.eq(bo.getFinalAmount() != null, XzdJsCgJungon::getFinalAmount, bo.getFinalAmount());

1
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/settlement/service/impl/XzdJsZhfwJinduServiceImpl.java
View File

@ -122,6 +122,7 @@ public class XzdJsZhfwJinduServiceImpl extends ServiceImpl<XzdJsZhfwJinduMapper,
lqw.orderByDesc(XzdJsZhfwJindu::getId);
lqw.eq(StringUtils.isNotBlank(bo.getDocCode()), XzdJsZhfwJindu::getDocCode, bo.getDocCode());
lqw.like(StringUtils.isNotBlank(bo.getTitle()), XzdJsZhfwJindu::getTitle, bo.getTitle());
lqw.eq(bo.getDeptId() != null, XzdJsZhfwJindu::getDeptId, bo.getDeptId());
lqw.eq(bo.getDocDate() != null, XzdJsZhfwJindu::getDocDate, bo.getDocDate());
lqw.eq(bo.getContractCode() != null, XzdJsZhfwJindu::getContractCode, bo.getContractCode());
lqw.like(StringUtils.isNotBlank(bo.getContractName()), XzdJsZhfwJindu::getContractName, bo.getContractName());