From d9ff3817f056ad245a16bd394133a407d6c6b9cf Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 13 一月 2026 16:14:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java | 12 ++
src/main/java/com/ruoyi/basic/controller/ProductController.java | 23 +++
src/main/java/com/ruoyi/collaborativeApproval/service/RulesRegulationsManagementFileService.java | 19 +++
src/main/java/com/ruoyi/CodeGenerator.java | 2
src/main/java/com/ruoyi/collaborativeApproval/mapper/RulesRegulationsManagementFileMapper.java | 22 +++
src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml | 9 +
src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java | 7 +
src/main/java/com/ruoyi/collaborativeApproval/service/impl/RulesRegulationsManagementFileServiceImpl.java | 33 +++++
src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java | 3
src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java | 66 +++++++++++
src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagementFile.java | 65 ++++++++++
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 12 ++
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 11 +
src/main/resources/collaborativeApproval/mapper/RulesRegulationsManagementFileMapper.xml | 24 ++++
src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java | 3
15 files changed, 300 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/CodeGenerator.java b/src/main/java/com/ruoyi/CodeGenerator.java
index ccd51ca..08bc186 100644
--- a/src/main/java/com/ruoyi/CodeGenerator.java
+++ b/src/main/java/com/ruoyi/CodeGenerator.java
@@ -89,6 +89,8 @@
.mapperBuilder()
.enableFileOverride() // 瑕嗙洊宸茬敓鎴怣apper鏂囦欢
.enableBaseResultMap() // 鑷姩鐢熸垚resultMap
+ .mapperAnnotation(org.apache.ibatis.annotations.Mapper.class)
+
// Service 绛栫暐閰嶇疆
.serviceBuilder()
.formatServiceFileName("%sService") //鏍煎紡鍖� service 鎺ュ彛鏂囦欢鍚嶇О锛�%s杩涜鍖归厤琛ㄥ悕锛屽 UserService
diff --git a/src/main/java/com/ruoyi/basic/controller/ProductController.java b/src/main/java/com/ruoyi/basic/controller/ProductController.java
index 2e39db8..a97bd7b 100644
--- a/src/main/java/com/ruoyi/basic/controller/ProductController.java
+++ b/src/main/java/com/ruoyi/basic/controller/ProductController.java
@@ -1,5 +1,6 @@
package com.ruoyi.basic.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.ProductDto;
@@ -12,9 +13,13 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.sales.service.ISalesLedgerProductService;
+import com.ruoyi.sales.service.ISalesLedgerService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -28,8 +33,8 @@
private IProductService productService;
private IProductModelService productModelService;
-
-
+ @Autowired
+ private ISalesLedgerProductService salesLedgerProductService;
/**
* 鏌ヨ浜у搧
*/
@@ -73,6 +78,13 @@
if (ids == null || ids.length == 0) {
return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
+ // 妫�鏌ユ槸鍚︽湁閿�鍞晢鍝佽褰曞叧鑱旇浜у搧
+ LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.in(SalesLedgerProduct::getProductId, ids);
+ List<SalesLedgerProduct> salesLedgerProductList = salesLedgerProductService.list(queryWrapper);
+ if (salesLedgerProductList.size() > 0) {
+ return AjaxResult.error("璇ヤ骇鍝佸瓨鍦ㄩ攢鍞�/閲囪喘璁板綍锛屼笉鑳藉垹闄�");
+ }
return toAjax(productService.delProductByIds(ids));
}
@@ -85,6 +97,13 @@
if (ids == null || ids.length == 0) {
return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
+ // 妫�鏌ユ槸鍚︽湁閿�鍞晢鍝佽褰曞叧鑱旇浜у搧瑙勬牸鍨嬪彿
+ LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.in(SalesLedgerProduct::getProductModelId, ids);
+ List<SalesLedgerProduct> salesLedgerProductList = salesLedgerProductService.list(queryWrapper);
+ if (salesLedgerProductList.size() > 0) {
+ return AjaxResult.error("璇ヤ骇鍝佽鏍煎瀷鍙峰瓨鍦ㄩ攢鍞�/閲囪喘璁板綍锛屼笉鑳藉垹闄�");
+ }
return toAjax(productModelService.delProductModel(ids));
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
index acfe676..cf4c2fe 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
@@ -38,7 +38,8 @@
@PostMapping("/add")
@ApiOperation("鏂板")
public AjaxResult add(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
- return AjaxResult.success(rulesRegulationsManagementService.save(rulesRegulationsManagement));
+ rulesRegulationsManagementService.save(rulesRegulationsManagement);
+ return AjaxResult.success(rulesRegulationsManagement.getId());
}
@PostMapping("/update")
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java
new file mode 100644
index 0000000..8f9ced9
--- /dev/null
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java
@@ -0,0 +1,66 @@
+package com.ruoyi.collaborativeApproval.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagementFile;
+import com.ruoyi.collaborativeApproval.service.RulesRegulationsManagementFileService;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.quality.pojo.QualityInspectFile;
+import com.ruoyi.quality.service.IQualityInspectFileService;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ * 瑙勭珷鍒跺害绠＄悊--闄勪欢 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-13 01:06:41
+ */
+@RestController
+@RequestMapping("/rulesRegulationsManagementFile")
+public class RulesRegulationsManagementFileController {
+
+ @Resource
+ private RulesRegulationsManagementFileService rulesRegulationsManagementFileService;
+
+
+ /**
+ * 鏂板
+ * @param rulesRegulationsManagementFile
+ * @return
+ */
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody RulesRegulationsManagementFile rulesRegulationsManagementFile) {
+ return AjaxResult.success(rulesRegulationsManagementFileService.save(rulesRegulationsManagementFile));
+ }
+
+ /**
+ * 鍒犻櫎
+ * @param ids
+ * @return
+ */
+ @DeleteMapping("/del")
+ public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
+ if(CollectionUtils.isEmpty(ids)){
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ //鍒犻櫎妫�楠岄檮浠�
+ return AjaxResult.success(rulesRegulationsManagementFileService.removeBatchByIds(ids));
+ }
+
+ /**
+ *鍒嗛〉鏌ヨ
+ * @param page
+ * @param rulesRegulationsManagementFile
+ * @return
+ */
+ @GetMapping("/listPage")
+ public AjaxResult listPage(Page page, RulesRegulationsManagementFile rulesRegulationsManagementFile) {
+ return AjaxResult.success(rulesRegulationsManagementFileService.listPage(page, rulesRegulationsManagementFile));
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
index 242072e..66a2d83 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
@@ -7,6 +7,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.service.ISysNoticeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -15,6 +16,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
import java.util.List;
@AllArgsConstructor
@@ -25,6 +27,9 @@
@Autowired
private SealApplicationManagementService sealApplicationManagementService;
+ @Autowired
+ private ISysNoticeService sysNoticeService;
+
@GetMapping("/getList")
@ApiOperation("鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, SealApplicationManagement sealApplicationManagement){
@@ -34,6 +39,13 @@
@PostMapping("/add")
@ApiOperation("鏂板")
public AjaxResult add(@RequestBody SealApplicationManagement sealApplicationManagement){
+ //娑堟伅閫氱煡
+ sysNoticeService.simpleNoticeByUser("鐢ㄥ嵃瀹℃壒",
+ "鐢宠缂栧彿锛�"+sealApplicationManagement.getApplicationNum()+"\n"
+ +"鐢宠鏍囬锛�"+sealApplicationManagement.getTitle(),
+ Arrays.asList(sealApplicationManagement.getApproveUserId()),
+ sealApplicationManagement.getTenantId(),
+ "/collaborativeApproval/sealManagement?applicationNum="+sealApplicationManagement.getApplicationNum());
return AjaxResult.success(sealApplicationManagementService.save(sealApplicationManagement));
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java b/src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java
index 0dc75a6..8dc8454 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java
@@ -8,4 +8,7 @@
private String createUserName;
//鎵�灞為儴闂�
private String department;
+
+ //瀹℃壒浜�
+ private String approveUserName;
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/mapper/RulesRegulationsManagementFileMapper.java b/src/main/java/com/ruoyi/collaborativeApproval/mapper/RulesRegulationsManagementFileMapper.java
new file mode 100644
index 0000000..0744cd9
--- /dev/null
+++ b/src/main/java/com/ruoyi/collaborativeApproval/mapper/RulesRegulationsManagementFileMapper.java
@@ -0,0 +1,22 @@
+package com.ruoyi.collaborativeApproval.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagementFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 瑙勭珷鍒跺害绠＄悊--闄勪欢 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-13 01:06:41
+ */
+@Mapper
+public interface RulesRegulationsManagementFileMapper extends BaseMapper<RulesRegulationsManagementFile> {
+
+ IPage<RulesRegulationsManagementFile> listPage(Page page, @Param("c") RulesRegulationsManagementFile rulesRegulationsManagementFile);
+}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagementFile.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagementFile.java
new file mode 100644
index 0000000..fa43d0e
--- /dev/null
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagementFile.java
@@ -0,0 +1,65 @@
+package com.ruoyi.collaborativeApproval.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 瑙勭珷鍒跺害绠＄悊--闄勪欢
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-13 01:06:41
+ */
+@Getter
+@Setter
+@TableName("rules_regulations_management_file")
+@ApiModel(value = "RulesRegulationsManagementFile瀵硅薄", description = "瑙勭珷鍒跺害绠＄悊--闄勪欢")
+public class RulesRegulationsManagementFile implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("鏂囦欢鍚嶇О")
+ private String name;
+
+ @ApiModelProperty("鏂囦欢璺緞")
+ private String url;
+
+ @ApiModelProperty("鏂囦欢澶у皬")
+ private Integer fileSize;
+
+ @ApiModelProperty("瑙勭珷鍒跺害ID")
+ private Integer rulesRegulationsManagementId;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Long createUser;
+
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("淇敼鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Long updateUser;
+
+ @ApiModelProperty("绉熸埛ID")
+ @TableField(fill = FieldFill.INSERT)
+ private Long tenantId;
+}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
index d6d1d81..4055f21 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
@@ -32,7 +32,7 @@
* 鐢ㄥ嵃绫诲瀷
*/
@ApiModelProperty("鐢ㄥ嵃绫诲瀷")
- @Excel(name = "鐢ㄥ嵃绫诲瀷", readConverterExp = "official=鍏珷,contract=鍚堝悓涓撶敤绔�,finance=璐㈠姟涓撶敤绔�,legal=鏈煡")
+ @Excel(name = "鐢ㄥ嵃绫诲瀷", readConverterExp = "official=鍏珷,contract=鍚堝悓涓撶敤绔�,finance=璐㈠姟涓撶敤绔�,legal=娉曚汉绔�")
private String sealType;
/**
* 鐢宠鐢ㄥ嵃鍘熷洜
@@ -51,6 +51,11 @@
@ApiModelProperty("鐘舵��")
@Excel(name = "鐘舵��", readConverterExp = "pending=寰呭鎵�,approved=宸查�氳繃,rejected=宸叉嫆缁�")
private String status;
+
+ /**
+ * 瀹℃壒浜�
+ */
+ private Long approveUserId;
/**
* 鍒涘缓鑰�
*/
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/RulesRegulationsManagementFileService.java b/src/main/java/com/ruoyi/collaborativeApproval/service/RulesRegulationsManagementFileService.java
new file mode 100644
index 0000000..5f22478
--- /dev/null
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/RulesRegulationsManagementFileService.java
@@ -0,0 +1,19 @@
+package com.ruoyi.collaborativeApproval.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagementFile;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 瑙勭珷鍒跺害绠＄悊--闄勪欢 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-13 01:06:41
+ */
+public interface RulesRegulationsManagementFileService extends IService<RulesRegulationsManagementFile> {
+
+ IPage<RulesRegulationsManagementFile> listPage(Page page, RulesRegulationsManagementFile rulesRegulationsManagementFile);
+}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/RulesRegulationsManagementFileServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/RulesRegulationsManagementFileServiceImpl.java
new file mode 100644
index 0000000..ff59f8c
--- /dev/null
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/RulesRegulationsManagementFileServiceImpl.java
@@ -0,0 +1,33 @@
+package com.ruoyi.collaborativeApproval.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagementFile;
+import com.ruoyi.collaborativeApproval.mapper.RulesRegulationsManagementFileMapper;
+import com.ruoyi.collaborativeApproval.service.RulesRegulationsManagementFileService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.management.Query;
+
+/**
+ * <p>
+ * 瑙勭珷鍒跺害绠＄悊--闄勪欢 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-13 01:06:41
+ */
+@Service
+public class RulesRegulationsManagementFileServiceImpl extends ServiceImpl<RulesRegulationsManagementFileMapper, RulesRegulationsManagementFile> implements RulesRegulationsManagementFileService {
+
+ @Autowired
+ private RulesRegulationsManagementFileMapper rulesRegulationsManagementFileMapper;
+
+ @Override
+ public IPage<RulesRegulationsManagementFile> listPage(Page page, RulesRegulationsManagementFile rulesRegulationsManagementFile) {
+ return rulesRegulationsManagementFileMapper.listPage(page, rulesRegulationsManagementFile);
+ }
+}
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index b964e4c..2848d5c 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -75,11 +75,12 @@
procurementDto.setSalesLedgerProductId(item.getId());
procurementDto.setProductCategory(item.getProductCategory());
IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopyByProduction(new Page<>(1,-1), procurementDto);
- if(result.getTotal()==0) return;
- ProcurementPageDtoCopy procurementDtoCopy = result.getRecords().get(0);
- if(item.getQuantity().compareTo(procurementDtoCopy.getInboundNum0())>=0){
- item.setApproveStatus(1);
- salesLedgerProductService.addOrUpdateSalesLedgerProduct(item);
+ if(result.getRecords().size()>0) {
+ ProcurementPageDtoCopy procurementDtoCopy = result.getRecords().get(0);
+ if (item.getQuantity().compareTo(procurementDtoCopy.getInboundNum0()) >= 0) {
+ item.setApproveStatus(1);
+ salesLedgerProductService.addOrUpdateSalesLedgerProduct(item);
+ }
}
});
return AjaxResult.success(list);
diff --git a/src/main/resources/collaborativeApproval/mapper/RulesRegulationsManagementFileMapper.xml b/src/main/resources/collaborativeApproval/mapper/RulesRegulationsManagementFileMapper.xml
new file mode 100644
index 0000000..f93a112
--- /dev/null
+++ b/src/main/resources/collaborativeApproval/mapper/RulesRegulationsManagementFileMapper.xml
@@ -0,0 +1,24 @@
+<?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.collaborativeApproval.mapper.RulesRegulationsManagementFileMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagementFile">
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="url" property="url" />
+ <result column="file_size" property="fileSize" />
+ <result column="rules_regulations_management_id" property="rulesRegulationsManagementId" />
+ <result column="create_time" property="createTime" />
+ <result column="create_user" property="createUser" />
+ <result column="update_time" property="updateTime" />
+ <result column="update_user" property="updateUser" />
+ <result column="tenant_id" property="tenantId" />
+ </resultMap>
+ <select id="listPage" resultType="com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagementFile">
+ select *
+ from rules_regulations_management_file
+ where rules_regulations_management_id = #{c.rulesRegulationsManagementId}
+ </select>
+
+</mapper>
diff --git a/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml b/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml
index b8ad6a7..5da6dff 100644
--- a/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml
+++ b/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml
@@ -4,12 +4,17 @@
<select id="listPage" resultType="com.ruoyi.collaborativeApproval.dto.SealApplicationManagementDTO">
- select sam.*, su.user_name as create_user_name, d.dept_name as department
+ select sam.*, su.user_name as create_user_name, d.dept_name as department,
+ su1.nick_name as approveUserName
from seal_application_management sam
left join sys_user su on sam.create_user = su.user_id
+ left join sys_user su1 on sam.approve_user_id = su1.user_id
left join sys_user_dept sud on su.user_id = sud.user_id
left join sys_dept d on sud.dept_id = d.dept_id
<where>
+ <if test="ew.applicationNum != null and ew.applicationNum != ''">
+ and sam.application_num like concat('%',#{ew.applicationNum},'%')
+ </if>
<if test="ew.title != null and ew.title != ''">
and sam.title like concat('%',#{ew.title},'%')
</if>
@@ -18,4 +23,4 @@
</if>
</where>
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index f739bec..3642db2 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -340,5 +340,17 @@
select *
from procurement_record_storage t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
+ <where>
+ 1=1
+ <if test="req.productCategory != null and req.productCategory != ''">
+ and t2.product_category like concat('%',#{req.productCategory},'%')
+ </if>
+ <if test="req.timeStr != null and req.timeStr != ''">
+ and t1.create_time like concat('%',#{req.timeStr},'%')
+ </if>
+ <if test="req.salesLedgerProductId != null and req.salesLedgerProductId != ''">
+ and t1.sales_ledger_product_id = #{req.salesLedgerProductId}
+ </if>
+ </where>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3