From df3f154f020076d8b0075b92626f22e970f63702 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 25 二月 2025 16:14:51 +0800
Subject: [PATCH] 设施和环境条件代码迁移
---
cnas-require/src/main/resources/mapper/ForeignRegisterMapper.xml | 39 +++++++++++++++++++
cnas-require/src/main/resources/static/internal-wastes.docx | 0
cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java | 15 +++----
cnas-require/src/main/java/com/ruoyi/require/controller/SupplierManagementController.java | 2
cnas-require/src/main/java/com/ruoyi/require/pojo/ForeignRegister.java | 2 +
cnas-require/src/main/java/com/ruoyi/require/service/impl/InternalWastesServiceImpl.java | 2 -
cnas-require/src/main/resources/static/foreign-register.docx | 0
cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java | 11 ++---
cnas-require/src/main/resources/mapper/InternalWastesMapper.xml | 20 ++++++++++
9 files changed, 74 insertions(+), 17 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java
index 244e9fd..5c48d2f 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java
@@ -33,14 +33,13 @@
/**
* 澶栨潵浜哄憳鐧昏鍒嗛〉鏌ヨ
- * @param data
+ * @param page
+ * @param foreignRegister
* @return
*/
@ApiOperation(value = "澶栨潵浜哄憳鐧昏鍒嗛〉鏌ヨ")
- @PostMapping("/pageForeignRegister")
- public Result<IPage<ForeignRegisterDto>> pageForeignRegister(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ForeignRegisterDto foreignRegister = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ForeignRegisterDto.class);
+ @GetMapping("/pageForeignRegister")
+ public Result<IPage<ForeignRegisterDto>> pageForeignRegister(Page page,ForeignRegisterDto foreignRegister) throws Exception {
return Result.success(foreignRegisterService.pageForeignRegister(page, foreignRegister));
}
@@ -69,7 +68,7 @@
* @return
*/
@ApiOperation(value = "澶栨潵浜哄憳鐧昏鍒犻櫎")
- @GetMapping("/delForeignRegister")
+ @DeleteMapping("/delForeignRegister")
public Result delForeignRegister(Integer registerId){
return Result.success(foreignRegisterService.removeById(registerId));
}
@@ -89,8 +88,8 @@
* @return
*/
@ApiOperation(value = "瀵煎嚭澶栨潵浜哄憳鐧昏")
- @PostMapping("/exportForeignRegister")
- public void exportForeignRegister(@RequestBody ForeignRegisterDto foreignRegister, HttpServletResponse response){
+ @GetMapping("/exportForeignRegister")
+ public void exportForeignRegister(ForeignRegisterDto foreignRegister, HttpServletResponse response){
foreignRegisterService.exportForeignRegister(foreignRegister, response);
}
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java
index e507069..2103526 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/InternalWastesController.java
@@ -33,14 +33,13 @@
/**
* 瀹夊叏鍐呭姟涓夊簾澶勭悊鍒嗛〉鏌ヨ
- * @param data
+ * @param page
+ * @param internalWastes
* @return
*/
@ApiOperation(value = "瀹夊叏鍐呭姟涓夊簾澶勭悊鍒嗛〉鏌ヨ")
- @PostMapping("/pageInternalWastes")
- public Result<IPage<InternalWastesDto>> pageInternalWastes(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- InternalWastes internalWastes = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InternalWastes.class);
+ @GetMapping("/pageInternalWastes")
+ public Result<IPage<InternalWastesDto>> pageInternalWastes(Page page,InternalWastes internalWastes) throws Exception {
return Result.success(internalWastesService.pageInternalWastes(page, internalWastes));
}
@@ -69,7 +68,7 @@
* @return
*/
@ApiOperation(value = "瀹夊叏鍐呭姟涓夊簾澶勭悊鍒犻櫎")
- @GetMapping("/delInternalWastes")
+ @DeleteMapping("/delInternalWastes")
public Result delInternalWastes(Integer wastesId){
return Result.success(internalWastesService.delInternalWastes(wastesId));
}
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/SupplierManagementController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/SupplierManagementController.java
index 495dfbb..faeaab7 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/SupplierManagementController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/SupplierManagementController.java
@@ -71,7 +71,7 @@
}
@ApiOperation("鍒犻櫎渚涘簲鍟�")
- @PostMapping("/delSupplierManagement")
+ @DeleteMapping("/delSupplierManagement")
public Result delSupplierManagement(Integer supplierManagementId) {
return Result.success(supplierManagementService.removeById(supplierManagementId));
}
diff --git a/cnas-require/src/main/java/com/ruoyi/require/pojo/ForeignRegister.java b/cnas-require/src/main/java/com/ruoyi/require/pojo/ForeignRegister.java
index ba7eaf4..b655e0b 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/pojo/ForeignRegister.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/pojo/ForeignRegister.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -25,6 +26,7 @@
private Integer registerId;
@ApiModelProperty("鐧昏濡傛湡")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate registerDate;
@ApiModelProperty("杩涘叆鍖哄煙")
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/InternalWastesServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/InternalWastesServiceImpl.java
index 9d58f8b..a7debfb 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/InternalWastesServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/InternalWastesServiceImpl.java
@@ -138,8 +138,6 @@
detail.setIndex(index);
index++;
}
-
-
// 鑾峰彇璺緞
InputStream inputStream = this.getClass().getResourceAsStream("/static/internal-wastes.docx");
Configure configure = Configure.builder()
diff --git a/cnas-require/src/main/resources/mapper/ForeignRegisterMapper.xml b/cnas-require/src/main/resources/mapper/ForeignRegisterMapper.xml
new file mode 100644
index 0000000..a619f2f
--- /dev/null
+++ b/cnas-require/src/main/resources/mapper/ForeignRegisterMapper.xml
@@ -0,0 +1,39 @@
+<?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.ForeignRegisterMapper">
+
+ <!-- 澶栨潵浜哄憳鐧昏鍒嗛〉鏌ヨ -->
+ <select id="pageForeignRegister" resultType="com.ruoyi.require.dto.ForeignRegisterDto">
+ select *
+ from (select *
+ from cnas_foreign_register
+ <where>
+ <if test="beginDate != null and beginDate != '' and endDate != null and endDate != ''">
+ register_date between #{beginDate} and #{endDate}
+ </if>
+ </where>
+ order by create_time desc) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+ <select id="getForeignRegisterList" resultType="com.ruoyi.require.dto.ForeignRegisterDto">
+ select *
+ from (select cfr.*,
+ u1.signature_url accompanyingUrl,
+ u2.signature_url approveUrl
+ from cnas_foreign_register cfr
+ left join user u1 on u1.id = cfr.accompanying_id
+ left join user u2 on u2.id = cfr.approve_id
+ <where>
+ <if test="beginDate != null and beginDate != '' and endDate != null and endDate != ''">
+ cfr.register_date between #{beginDate} and #{endDate}
+ </if>
+ </where>
+ order by cfr.create_time desc) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+
+</mapper>
diff --git a/cnas-require/src/main/resources/mapper/InternalWastesMapper.xml b/cnas-require/src/main/resources/mapper/InternalWastesMapper.xml
new file mode 100644
index 0000000..1ee1a73
--- /dev/null
+++ b/cnas-require/src/main/resources/mapper/InternalWastesMapper.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.ruoyi.require.mapper.InternalWastesMapper">
+
+ <!-- 瀹夊叏鍐呭姟涓夊簾鐧昏鍒楄〃 -->
+ <select id="pageInternalWastes" resultType="com.ruoyi.require.dto.InternalWastesDto">
+ select *
+ from (select ciw.*,
+ u1.name create_user_name,
+ u2.name update_user_name
+ from cnas_internal_wastes ciw
+ left join user u1 on u1.id = ciw.create_user
+ left join user u2 on u2.id = ciw.update_user
+ order by ciw.create_time desc) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+
+</mapper>
diff --git a/cnas-require/src/main/resources/static/foreign-register.docx b/cnas-require/src/main/resources/static/foreign-register.docx
new file mode 100644
index 0000000..ca6eed5
--- /dev/null
+++ b/cnas-require/src/main/resources/static/foreign-register.docx
Binary files differ
diff --git a/cnas-require/src/main/resources/static/internal-wastes.docx b/cnas-require/src/main/resources/static/internal-wastes.docx
new file mode 100644
index 0000000..7f03f75
--- /dev/null
+++ b/cnas-require/src/main/resources/static/internal-wastes.docx
Binary files differ
--
Gitblit v1.9.3