From fed01a2550b0d62855ec6f76dad32bc15a57da94 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 08 四月 2025 14:20:30 +0800
Subject: [PATCH] 标准库添加委托要求功能
---
basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 3 ++-
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java | 11 +++++++++++
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
index 1f2e03a..d7b1df1 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
@@ -90,6 +90,15 @@
if(StandardProductListChcekTypeEnums.CHECK_ING.getCode().equals(list.getCheckStatus())){
throw new RuntimeException("瀹℃牳涓笉鏀寔淇敼");
}
+ // 鍒ゆ柇妫�楠岄」鏄惁涓烘槸鍚﹀鎵樿姹� 鏄殑璇濅笉闇�瑕佸仛澶囦唤鍜岀姸鎬佷慨鏀圭洿鎺ユ洿鏂�
+ StructureItemParameter structureItemParameter = structureItemParameterMapper.selectById(standardProductList.getStructureItemParameterId());
+ if(!ObjectUtils.isEmpty(structureItemParameter) && "1".equals(structureItemParameter.getDelegateRequestFlag())){
+ return standardProductListMapper.updateById(list);
+ }
+ // 鍒ゆ柇鏄惁涓虹敓鏁堢殑淇敼濡傛灉鏄笉鍋氬浠�
+ if(null != list.getState()){
+ return standardProductListMapper.updateById(list);
+ }
// 鏌ヨ鏈�鏂扮殑涓�娆″叧鑱斿浠� 濡傛灉瀛樺湪璇存槑鏈鏍稿畬缁х画淇敼浜嗐�備笉鍋氭暟鎹鐞嗐��
StandardProductListBackupRel standardProductListBackupRel = standardProductListBackupRelMapper.selectById(list.getId());
if(ObjectUtils.isEmpty(standardProductListBackupRel)){
@@ -394,6 +403,8 @@
StructureItemParameterDto structureItemParameterDto = new StructureItemParameterDto();
if(standardMethod.getName().equals("濮旀墭瑕佹眰")){
structureItemParameterDto.setDelegateRequestFlag("1");
+ }else {
+ structureItemParameterDto.setDelegateRequestFlag("0");
}
structureItemParameterDto.setTree(checkItemQueryTree.toString());
diff --git a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index fda176d..9b3ec8a 100644
--- a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -209,9 +209,10 @@
or sample = '[]'
OR sample LIKE CONCAT('%', #{structureItemParameterDto.tree}, '%')
)
- <if test="structureItemParameterDto.delegateRequestFlag != null and structureItemParameterDto.delegateRequestFlag !='' and structureItemParameterDto.delegateRequestFlag == '1' ">
+ <if test="structureItemParameterDto.delegateRequestFlag != null and structureItemParameterDto.delegateRequestFlag !='' ">
AND delegate_request_flag = #{structureItemParameterDto.delegateRequestFlag}
</if>
+
order by id asc
</select>
--
Gitblit v1.9.3