From e17db1a57b9788ab16c805e44b54a0324fea7da0 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 21 六月 2023 17:54:20 +0800
Subject: [PATCH] 倒仓和粮食性质变更
---
igds-core/src/main/resources/mapper/CheckStandardMapper.xml | 56 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/igds-core/src/main/resources/mapper/CheckStandardMapper.xml b/igds-core/src/main/resources/mapper/CheckStandardMapper.xml
index 56676d5..e061d49 100644
--- a/igds-core/src/main/resources/mapper/CheckStandardMapper.xml
+++ b/igds-core/src/main/resources/mapper/CheckStandardMapper.xml
@@ -15,17 +15,20 @@
STANDARD_NAME_,
UNIT_,
UPPER_LIMIT_,
+ OPERA_SYMBOL_,
RULE_NUM_,
RULE_ADD_,
RULE_ADD_END_,
RULE_REDUCE_,
- STANDARD_VALUE_,
VALUE_,
- STANDARD_PRICE_,
RULE_PRICE_,
RULE_REDUCE_PRICE_,
- REMARKS_,
- OPERA_SYMBOL_
+ ADD_NUM_,
+ DE_NUM_,
+ ADD_PRICE_,
+ DE_PRICE_,
+ RESULT_,
+ REMARKS_
)values (
#{data.companyId},
#{data.checkId},
@@ -33,17 +36,20 @@
#{data.standardName},
#{data.unit},
#{data.upperLimit},
+ #{data.operaSymbol},
#{data.ruleNum},
#{data.ruleAdd},
#{data.ruleAddEnd},
#{data.ruleReduce},
- #{data.standardValue},
#{data.value},
- #{data.standardPrice},
#{data.rulePrice},
#{data.ruleReducePrice},
- #{data.remarks},
- #{data.operaSymbol}
+ #{data.addNum},
+ #{data.deNum},
+ #{data.addPrice},
+ #{data.dePrice},
+ #{data.result},
+ #{data.remarks}
)
</insert>
@@ -53,9 +59,13 @@
<set>
<if test="data.standardName != null and data.standardName != '' ">STANDARD_NAME_ = #{data.standardName},</if>
<if test="data.upperLimit != null and data.upperLimit != '' ">UPPER_LIMIT_ = #{data.upperLimit},</if>
-<!-- <if test="data.lowerLimit != null and data.lowerLimit != '' ">LOWER_LIMIT_ = #{data.lowerLimit},</if>-->
<if test="data.unit != null and data.unit != '' ">UNIT_ = #{data.unit},</if>
<if test="data.value != null and data.value != '' ">VALUE_ = #{data.value},</if>
+ <if test="data.addNum != null">ADD_NUM_ = #{data.addNum},</if>
+ <if test="data.deNum != null">DE_NUM_ = #{data.deNum},</if>
+ <if test="data.addPrice != null">ADD_PRICE_ = #{data.addPrice},</if>
+ <if test="data.dePrice != null">DE_PRICE_ = #{data.dePrice},</if>
+ <if test="data.result != null and data.result != '' ">RESULT_ = #{data.result},</if>
<if test="data.remarks != null and data.remarks != '' ">REMARKS_ = #{data.remarks},</if>
<if test="data.operaSymbol != null and data.operaSymbol != '' ">OPERA_SYMBOL_ = #{data.operaSymbol}</if>
</set>
@@ -93,18 +103,20 @@
STANDARD_NAME_ as standardName,
UNIT_ as unit,
UPPER_LIMIT_ as upperLimit,
--- LOWER_LIMIT_ as lowerLimit,
+ OPERA_SYMBOL_ as operaSymbol,
RULE_NUM_ as ruleNum,
RULE_ADD_ as ruleAdd,
RULE_ADD_END_ as ruleAddEnd,
RULE_REDUCE_ as ruleReduce,
- STANDARD_VALUE_ as standardValue,
VALUE_ as value,
- STANDARD_PRICE_ as standardPrice,
RULE_PRICE_ as rulePrice,
RULE_REDUCE_PRICE_ as ruleReducePrice,
- REMARKS_ as remarks,
- OPERA_SYMBOL_ as operaSymbol
+ ADD_NUM_ as addNum,
+ DE_NUM_ as deNum,
+ ADD_PRICE_ as addPrice,
+ DE_PRICE_ as dePrice,
+ RESULT_ as result,
+ REMARKS_ as remarks
from
D_CHECK_ITEM
where COMPANY_ID_ = #{companyId}
@@ -118,28 +130,24 @@
select
ID_ as id,
COMPANY_ID_ as companyId,
- DEPT_ID_ as deptId,
FOOD_VARIETY_ as foodVariety,
STANDARD_ID_ as standardId,
STANDARD_NAME_ as standardName,
UNIT_ as unit,
+ OPERA_SYMBOL_ as operaSymbol,
UPPER_LIMIT_ as upperLimit,
--- LOWER_LIMIT_ as lowerLimit,
RULE_NUM_ as ruleNum,
+ RULE_REDUCE_ as ruleReduce,
RULE_ADD_ as ruleAdd,
RULE_ADD_END_ as ruleAddEnd,
- RULE_REDUCE_ as ruleReduce,
- STANDARD_PRICE_ as standardPrice,
RULE_PRICE_ as rulePrice,
RULE_REDUCE_PRICE_ as ruleReducePrice,
UPDATE_TIME_ as updateTime,
- REMARKS_ as remarks,
- OPERA_SYMBOL_ as operaSymbol
- from D_CHECK_STANDARD
- where
+ REMARKS_ as remarks
+ FROM D_CHECK_STANDARD
+ WHERE
COMPANY_ID_ = #{companyId}
- and DEPT_ID_ = #{deptId}
- and FOOD_VARIETY_ = #{foodVariety}
+ AND FOOD_VARIETY_ = #{foodVariety}
ORDER by STANDARD_ID_ + 0
</select>
--
Gitblit v1.9.3