机械合同名称注解

xinnengyuan/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/XzdContractMachineryService.java

@@ -0,0 +1,14 @@
+package org.dromara.common.core.service;
+
+/**
+ * 机械合同信息Service接口
+ *
+ * @author Lion Li
+ * @date 2025-11-12
+ */
+public interface XzdContractMachineryService {
+
+    String selectNmaeByIds(String ids);
+
+
+}

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

@@ -53,6 +53,12 @@ public interface TransConstant {
      * 采购合同id转名称
      */
     String XZD_PURCHASE_CONTRACT_ID_TO_NAME = "xzd_purchase_contract_id_to_name";
+
+    /**
+     * 采购合同id转名称
+     */
+    String XZD_PURCHASE_JXXIE_ID_TO_NAME = "xzd_purchase_contract_jixie_id_to_name";
+
     /**
      * 综合服务合同id转名称
      */

xinnengyuan/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/XzdJXHTTranslation.java

@@ -0,0 +1,27 @@
+package org.dromara.common.translation.core.impl;
+
+
+import lombok.AllArgsConstructor;
+import org.dromara.common.core.service.XzdContractMachineryService;
+import org.dromara.common.core.service.XzdJsCgJungonService;
+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_JXXIE_ID_TO_NAME)
+public class XzdJXHTTranslation implements TranslationInterface<String> {
+
+    private final XzdContractMachineryService xzdContractMachineryService;
+
+    @Override
+    public String translation(Object key, String other) {
+        if (key instanceof String ids) {
+            return xzdContractMachineryService.selectNmaeByIds(ids);
+        } else if (key instanceof Long id) {
+            return xzdContractMachineryService.selectNmaeByIds(id.toString());
+        }
+        return null;
+    }
+
+}

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

@@ -13,3 +13,4 @@ org.dromara.common.translation.core.impl.XzdCsContractInformationImpl
 org.dromara.common.translation.core.impl.XzdSupplierOpenBankImpl
 org.dromara.common.translation.core.impl.XzdProjectManagerApprovalImpl
 org.dromara.common.translation.core.impl.XzdCbysZjhcbImpl
+org.dromara.common.translation.core.impl.XzdJXHTTranslation

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongbiang/service/impl/XzdMachineryContractAlterationServiceImpl.java

@@ -220,8 +220,8 @@ public class XzdMachineryContractAlterationServiceImpl extends ServiceImpl<XzdMa
         lqw.eq(StringUtils.isNotBlank(bo.getRevisedTotalAmount()), XzdMachineryContractAlteration::getRevisedTotalAmount, bo.getRevisedTotalAmount());
         lqw.eq(StringUtils.isNotBlank(bo.getContractText()), XzdMachineryContractAlteration::getContractText, bo.getContractText());
         lqw.eq(bo.getDeptId() != null, XzdMachineryContractAlteration::getDeptId, bo.getDeptId());
-        lqw.ge(bo.getStartTime() != null, XzdMachineryContractAlteration::getCreateTime, bo.getStartTime());
+        lqw.ge(bo.getStartTime() != null, XzdMachineryContractAlteration::getDocumentDate, bo.getStartTime());
-        lqw.le(bo.getEndTime() != null, XzdMachineryContractAlteration::getCreateTime, bo.getEndTime());
+        lqw.le(bo.getEndTime() != null, XzdMachineryContractAlteration::getDocumentDate, bo.getEndTime());
         return lqw;
     }
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongxinxi/service/impl/XzdContractMachineryServiceImpl.java

@@ -1,11 +1,15 @@
 package org.dromara.xzd.contractManagement.jixiehetongxinxi.service.impl;
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
 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.service.XzdContractMachineryService;
 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;
@@ -30,6 +34,7 @@ import org.dromara.xzd.domain.XzdContractAdvanceInfo;
 import org.dromara.xzd.domain.XzdContractClause;
 import org.dromara.xzd.domain.XzdDeductionItems;
 import org.dromara.xzd.domain.vo.XzdBusinessSealVo;
+import org.dromara.xzd.domain.vo.XzdProjectVo;
 import org.dromara.xzd.enums.XzdClassEnum;
 import org.dromara.xzd.enums.ZxdEnum;
 import org.dromara.xzd.service.IXzdContractAdvanceInfoService;
@@ -57,7 +62,7 @@ import java.util.*;
 @RequiredArgsConstructor
 @Service
 @Slf4j
-public class XzdContractMachineryServiceImpl extends ServiceImpl<XzdContractMachineryMapper, XzdContractMachinery> implements IXzdContractMachineryService {
+public class XzdContractMachineryServiceImpl extends ServiceImpl<XzdContractMachineryMapper, XzdContractMachinery> implements IXzdContractMachineryService , XzdContractMachineryService {
 
     private final XzdContractMachineryMapper baseMapper;
 
@@ -234,8 +239,8 @@ public class XzdContractMachineryServiceImpl extends ServiceImpl<XzdContractMach
         lqw.eq(StringUtils.isNotBlank(bo.getFileId()), XzdContractMachinery::getFileId, bo.getFileId());
         lqw.eq(StringUtils.isNotBlank(bo.getAuditStatus()), XzdContractMachinery::getAuditStatus, bo.getAuditStatus());
         lqw.eq(bo.getDeptId() != null, XzdContractMachinery::getDeptId, bo.getDeptId());
-        lqw.ge(bo.getStartTime() != null, XzdContractMachinery::getCreateTime, bo.getStartTime());
+        lqw.ge(bo.getStartTime() != null, XzdContractMachinery::getDocumentDate, bo.getStartTime());
-        lqw.le(bo.getEndTime() != null, XzdContractMachinery::getCreateTime, bo.getEndTime());
+        lqw.le(bo.getEndTime() != null, XzdContractMachinery::getDocumentDate, bo.getEndTime());
         return lqw;
     }
 
@@ -460,10 +465,15 @@ public class XzdContractMachineryServiceImpl extends ServiceImpl<XzdContractMach
     }
 
 
-
+    @Override
-
+    public String selectNmaeByIds(String ids) {
-
+        List<String> list = new ArrayList<>();
-
+        for (Long id : StringUtils.splitTo(ids, Convert::toLong)) {
-
+            XzdContractMachineryVo vo = SpringUtils.getAopProxy(this).getBaseMapper().selectVoById(id);
-
+            if (ObjectUtil.isNotNull(vo)) {
+                list.add(vo.getContractCode());
+            }
+        }
+        return String.join(StringUtils.SEPARATOR, list);
+    }
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/contractManagement/jixiehetongzz/service/impl/XzdMachineryContractSuspendServiceImpl.java

@@ -159,8 +159,8 @@ public class XzdMachineryContractSuspendServiceImpl extends ServiceImpl<XzdMachi
         lqw.eq(StringUtils.isNotBlank(bo.getFileId()), XzdMachineryContractSuspend::getFileId, bo.getFileId());
         lqw.eq(StringUtils.isNotBlank(bo.getAuditStatus()), XzdMachineryContractSuspend::getAuditStatus, bo.getAuditStatus());
         lqw.eq(bo.getDeptId() != null, XzdMachineryContractSuspend::getDeptId, bo.getDeptId());
-        lqw.ge(bo.getStartTime() != null, XzdMachineryContractSuspend::getCreateTime, bo.getStartTime());
+        lqw.ge(bo.getStartTime() != null, XzdMachineryContractSuspend::getDocumentDate, bo.getStartTime());
-        lqw.le(bo.getEndTime() != null, XzdMachineryContractSuspend::getCreateTime, bo.getEndTime());
+        lqw.le(bo.getEndTime() != null, XzdMachineryContractSuspend::getDocumentDate, bo.getEndTime());
         return lqw;
     }