From 73fc635888a5ab20ed1e85ac4e2f8bf6879c4fd9 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 30 十月 2023 00:03:31 +0800
Subject: [PATCH] 武汉接口
---
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java | 60
src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java | 13
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1207.java | 6
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1208PR.java | 224 ++
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1209PR.java | 223 ++
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1115.java | 10
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1206PR.java | 225 ++
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlYQSB.java | 30
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1115PR.java | 198 +
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJSMX.java | 28
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1205.view.xml | 424 ++-
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1215.java | 58
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java | 121 +
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1208.view.xml | 601 +++++
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java | 73
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml | 58
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJCNL.java | 31
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1213.java | 59
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java | 6
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlZCMX.java | 25
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml | 774 +++++++
src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java | 36
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlInoutDel.java | 73
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlCheck.java | 33
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1205.java | 65
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java | 73
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java | 53
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1113.view.xml | 58
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1205PR.java | 199 +
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1210PR.java | 223 ++
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1110.view.xml | 8
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1211PR.java | 223 ++
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1212PR.java | 157 +
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1213PR.java | 223 ++
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java | 82
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1215PR.java | 223 ++
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java | 127
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml | 38
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1207.view.xml | 904 +++----
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1211.java | 53
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1115.view.xml | 412 +++
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java | 70
42 files changed, 5,535 insertions(+), 1,045 deletions(-)
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1207.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1207.java
index fedacbe..b5b2330 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1207.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1207.java
@@ -10,7 +10,7 @@
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultContract;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1207Rep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
-import com.fzzy.otherview.whhpjl.dto.WhjlApi1207;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1206;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -56,9 +56,9 @@
try {
List<Fz40WhjlDefaultContract> list = fz40ToWhjlSync1207Rep.listApi1207(deptId.substring(0, 4));
List<ApiInfoData> apiInfoDataList;
- WhjlApi1207 apiData;
+ WhjlApi1206 apiData;
for (Fz40WhjlDefaultContract sysData : list) {
- apiData = new WhjlApi1207();
+ apiData = new WhjlApi1206();
apiData.setHtid(sysData.getId()); //鍚堝悓ID
apiData.setJlqybh(""); //鍐涚伯浼佷笟缂栧彿
apiData.setSsqymc(""); //鍐涚伯浼佷笟鍚嶇О
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java
index f6801be..6e14d13 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java
@@ -10,7 +10,7 @@
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultInoutRecord;
import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1214Rep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
-import com.fzzy.otherview.whhpjl.dto.WhjlApi1214;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1212;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -56,9 +56,9 @@
try {
List<Fz40WhjlDefaultInoutRecord> list = fz40ToWhjlSync1214Rep.listApi1214(deptId.substring(0, 4));
List<ApiInfoData> apiInfoDataList;
- WhjlApi1214 apiData;
+ WhjlApi1212 apiData;
for (Fz40WhjlDefaultInoutRecord sysData : list) {
- apiData = new WhjlApi1214();
+ apiData = new WhjlApi1212();
apiData.setCrkid(sysData.getId()); //鍑哄叆搴撹褰旾D
apiData.setJlqybh(""); //鍐涚伯浼佷笟缂栧彿
apiData.setSsqymc(""); //鍐涚伯浼佷笟鍚嶇О
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml
index 179c296..af0cfcc 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml
@@ -6,55 +6,55 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1109</Property>
<PropertyDef name="dadm">
- <Property/>
+ <Property></Property>
<Property name="label">妗ｆ浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="jlqybh">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涚伯浼佷笟缂栧彿</Property>
</PropertyDef>
<PropertyDef name="jlqymc">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涚伯浼佷笟鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="jgzdbh">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涗緵绔欑偣缂栧彿</Property>
</PropertyDef>
<PropertyDef name="jgzdmc">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涗緵绔欑偣鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="cfbh">
- <Property/>
+ <Property></Property>
<Property name="label">浠撴埧缂栧彿</Property>
</PropertyDef>
<PropertyDef name="sscfmc">
- <Property/>
+ <Property></Property>
<Property name="label">浠撴埧鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="dalx">
- <Property/>
+ <Property></Property>
<Property name="label">妗ｆ绫诲瀷</Property>
</PropertyDef>
<PropertyDef name="damc">
- <Property/>
+ <Property></Property>
<Property name="label">妗ｆ鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="dawj">
- <Property/>
+ <Property></Property>
<Property name="label">妗ｆ鏂囦欢</Property>
</PropertyDef>
<PropertyDef name="sfyx">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁鏈夋晥</Property>
</PropertyDef>
<PropertyDef name="bz">
- <Property/>
+ <Property></Property>
<Property name="label">澶囨敞</Property>
</PropertyDef>
<PropertyDef name="bizId">
- <Property/>
+ <Property></Property>
<Property name="label">涓氬姟ID</Property>
</PropertyDef>
<PropertyDef name="updateTime">
@@ -62,11 +62,11 @@
<Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
</PropertyDef>
<PropertyDef name="czbz">
- <Property/>
+ <Property></Property>
<Property name="label">鎿嶄綔鏍囧織</Property>
</PropertyDef>
<PropertyDef name="kqdm">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
</DataType>
@@ -99,7 +99,7 @@
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">whjlApi1110PR#listData</Property>
+ <Property name="dataProvider">whjlApi1109PR#listData</Property>
<Property name="pageSize">20</Property>
</DataSet>
<DataSet id="dsQuery">
@@ -324,7 +324,7 @@
<Tools/>
</Dialog>
<UpdateAction id="updateSave">
- <Property name="dataResolver">whjlApi1110PR#saveData</Property>
+ <Property name="dataResolver">whjlApi1109PR#saveData</Property>
<UpdateItem>
<Property name="dataPath">[#current]</Property>
<Property name="dataSet">dsMain</Property>
@@ -332,10 +332,10 @@
</UpdateAction>
<AjaxAction id="ajaxDel">
<Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
- <Property name="service">whjlApi1110PR#delData</Property>
+ <Property name="service">whjlApi1109PR#delData</Property>
</AjaxAction>
<AjaxAction id="ajaxPush">
- <Property name="service">whjlApi1110PR#pushData</Property>
+ <Property name="service">whjlApi1109PR#pushData</Property>
</AjaxAction>
<Dialog id="dialogLog">
<Property name="width">90%</Property>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1110.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1110.view.xml
index a3b09e4..bd1b28b 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1110.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1110.view.xml
@@ -119,7 +119,7 @@
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">whjlApi1108PR#listData</Property>
+ <Property name="dataProvider">whjlApi1110PR#listData</Property>
<Property name="pageSize">20</Property>
</DataSet>
<DataSet id="dsQuery">
@@ -391,7 +391,7 @@
<Tools/>
</Dialog>
<UpdateAction id="updateSave">
- <Property name="dataResolver">whjlApi1108PR#saveData</Property>
+ <Property name="dataResolver">whjlApi1110PR#saveData</Property>
<UpdateItem>
<Property name="dataPath">[#current]</Property>
<Property name="dataSet">dsMain</Property>
@@ -399,10 +399,10 @@
</UpdateAction>
<AjaxAction id="ajaxDel">
<Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
- <Property name="service">whjlApi1108PR#delData</Property>
+ <Property name="service">whjlApi1110PR#delData</Property>
</AjaxAction>
<AjaxAction id="ajaxPush">
- <Property name="service">whjlApi1108PR#pushData</Property>
+ <Property name="service">whjlApi1110PR#pushData</Property>
</AjaxAction>
<Dialog id="dialogLog">
<Property name="width">90%</Property>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1113.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1113.view.xml
index 643380e..2a84807 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1113.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1113.view.xml
@@ -6,88 +6,88 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1113</Property>
<PropertyDef name="sbwhjlbh">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="jlqybh">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="jlqymc">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="jgzdbh">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="jgzdmc">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="sbbh">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="sbmc">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="wbrq">
<Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="wbdw">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="wbr">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="lxdh">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="whlr">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="whjl">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="fxwt">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="jjcs">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="xcwbrq">
<Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="ysr">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="whjy">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="whjlzp">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="bz">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="zpid">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="zpmc">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="zplj">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="zpdx">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="bizId">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="updateTime">
<Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="czbz">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="kqdm">
- <Property/>
+ <Property></Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -119,7 +119,7 @@
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">whjlApi1108PR#listData</Property>
+ <Property name="dataProvider">whjlApi1113PR#listData</Property>
</DataSet>
<DataSet id="dsQuery">
<ClientEvent name="onReady">self.insert();</ClientEvent>
@@ -431,7 +431,7 @@
<Tools/>
</Dialog>
<UpdateAction id="updateSave">
- <Property name="dataResolver">whjlApi1108PR#saveData</Property>
+ <Property name="dataResolver">whjlApi1113PR#saveData</Property>
<UpdateItem>
<Property name="dataPath">[#current]</Property>
<Property name="dataSet">dsMain</Property>
@@ -439,10 +439,10 @@
</UpdateAction>
<AjaxAction id="ajaxDel">
<Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
- <Property name="service">whjlApi1108PR#delData</Property>
+ <Property name="service">whjlApi1113PR#delData</Property>
</AjaxAction>
<AjaxAction id="ajaxPush">
- <Property name="service">whjlApi1108PR#pushData</Property>
+ <Property name="service">whjlApi1113PR#pushData</Property>
</AjaxAction>
<Dialog id="dialogLog">
<Property name="width">90%</Property>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1115.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1115.view.xml
new file mode 100644
index 0000000..d7fca9a
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1115.view.xml
@@ -0,0 +1,412 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1115</Property>
+ <PropertyDef name="sbbfjlbh">
+ <Property/>
+ <Property name="label">璁惧鎶ュ簾璁板綍缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="jlqybh">
+ <Property/>
+ <Property name="label">鍐涚伯浼佷笟缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="jlqymc">
+ <Property/>
+ <Property name="label">鍐涚伯浼佷笟鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="jgzdbh">
+ <Property/>
+ <Property name="label">鍐涗緵绔欑偣缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="jgzdmc">
+ <Property/>
+ <Property name="label">鍐涗緵绔欑偣鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="sbbh">
+ <Property/>
+ <Property name="label">璁惧缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="sbmc">
+ <Property/>
+ <Property name="label">璁惧鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="bfsqsj">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鎶ュ簾鐢宠鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="sqr">
+ <Property/>
+ <Property name="label">鐢宠浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="ysynx">
+ <Property/>
+ <Property name="label">宸蹭娇鐢ㄥ勾闄�</Property>
+ </PropertyDef>
+ <PropertyDef name="bfyy">
+ <Property/>
+ <Property name="label">鎶ュ簾鍘熷洜</Property>
+ </PropertyDef>
+ <PropertyDef name="pzr">
+ <Property/>
+ <Property name="label">鎵瑰噯浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="pzrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鎵瑰噯鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="sm">
+ <Property/>
+ <Property name="label">璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="bz">
+ <Property/>
+ <Property name="label">澶囨敞</Property>
+ </PropertyDef>
+ <PropertyDef name="bizId">
+ <Property/>
+ <Property name="label">涓氬姟ID</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="czbz">
+ <Property/>
+ <Property name="label">鎿嶄綔鏍囧織</Property>
+ </PropertyDef>
+ <PropertyDef name="kqdm">
+ <Property/>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtParam">
+ <Property name="creationType">com.fzzy.api.data.ApiParam</Property>
+ <PropertyDef name="kqdm">
+ <Property></Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ </PropertyDef>
+ <PropertyDef name="start">
+ <Property name="dataType">Date</Property>
+ <Property name="label">寮�濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="end">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鎴鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="czbz">
+ <Property></Property>
+ <Property name="label">鎿嶄綔鏍囧織</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ </DataType>
+ </Model>
+ <View layout="regionPadding:10">
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="dataType">[dtMain]</Property>
+ <Property name="dataProvider">whjlApi1115PR#listData</Property>
+ <Property name="parameter">20</Property>
+ </DataSet>
+ <DataSet id="dsQuery">
+ <ClientEvent name="onReady">self.insert();</ClientEvent>
+ <Property name="dataType">dtParam</Property>
+ </DataSet>
+ <Container layout="regionPadding:10" layoutConstraint="top">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="height">55</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").insert();
+view.get("#dialogMain").show();</ClientEvent>
+ <Property name="iconClass">fa fa-plus</Property>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#dialogMain").show();
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">缂栬緫</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ <Property name="exClassName">btn-warm</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#ajaxDel").set("parameter",cur).execute(function(result){
+ if(result){
+ $alert(result);
+ } else{
+ cur.remove();
+ }
+ });
+}else{
+ $alert("璇峰嬀閫夐渶瑕佸垹闄ょ殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ <Property name="exClassName">btn-warn</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").flushAsync();</ClientEvent>
+ <Property name="caption">鍒锋柊</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ <Property name="exClassName">btn-flush</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var select = view.get("#dgMain").get("selection");
+if(select && select.length > 0){
+ view.get("#ajaxPush").set("parameter",select).execute(function(result){
+ view.get("#dsMain").flushAsync();
+ $notify(result);
+ });
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷笂鎶ョ殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">鎵嬪姩涓婁紶</Property>
+ <Property name="iconClass">fa fa-hand-o-up</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="right">
+ <ClientEvent name="onClick">//鏄剧ず璁板綍
+view.get("#iFrame").reload();
+view.get("#dialogLog").show();</ClientEvent>
+ <Property name="caption">涓婁紶璁板綍</Property>
+ <Property name="iconClass">fa fa-bars</Property>
+ <Property name="exClassName">btn-flush</Property>
+ </Button>
+ </Container>
+ <Container layoutConstraint="center">
+ <Property name="exClassName">bg-color</Property>
+ <DataGrid id="dgMain">
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
+if(data){
+ view.get("#dialogMain").show();
+}</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="selectionMode">multiRows</Property>
+ <Property name="readOnly">true</Property>
+ <RowNumColumn/>
+ <RowSelectorColumn>
+ <Property name="caption">涓婁紶</Property>
+ </RowSelectorColumn>
+ <DataColumn name="sbbfjlbh">
+ <Property name="property">sbbfjlbh</Property>
+ </DataColumn>
+ <DataColumn name="jlqybh">
+ <Property name="property">jlqybh</Property>
+ </DataColumn>
+ <DataColumn name="jlqymc">
+ <Property name="property">jlqymc</Property>
+ </DataColumn>
+ <DataColumn name="jgzdmc">
+ <Property name="property">jgzdmc</Property>
+ </DataColumn>
+ <DataColumn name="sbmc">
+ <Property name="property">sbmc</Property>
+ </DataColumn>
+ <DataColumn name="sqr">
+ <Property name="property">sqr</Property>
+ </DataColumn>
+ <DataColumn name="ysynx">
+ <Property name="property">ysynx</Property>
+ </DataColumn>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Container layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </Container>
+ <Dialog id="dialogMain">
+ <Property name="width">60%</Property>
+ <Property name="closeable">false</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Property name="caption">璐т綅淇℃伅</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+view.get("#updateSave").execute(function(){
+ self.get("parent").hide();
+ view.get("#dsMain").flushAsync();
+});</ClientEvent>
+ <Property name="caption">纭畾</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+self.get("parent").hide();
+if(cur) cur.cancel();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelPosition">top</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement>
+ <Property name="name">sbbfjlbh</Property>
+ <Property name="property">sbbfjlbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jlqybh</Property>
+ <Property name="property">jlqybh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jlqymc</Property>
+ <Property name="property">jlqymc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jgzdbh</Property>
+ <Property name="property">jgzdbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jgzdmc</Property>
+ <Property name="property">jgzdmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sbbh</Property>
+ <Property name="property">sbbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sbmc</Property>
+ <Property name="property">sbmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bfsqsj</Property>
+ <Property name="property">bfsqsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sqr</Property>
+ <Property name="property">sqr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ysynx</Property>
+ <Property name="property">ysynx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bfyy</Property>
+ <Property name="property">bfyy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">pzr</Property>
+ <Property name="property">pzr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">pzrq</Property>
+ <Property name="property">pzrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sm</Property>
+ <Property name="property">sm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bz</Property>
+ <Property name="property">bz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bizId</Property>
+ <Property name="property">bizId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="updateSave">
+ <Property name="dataResolver">whjlApi1115PR#saveData</Property>
+ <UpdateItem>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="dataSet">dsMain</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDel">
+ <Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
+ <Property name="service">whjlApi1115PR#delData</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxPush">
+ <Property name="service">whjlApi1115PR#pushData</Property>
+ </AjaxAction>
+ <Dialog id="dialogLog">
+ <Property name="width">90%</Property>
+ <Property name="height">90%</Property>
+ <Property name="caption">涓婁紶璁板綍</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍏抽棴</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <Container>
+ <IFrame id="iFrame">
+ <Property name="path">com.fzzy.api.view.ApiLog.d</Property>
+ <Property name="userData">
+ <Entity>
+ <Property name="deptId">deptId</Property>
+ </Entity>
+ </Property>
+ </IFrame>
+ </Container>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <ListDropDown id="listDropYN">
+ <Property name="items">鏄�,鍚�</Property>
+ </ListDropDown>
+ </View>
+</ViewConfig>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1214.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1205.view.xml
similarity index 61%
copy from src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1214.view.xml
copy to src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1205.view.xml
index 76c1084..24f3a05 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1214.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1205.view.xml
@@ -4,107 +4,153 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1214</Property>
- <PropertyDef name="crkid">
- <Property/>
- <Property name="label">鍑哄叆搴撹褰旾D</Property>
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1205</Property>
+ <PropertyDef name="ddid">
+ <Property></Property>
+ <Property name="label">璁㈠崟ID</Property>
+ </PropertyDef>
+ <PropertyDef name="ddbh">
+ <Property></Property>
+ <Property name="label">璁㈠崟缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="jhid">
+ <Property></Property>
+ <Property name="label">璁″垝id</Property>
</PropertyDef>
<PropertyDef name="jlqybh">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涚伯浼佷笟缂栧彿</Property>
</PropertyDef>
<PropertyDef name="ssqymc">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涚伯浼佷笟鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="jgzdbh">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涗緵绔欑偣缂栧彿</Property>
</PropertyDef>
<PropertyDef name="jgzdmc">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涗緵绔欑偣鍚嶇О</Property>
</PropertyDef>
- <PropertyDef name="ywrq">
- <Property/>
- <Property name="label">涓氬姟鏃ユ湡</Property>
+ <PropertyDef name="ddlx">
+ <Property></Property>
+ <Property name="label">璁㈠崟绫诲瀷</Property>
+ </PropertyDef>
+ <PropertyDef name="grxsrq">
<Property name="dataType">Date</Property>
- </PropertyDef>
- <PropertyDef name="crklx">
- <Property/>
- <Property name="label">鍑哄叆搴撶被鍨�</Property>
- </PropertyDef>
- <PropertyDef name="ywlx">
- <Property/>
- <Property name="label">涓氬姟绫诲瀷</Property>
- </PropertyDef>
- <PropertyDef name="crkpz">
- <Property/>
- <Property name="label">鍑哄叆搴撳嚟璇�</Property>
+ <Property name="label">璐叆/閿�鍞棩鏈�</Property>
</PropertyDef>
<PropertyDef name="jljgqybh">
- <Property/>
- <Property name="label">鍔犲伐浼佷笟缂栧彿</Property>
- </PropertyDef>
- <PropertyDef name="jljgqymc">
- <Property/>
- <Property name="label">鍔犲伐浼佷笟鍚嶇О</Property>
+ <Property></Property>
+ <Property name="label">渚涘簲鍟嗕紒涓氱紪鍙�</Property>
</PropertyDef>
<PropertyDef name="khbh">
- <Property/>
+ <Property></Property>
<Property name="label">瀹㈡埛缂栧彿</Property>
</PropertyDef>
- <PropertyDef name="glzxm">
- <Property/>
- <Property name="label">瀹㈡埛濮撳悕</Property>
+ <PropertyDef name="sjjlpzbh">
+ <Property></Property>
+ <Property name="label">瀹為檯鍐涚伯鍝佺缂栧彿</Property>
</PropertyDef>
- <PropertyDef name="shdw">
- <Property/>
- <Property name="label">鏀惰揣鍗曚綅</Property>
+ <PropertyDef name="sjjlppbh">
+ <Property></Property>
+ <Property name="label">瀹為檯鍐涚伯鍝佺墝缂栧彿</Property>
</PropertyDef>
- <PropertyDef name="shlxr">
- <Property/>
- <Property name="label">鏀惰揣鑱旂郴浜�</Property>
+ <PropertyDef name="jlcpbh">
+ <Property></Property>
+ <Property name="label">鍐涚伯浜у搧缂栧彿</Property>
</PropertyDef>
- <PropertyDef name="shlxrdh">
- <Property/>
- <Property name="label">鏀惰揣鑱旂郴鐢佃瘽</Property>
+ <PropertyDef name="cpmc">
+ <Property></Property>
+ <Property name="label">浜у搧鍚嶇О</Property>
</PropertyDef>
- <PropertyDef name="rjfaid">
- <Property/>
- <Property name="label">搴旀�ユ柟妗圛D</Property>
+ <PropertyDef name="sjjldjbh">
+ <Property></Property>
+ <Property name="label">瀹為檯鍐涚伯绛夌骇缂栧彿</Property>
</PropertyDef>
- <PropertyDef name="jhid">
- <Property/>
- <Property name="label">绛规帾璁″垝ID</Property>
+ <PropertyDef name="sjjlsl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">瀹為檯鍐涚伯鏁伴噺</Property>
</PropertyDef>
- <PropertyDef name="htid">
- <Property/>
- <Property name="label">鍚堝悓ID</Property>
+ <PropertyDef name="sjjlzl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">瀹為檯鍐涚伯閲嶉噺</Property>
</PropertyDef>
- <PropertyDef name="psrwid">
- <Property/>
- <Property name="label">閰嶉�佷换鍔d</Property>
+ <PropertyDef name="sjdj">
+ <Property name="dataType">Double</Property>
+ <Property name="label">瀹為檯鍗曚环</Property>
</PropertyDef>
- <PropertyDef name="yscch">
- <Property/>
- <Property name="label">杩愯緭杞﹁埞鍙�</Property>
+ <PropertyDef name="sjzj">
+ <Property name="dataType">Double</Property>
+ <Property name="label">瀹為檯鎬讳环</Property>
</PropertyDef>
- <PropertyDef name="cyr">
- <Property/>
- <Property name="label">鎵胯繍浜�</Property>
+ <PropertyDef name="zljybhbh">
+ <Property></Property>
+ <Property name="label">璐ㄩ噺妫�楠屾姤鍛婄紪鍙�</Property>
</PropertyDef>
- <PropertyDef name="cyrdh">
- <Property/>
- <Property name="label">鎵胯繍浜虹數璇�</Property>
+ <PropertyDef name="chfs">
+ <Property></Property>
+ <Property name="label">鍑鸿揣鏂瑰紡</Property>
+ </PropertyDef>
+ <PropertyDef name="shdz">
+ <Property></Property>
+ <Property name="label">鏀惰揣鍦板潃</Property>
+ </PropertyDef>
+ <PropertyDef name="lxdh">
+ <Property></Property>
+ <Property name="label">鑱旂郴鐢佃瘽</Property>
+ </PropertyDef>
+ <PropertyDef name="lxr">
+ <Property></Property>
+ <Property name="label">鑱旂郴浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="ddjhrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">浜よ揣鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="xh">
+ <Property></Property>
+ <Property name="label">搴忓彿</Property>
+ </PropertyDef>
+ <PropertyDef name="sfyx">
+ <Property></Property>
+ <Property name="label">鏄惁鏈夋晥</Property>
+ </PropertyDef>
+ <PropertyDef name="bz">
+ <Property></Property>
+ <Property name="label">澶囨敞</Property>
</PropertyDef>
<PropertyDef name="bizId">
<Property></Property>
<Property name="label">涓氬姟ID</Property>
</PropertyDef>
<PropertyDef name="updateTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="czbz">
+ <Property></Property>
+ <Property name="label">鎿嶄綔鏍囧織</Property>
+ </PropertyDef>
+ <PropertyDef name="kqdm">
+ <Property></Property>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtParam">
+ <Property name="creationType">com.fzzy.api.data.ApiParam</Property>
+ <PropertyDef name="kqdm">
+ <Property></Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ </PropertyDef>
+ <PropertyDef name="start">
<Property name="dataType">Date</Property>
- <Property name="label">鏇存柊鏃堕棿</Property>
+ <Property name="label">寮�濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="end">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鎴鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="czbz">
<Property></Property>
@@ -115,21 +161,18 @@
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
- <PropertyDef name="kqdm">
- <Property></Property>
- <Property name="label">搴撳尯浠ｇ爜</Property>
- </PropertyDef>
- <PropertyDef name="bz">
- <Property/>
- <Property name="label">澶囨敞</Property>
- </PropertyDef>
</DataType>
</Model>
<View layout="regionPadding:10">
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">whjlApi1214PR#listData</Property>
+ <Property name="dataProvider">whjlApi1205PR#listData</Property>
+ <Property name="parameter">20</Property>
+ </DataSet>
+ <DataSet id="dsQuery">
+ <ClientEvent name="onReady">self.insert();</ClientEvent>
+ <Property name="dataType">dtParam</Property>
</DataSet>
<Container layout="regionPadding:10" layoutConstraint="top">
<Property name="exClassName">bg-color</Property>
@@ -216,57 +259,47 @@
<RowSelectorColumn>
<Property name="caption">涓婁紶</Property>
</RowSelectorColumn>
- <DataColumn name="crkid">
- <Property name="property">crkid</Property>
- <Property name="align">center</Property>
+ <DataColumn name="ddid">
+ <Property name="property">ddid</Property>
+ </DataColumn>
+ <DataColumn name="jhid">
+ <Property name="property">jhid</Property>
</DataColumn>
<DataColumn name="ssqymc">
<Property name="property">ssqymc</Property>
- <Property name="align">center</Property>
</DataColumn>
<DataColumn name="jgzdmc">
<Property name="property">jgzdmc</Property>
- <Property name="align">center</Property>
</DataColumn>
- <DataColumn name="ywrq">
- <Property name="property">ywrq</Property>
- <Property name="align">center</Property>
+ <DataColumn name="ddlx">
+ <Property name="property">ddlx</Property>
</DataColumn>
- <DataColumn name="crklx">
- <Property name="property">crklx</Property>
- <Property name="align">center</Property>
+ <DataColumn name="grxsrq">
+ <Property name="property">grxsrq</Property>
</DataColumn>
- <DataColumn name="ywlx">
- <Property name="property">ywlx</Property>
- <Property name="align">center</Property>
+ <DataColumn name="khbh">
+ <Property name="property">khbh</Property>
</DataColumn>
- <DataColumn name="crkpz">
- <Property name="property">crkpz</Property>
- <Property name="align">center</Property>
+ <DataColumn name="cpmc">
+ <Property name="property">cpmc</Property>
</DataColumn>
- <DataColumn name="glzxm">
- <Property name="property">glzxm</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="cyr">
- <Property name="property">cyr</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="cyrdh">
- <Property name="property">cyrdh</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="yscch">
- <Property name="property">yscch</Property>
- <Property name="align">center</Property>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
</DataColumn>
</DataGrid>
</Container>
+ <Container layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </Container>
<Dialog id="dialogMain">
- <Property name="width">85%</Property>
+ <Property name="width">60%</Property>
<Property name="closeable">false</Property>
<Property name="iconClass">fa fa-sliders</Property>
- <Property name="caption">瀹㈡埛淇℃伅</Property>
+ <Property name="caption">璐т綅淇℃伅</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
@@ -291,10 +324,20 @@
<Property name="cols">*,*,*,*</Property>
<Property name="labelPosition">top</Property>
<Property name="labelSeparator">:</Property>
- <Property name="labelAlign">left</Property>
+ <Property name="labelWidth">120</Property>
<AutoFormElement>
- <Property name="name">crkid</Property>
- <Property name="property">crkid</Property>
+ <Property name="name">ddid</Property>
+ <Property name="property">ddid</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ddbh</Property>
+ <Property name="property">ddbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jhid</Property>
+ <Property name="property">jhid</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -318,115 +361,113 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ywrq</Property>
- <Property name="property">ywrq</Property>
+ <Property name="name">ddlx</Property>
+ <Property name="property">ddlx</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">crklx</Property>
- <Property name="property">crklx</Property>
- <Property name="trigger">listDropInOut</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ywlx</Property>
- <Property name="property">ywlx</Property>
- <Property name="trigger">listDropType</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">crkpz</Property>
- <Property name="property">crkpz</Property>
+ <Property name="name">grxsrq</Property>
+ <Property name="property">grxsrq</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
<Property name="name">jljgqybh</Property>
<Property name="property">jljgqybh</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">-----鐢ㄤ簬鍏ュ簱-----</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jljgqymc</Property>
- <Property name="property">jljgqymc</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">-----鐢ㄤ簬鍏ュ簱-----</Property>
- </TextEditor>
- </Editor>
+ <Editor/>
</AutoFormElement>
<AutoFormElement>
<Property name="name">khbh</Property>
<Property name="property">khbh</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">-----鐢ㄤ簬鍑哄簱-----</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">glzxm</Property>
- <Property name="property">glzxm</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">-----鐢ㄤ簬鍑哄簱-----</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">shdw</Property>
- <Property name="property">shdw</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">shlxr</Property>
- <Property name="property">shlxr</Property>
+ <Property name="name">sjjlpzbh</Property>
+ <Property name="property">sjjlpzbh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">shlxrdh</Property>
- <Property name="property">shlxrdh</Property>
+ <Property name="name">sjjlppbh</Property>
+ <Property name="property">sjjlppbh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">rjfaid</Property>
- <Property name="property">rjfaid</Property>
+ <Property name="name">jlcpbh</Property>
+ <Property name="property">jlcpbh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">jhid</Property>
- <Property name="property">jhid</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">-----鐢ㄤ簬鍏ュ簱-----</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htid</Property>
- <Property name="property">htid</Property>
+ <Property name="name">cpmc</Property>
+ <Property name="property">cpmc</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">psrwid</Property>
- <Property name="property">psrwid</Property>
+ <Property name="name">sjjldjbh</Property>
+ <Property name="property">sjjldjbh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">yscch</Property>
- <Property name="property">yscch</Property>
+ <Property name="name">sjjlsl</Property>
+ <Property name="property">sjjlsl</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">cyr</Property>
- <Property name="property">cyr</Property>
+ <Property name="name">sjjlzl</Property>
+ <Property name="property">sjjlzl</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">cyrdh</Property>
- <Property name="property">cyrdh</Property>
+ <Property name="name">sjdj</Property>
+ <Property name="property">sjdj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sjzj</Property>
+ <Property name="property">sjzj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zljybhbh</Property>
+ <Property name="property">zljybhbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">chfs</Property>
+ <Property name="property">chfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">shdz</Property>
+ <Property name="property">shdz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lxdh</Property>
+ <Property name="property">lxdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lxr</Property>
+ <Property name="property">lxr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ddjhrq</Property>
+ <Property name="property">ddjhrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xh</Property>
+ <Property name="property">xh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfyx</Property>
+ <Property name="property">sfyx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bz</Property>
+ <Property name="property">bz</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -449,17 +490,12 @@
<Property name="property">kqdm</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">bz</Property>
- <Property name="property">bz</Property>
- <Editor/>
- </AutoFormElement>
</AutoForm>
</Children>
<Tools/>
</Dialog>
<UpdateAction id="updateSave">
- <Property name="dataResolver">whjlApi1214PR#saveData</Property>
+ <Property name="dataResolver">whjlApi1205PR#saveData</Property>
<UpdateItem>
<Property name="dataPath">[#current]</Property>
<Property name="dataSet">dsMain</Property>
@@ -467,10 +503,10 @@
</UpdateAction>
<AjaxAction id="ajaxDel">
<Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
- <Property name="service">whjlApi1214PR#delData</Property>
+ <Property name="service">whjlApi1205PR#delData</Property>
</AjaxAction>
<AjaxAction id="ajaxPush">
- <Property name="service">whjlApi1214PR#pushData</Property>
+ <Property name="service">whjlApi1205PR#pushData</Property>
</AjaxAction>
<Dialog id="dialogLog">
<Property name="width">90%</Property>
@@ -500,12 +536,6 @@
</Dialog>
<ListDropDown id="listDropYN">
<Property name="items">鏄�,鍚�</Property>
- </ListDropDown>
- <ListDropDown id="listDropType">
- <Property name="items">鏃ュ父鍑哄簱,鏃ュ父鍏ュ簱,搴旀�ュ嚭搴�,搴旀�ュ叆搴�</Property>
- </ListDropDown>
- <ListDropDown id="listDropInOut">
- <Property name="items">鍏ュ簱,鍑哄簱</Property>
</ListDropDown>
</View>
</ViewConfig>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml
new file mode 100644
index 0000000..2d2f1a4
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml
@@ -0,0 +1,774 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1206</Property>
+ <PropertyDef name="htid">
+ <Property></Property>
+ <Property name="label">鍚堝悓ID</Property>
+ </PropertyDef>
+ <PropertyDef name="jlqybh">
+ <Property></Property>
+ <Property name="label">鍐涚伯浼佷笟缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="ssqymc">
+ <Property></Property>
+ <Property name="label">鍐涚伯浼佷笟鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="jgzdbh">
+ <Property></Property>
+ <Property name="label">鍐涗緵绔欑偣缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="jgzdmc">
+ <Property></Property>
+ <Property name="label">鍐涗緵绔欑偣鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="htlx">
+ <Property></Property>
+ <Property name="label">鍚堝悓绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("HT_YWLX")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="htbh">
+ <Property></Property>
+ <Property name="label">鍚堝悓缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="htbt">
+ <Property></Property>
+ <Property name="label">鍚堝悓鏍囬</Property>
+ </PropertyDef>
+ <PropertyDef name="jljgqybh">
+ <Property></Property>
+ <Property name="label">鍔犲伐浼佷笟缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="jljgqymc">
+ <Property></Property>
+ <Property name="label">鍔犲伐浼佷笟鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="htkhbh">
+ <Property></Property>
+ <Property name="label">鍚堝悓瀹㈡埛缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="htkhmc">
+ <Property></Property>
+ <Property name="label">鍚堝悓瀹㈡埛鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="htspdj">
+ <Property></Property>
+ <Property name="label">鍚堝悓鍟嗗搧鍗曚环</Property>
+ </PropertyDef>
+ <PropertyDef name="htspsl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍚堝悓鍟嗗搧鏁伴噺</Property>
+ <Property name="displayFormat">#0.00</Property>
+ </PropertyDef>
+ <PropertyDef name="spbm">
+ <Property></Property>
+ <Property name="label">鍟嗗搧缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="zje">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鎬婚噾棰�</Property>
+ </PropertyDef>
+ <PropertyDef name="htqdr">
+ <Property></Property>
+ <Property name="label">鍚堝悓绛捐浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="htqdsj">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鍚堝悓绛捐鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="htsxrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鍚堝悓鐢熸晥鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="htjzrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鍚堝悓鎴鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="htcjr">
+ <Property></Property>
+ <Property name="label">鍚堝悓鍒涘缓浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="htcjsj">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鍚堝悓鍒涘缓鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="htdbgjlbz">
+ <Property></Property>
+ <Property name="label">鍚堝悓鐨勫彉鏇磋褰曟爣蹇�</Property>
+ </PropertyDef>
+ <PropertyDef name="htbgyy">
+ <Property></Property>
+ <Property name="label">鍚堝悓鍙樻洿鍘熷洜</Property>
+ </PropertyDef>
+ <PropertyDef name="htgylx">
+ <Property></Property>
+ <Property name="label">鍚堝悓渚涘簲绫诲瀷</Property>
+ </PropertyDef>
+ <PropertyDef name="yhtbh">
+ <Property></Property>
+ <Property name="label">鍘熷悎鍚岀紪鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="zffs">
+ <Property></Property>
+ <Property name="label">鏀粯鏂瑰紡</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("JSFS")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="ywcsl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">宸插畬鎴愭暟閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="ywcslje">
+ <Property></Property>
+ <Property name="label">宸插畬鎴愭暟閲忛噾棰�</Property>
+ </PropertyDef>
+ <PropertyDef name="htbz">
+ <Property></Property>
+ <Property name="label">鍚堝悓澶囨敞</Property>
+ </PropertyDef>
+ <PropertyDef name="xh">
+ <Property></Property>
+ <Property name="label">搴忓彿</Property>
+ <Property name="dataType">Integer</Property>
+ </PropertyDef>
+ <PropertyDef name="sfyx">
+ <Property></Property>
+ <Property name="label">鏄惁鏈夋晥</Property>
+ </PropertyDef>
+ <PropertyDef name="bz">
+ <Property></Property>
+ <Property name="label">澶囨敞</Property>
+ </PropertyDef>
+ <PropertyDef name="bizId">
+ <Property></Property>
+ <Property name="label">涓氬姟ID</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="czbz">
+ <Property></Property>
+ <Property name="label">鎿嶄綔鏍囧織</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="kqdm">
+ <Property></Property>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
+ </PropertyDef>
+ <Reference name="htspqd">
+ <Property name="parameter">$${this.htid}</Property>
+ <Property name="dataProvider">whjlApi1206PR#listItem</Property>
+ <Property name="dataType">[dtItem]</Property>
+ </Reference>
+ </DataType>
+ <DataType name="dtItem">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlQDItem</Property>
+ <PropertyDef name="htspid">
+ <Property></Property>
+ <Property name="label">鍚堝悓鍟嗗搧ID</Property>
+ </PropertyDef>
+ <PropertyDef name="htid">
+ <Property></Property>
+ <Property name="label">鍚堝悓ID</Property>
+ </PropertyDef>
+ <PropertyDef name="ddid">
+ <Property></Property>
+ <Property name="label">璁㈠崟ID</Property>
+ </PropertyDef>
+ <PropertyDef name="lspzbm">
+ <Property></Property>
+ <Property name="label">鍝佺缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="lspzmc">
+ <Property></Property>
+ <Property name="label">鍝佺鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="cpbh">
+ <Property></Property>
+ <Property name="label">浜у搧缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="cpmc">
+ <Property></Property>
+ <Property name="label">浜у搧鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="spsl">
+ <Property></Property>
+ <Property name="label">鍟嗗搧鏁伴噺</Property>
+ <Property name="dataType">Double</Property>
+ <Property name="displayFormat">#0.00</Property>
+ </PropertyDef>
+ <PropertyDef name="spdj">
+ <Property></Property>
+ <Property name="label">鍟嗗搧鍗曚环</Property>
+ <Property name="dataType">Double</Property>
+ <Property name="displayFormat">#0.00</Property>
+ </PropertyDef>
+ <PropertyDef name="je">
+ <Property></Property>
+ <Property name="label">閲戦</Property>
+ <Property name="dataType">Double</Property>
+ <Property name="displayFormat">#0.00</Property>
+ </PropertyDef>
+ <PropertyDef name="ywcsl">
+ <Property></Property>
+ <Property name="label">宸插畬鎴愭暟閲�</Property>
+ <Property name="dataType">Double</Property>
+ <Property name="displayFormat">#0.00</Property>
+ </PropertyDef>
+ <PropertyDef name="ywcje">
+ <Property></Property>
+ <Property name="label">宸插畬鎴愰噾棰�</Property>
+ <Property name="dataType">Double</Property>
+ <Property name="displayFormat">#0.00</Property>
+ </PropertyDef>
+ <PropertyDef name="bz">
+ <Property></Property>
+ <Property name="label">澶囨敞</Property>
+ </PropertyDef>
+ </DataType>
+ </Model>
+ <View layout="regionPadding:10">
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="dataType">[dtMain]</Property>
+ <Property name="dataProvider">whjlApi1206PR#listData</Property>
+ </DataSet>
+ <Container layout="regionPadding:10" layoutConstraint="top">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="height">55</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").insert();
+view.get("#dialogMain").show();</ClientEvent>
+ <Property name="iconClass">fa fa-plus</Property>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#dialogMain").show();
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">缂栬緫</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ <Property name="exClassName">btn-warm</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#ajaxDel").set("parameter",cur).execute(function(result){
+ if(result){
+ $alert(result);
+ } else{
+ cur.remove();
+ }
+ });
+}else{
+ $alert("璇峰嬀閫夐渶瑕佸垹闄ょ殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ <Property name="exClassName">btn-warn</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").flushAsync();</ClientEvent>
+ <Property name="caption">鍒锋柊</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ <Property name="exClassName">btn-flush</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var select = view.get("#dgMain").get("selection");
+if(select && select.length > 0){
+ view.get("#ajaxPush").set("parameter",select).execute(function(result){
+ view.get("#dsMain").flushAsync();
+ $notify(result);
+ });
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷笂鎶ョ殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">鎵嬪姩涓婁紶</Property>
+ <Property name="iconClass">fa fa-hand-o-up</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="right">
+ <ClientEvent name="onClick">//鏄剧ず璁板綍
+view.get("#iFrame").reload();
+view.get("#dialogLog").show();</ClientEvent>
+ <Property name="caption">涓婁紶璁板綍</Property>
+ <Property name="iconClass">fa fa-bars</Property>
+ <Property name="exClassName">btn-flush</Property>
+ </Button>
+ </Container>
+ <Container layoutConstraint="center">
+ <Property name="exClassName">bg-color</Property>
+ <DataGrid id="dgMain">
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
+if(data){
+ view.get("#dialogMain").show();
+}</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="selectionMode">multiRows</Property>
+ <Property name="readOnly">true</Property>
+ <RowNumColumn/>
+ <RowSelectorColumn>
+ <Property name="caption">涓婁紶</Property>
+ </RowSelectorColumn>
+ <DataColumn name="htbh">
+ <Property name="property">htbh</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="ssqymc">
+ <Property name="property">ssqymc</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="jgzdmc">
+ <Property name="property">jgzdmc</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="htlx">
+ <Property name="property">htlx</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="htbt">
+ <Property name="property">htbt</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="htkhmc">
+ <Property name="property">htkhmc</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="zje">
+ <Property name="property">zje</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="zffs">
+ <Property name="property">zffs</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="ywcsl">
+ <Property name="property">ywcsl</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="ywcslje">
+ <Property name="property">ywcslje</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="htbz">
+ <Property name="property">htbz</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="xh">
+ <Property name="property">xh</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="sfyx">
+ <Property name="property">sfyx</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Dialog id="dialogMain" layout="regionPadding:10;padding:5">
+ <Property name="width">85%</Property>
+ <Property name="closeable">false</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Property name="caption">瀹㈡埛淇℃伅</Property>
+ <Property name="height">85%</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+view.get("#updateSave").execute(function(){
+ self.get("parent").hide();
+ view.get("#dsMain").flushAsync();
+});</ClientEvent>
+ <Property name="caption">纭畾</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+self.get("parent").hide();
+if(cur) cur.cancel();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <FieldSet>
+ <Property name="caption">鍚堝悓淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="labelPosition">top</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelAlign">left</Property>
+ <AutoFormElement>
+ <Property name="name">htlx</Property>
+ <Property name="property">htlx</Property>
+ <Property name="editorType">RadioGroup</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">htid</Property>
+ <Property name="property">htid</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jlqybh</Property>
+ <Property name="property">jlqybh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ssqymc</Property>
+ <Property name="property">ssqymc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jgzdbh</Property>
+ <Property name="property">jgzdbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jgzdmc</Property>
+ <Property name="property">jgzdmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">htbh</Property>
+ <Property name="property">htbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">htbt</Property>
+ <Property name="property">htbt</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jljgqybh</Property>
+ <Property name="property">jljgqybh</Property>
+ <Editor>
+ <TextEditor>
+ <Property name="blankText">----鐢ㄤ簬閲囪喘鍚堝悓----</Property>
+ </TextEditor>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jljgqymc</Property>
+ <Property name="property">jljgqymc</Property>
+ <Editor>
+ <TextEditor>
+ <Property name="blankText">----鐢ㄤ簬閲囪喘鍚堝悓----</Property>
+ </TextEditor>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">htkhbh</Property>
+ <Property name="property">htkhbh</Property>
+ <Editor>
+ <TextEditor>
+ <Property name="blankText">----鐢ㄤ簬閿�鍞悎鍚�----</Property>
+ </TextEditor>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">htkhmc</Property>
+ <Property name="property">htkhmc</Property>
+ <Editor>
+ <TextEditor>
+ <Property name="blankText">----鐢ㄤ簬閿�鍞悎鍚�----</Property>
+ </TextEditor>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">htspdj</Property>
+ <Property name="property">htspdj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">htspsl</Property>
+ <Property name="property">htspsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">spbm</Property>
+ <Property name="property">spbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zje</Property>
+ <Property name="property">zje</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">htqdr</Property>
+ <Property name="property">htqdr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">htqdsj</Property>
+ <Property name="property">htqdsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">htsxrq</Property>
+ <Property name="property">htsxrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">htjzrq</Property>
+ <Property name="property">htjzrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">htcjr</Property>
+ <Property name="property">htcjr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">htcjsj</Property>
+ <Property name="property">htcjsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">htdbgjlbz</Property>
+ <Property name="property">htdbgjlbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">htbgyy</Property>
+ <Property name="property">htbgyy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">htgylx</Property>
+ <Property name="property">htgylx</Property>
+ <Property name="trigger">listDropLX</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yhtbh</Property>
+ <Property name="property">yhtbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zffs</Property>
+ <Property name="property">zffs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ywcsl</Property>
+ <Property name="property">ywcsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ywcslje</Property>
+ <Property name="property">ywcslje</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">htbz</Property>
+ <Property name="property">htbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xh</Property>
+ <Property name="property">xh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfyx</Property>
+ <Property name="property">sfyx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bz</Property>
+ <Property name="property">bz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bizId</Property>
+ <Property name="property">bizId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <Panel layout="regionPadding:5">
+ <Property name="caption">鍚堝悓鍟嗗搧娓呭崟</Property>
+ <Property name="height">400</Property>
+ <Buttons/>
+ <Children>
+ <Container layout="regionPadding:10">
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("htspqd");
+list.insert({});</ClientEvent>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dataGridDetail.currentEntity");
+if(!data){
+ return;
+}
+view.get("#ajaxItem").set("parameter",data).execute(function(result){
+ if(result){
+ $alert(result);
+ return;
+ }else{
+ data.remove();
+ }
+});</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ </Button>
+ </Container>
+ <DataGrid id="dataGridDetail">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">#.htspqd</Property>
+ <DataColumn name="htspid">
+ <Property name="property">htspid</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="ddid">
+ <Property name="property">ddid</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="lspzbm">
+ <Property name="property">lspzbm</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="lspzmc">
+ <Property name="property">lspzmc</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="cpbh">
+ <Property name="property">cpbh</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="cpmc">
+ <Property name="property">cpmc</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="spsl">
+ <Property name="property">spsl</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="spdj">
+ <Property name="property">spdj</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="je">
+ <Property name="property">je</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="ywcsl">
+ <Property name="property">ywcsl</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="ywcje">
+ <Property name="property">ywcje</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="bz">
+ <Property name="property">bz</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="updateSave">
+ <Property name="dataResolver">whjlApi1206PR#saveData</Property>
+ <UpdateItem>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="dataSet">dsMain</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDel">
+ <Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
+ <Property name="service">whjlApi1206PR#delData</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxItem">
+ <Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
+ <Property name="service">whjlApi1206PR#delItem</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxPush">
+ <Property name="service">whjlApi1206PR#pushData</Property>
+ </AjaxAction>
+ <Dialog id="dialogLog">
+ <Property name="width">90%</Property>
+ <Property name="height">90%</Property>
+ <Property name="caption">涓婁紶璁板綍</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍏抽棴</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <Container>
+ <IFrame id="iFrame">
+ <Property name="path">com.fzzy.api.view.ApiLog.d</Property>
+ <Property name="userData">
+ <Entity>
+ <Property name="deptId">deptId</Property>
+ </Entity>
+ </Property>
+ </IFrame>
+ </Container>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <ListDropDown id="listDropYN">
+ <Property name="items">鏄�,鍚�</Property>
+ </ListDropDown>
+ <ListDropDown id="listDropLX">
+ <Property name="items">鍐涚伯渚涘簲鍚堝悓,鍓渚涘簲鍚堝悓</Property>
+ </ListDropDown>
+ </View>
+</ViewConfig>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1207.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1207.view.xml
index 2c91f58..d63cd39 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1207.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1207.view.xml
@@ -5,9 +5,9 @@
<Model>
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1207</Property>
- <PropertyDef name="htid">
+ <PropertyDef name="kctzbh">
<Property></Property>
- <Property name="label">鍚堝悓ID</Property>
+ <Property name="label">搴撳瓨鍙板笎ID</Property>
</PropertyDef>
<PropertyDef name="jlqybh">
<Property></Property>
@@ -25,125 +25,141 @@
<Property></Property>
<Property name="label">鍐涗緵绔欑偣鍚嶇О</Property>
</PropertyDef>
- <PropertyDef name="htlx">
+ <PropertyDef name="cfbh">
<Property></Property>
- <Property name="label">鍚堝悓绫诲瀷</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("HT_YWLX")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
+ <Property name="label">浠撴埧缂栧彿</Property>
</PropertyDef>
- <PropertyDef name="htbh">
+ <PropertyDef name="cfmc">
<Property></Property>
- <Property name="label">鍚堝悓缂栧彿</Property>
+ <Property name="label">浠撴埧鍚嶇О</Property>
</PropertyDef>
- <PropertyDef name="htbt">
+ <PropertyDef name="ajbh">
<Property></Property>
- <Property name="label">鍚堝悓鏍囬</Property>
+ <Property name="label">寤掗棿缂栧彿</Property>
</PropertyDef>
- <PropertyDef name="jljgqybh">
+ <PropertyDef name="ajmc">
<Property></Property>
- <Property name="label">鍔犲伐浼佷笟缂栧彿</Property>
+ <Property name="label">寤掗棿鍚嶇О</Property>
</PropertyDef>
- <PropertyDef name="jljgqymc">
+ <PropertyDef name="hwbh">
<Property></Property>
- <Property name="label">鍔犲伐浼佷笟鍚嶇О</Property>
+ <Property name="label">璐т綅缂栧彿</Property>
</PropertyDef>
- <PropertyDef name="htkhbh">
+ <PropertyDef name="hwmc">
<Property></Property>
- <Property name="label">鍚堝悓瀹㈡埛缂栧彿</Property>
+ <Property name="label">璐т綅鍚嶇О</Property>
</PropertyDef>
- <PropertyDef name="htkhmc">
+ <PropertyDef name="lspzbm">
<Property></Property>
- <Property name="label">鍚堝悓瀹㈡埛鍚嶇О</Property>
+ <Property name="label">鍝佺缂栧彿</Property>
</PropertyDef>
- <PropertyDef name="htspdj">
+ <PropertyDef name="lspzmc">
<Property></Property>
- <Property name="label">鍚堝悓鍟嗗搧鍗曚环</Property>
+ <Property name="label">鍝佺鍚嶇О</Property>
</PropertyDef>
- <PropertyDef name="htspsl">
+ <PropertyDef name="cpbm">
+ <Property></Property>
+ <Property name="label">浜у搧缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="cpmc">
+ <Property></Property>
+ <Property name="label">浜у搧鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="lqdw">
+ <Property></Property>
+ <Property name="label">绮潈鍗曚綅</Property>
+ </PropertyDef>
+ <PropertyDef name="bgms">
+ <Property></Property>
+ <Property name="label">淇濈妯″紡</Property>
+ </PropertyDef>
+ <PropertyDef name="sjsl">
<Property name="dataType">Double</Property>
- <Property name="label">鍚堝悓鍟嗗搧鏁伴噺</Property>
- <Property name="displayFormat">#0.00</Property>
+ <Property name="label">瀹為檯鏁伴噺</Property>
</PropertyDef>
- <PropertyDef name="spbm">
+ <PropertyDef name="jldwbm">
<Property></Property>
- <Property name="label">鍟嗗搧缂栫爜</Property>
+ <Property name="label">璁￠噺鍗曚綅缂栫爜</Property>
</PropertyDef>
- <PropertyDef name="zje">
- <Property name="dataType">Double</Property>
- <Property name="label">鎬婚噾棰�</Property>
- </PropertyDef>
- <PropertyDef name="htqdr">
+ <PropertyDef name="jldwmc">
<Property></Property>
- <Property name="label">鍚堝悓绛捐浜�</Property>
+ <Property name="label">璁￠噺鍗曚綅鍚嶇О</Property>
</PropertyDef>
- <PropertyDef name="htqdsj">
- <Property name="dataType">DateTime</Property>
- <Property name="label">鍚堝悓绛捐鏃堕棿</Property>
+ <PropertyDef name="jsdwbm">
+ <Property></Property>
+ <Property name="label">璁℃暟鍗曚綅缂栫爜</Property>
</PropertyDef>
- <PropertyDef name="htsxrq">
+ <PropertyDef name="jsdwmc">
+ <Property></Property>
+ <Property name="label">璁℃暟鍗曚綅鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="clfs">
+ <Property></Property>
+ <Property name="label">鍌ㄧ伯鏂瑰紡</Property>
+ </PropertyDef>
+ <PropertyDef name="kcsbm">
+ <Property></Property>
+ <Property name="label">搴撳瓨璇嗗埆鐮�</Property>
+ </PropertyDef>
+ <PropertyDef name="jkrq">
<Property name="dataType">Date</Property>
- <Property name="label">鍚堝悓鐢熸晥鏃ユ湡</Property>
+ <Property name="label">寤哄崱鏃ユ湡</Property>
</PropertyDef>
- <PropertyDef name="htjzrq">
- <Property name="dataType">Date</Property>
- <Property name="label">鍚堝悓鎴鏃堕棿</Property>
- </PropertyDef>
- <PropertyDef name="htcjr">
+ <PropertyDef name="sfgd">
<Property></Property>
- <Property name="label">鍚堝悓鍒涘缓浜�</Property>
+ <Property name="label">鏄惁褰掓。</Property>
</PropertyDef>
- <PropertyDef name="htcjsj">
+ <PropertyDef name="gdsj">
<Property name="dataType">DateTime</Property>
- <Property name="label">鍚堝悓鍒涘缓鏃堕棿</Property>
+ <Property name="label">褰掓。鏃堕棿</Property>
</PropertyDef>
- <PropertyDef name="htdbgjlbz">
+ <PropertyDef name="kczt">
<Property></Property>
- <Property name="label">鍚堝悓鐨勫彉鏇磋褰曟爣蹇�</Property>
+ <Property name="label">搴撳瓨鐘舵��</Property>
</PropertyDef>
- <PropertyDef name="htbgyy">
- <Property></Property>
- <Property name="label">鍚堝悓鍙樻洿鍘熷洜</Property>
- </PropertyDef>
- <PropertyDef name="htgylx">
- <Property></Property>
- <Property name="label">鍚堝悓渚涘簲绫诲瀷</Property>
- </PropertyDef>
- <PropertyDef name="yhtbh">
- <Property></Property>
- <Property name="label">鍘熷悎鍚岀紪鍙�</Property>
- </PropertyDef>
- <PropertyDef name="zffs">
- <Property></Property>
- <Property name="label">鏀粯鏂瑰紡</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("JSFS")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="ywcsl">
+ <PropertyDef name="rksl">
<Property name="dataType">Double</Property>
- <Property name="label">宸插畬鎴愭暟閲�</Property>
+ <Property name="label">鍏ュ簱鏁伴噺</Property>
</PropertyDef>
- <PropertyDef name="ywcslje">
- <Property></Property>
- <Property name="label">宸插畬鎴愭暟閲忛噾棰�</Property>
+ <PropertyDef name="cksl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍑哄簱鏁伴噺</Property>
</PropertyDef>
- <PropertyDef name="htbz">
- <Property></Property>
- <Property name="label">鍚堝悓澶囨敞</Property>
+ <PropertyDef name="kcsl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">搴撳瓨鏁伴噺</Property>
</PropertyDef>
- <PropertyDef name="xh">
- <Property></Property>
- <Property name="label">搴忓彿</Property>
- <Property name="dataType">Integer</Property>
+ <PropertyDef name="rkzl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍏ュ簱閲嶉噺</Property>
</PropertyDef>
- <PropertyDef name="sfyx">
- <Property></Property>
- <Property name="label">鏄惁鏈夋晥</Property>
+ <PropertyDef name="ckzl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍑哄簱閲嶉噺</Property>
+ </PropertyDef>
+ <PropertyDef name="kczl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">搴撳瓨閲嶉噺</Property>
+ </PropertyDef>
+ <PropertyDef name="ztsl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍦ㄩ�旀暟閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="ztzl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍦ㄩ�旈噸閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="zssl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍦ㄥ敭鏁伴噺</Property>
+ </PropertyDef>
+ <PropertyDef name="zszl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍦ㄥ敭閲嶉噺</Property>
+ </PropertyDef>
+ <PropertyDef name="sxh">
+ <Property name="dataType">int</Property>
+ <Property name="label">椤哄簭鍙�</Property>
</PropertyDef>
<PropertyDef name="bz">
<Property></Property>
@@ -154,91 +170,16 @@
<Property name="label">涓氬姟ID</Property>
</PropertyDef>
<PropertyDef name="updateTime">
- <Property name="dataType">Date</Property>
- <Property name="label">鏇存柊鏃堕棿</Property>
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
</PropertyDef>
<PropertyDef name="czbz">
<Property></Property>
<Property name="label">鎿嶄綔鏍囧織</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
</PropertyDef>
<PropertyDef name="kqdm">
<Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
- </PropertyDef>
- <Reference name="htspqd">
- <Property name="parameter">$${this.htid}</Property>
- <Property name="dataProvider">whjlApi1207PR#listItem</Property>
- <Property name="dataType">[dtItem]</Property>
- </Reference>
- </DataType>
- <DataType name="dtItem">
- <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlQDItem</Property>
- <PropertyDef name="htspid">
- <Property></Property>
- <Property name="label">鍚堝悓鍟嗗搧ID</Property>
- </PropertyDef>
- <PropertyDef name="htid">
- <Property></Property>
- <Property name="label">鍚堝悓ID</Property>
- </PropertyDef>
- <PropertyDef name="ddid">
- <Property></Property>
- <Property name="label">璁㈠崟ID</Property>
- </PropertyDef>
- <PropertyDef name="lspzbm">
- <Property></Property>
- <Property name="label">鍝佺缂栧彿</Property>
- </PropertyDef>
- <PropertyDef name="lspzmc">
- <Property></Property>
- <Property name="label">鍝佺鍚嶇О</Property>
- </PropertyDef>
- <PropertyDef name="cpbh">
- <Property></Property>
- <Property name="label">浜у搧缂栧彿</Property>
- </PropertyDef>
- <PropertyDef name="cpmc">
- <Property></Property>
- <Property name="label">浜у搧鍚嶇О</Property>
- </PropertyDef>
- <PropertyDef name="spsl">
- <Property></Property>
- <Property name="label">鍟嗗搧鏁伴噺</Property>
- <Property name="dataType">Double</Property>
- <Property name="displayFormat">#0.00</Property>
- </PropertyDef>
- <PropertyDef name="spdj">
- <Property></Property>
- <Property name="label">鍟嗗搧鍗曚环</Property>
- <Property name="dataType">Double</Property>
- <Property name="displayFormat">#0.00</Property>
- </PropertyDef>
- <PropertyDef name="je">
- <Property></Property>
- <Property name="label">閲戦</Property>
- <Property name="dataType">Double</Property>
- <Property name="displayFormat">#0.00</Property>
- </PropertyDef>
- <PropertyDef name="ywcsl">
- <Property></Property>
- <Property name="label">宸插畬鎴愭暟閲�</Property>
- <Property name="dataType">Double</Property>
- <Property name="displayFormat">#0.00</Property>
- </PropertyDef>
- <PropertyDef name="ywcje">
- <Property></Property>
- <Property name="label">宸插畬鎴愰噾棰�</Property>
- <Property name="dataType">Double</Property>
- <Property name="displayFormat">#0.00</Property>
- </PropertyDef>
- <PropertyDef name="bz">
- <Property></Property>
- <Property name="label">澶囨敞</Property>
</PropertyDef>
</DataType>
</Model>
@@ -246,7 +187,8 @@
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">whjlApi1207PR#listData</Property>
+ <Property name="dataProvider">whjlApi1206PR#listData</Property>
+ <Property name="pageSize">20</Property>
</DataSet>
<Container layout="regionPadding:10" layoutConstraint="top">
<Property name="exClassName">bg-color</Property>
@@ -333,66 +275,64 @@
<RowSelectorColumn>
<Property name="caption">涓婁紶</Property>
</RowSelectorColumn>
- <DataColumn name="htbh">
- <Property name="property">htbh</Property>
- <Property name="align">center</Property>
+ <DataColumn name="kctzbh">
+ <Property name="property">kctzbh</Property>
+ </DataColumn>
+ <DataColumn name="jlqybh">
+ <Property name="property">jlqybh</Property>
</DataColumn>
<DataColumn name="ssqymc">
<Property name="property">ssqymc</Property>
- <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="jgzdbh">
+ <Property name="property">jgzdbh</Property>
</DataColumn>
<DataColumn name="jgzdmc">
<Property name="property">jgzdmc</Property>
- <Property name="align">center</Property>
</DataColumn>
- <DataColumn name="htlx">
- <Property name="property">htlx</Property>
- <Property name="align">center</Property>
+ <DataColumn name="cfbh">
+ <Property name="property">cfbh</Property>
</DataColumn>
- <DataColumn name="htbt">
- <Property name="property">htbt</Property>
- <Property name="align">center</Property>
+ <DataColumn name="jldwmc">
+ <Property name="property">jldwmc</Property>
</DataColumn>
- <DataColumn name="htkhmc">
- <Property name="property">htkhmc</Property>
- <Property name="align">center</Property>
+ <DataColumn name="jsdwmc">
+ <Property name="property">jsdwmc</Property>
</DataColumn>
- <DataColumn name="zje">
- <Property name="property">zje</Property>
- <Property name="align">center</Property>
+ <DataColumn name="clfs">
+ <Property name="property">clfs</Property>
</DataColumn>
- <DataColumn name="zffs">
- <Property name="property">zffs</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="ywcsl">
- <Property name="property">ywcsl</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="ywcslje">
- <Property name="property">ywcslje</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="htbz">
- <Property name="property">htbz</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="xh">
- <Property name="property">xh</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="sfyx">
- <Property name="property">sfyx</Property>
- <Property name="align">center</Property>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
</DataColumn>
</DataGrid>
</Container>
- <Dialog id="dialogMain" layout="regionPadding:10;padding:5">
- <Property name="width">85%</Property>
+ <Container layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </Container>
+ <UpdateAction id="updateSave">
+ <Property name="dataResolver">whjlApi1207PR#saveData</Property>
+ <UpdateItem>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="dataSet">dsMain</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDel">
+ <Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
+ <Property name="service">whjlApi1207PR#delData</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxPush">
+ <Property name="service">whjlApi1207PR#pushData</Property>
+ </AjaxAction>
+ <Dialog id="dialogMain">
+ <Property name="width">60%</Property>
<Property name="closeable">false</Property>
<Property name="iconClass">fa fa-sliders</Property>
- <Property name="caption">瀹㈡埛淇℃伅</Property>
- <Property name="height">85%</Property>
+ <Property name="caption">璐т綅淇℃伅</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
@@ -412,332 +352,236 @@
</Button>
</Buttons>
<Children>
- <FieldSet>
- <Property name="caption">鍚堝悓淇℃伅</Property>
- <Buttons/>
- <Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*,*</Property>
- <Property name="labelPosition">top</Property>
- <Property name="labelSeparator">:</Property>
- <Property name="labelAlign">left</Property>
- <AutoFormElement>
- <Property name="name">htlx</Property>
- <Property name="property">htlx</Property>
- <Property name="editorType">RadioGroup</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htid</Property>
- <Property name="property">htid</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jlqybh</Property>
- <Property name="property">jlqybh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ssqymc</Property>
- <Property name="property">ssqymc</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jgzdbh</Property>
- <Property name="property">jgzdbh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jgzdmc</Property>
- <Property name="property">jgzdmc</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htbh</Property>
- <Property name="property">htbh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htbt</Property>
- <Property name="property">htbt</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jljgqybh</Property>
- <Property name="property">jljgqybh</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">----鐢ㄤ簬閲囪喘鍚堝悓----</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jljgqymc</Property>
- <Property name="property">jljgqymc</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">----鐢ㄤ簬閲囪喘鍚堝悓----</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htkhbh</Property>
- <Property name="property">htkhbh</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">----鐢ㄤ簬閿�鍞悎鍚�----</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htkhmc</Property>
- <Property name="property">htkhmc</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">----鐢ㄤ簬閿�鍞悎鍚�----</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htspdj</Property>
- <Property name="property">htspdj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htspsl</Property>
- <Property name="property">htspsl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">spbm</Property>
- <Property name="property">spbm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zje</Property>
- <Property name="property">zje</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htqdr</Property>
- <Property name="property">htqdr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htqdsj</Property>
- <Property name="property">htqdsj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htsxrq</Property>
- <Property name="property">htsxrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htjzrq</Property>
- <Property name="property">htjzrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htcjr</Property>
- <Property name="property">htcjr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htcjsj</Property>
- <Property name="property">htcjsj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htdbgjlbz</Property>
- <Property name="property">htdbgjlbz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htbgyy</Property>
- <Property name="property">htbgyy</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htgylx</Property>
- <Property name="property">htgylx</Property>
- <Property name="trigger">listDropLX</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">yhtbh</Property>
- <Property name="property">yhtbh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zffs</Property>
- <Property name="property">zffs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ywcsl</Property>
- <Property name="property">ywcsl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ywcslje</Property>
- <Property name="property">ywcslje</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htbz</Property>
- <Property name="property">htbz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">xh</Property>
- <Property name="property">xh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">sfyx</Property>
- <Property name="property">sfyx</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bz</Property>
- <Property name="property">bz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bizId</Property>
- <Property name="property">bizId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">updateTime</Property>
- <Property name="property">updateTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">czbz</Property>
- <Property name="property">czbz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">kqdm</Property>
- <Property name="property">kqdm</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
- </Children>
- </FieldSet>
- <Panel layout="regionPadding:5">
- <Property name="caption">鍚堝悓鍟嗗搧娓呭崟</Property>
- <Property name="height">400</Property>
- <Buttons/>
- <Children>
- <Container layout="regionPadding:10">
- <Label layoutConstraint="left">
- <Property name="text">鑿滃崟鏍忥細</Property>
- </Label>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("htspqd");
-list.insert({});</ClientEvent>
- <Property name="caption">鏂板</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-plus</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">var data = view.get("#dataGridDetail.currentEntity");
-if(!data){
- return;
-}
-view.get("#ajaxItem").set("parameter",data).execute(function(result){
- if(result){
- $alert(result);
- return;
- }else{
- data.remove();
- }
-});</ClientEvent>
- <Property name="caption">鍒犻櫎</Property>
- <Property name="exClassName">btn-warn</Property>
- <Property name="iconClass">fa fa-minus</Property>
- </Button>
- </Container>
- <DataGrid id="dataGridDetail">
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">#.htspqd</Property>
- <DataColumn name="htspid">
- <Property name="property">htspid</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="ddid">
- <Property name="property">ddid</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="lspzbm">
- <Property name="property">lspzbm</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="lspzmc">
- <Property name="property">lspzmc</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="cpbh">
- <Property name="property">cpbh</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="cpmc">
- <Property name="property">cpmc</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="spsl">
- <Property name="property">spsl</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="spdj">
- <Property name="property">spdj</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="je">
- <Property name="property">je</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="ywcsl">
- <Property name="property">ywcsl</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="ywcje">
- <Property name="property">ywcje</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="bz">
- <Property name="property">bz</Property>
- <Property name="align">center</Property>
- </DataColumn>
- </DataGrid>
- </Children>
- <Tools/>
- </Panel>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="labelPosition">top</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement>
+ <Property name="name">kctzbh</Property>
+ <Property name="property">kctzbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jlqybh</Property>
+ <Property name="property">jlqybh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ssqymc</Property>
+ <Property name="property">ssqymc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jgzdbh</Property>
+ <Property name="property">jgzdbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jgzdmc</Property>
+ <Property name="property">jgzdmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cfbh</Property>
+ <Property name="property">cfbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cfmc</Property>
+ <Property name="property">cfmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajbh</Property>
+ <Property name="property">ajbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ajmc</Property>
+ <Property name="property">ajmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hwbh</Property>
+ <Property name="property">hwbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hwmc</Property>
+ <Property name="property">hwmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lspzbm</Property>
+ <Property name="property">lspzbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lspzmc</Property>
+ <Property name="property">lspzmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cpbm</Property>
+ <Property name="property">cpbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cpmc</Property>
+ <Property name="property">cpmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lqdw</Property>
+ <Property name="property">lqdw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bgms</Property>
+ <Property name="property">bgms</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sjsl</Property>
+ <Property name="property">sjsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jldwbm</Property>
+ <Property name="property">jldwbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jldwmc</Property>
+ <Property name="property">jldwmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jsdwbm</Property>
+ <Property name="property">jsdwbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jsdwmc</Property>
+ <Property name="property">jsdwmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">clfs</Property>
+ <Property name="property">clfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kcsbm</Property>
+ <Property name="property">kcsbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jkrq</Property>
+ <Property name="property">jkrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfgd</Property>
+ <Property name="property">sfgd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">gdsj</Property>
+ <Property name="property">gdsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kczt</Property>
+ <Property name="property">kczt</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">rksl</Property>
+ <Property name="property">rksl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cksl</Property>
+ <Property name="property">cksl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kcsl</Property>
+ <Property name="property">kcsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">rkzl</Property>
+ <Property name="property">rkzl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ckzl</Property>
+ <Property name="property">ckzl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kczl</Property>
+ <Property name="property">kczl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ztsl</Property>
+ <Property name="property">ztsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ztzl</Property>
+ <Property name="property">ztzl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zssl</Property>
+ <Property name="property">zssl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zszl</Property>
+ <Property name="property">zszl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sxh</Property>
+ <Property name="property">sxh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bz</Property>
+ <Property name="property">bz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bizId</Property>
+ <Property name="property">bizId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
</Children>
<Tools/>
</Dialog>
- <UpdateAction id="updateSave">
- <Property name="dataResolver">whjlApi1207PR#saveData</Property>
- <UpdateItem>
- <Property name="dataPath">[#current]</Property>
- <Property name="dataSet">dsMain</Property>
- </UpdateItem>
- </UpdateAction>
- <AjaxAction id="ajaxDel">
- <Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
- <Property name="service">whjlApi1207PR#delData</Property>
- </AjaxAction>
- <AjaxAction id="ajaxItem">
- <Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
- <Property name="service">whjlApi1207PR#delItem</Property>
- </AjaxAction>
- <AjaxAction id="ajaxPush">
- <Property name="service">whjlApi1207PR#pushData</Property>
- </AjaxAction>
<Dialog id="dialogLog">
<Property name="width">90%</Property>
<Property name="height">90%</Property>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1208.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1208.view.xml
new file mode 100644
index 0000000..4a3f8d6
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1208.view.xml
@@ -0,0 +1,601 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1208</Property>
+ <PropertyDef name="kctzcppcid">
+ <Property></Property>
+ <Property name="label">搴撳瓨鍙颁骇鍝佹壒娆D</Property>
+ </PropertyDef>
+ <PropertyDef name="kctzbh">
+ <Property></Property>
+ <Property name="label">搴撳瓨鍙板笎ID</Property>
+ </PropertyDef>
+ <PropertyDef name="jlqybh">
+ <Property></Property>
+ <Property name="label">鍐涚伯浼佷笟缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="ssqymc">
+ <Property></Property>
+ <Property name="label">鍐涚伯浼佷笟鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="jgzdbh">
+ <Property></Property>
+ <Property name="label">鍐涗緵绔欑偣缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="jgzdmc">
+ <Property></Property>
+ <Property name="label">鍐涗緵绔欑偣鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="cpbm">
+ <Property></Property>
+ <Property name="label">浜у搧缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="cpmc">
+ <Property></Property>
+ <Property name="label">浜у搧鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="cpnd">
+ <Property></Property>
+ <Property name="label">浜у搧骞村害</Property>
+ </PropertyDef>
+ <PropertyDef name="cpcd">
+ <Property></Property>
+ <Property name="label">浜у搧浜у湴</Property>
+ </PropertyDef>
+ <PropertyDef name="yssj">
+ <Property></Property>
+ <Property name="label">楠屾敹鏃堕棿</Property>
+ <Property name="dataType">DateTime</Property>
+ </PropertyDef>
+ <PropertyDef name="cppc">
+ <Property></Property>
+ <Property name="label">浜у搧鎵规</Property>
+ </PropertyDef>
+ <PropertyDef name="scrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鐢熶骇鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="bzq">
+ <Property name="dataType">Double</Property>
+ <Property name="label">淇濊川鏈�</Property>
+ </PropertyDef>
+ <PropertyDef name="bzjzrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">淇濊川鎴鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="rksl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍏ュ簱鏁伴噺</Property>
+ </PropertyDef>
+ <PropertyDef name="cksl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍑哄簱鏁伴噺</Property>
+ </PropertyDef>
+ <PropertyDef name="kcsl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">搴撳瓨鏁伴噺</Property>
+ </PropertyDef>
+ <PropertyDef name="rkzl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍏ュ簱閲嶉噺</Property>
+ </PropertyDef>
+ <PropertyDef name="ckzl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍑哄簱閲嶉噺</Property>
+ </PropertyDef>
+ <PropertyDef name="kczl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">搴撳瓨閲嶉噺</Property>
+ </PropertyDef>
+ <PropertyDef name="dj">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍗曚环</Property>
+ </PropertyDef>
+ <PropertyDef name="je">
+ <Property name="dataType">Double</Property>
+ <Property name="label">閲戦</Property>
+ </PropertyDef>
+ <PropertyDef name="jldwbm">
+ <Property></Property>
+ <Property name="label">璁￠噺鍗曚綅缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="jldwmc">
+ <Property></Property>
+ <Property name="label">璁￠噺鍗曚綅鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="jsdwbm">
+ <Property></Property>
+ <Property name="label">璁℃暟鍗曚綅缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="jsdwmc">
+ <Property></Property>
+ <Property name="label">璁℃暟鍗曚綅鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="rkkssj">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鍏ュ簱寮�濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="rkjssj">
+ <Property></Property>
+ <Property name="label">鍏ュ簱缁撴潫鏃堕棿</Property>
+ <Property name="dataType">DateTime</Property>
+ </PropertyDef>
+ <PropertyDef name="ckkssj">
+ <Property></Property>
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鍑哄簱寮�濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="ckjssj">
+ <Property></Property>
+ <Property name="label">鍑哄簱缁撴潫鏃堕棿</Property>
+ <Property name="dataType">DateTime</Property>
+ </PropertyDef>
+ <PropertyDef name="sjsl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">瀹為檯鏁伴噺</Property>
+ </PropertyDef>
+ <PropertyDef name="zlzt">
+ <Property></Property>
+ <Property name="label">璐ㄩ噺鐘舵��</Property>
+ </PropertyDef>
+ <PropertyDef name="kczt">
+ <Property></Property>
+ <Property name="label">搴撳瓨鐘舵��</Property>
+ </PropertyDef>
+ <PropertyDef name="sxh">
+ <Property name="dataType">int</Property>
+ <Property name="label">椤哄簭鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="bz">
+ <Property></Property>
+ <Property name="label">澶囨敞</Property>
+ </PropertyDef>
+ <PropertyDef name="bizId">
+ <Property></Property>
+ <Property name="label">涓氬姟ID</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="czbz">
+ <Property></Property>
+ <Property name="label">鎿嶄綔鏍囧織</Property>
+ </PropertyDef>
+ <PropertyDef name="kqdm">
+ <Property></Property>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtParam">
+ <Property name="creationType">com.fzzy.api.data.ApiParam</Property>
+ <PropertyDef name="kqdm">
+ <Property></Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ </PropertyDef>
+ <PropertyDef name="start">
+ <Property name="dataType">Date</Property>
+ <Property name="label">寮�濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="end">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鎴鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="czbz">
+ <Property></Property>
+ <Property name="label">鎿嶄綔鏍囧織</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("CZBZ")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ </DataType>
+ </Model>
+ <View layout="regionPadding:10">
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="dataType">[dtMain]</Property>
+ <Property name="dataProvider">whjlApi1208PR#listData</Property>
+ </DataSet>
+ <DataSet id="dsQuery">
+ <ClientEvent name="onReady">self.insert();</ClientEvent>
+ <Property name="dataType">dtParam</Property>
+ </DataSet>
+ <Container layout="regionPadding:10" layoutConstraint="top">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="height">55</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").insert();
+view.get("#dialogMain").show();</ClientEvent>
+ <Property name="iconClass">fa fa-plus</Property>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#dialogMain").show();
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">缂栬緫</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ <Property name="exClassName">btn-warm</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#ajaxDel").set("parameter",cur).execute(function(result){
+ if(result){
+ $alert(result);
+ } else{
+ cur.remove();
+ }
+ });
+}else{
+ $alert("璇峰嬀閫夐渶瑕佸垹闄ょ殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ <Property name="exClassName">btn-warn</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").flushAsync();</ClientEvent>
+ <Property name="caption">鍒锋柊</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ <Property name="exClassName">btn-flush</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var select = view.get("#dgMain").get("selection");
+if(select && select.length > 0){
+ view.get("#ajaxPush").set("parameter",select).execute(function(result){
+ view.get("#dsMain").flushAsync();
+ $notify(result);
+ });
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷笂鎶ョ殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">鎵嬪姩涓婁紶</Property>
+ <Property name="iconClass">fa fa-hand-o-up</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="right">
+ <ClientEvent name="onClick">//鏄剧ず璁板綍
+view.get("#iFrame").reload();
+view.get("#dialogLog").show();</ClientEvent>
+ <Property name="caption">涓婁紶璁板綍</Property>
+ <Property name="iconClass">fa fa-bars</Property>
+ <Property name="exClassName">btn-flush</Property>
+ </Button>
+ </Container>
+ <Container layoutConstraint="center">
+ <Property name="exClassName">bg-color</Property>
+ <DataGrid id="dgMain">
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
+if(data){
+ view.get("#dialogMain").show();
+}</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="selectionMode">multiRows</Property>
+ <Property name="readOnly">true</Property>
+ <RowNumColumn/>
+ <RowSelectorColumn>
+ <Property name="caption">涓婁紶</Property>
+ </RowSelectorColumn>
+ <DataColumn name="kctzcppcid">
+ <Property name="property">kctzcppcid</Property>
+ </DataColumn>
+ <DataColumn name="kctzbh">
+ <Property name="property">kctzbh</Property>
+ </DataColumn>
+ <DataColumn name="jlqybh">
+ <Property name="property">jlqybh</Property>
+ </DataColumn>
+ <DataColumn name="ssqymc">
+ <Property name="property">ssqymc</Property>
+ </DataColumn>
+ <DataColumn name="jgzdbh">
+ <Property name="property">jgzdbh</Property>
+ </DataColumn>
+ <DataColumn name="jgzdmc">
+ <Property name="property">jgzdmc</Property>
+ </DataColumn>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Container layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </Container>
+ <Dialog id="dialogMain">
+ <Property name="width">60%</Property>
+ <Property name="closeable">false</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Property name="caption">璐т綅淇℃伅</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+view.get("#updateSave").execute(function(){
+ self.get("parent").hide();
+ view.get("#dsMain").flushAsync();
+});</ClientEvent>
+ <Property name="caption">纭畾</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+self.get("parent").hide();
+if(cur) cur.cancel();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="labelPosition">top</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement>
+ <Property name="name">kctzcppcid</Property>
+ <Property name="property">kctzcppcid</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kctzbh</Property>
+ <Property name="property">kctzbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jlqybh</Property>
+ <Property name="property">jlqybh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ssqymc</Property>
+ <Property name="property">ssqymc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jgzdbh</Property>
+ <Property name="property">jgzdbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jgzdmc</Property>
+ <Property name="property">jgzdmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cpbm</Property>
+ <Property name="property">cpbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cpmc</Property>
+ <Property name="property">cpmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cpnd</Property>
+ <Property name="property">cpnd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cpcd</Property>
+ <Property name="property">cpcd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yssj</Property>
+ <Property name="property">yssj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cppc</Property>
+ <Property name="property">cppc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">scrq</Property>
+ <Property name="property">scrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bzq</Property>
+ <Property name="property">bzq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bzjzrq</Property>
+ <Property name="property">bzjzrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">rksl</Property>
+ <Property name="property">rksl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cksl</Property>
+ <Property name="property">cksl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kcsl</Property>
+ <Property name="property">kcsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">rkzl</Property>
+ <Property name="property">rkzl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ckzl</Property>
+ <Property name="property">ckzl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kczl</Property>
+ <Property name="property">kczl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dj</Property>
+ <Property name="property">dj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">je</Property>
+ <Property name="property">je</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jldwbm</Property>
+ <Property name="property">jldwbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jldwmc</Property>
+ <Property name="property">jldwmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jsdwbm</Property>
+ <Property name="property">jsdwbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jsdwmc</Property>
+ <Property name="property">jsdwmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">rkkssj</Property>
+ <Property name="property">rkkssj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">rkjssj</Property>
+ <Property name="property">rkjssj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ckkssj</Property>
+ <Property name="property">ckkssj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ckjssj</Property>
+ <Property name="property">ckjssj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sjsl</Property>
+ <Property name="property">sjsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zlzt</Property>
+ <Property name="property">zlzt</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kczt</Property>
+ <Property name="property">kczt</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sxh</Property>
+ <Property name="property">sxh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bz</Property>
+ <Property name="property">bz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bizId</Property>
+ <Property name="property">bizId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="updateSave">
+ <Property name="dataResolver">whjlApi1208PR#saveData</Property>
+ <UpdateItem>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="dataSet">dsMain</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDel">
+ <Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
+ <Property name="service">whjlApi1208PR#delData</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxPush">
+ <Property name="service">whjlApi1208PR#pushData</Property>
+ </AjaxAction>
+ <Dialog id="dialogLog">
+ <Property name="width">90%</Property>
+ <Property name="height">90%</Property>
+ <Property name="caption">涓婁紶璁板綍</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍏抽棴</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <Container>
+ <IFrame id="iFrame">
+ <Property name="path">com.fzzy.api.view.ApiLog.d</Property>
+ <Property name="userData">
+ <Entity>
+ <Property name="deptId">deptId</Property>
+ </Entity>
+ </Property>
+ </IFrame>
+ </Container>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <ListDropDown id="listDropYN">
+ <Property name="items">鏄�,鍚�</Property>
+ </ListDropDown>
+ </View>
+</ViewConfig>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1214.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml
similarity index 94%
rename from src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1214.view.xml
rename to src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml
index 76c1084..524530c 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1214.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml
@@ -4,98 +4,98 @@
<Context/>
<Model>
<DataType name="dtMain">
- <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1214</Property>
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1212</Property>
<PropertyDef name="crkid">
- <Property/>
+ <Property></Property>
<Property name="label">鍑哄叆搴撹褰旾D</Property>
</PropertyDef>
<PropertyDef name="jlqybh">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涚伯浼佷笟缂栧彿</Property>
</PropertyDef>
<PropertyDef name="ssqymc">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涚伯浼佷笟鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="jgzdbh">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涗緵绔欑偣缂栧彿</Property>
</PropertyDef>
<PropertyDef name="jgzdmc">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涗緵绔欑偣鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="ywrq">
- <Property/>
+ <Property></Property>
<Property name="label">涓氬姟鏃ユ湡</Property>
<Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="crklx">
- <Property/>
+ <Property></Property>
<Property name="label">鍑哄叆搴撶被鍨�</Property>
</PropertyDef>
<PropertyDef name="ywlx">
- <Property/>
+ <Property></Property>
<Property name="label">涓氬姟绫诲瀷</Property>
</PropertyDef>
<PropertyDef name="crkpz">
- <Property/>
+ <Property></Property>
<Property name="label">鍑哄叆搴撳嚟璇�</Property>
</PropertyDef>
<PropertyDef name="jljgqybh">
- <Property/>
+ <Property></Property>
<Property name="label">鍔犲伐浼佷笟缂栧彿</Property>
</PropertyDef>
<PropertyDef name="jljgqymc">
- <Property/>
+ <Property></Property>
<Property name="label">鍔犲伐浼佷笟鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="khbh">
- <Property/>
+ <Property></Property>
<Property name="label">瀹㈡埛缂栧彿</Property>
</PropertyDef>
<PropertyDef name="glzxm">
- <Property/>
+ <Property></Property>
<Property name="label">瀹㈡埛濮撳悕</Property>
</PropertyDef>
<PropertyDef name="shdw">
- <Property/>
+ <Property></Property>
<Property name="label">鏀惰揣鍗曚綅</Property>
</PropertyDef>
<PropertyDef name="shlxr">
- <Property/>
+ <Property></Property>
<Property name="label">鏀惰揣鑱旂郴浜�</Property>
</PropertyDef>
<PropertyDef name="shlxrdh">
- <Property/>
+ <Property></Property>
<Property name="label">鏀惰揣鑱旂郴鐢佃瘽</Property>
</PropertyDef>
<PropertyDef name="rjfaid">
- <Property/>
+ <Property></Property>
<Property name="label">搴旀�ユ柟妗圛D</Property>
</PropertyDef>
<PropertyDef name="jhid">
- <Property/>
+ <Property></Property>
<Property name="label">绛规帾璁″垝ID</Property>
</PropertyDef>
<PropertyDef name="htid">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓ID</Property>
</PropertyDef>
<PropertyDef name="psrwid">
- <Property/>
+ <Property></Property>
<Property name="label">閰嶉�佷换鍔d</Property>
</PropertyDef>
<PropertyDef name="yscch">
- <Property/>
+ <Property></Property>
<Property name="label">杩愯緭杞﹁埞鍙�</Property>
</PropertyDef>
<PropertyDef name="cyr">
- <Property/>
+ <Property></Property>
<Property name="label">鎵胯繍浜�</Property>
</PropertyDef>
<PropertyDef name="cyrdh">
- <Property/>
+ <Property></Property>
<Property name="label">鎵胯繍浜虹數璇�</Property>
</PropertyDef>
<PropertyDef name="bizId">
@@ -120,7 +120,7 @@
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="bz">
- <Property/>
+ <Property></Property>
<Property name="label">澶囨敞</Property>
</PropertyDef>
</DataType>
@@ -129,7 +129,7 @@
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">whjlApi1214PR#listData</Property>
+ <Property name="dataProvider">whjlApi1212PR#listData</Property>
</DataSet>
<Container layout="regionPadding:10" layoutConstraint="top">
<Property name="exClassName">bg-color</Property>
@@ -459,7 +459,7 @@
<Tools/>
</Dialog>
<UpdateAction id="updateSave">
- <Property name="dataResolver">whjlApi1214PR#saveData</Property>
+ <Property name="dataResolver">whjlApi1212PR#saveData</Property>
<UpdateItem>
<Property name="dataPath">[#current]</Property>
<Property name="dataSet">dsMain</Property>
@@ -467,10 +467,10 @@
</UpdateAction>
<AjaxAction id="ajaxDel">
<Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
- <Property name="service">whjlApi1214PR#delData</Property>
+ <Property name="service">whjlApi1212PR#delData</Property>
</AjaxAction>
<AjaxAction id="ajaxPush">
- <Property name="service">whjlApi1214PR#pushData</Property>
+ <Property name="service">whjlApi1212PR#pushData</Property>
</AjaxAction>
<Dialog id="dialogLog">
<Property name="width">90%</Property>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java b/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
index 750c1b8..35723f7 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
@@ -83,6 +83,10 @@
*/
public static String API_CODE_1114 = "1114";
/**
+ * 鎺ュ彛缂栫爜-1114 浠撳偍璁惧鎶ュ簾璁板綍鏁版嵁鎺ュ彛
+ */
+ public static String API_CODE_1115 = "1115";
+ /**
* 鎺ュ彛缂栫爜-1201 鍓渚涘簲鍟嗕俊鎭暟鎹帴鍙�
*/
public static String API_CODE_1201 = "1201";
@@ -131,10 +135,19 @@
*/
public static String API_CODE_1212 = "1212";
/**
+ * 鎺ュ彛缂栫爜-1212 鍑哄叆搴撶粨绠楄褰曟嵁鎺ュ彛
+ */
+ public static String API_CODE_1213 = "1213";
+ /**
+ * /**
* 鎺ュ彛缂栫爜-1214 鍑哄叆搴撹褰曟暟鎹帴鍙�
*/
public static String API_CODE_1214 = "1214";
/**
+ * 鎺ュ彛缂栫爜-1214 鏍峰搧鐧昏淇℃伅鏁版嵁鎺ュ彛
+ */
+ public static String API_CODE_1215 = "1215";
+ /**
* 鎺ュ彛缂栫爜-1216 璐ㄦ鎶ュ憡鏁版嵁鎺ュ彛
*/
public static String API_CODE_1216 = "1216";
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1115.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1115.java
index d881b69..c2550d5 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1115.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1115.java
@@ -39,4 +39,14 @@
private String sm; //璇存槑
private String bz; //澶囨敞
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ @JSONField(serialize = false)
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
+
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1205.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1205.java
new file mode 100644
index 0000000..f520b98
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1205.java
@@ -0,0 +1,65 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author: YYC
+ * @Description:璁㈠崟淇℃伅
+ * @DateTime: 2023-10-29 20:57
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlApi1205 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private String ddid ;//璁㈠崟ID
+ private String ddbh ;//璁㈠崟缂栧彿
+ private String jhid ;//璁″垝id
+ private String jlqybh ;//鍐涚伯浼佷笟缂栧彿
+ private String ssqymc ;//鍐涚伯浼佷笟鍚嶇О
+ private String jgzdbh ;//鍐涗緵绔欑偣缂栧彿
+ private String jgzdmc ;//鍐涗緵绔欑偣鍚嶇О
+ private String ddlx ;//璁㈠崟绫诲瀷
+ @JSONField(format = "yyyy-MM-dd")
+ private Date grxsrq ;//璐叆/閿�鍞棩鏈�
+ private String jljgqybh ;//渚涘簲鍟嗕紒涓氱紪鍙�
+ private String khbh ;//瀹㈡埛缂栧彿
+ private String sjjlpzbh ;//瀹為檯鍐涚伯鍝佺缂栧彿
+ private String sjjlppbh ;//瀹為檯鍐涚伯鍝佺墝缂栧彿
+ private String jlcpbh ;//鍐涚伯浜у搧缂栧彿
+ private String cpmc ;//浜у搧鍚嶇О
+ private String sjjldjbh ;//瀹為檯鍐涚伯绛夌骇缂栧彿
+ private Double sjjlsl ;//瀹為檯鍐涚伯鏁伴噺
+ private Double sjjlzl ;//瀹為檯鍐涚伯閲嶉噺
+ private Double sjdj ;//瀹為檯鍗曚环
+ private Double sjzj ;//瀹為檯鎬讳环
+ private String zljybhbh ;//璐ㄩ噺妫�楠屾姤鍛婄紪鍙�
+ private String chfs ;//鍑鸿揣鏂瑰紡
+ private String shdz ;//鏀惰揣鍦板潃
+ private String lxdh ;//鑱旂郴鐢佃瘽
+ private String lxr ;//鑱旂郴浜�
+ @JSONField(format = "yyyy-MM-dd")
+ private Date ddjhrq ;//浜よ揣鏃ユ湡
+ private String xh ;//搴忓彿
+ private String sfyx ;//鏄惁鏈夋晥
+ private String bz ;//澶囨敞
+
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ @JSONField(serialize = false)
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java
new file mode 100644
index 0000000..b19fd89
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java
@@ -0,0 +1,70 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 缁忚惀绠＄悊-鍚堝悓淇℃伅
+ *
+ * @author czt
+ * @date 2023/8/2 20:10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlApi1206 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+
+ private String htid; //鍚堝悓ID
+ private String jlqybh; //鍐涚伯浼佷笟缂栧彿
+ private String ssqymc; //鍐涚伯浼佷笟鍚嶇О
+ private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
+ private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
+ private String htlx; //鍚堝悓绫诲瀷
+ private String htbh; //鍚堝悓缂栧彿
+ private String htbt; //鍚堝悓鏍囬
+ private String jljgqybh; //鍔犲伐浼佷笟缂栧彿
+ private String jljgqymc; //鍔犲伐浼佷笟鍚嶇О
+ private String htkhbh; //鍚堝悓瀹㈡埛缂栧彿
+ private String htkhmc; //鍚堝悓瀹㈡埛鍚嶇О
+ private Double htspdj; //鍚堝悓鍟嗗搧鍗曚环
+ private Double htspsl; //鍚堝悓鍟嗗搧鏁伴噺
+ private String spbm; //鍟嗗搧缂栫爜
+ private Double zje; //鎬婚噾棰�
+ private String htqdr; //鍚堝悓绛捐浜�
+ private Date htqdsj; //鍚堝悓绛捐鏃堕棿
+ private Date htsxrq; //鍚堝悓鐢熸晥鏃ユ湡
+ private Date htjzrq; //鍚堝悓鎴鏃堕棿
+ private String htcjr; //鍚堝悓鍒涘缓浜�
+ private Date htcjsj; //鍚堝悓鍒涘缓鏃堕棿
+ private String htdbgjlbz; //鍚堝悓鐨勫彉鏇磋褰曟爣蹇�
+ private String htbgyy; //鍚堝悓鍙樻洿鍘熷洜
+ private String htgylx; //鍚堝悓渚涘簲绫诲瀷
+ private String yhtbh; //鍘熷悎鍚岀紪鍙�
+ private String zffs; //鏀粯鏂瑰紡
+ private Double ywcsl; //宸插畬鎴愭暟閲�
+ private Double ywcslje; //宸插畬鎴愭暟閲忛噾棰�
+ private String htbz; //鍚堝悓澶囨敞
+ private Integer xh; //搴忓彿
+ private String sfyx; //鏄惁鏈夋晥
+ private String bz; //澶囨敞
+ private List<WhjlQDItem> htspqd; //鍟嗗搧娓呭崟
+
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ @JSONField(serialize = false)
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java
index a5aa22c..84014bb 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java
@@ -6,13 +6,12 @@
import java.io.Serializable;
import java.util.Date;
-import java.util.List;
/**
- * 缁忚惀绠＄悊-鍚堝悓淇℃伅
+ * 鍑哄叆搴撲笟鍔�-搴撳瓨鍙拌处
*
* @author czt
- * @date 2023/8/2 20:10
+ * @date 2023/8/2 20:15
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -22,41 +21,48 @@
*/
private static final long serialVersionUID = 1L;
-
- private String htid; //鍚堝悓ID
+ private String kctzbh; //搴撳瓨鍙板笎ID
private String jlqybh; //鍐涚伯浼佷笟缂栧彿
private String ssqymc; //鍐涚伯浼佷笟鍚嶇О
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
- private String htlx; //鍚堝悓绫诲瀷
- private String htbh; //鍚堝悓缂栧彿
- private String htbt; //鍚堝悓鏍囬
- private String jljgqybh; //鍔犲伐浼佷笟缂栧彿
- private String jljgqymc; //鍔犲伐浼佷笟鍚嶇О
- private String htkhbh; //鍚堝悓瀹㈡埛缂栧彿
- private String htkhmc; //鍚堝悓瀹㈡埛鍚嶇О
- private Double htspdj; //鍚堝悓鍟嗗搧鍗曚环
- private Double htspsl; //鍚堝悓鍟嗗搧鏁伴噺
- private String spbm; //鍟嗗搧缂栫爜
- private Double zje; //鎬婚噾棰�
- private String htqdr; //鍚堝悓绛捐浜�
- private Date htqdsj; //鍚堝悓绛捐鏃堕棿
- private Date htsxrq; //鍚堝悓鐢熸晥鏃ユ湡
- private Date htjzrq; //鍚堝悓鎴鏃堕棿
- private String htcjr; //鍚堝悓鍒涘缓浜�
- private Date htcjsj; //鍚堝悓鍒涘缓鏃堕棿
- private String htdbgjlbz; //鍚堝悓鐨勫彉鏇磋褰曟爣蹇�
- private String htbgyy; //鍚堝悓鍙樻洿鍘熷洜
- private String htgylx; //鍚堝悓渚涘簲绫诲瀷
- private String yhtbh; //鍘熷悎鍚岀紪鍙�
- private String zffs; //鏀粯鏂瑰紡
- private Double ywcsl; //宸插畬鎴愭暟閲�
- private Double ywcslje; //宸插畬鎴愭暟閲忛噾棰�
- private String htbz; //鍚堝悓澶囨敞
- private Integer xh; //搴忓彿
- private String sfyx; //鏄惁鏈夋晥
+ private String cfbh; //浠撴埧缂栧彿
+ private String cfmc; //浠撴埧鍚嶇О
+ private String ajbh; //寤掗棿缂栧彿
+ private String ajmc; //寤掗棿鍚嶇О
+ private String hwbh; //璐т綅缂栧彿
+ private String hwmc; //璐т綅鍚嶇О
+ private String lspzbm; //鍝佺缂栧彿
+ private String lspzmc; //鍝佺鍚嶇О
+ private String cpbm; //浜у搧缂栧彿
+ private String cpmc; //浜у搧鍚嶇О
+ private String lqdw; //绮潈鍗曚綅
+ private String bgms; //淇濈妯″紡
+ private Double sjsl; //瀹為檯鏁伴噺
+ private String jldwbm; //璁￠噺鍗曚綅缂栫爜
+ private String jldwmc; //璁￠噺鍗曚綅鍚嶇О
+ private String jsdwbm; //璁℃暟鍗曚綅缂栫爜
+ private String jsdwmc; //璁℃暟鍗曚綅鍚嶇О
+ private String clfs; //鍌ㄧ伯鏂瑰紡
+ private String kcsbm; //搴撳瓨璇嗗埆鐮�
+ @JSONField(format = "yyyy-MM-dd")
+ private Date jkrq; //寤哄崱鏃ユ湡
+ private String sfgd; //鏄惁褰掓。
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date gdsj; //褰掓。鏃堕棿
+ private String kczt; //搴撳瓨鐘舵��
+ private Double rksl; //鍏ュ簱鏁伴噺
+ private Double cksl; //鍑哄簱鏁伴噺
+ private Double kcsl; //搴撳瓨鏁伴噺
+ private Double rkzl; //鍏ュ簱閲嶉噺
+ private Double ckzl; //鍑哄簱閲嶉噺
+ private Double kczl; //搴撳瓨閲嶉噺
+ private Double ztsl; //鍦ㄩ�旀暟閲�
+ private Double ztzl; //鍦ㄩ�旈噸閲�
+ private Double zssl; //鍦ㄥ敭鏁伴噺
+ private Double zszl; //鍦ㄥ敭閲嶉噺
+ private int sxh; //椤哄簭鍙�
private String bz; //澶囨敞
- private List<WhjlQDItem> htspqd; //鍟嗗搧娓呭崟
//鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
@JSONField(serialize = false)
@@ -67,4 +73,5 @@
private String czbz; //鎿嶄綔鏍囧織
@JSONField(serialize = false)
private String kqdm; //搴撳尯浠ｇ爜
+
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java
index ae3d6ff..472d74f 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java
@@ -1,15 +1,17 @@
package com.fzzy.otherview.whhpjl.dto;
+import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.util.Date;
/**
- * 鍑哄叆搴撲笟鍔�-搴撳瓨鍙拌处
+ * 鍑哄叆搴撲笟鍔�-搴撳瓨鍙拌处浜у搧鎵规
*
* @author czt
- * @date 2023/8/2 20:15
+ * @date 2023/8/2 20:25
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -19,45 +21,58 @@
*/
private static final long serialVersionUID = 1L;
+ private String kctzcppcid; //搴撳瓨鍙颁骇鍝佹壒娆D
private String kctzbh; //搴撳瓨鍙板笎ID
private String jlqybh; //鍐涚伯浼佷笟缂栧彿
private String ssqymc; //鍐涚伯浼佷笟鍚嶇О
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
- private String cfbh; //浠撴埧缂栧彿
- private String cfmc; //浠撴埧鍚嶇О
- private String ajbh; //寤掗棿缂栧彿
- private String ajmc; //寤掗棿鍚嶇О
- private String hwbh; //璐т綅缂栧彿
- private String hwmc; //璐т綅鍚嶇О
- private String lspzbm; //鍝佺缂栧彿
- private String lspzmc; //鍝佺鍚嶇О
private String cpbm; //浜у搧缂栧彿
private String cpmc; //浜у搧鍚嶇О
- private String lqdw; //绮潈鍗曚綅
- private String bgms; //淇濈妯″紡
- private String sjsl; //瀹為檯鏁伴噺
+ private String cpnd; //浜у搧骞村害
+ private String cpcd; //浜у搧浜у湴
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date yssj; //楠屾敹鏃堕棿
+ private String cppc; //浜у搧鎵规
+ @JSONField(format = "yyyy-MM-dd")
+ private Date scrq; //鐢熶骇鏃ユ湡
+ private Double bzq; //淇濊川鏈�
+ @JSONField(format = "yyyy-MM-dd")
+ private Date bzjzrq; //淇濊川鎴鏃ユ湡
+ private Double rksl; //鍏ュ簱鏁伴噺
+ private Double cksl; //鍑哄簱鏁伴噺
+ private Double kcsl; //搴撳瓨鏁伴噺
+ private Double rkzl; //鍏ュ簱閲嶉噺
+ private Double ckzl; //鍑哄簱閲嶉噺
+ private Double kczl; //搴撳瓨閲嶉噺
+ private Double dj; //鍗曚环
+ private Double je; //閲戦
private String jldwbm; //璁￠噺鍗曚綅缂栫爜
private String jldwmc; //璁￠噺鍗曚綅鍚嶇О
private String jsdwbm; //璁℃暟鍗曚綅缂栫爜
private String jsdwmc; //璁℃暟鍗曚綅鍚嶇О
- private String clfs; //鍌ㄧ伯鏂瑰紡
- private String kcsbm; //搴撳瓨璇嗗埆鐮�
- private String jkrq; //寤哄崱鏃ユ湡
- private String sfgd; //鏄惁褰掓。
- private String gdsj; //褰掓。鏃堕棿
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date rkkssj; //鍏ュ簱寮�濮嬫椂闂�
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date rkjssj; //鍏ュ簱缁撴潫鏃堕棿
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date ckkssj; //鍑哄簱寮�濮嬫椂闂�
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date ckjssj; //鍑哄簱缁撴潫鏃堕棿
+ private Double sjsl; //瀹為檯鏁伴噺
+ private String zlzt; //璐ㄩ噺鐘舵��
private String kczt; //搴撳瓨鐘舵��
- private String rksl; //鍏ュ簱鏁伴噺
- private String cksl; //鍑哄簱鏁伴噺
- private String kcsl; //搴撳瓨鏁伴噺
- private String rkzl; //鍏ュ簱閲嶉噺
- private String ckzl; //鍑哄簱閲嶉噺
- private String kczl; //搴撳瓨閲嶉噺
- private String ztsl; //鍦ㄩ�旀暟閲�
- private String ztzl; //鍦ㄩ�旈噸閲�
- private String zssl; //鍦ㄥ敭鏁伴噺
- private String zszl; //鍦ㄥ敭鏁伴噺
- private String sxh; //椤哄簭鍙�
+ private int sxh; //椤哄簭鍙�
private String bz; //澶囨敞
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ @JSONField(serialize = false)
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
+
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java
index 29963d7..dcbec6a 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java
@@ -1,15 +1,17 @@
package com.fzzy.otherview.whhpjl.dto;
+import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.util.Date;
/**
- * 鍑哄叆搴撲笟鍔�-搴撳瓨鍙拌处浜у搧鎵规
+ * 鍑哄叆搴撲笟鍔�-搴撳瓨鍙拌处鍑哄叆搴撹褰�
*
* @author czt
- * @date 2023/8/2 20:25
+ * @date 2023/8/2 20:35
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -19,41 +21,31 @@
*/
private static final long serialVersionUID = 1L;
- private String kctzcppcid; //搴撳瓨鍙颁骇鍝佹壒娆D
- private String kctzbh; //搴撳瓨鍙板笎ID
+ private String kctzcpcrjlid; //搴撳瓨鍙拌处鍑哄叆璁板綍ID
+ private String kctzcppcid; //搴撳瓨鍙拌处浜у搧鎵规ID
private String jlqybh; //鍐涚伯浼佷笟缂栧彿
private String ssqymc; //鍐涚伯浼佷笟鍚嶇О
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
- private String cpbm; //浜у搧缂栧彿
- private String cpmc; //浜у搧鍚嶇О
- private String cpnd; //浜у搧骞村害
- private String cpcd; //浜у搧浜у湴
- private String yssj; //楠屾敹鏃堕棿
- private String cppc; //浜у搧鎵规
- private String scrq; //鐢熶骇鏃ユ湡
- private String bzq; //淇濊川鏈�
- private String bzjzrq; //淇濊川鎴鏃ユ湡
- private String rksl; //鍏ュ簱鏁伴噺
- private String cksl; //鍑哄簱鏁伴噺
- private String kcsl; //搴撳瓨鏁伴噺
- private String rkzl; //鍏ュ簱閲嶉噺
- private String ckzl; //鍑哄簱閲嶉噺
- private String kczl; //搴撳瓨閲嶉噺
- private String dj; //鍗曚环
- private String je; //閲戦
- private String jldwbm; //璁￠噺鍗曚綅缂栫爜
- private String jldwmc; //璁￠噺鍗曚綅鍚嶇О
- private String jsdwbm; //璁℃暟鍗曚綅缂栫爜
- private String jsdwmc; //璁℃暟鍗曚綅鍚嶇О
- private String rkkssj; //鍏ュ簱寮�濮嬫椂闂�
- private String rkjssj; //鍏ュ簱缁撴潫鏃堕棿
- private String ckkssj; //鍑哄簱寮�濮嬫椂闂�
- private String ckjssj; //鍑哄簱缁撴潫鏃堕棿
- private String sjsl; //瀹為檯鏁伴噺
- private String zlzt; //璐ㄩ噺鐘舵��
- private String kczt; //搴撳瓨鐘舵��
- private String sxh; //椤哄簭鍙�
- private String bz; //澶囨敞
+ private String crlx; //鍑哄叆绫诲瀷
+ private String jllx; //璁板綍绫诲瀷
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private String jlsj; //璁板綍鏃堕棿
+ private Double crqsl; //鍑哄叆搴撳墠鏁伴噺
+ private Double crqzl; //鍑哄叆搴撳墠閲嶉噺
+ private Double crsl; //鍑哄叆鏁伴噺
+ private Double crzl; //鍑哄叆閲嶉噺
+ private Double crhsl; //鍑哄叆搴撳悗鏁伴噺
+ private Double crhzl; //鍑哄叆搴撳悗閲嶉噺
+
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ @JSONField(serialize = false)
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java
index b859283..c1863c3 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java
@@ -1,38 +1,49 @@
package com.fzzy.otherview.whhpjl.dto;
+import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
/**
- * 鍑哄叆搴撲笟鍔�-搴撳瓨鍙拌处鍑哄叆搴撹褰�
- *
- * @author czt
- * @date 2023/8/2 20:35
- */
+ * @Author: YYC
+ * @Description:搴撳瓨鐩樼偣璁板綍
+ * @DateTime: 2023-10-29 21:11
+ **/
@Data
@EqualsAndHashCode(callSuper = false)
public class WhjlApi1210 implements Serializable {
+
/**
*
*/
private static final long serialVersionUID = 1L;
- private String kctzcpcrjlid; //搴撳瓨鍙拌处鍑哄叆璁板綍ID
- private String kctzcppcid; //搴撳瓨鍙拌处浜у搧鎵规ID
- private String jlqybh; //鍐涚伯浼佷笟缂栧彿
- private String ssqymc; //鍐涚伯浼佷笟鍚嶇О
- private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
- private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
- private String crlx; //鍑哄叆绫诲瀷
- private String jllx; //璁板綍绫诲瀷
- private String jlsj; //璁板綍鏃堕棿
- private String crqsl; //鍑哄叆搴撳墠鏁伴噺
- private String crqzl; //鍑哄叆搴撳墠閲嶉噺
- private String crsl; //鍑哄叆鏁伴噺
- private String crzl; //鍑哄叆閲嶉噺
- private String crhsl; //鍑哄叆搴撳悗鏁伴噺
- private String crhzl; //鍑哄叆搴撳悗閲嶉噺
+ private String kcpdjlid; //搴撳瓨鐩樼偣璁板綍ID
+ private String jlqybh; //鍐涚伯浼佷笟缂栧彿
+ private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
+ private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
+ private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
+ private String ajbh; //寤掗棿缂栧彿
+ private String ajmc; //寤掗棿鍚嶇О
+ @JSONField(format = "yyyy-MM-dd")
+ private Date pdrq; //鐩樼偣鏃ユ湡
+ private String pdkj; //鐩樼偣浼氳
+ private String bgy; //淇濈鍛�
+ private String fzr; //璐熻矗浜�
+ private String sfyx; //鏄惁鏈夋晥
-}
\ No newline at end of file
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ @JSONField(serialize = false)
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
+
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1211.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1211.java
new file mode 100644
index 0000000..7c58b2e
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1211.java
@@ -0,0 +1,53 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author: YYC
+ * @Description:搴撳唴杞粨璁板綍
+ * @DateTime: 2023-10-29 21:55
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlApi1211 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private String kcpdjlid;//搴撳瓨杞粨璁板綍ID
+ private String jlqybh;//鍐涚伯浼佷笟缂栧彿
+ private String ssqymc;//鍐涚伯浼佷笟鍚嶇О
+ private String jgzdbh;//鍐涗緵绔欑偣缂栧彿
+ private String jgzdmc;//鍐涗緵绔欑偣鍚嶇О
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date zcsj;//杞粨鏃堕棿
+ private String zcajbh;//杞嚭寤掗棿缂栧彿
+ private String zccfmc;//杞嚭寤掗棿鍚嶇О
+ private String zrajbh;//杞叆寤掗棿缂栧彿
+ private String zrajmc;//杞叆寤掗棿鍚嶇О
+ private String zckctzbh;//杞嚭搴撳瓨鍙板笎缂栧彿
+ private String zrkctzbh;//杞叆搴撳瓨鍙板笎缂栧彿
+ private Double zczsl;//杞粨鎬绘暟閲�
+ private Double zczzl;//杞粨鎬婚噸閲�
+ private List<WhjlZCMX> zcmx;//杞粨鏄庣粏
+
+
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ @JSONField(serialize = false)
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
+
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java
new file mode 100644
index 0000000..1dba195
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java
@@ -0,0 +1,121 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鍑哄叆搴撲笟鍔�-鍑哄叆搴撹褰�
+ *
+ * @author czt
+ * @date 2023/8/2 20:40
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlApi1212 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private String crkid; //鍑哄叆搴撹褰昳d
+ private String jlqybh; //鍐涚伯浼佷笟缂栧彿
+ private String ssqymc; //鍐涚伯浼佷笟鍚嶇О
+ private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
+ private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
+ @JSONField(format = "yyyy-MM-dd")
+ private Date ywrq; //涓氬姟鏃ユ湡
+ private String crklx; //鍑哄叆搴撶被鍨�
+ private String ywlx; //涓氬姟绫诲瀷
+ private String crkpz; //鍑哄叆搴撳嚟璇�
+ private String jljgqybh; //鍔犲伐浼佷笟缂栧彿
+ private String jljgqymc; //鍔犲伐浼佷笟鍚嶇О
+ private String khbh; //瀹㈡埛缂栧彿
+ private String glzxm; //瀹㈡埛濮撳悕
+ private String shdw; //鏀惰揣鍗曚綅
+ private String shlxr; //鏀惰揣鑱旂郴浜�
+ private String shlxrdh; //鏀惰揣鑱旂郴鐢佃瘽
+ private String rjfaid; //搴旀�ユ柟妗坕d
+ private String jhid; //绛规帾璁″垝ID
+ private String htid; //鍚堝悓ID
+ private String psrwid; //閰嶉�佷换鍔d
+ private String yscch; //杩愯緭杞﹁埞鍙�
+ private String cyr; //鎵胯繍浜�
+ private String cyrdh; //鎵胯繍浜虹數璇�
+ private String bz; //澶囨敞
+ private List<WhjlInoutDel> crkmx; //鍑哄叆搴撴槑缁�
+ private List<WhjlCheck> zjbgwj; //璐ㄦ鎶ュ憡鏂囦欢
+
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ @JSONField(serialize = false)
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
+
+ private String crkmxid; //鍑哄叆搴撴槑缁咺D
+ private String ajbh; //寤掗棿缂栧彿
+ private String cfmc; //寤掗棿鍚嶇О
+ private String hwbh; //璐т綅缂栧彿
+ private String hwmc; //璐т綅鍚嶇О
+ private String kctzbh; //搴撳瓨鍙板笎ID
+ private String kctzcppcid; //搴撳瓨鍙板笎浜у搧鎵规ID
+ private String psmxid; //閰嶉�佽溅杈嗘槑缁咺D
+ private String yjfamxid; //搴旀�ユ柟妗堟槑缁咺D
+ private String lspzbm; //鍝佺缂栧彿
+ private String lspzmc; //鍝佺鍚嶇О
+ private String cpbh; //浜у搧缂栧彿
+ private String cpmc; //浜у搧鍚嶇О
+ private String jldwbm; //璁￠噺鍗曚綅缂栫爜
+ private String jldwmc; //璁￠噺鍗曚綅鍚嶇О
+ private String jsdwbm; //璁℃暟鍗曚綅缂栫爜
+ private String jsdwmc; //璁℃暟鍗曚綅鍚嶇О
+ private String crlx; //鍑哄簱绫诲瀷
+ private Double crksl; //鍑哄叆搴撴暟閲�
+ private Double crkzl; //鍑哄叆搴撻噸閲�
+ private Double qcsl; //鏈熷垵鏁伴噺
+ private Double qmsl; //鏈熸湯鏁伴噺
+ private Double qczl; //鏈熷垵閲嶉噺
+ private Double qmzl; //鏈熸湭閲嶉噺
+ private Double shsl; //鎹熻�楁暟閲�
+ private Double shzl; //鎹熻�楅噸閲�
+ private String ysyq; //楠屾敹瑕佹眰
+ private String sfhx; //鏄惁鏍搁攢
+ private String qkxm; //娆犳椤圭洰
+ private Double dj; //鍗曚环
+ private Double je; //閲戦
+ private String dj1; //绛夌骇
+ private String cd; //浜у湴
+ private String sccj; //鐢熶骇鍘傚
+ private String gg; //瑙勬牸鍨嬪彿
+ private String cppc; //浜у搧鎵规
+ @JSONField(format = "yyyy-MM-dd")
+ private Date scrq; //鐢熶骇鏃ユ湡
+ private Double bzq; //淇濊川鏈�
+ @JSONField(format = "yyyy-MM-dd")
+ private String bzqjzrq; //淇濊川鏈熸埅鑷虫棩鏈�
+ private String bgy; //淇濈鍛�
+ private String ckfs; //鍑哄簱鏂瑰紡
+ private String djsj; //鐧昏鏃堕棿
+ private String zz; //绔欓暱
+ private String jjy; //璐ㄦ鍛�
+ private String sxh; //椤哄簭鍙�
+// private String bz; //澶囨敞
+
+ private String jybgwjid; //妫�楠屾姤鍛婃枃浠秈d
+ @JSONField(format = "yyyy-MM-dd")
+ private Date jyrq; //妫�楠屾棩鏈�
+ private String jylx; //妫�楠岀被鍨�
+ private String wjlx; //鏂囦欢绫诲瀷
+ private String wjm; //鏂囦欢鍚�
+ private String wjlj; //鏂囦欢璺緞
+ private String wjdx; //鏂囦欢澶у皬
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1213.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1213.java
new file mode 100644
index 0000000..9d4148a
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1213.java
@@ -0,0 +1,59 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author: YYC
+ * @Description:鍑哄叆搴撶粨绠楄褰�
+ * @DateTime: 2023-10-29 22:06
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlApi1213 implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private String rkfkjlid;//鍏ュ簱缁撶畻璁板綍ID
+ private String crkid;//鍑哄叆搴撹褰昳d
+ private String jlqybh;//鍐涚伯浼佷笟缂栧彿
+ private String jlqymc;//鍐涚伯浼佷笟鍚嶇О
+ private String jgzdbh;//鍐涗緵绔欑偣缂栧彿
+ private String jgzdmc;//鍐涗緵绔欑偣鍚嶇О
+ private String jljgqybh;//鍔犲伐浼佷笟缂栧彿
+ private String jljgqymc;//鍔犲伐浼佷笟鍚嶇О
+ private String khbh;//瀹㈡埛缂栧彿
+ private String glzxm;//瀹㈡埛濮撳悕
+ private String crklx;//鍑哄叆搴撶被鍨�
+ private String jslx;//缁撶畻绫诲瀷
+ @JSONField(format = "yyyy-MM-dd")
+ private Date jsrq;//缁撶畻鏃ユ湡
+ private String jszt;//缁撶畻鐘舵��
+ private Double je;//閲戦
+ private String skr;//鏀舵浜�
+ private String skrsfzh;//鏀舵浜鸿韩浠借瘉鍙�
+ private String skrdh;//鏀舵浜虹數璇�
+ private String khh;//寮�鎴疯
+ private String yhkh;//閾惰鍗″彿
+ private String sfyx;//鏄惁鏈夋晥
+ private String bz;//澶囨敞
+ private List<WhjlJSMX> jsmx;//缁撶畻鏄庣粏璁板綍
+
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ @JSONField(serialize = false)
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
+
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java
index 65a23f0..614bf23 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java
@@ -6,47 +6,54 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
- * 鍑哄叆搴撲笟鍔�-鍑哄叆搴撹褰�
- *
- * @author czt
- * @date 2023/8/2 20:40
- */
+ * @Author: YYC
+ * @Description:璐ㄦ鏈烘瀯
+ * @DateTime: 2023-10-29 22:16
+ **/
@Data
@EqualsAndHashCode(callSuper = false)
public class WhjlApi1214 implements Serializable {
+
/**
*
*/
private static final long serialVersionUID = 1L;
- private String crkid; //鍑哄叆搴撹褰昳d
- private String jlqybh; //鍐涚伯浼佷笟缂栧彿
- private String ssqymc; //鍐涚伯浼佷笟鍚嶇О
- private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
- private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
- private Date ywrq; //涓氬姟鏃ユ湡
- private String crklx; //鍑哄叆搴撶被鍨�
- private String ywlx; //涓氬姟绫诲瀷
- private String crkpz; //鍑哄叆搴撳嚟璇�
- private String jljgqybh; //鍔犲伐浼佷笟缂栧彿
- private String jljgqymc; //鍔犲伐浼佷笟鍚嶇О
- private String khbh; //瀹㈡埛缂栧彿
- private String glzxm; //瀹㈡埛濮撳悕
- private String shdw; //鏀惰揣鍗曚綅
- private String shlxr; //鏀惰揣鑱旂郴浜�
- private String shlxrdh; //鏀惰揣鑱旂郴鐢佃瘽
- private String rjfaid; //搴旀�ユ柟妗坕d
- private String jhid; //绛规帾璁″垝ID
- private String htid; //鍚堝悓ID
- private String psrwid; //閰嶉�佷换鍔d
- private String yscch; //杩愯緭杞﹁埞鍙�
- private String cyr; //鎵胯繍浜�
- private String cyrdh; //鎵胯繍浜虹數璇�
- private String bz; //澶囨敞
- private String crkmx; //鍑哄叆搴撴槑缁�
- private String zjbgwj; //璐ㄦ鎶ュ憡鏂囦欢
+
+ private String zjjgbm;//璐ㄦ鏈烘瀯缂栧彿
+ private String zjjgmc;//璐ㄦ鏈烘瀯鍚嶇О
+ private String zjjgjc;//璐ㄦ鏈烘瀯绠�绉�
+ private String zjjgssly;//璐ㄦ鏈烘瀯鎵�灞為鍩�
+ private String zjjgssdq;//璐ㄦ鏈烘瀯鎵�灞炲湴鍖�
+ private String xzqhbm;//琛屾斂鍖哄垝缂栫爜
+ private String xzqhmc;//琛屾斂鍖哄垝鍚嶇О
+ private String sysfr;//璐ㄦ鏈烘瀯娉曚汉
+ private String dh;//鑱旂郴鐢佃瘽
+ private String cz;//浼犵湡
+ private String dzyx;//鐢靛瓙閭
+ private String dz;//鍦板潃
+ private String yb;//閭紪
+ private String lxr;//鑱旂郴浜�
+ private String zgbm;//涓荤閮ㄩ棬
+ private String zjjgjb;//璐ㄦ鏈烘瀯绾у埆
+ private int zcygs;//鍦ㄥ唽鍛樺伐鏁�
+ private int gjzcrs;//楂樼骇鑱岀О浜烘暟
+ private int zjzcrs;//涓骇鑱岀О浜烘暟
+ private int cjzcrs;//鍒濈骇鑱岀О浜烘暟
+ private int bs;//鍗氬＋浜烘暟
+ private int ss;//纭曞＋浜烘暟
+ private int xs;//瀛﹀＋浜烘暟
+ private int dzsyx;//澶т笓鐢熶互涓�
+ private Double zgdzc;//鎬诲浐瀹氳祫浜�
+ private Double mj;//闈㈢Н
+ private String zcxz;//璧勪骇鎬ц川
+ private int csspjcdrs;//浠庝簨椋熷搧妫�娴嬬殑浜烘暟
+ private String bz;//澶囨敞
+ private List<WhjlJCNL> jcnl;//妫�娴嬭兘鍔�
+ private List<WhjlYQSB> yqsb;//浠櫒璁惧
//鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
@JSONField(serialize = false)
@@ -57,60 +64,4 @@
private String czbz; //鎿嶄綔鏍囧織
@JSONField(serialize = false)
private String kqdm; //搴撳尯浠ｇ爜
-
- private String crkmxid; //鍑哄叆搴撴槑缁咺D
- private String ajbh; //寤掗棿缂栧彿
- private String cfmc; //寤掗棿鍚嶇О
- private String hwbh; //璐т綅缂栧彿
- private String hwmc; //璐т綅鍚嶇О
- private String kctzbh; //搴撳瓨鍙板笎ID
- private String kctzcppcid; //搴撳瓨鍙板笎浜у搧鎵规ID
- private String psmxid; //閰嶉�佽溅杈嗘槑缁咺D
- private String yjfamxid; //搴旀�ユ柟妗堟槑缁咺D
- private String lspzbm; //鍝佺缂栧彿
- private String lspzmc; //鍝佺鍚嶇О
- private String cpbh; //浜у搧缂栧彿
- private String cpmc; //浜у搧鍚嶇О
- private String jldwbm; //璁￠噺鍗曚綅缂栫爜
- private String jldwmc; //璁￠噺鍗曚綅鍚嶇О
- private String jsdwbm; //璁℃暟鍗曚綅缂栫爜
- private String jsdwmc; //璁℃暟鍗曚綅鍚嶇О
- private String crlx; //鍑哄簱绫诲瀷
- private String crksl; //鍑哄叆搴撴暟閲�
- private String crkzl; //鍑哄叆搴撻噸閲�
- private String qcsl; //鏈熷垵鏁伴噺
- private String qmsl; //鏈熸湯鏁伴噺
- private String qczl; //鏈熷垵閲嶉噺
- private String qmzl; //鏈熸湭閲嶉噺
- private String shsl; //鎹熻�楁暟閲�
- private String shzl; //鎹熻�楅噸閲�
- private String ysyq; //楠屾敹瑕佹眰
- private String sfhx; //鏄惁鏍搁攢
- private String qkxm; //娆犳椤圭洰
- private String dj; //鍗曚环
- private String je; //閲戦
- // private String dj; //绛夌骇
- private String cd; //浜у湴
- private String sccj; //鐢熶骇鍘傚
- private String gg; //瑙勬牸鍨嬪彿
- private String cppc; //浜у搧鎵规
- private String scrq; //鐢熶骇鏃ユ湡
- private String bzq; //淇濊川鏈�
- private String bzqjzrq; //淇濊川鏈熸埅鑷虫棩鏈�
- private String bgy; //淇濈鍛�
- private String ckfs; //鍑哄簱鏂瑰紡
- private String djsj; //鐧昏鏃堕棿
- private String zz; //绔欓暱
- private String jjy; //璐ㄦ鍛�
- private String sxh; //椤哄簭鍙�
-// private String bz; //澶囨敞
-
- private String jybgwjid; //妫�楠屾姤鍛婃枃浠秈d
- private String jyrq; //妫�楠屾棩鏈�
- private String jylx; //妫�楠岀被鍨�
- private String wjlx; //鏂囦欢绫诲瀷
- private String wjm; //鏂囦欢鍚�
- private String wjlj; //鏂囦欢璺緞
- private String wjdx; //鏂囦欢澶у皬
-
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1215.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1215.java
new file mode 100644
index 0000000..4bc2d7c
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1215.java
@@ -0,0 +1,58 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author: YYC
+ * @Description:鏍峰搧鐧昏淇℃伅
+ * @DateTime: 2023-10-29 22:31
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlApi1215 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private String cybh;//鏍峰搧缂栧彿
+ private String jlqybh;//鍐涚伯浼佷笟缂栧彿
+ private String jlqymc;//鍐涚伯浼佷笟鍚嶇О
+ private String jgzdbh;//鍐涗緵绔欑偣缂栧彿
+ private String jgzdmc;//鍐涗緵绔欑偣鍚嶇О
+ private String zjjgbm;//璐ㄦ鏈烘瀯缂栧彿
+ private String zjjgmc;//璐ㄦ鏈烘瀯鍚嶇О
+ private String jljgqybh;//鍔犲伐浼佷笟缂栧彿
+ private String cpmc;//浜у搧鍚嶇О
+ private String cppc;//浜у搧鎵规
+ @JSONField(format = "yyyy-MM-dd")
+ private Date scrq;//鐢熶骇鏃ユ湡
+ private String cysm;//鎶芥牱璇存槑
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date cysj;//鎶芥牱鏃堕棿
+ private String cyr;//鎶芥牱浜�
+ private String cydd;//鎶芥牱鍦扮偣
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date djsj;//鐧昏鏃堕棿
+ private Double cyjs;//鎶芥牱鍩烘暟
+ private Double cysl;//鎶芥牱鏁伴噺
+ private String sfyx;//鏄惁鏈夋晥
+ private String bz;//澶囨敞
+
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ @JSONField(serialize = false)
+ private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
+
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlCheck.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlCheck.java
new file mode 100644
index 0000000..e70e208
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlCheck.java
@@ -0,0 +1,33 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author: YYC
+ * @Description:璐ㄦ鎶ュ憡鏂囦欢
+ * @DateTime: 2023-10-29 21:46
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlCheck implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private String jybgwjid;//妫�楠屾姤鍛婃枃浠秈d
+ @JSONField(format = "yyyy-MM-dd")
+ private Date jyrq;//妫�楠屾棩鏈�
+ private String jylx;//妫�楠岀被鍨�
+ private String wjlx;//鏂囦欢绫诲瀷
+ private String wjm;//鏂囦欢鍚�
+ private String wjlj;//鏂囦欢璺緞
+ private String wjdx;//鏂囦欢澶у皬
+
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlInoutDel.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlInoutDel.java
new file mode 100644
index 0000000..bec0282
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlInoutDel.java
@@ -0,0 +1,73 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author: YYC
+ * @Description:
+ * @DateTime: 2023-10-29 21:30
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlInoutDel implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private String crkmxid;//鍑哄叆搴撴槑缁咺D
+ private String ajbh;//寤掗棿缂栧彿
+ private String ajmc;//寤掗棿鍚嶇О
+ private String hwbh;//璐т綅缂栧彿
+ private String hwmc;//璐т綅鍚嶇О
+ private String kctzbh;//搴撳瓨鍙板笎ID
+ private String kctzcppcid;//搴撳瓨鍙板笎浜у搧鎵规ID
+ private String psmxid;//閰嶉�佽溅杈嗘槑缁咺D
+ private String yjfamxid;//搴旀�ユ柟妗堟槑缁咺D
+ private String lspzbm;//鍝佺缂栧彿
+ private String lspzmc;//鍝佺鍚嶇О
+ private String cpbh;//浜у搧缂栧彿
+ private String cpmc;//浜у搧鍚嶇О
+ private String jldwbm;//璁￠噺鍗曚綅缂栫爜
+ private String jldwmc;//璁￠噺鍗曚綅鍚嶇О
+ private String jsdwbm;//璁℃暟鍗曚綅缂栫爜
+ private String jsdwmc;//璁℃暟鍗曚綅鍚嶇О
+ private String crlx;//鍑哄簱绫诲瀷
+ private Double crksl;//鍑哄叆搴撴暟閲�
+ private Double crkzl;//鍑哄叆搴撻噸閲�
+ private Double qcsl;//鏈熷垵鏁伴噺
+ private Double qmsl;//鏈熸湯鏁伴噺
+ private Double qczl;//鏈熷垵閲嶉噺
+ private Double qmzl;//鏈熸湭閲嶉噺
+ private Double shsl;//鎹熻�楁暟閲�
+ private Double shzl;//鎹熻�楅噸閲�
+ private String ysyq;//楠屾敹瑕佹眰
+ private String sfhx;//鏄惁鏍搁攢
+ private String qkxm;//娆犳椤圭洰
+ private Double dj;//鍗曚环
+ private Double je;//閲戦
+ private String dj1;//绛夌骇
+ private String cd;//浜у湴
+ private String sccj;//鐢熶骇鍘傚
+ private String gg;//瑙勬牸鍨嬪彿
+ private String cppc;//浜у搧鎵规
+ @JSONField(format = "yyyy-MM-dd")
+ private Date scrq;//鐢熶骇鏃ユ湡
+ private Double bzq;//淇濊川鏈�
+ @JSONField(format = "yyyy-MM-dd")
+ private Date bzqjzrq;//淇濊川鏈熸埅鑷虫棩鏈�
+ private String bgy;//淇濈鍛�
+ private String ckfs;//鍑哄簱鏂瑰紡
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private String djsj;//鐧昏鏃堕棿
+ private String zz;//绔欓暱
+ private String jjy;//璐ㄦ鍛�
+ private int sxh;//椤哄簭鍙�
+ private String bz;//澶囨敞
+
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJCNL.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJCNL.java
new file mode 100644
index 0000000..6fb9191
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJCNL.java
@@ -0,0 +1,31 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * @Author: YYC
+ * @Description:妫�娴嬭兘鍔�
+ * @DateTime: 2023-10-29 22:21
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlJCNL implements Serializable {
+
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private String bzbm;//璐ㄦ鏍囧噯缂栫爜
+ private String bzmxbm;//鏍囧噯鏄庣粏缂栫爜
+ private String jcxmdjbm;//妫�娴嬮」鐩瓑绾х紪鐮�
+ private String jcly;//妫�娴嬮鍩�
+ private String xzfw;//闄愬埗鑼冨洿
+ private String zzzmdm;//璧勮川璇佹槑浠ｇ爜
+ private int xh;//搴忓彿
+
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJSMX.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJSMX.java
new file mode 100644
index 0000000..8723ba1
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJSMX.java
@@ -0,0 +1,28 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * @Author: YYC
+ * @Description:缁撶畻鏄庣粏璁板綍
+ * @DateTime: 2023-10-29 22:10
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlJSMX implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private String rkfkjlmxid;
+ private String crkmxid;
+ private String fkpzh;
+ private Double sl;
+ private Double dj;
+ private Double je;
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlYQSB.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlYQSB.java
new file mode 100644
index 0000000..5a0237d
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlYQSB.java
@@ -0,0 +1,30 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * @Author: YYC
+ * @Description:浠櫒璁惧
+ * @DateTime: 2023-10-29 22:24
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlYQSB implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private String yqsbbm;//浠櫒璁惧缂栫爜
+ private String yqsbmc;//浠櫒璁惧鍚嶇О
+ private String ggxh;//瑙勬牸鍨嬪彿
+ private String zzgb;//鍒堕�犲浗鍒�
+ private Double jg;//浠锋牸
+ private String gznf;//璐疆骞翠唤
+ private Double syl;//浣跨敤鐜�
+ private int xh;//搴忓彿
+
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlZCMX.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlZCMX.java
new file mode 100644
index 0000000..c920db3
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlZCMX.java
@@ -0,0 +1,25 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * @Author: YYC
+ * @Description:杞粨鏄庣粏
+ * @DateTime: 2023-10-29 22:56
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlZCMX implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+ private String zcmxid;//杞粨鏄庣粏ID
+ private String zckctzcppcid;//杞嚭搴撳瓨鍙颁骇鍝佹壒娆D
+ private String zrkctzcppcid;//杞叆搴撳瓨鍙颁骇鍝佹壒娆D
+ private String zcsl;//杞粨鏁伴噺
+ private String zczl;//杞粨閲嶉噺
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1115PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1115PR.java
new file mode 100644
index 0000000..45d1946
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1115PR.java
@@ -0,0 +1,198 @@
+package com.fzzy.otherview.whhpjl.pr;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1115;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author: YYC
+ * @Description:浠撳偍璁惧缁翠慨璁板綍
+ * @DateTime: 2023-10-25 14:13
+ **/
+@Component
+public class WhjlApi1115PR {
+
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * WhjlApi1115PR#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public void listData(Page<WhjlApi1115> page, ApiParam param) {
+
+ Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
+
+ Specification specification = new Specification<ApiInfoData>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+ List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), WhjlConstant.API_CODE_1115);
+ predicates.add(predicate);
+ if (null != param) {
+ if (StringUtils.isNotBlank(param.getKqdm())) {
+ Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
+ predicates.add(predicate1);
+ }
+
+ if (StringUtils.isNotBlank(param.getCzbz())) {
+ Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
+ predicates.add(predicate2);
+ }
+ if (null != param.getStart()) {
+ Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
+ predicates.add(predicate3);
+ }
+
+ if (null != param.getEnd()) {
+ Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
+ predicates.add(predicate4);
+ }
+ }
+ return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+ }
+ };
+ org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
+ List<WhjlApi1115> list = new ArrayList<>();
+ WhjlApi1115 whjlApi1115;
+ for (ApiInfoData infoData : japPage.getContent()) {
+ whjlApi1115 = JSONObject.parseObject(infoData.getData(), WhjlApi1115.class);
+ whjlApi1115.setKqdm(infoData.getKqdm());
+ whjlApi1115.setCzbz(infoData.getCzbz());
+ whjlApi1115.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1115.setBizId(infoData.getDataId());
+ list.add(whjlApi1115);
+ }
+ page.setEntities(list);
+
+ }
+
+ /**
+ * 鏇存柊鎴栦慨鏀�
+ * WhjlApi1115PR#saveData
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ public void saveData(WhjlApi1115 data) {
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1115);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ apiInfoDataRep.save(infoData);
+ }
+
+ /**
+ * 鍒犻櫎
+ * WhjlApi1115PR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(WhjlApi1115 data) {
+ apiInfoDataRep.deleteById(data.getBizId());
+ return null;
+ }
+
+ /**
+ * 涓婁紶
+ * WhjlApi1115PR#pushData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pushData(List<WhjlApi1115> items) {
+
+ String result = "";
+
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+
+ if (null == apiConf) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1115);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ ResponseDto responseDto;
+ ApiInfoData infoData;
+ for (WhjlApi1115 data : items) {
+ responseDto = apiService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+ infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1115);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+
+ data.setCzbz(Constant.CZBZ_U);
+ infoData.setCzbz(Constant.CZBZ_U);
+ infoData.setData(JSON.toJSONString(data));
+ apiInfoDataRep.save(infoData);
+ }
+ }
+ result += responseDto.toString();
+ }
+ return result;
+ }
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1205PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1205PR.java
new file mode 100644
index 0000000..0264246
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1205PR.java
@@ -0,0 +1,199 @@
+package com.fzzy.otherview.whhpjl.pr;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1205;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璁㈠崟淇℃伅
+ *
+ * @Author:YAN
+ */
+@Component
+public class WhjlApi1205PR {
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1205PR#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public void listData(Page<WhjlApi1205> page, ApiParam param) {
+
+ Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
+
+ Specification specification = new Specification<ApiInfoData>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+ List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), WhjlConstant.API_CODE_1205);
+ predicates.add(predicate);
+ if (null != param) {
+ if (StringUtils.isNotBlank(param.getKqdm())) {
+ Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
+ predicates.add(predicate1);
+ }
+
+ if (StringUtils.isNotBlank(param.getCzbz())) {
+ Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
+ predicates.add(predicate2);
+ }
+ if (null != param.getStart()) {
+ Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
+ predicates.add(predicate3);
+ }
+
+ if (null != param.getEnd()) {
+ Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
+ predicates.add(predicate4);
+ }
+ }
+ return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+ }
+ };
+ org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
+ List<WhjlApi1205> list = new ArrayList<>();
+ WhjlApi1205 whjlApi1205;
+ for (ApiInfoData infoData : japPage.getContent()) {
+ whjlApi1205 = JSONObject.parseObject(infoData.getData(), WhjlApi1205.class);
+ whjlApi1205.setKqdm(infoData.getKqdm());
+ whjlApi1205.setCzbz(infoData.getCzbz());
+ whjlApi1205.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1205.setBizId(infoData.getDataId());
+ list.add(whjlApi1205);
+ }
+ page.setEntities(list);
+
+ }
+
+ /**
+ * 鏇存柊鎴栦慨鏀�
+ * whjlApi1205PR#saveData
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ public void saveData(WhjlApi1205 data) {
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1205);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ apiInfoDataRep.save(infoData);
+ }
+
+ /**
+ * 鍒犻櫎
+ * whjlApi1205PR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(WhjlApi1205 data) {
+ apiInfoDataRep.deleteById(data.getBizId());
+ return null;
+ }
+
+ /**
+ * 涓婁紶
+ * whjlApi1205PR#pushData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pushData(List<WhjlApi1205> items) {
+
+ String result = "";
+
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+
+ if (null == apiConf) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1205);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ ApiInfoData infoData;
+ ResponseDto responseDto;
+ for (WhjlApi1205 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1205);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+
+ data.setCzbz(Constant.CZBZ_U);
+ infoData.setCzbz(Constant.CZBZ_U);
+ infoData.setData(JSON.toJSONString(data));
+
+ apiInfoDataRep.save(infoData);
+ }
+ }
+ result += responseDto.toString();
+ }
+ return result;
+ }
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1206PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1206PR.java
new file mode 100644
index 0000000..187c528
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1206PR.java
@@ -0,0 +1,225 @@
+package com.fzzy.otherview.whhpjl.pr;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1206;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1206;
+import com.fzzy.otherview.whhpjl.dto.WhjlQDItem;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鍚堝悓淇℃伅
+ *
+ * @Author:YAN
+ */
+@Component
+public class WhjlApi1206PR {
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1207PR#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public void listData(Page<WhjlApi1206> page, ApiParam param) {
+
+ Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
+
+ Specification specification = new Specification<ApiInfoData>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+ List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), WhjlConstant.API_CODE_1206);
+ predicates.add(predicate);
+ if (null != param) {
+ if (StringUtils.isNotBlank(param.getKqdm())) {
+ Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
+ predicates.add(predicate1);
+ }
+
+ if (StringUtils.isNotBlank(param.getCzbz())) {
+ Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
+ predicates.add(predicate2);
+ }
+ if (null != param.getStart()) {
+ Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
+ predicates.add(predicate3);
+ }
+
+ if (null != param.getEnd()) {
+ Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
+ predicates.add(predicate4);
+ }
+ }
+ return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+ }
+ };
+ org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
+ List<WhjlApi1206> list = new ArrayList<>();
+ WhjlApi1206 whjlApi1206;
+ for (ApiInfoData infoData : japPage.getContent()) {
+ whjlApi1206 = JSONObject.parseObject(infoData.getData(), WhjlApi1206.class);
+ whjlApi1206.setKqdm(infoData.getKqdm());
+ whjlApi1206.setCzbz(infoData.getCzbz());
+ whjlApi1206.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1206.setBizId(infoData.getDataId());
+ list.add(whjlApi1206);
+ }
+ page.setEntities(list);
+
+ }
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1207PR#listItem
+ *
+ * @return
+ */
+ @DataProvider
+ public List<WhjlQDItem> listItem(String id) {
+ return null;
+ }
+
+ /**
+ * 鏇存柊鎴栦慨鏀�
+ * whjlApi1207PR#saveData
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ public void saveData(WhjlApi1206 data) {
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1207);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ apiInfoDataRep.save(infoData);
+ }
+
+
+ /**
+ * 鍒犻櫎
+ * whjlApi1207PR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(WhjlApi1206 data) {
+ apiInfoDataRep.deleteById(data.getBizId());
+ return null;
+ }
+
+ /**
+ * 鍒犻櫎鍚堝悓鍟嗗搧娓呭崟
+ * whjlApi1207PR#delItem
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delItem(WhjlQDItem data) {
+ return null;
+ }
+
+ /**
+ * 涓婁紶
+ * whjlApi1207PR#pushData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pushData(List<WhjlApi1206> items) {
+
+ String result = "";
+
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+
+ if (null == apiConf) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1207);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ ApiInfoData infoData;
+ ResponseDto responseDto;
+ for (WhjlApi1206 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1207);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+
+ data.setCzbz(Constant.CZBZ_U);
+ infoData.setCzbz(Constant.CZBZ_U);
+ infoData.setData(JSON.toJSONString(data));
+
+ apiInfoDataRep.save(infoData);
+ }
+ }
+ result += responseDto.toString();
+ }
+ return result;
+ }
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1208PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1208PR.java
new file mode 100644
index 0000000..4370e62
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1208PR.java
@@ -0,0 +1,224 @@
+package com.fzzy.otherview.whhpjl.pr;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1208;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1208;
+import com.fzzy.otherview.whhpjl.dto.WhjlQDItem;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 搴撳瓨鍙拌处浜у搧鎵规
+ *
+ * @Author:YAN
+ */
+@Component
+public class WhjlApi1208PR {
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1208PR#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public void listData(Page<WhjlApi1208> page, ApiParam param) {
+ Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
+
+ Specification specification = new Specification<ApiInfoData>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+ List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), WhjlConstant.API_CODE_1208);
+ predicates.add(predicate);
+ if (null != param) {
+ if (StringUtils.isNotBlank(param.getKqdm())) {
+ Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
+ predicates.add(predicate1);
+ }
+
+ if (StringUtils.isNotBlank(param.getCzbz())) {
+ Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
+ predicates.add(predicate2);
+ }
+ if (null != param.getStart()) {
+ Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
+ predicates.add(predicate3);
+ }
+
+ if (null != param.getEnd()) {
+ Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
+ predicates.add(predicate4);
+ }
+ }
+ return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+ }
+ };
+ org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
+ List<WhjlApi1208> list = new ArrayList<>();
+ WhjlApi1208 whjlApi1208;
+ for (ApiInfoData infoData : japPage.getContent()) {
+ whjlApi1208 = JSONObject.parseObject(infoData.getData(), WhjlApi1208.class);
+ whjlApi1208.setKqdm(infoData.getKqdm());
+ whjlApi1208.setCzbz(infoData.getCzbz());
+ whjlApi1208.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1208.setBizId(infoData.getDataId());
+ list.add(whjlApi1208);
+ }
+ page.setEntities(list);
+
+ }
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1208PR#listItem
+ *
+ * @return
+ */
+ @DataProvider
+ public List<WhjlQDItem> listItem(String id) {
+ return null;
+ }
+
+ /**
+ * 鏇存柊鎴栦慨鏀�
+ * whjlApi1208PR#saveData
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ public void saveData(WhjlApi1208 data) {
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1208);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ apiInfoDataRep.save(infoData);
+ }
+
+
+ /**
+ * 鍒犻櫎
+ * whjlApi1208PR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(WhjlApi1208 data) {
+ apiInfoDataRep.deleteById(data.getBizId());
+ return null;
+ }
+
+ /**
+ * 鍒犻櫎鍚堝悓鍟嗗搧娓呭崟
+ * whjlApi1208PR#delItem
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delItem(WhjlQDItem data) {
+ return null;
+ }
+
+ /**
+ * 涓婁紶
+ * whjlApi1208PR#pushData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pushData(List<WhjlApi1208> items) {
+
+ String result = "";
+
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+
+ if (null == apiConf) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1208);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ ApiInfoData infoData;
+ ResponseDto responseDto;
+ for (WhjlApi1208 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1208);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+
+ data.setCzbz(Constant.CZBZ_U);
+ infoData.setCzbz(Constant.CZBZ_U);
+ infoData.setData(JSON.toJSONString(data));
+
+ apiInfoDataRep.save(infoData);
+ }
+ }
+ result += responseDto.toString();
+ }
+ return result;
+ }
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1209PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1209PR.java
new file mode 100644
index 0000000..fecd8f5
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1209PR.java
@@ -0,0 +1,223 @@
+package com.fzzy.otherview.whhpjl.pr;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1209;
+import com.fzzy.otherview.whhpjl.dto.WhjlQDItem;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 搴撳瓨鍙拌处鍑哄叆璁板綍
+ *
+ * @Author:YAN
+ */
+@Component
+public class WhjlApi1209PR {
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1209PR#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public void listData(Page<WhjlApi1209> page, ApiParam param) {
+ Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
+
+ Specification specification = new Specification<ApiInfoData>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+ List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), WhjlConstant.API_CODE_1209);
+ predicates.add(predicate);
+ if (null != param) {
+ if (StringUtils.isNotBlank(param.getKqdm())) {
+ Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
+ predicates.add(predicate1);
+ }
+
+ if (StringUtils.isNotBlank(param.getCzbz())) {
+ Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
+ predicates.add(predicate2);
+ }
+ if (null != param.getStart()) {
+ Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
+ predicates.add(predicate3);
+ }
+
+ if (null != param.getEnd()) {
+ Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
+ predicates.add(predicate4);
+ }
+ }
+ return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+ }
+ };
+ org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
+ List<WhjlApi1209> list = new ArrayList<>();
+ WhjlApi1209 whjlApi1209;
+ for (ApiInfoData infoData : japPage.getContent()) {
+ whjlApi1209 = JSONObject.parseObject(infoData.getData(), WhjlApi1209.class);
+ whjlApi1209.setKqdm(infoData.getKqdm());
+ whjlApi1209.setCzbz(infoData.getCzbz());
+ whjlApi1209.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1209.setBizId(infoData.getDataId());
+ list.add(whjlApi1209);
+ }
+ page.setEntities(list);
+
+ }
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1209PR#listItem
+ *
+ * @return
+ */
+ @DataProvider
+ public List<WhjlQDItem> listItem(String id) {
+ return null;
+ }
+
+ /**
+ * 鏇存柊鎴栦慨鏀�
+ * whjlApi1209PR#saveData
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ public void saveData(WhjlApi1209 data) {
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1209);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ apiInfoDataRep.save(infoData);
+ }
+
+
+ /**
+ * 鍒犻櫎
+ * whjlApi1209PR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(WhjlApi1209 data) {
+ apiInfoDataRep.deleteById(data.getBizId());
+ return null;
+ }
+
+ /**
+ * 鍒犻櫎鍚堝悓鍟嗗搧娓呭崟
+ * whjlApi1209PR#delItem
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delItem(WhjlQDItem data) {
+ return null;
+ }
+
+ /**
+ * 涓婁紶
+ * whjlApi1209PR#pushData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pushData(List<WhjlApi1209> items) {
+
+ String result = "";
+
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+
+ if (null == apiConf) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1209);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ ApiInfoData infoData;
+ ResponseDto responseDto;
+ for (WhjlApi1209 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1209);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+
+ data.setCzbz(Constant.CZBZ_U);
+ infoData.setCzbz(Constant.CZBZ_U);
+ infoData.setData(JSON.toJSONString(data));
+
+ apiInfoDataRep.save(infoData);
+ }
+ }
+ result += responseDto.toString();
+ }
+ return result;
+ }
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1210PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1210PR.java
new file mode 100644
index 0000000..989ff3e
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1210PR.java
@@ -0,0 +1,223 @@
+package com.fzzy.otherview.whhpjl.pr;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1210;
+import com.fzzy.otherview.whhpjl.dto.WhjlQDItem;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 搴撳瓨鍙拌处鍑哄叆璁板綍
+ *
+ * @Author:YAN
+ */
+@Component
+public class WhjlApi1210PR {
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1210PR#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public void listData(Page<WhjlApi1210> page, ApiParam param) {
+ Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
+
+ Specification specification = new Specification<ApiInfoData>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+ List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), WhjlConstant.API_CODE_1210);
+ predicates.add(predicate);
+ if (null != param) {
+ if (StringUtils.isNotBlank(param.getKqdm())) {
+ Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
+ predicates.add(predicate1);
+ }
+
+ if (StringUtils.isNotBlank(param.getCzbz())) {
+ Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
+ predicates.add(predicate2);
+ }
+ if (null != param.getStart()) {
+ Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
+ predicates.add(predicate3);
+ }
+
+ if (null != param.getEnd()) {
+ Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
+ predicates.add(predicate4);
+ }
+ }
+ return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+ }
+ };
+ org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
+ List<WhjlApi1210> list = new ArrayList<>();
+ WhjlApi1210 whjlApi1210;
+ for (ApiInfoData infoData : japPage.getContent()) {
+ whjlApi1210 = JSONObject.parseObject(infoData.getData(), WhjlApi1210.class);
+ whjlApi1210.setKqdm(infoData.getKqdm());
+ whjlApi1210.setCzbz(infoData.getCzbz());
+ whjlApi1210.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1210.setBizId(infoData.getDataId());
+ list.add(whjlApi1210);
+ }
+ page.setEntities(list);
+
+ }
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1210PR#listItem
+ *
+ * @return
+ */
+ @DataProvider
+ public List<WhjlQDItem> listItem(String id) {
+ return null;
+ }
+
+ /**
+ * 鏇存柊鎴栦慨鏀�
+ * whjlApi1210PR#saveData
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ public void saveData(WhjlApi1210 data) {
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1210);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ apiInfoDataRep.save(infoData);
+ }
+
+
+ /**
+ * 鍒犻櫎
+ * whjlApi1210PR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(WhjlApi1210 data) {
+ apiInfoDataRep.deleteById(data.getBizId());
+ return null;
+ }
+
+ /**
+ * 鍒犻櫎鍚堝悓鍟嗗搧娓呭崟
+ * whjlApi1210PR#delItem
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delItem(WhjlQDItem data) {
+ return null;
+ }
+
+ /**
+ * 涓婁紶
+ * whjlApi1210PR#pushData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pushData(List<WhjlApi1210> items) {
+
+ String result = "";
+
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+
+ if (null == apiConf) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1210);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ ApiInfoData infoData;
+ ResponseDto responseDto;
+ for (WhjlApi1210 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1210);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+
+ data.setCzbz(Constant.CZBZ_U);
+ infoData.setCzbz(Constant.CZBZ_U);
+ infoData.setData(JSON.toJSONString(data));
+
+ apiInfoDataRep.save(infoData);
+ }
+ }
+ result += responseDto.toString();
+ }
+ return result;
+ }
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1211PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1211PR.java
new file mode 100644
index 0000000..22e7470
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1211PR.java
@@ -0,0 +1,223 @@
+package com.fzzy.otherview.whhpjl.pr;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1211;
+import com.fzzy.otherview.whhpjl.dto.WhjlQDItem;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 搴撳瓨鍙拌处鍑哄叆璁板綍
+ *
+ * @Author:YAN
+ */
+@Component
+public class WhjlApi1211PR {
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1211PR#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public void listData(Page<WhjlApi1211> page, ApiParam param) {
+ Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
+
+ Specification specification = new Specification<ApiInfoData>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+ List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), WhjlConstant.API_CODE_1211);
+ predicates.add(predicate);
+ if (null != param) {
+ if (StringUtils.isNotBlank(param.getKqdm())) {
+ Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
+ predicates.add(predicate1);
+ }
+
+ if (StringUtils.isNotBlank(param.getCzbz())) {
+ Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
+ predicates.add(predicate2);
+ }
+ if (null != param.getStart()) {
+ Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
+ predicates.add(predicate3);
+ }
+
+ if (null != param.getEnd()) {
+ Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
+ predicates.add(predicate4);
+ }
+ }
+ return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+ }
+ };
+ org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
+ List<WhjlApi1211> list = new ArrayList<>();
+ WhjlApi1211 whjlApi1211;
+ for (ApiInfoData infoData : japPage.getContent()) {
+ whjlApi1211 = JSONObject.parseObject(infoData.getData(), WhjlApi1211.class);
+ whjlApi1211.setKqdm(infoData.getKqdm());
+ whjlApi1211.setCzbz(infoData.getCzbz());
+ whjlApi1211.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1211.setBizId(infoData.getDataId());
+ list.add(whjlApi1211);
+ }
+ page.setEntities(list);
+
+ }
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1211PR#listItem
+ *
+ * @return
+ */
+ @DataProvider
+ public List<WhjlQDItem> listItem(String id) {
+ return null;
+ }
+
+ /**
+ * 鏇存柊鎴栦慨鏀�
+ * whjlApi1211PR#saveData
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ public void saveData(WhjlApi1211 data) {
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1211);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ apiInfoDataRep.save(infoData);
+ }
+
+
+ /**
+ * 鍒犻櫎
+ * whjlApi1211PR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(WhjlApi1211 data) {
+ apiInfoDataRep.deleteById(data.getBizId());
+ return null;
+ }
+
+ /**
+ * 鍒犻櫎鍚堝悓鍟嗗搧娓呭崟
+ * whjlApi1211PR#delItem
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delItem(WhjlQDItem data) {
+ return null;
+ }
+
+ /**
+ * 涓婁紶
+ * whjlApi1211PR#pushData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pushData(List<WhjlApi1211> items) {
+
+ String result = "";
+
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+
+ if (null == apiConf) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1211);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ ApiInfoData infoData;
+ ResponseDto responseDto;
+ for (WhjlApi1211 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1211);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+
+ data.setCzbz(Constant.CZBZ_U);
+ infoData.setCzbz(Constant.CZBZ_U);
+ infoData.setData(JSON.toJSONString(data));
+
+ apiInfoDataRep.save(infoData);
+ }
+ }
+ result += responseDto.toString();
+ }
+ return result;
+ }
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1212PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1212PR.java
new file mode 100644
index 0000000..874db4f
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1212PR.java
@@ -0,0 +1,157 @@
+package com.fzzy.otherview.whhpjl.pr;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1212;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鍚堝悓淇℃伅
+ *
+ * @Author:YAN
+ */
+@Component
+public class WhjlApi1212PR {
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1214PR#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public List<WhjlApi1212> listData() {
+ List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1214);
+ if (null == result || result.isEmpty()) {
+ return null;
+ }
+ List<WhjlApi1212> list = new ArrayList<>();
+ WhjlApi1212 whjlApi1212;
+ for (ApiInfoData infoData : result) {
+ whjlApi1212 = JSONObject.parseObject(infoData.getData(), WhjlApi1212.class);
+ whjlApi1212.setKqdm(infoData.getKqdm());
+ whjlApi1212.setCzbz(infoData.getCzbz());
+ whjlApi1212.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1212.setBizId(infoData.getDataId());
+ list.add(whjlApi1212);
+ }
+ return list;
+ }
+
+
+ /**
+ * 鏇存柊鎴栦慨鏀�
+ * whjlApi1214PR#saveData
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ public void saveData(WhjlApi1212 data) {
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1214);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ apiInfoDataRep.save(infoData);
+ }
+
+
+ /**
+ * 鍒犻櫎
+ * whjlApi1214PR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(WhjlApi1212 data) {
+ apiInfoDataRep.deleteById(data.getBizId());
+ return null;
+ }
+
+ /**
+ * 涓婁紶
+ * whjlApi1214PR#pushData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pushData(List<WhjlApi1212> items) {
+
+ String result = "";
+
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+
+ if (null == apiConf) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1214);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ ApiInfoData infoData;
+ ResponseDto responseDto;
+ for (WhjlApi1212 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1214);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+
+ data.setCzbz(Constant.CZBZ_U);
+ infoData.setCzbz(Constant.CZBZ_U);
+ infoData.setData(JSON.toJSONString(data));
+
+ apiInfoDataRep.save(infoData);
+ }
+ }
+ result += responseDto.toString();
+ }
+ return result;
+ }
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1213PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1213PR.java
new file mode 100644
index 0000000..2375ed8
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1213PR.java
@@ -0,0 +1,223 @@
+package com.fzzy.otherview.whhpjl.pr;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1213;
+import com.fzzy.otherview.whhpjl.dto.WhjlQDItem;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鍑哄叆搴撶粨绠楄褰�
+ *
+ * @Author:YAN
+ */
+@Component
+public class WhjlApi1213PR {
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1213PR#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public void listData(Page<WhjlApi1213> page, ApiParam param) {
+ Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
+
+ Specification specification = new Specification<ApiInfoData>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+ List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), WhjlConstant.API_CODE_1213);
+ predicates.add(predicate);
+ if (null != param) {
+ if (StringUtils.isNotBlank(param.getKqdm())) {
+ Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
+ predicates.add(predicate1);
+ }
+
+ if (StringUtils.isNotBlank(param.getCzbz())) {
+ Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
+ predicates.add(predicate2);
+ }
+ if (null != param.getStart()) {
+ Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
+ predicates.add(predicate3);
+ }
+
+ if (null != param.getEnd()) {
+ Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
+ predicates.add(predicate4);
+ }
+ }
+ return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+ }
+ };
+ org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
+ List<WhjlApi1213> list = new ArrayList<>();
+ WhjlApi1213 whjlApi1213;
+ for (ApiInfoData infoData : japPage.getContent()) {
+ whjlApi1213 = JSONObject.parseObject(infoData.getData(), WhjlApi1213.class);
+ whjlApi1213.setKqdm(infoData.getKqdm());
+ whjlApi1213.setCzbz(infoData.getCzbz());
+ whjlApi1213.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1213.setBizId(infoData.getDataId());
+ list.add(whjlApi1213);
+ }
+ page.setEntities(list);
+
+ }
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1213PR#listItem
+ *
+ * @return
+ */
+ @DataProvider
+ public List<WhjlQDItem> listItem(String id) {
+ return null;
+ }
+
+ /**
+ * 鏇存柊鎴栦慨鏀�
+ * whjlApi1213PR#saveData
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ public void saveData(WhjlApi1213 data) {
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1213);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ apiInfoDataRep.save(infoData);
+ }
+
+
+ /**
+ * 鍒犻櫎
+ * whjlApi1213PR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(WhjlApi1213 data) {
+ apiInfoDataRep.deleteById(data.getBizId());
+ return null;
+ }
+
+ /**
+ * 鍒犻櫎鍚堝悓鍟嗗搧娓呭崟
+ * whjlApi1213PR#delItem
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delItem(WhjlQDItem data) {
+ return null;
+ }
+
+ /**
+ * 涓婁紶
+ * whjlApi1213PR#pushData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pushData(List<WhjlApi1213> items) {
+
+ String result = "";
+
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+
+ if (null == apiConf) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1213);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ ApiInfoData infoData;
+ ResponseDto responseDto;
+ for (WhjlApi1213 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1213);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+
+ data.setCzbz(Constant.CZBZ_U);
+ infoData.setCzbz(Constant.CZBZ_U);
+ infoData.setData(JSON.toJSONString(data));
+
+ apiInfoDataRep.save(infoData);
+ }
+ }
+ result += responseDto.toString();
+ }
+ return result;
+ }
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java
index a0abee7..1ceaf32 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java
@@ -5,6 +5,7 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
@@ -13,18 +14,29 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1214;
+import com.fzzy.otherview.whhpjl.dto.WhjlQDItem;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Component;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
- * 鍚堝悓淇℃伅
+ * 璐ㄦ鏈烘瀯
*
* @Author:YAN
*/
@@ -44,14 +56,45 @@
* @return
*/
@DataProvider
- public List<WhjlApi1214> listData() {
- List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1214);
- if (null == result || result.isEmpty()) {
- return null;
- }
+ public void listData(Page<WhjlApi1214> page, ApiParam param) {
+ Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
+
+ Specification specification = new Specification<ApiInfoData>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+ List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), WhjlConstant.API_CODE_1214);
+ predicates.add(predicate);
+ if (null != param) {
+ if (StringUtils.isNotBlank(param.getKqdm())) {
+ Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
+ predicates.add(predicate1);
+ }
+
+ if (StringUtils.isNotBlank(param.getCzbz())) {
+ Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
+ predicates.add(predicate2);
+ }
+ if (null != param.getStart()) {
+ Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
+ predicates.add(predicate3);
+ }
+
+ if (null != param.getEnd()) {
+ Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
+ predicates.add(predicate4);
+ }
+ }
+ return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+ }
+ };
+ org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
List<WhjlApi1214> list = new ArrayList<>();
WhjlApi1214 whjlApi1214;
- for (ApiInfoData infoData : result) {
+ for (ApiInfoData infoData : japPage.getContent()) {
whjlApi1214 = JSONObject.parseObject(infoData.getData(), WhjlApi1214.class);
whjlApi1214.setKqdm(infoData.getKqdm());
whjlApi1214.setCzbz(infoData.getCzbz());
@@ -59,9 +102,20 @@
whjlApi1214.setBizId(infoData.getDataId());
list.add(whjlApi1214);
}
- return list;
+ page.setEntities(list);
+
}
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1214PR#listItem
+ *
+ * @return
+ */
+ @DataProvider
+ public List<WhjlQDItem> listItem(String id) {
+ return null;
+ }
/**
* 鏇存柊鎴栦慨鏀�
@@ -101,6 +155,18 @@
}
/**
+ * 鍒犻櫎鍚堝悓鍟嗗搧娓呭崟
+ * whjlApi1214PR#delItem
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delItem(WhjlQDItem data) {
+ return null;
+ }
+
+ /**
* 涓婁紶
* whjlApi1214PR#pushData
*
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1215PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1215PR.java
new file mode 100644
index 0000000..4b7355a
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1215PR.java
@@ -0,0 +1,223 @@
+package com.fzzy.otherview.whhpjl.pr;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1215;
+import com.fzzy.otherview.whhpjl.dto.WhjlQDItem;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鏍峰搧鐧昏淇℃伅
+ *
+ * @Author:YAN
+ */
+@Component
+public class WhjlApi1215PR {
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1215PR#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public void listData(Page<WhjlApi1215> page, ApiParam param) {
+ Pageable pageable = PageRequest.of(page.getPageNo() - 1, page.getPageSize(), Sort.Direction.DESC, "updateTime");
+
+ Specification specification = new Specification<ApiInfoData>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate toPredicate(Root<ApiInfoData> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
+ List<Predicate> predicates = new ArrayList<>(); //鎵�鏈夌殑鏂█
+ Predicate predicate = criteriaBuilder.equal(root.get("inteId"), WhjlConstant.API_CODE_1215);
+ predicates.add(predicate);
+ if (null != param) {
+ if (StringUtils.isNotBlank(param.getKqdm())) {
+ Predicate predicate1 = criteriaBuilder.equal(root.get("kqdm"), param.getKqdm());
+ predicates.add(predicate1);
+ }
+
+ if (StringUtils.isNotBlank(param.getCzbz())) {
+ Predicate predicate2 = criteriaBuilder.equal(root.get("czbz"), param.getCzbz());
+ predicates.add(predicate2);
+ }
+ if (null != param.getStart()) {
+ Predicate predicate3 = criteriaBuilder.greaterThan(root.get("updateTime"), ContextUtil.getCurZero(param.getStart()));
+ predicates.add(predicate3);
+ }
+
+ if (null != param.getEnd()) {
+ Predicate predicate4 = criteriaBuilder.lessThan(root.get("updateTime"), ContextUtil.getNextZero(param.getEnd()));
+ predicates.add(predicate4);
+ }
+ }
+ return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
+ }
+ };
+ org.springframework.data.domain.Page<ApiInfoData> japPage = apiInfoDataRep.findAll(specification, pageable);
+ page.setEntityCount((int) japPage.getTotalElements());
+ List<WhjlApi1215> list = new ArrayList<>();
+ WhjlApi1215 whjlApi1215;
+ for (ApiInfoData infoData : japPage.getContent()) {
+ whjlApi1215 = JSONObject.parseObject(infoData.getData(), WhjlApi1215.class);
+ whjlApi1215.setKqdm(infoData.getKqdm());
+ whjlApi1215.setCzbz(infoData.getCzbz());
+ whjlApi1215.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1215.setBizId(infoData.getDataId());
+ list.add(whjlApi1215);
+ }
+ page.setEntities(list);
+
+ }
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlApi1215PR#listItem
+ *
+ * @return
+ */
+ @DataProvider
+ public List<WhjlQDItem> listItem(String id) {
+ return null;
+ }
+
+ /**
+ * 鏇存柊鎴栦慨鏀�
+ * whjlApi1215PR#saveData
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ public void saveData(WhjlApi1215 data) {
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1215);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ apiInfoDataRep.save(infoData);
+ }
+
+
+ /**
+ * 鍒犻櫎
+ * whjlApi1215PR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(WhjlApi1215 data) {
+ apiInfoDataRep.deleteById(data.getBizId());
+ return null;
+ }
+
+ /**
+ * 鍒犻櫎鍚堝悓鍟嗗搧娓呭崟
+ * whjlApi1215PR#delItem
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delItem(WhjlQDItem data) {
+ return null;
+ }
+
+ /**
+ * 涓婁紶
+ * whjlApi1215PR#pushData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pushData(List<WhjlApi1215> items) {
+
+ String result = "";
+
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+
+ if (null == apiConf) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1215);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) {
+ return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+ }
+
+ ApiInfoData infoData;
+ ResponseDto responseDto;
+ for (WhjlApi1215 data : items) {
+ responseDto = apiService.pushData(param, apiConf, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ infoData = new ApiInfoData();
+ infoData.setId(data.getBizId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1215);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getBizId());
+
+ data.setCzbz(Constant.CZBZ_U);
+ infoData.setCzbz(Constant.CZBZ_U);
+ infoData.setData(JSON.toJSONString(data));
+
+ apiInfoDataRep.save(infoData);
+ }
+ }
+ result += responseDto.toString();
+ }
+ return result;
+ }
+}
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java
index 9c0d03d..bbf66cc 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService12.java
@@ -11,8 +11,8 @@
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1204;
-import com.fzzy.otherview.whhpjl.dto.WhjlApi1207;
-import com.fzzy.otherview.whhpjl.dto.WhjlApi1214;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1206;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1212;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -111,15 +111,15 @@
}
param.setInteCategory(WhjlConstant.API_CATEGORY_12);
param.setInteId(WhjlConstant.API_CODE_1207);
- List<WhjlApi1207> list = new ArrayList<>();
- WhjlApi1207 whjlApi1207;
+ List<WhjlApi1206> list = new ArrayList<>();
+ WhjlApi1206 whjlApi1206;
for (ApiInfoData infoData : items) {
- whjlApi1207 = JSONObject.parseObject(infoData.getData(), WhjlApi1207.class);
- whjlApi1207.setKqdm(infoData.getKqdm());
- whjlApi1207.setCzbz(infoData.getCzbz());
- whjlApi1207.setUpdateTime(infoData.getUpdateTime());
- whjlApi1207.setBizId(infoData.getDataId());
- list.add(whjlApi1207);
+ whjlApi1206 = JSONObject.parseObject(infoData.getData(), WhjlApi1206.class);
+ whjlApi1206.setKqdm(infoData.getKqdm());
+ whjlApi1206.setCzbz(infoData.getCzbz());
+ whjlApi1206.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1206.setBizId(infoData.getDataId());
+ list.add(whjlApi1206);
}
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
@@ -149,15 +149,15 @@
}
param.setInteCategory(WhjlConstant.API_CATEGORY_12);
param.setInteId(WhjlConstant.API_CODE_1214);
- List<WhjlApi1214> list = new ArrayList<>();
- WhjlApi1214 whjlApi1214;
+ List<WhjlApi1212> list = new ArrayList<>();
+ WhjlApi1212 whjlApi1212;
for (ApiInfoData infoData : items) {
- whjlApi1214 = JSONObject.parseObject(infoData.getData(), WhjlApi1214.class);
- whjlApi1214.setKqdm(infoData.getKqdm());
- whjlApi1214.setCzbz(infoData.getCzbz());
- whjlApi1214.setUpdateTime(infoData.getUpdateTime());
- whjlApi1214.setBizId(infoData.getDataId());
- list.add(whjlApi1214);
+ whjlApi1212 = JSONObject.parseObject(infoData.getData(), WhjlApi1212.class);
+ whjlApi1212.setKqdm(infoData.getKqdm());
+ whjlApi1212.setCzbz(infoData.getCzbz());
+ whjlApi1212.setUpdateTime(infoData.getUpdateTime());
+ whjlApi1212.setBizId(infoData.getDataId());
+ list.add(whjlApi1212);
}
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
--
Gitblit v1.9.3