From 6ed95f5c68ea2780dc97792ced6c94a77324393e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 24 二月 2025 19:51:21 +0800
Subject: [PATCH] 标准物质领用
---
cnas-require/src/main/resources/mapper/FeStandardSubstanceRecordMapper.xml | 51 +++++++++++++++++++++++++
cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceRecordController.java | 9 +---
cnas-require/src/main/resources/mapper/FeStandardSubstanceAcceptanceMapper.xml | 46 +++++++++++++++++++++++
3 files changed, 100 insertions(+), 6 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceRecordController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceRecordController.java
index b2bcf7a..da69a88 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceRecordController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/FeStandardSubstanceRecordController.java
@@ -9,10 +9,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -55,8 +52,8 @@
}
@ApiOperation(value = "鍒嗛〉鏌ヨ")
- @PostMapping("/getPageSubstanceRecord")
- public Result<IPage<SubstanceRecordVo>> getPageSubstanceRecord(Page page, @RequestBody SubstanceRecordVo vo) {
+ @GetMapping("/getPageSubstanceRecord")
+ public Result<IPage<SubstanceRecordVo>> getPageSubstanceRecord(Page page, SubstanceRecordVo vo) {
IPage<SubstanceRecordVo> ipage = feStandardSubstanceRecordService.getPage(page,vo);
return Result.success(ipage);
}
diff --git a/cnas-require/src/main/resources/mapper/FeStandardSubstanceAcceptanceMapper.xml b/cnas-require/src/main/resources/mapper/FeStandardSubstanceAcceptanceMapper.xml
new file mode 100644
index 0000000..e336198
--- /dev/null
+++ b/cnas-require/src/main/resources/mapper/FeStandardSubstanceAcceptanceMapper.xml
@@ -0,0 +1,46 @@
+<?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.ruoyi.require.mapper.FeStandardSubstanceAcceptanceMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.require.pojo.FeStandardSubstanceAcceptance">
+ <id column="id" property="id" />
+ <result column="substance_id" property="substanceId" />
+ <result column="arrive_date" property="arriveDate" />
+ <result column="maintenance_unit" property="maintenanceUnit" />
+ <result column="perameters" property="perameters" />
+ <result column="installation" property="installation" />
+ <result column="situation" property="situation" />
+ <result column="signature" property="signature" />
+ <result column="producer" property="producer" />
+ <result column="recipient" property="recipient" />
+ <result column="file" property="file" />
+ <result column="create_user" property="createUser" />
+ <result column="create_time" property="createTime" />
+ <result column="update_user" property="updateUser" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+ <select id="getPageAcceptance" resultType="com.ruoyi.require.vo.AcceptanceVo">
+ SELECT
+ sa.id,
+ ss.name,
+ ss.model,
+ ss.factory_manufacturer,
+ ss.factory_num,
+ ss.manage_num,
+ ss.uncertainty,
+ ss.quantity,
+ ss.acquisition_date,
+ ss.effective_date,
+ ss.file_num,
+ ss.position
+ FROM cnas_fe_standard_substance_acceptance sa
+ LEFT JOIN cnas_fe_standard_substance ss on ss.id = sa.substance_id
+ <where>
+ <if test="name != null and name != ''">
+ ss.name like CONCAT('%', #{name}, '%')
+ </if>
+ </where>
+ </select>
+
+</mapper>
diff --git a/cnas-require/src/main/resources/mapper/FeStandardSubstanceRecordMapper.xml b/cnas-require/src/main/resources/mapper/FeStandardSubstanceRecordMapper.xml
new file mode 100644
index 0000000..315d743
--- /dev/null
+++ b/cnas-require/src/main/resources/mapper/FeStandardSubstanceRecordMapper.xml
@@ -0,0 +1,51 @@
+<?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.ruoyi.require.mapper.FeStandardSubstanceRecordMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.require.pojo.FeStandardSubstanceRecord">
+ <id column="id" property="id" />
+ <result column="substance_id" property="substanceId" />
+ <result column="integrity" property="integrity" />
+ <result column="borrow_user" property="borrowUser" />
+ <result column="phone" property="phone" />
+ <result column="borrow_date" property="borrowDate" />
+ <result column="return_date" property="returnDate" />
+ <result column="lender" property="lender" />
+ <result column="rummager" property="rummager" />
+ <result column="status" property="status" />
+ <result column="create_user" property="createUser" />
+ <result column="create_time" property="createTime" />
+ <result column="update_user" property="updateUser" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+ <select id="getPage" resultType="com.ruoyi.require.vo.SubstanceRecordVo">
+ SELECT
+ ssr.id,
+ ss.name,
+ ss.model,
+ ss.factory_num,
+ ss.quantity,
+ ssr.borrow_user,
+ ssr.borrow_date,
+ ssr.return_date,
+ ssr.integrity,
+ ssr.return_integrity,
+ ssr.returned_person,
+ ss.remark
+ FROM cnas_fe_standard_substance_record ssr
+ LEFT JOIN cnas_fe_standard_substance ss on ss.id = ssr.substance_id
+ <where>
+ <if test="ew.name != null and ew.name != ''">
+ ss.name like CONCAT('%', #{ew.name}, '%')
+ </if>
+ <if test="ew.model != null and ew.model != ''">
+ and ss.model like CONCAT('%', #{ew.model}, '%')
+ </if>
+ <if test="ew.factoryNum != null and ew.factoryNum != ''">
+ and ss.factory_num like CONCAT('%', #{ew.factoryNum}, '%')
+ </if>
+ </where>
+ </select>
+
+</mapper>
--
Gitblit v1.9.3