1.0.41 查询项目采购信息优化

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectPurchase.java

@@ -60,7 +60,6 @@ public class ErpProjectPurchase extends TenantEntity {
     /**
      * 版本
      */
-    @Version
     private Long version;
 
     /**

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectPurchaseVo.java

@@ -11,7 +11,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -100,6 +100,12 @@ public class ErpProjectPurchaseVo implements Serializable {
     @ExcelProperty(value = "部门ID")
     private Long deptId;
 
+    /**
+     * 版本
+     */
+    @ExcelProperty(value = "版本")
+    private Long version;
+
     /**
      * 提报人
      */
@@ -175,5 +181,8 @@ public class ErpProjectPurchaseVo implements Serializable {
     @ExcelDictFormat(dictType = "active_flag")
     private String activeFlag;
 
-
+    /**
+     * 合同物料List
+     */
+    private List<ErpProjectPurchaseMaterialVo> purchaseMaterialList;
 }

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectPurchaseServiceImpl.java

@@ -65,7 +65,17 @@ public class ErpProjectPurchaseServiceImpl implements IErpProjectPurchaseService
      */
     @Override
     public ErpProjectPurchaseVo queryById(Long projectPurchaseId) {
-        return baseMapper.selectVoById(projectPurchaseId);
+        MPJLambdaWrapper<ErpProjectPurchase> lqw = JoinWrappers.lambda(ErpProjectPurchase.class)
+                .eq(ErpProjectPurchase::getProjectPurchaseId, projectPurchaseId);
+        List<ErpProjectPurchaseVo> list = baseMapper.selectCustomErpProjectPurchaseVoList(lqw);
+        ErpProjectPurchaseVo erpProjectPurchaseVo = list.get(0);
+        MPJLambdaWrapper<ErpProjectPurchaseMaterial> lqwM = JoinWrappers.lambda(ErpProjectPurchaseMaterial.class)
+                .selectAll(ErpProjectPurchaseMaterial.class)
+                .eq("t.del_flag", "0")
+                .eq(ErpProjectPurchaseMaterial::getProjectPurchaseId, erpProjectPurchaseVo.getProjectPurchaseId());
+        List<ErpProjectPurchaseMaterialVo> voList = purchaseMaterialMapper.selectCustomErpProjectPurchaseMaterialVoList(lqwM);
+        erpProjectPurchaseVo.setPurchaseMaterialList(voList);
+        return erpProjectPurchaseVo;
     }
 
     /**

ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectPurchaseMapper.xml

@@ -26,6 +26,7 @@
                t.relation_id,
                t.remark,
                t.spare_flag,
+               t.version,
                t.active_flag,
                t.del_flag,
                t.create_dept,
@@ -34,7 +35,7 @@
                t.update_by,
                t.update_time,
                p.project_name,
-               p.dept_id,
+               p.dept_id as deptId,
                u1.nick_name as managerName,
                u2.nick_name as chargeName,
                u3.nick_name as deputyName,