From b33ec77c0da920c50c1d3e34d2a370f5a6fffbed Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 24 七月 2023 16:58:08 +0800
Subject: [PATCH] 质量巡检添加页面优化
---
igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml | 128 ++++++++++++-
igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java | 57 ++++-
igds-core/src/main/java/com/ld/igds/check/mapper/CheckStandardMapper.java | 11 +
igds-core/src/main/java/com/ld/igds/m/service/HQualityManageService.java | 23 ++
igds-core/src/main/resources/mapper/CheckStandardMapper.xml | 273 +++++++++++++++---------------
5 files changed, 324 insertions(+), 168 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/check/mapper/CheckStandardMapper.java b/igds-core/src/main/java/com/ld/igds/check/mapper/CheckStandardMapper.java
index 8d4e4f2..153cc2e 100644
--- a/igds-core/src/main/java/com/ld/igds/check/mapper/CheckStandardMapper.java
+++ b/igds-core/src/main/java/com/ld/igds/check/mapper/CheckStandardMapper.java
@@ -3,6 +3,7 @@
import com.ld.igds.check.dto.CheckItemData;
import com.ld.igds.check.dto.CheckStandardData;
import org.apache.ibatis.annotations.Param;
+
import java.util.List;
/**
@@ -27,6 +28,7 @@
/**
* 鏍规嵁鍖栭獙缁撴灉鏇存柊鍊硷紝濡傛灉宸茬粡鏈夊�煎垯涓嶆洿鏂帮紝閬垮厤瑕嗙洊浜哄伐褰曞叆淇℃伅
+ *
* @param item
* @return
*/
@@ -41,6 +43,7 @@
*/
List<CheckItemData> getCheckItemById(@Param("checkId") String checkId,
@Param("companyId") String companyId);
+
/**
* 鑾峰彇閰嶇疆鐨勫寲楠岄」淇℃伅
*
@@ -51,4 +54,12 @@
List<CheckStandardData> getCheckStandard(@Param("companyId") String companyId,
@Param("foodVariety") String foodVariety);
+ /**
+ * 鏍规嵁鏉′欢鍒犻櫎鍖栭獙椤�
+ *
+ * @param item
+ * @return
+ */
+ int delCheckItemByParam(@Param("data") CheckItemData item);
+
}
diff --git a/igds-core/src/main/java/com/ld/igds/m/service/HQualityManageService.java b/igds-core/src/main/java/com/ld/igds/m/service/HQualityManageService.java
index 3349e2c..b54172e 100644
--- a/igds-core/src/main/java/com/ld/igds/m/service/HQualityManageService.java
+++ b/igds-core/src/main/java/com/ld/igds/m/service/HQualityManageService.java
@@ -3,6 +3,7 @@
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.bstek.dorado.data.entity.EntityUtils;
import com.bstek.dorado.data.provider.Page;
+import com.ld.igds.check.dto.CheckItemData;
import com.ld.igds.check.mapper.CheckStandardMapper;
import com.ld.igds.constant.RedisConst;
import com.ld.igds.models.MQuality;
@@ -15,10 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* @author chen
@@ -128,6 +126,19 @@
if (null == data.getDeptId()) {
data.setDeptId(ContextUtil.subDeptId(null));
}
+ if (null != data.getZblb() || "" != data.getZblb()) {
+ String[] str = data.getZblb().split("#");
+ //闃叉鍦ㄦ洿鏂版搷浣滄椂鍐嶆瀛樺叆鐩稿悓鐨勬暟鎹�
+ Set<String> metrics = new HashSet<>();
+ for (int i = 0; i < str.length; i++) {
+ metrics.add(str[i].substring(0, 1));
+ }
+ String value = "";
+ for (String s : metrics) {
+ value = value + s + "#";
+ }
+ data.setZblb(value.substring(0, value.length() - 1));
+ }
Session session = this.getSessionFactory().openSession();
data.setUpdateTime(new Date());
try {
@@ -160,6 +171,10 @@
try {
if (null != data.getId()) {
session.delete(data);
+ CheckItemData checkItemData = new CheckItemData();
+ checkItemData.setCompanyId(ContextUtil.getCompanyId());
+ checkItemData.setCheckId(data.getId());
+ checkStandardMapper.delCheckItemByParam(checkItemData);
redisUtil.del(RedisConst.buildKey(ContextUtil.getCompanyId(), RedisConst.KEY_DEPOT_QUALITY, data.getDepotId()));
}
} catch (Exception e) {
diff --git a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
index 1da57df..1eca900 100644
--- a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
@@ -135,6 +135,46 @@
<PropertyDef name="remark">
<Property name="label">澶囨敞淇℃伅</Property>
</PropertyDef>
+ <PropertyDef name="storeDate">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鍏ュ簱鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="unit">
+ <Property/>
+ <Property name="label">妫�楠屽崟浣�</Property>
+ </PropertyDef>
+ <PropertyDef name="zblb">
+ <Property/>
+ <Property name="label">鎸囨爣绫诲埆</Property>
+ </PropertyDef>
+ <PropertyDef name="qfrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">绛惧彂鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="bgcjsj">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鎶ュ憡鍑哄叿鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="shrxm">
+ <Property/>
+ <Property name="label">瀹℃牳浜哄鍚�</Property>
+ </PropertyDef>
+ <PropertyDef name="qydbh">
+ <Property/>
+ <Property name="label">鎵︽牱鍗曠紪鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="jdrxm">
+ <Property/>
+ <Property name="label">鐩戠潱浜哄鍚�</Property>
+ </PropertyDef>
+ <PropertyDef name="ypbh">
+ <Property/>
+ <Property name="label">鏍峰搧缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏁版嵁鏇存柊鏃堕棿</Property>
+ </PropertyDef>
<Reference name="checkItems">
<Property name="dataProvider">checkStandardPR#listCheckItemsByParam</Property>
<Property name="dataType">[dtCheckItems]</Property>
@@ -211,10 +251,10 @@
<Property name="label">鍖栭獙缁撴灉</Property>
</PropertyDef>
<PropertyDef name="operaSymbolValue">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="operaSymbol">
- <Property/>
+ <Property></Property>
<Property name="label">杩愮畻绗﹀彿</Property>
</PropertyDef>
<PropertyDef name="ruleNum">
@@ -258,7 +298,7 @@
<Property name="label">鎵ｄ环</Property>
</PropertyDef>
<PropertyDef name="result">
- <Property/>
+ <Property></Property>
<Property name="label">妫�楠岀粨鏋�</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("inoutDataPR#triggerResult").getResult()}</Property>
@@ -396,6 +436,13 @@
<Property name="dataType">String</Property>
</PropertyDef>
</DataType>
+ <DataType name="dtMetrics">
+ <PropertyDef name="code"/>
+ <PropertyDef name="name"/>
+ </DataType>
+ <DataType name="dtResult">
+ <PropertyDef name="name"/>
+ </DataType>
</Model>
<View layout="padding:5;regionPadding:5">
<ClientEvent name="onReady">var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
@@ -436,6 +483,38 @@
<Property name="dataType">[dataTypeUser]</Property>
<Property name="pageSize">100</Property>
<Property name="dataProvider">bdf2.userMaintain#loadUsers</Property>
+ </DataSet>
+ <DataSet id="dsMetrics">
+ <ClientEvent name="onCreate">var data = [ {
+ name : "1:璐ㄩ噺鎸囨爣妫�楠�"
+}, {
+ name : "2:鍌ㄥ瓨鍝佽川妫�楠�"
+}, {
+ name : "3:椋熷搧瀹夊叏妫�楠�"
+}]
+self.setData(data);
+</ClientEvent>
+ <Property name="dataType">[dtMetrics]</Property>
+ </DataSet>
+ <DataSet id="dsResult">
+ <ClientEvent name="onCreate">var data = [ {
+ name : "杈炬爣"
+}, {
+ name : "涓嶈揪鏍�"
+}, {
+ name : "瀹滃瓨"
+},{
+ name : "杞诲害涓嶅疁瀛�"
+},{
+ name : "閲嶅害涓嶅疁瀛�"
+}, {
+ name : "鍚堟牸"
+}, {
+ name : "涓嶅悎鏍�"
+}]
+self.setData(data);
+</ClientEvent>
+ <Property name="dataType">[dtResult]</Property>
</DataSet>
<Container layout="regionPadding:10" layoutConstraint="top">
<Property name="exClassName">bg-color</Property>
@@ -556,11 +635,6 @@
<Property name="name">foodVariety</Property>
</DataColumn>
<DataColumn>
- <Property name="property">foodType</Property>
- <Property name="align">center</Property>
- <Property name="name">foodType</Property>
- </DataColumn>
- <DataColumn>
<Property name="property">foodLevel</Property>
<Property name="align">center</Property>
<Property name="name">foodLevel</Property>
@@ -673,8 +747,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">foodType</Property>
- <Property name="property">foodType</Property>
+ <Property name="name">foodLevel</Property>
+ <Property name="property">foodLevel</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -689,8 +763,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">foodLevel</Property>
- <Property name="property">foodLevel</Property>
+ <Property name="name">unit</Property>
+ <Property name="property">unit</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -704,9 +778,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">foodLocation</Property>
- <Property name="property">foodLocation</Property>
- <Property name="trigger">ddFoodOrigin</Property>
+ <Property name="name">shrxm</Property>
+ <Property name="property">shrxm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -736,10 +809,33 @@
</Editor>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">zblb</Property>
+ <Property name="property">zblb</Property>
+ <Editor>
+ <TagEditor>
+ <Property name="textSeperator">#</Property>
+ <Property name="availableTagsDataSet">dsMetrics</Property>
+ <Property name="availableTagsDataPath">.name</Property>
+ </TagEditor>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:1">
<Property name="name">result</Property>
<Property name="property">result</Property>
- <Editor/>
+ <Editor>
+ <TagEditor>
+ <Property name="availableTagsDataPath">.name</Property>
+ <Property name="availableTagsDataSet">dsResult</Property>
+ <Property name="textSeperator">#</Property>
+ </TagEditor>
+ </Editor>
</AutoFormElement>
+ <Label layoutConstraint="colSpan:2">
+ <Property name="text">璇存槑锛氬椤规寚鏍囨椂鎸夌収1:璐ㄩ噺鎸囨爣妫�楠�(杈炬爣,涓嶈揪鏍�)銆�2:鍌ㄥ瓨鍝佽川妫�楠�(瀹滃瓨,涓嶅疁瀛�)銆�3:椋熷搧瀹夊叏妫�楠�(鍚堟牸,涓嶅悎鏍�)杩欎釜椤哄簭濉啓妫�楠岀粨璁�</Property>
+ <Property name="style">
+ <Property name="color">blue</Property>
+ </Property>
+ </Label>
<AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
diff --git a/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java b/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java
index 4841801..9b7272b 100644
--- a/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java
+++ b/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java
@@ -12,15 +12,15 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* 璐ㄩ噺杩芥函绠＄悊
- *
- * @author: chen
*
+ * @author: chen
*/
@Component
public class QualityManagerPR {
@@ -32,23 +32,36 @@
/**
* 妫�楠岀被鍒�
- *
+ * <p>
* ${dorado.getDataProvider("qualityManagerPR#triggerType").getResult()}
*
* @return
*/
+// @DataProvider
+// public List<DicTrigger> triggerType() {
+// List<DicTrigger> list = new ArrayList<DicTrigger>();
+// list.add(new DicTrigger("01", "婊′粨鍒濇"));
+// list.add(new DicTrigger("02", "鍑轰粨妫�楠�"));
+// list.add(new DicTrigger("03", "鏈堝害鏅"));
+// return list;
+// }
@DataProvider
public List<DicTrigger> triggerType() {
List<DicTrigger> list = new ArrayList<DicTrigger>();
- list.add(new DicTrigger("01", "婊′粨鍒濇"));
+ list.add(new DicTrigger("01", "鍏ヤ粨楠屾敹"));
list.add(new DicTrigger("02", "鍑轰粨妫�楠�"));
- list.add(new DicTrigger("03", "鏈堝害鏅"));
+ list.add(new DicTrigger("03", "3鏈堟湯鏅"));
+ list.add(new DicTrigger("04", "9鏈堟湯鏅"));
+ list.add(new DicTrigger("05", "鍏ュ簱鍒濇"));
+ list.add(new DicTrigger("06", "鏈堝害妫�鏌�"));
+ list.add(new DicTrigger("07", "3鏈堟湯搴撳唴鏅煡"));
+ list.add(new DicTrigger("08", "9鏈堟湯搴撳唴鏅煡"));
return list;
}
/**
- * 妫�楠屼緷鎹�
- *
+ * 鎸囨爣绫诲埆
+ * <p>
* ${dorado.getDataProvider("qualityManagerPR#triggerStandard").getResult()}
*
* @return
@@ -64,8 +77,26 @@
}
/**
- * 鍒嗛〉鑾峰彇璐ㄩ噺宸℃璁板綍淇℃伅
+ * 妫�楠屼緷鎹�
+ * <p>
+ * ${dorado.getDataProvider("qualityManagerPR#triggerMetrics").getResult()}
*
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerMetrics() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+
+ list.add(new DicTrigger("1", "璐ㄩ噺鎸囨爣妫�楠�"));
+ list.add(new DicTrigger("2", "鍌ㄥ瓨鍝佽川妫�楠�"));
+ list.add(new DicTrigger("3", "椋熷搧瀹夊叏妫�楠�"));
+
+ return list;
+ }
+
+ /**
+ * 鍒嗛〉鑾峰彇璐ㄩ噺宸℃璁板綍淇℃伅
+ * <p>
* qualityManagerPR#listQuality
*
* @param page
@@ -73,7 +104,7 @@
* @throws Exception
*/
@DataProvider
- public void listQuality(Page<MQuality> page, Map<String, Object> param) throws Exception{
+ public void listQuality(Page<MQuality> page, Map<String, Object> param) throws Exception {
qualityManageService.listQuality(page, param);
}
@@ -84,16 +115,16 @@
* @param data
*/
@DataResolver
- public void saveQuality(MQuality data){
+ public void saveQuality(MQuality data) {
String id = "";
- if(StringUtils.isEmpty(data.getId())){
+ if (StringUtils.isEmpty(data.getId())) {
id = ManageUtil.createQualityId(data.getType());
}
qualityManageService.saveQuality(id, data);
//淇濆瓨妫�娴嬬殑鍖栭獙椤逛俊鎭�
if (null != data.getCheckItems()) {
- checkStandardManager.updateCheckItems(id,null,data.getCheckItems());
+ checkStandardManager.updateCheckItems(id, null, data.getCheckItems());
}
}
@@ -104,7 +135,7 @@
* @return
*/
@Expose
- public String delQuality(MQuality data){
+ public String delQuality(MQuality data) {
return qualityManageService.delQuality(data);
}
diff --git a/igds-core/src/main/resources/mapper/CheckStandardMapper.xml b/igds-core/src/main/resources/mapper/CheckStandardMapper.xml
index e061d49..6e33d17 100644
--- a/igds-core/src/main/resources/mapper/CheckStandardMapper.xml
+++ b/igds-core/src/main/resources/mapper/CheckStandardMapper.xml
@@ -1,114 +1,119 @@
<?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">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ld.igds.check.mapper.CheckStandardMapper">
- <!--鏂板鍖栭獙鏁版嵁 -->
- <insert id="insertCheckItem" parameterType="com.ld.igds.check.dto.CheckItemData">
- insert into
- D_CHECK_ITEM(
- COMPANY_ID_,
- CHECK_ID_,
- STANDARD_ID_,
- STANDARD_NAME_,
- UNIT_,
- UPPER_LIMIT_,
- OPERA_SYMBOL_,
- RULE_NUM_,
- RULE_ADD_,
- RULE_ADD_END_,
- RULE_REDUCE_,
- VALUE_,
- RULE_PRICE_,
- RULE_REDUCE_PRICE_,
- ADD_NUM_,
- DE_NUM_,
- ADD_PRICE_,
- DE_PRICE_,
- RESULT_,
- REMARKS_
- )values (
- #{data.companyId},
- #{data.checkId},
- #{data.standardId},
- #{data.standardName},
- #{data.unit},
- #{data.upperLimit},
- #{data.operaSymbol},
- #{data.ruleNum},
- #{data.ruleAdd},
- #{data.ruleAddEnd},
- #{data.ruleReduce},
- #{data.value},
- #{data.rulePrice},
- #{data.ruleReducePrice},
- #{data.addNum},
- #{data.deNum},
- #{data.addPrice},
- #{data.dePrice},
- #{data.result},
- #{data.remarks}
- )
- </insert>
+ <!--鏂板鍖栭獙鏁版嵁 -->
+ <insert id="insertCheckItem" parameterType="com.ld.igds.check.dto.CheckItemData">
+ insert into D_CHECK_ITEM(COMPANY_ID_,
+ CHECK_ID_,
+ STANDARD_ID_,
+ STANDARD_NAME_,
+ UNIT_,
+ UPPER_LIMIT_,
+ OPERA_SYMBOL_,
+ RULE_NUM_,
+ RULE_ADD_,
+ RULE_ADD_END_,
+ RULE_REDUCE_,
+ VALUE_,
+ RULE_PRICE_,
+ RULE_REDUCE_PRICE_,
+ ADD_NUM_,
+ DE_NUM_,
+ ADD_PRICE_,
+ DE_PRICE_,
+ RESULT_,
+ REMARKS_)
+ values (#{data.companyId},
+ #{data.checkId},
+ #{data.standardId},
+ #{data.standardName},
+ #{data.unit},
+ #{data.upperLimit},
+ #{data.operaSymbol},
+ #{data.ruleNum},
+ #{data.ruleAdd},
+ #{data.ruleAddEnd},
+ #{data.ruleReduce},
+ #{data.value},
+ #{data.rulePrice},
+ #{data.ruleReducePrice},
+ #{data.addNum},
+ #{data.deNum},
+ #{data.addPrice},
+ #{data.dePrice},
+ #{data.result},
+ #{data.remarks})
+ </insert>
- <!--鏇存柊鍖栭獙椤规暟鎹� -->
- <update id="updateCheckItem" parameterType="com.ld.igds.check.dto.CheckItemData">
- update D_CHECK_ITEM
- <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.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>
- <where>
- <if test="data.companyId != null and data.companyId != '' "> COMPANY_ID_= #{data.companyId}</if>
- <if test="data.checkId != null">AND CHECK_ID_ = #{data.checkId}</if>
- <if test="data.standardId != null and data.standardId != '' ">AND STANDARD_ID_ = #{data.standardId}</if>
- </where>
- </update>
+ <!--鏇存柊鍖栭獙椤规暟鎹� -->
+ <update id="updateCheckItem" parameterType="com.ld.igds.check.dto.CheckItemData">
+ update D_CHECK_ITEM
+ <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.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>
+ <where>
+ <if test="data.companyId != null and data.companyId != '' ">COMPANY_ID_= #{data.companyId}</if>
+ <if test="data.checkId != null">AND CHECK_ID_ = #{data.checkId}</if>
+ <if test="data.standardId != null and data.standardId != '' ">AND STANDARD_ID_ = #{data.standardId}</if>
+ </where>
+ </update>
- <!--鏇存柊鏁版嵁 瑕佹眰缁撴灉鍊煎繀椤讳负绌猴紝閬垮厤璁や负鏇存柊鍚庤鏇挎崲 -->
- <update id="updateItemByResult" parameterType="com.ld.igds.check.dto.CheckItemData">
- update D_CHECK_ITEM
- <set>
- <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.remarks != null and data.remarks != '' ">REMARKS_ = #{data.remarks},</if>
- <if test="data.operaSymbol != null and data.operaSymbol != '' ">OPERA_SYMBOL_ = #{data.operaSymbol}</if>
- </set>
- <where>
- <if test="data.companyId != null and data.companyId != '' "> COMPANY_ID_= #{data.companyId}</if>
- <if test="data.checkId != null and data.checkId != '' ">AND CHECK_ID_ = #{data.checkId}</if>
- <if test="data.standardId != null and data.standardId != '' ">AND STANDARD_ID_ = #{data.standardId}</if>
- </where>
- AND VALUE_ IS NULL
- </update>
+ <!--鏇存柊鏁版嵁 瑕佹眰缁撴灉鍊煎繀椤讳负绌猴紝閬垮厤璁や负鏇存柊鍚庤鏇挎崲 -->
+ <update id="updateItemByResult" parameterType="com.ld.igds.check.dto.CheckItemData">
+ update D_CHECK_ITEM
+ <set>
+ <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.remarks != null and data.remarks != '' ">REMARKS_ = #{data.remarks},</if>
+ <if test="data.operaSymbol != null and data.operaSymbol != '' ">OPERA_SYMBOL_ = #{data.operaSymbol}</if>
+ </set>
+ <where>
+ <if test="data.companyId != null and data.companyId != '' ">COMPANY_ID_= #{data.companyId}</if>
+ <if test="data.checkId != null and data.checkId != '' ">AND CHECK_ID_ = #{data.checkId}</if>
+ <if test="data.standardId != null and data.standardId != '' ">AND STANDARD_ID_ = #{data.standardId}</if>
+ </where>
+ AND VALUE_ IS NULL
+ </update>
+ <!-- 鏍规嵁鏉′欢鍒犻櫎鍖栭獙椤�-->
+ <delete id="delCheckItemByParam" parameterType="com.ld.igds.check.dto.CheckItemData">
+ DELETE
+ FROM D_CHECK_ITEM
+ <where>
+ <if test="data.companyId != null and data.companyId != '' ">COMPANY_ID_= #{data.companyId}</if>
+ <if test="data.checkId != null and data.checkId != '' ">AND CHECK_ID_ = #{data.checkId}</if>
+ </where>
+ </delete>
- <!-- 鏍规嵁checkId鑾峰彇妫�娴嬬粨鏋� -->
- <select id="getCheckItemById" parameterType="java.lang.String"
- resultType="com.ld.igds.check.dto.CheckItemData">
- select
- CHECK_ID_ as checkId,
- COMPANY_ID_ as companyId,
- STANDARD_ID_ as standardId,
- STANDARD_NAME_ as standardName,
- UNIT_ as unit,
- UPPER_LIMIT_ as upperLimit,
- OPERA_SYMBOL_ as operaSymbol,
- RULE_NUM_ as ruleNum,
- RULE_ADD_ as ruleAdd,
- RULE_ADD_END_ as ruleAddEnd,
- RULE_REDUCE_ as ruleReduce,
- VALUE_ as value,
+ <!-- 鏍规嵁checkId鑾峰彇妫�娴嬬粨鏋� -->
+ <select id="getCheckItemById" parameterType="java.lang.String"
+ resultType="com.ld.igds.check.dto.CheckItemData">
+ select CHECK_ID_ as checkId,
+ COMPANY_ID_ as companyId,
+ STANDARD_ID_ as standardId,
+ STANDARD_NAME_ as standardName,
+ UNIT_ as unit,
+ UPPER_LIMIT_ as upperLimit,
+ OPERA_SYMBOL_ as operaSymbol,
+ RULE_NUM_ as ruleNum,
+ RULE_ADD_ as ruleAdd,
+ RULE_ADD_END_ as ruleAddEnd,
+ RULE_REDUCE_ as ruleReduce,
+ VALUE_ as value,
RULE_PRICE_ as rulePrice,
RULE_REDUCE_PRICE_ as ruleReducePrice,
ADD_NUM_ as addNum,
@@ -117,38 +122,36 @@
DE_PRICE_ as dePrice,
RESULT_ as result,
REMARKS_ as remarks
- from
- D_CHECK_ITEM
- where COMPANY_ID_ = #{companyId}
- and CHECK_ID_ = #{checkId}
- ORDER by STANDARD_ID_ +0
- </select>
+ from
+ D_CHECK_ITEM
+ where COMPANY_ID_ = #{companyId}
+ and CHECK_ID_ = #{checkId}
+ ORDER by STANDARD_ID_ +0
+ </select>
- <!-- 鏍规嵁绮鍝佺鑾峰彇閰嶇殑鍖栭獙淇℃伅 -->
- <select id="getCheckStandard" parameterType="java.lang.String"
- resultType="com.ld.igds.check.dto.CheckStandardData">
- select
- ID_ as id,
- COMPANY_ID_ as companyId,
- FOOD_VARIETY_ as foodVariety,
- STANDARD_ID_ as standardId,
- STANDARD_NAME_ as standardName,
- UNIT_ as unit,
- OPERA_SYMBOL_ as operaSymbol,
- UPPER_LIMIT_ as upperLimit,
- RULE_NUM_ as ruleNum,
- RULE_REDUCE_ as ruleReduce,
- RULE_ADD_ as ruleAdd,
- RULE_ADD_END_ as ruleAddEnd,
- RULE_PRICE_ as rulePrice,
- RULE_REDUCE_PRICE_ as ruleReducePrice,
- UPDATE_TIME_ as updateTime,
- REMARKS_ as remarks
- FROM D_CHECK_STANDARD
- WHERE
- COMPANY_ID_ = #{companyId}
- AND FOOD_VARIETY_ = #{foodVariety}
- ORDER by STANDARD_ID_ + 0
- </select>
+ <!-- 鏍规嵁绮鍝佺鑾峰彇閰嶇殑鍖栭獙淇℃伅 -->
+ <select id="getCheckStandard" parameterType="java.lang.String"
+ resultType="com.ld.igds.check.dto.CheckStandardData">
+ select ID_ as id,
+ COMPANY_ID_ as companyId,
+ FOOD_VARIETY_ as foodVariety,
+ STANDARD_ID_ as standardId,
+ STANDARD_NAME_ as standardName,
+ UNIT_ as unit,
+ OPERA_SYMBOL_ as operaSymbol,
+ UPPER_LIMIT_ as upperLimit,
+ RULE_NUM_ as ruleNum,
+ RULE_REDUCE_ as ruleReduce,
+ RULE_ADD_ as ruleAdd,
+ RULE_ADD_END_ as ruleAddEnd,
+ RULE_PRICE_ as rulePrice,
+ RULE_REDUCE_PRICE_ as ruleReducePrice,
+ UPDATE_TIME_ as updateTime,
+ REMARKS_ as remarks
+ FROM D_CHECK_STANDARD
+ WHERE COMPANY_ID_ = #{companyId}
+ AND FOOD_VARIETY_ = #{foodVariety}
+ ORDER by STANDARD_ID_ + 0
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3