From a45f6c10be2177ccb7f654d1ed2ae208ebb13919 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 26 三月 2025 14:41:24 +0800
Subject: [PATCH] 验收单及明细 生成厂商
---
platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteQueryDTO.java | 2
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceManufacturerServiceImpl.java | 16 ++
platformx-device-biz/src/main/resources/mapper/DeviceManufacturerMapper.xml | 20 ++
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java | 2
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceManufacturerController.java | 122 +++++++++++++++++
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNotePageVo.java | 26 ++
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceManufacturer.java | 54 +++++++
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNoteItemPageVo.java | 10 +
platformx-device-biz/src/main/resources/mapper/ReceivingNoteItemMapper.xml | 13 +
platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml | 16 +
platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteItemQueryDTO.java | 2
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java | 77 ++++++++++
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceManufacturerService.java | 8 +
platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNoteItem.java | 35 +++++
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceManufacturerMapper.java | 11 +
15 files changed, 392 insertions(+), 22 deletions(-)
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteItemQueryDTO.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteItemQueryDTO.java
index 33fd284..0bf8c61 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteItemQueryDTO.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteItemQueryDTO.java
@@ -7,4 +7,6 @@
private String contractItemName;
+ private String releaseCode;
+
}
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteQueryDTO.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteQueryDTO.java
index 26841a5..38ef50a 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteQueryDTO.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/dto/ReceivingNoteQueryDTO.java
@@ -5,6 +5,6 @@
@Data
public class ReceivingNoteQueryDTO {
- private String contractName;
+ private String releaseCode;
}
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceManufacturer.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceManufacturer.java
new file mode 100644
index 0000000..96e8f02
--- /dev/null
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceManufacturer.java
@@ -0,0 +1,54 @@
+package com.by4cloud.platformx.device.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.by4cloud.platformx.common.data.mybatis.BaseModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.hibernate.annotations.Table;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+
+@Data
+@Entity
+@TableName("device_manufacturer")
+@javax.persistence.Table(name = "device_manufacturer")
+@Table(appliesTo = "device_manufacturer", comment = "璁惧鍘傚晢")
+public class DeviceManufacturer extends BaseModel<DeviceManufacturer> {
+
+ /**
+ * 璁惧鍘傚晢鍚嶇О
+ */
+ @Schema(description = "璁惧鍘傚晢鍚嶇О")
+ @Column(columnDefinition="VARCHAR(128) comment '璁惧鍘傚晢鍚嶇О'")
+ private String manufacturerName;
+
+ /**
+ * 璁惧鍘傚晢鑱旂郴浜�
+ */
+ @Schema(description = "璁惧鍘傚晢鑱旂郴浜�")
+ @Column(columnDefinition="VARCHAR(128) comment '璁惧鍘傚晢鑱旂郴浜�'")
+ private String manufacturerContact;
+
+ /**
+ * 璁惧鍘傚晢鑱旂郴浜�
+ */
+ @Schema(description = "璁惧鍘傚晢鑱旂郴浜虹數璇�")
+ @Column(columnDefinition="VARCHAR(32) comment '璁惧鍘傚晢鑱旂郴浜虹數璇�'")
+ private String contactPhone;
+
+ /**
+ * 璁惧鍘傚晢鍦板潃
+ */
+ @Schema(description = "璁惧鍘傚晢鍦板潃")
+ @Column(columnDefinition="VARCHAR(32) comment '璁惧鍘傚晢鍦板潃'")
+ private String contactAddress;
+
+
+ /**
+ * 璁惧鍘傚晢鍦板潃
+ */
+ @Schema(description = "璁惧鍘傚晢绉嶇被")
+ @Column(columnDefinition="VARCHAR(256) comment '璁惧鍘傚晢绉嶇被'")
+ private String manufacturerCategory;
+}
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java
index d7eeaa7..5670ea3 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNote.java
@@ -27,10 +27,17 @@
@Table(appliesTo = "receiving_note", comment = "楠屾敹琛�")
public class ReceivingNote extends BaseModel<ReceivingNote> {
/**
- * 鍚堝悓Id
+ * 鎵跨鍚堝悓Id
*/
- @Column(columnDefinition="long comment '鍚堝悓Id'")
- private Long contractId;
+ @Column(columnDefinition="long comment '鎵跨鍚堝悓Id'")
+ private Long lesseeContractId;
+
+ /**
+ * 绉熺敤鍚堝悓Id
+ */
+ @Column(columnDefinition="long comment '绉熺敤鍚堝悓Id'")
+ private Long rentContractId;
+
@Schema(description = "楠屾敹鍏徃")
@Column(columnDefinition="VARCHAR(64) comment '楠屾敹鍏徃'")
private String releaseCompName;
@@ -56,4 +63,68 @@
@Column(columnDefinition="VARCHAR(32) comment '楠屾敹鍗曠紪鍙�'")
private String releaseCode;
+ /**
+ * 鏉ユ簮绫诲瀷
+ */
+ @Schema(description = "鏉ユ簮绫诲瀷")
+ @Column(columnDefinition="INTEGER comment '鏉ユ簮绫诲瀷'")
+ private String resourceType;
+
+ /**
+ * 鐢熶骇鍘傚晢
+ */
+ @Schema(description = "鐢熶骇鍘傚晢")
+ @Column(columnDefinition="long comment '鐢熶骇鍘傚晢'")
+ private Long manufacturerId;
+
+ /**
+ * 鍑哄巶鏃ユ湡
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Schema(description = "鍑哄巶鏃ユ湡")
+ @Column(columnDefinition = "datetime comment '鍑哄巶鏃ユ湡'")
+ private Date productDate;
+
+ /**
+ * 楠屾敹鎯呭喌
+ */
+ @Schema(description = "楠屾敹鎯呭喌")
+ @Column(columnDefinition="VARCHAR(1024) comment '楠屾敹鎯呭喌'")
+ private String releaseSituation;
+
+ /**
+ * 鏁存敼鎯呭喌
+ */
+ @Schema(description = "鏁存敼鎯呭喌")
+ @Column(columnDefinition="VARCHAR(1024) comment '鏁存敼鎯呭喌'")
+ private String correctionSituation;
+
+ /**
+ * 楠屾敹缁撹
+ */
+ @Schema(description = "楠屾敹缁撹")
+ @Column(columnDefinition="VARCHAR(1024) comment '楠屾敹缁撹'")
+ private String releaseConclusion;
+
+ /**
+ * 妫�楠屾姤鍛�
+ */
+ @Schema(description = "妫�楠屾姤鍛�")
+ @Column(columnDefinition="VARCHAR(1024) comment '妫�楠屾姤鍛�'")
+ private String inspectionReport;
+
+ /**
+ * 澶囨敞
+ */
+ @Schema(description = "澶囨敞")
+ @Column(columnDefinition="VARCHAR(256) comment '澶囨敞'")
+ private String remarks;
+
+ /**
+ * 浣跨敤鍏徃
+ */
+ @Schema(description = "浣跨敤鍏徃")
+ @Column(columnDefinition="long comment '浣跨敤鍏徃'")
+ private Long deptId;
}
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNoteItem.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNoteItem.java
index aefe50f..bb91a8e 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNoteItem.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/ReceivingNoteItem.java
@@ -31,6 +31,7 @@
*/
@Column(columnDefinition="long comment '楠屾敹涓昏〃Id'")
private Long noteId;
+
/**
* 鍚堝悓Id
*/
@@ -48,6 +49,40 @@
@Column(columnDefinition="double comment '楠屾敹閲戦'")
private Double output;
+ /**
+ * 璁惧缂栫爜
+ */
+ @Schema(description="璁惧缂栫爜")
+ @Column(columnDefinition="VARCHAR(16) comment '璁惧缂栫爜'")
+ private String deviceCode;
+ /**
+ * 璁惧鍚嶇О
+ */
+ @Schema(description="璁惧鍚嶇О")
+ @Column(columnDefinition="VARCHAR(256) comment '璁惧鍚嶇О'")
+ private String deviceName;
+
+ /**
+ * 瑙勬牸鍨嬪彿
+ */
+ @Schema(description="瑙勬牸鍨嬪彿")
+ @Column(columnDefinition="VARCHAR(256) comment '瑙勬牸鍨嬪彿'")
+ private String deviceModels;
+
+ /**
+ * 鍏抽敭鍙傛暟
+ */
+ @Schema(description="鍏抽敭鍙傛暟")
+ @Column(columnDefinition="VARCHAR(256) comment '鍏抽敭鍙傛暟'")
+ private String keyParameter;
+
+
+ /**
+ * 璁￠噺鍗曚綅
+ */
+ @Schema(description="璁￠噺鍗曚綅")
+ @Column(columnDefinition="VARCHAR(32) comment '璁￠噺鍗曚綅'")
+ private String meteringUnit;
}
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNoteItemPageVo.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNoteItemPageVo.java
index b4d7550..4d1e78b 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNoteItemPageVo.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNoteItemPageVo.java
@@ -9,7 +9,15 @@
private String releaseCode;
- private String contractItemName;
+ private String deviceCode;
+
+ private String deviceName;
+
+ private String deviceModels;
+
+ private String keyParameter;
+
+ private String meteringUnit;
private String num;
diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNotePageVo.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNotePageVo.java
index eb4b338..986ce36 100644
--- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNotePageVo.java
+++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/vo/ReceivingNotePageVo.java
@@ -1,18 +1,32 @@
package com.by4cloud.platformx.device.entity.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+
+import java.util.Date;
@Data
public class ReceivingNotePageVo {
private Long id;
- private String releaseCompName;
-
- private String releasePerson;
-
- private String contractName;
-
private String releaseCode;
+ /**
+ * 鏉ユ簮绫诲瀷
+ */
+ private String resourceType;
+
+ /**
+ * 鐢熶骇鍘傚晢
+ */
+ private String manufacturerName;
+
+ /**
+ * 浣跨敤鍏徃
+ */
+ private String deptName;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date releaseDate;
}
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java
index 0ce52de..1d8bf4e 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/ContractController.java
@@ -3,6 +3,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -50,6 +51,7 @@
@PreAuthorize("@pms.hasPermission('platformx_contract_view')" )
public R getContractPage(@ParameterObject Page page, @ParameterObject Contract contract) {
LambdaQueryWrapper<Contract> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(contract.getType()!=null,Contract::getType,contract.getType());
wrapper.like(StringUtils.isNotEmpty(contract.getName()),Contract::getName,contract.getName());
wrapper.like(StringUtils.isNotEmpty(contract.getNumber()),Contract::getNumber,contract.getNumber());
return R.ok(contractService.page(page, wrapper));
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceManufacturerController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceManufacturerController.java
new file mode 100644
index 0000000..b841ffc
--- /dev/null
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceManufacturerController.java
@@ -0,0 +1,122 @@
+package com.by4cloud.platformx.device.controller;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.log.annotation.SysLog;
+import com.by4cloud.platformx.device.entity.DeviceManufacturer;
+import com.by4cloud.platformx.device.service.DeviceManufacturerService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import org.springdoc.api.annotations.ParameterObject;
+import org.springframework.http.HttpHeaders;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 璁惧鍘傚晢
+ *
+ * @author syt
+ * @date 2025-03-26 08:46:59
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/deviceManufacturer" )
+@Tag(description = "deviceManufacturer" , name = "璁惧鍘傚晢绠＄悊" )
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class DeviceManufacturerController {
+
+ private final DeviceManufacturerService deviceManufacturerService;
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page 鍒嗛〉瀵硅薄
+ * @param deviceManufacturer 璁惧鍘傚晢
+ * @return
+ */
+ @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
+ @GetMapping("/page" )
+ @PreAuthorize("@pms.hasPermission('device_deviceManufacturer_view')" )
+ public R getDeviceManufacturerPage(@ParameterObject Page page, @ParameterObject DeviceManufacturer deviceManufacturer) {
+ LambdaQueryWrapper<DeviceManufacturer> wrapper = Wrappers.lambdaQuery();
+ wrapper.like(StrUtil.isNotBlank(deviceManufacturer.getManufacturerCategory()),DeviceManufacturer::getManufacturerCategory,deviceManufacturer.getManufacturerCategory());
+ wrapper.like(StrUtil.isNotBlank(deviceManufacturer.getManufacturerName()),DeviceManufacturer::getManufacturerName,deviceManufacturer.getManufacturerName());
+ return R.ok(deviceManufacturerService.page(page, wrapper));
+ }
+
+
+ /**
+ * 閫氳繃id鏌ヨ璁惧鍘傚晢
+ * @param id id
+ * @return R
+ */
+ @Operation(summary = "閫氳繃id鏌ヨ" , description = "閫氳繃id鏌ヨ" )
+ @GetMapping("/{id}" )
+ @PreAuthorize("@pms.hasPermission('device_deviceManufacturer_view')" )
+ public R getById(@PathVariable("id" ) Long id) {
+ return R.ok(deviceManufacturerService.getById(id));
+ }
+
+ /**
+ * 鏂板璁惧鍘傚晢
+ * @param deviceManufacturer 璁惧鍘傚晢
+ * @return R
+ */
+ @Operation(summary = "鏂板璁惧鍘傚晢" , description = "鏂板璁惧鍘傚晢" )
+ @SysLog("鏂板璁惧鍘傚晢" )
+ @PostMapping
+ @PreAuthorize("@pms.hasPermission('device_deviceManufacturer_add')" )
+ public R save(@RequestBody DeviceManufacturer deviceManufacturer) {
+ return R.ok(deviceManufacturerService.save(deviceManufacturer));
+ }
+
+ /**
+ * 淇敼璁惧鍘傚晢
+ * @param deviceManufacturer 璁惧鍘傚晢
+ * @return R
+ */
+ @Operation(summary = "淇敼璁惧鍘傚晢" , description = "淇敼璁惧鍘傚晢" )
+ @SysLog("淇敼璁惧鍘傚晢" )
+ @PutMapping
+ @PreAuthorize("@pms.hasPermission('device_deviceManufacturer_edit')" )
+ public R updateById(@RequestBody DeviceManufacturer deviceManufacturer) {
+ return R.ok(deviceManufacturerService.updateById(deviceManufacturer));
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎璁惧鍘傚晢
+ * @param ids id鍒楄〃
+ * @return R
+ */
+ @Operation(summary = "閫氳繃id鍒犻櫎璁惧鍘傚晢" , description = "閫氳繃id鍒犻櫎璁惧鍘傚晢" )
+ @SysLog("閫氳繃id鍒犻櫎璁惧鍘傚晢" )
+ @DeleteMapping
+ @PreAuthorize("@pms.hasPermission('device_deviceManufacturer_del')" )
+ public R removeById(@RequestBody Long[] ids) {
+ return R.ok(deviceManufacturerService.removeBatchByIds(CollUtil.toList(ids)));
+ }
+
+
+ /**
+ * 瀵煎嚭excel 琛ㄦ牸
+ * @param deviceManufacturer 鏌ヨ鏉′欢
+ * @param ids 瀵煎嚭鎸囧畾ID
+ * @return excel 鏂囦欢娴�
+ */
+ @ResponseExcel
+ @GetMapping("/export")
+ @PreAuthorize("@pms.hasPermission('device_deviceManufacturer_export')" )
+ public List<DeviceManufacturer> export(DeviceManufacturer deviceManufacturer,Long[] ids) {
+ return deviceManufacturerService.list(Wrappers.lambdaQuery(deviceManufacturer).in(ArrayUtil.isNotEmpty(ids), DeviceManufacturer::getId, ids));
+ }
+}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceManufacturerMapper.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceManufacturerMapper.java
new file mode 100644
index 0000000..f13d907
--- /dev/null
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/mapper/DeviceManufacturerMapper.java
@@ -0,0 +1,11 @@
+package com.by4cloud.platformx.device.mapper;
+
+import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
+import com.by4cloud.platformx.device.entity.DeviceManufacturer;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface DeviceManufacturerMapper extends PlatformxBaseMapper<DeviceManufacturer> {
+
+
+}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceManufacturerService.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceManufacturerService.java
new file mode 100644
index 0000000..3309768
--- /dev/null
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/DeviceManufacturerService.java
@@ -0,0 +1,8 @@
+package com.by4cloud.platformx.device.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.by4cloud.platformx.device.entity.DeviceManufacturer;
+
+public interface DeviceManufacturerService extends IService<DeviceManufacturer> {
+
+}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceManufacturerServiceImpl.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceManufacturerServiceImpl.java
new file mode 100644
index 0000000..3cf354e
--- /dev/null
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/DeviceManufacturerServiceImpl.java
@@ -0,0 +1,16 @@
+package com.by4cloud.platformx.device.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.by4cloud.platformx.device.entity.DeviceManufacturer;
+import com.by4cloud.platformx.device.mapper.DeviceManufacturerMapper;
+import com.by4cloud.platformx.device.service.DeviceManufacturerService;
+import org.springframework.stereotype.Service;
+/**
+ * 璁惧鍘傚晢
+ *
+ * @author syt
+ * @date 2025-03-26 08:46:59
+ */
+@Service
+public class DeviceManufacturerServiceImpl extends ServiceImpl<DeviceManufacturerMapper, DeviceManufacturer> implements DeviceManufacturerService {
+}
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/resources/mapper/DeviceManufacturerMapper.xml b/platformx-device-biz/src/main/resources/mapper/DeviceManufacturerMapper.xml
new file mode 100644
index 0000000..6e37c64
--- /dev/null
+++ b/platformx-device-biz/src/main/resources/mapper/DeviceManufacturerMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.by4cloud.platformx.device.mapper.DeviceManufacturerMapper">
+
+ <resultMap id="deviceManufacturerMap" type="com.by4cloud.platformx.device.entity.DeviceManufacturer">
+ <id property="id" column="id"/>
+ <result property="compId" column="comp_id"/>
+ <result property="contactAddress" column="contact_address"/>
+ <result property="contactPhone" column="contact_phone"/>
+ <result property="manufacturerCategory" column="manufacturer_category"/>
+ <result property="manufacturerContact" column="manufacturer_contact"/>
+ <result property="manufacturerName" column="manufacturer_name"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="delFlag" column="del_flag"/>
+ </resultMap>
+</mapper>
\ No newline at end of file
diff --git a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteItemMapper.xml b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteItemMapper.xml
index 48f45ec..6ebc75f 100644
--- a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteItemMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteItemMapper.xml
@@ -20,17 +20,20 @@
select
rni.id,
rni.num ,
+ rni.device_code,
+ rni.device_name ,
+ rni.device_models ,
+ rni.key_parameter ,
+ rni.metering_unit ,
rni.`output` ,
- ci.name contractItemName,
rn.release_code
from
receiving_note_item rni
- join contract_item ci on rni.contract_item_id = ci.id
- join receiving_note rn on rn.id = rni.note_id
+ join receiving_note rn on rn.id = rni.note_id
where
rni.del_flag = '0'
- <if test="queryDTO.contractItemName != null and queryDTO.contractItemName !=''">
- and c.name like CONCAT('%', #{queryDTO.contractItemName}, '%')
+ <if test="queryDTO.releaseCode != null and queryDTO.releaseCode !=''">
+ and rn.release_code like CONCAT('%', #{queryDTO.releaseCode}, '%')
</if>
</select>
</mapper>
diff --git a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
index 88e1e79..2ad25b2 100644
--- a/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
+++ b/platformx-device-biz/src/main/resources/mapper/ReceivingNoteMapper.xml
@@ -21,17 +21,21 @@
<select id="pageNew" resultType="com.by4cloud.platformx.device.entity.vo.ReceivingNotePageVo">
select
rn.id,
- rn.release_comp_name ,
- rn.release_person,
+ rn.resource_type ,
+ rn.release_date ,
rn.release_code,
- c.name contractName
+ dm.manufacturer_name,
+ sd.name deptName
from
receiving_note rn
- join contract c on rn.contract_id = c.id
+ join device_manufacturer dm on
+ rn.manufacturer_id = dm.id
+ join platformxx_boot.sys_dept sd on
+ rn.dept_id = sd.dept_id
where
rn.del_flag = '0'
- <if test="queryDTO.contractName != null and queryDTO.contractName !=''">
- and c.name like CONCAT('%', #{queryDTO.contractName}, '%')
+ <if test="queryDTO.releaseCode != null and queryDTO.releaseCode !=''">
+ and rn.release_code like CONCAT('%', #{queryDTO.releaseCode}, '%')
</if>
</select>
</mapper>
--
Gitblit v1.9.1