From a3f0d41f1c7feeee8ec6a377c692ab7023a391d8 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期一, 06 十一月 2023 19:31:35 +0800
Subject: [PATCH] 提交测试武汉接口
---
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1309.java | 19
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1303.java | 3
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1403.java | 50
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1409.java | 3
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlRwwz.java | 34
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1412PR.java | 6
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1220.java | 3
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1413PR.java | 6
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1410PR.java | 6
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1411PR.java | 6
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1303.view.xml | 5
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1306.view.xml | 15
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1401.view.xml | 13
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1411.view.xml | 108 -
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1308.java | 5
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1301PR.java | 6
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1404.view.xml | 71
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1408.java | 23
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java | 7
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1404.java | 9
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1412.java | 8
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlWDZJH.java | 4
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml | 591 ++++++----
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1413.view.xml | 37
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1302PR.java | 4
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1301.view.xml | 236 +++
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1309.view.xml | 186 ++-
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml | 54
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1402.view.xml | 52
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1410.view.xml | 54
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlInoutDel.java | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1413.java | 8
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1220.view.xml | 28
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1307.view.xml | 120 -
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1402.java | 13
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1410.java | 9
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1408PR.java | 6
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1408.view.xml | 98 -
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1212PR.java | 8
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1406PR.java | 6
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1404PR.java | 6
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1403.view.xml | 183 +-
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1306.java | 6
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1402PR.java | 6
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml | 1
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1401PR.java | 6
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1403PR.java | 6
src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java | 40
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1308.view.xml | 20
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1412.view.xml | 67
src/main/resources/templates/home/home-whjl.html | 16
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1409.view.xml | 44
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1301.java | 23
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java | 24
src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java | 38
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1304.view.xml | 29
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlLXZBMX.java | 4
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1405.view.xml | 151 -
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1305.java | 46
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlXDZJH.java | 4
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1302.java | 4
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1409PR.java | 6
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlPscl.java | 51
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1411.java | 10
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1405PR.java | 6
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1407PR.java | 6
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1305.view.xml | 530 +++++++--
67 files changed, 1,897 insertions(+), 1,358 deletions(-)
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml
index b30b077..3334491 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml
@@ -6,55 +6,55 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1206</Property>
<PropertyDef name="htid">
- <Property/>
+ <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="htlx">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓绫诲瀷</Property>
</PropertyDef>
<PropertyDef name="htbh">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓缂栧彿</Property>
</PropertyDef>
<PropertyDef name="htbt">
- <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="htkhbh">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓瀹㈡埛缂栧彿</Property>
</PropertyDef>
<PropertyDef name="htkhmc">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓瀹㈡埛鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="htspdj">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓鍟嗗搧鍗曚环</Property>
</PropertyDef>
<PropertyDef name="htspsl">
@@ -62,7 +62,7 @@
<Property name="label">鍚堝悓鍟嗗搧鏁伴噺</Property>
</PropertyDef>
<PropertyDef name="spbm">
- <Property/>
+ <Property></Property>
<Property name="label">鍟嗗搧缂栫爜</Property>
</PropertyDef>
<PropertyDef name="zje">
@@ -70,11 +70,11 @@
<Property name="label">鎬婚噾棰�</Property>
</PropertyDef>
<PropertyDef name="hrqdr">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓绛捐浜�</Property>
</PropertyDef>
<PropertyDef name="htqdsj">
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鍚堝悓绛捐鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="htsxrq">
@@ -86,31 +86,31 @@
<Property name="label">鍚堝悓鎴鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="htcjr">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓鍒涘缓浜�</Property>
</PropertyDef>
<PropertyDef name="htcjsj">
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鍚堝悓鍒涘缓鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="htdbgjlbz">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓鐨勫彉鏇磋褰曟爣蹇�</Property>
</PropertyDef>
<PropertyDef name="htbgyy">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓鍙樻洿鍘熷洜</Property>
</PropertyDef>
<PropertyDef name="htgylx">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓渚涘簲绫诲瀷</Property>
</PropertyDef>
<PropertyDef name="yhtbh">
- <Property/>
+ <Property></Property>
<Property name="label">鍘熷悎鍚岀紪鍙�</Property>
</PropertyDef>
<PropertyDef name="zffs">
- <Property/>
+ <Property></Property>
<Property name="label">鏀粯鏂瑰紡</Property>
</PropertyDef>
<PropertyDef name="ywcsl">
@@ -122,11 +122,11 @@
<Property name="label">宸插畬鎴愭暟閲忛噾棰�</Property>
</PropertyDef>
<PropertyDef name="htbz">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓澶囨敞</Property>
</PropertyDef>
<PropertyDef name="htzt">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓鐘舵��</Property>
</PropertyDef>
<PropertyDef name="xh">
@@ -134,11 +134,11 @@
<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">
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml
index 7c24f0a..b11e45a 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml
@@ -303,6 +303,7 @@
<PropertyDef name="djsj">
<Property></Property>
<Property name="label">鐧昏鏃堕棿</Property>
+ <Property name="dataType">DateTime</Property>
</PropertyDef>
<PropertyDef name="zz">
<Property></Property>
@@ -354,6 +355,20 @@
</DataType>
</Model>
<View layout="regionPadding:10">
+ <ClientEvent name="onReady">
+edit = function(){
+ var dialog= view.get("#dialogMain1");
+ dialog.show();
+}
+
+
+save = function(){
+ var dialog= view.get("#dialogMain2");
+ var list = view.get("#dsMain.data:#").get("crkmx");
+ list.insert({});
+ dialog.show();
+
+}</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
@@ -488,8 +503,72 @@
<Property name="property">yscch</Property>
<Property name="align">center</Property>
</DataColumn>
+ <DataColumn>
+ <ClientEvent name="onRenderCell">arg.dom.innerHTML="<a href='javascript:;' class ='btn-s-default' onClick='edit()'>璇︽儏</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a class ='btn-s-warm' href='javascript:;' onClick='save()'>鏂板</a>";
+arg.progressDefault= false;</ClientEvent>
+ <Property name="caption">鎿嶄綔</Property>
+ <Property name="width">150</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
</DataGrid>
</Container>
+ <Dialog id="dialogMain1">
+ <Property name="width">85%</Property>
+ <Property name="closeable">false</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Property name="height">80%</Property>
+ <Buttons>
+ <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>
+ <Panel layout="regionPadding:5">
+ <Property name="caption">鍑哄叆搴撴槑缁�</Property>
+ <Property name="height">400</Property>
+ <Buttons/>
+ <Children>
+ <DataGrid id="dgCrkmx">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">#.crkmx</Property>
+ <DataColumn name="crkmxid">
+ <Property name="property">crkmxid</Property>
+ </DataColumn>
+ <DataColumn name="ajbh">
+ <Property name="property">ajbh</Property>
+ </DataColumn>
+ <DataColumn name="ajmc">
+ <Property name="property">ajmc</Property>
+ </DataColumn>
+ <DataColumn name="hwbh">
+ <Property name="property">hwbh</Property>
+ </DataColumn>
+ <DataColumn name="hwmc">
+ <Property name="property">hwmc</Property>
+ </DataColumn>
+ <DataColumn name="kctzbh">
+ <Property name="property">kctzbh</Property>
+ </DataColumn>
+ <DataColumn name="kctzcppcid">
+ <Property name="property">kctzcppcid</Property>
+ </DataColumn>
+ <DataColumn name="psmxid">
+ <Property name="property">psmxid</Property>
+ </DataColumn>
+ <DataColumn name="yjfamxid">
+ <Property name="property">yjfamxid</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
+ </Children>
+ <Tools/>
+ </Dialog>
<Dialog id="dialogMain">
<Property name="width">85%</Property>
<Property name="closeable">false</Property>
@@ -685,252 +764,6 @@
</AutoFormElement>
</AutoForm>
<Panel layout="regionPadding:5">
- <Property name="caption">鐩樼偣鏄庣粏</Property>
- <Property name="height">400</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>
- <Property name="dataPath">#.crkmx</Property>
- <AutoFormElement>
- <Property name="name">crkmxid</Property>
- <Property name="property">crkmxid</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">kctzbh</Property>
- <Property name="property">kctzbh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">kctzcppcid</Property>
- <Property name="property">kctzcppcid</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">psmxid</Property>
- <Property name="property">psmxid</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">yjfamxid</Property>
- <Property name="property">yjfamxid</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">cpbh</Property>
- <Property name="property">cpbh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cpmc</Property>
- <Property name="property">cpmc</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">crlx</Property>
- <Property name="property">crlx</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">crksl</Property>
- <Property name="property">crksl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">crkzl</Property>
- <Property name="property">crkzl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">qcsl</Property>
- <Property name="property">qcsl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">qmsl</Property>
- <Property name="property">qmsl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">qczl</Property>
- <Property name="property">qczl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">qmzl</Property>
- <Property name="property">qmzl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">shsl</Property>
- <Property name="property">shsl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">shzl</Property>
- <Property name="property">shzl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ysyq</Property>
- <Property name="property">ysyq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">sfhx</Property>
- <Property name="property">sfhx</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">qkxm</Property>
- <Property name="property">qkxm</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">cpdj</Property>
- <Property name="property">cpdj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cd</Property>
- <Property name="property">cd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">sccj</Property>
- <Property name="property">sccj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">gg</Property>
- <Property name="property">gg</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">bzqjzrq</Property>
- <Property name="property">bzqjzrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bgy</Property>
- <Property name="property">bgy</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ckfs</Property>
- <Property name="property">ckfs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">djsj</Property>
- <Property name="property">djsj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zz</Property>
- <Property name="property">zz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jjy</Property>
- <Property name="property">jjy</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>
- </AutoForm>
- </Children>
- <Tools/>
- </Panel>
- <Panel layout="regionPadding:5">
<Property name="caption">璐ㄦ鎶ュ憡鏂囦欢</Property>
<Property name="height">400</Property>
<Buttons/>
@@ -988,6 +821,272 @@
</Children>
<Tools/>
</Dialog>
+ <Dialog id="dialogMain2">
+ <Property name="width">85%</Property>
+ <Property name="closeable">false</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Property name="caption">鍑哄叆搴撴槑缁�</Property>
+ <Property name="height">80%</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="labelAlign">left</Property>
+ <Property name="dataPath">#.crkmx</Property>
+ <AutoFormElement>
+ <Property name="name">crkmxid</Property>
+ <Property name="property">crkmxid</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">kctzbh</Property>
+ <Property name="property">kctzbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kctzcppcid</Property>
+ <Property name="property">kctzcppcid</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">psmxid</Property>
+ <Property name="property">psmxid</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yjfamxid</Property>
+ <Property name="property">yjfamxid</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">cpbh</Property>
+ <Property name="property">cpbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cpmc</Property>
+ <Property name="property">cpmc</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">crlx</Property>
+ <Property name="property">crlx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">crksl</Property>
+ <Property name="property">crksl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">crkzl</Property>
+ <Property name="property">crkzl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qcsl</Property>
+ <Property name="property">qcsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qmsl</Property>
+ <Property name="property">qmsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qczl</Property>
+ <Property name="property">qczl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qmzl</Property>
+ <Property name="property">qmzl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">shsl</Property>
+ <Property name="property">shsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">shzl</Property>
+ <Property name="property">shzl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ysyq</Property>
+ <Property name="property">ysyq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfhx</Property>
+ <Property name="property">sfhx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qkxm</Property>
+ <Property name="property">qkxm</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">cpdj</Property>
+ <Property name="property">cpdj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cd</Property>
+ <Property name="property">cd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sccj</Property>
+ <Property name="property">sccj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">gg</Property>
+ <Property name="property">gg</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">bzqjzrq</Property>
+ <Property name="property">bzqjzrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bgy</Property>
+ <Property name="property">bgy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ckfs</Property>
+ <Property name="property">ckfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">djsj</Property>
+ <Property name="property">djsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zz</Property>
+ <Property name="property">zz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jjy</Property>
+ <Property name="property">jjy</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>
+ </AutoForm>
+ </Children>
+ <Tools/>
+ </Dialog>
<UpdateAction id="updateSave">
<Property name="dataResolver">whjlApi1212PR#saveData</Property>
<UpdateItem>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml
index c2566f6..8d6323d 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml
@@ -88,6 +88,7 @@
<PropertyDef name="sfyx">
<Property></Property>
<Property name="label">鏄惁鏈夋晥</Property>
+ <Property name="dataType">Integer</Property>
</PropertyDef>
<PropertyDef name="bz">
<Property></Property>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1220.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1220.view.xml
index be0b29e..8c54684 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1220.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1220.view.xml
@@ -6,47 +6,48 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1220</Property>
<PropertyDef name="wzkcyjjlid">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳瓨棰勮璁板綍ID</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="kcyjgcid">
- <Property/>
+ <Property></Property>
<Property name="label">浣跨敤鐨勫憡璀﹁鍒橧D</Property>
</PropertyDef>
<PropertyDef name="yjsj">
- <Property/>
+ <Property></Property>
<Property name="label">棰勮鏃堕棿</Property>
+ <Property name="dataType">DateTime</Property>
</PropertyDef>
<PropertyDef name="cpbh">
- <Property/>
+ <Property></Property>
<Property name="label">浜у搧缂栧彿</Property>
</PropertyDef>
<PropertyDef name="cpmc">
- <Property/>
+ <Property></Property>
<Property name="label">浜у搧鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="gjdj">
- <Property/>
+ <Property></Property>
<Property name="label">鍛婅绛夌骇</Property>
</PropertyDef>
<PropertyDef name="gjkczl">
- <Property/>
+ <Property></Property>
<Property name="label">鍛婅搴撳瓨閲嶉噺</Property>
</PropertyDef>
<PropertyDef name="bizId">
@@ -60,6 +61,11 @@
<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>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1301.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1301.view.xml
index 151e157..f657716 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1301.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1301.view.xml
@@ -6,88 +6,88 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1301</Property>
<PropertyDef name="lqjcid">
- <Property/>
+ <Property></Property>
<Property name="label">绮儏妫�娴媔d</Property>
</PropertyDef>
<PropertyDef name="jlqybh">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涚伯浼佷笟缂栧彿</Property>
</PropertyDef>
- <PropertyDef name="ssqymc">
- <Property/>
+ <PropertyDef name="jlqymc">
+ <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="ajbh">
- <Property/>
+ <Property></Property>
<Property name="label">寤掗棿缂栧彿</Property>
</PropertyDef>
<PropertyDef name="ajmc">
- <Property/>
+ <Property></Property>
<Property name="label">寤掗棿鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="jcsj">
- <Property/>
+ <Property></Property>
<Property name="label">妫�娴嬫椂闂�</Property>
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
</PropertyDef>
<PropertyDef name="cw">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">浠撴俯</Property>
</PropertyDef>
<PropertyDef name="sw">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">浠撴箍</Property>
</PropertyDef>
<PropertyDef name="ww">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">澶栨俯</Property>
</PropertyDef>
<PropertyDef name="ws">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">澶栨箍</Property>
</PropertyDef>
<PropertyDef name="pjlw">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">骞冲潎绮俯</Property>
</PropertyDef>
<PropertyDef name="zglw">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">鏈�楂樼伯娓�</Property>
</PropertyDef>
<PropertyDef name="zdlw">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">鏈�浣庣伯娓�</Property>
</PropertyDef>
<PropertyDef name="pjlx">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">骞冲潎绮箍</Property>
</PropertyDef>
<PropertyDef name="zglx">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">鏈�楂樼伯婀�</Property>
</PropertyDef>
<PropertyDef name="zdlx">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">鏈�浣庣伯婀�</Property>
</PropertyDef>
<PropertyDef name="jcjg">
- <Property/>
+ <Property></Property>
<Property name="label">妫�娴嬬粨鏋�</Property>
</PropertyDef>
<PropertyDef name="bizId">
@@ -106,53 +106,59 @@
<Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
- <Reference name="wdzjh">
+ <PropertyDef name="wdzjh">
+ <Property></Property>
<Property name="label">娓╁害鍊奸泦鍚�</Property>
<Property name="dataType">[dtWdzjh]</Property>
- </Reference>
- <Reference name="xdzjh">
+ </PropertyDef>
+ <PropertyDef name="xdzjh">
+ <Property></Property>
<Property name="label">婀垮害鍊奸泦鍚�</Property>
<Property name="dataType">[dtXdzjh]</Property>
- </Reference>
- <Reference name="kctzid">
- <Property name="label">搴撳瓨鍙拌处ID闆嗗悎</Property>
- </Reference>
+ </PropertyDef>
+ <PropertyDef name="kctzid">
+ <Property></Property>
+ <Property name="label">搴撳瓨鍙板笎ID闆嗗悎</Property>
+ <Property name="dataType">[String]</Property>
+ </PropertyDef>
</DataType>
<DataType name="dtWdzjh">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlWDZJH</Property>
<PropertyDef name="sxh">
- <Property/>
+ <Property></Property>
<Property name="label">椤哄簭鍙�</Property>
+ <Property name="dataType">Integer</Property>
</PropertyDef>
<PropertyDef name="wdz">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">娓╁害鍊�</Property>
</PropertyDef>
<PropertyDef name="hwbh">
- <Property/>
+ <Property></Property>
<Property name="label">璐т綅缂栧彿</Property>
</PropertyDef>
<PropertyDef name="jcjg">
- <Property/>
+ <Property></Property>
<Property name="label">妫�娴嬬粨鏋�</Property>
</PropertyDef>
</DataType>
<DataType name="dtXdzjh">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlXDZJH</Property>
<PropertyDef name="sxh">
- <Property/>
+ <Property></Property>
<Property name="label">椤哄簭鍙�</Property>
+ <Property name="dataType">Integer</Property>
</PropertyDef>
<PropertyDef name="sdz">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">婀垮害鍊�</Property>
</PropertyDef>
<PropertyDef name="hwbh">
- <Property/>
+ <Property></Property>
<Property name="label">璐т綅缂栧彿</Property>
</PropertyDef>
<PropertyDef name="jcjg">
- <Property/>
+ <Property></Property>
<Property name="label">妫�娴嬬粨鏋�</Property>
</PropertyDef>
</DataType>
@@ -254,8 +260,8 @@
<DataColumn name="jlqybh">
<Property name="property">jlqybh</Property>
</DataColumn>
- <DataColumn name="ssqymc">
- <Property name="property">ssqymc</Property>
+ <DataColumn name="jlqymc">
+ <Property name="property">jlqymc</Property>
</DataColumn>
<DataColumn name="jgzdbh">
<Property name="property">jgzdbh</Property>
@@ -356,6 +362,136 @@
<Property name="labelPosition">top</Property>
<Property name="labelSeparator">:</Property>
<Property name="labelAlign">left</Property>
+ <AutoFormElement>
+ <Property name="name">lqjcid</Property>
+ <Property name="property">lqjcid</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">cfbh</Property>
+ <Property name="property">cfbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sscfmc</Property>
+ <Property name="property">sscfmc</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">jcsj</Property>
+ <Property name="property">jcsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cw</Property>
+ <Property name="property">cw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sw</Property>
+ <Property name="property">sw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ww</Property>
+ <Property name="property">ww</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ws</Property>
+ <Property name="property">ws</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">pjlw</Property>
+ <Property name="property">pjlw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zglw</Property>
+ <Property name="property">zglw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zdlw</Property>
+ <Property name="property">zdlw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">pjlx</Property>
+ <Property name="property">pjlx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zglx</Property>
+ <Property name="property">zglx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zdlx</Property>
+ <Property name="property">zdlx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jcjg</Property>
+ <Property name="property">jcjg</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>
+ <AutoFormElement>
+ <Property name="name">kctzid</Property>
+ <Property name="property">kctzid</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
<Panel>
<Property name="caption">娓╁害鍊奸泦鍚�</Property>
@@ -367,7 +503,7 @@
<Property name="text">鑿滃崟鏍忥細</Property>
</Label>
<Button layoutConstraint="left">
- <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("jcbgfjmx");
+ <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("wdzjh");
list.insert({});</ClientEvent>
<Property name="caption">鏂板</Property>
<Property name="exClassName">btn-default</Property>
@@ -410,7 +546,7 @@
<Property name="text">鑿滃崟鏍忥細</Property>
</Label>
<Button layoutConstraint="left">
- <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("jcbgfjmx");
+ <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("xdzjh");
list.insert({});</ClientEvent>
<Property name="caption">鏂板</Property>
<Property name="exClassName">btn-default</Property>
@@ -424,14 +560,20 @@
<Property name="iconClass">fa fa-minus</Property>
</Button>
</Container>
- <DataGrid id="dgLink">
+ <DataGrid id="dgXdzjh">
<Property name="dataPath">#.xdzjh</Property>
<Property name="dataSet">dsMain</Property>
- <DataColumn name="jybgwjid">
- <Property name="property">jybgwjid</Property>
+ <DataColumn name="sxh">
+ <Property name="property">sxh</Property>
</DataColumn>
- <DataColumn name="qklwjdz">
- <Property name="property">qklwjdz</Property>
+ <DataColumn name="sdz">
+ <Property name="property">sdz</Property>
+ </DataColumn>
+ <DataColumn name="hwbh">
+ <Property name="property">hwbh</Property>
+ </DataColumn>
+ <DataColumn name="jcjg">
+ <Property name="property">jcjg</Property>
</DataColumn>
</DataGrid>
</Children>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1303.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1303.view.xml
index 905cef7..39bb680 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1303.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1303.view.xml
@@ -26,7 +26,7 @@
<Property name="label">鍐涗緵绔欑偣鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="gjsj">
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鍛婅鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="gjbt">
@@ -39,7 +39,8 @@
</PropertyDef>
<PropertyDef name="gjjb">
<Property/>
- <Property name="label">鍛婅绾у埆</Property>
+ <Property name="dataType">Integer</Property>
+ <Property name="label">鍛婅绾у埆</Property>
</PropertyDef>
<PropertyDef name="bizId">
<Property></Property>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1304.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1304.view.xml
index 79f0779..d1ae8ef 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1304.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1304.view.xml
@@ -6,55 +6,58 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1304</Property>
<PropertyDef name="chjlid">
- <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="ajbh">
- <Property/>
+ <Property></Property>
<Property name="label">寤掗棿缂栧彿</Property>
</PropertyDef>
<PropertyDef name="sbbh">
- <Property/>
+ <Property></Property>
<Property name="label">璁惧缂栧彿</Property>
</PropertyDef>
<PropertyDef name="cjsj">
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">閲囬泦鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="nhz">
- <Property/>
+ <Property></Property>
<Property name="label">鑳借�楀��</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="nhxzz">
- <Property/>
+ <Property></Property>
<Property name="label">鑳借�椾慨姝ｅ��</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="nhzl">
- <Property/>
+ <Property></Property>
<Property name="label">鑳借�楀閲�</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="nhxm">
- <Property/>
+ <Property></Property>
<Property name="label">鑳借�楅」鐩�</Property>
</PropertyDef>
<PropertyDef name="bz">
- <Property/>
+ <Property></Property>
<Property name="label">澶囨敞</Property>
</PropertyDef>
<PropertyDef name="bizId">
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1305.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1305.view.xml
index 6a0147d..b4bf319 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1305.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1305.view.xml
@@ -5,6 +5,163 @@
<Model>
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1305</Property>
+ <PropertyDef name="ddpsrwid">
+ <Property/>
+ <Property name="label">璋冨害閰嶉�佷换鍔d</Property>
+ </PropertyDef>
+ <PropertyDef name="ddrwlx">
+ <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="yjfayjhbh">
+ <Property/>
+ <Property name="label">搴旀�ユ柟妗堜笌璁″垝缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="rwrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">浠诲姟鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="rwbh">
+ <Property/>
+ <Property name="label">浠诲姟缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="rwbt">
+ <Property/>
+ <Property name="label">浠诲姟鏍囬</Property>
+ </PropertyDef>
+ <PropertyDef name="rwms">
+ <Property/>
+ <Property name="label">浠诲姟鎻忚堪</Property>
+ </PropertyDef>
+ <PropertyDef name="yqsdsj">
+ <Property/>
+ <Property name="label">瑕佹眰閫佽揪鏃堕棿</Property>
+ <Property name="dataType">DateTime</Property>
+ </PropertyDef>
+ <PropertyDef name="mddxzqhbm">
+ <Property/>
+ <Property name="label">鐩殑鍦拌鏀垮尯鍒掔紪鐮�</Property>
+ </PropertyDef>
+ <PropertyDef name="mdddz">
+ <Property/>
+ <Property name="label">杩愰�佺洰鐨勫湴鍦板潃</Property>
+ </PropertyDef>
+ <PropertyDef name="mddzb">
+ <Property/>
+ <Property name="label">杩愰�佺洰鐨勫湴鍧愭爣</Property>
+ </PropertyDef>
+ <PropertyDef name="shdwmc">
+ <Property/>
+ <Property name="label">鏀惰揣鍗曚綅鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="shlxr">
+ <Property/>
+ <Property name="label">鏀惰揣鑱旂郴浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="shlxrdh">
+ <Property/>
+ <Property name="label">鏀惰揣鑱旂郴浜虹數璇�</Property>
+ </PropertyDef>
+ <PropertyDef name="rwfzr">
+ <Property/>
+ <Property name="label">浠诲姟璐熻矗浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="lxid">
+ <Property/>
+ <Property name="label">璺嚎id</Property>
+ </PropertyDef>
+ <PropertyDef name="rwzt">
+ <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>
+ <PropertyDef name="pscl">
+ <Property/>
+ <Property name="label">閰嶉�佽溅杈�</Property>
+ <Property name="dataType">[dtPscl]</Property>
+ </PropertyDef>
+ <PropertyDef name="rwwz">
+ <Property/>
+ <Property name="label">浠诲姟闇�瑕侀厤閫佺殑鐗╄祫</Property>
+ <Property name="dataType">[dtRwwz]</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtRwwz">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlRwwz</Property>
+ <PropertyDef name="pswzid">
+ <Property/>
+ <Property name="label">閰嶉�佺墿璧処D</Property>
+ </PropertyDef>
+ <PropertyDef name="yjfajgid">
+ <Property/>
+ <Property name="label">搴旀�ユ柟妗堢粨鏋淚D</Property>
+ </PropertyDef>
+ <PropertyDef name="lspzbm">
+ <Property/>
+ <Property name="label">鍝佺缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="lspzmc">
+ <Property/>
+ <Property name="label">鍝佺鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="cpbh">
+ <Property/>
+ <Property name="label">浜у搧缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="cpmc">
+ <Property/>
+ <Property name="label">浜у搧鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="sldwbh">
+ <Property/>
+ <Property name="label">璁￠噺鍗曚綅缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="pszl">
+ <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="sdzl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">閫佽揪閲嶉噺</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtPscl">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlPscl</Property>
<PropertyDef name="psclid">
<Property/>
<Property name="label">閰嶉�佽溅杈咺D</Property>
@@ -29,38 +186,33 @@
<Property/>
<Property name="label">浜у搧鍚嶇О</Property>
</PropertyDef>
- <PropertyDef name="sldwid">
+ <PropertyDef name="sldwbh">
<Property/>
- <Property name="label">璁￠噺鍗曚綅id</Property>
+ <Property name="label">璁￠噺鍗曚綅缂栧彿</Property>
</PropertyDef>
- <PropertyDef name="pssl">
- <Property/>
- <Property name="label">閰嶉�佹暟閲�</Property>
- <Property name="dataType">double</Property>
+ <PropertyDef name="pszl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">閰嶉�侀噸閲�</Property>
</PropertyDef>
<PropertyDef name="pszt">
<Property/>
<Property name="label">閰嶉�佺姸鎬�</Property>
</PropertyDef>
- <PropertyDef name="sdsl">
- <Property/>
- <Property name="label">閫佸埌鏁伴噺</Property>
- <Property name="dataType">double</Property>
+ <PropertyDef name="sdzl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">閫佸埌閲嶉噺</Property>
</PropertyDef>
<PropertyDef name="yqsdsj">
- <Property/>
+ <Property name="dataType">DateTime</Property>
<Property name="label">瑕佹眰閫佽揪鏃堕棿</Property>
- <Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="yskssj">
- <Property/>
+ <Property name="dataType">DateTime</Property>
<Property name="label">杩愰�佸紑濮嬫椂闂�</Property>
- <Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="ysjssj">
- <Property/>
+ <Property name="dataType">DateTime</Property>
<Property name="label">杩愰�佺粨鏉熸椂闂�</Property>
- <Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="jsyxm">
<Property/>
@@ -75,14 +227,12 @@
<Property name="label">椹鹃┒鍛樼數璇�</Property>
</PropertyDef>
<PropertyDef name="lssj">
- <Property/>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鎻芥敹鏃堕棿</Property>
- <Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="sdqrsj">
- <Property/>
+ <Property name="dataType">DateTime</Property>
<Property name="label">閫佽揪纭鏃堕棿</Property>
- <Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="sdqrr">
<Property/>
@@ -95,22 +245,6 @@
<PropertyDef name="bdkh">
<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>
- </PropertyDef>
- <PropertyDef name="kqdm">
- <Property></Property>
- <Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
</DataType>
</Model>
@@ -205,80 +339,38 @@
<RowSelectorColumn>
<Property name="caption">涓婁紶</Property>
</RowSelectorColumn>
- <DataColumn name="psclid">
- <Property name="property">psclid</Property>
+ <DataColumn name="ddpsrwid">
+ <Property name="property">ddpsrwid</Property>
</DataColumn>
- <DataColumn name="cphm">
- <Property name="property">cphm</Property>
+ <DataColumn name="ddrwlx">
+ <Property name="property">ddrwlx</Property>
</DataColumn>
- <DataColumn name="lspzbm">
- <Property name="property">lspzbm</Property>
+ <DataColumn name="jlqybh">
+ <Property name="property">jlqybh</Property>
</DataColumn>
- <DataColumn name="lspzmc">
- <Property name="property">lspzmc</Property>
+ <DataColumn name="jlqymc">
+ <Property name="property">jlqymc</Property>
</DataColumn>
- <DataColumn name="cpbh">
- <Property name="property">cpbh</Property>
+ <DataColumn name="jgzdbh">
+ <Property name="property">jgzdbh</Property>
</DataColumn>
- <DataColumn name="cpmc">
- <Property name="property">cpmc</Property>
+ <DataColumn name="jgzdmc">
+ <Property name="property">jgzdmc</Property>
</DataColumn>
- <DataColumn name="sldwid">
- <Property name="property">sldwid</Property>
+ <DataColumn name="yjfayjhbh">
+ <Property name="property">yjfayjhbh</Property>
</DataColumn>
- <DataColumn name="pssl">
- <Property name="property">pssl</Property>
+ <DataColumn name="rwrq">
+ <Property name="property">rwrq</Property>
</DataColumn>
- <DataColumn name="pszt">
- <Property name="property">pszt</Property>
+ <DataColumn name="rwbh">
+ <Property name="property">rwbh</Property>
</DataColumn>
- <DataColumn name="sdsl">
- <Property name="property">sdsl</Property>
- </DataColumn>
- <DataColumn name="yqsdsj">
- <Property name="property">yqsdsj</Property>
- </DataColumn>
- <DataColumn name="yskssj">
- <Property name="property">yskssj</Property>
- </DataColumn>
- <DataColumn name="ysjssj">
- <Property name="property">ysjssj</Property>
- </DataColumn>
- <DataColumn name="jsyxm">
- <Property name="property">jsyxm</Property>
- </DataColumn>
- <DataColumn name="jsysfzh">
- <Property name="property">jsysfzh</Property>
- </DataColumn>
- <DataColumn name="jsydh">
- <Property name="property">jsydh</Property>
- </DataColumn>
- <DataColumn name="lssj">
- <Property name="property">lssj</Property>
- </DataColumn>
- <DataColumn name="sdqrsj">
- <Property name="property">sdqrsj</Property>
- </DataColumn>
- <DataColumn name="sdqrr">
- <Property name="property">sdqrr</Property>
- </DataColumn>
- <DataColumn name="ckm">
- <Property name="property">ckm</Property>
- </DataColumn>
- <DataColumn name="bdkh">
- <Property name="property">bdkh</Property>
- </DataColumn>
- <DataColumn name="bizId">
- <Property name="property">bizId</Property>
- </DataColumn>
- <DataColumn name="updateTime">
- <Property name="property">updateTime</Property>
+ <DataColumn name="rwbt">
+ <Property name="property">rwbt</Property>
</DataColumn>
<DataColumn name="czbz">
<Property name="property">czbz</Property>
- </DataColumn>
- <DataColumn name="kqdm">
- <Property name="property">kqdm</Property>
</DataColumn>
</DataGrid>
</Container>
@@ -287,6 +379,7 @@
<Property name="closeable">false</Property>
<Property name="iconClass">fa fa-sliders</Property>
<Property name="caption">鑳借�楄褰�</Property>
+ <Property name="height">80%</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
@@ -313,53 +406,58 @@
<Property name="labelSeparator">:</Property>
<Property name="labelAlign">left</Property>
<AutoFormElement>
- <Property name="name">psclid</Property>
- <Property name="property">psclid</Property>
+ <Property name="name">ddpsrwid</Property>
+ <Property name="property">ddpsrwid</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">cphm</Property>
- <Property name="property">cphm</Property>
+ <Property name="name">ddrwlx</Property>
+ <Property name="property">ddrwlx</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">lspzbm</Property>
- <Property name="property">lspzbm</Property>
+ <Property name="name">jlqybh</Property>
+ <Property name="property">jlqybh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">lspzmc</Property>
- <Property name="property">lspzmc</Property>
+ <Property name="name">jlqymc</Property>
+ <Property name="property">jlqymc</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">cpbh</Property>
- <Property name="property">cpbh</Property>
+ <Property name="name">jgzdbh</Property>
+ <Property name="property">jgzdbh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">cpmc</Property>
- <Property name="property">cpmc</Property>
+ <Property name="name">jgzdmc</Property>
+ <Property name="property">jgzdmc</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sldwid</Property>
- <Property name="property">sldwid</Property>
+ <Property name="name">yjfayjhbh</Property>
+ <Property name="property">yjfayjhbh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">pssl</Property>
- <Property name="property">pssl</Property>
+ <Property name="name">rwrq</Property>
+ <Property name="property">rwrq</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">pszt</Property>
- <Property name="property">pszt</Property>
+ <Property name="name">rwbh</Property>
+ <Property name="property">rwbh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sdsl</Property>
- <Property name="property">sdsl</Property>
+ <Property name="name">rwbt</Property>
+ <Property name="property">rwbt</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">rwms</Property>
+ <Property name="property">rwms</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -368,53 +466,48 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">yskssj</Property>
- <Property name="property">yskssj</Property>
+ <Property name="name">mddxzqhbm</Property>
+ <Property name="property">mddxzqhbm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ysjssj</Property>
- <Property name="property">ysjssj</Property>
+ <Property name="name">mdddz</Property>
+ <Property name="property">mdddz</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">jsyxm</Property>
- <Property name="property">jsyxm</Property>
+ <Property name="name">mddzb</Property>
+ <Property name="property">mddzb</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">jsysfzh</Property>
- <Property name="property">jsysfzh</Property>
+ <Property name="name">shdwmc</Property>
+ <Property name="property">shdwmc</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">jsydh</Property>
- <Property name="property">jsydh</Property>
+ <Property name="name">shlxr</Property>
+ <Property name="property">shlxr</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">lssj</Property>
- <Property name="property">lssj</Property>
+ <Property name="name">shlxrdh</Property>
+ <Property name="property">shlxrdh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sdqrsj</Property>
- <Property name="property">sdqrsj</Property>
+ <Property name="name">rwfzr</Property>
+ <Property name="property">rwfzr</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sdqrr</Property>
- <Property name="property">sdqrr</Property>
+ <Property name="name">lxid</Property>
+ <Property name="property">lxid</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ckm</Property>
- <Property name="property">ckm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bdkh</Property>
- <Property name="property">bdkh</Property>
+ <Property name="name">rwzt</Property>
+ <Property name="property">rwzt</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -438,6 +531,161 @@
<Editor/>
</AutoFormElement>
</AutoForm>
+ <Panel>
+ <Property name="caption">浠诲姟闇�瑕侀厤閫佺殑鐗╄祫</Property>
+ <Property name="height">80%</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("rwwz");
+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("#dgLink.currentEntity");
+data.remove();</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ </Button>
+ </Container>
+ <DataGrid id="dgRwwz">
+ <Property name="dataPath">#.rwwz</Property>
+ <Property name="dataSet">dsMain</Property>
+ <DataColumn name="pswzid">
+ <Property name="property">pswzid</Property>
+ </DataColumn>
+ <DataColumn name="yjfajgid">
+ <Property name="property">yjfajgid</Property>
+ </DataColumn>
+ <DataColumn name="lspzbm">
+ <Property name="property">lspzbm</Property>
+ </DataColumn>
+ <DataColumn name="lspzmc">
+ <Property name="property">lspzmc</Property>
+ </DataColumn>
+ <DataColumn name="cpbh">
+ <Property name="property">cpbh</Property>
+ </DataColumn>
+ <DataColumn name="cpmc">
+ <Property name="property">cpmc</Property>
+ </DataColumn>
+ <DataColumn name="sldwbh">
+ <Property name="property">sldwbh</Property>
+ </DataColumn>
+ <DataColumn name="pszl">
+ <Property name="property">pszl</Property>
+ </DataColumn>
+ <DataColumn name="ckzl">
+ <Property name="property">ckzl</Property>
+ </DataColumn>
+ <DataColumn name="sdzl">
+ <Property name="property">sdzl</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
+ <Panel>
+ <Property name="caption">閰嶉�佽溅杈�</Property>
+ <Property name="height">80%</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("pscl");
+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("#dgLink.currentEntity");
+data.remove();</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ </Button>
+ </Container>
+ <DataGrid id="dgPscl">
+ <Property name="dataPath">#.pscl</Property>
+ <Property name="dataSet">dsMain</Property>
+ <DataColumn name="psclid">
+ <Property name="property">psclid</Property>
+ </DataColumn>
+ <DataColumn name="cphm">
+ <Property name="property">cphm</Property>
+ </DataColumn>
+ <DataColumn name="lspzbm">
+ <Property name="property">lspzbm</Property>
+ </DataColumn>
+ <DataColumn name="lspzmc">
+ <Property name="property">lspzmc</Property>
+ </DataColumn>
+ <DataColumn name="cpbh">
+ <Property name="property">cpbh</Property>
+ </DataColumn>
+ <DataColumn name="cpmc">
+ <Property name="property">cpmc</Property>
+ </DataColumn>
+ <DataColumn name="sldwbh">
+ <Property name="property">sldwbh</Property>
+ </DataColumn>
+ <DataColumn name="pszl">
+ <Property name="property">pszl</Property>
+ </DataColumn>
+ <DataColumn name="pszt">
+ <Property name="property">pszt</Property>
+ </DataColumn>
+ <DataColumn name="sdzl">
+ <Property name="property">sdzl</Property>
+ </DataColumn>
+ <DataColumn name="yqsdsj">
+ <Property name="property">yqsdsj</Property>
+ </DataColumn>
+ <DataColumn name="yskssj">
+ <Property name="property">yskssj</Property>
+ </DataColumn>
+ <DataColumn name="ysjssj">
+ <Property name="property">ysjssj</Property>
+ </DataColumn>
+ <DataColumn name="jsyxm">
+ <Property name="property">jsyxm</Property>
+ </DataColumn>
+ <DataColumn name="jsysfzh">
+ <Property name="property">jsysfzh</Property>
+ </DataColumn>
+ <DataColumn name="jsydh">
+ <Property name="property">jsydh</Property>
+ </DataColumn>
+ <DataColumn name="lssj">
+ <Property name="property">lssj</Property>
+ </DataColumn>
+ <DataColumn name="sdqrsj">
+ <Property name="property">sdqrsj</Property>
+ </DataColumn>
+ <DataColumn name="sdqrr">
+ <Property name="property">sdqrr</Property>
+ </DataColumn>
+ <DataColumn name="ckm">
+ <Property name="property">ckm</Property>
+ </DataColumn>
+ <DataColumn name="bdkh">
+ <Property name="property">bdkh</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
</Children>
<Tools/>
</Dialog>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1306.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1306.view.xml
index 3555a1e..5759f79 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1306.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1306.view.xml
@@ -6,31 +6,34 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1306</Property>
<PropertyDef name="bdlswzid">
- <Property/>
+ <Property></Property>
<Property name="label">鍖楁枟浣嶇疆ID</Property>
</PropertyDef>
<PropertyDef name="bdkh">
- <Property/>
+ <Property></Property>
<Property name="label">鍖楁枟鍗″彿</Property>
</PropertyDef>
<PropertyDef name="jd">
- <Property/>
+ <Property></Property>
<Property name="label">缁忓害</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="wd">
- <Property/>
+ <Property></Property>
<Property name="label">绾害</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="hbgd">
- <Property/>
+ <Property></Property>
<Property name="label">娴锋嫈楂樺害</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="sbsj">
<Property name="dataType">Date</Property>
<Property name="label">涓婃姤鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="xhly">
- <Property/>
+ <Property></Property>
<Property name="label">淇″彿鏉ユ簮</Property>
</PropertyDef>
<PropertyDef name="bizId">
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1307.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1307.view.xml
index c4c932c..56ac141 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1307.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1307.view.xml
@@ -6,35 +6,35 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1307</Property>
<PropertyDef name="ysrwbdxxid">
- <Property/>
+ <Property></Property>
<Property name="label">杩愰�佷换鍔″寳鏂椾俊鎭疘D</Property>
</PropertyDef>
<PropertyDef name="ysrwlx">
- <Property/>
+ <Property></Property>
<Property name="label">杩愰�佷换鍔＄被鍨�</Property>
</PropertyDef>
<PropertyDef name="bdkh">
- <Property/>
+ <Property></Property>
<Property name="label">鍖楁枟鍗″彿</Property>
</PropertyDef>
<PropertyDef name="cph">
- <Property/>
+ <Property></Property>
<Property name="label">杞︾墝鍙�</Property>
</PropertyDef>
<PropertyDef name="jssj">
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鎺ユ敹鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="wd">
- <Property/>
+ <Property></Property>
<Property name="label">绾害</Property>
</PropertyDef>
<PropertyDef name="jd">
- <Property/>
+ <Property></Property>
<Property name="label">缁忓害</Property>
</PropertyDef>
<PropertyDef name="ysrwmxid">
- <Property/>
+ <Property></Property>
<Property name="label">杩愰�佷换鍔¤溅杈咺D</Property>
</PropertyDef>
<PropertyDef name="bizId">
@@ -146,44 +146,29 @@
<RowSelectorColumn>
<Property name="caption">涓婁紶</Property>
</RowSelectorColumn>
- <DataColumn name="chjlid">
- <Property name="property">chjlid</Property>
+ <DataColumn name="ysrwbdxxid">
+ <Property name="property">ysrwbdxxid</Property>
</DataColumn>
- <DataColumn name="jlqybh">
- <Property name="property">jlqybh</Property>
+ <DataColumn name="ysrwlx">
+ <Property name="property">ysrwlx</Property>
</DataColumn>
- <DataColumn name="ssqymc">
- <Property name="property">ssqymc</Property>
+ <DataColumn name="bdkh">
+ <Property name="property">bdkh</Property>
</DataColumn>
- <DataColumn name="jgzdbh">
- <Property name="property">jgzdbh</Property>
+ <DataColumn name="cph">
+ <Property name="property">cph</Property>
</DataColumn>
- <DataColumn name="jgzdmc">
- <Property name="property">jgzdmc</Property>
+ <DataColumn name="jssj">
+ <Property name="property">jssj</Property>
</DataColumn>
- <DataColumn name="ajbh">
- <Property name="property">ajbh</Property>
+ <DataColumn name="wd">
+ <Property name="property">wd</Property>
</DataColumn>
- <DataColumn name="sbbh">
- <Property name="property">sbbh</Property>
+ <DataColumn name="jd">
+ <Property name="property">jd</Property>
</DataColumn>
- <DataColumn name="cjsj">
- <Property name="property">cjsj</Property>
- </DataColumn>
- <DataColumn name="nhz">
- <Property name="property">nhz</Property>
- </DataColumn>
- <DataColumn name="nhxzz">
- <Property name="property">nhxzz</Property>
- </DataColumn>
- <DataColumn name="nhzl">
- <Property name="property">nhzl</Property>
- </DataColumn>
- <DataColumn name="nhxm">
- <Property name="property">nhxm</Property>
- </DataColumn>
- <DataColumn name="bz">
- <Property name="property">bz</Property>
+ <DataColumn name="ysrwmxid">
+ <Property name="property">ysrwmxid</Property>
</DataColumn>
<DataColumn name="bizId">
<Property name="property">bizId</Property>
@@ -230,68 +215,43 @@
<Property name="labelSeparator">:</Property>
<Property name="labelAlign">left</Property>
<AutoFormElement>
- <Property name="name">chjlid</Property>
- <Property name="property">chjlid</Property>
+ <Property name="name">ysrwbdxxid</Property>
+ <Property name="property">ysrwbdxxid</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">jlqybh</Property>
- <Property name="property">jlqybh</Property>
+ <Property name="name">ysrwlx</Property>
+ <Property name="property">ysrwlx</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ssqymc</Property>
- <Property name="property">ssqymc</Property>
+ <Property name="name">bdkh</Property>
+ <Property name="property">bdkh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">jgzdbh</Property>
- <Property name="property">jgzdbh</Property>
+ <Property name="name">cph</Property>
+ <Property name="property">cph</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">jgzdmc</Property>
- <Property name="property">jgzdmc</Property>
+ <Property name="name">jssj</Property>
+ <Property name="property">jssj</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ajbh</Property>
- <Property name="property">ajbh</Property>
+ <Property name="name">wd</Property>
+ <Property name="property">wd</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sbbh</Property>
- <Property name="property">sbbh</Property>
+ <Property name="name">jd</Property>
+ <Property name="property">jd</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">cjsj</Property>
- <Property name="property">cjsj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">nhz</Property>
- <Property name="property">nhz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">nhxzz</Property>
- <Property name="property">nhxzz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">nhzl</Property>
- <Property name="property">nhzl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">nhxm</Property>
- <Property name="property">nhxm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bz</Property>
- <Property name="property">bz</Property>
+ <Property name="name">ysrwmxid</Property>
+ <Property name="property">ysrwmxid</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1308.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1308.view.xml
index fa61c22..831fe29 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1308.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1308.view.xml
@@ -6,39 +6,41 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1308</Property>
<PropertyDef name="gjjlid">
- <Property/>
+ <Property></Property>
<Property name="label">鍛婅璁板綍id</Property>
</PropertyDef>
<PropertyDef name="xzqhbm">
- <Property/>
+ <Property></Property>
<Property name="label">琛屾斂鍖哄垝缂栫爜</Property>
</PropertyDef>
<PropertyDef name="xzqhmc">
- <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="gjsj">
- <Property/>
+ <Property></Property>
<Property name="label">鍛婅鏃堕棿</Property>
+ <Property name="dataType">DateTime</Property>
</PropertyDef>
<PropertyDef name="gjjb">
- <Property/>
+ <Property></Property>
<Property name="label">鍛婅绾у埆</Property>
+ <Property name="dataType">Integer</Property>
</PropertyDef>
<PropertyDef name="gjbt">
- <Property/>
+ <Property></Property>
<Property name="label">鍛婅鏍囬</Property>
</PropertyDef>
<PropertyDef name="gjms">
- <Property/>
+ <Property></Property>
<Property name="label">鍛婅鎻忚堪</Property>
</PropertyDef>
<PropertyDef name="bizId">
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1309.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1309.view.xml
index dffc0ce..ad262bb 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1309.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1309.view.xml
@@ -5,37 +5,65 @@
<Model>
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1309</Property>
- <PropertyDef name="ysrwbdxxid">
+ <PropertyDef name="BDT_THREE_LINK_ID">
<Property/>
- <Property name="label">杩愰�佷换鍔″寳鏂椾俊鎭疘D</Property>
+ <Property name="label">涓夐�氭暟鎹甀D</Property>
</PropertyDef>
- <PropertyDef name="ysrwlx">
+ <PropertyDef name="DIVISION_CODE">
<Property/>
- <Property name="label">杩愰�佷换鍔＄被鍨�</Property>
+ <Property name="label">琛屾斂鍖哄垝缂栫爜</Property>
</PropertyDef>
- <PropertyDef name="bdkh">
+ <PropertyDef name="DIVISION_NAME">
<Property/>
- <Property name="label">鍖楁枟鍗″彿</Property>
+ <Property name="label">琛屾斂鍖哄垝鍚嶇О</Property>
</PropertyDef>
- <PropertyDef name="cph">
+ <PropertyDef name="STATION_CODE">
<Property/>
- <Property name="label">杞︾墝鍙�</Property>
+ <Property name="label">绔欑偣缂栫爜</Property>
</PropertyDef>
- <PropertyDef name="jssj">
+ <PropertyDef name="STATION_NAME">
+ <Property/>
+ <Property name="label">绔欑偣鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="STAT_DATE">
<Property name="dataType">Date</Property>
- <Property name="label">鎺ユ敹鏃堕棿</Property>
+ <Property name="label">缁熻鏃ユ湡</Property>
</PropertyDef>
- <PropertyDef name="wd">
- <Property/>
- <Property name="label">绾害</Property>
+ <PropertyDef name="NUM_TOTAL_DATA">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">涓婃姤鏁版嵁鏁伴噺</Property>
</PropertyDef>
- <PropertyDef name="jd">
- <Property/>
- <Property name="label">缁忓害</Property>
+ <PropertyDef name="NUM_YES_DATA">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">涓婃姤鏁版嵁鎴愬姛鏁�</Property>
</PropertyDef>
- <PropertyDef name="ysrwmxid">
- <Property/>
- <Property name="label">杩愰�佷换鍔¤溅杈咺D</Property>
+ <PropertyDef name="NUM_NOT_DATA">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">涓婃姤鏁版嵁澶辫触鏁�</Property>
+ </PropertyDef>
+ <PropertyDef name="NUM_TOTAL_SYS">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">搴旂敤绯荤粺鏁伴噺</Property>
+ </PropertyDef>
+ <PropertyDef name="NUM_YES_SYS">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">绯荤粺姝ｅ父鏁伴噺</Property>
+ </PropertyDef>
+ <PropertyDef name="NUM_NOT_SYS">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">绯荤粺闈炴甯告暟閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="NUM_TOTAL_CAMERA">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">鎽勫儚澶存甯告暟閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="NUM_YES_CAMERA">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">鎽勫儚澶存甯告暟</Property>
+ </PropertyDef>
+ <PropertyDef name="NUM_NOT_CAMERA">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">鎽勫儚澶村紓甯告暟</Property>
</PropertyDef>
<PropertyDef name="bizId">
<Property></Property>
@@ -146,44 +174,50 @@
<RowSelectorColumn>
<Property name="caption">涓婁紶</Property>
</RowSelectorColumn>
- <DataColumn name="chjlid">
- <Property name="property">chjlid</Property>
+ <DataColumn name="BDT_THREE_LINK_ID">
+ <Property name="property">BDT_THREE_LINK_ID</Property>
</DataColumn>
- <DataColumn name="jlqybh">
- <Property name="property">jlqybh</Property>
+ <DataColumn name="DIVISION_CODE">
+ <Property name="property">DIVISION_CODE</Property>
</DataColumn>
- <DataColumn name="ssqymc">
- <Property name="property">ssqymc</Property>
+ <DataColumn name="DIVISION_NAME">
+ <Property name="property">DIVISION_NAME</Property>
</DataColumn>
- <DataColumn name="jgzdbh">
- <Property name="property">jgzdbh</Property>
+ <DataColumn name="STATION_CODE">
+ <Property name="property">STATION_CODE</Property>
</DataColumn>
- <DataColumn name="jgzdmc">
- <Property name="property">jgzdmc</Property>
+ <DataColumn name="STATION_NAME">
+ <Property name="property">STATION_NAME</Property>
</DataColumn>
- <DataColumn name="ajbh">
- <Property name="property">ajbh</Property>
+ <DataColumn name="STAT_DATE">
+ <Property name="property">STAT_DATE</Property>
</DataColumn>
- <DataColumn name="sbbh">
- <Property name="property">sbbh</Property>
+ <DataColumn name="NUM_TOTAL_DATA">
+ <Property name="property">NUM_TOTAL_DATA</Property>
</DataColumn>
- <DataColumn name="cjsj">
- <Property name="property">cjsj</Property>
+ <DataColumn name="NUM_YES_DATA">
+ <Property name="property">NUM_YES_DATA</Property>
</DataColumn>
- <DataColumn name="nhz">
- <Property name="property">nhz</Property>
+ <DataColumn name="NUM_NOT_DATA">
+ <Property name="property">NUM_NOT_DATA</Property>
</DataColumn>
- <DataColumn name="nhxzz">
- <Property name="property">nhxzz</Property>
+ <DataColumn name="NUM_TOTAL_SYS">
+ <Property name="property">NUM_TOTAL_SYS</Property>
</DataColumn>
- <DataColumn name="nhzl">
- <Property name="property">nhzl</Property>
+ <DataColumn name="NUM_YES_SYS">
+ <Property name="property">NUM_YES_SYS</Property>
</DataColumn>
- <DataColumn name="nhxm">
- <Property name="property">nhxm</Property>
+ <DataColumn name="NUM_NOT_SYS">
+ <Property name="property">NUM_NOT_SYS</Property>
</DataColumn>
- <DataColumn name="bz">
- <Property name="property">bz</Property>
+ <DataColumn name="NUM_TOTAL_CAMERA">
+ <Property name="property">NUM_TOTAL_CAMERA</Property>
+ </DataColumn>
+ <DataColumn name="NUM_YES_CAMERA">
+ <Property name="property">NUM_YES_CAMERA</Property>
+ </DataColumn>
+ <DataColumn name="NUM_NOT_CAMERA">
+ <Property name="property">NUM_NOT_CAMERA</Property>
</DataColumn>
<DataColumn name="bizId">
<Property name="property">bizId</Property>
@@ -230,68 +264,78 @@
<Property name="labelSeparator">:</Property>
<Property name="labelAlign">left</Property>
<AutoFormElement>
- <Property name="name">chjlid</Property>
- <Property name="property">chjlid</Property>
+ <Property name="name">BDT_THREE_LINK_ID</Property>
+ <Property name="property">BDT_THREE_LINK_ID</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">jlqybh</Property>
- <Property name="property">jlqybh</Property>
+ <Property name="name">DIVISION_CODE</Property>
+ <Property name="property">DIVISION_CODE</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ssqymc</Property>
- <Property name="property">ssqymc</Property>
+ <Property name="name">DIVISION_NAME</Property>
+ <Property name="property">DIVISION_NAME</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">jgzdbh</Property>
- <Property name="property">jgzdbh</Property>
+ <Property name="name">STATION_CODE</Property>
+ <Property name="property">STATION_CODE</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">jgzdmc</Property>
- <Property name="property">jgzdmc</Property>
+ <Property name="name">STATION_NAME</Property>
+ <Property name="property">STATION_NAME</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ajbh</Property>
- <Property name="property">ajbh</Property>
+ <Property name="name">STAT_DATE</Property>
+ <Property name="property">STAT_DATE</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sbbh</Property>
- <Property name="property">sbbh</Property>
+ <Property name="name">NUM_TOTAL_DATA</Property>
+ <Property name="property">NUM_TOTAL_DATA</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">cjsj</Property>
- <Property name="property">cjsj</Property>
+ <Property name="name">NUM_YES_DATA</Property>
+ <Property name="property">NUM_YES_DATA</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">nhz</Property>
- <Property name="property">nhz</Property>
+ <Property name="name">NUM_NOT_DATA</Property>
+ <Property name="property">NUM_NOT_DATA</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">nhxzz</Property>
- <Property name="property">nhxzz</Property>
+ <Property name="name">NUM_TOTAL_SYS</Property>
+ <Property name="property">NUM_TOTAL_SYS</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">nhzl</Property>
- <Property name="property">nhzl</Property>
+ <Property name="name">NUM_YES_SYS</Property>
+ <Property name="property">NUM_YES_SYS</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">nhxm</Property>
- <Property name="property">nhxm</Property>
+ <Property name="name">NUM_NOT_SYS</Property>
+ <Property name="property">NUM_NOT_SYS</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">bz</Property>
- <Property name="property">bz</Property>
+ <Property name="name">NUM_TOTAL_CAMERA</Property>
+ <Property name="property">NUM_TOTAL_CAMERA</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">NUM_YES_CAMERA</Property>
+ <Property name="property">NUM_YES_CAMERA</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">NUM_NOT_CAMERA</Property>
+ <Property name="property">NUM_NOT_CAMERA</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1401.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1401.view.xml
index 6d530af..3649560 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1401.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1401.view.xml
@@ -44,15 +44,21 @@
<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="jcbgfjmx">
+ <PropertyDef name="jcbgfjmx">
+ <Property></Property>
<Property name="label">妫�鏌ユ姤鍛婇檮浠朵笂閾炬槑缁�</Property>
<Property name="dataType">[dtLink]</Property>
- </Reference>
+ </PropertyDef>
</DataType>
<DataType name="dtLink">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlLink</Property>
@@ -189,9 +195,6 @@
</DataColumn>
<DataColumn name="kqdm">
<Property name="property">kqdm</Property>
- </DataColumn>
- <DataColumn name="jcbgfjmx">
- <Property name="property">jcbgfjmx</Property>
</DataColumn>
</DataGrid>
</Container>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1402.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1402.view.xml
index e6dfc49..859472f 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1402.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1402.view.xml
@@ -6,87 +6,93 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1402</Property>
<PropertyDef name="kgpjid">
- <Property/>
+ <Property></Property>
<Property name="label">鍙ｆ劅璇勪环id</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="cpid">
- <Property/>
+ <Property></Property>
<Property name="label">浜у搧id</Property>
</PropertyDef>
<PropertyDef name="cpbh">
- <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="pflb">
- <Property/>
+ <Property></Property>
<Property name="label">璇勫垎绫诲埆</Property>
</PropertyDef>
<PropertyDef name="pjsj">
- <Property/>
+ <Property></Property>
<Property name="label">璇勪环鏃堕棿</Property>
+ <Property name="dataType">DateTime</Property>
</PropertyDef>
<PropertyDef name="pjr">
- <Property/>
+ <Property></Property>
<Property name="label">璇勪环浜�</Property>
</PropertyDef>
<PropertyDef name="zhpj">
- <Property/>
+ <Property></Property>
<Property name="label">缁煎悎璇勪环</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="pjwg">
- <Property/>
+ <Property></Property>
<Property name="label">澶栬</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="pjqw">
- <Property/>
+ <Property></Property>
<Property name="label">姘斿懗</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="pjskx">
- <Property/>
+ <Property></Property>
<Property name="label">閫傚彛鎬�</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="pjwd">
- <Property/>
+ <Property></Property>
<Property name="label">鍛抽亾</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="zlfk">
- <Property/>
+ <Property></Property>
<Property name="label">璐ㄩ噺鍙嶉</Property>
</PropertyDef>
<PropertyDef name="cppc">
- <Property/>
+ <Property></Property>
<Property name="label">浜у搧鎵规</Property>
</PropertyDef>
<PropertyDef name="sfyx">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁鏈夋晥</Property>
</PropertyDef>
<PropertyDef name="bizId">
- <Property/>
+ <Property></Property>
<Property name="label">涓氬姟ID</Property>
</PropertyDef>
<PropertyDef name="updateTime">
@@ -94,11 +100,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>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1403.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1403.view.xml
index db1763b..67be988 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1403.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1403.view.xml
@@ -165,10 +165,16 @@
<Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
- <Reference name="dyqyry">
+ <PropertyDef name="dyqyry">
+ <Property></Property>
<Property name="label">鍔ㄥ憳浼佷笟浜哄憳</Property>
<Property name="dataType">[dtDyqyry]</Property>
- </Reference>
+ </PropertyDef>
+ <PropertyDef name="dyqycl">
+ <Property></Property>
+ <Property name="label">鍔ㄥ憳浼佷笟浜哄憳</Property>
+ <Property name="dataType">[dtDyqycl]</Property>
+ </PropertyDef>
</DataType>
<DataType name="dtDyqyry">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlDYQYRY</Property>
@@ -199,6 +205,33 @@
<PropertyDef name="bz">
<Property></Property>
<Property name="label">澶囨敞</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtDyqycl">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlDYQYCL</Property>
+ <PropertyDef name="dyqyclbh">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="cllx">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="cph">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="jsr">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="jsrsfz">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="lxdz">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="sfyx">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="bz">
+ <Property/>
</PropertyDef>
</DataType>
</Model>
@@ -323,98 +356,11 @@
<DataColumn name="qyxzqhdm">
<Property name="property">qyxzqhdm</Property>
</DataColumn>
- <DataColumn name="xynl">
- <Property name="property">xynl</Property>
- </DataColumn>
- <DataColumn name="xysd">
- <Property name="property">xysd</Property>
- </DataColumn>
- <DataColumn name="sbzs">
- <Property name="property">sbzs</Property>
- </DataColumn>
- <DataColumn name="yyzs">
- <Property name="property">yyzs</Property>
- </DataColumn>
- <DataColumn name="nx">
- <Property name="property">nx</Property>
- </DataColumn>
- <DataColumn name="ssmz">
- <Property name="property">ssmz</Property>
- </DataColumn>
- <DataColumn name="gcdy">
- <Property name="property">gcdy</Property>
- </DataColumn>
- <DataColumn name="zgzg">
- <Property name="property">zgzg</Property>
- </DataColumn>
- <DataColumn name="qyjyglry">
- <Property name="property">qyjyglry</Property>
- </DataColumn>
- <DataColumn name="zyjsry">
- <Property name="property">zyjsry</Property>
- </DataColumn>
- <DataColumn name="jsgr">
- <Property name="property">jsgr</Property>
- </DataColumn>
- <DataColumn name="cqzg">
- <Property name="property">cqzg</Property>
- </DataColumn>
- <DataColumn name="lszg">
- <Property name="property">lszg</Property>
- </DataColumn>
- <DataColumn name="qtcyry">
- <Property name="property">qtcyry</Property>
- </DataColumn>
- <DataColumn name="yjs">
- <Property name="property">yjs</Property>
- </DataColumn>
- <DataColumn name="dxbk">
- <Property name="property">dxbk</Property>
- </DataColumn>
- <DataColumn name="dxzk">
- <Property name="property">dxzk</Property>
- </DataColumn>
- <DataColumn name="zzrs">
- <Property name="property">zzrs</Property>
- </DataColumn>
- <DataColumn name="gz">
- <Property name="property">gz</Property>
- </DataColumn>
- <DataColumn name="czjyx">
- <Property name="property">czjyx</Property>
- </DataColumn>
- <DataColumn name="z35syx">
- <Property name="property">z35syx</Property>
- </DataColumn>
- <DataColumn name="z36z45">
- <Property name="property">z36z45</Property>
- </DataColumn>
- <DataColumn name="z46z54">
- <Property name="property">z46z54</Property>
- </DataColumn>
- <DataColumn name="z55ys">
- <Property name="property">z55ys</Property>
- </DataColumn>
- <DataColumn name="sfyx">
- <Property name="property">sfyx</Property>
- </DataColumn>
- <DataColumn name="bz">
- <Property name="property">bz</Property>
- </DataColumn>
- <DataColumn name="bizId">
- <Property name="property">bizId</Property>
- </DataColumn>
<DataColumn name="updateTime">
<Property name="property">updateTime</Property>
</DataColumn>
<DataColumn name="czbz">
<Property name="property">czbz</Property>
- </DataColumn>
- <DataColumn name="kqdm">
- <Property name="property">kqdm</Property>
- </DataColumn>
- <DataColumn name="dyqyry">
- <Property name="property">dyqyry</Property>
</DataColumn>
</DataGrid>
</Container>
@@ -660,7 +606,7 @@
<Property name="text">鑿滃崟鏍忥細</Property>
</Label>
<Button layoutConstraint="left">
- <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("jcbgfjmx");
+ <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("dyqyry");
list.insert({});</ClientEvent>
<Property name="caption">鏂板</Property>
<Property name="exClassName">btn-default</Property>
@@ -674,7 +620,7 @@
<Property name="iconClass">fa fa-minus</Property>
</Button>
</Container>
- <DataGrid id="dgLink">
+ <DataGrid id="dgdyry">
<Property name="dataPath">#.dyqyry</Property>
<Property name="dataSet">dsMain</Property>
<DataColumn name="dyqyrybh">
@@ -702,6 +648,61 @@
</Children>
<Tools/>
</Panel>
+ <Panel>
+ <Property name="caption">鍔ㄥ憳浼佷笟杞﹁締</Property>
+ <Property name="height">80%</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("dyqycl");
+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("#dgLink.currentEntity");
+data.remove();</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ </Button>
+ </Container>
+ <DataGrid id="dgdycl">
+ <Property name="dataPath">#.dyqycl</Property>
+ <Property name="dataSet">dsMain</Property>
+ <DataColumn name="dyqyclbh">
+ <Property name="property">dyqyclbh</Property>
+ </DataColumn>
+ <DataColumn name="cllx">
+ <Property name="property">cllx</Property>
+ </DataColumn>
+ <DataColumn name="cph">
+ <Property name="property">cph</Property>
+ </DataColumn>
+ <DataColumn name="jsr">
+ <Property name="property">jsr</Property>
+ </DataColumn>
+ <DataColumn name="jsrsfz">
+ <Property name="property">jsrsfz</Property>
+ </DataColumn>
+ <DataColumn name="lxdz">
+ <Property name="property">lxdz</Property>
+ </DataColumn>
+ <DataColumn name="sfyx">
+ <Property name="property">sfyx</Property>
+ </DataColumn>
+ <DataColumn name="bz">
+ <Property name="property">bz</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
</Children>
<Tools/>
</Dialog>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1404.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1404.view.xml
index c9a1db2..563755c 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1404.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1404.view.xml
@@ -6,83 +6,87 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1404</Property>
<PropertyDef name="dyspid">
- <Property/>
+ <Property></Property>
<Property name="label">鍔ㄥ憳鍟嗗搧Id</Property>
</PropertyDef>
<PropertyDef name="dyqynm">
- <Property/>
+ <Property></Property>
<Property name="label">鍔ㄥ憳浼佷笟缂栫爜</Property>
</PropertyDef>
<PropertyDef name="qymc">
- <Property/>
+ <Property></Property>
<Property name="label">鍔ㄥ憳浼佷笟鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="dywz">
- <Property/>
+ <Property></Property>
<Property name="label">鍔ㄥ憳浣嶇疆</Property>
</PropertyDef>
<PropertyDef name="cplx">
- <Property/>
+ <Property></Property>
<Property name="label">浜у搧绫诲瀷</Property>
</PropertyDef>
<PropertyDef name="lspzbm">
- <Property/>
+ <Property></Property>
<Property name="label">鍝佺缂栧彿</Property>
</PropertyDef>
<PropertyDef name="lspzmc">
- <Property/>
+ <Property></Property>
<Property name="label">鍝佺鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="ppbh">
- <Property/>
+ <Property></Property>
<Property name="label">鍝佺墝缂栧彿</Property>
</PropertyDef>
<PropertyDef name="ppmc">
- <Property/>
+ <Property></Property>
<Property name="label">鍝佺墝鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="cpbh">
- <Property/>
+ <Property></Property>
<Property name="label">浜у搧缂栧彿</Property>
</PropertyDef>
<PropertyDef name="cpmc">
- <Property/>
+ <Property></Property>
<Property name="label">浜у搧鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="dj">
- <Property/>
+ <Property></Property>
<Property name="label">鍗曚环</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="scrq">
- <Property/>
+ <Property></Property>
<Property name="label">鐢熶骇鏃ユ湡</Property>
+ <Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="cppc">
- <Property/>
+ <Property></Property>
<Property name="label">鎵规</Property>
</PropertyDef>
<PropertyDef name="sl">
- <Property/>
+ <Property></Property>
<Property name="label">鏁伴噺</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="sldwbm">
- <Property/>
+ <Property></Property>
<Property name="label">鏁伴噺鍗曚綅缂栫爜</Property>
</PropertyDef>
<PropertyDef name="zl">
- <Property/>
+ <Property></Property>
<Property name="label">閲嶉噺</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="zldwbm">
- <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">
@@ -233,38 +237,11 @@
<DataColumn name="scrq">
<Property name="property">scrq</Property>
</DataColumn>
- <DataColumn name="cppc">
- <Property name="property">cppc</Property>
- </DataColumn>
- <DataColumn name="sl">
- <Property name="property">sl</Property>
- </DataColumn>
- <DataColumn name="sldwbm">
- <Property name="property">sldwbm</Property>
- </DataColumn>
- <DataColumn name="zl">
- <Property name="property">zl</Property>
- </DataColumn>
- <DataColumn name="zldwbm">
- <Property name="property">zldwbm</Property>
- </DataColumn>
- <DataColumn name="sfyx">
- <Property name="property">sfyx</Property>
- </DataColumn>
- <DataColumn name="bz">
- <Property name="property">bz</Property>
- </DataColumn>
- <DataColumn name="bizId">
- <Property name="property">bizId</Property>
- </DataColumn>
<DataColumn name="updateTime">
<Property name="property">updateTime</Property>
</DataColumn>
<DataColumn name="czbz">
<Property name="property">czbz</Property>
- </DataColumn>
- <DataColumn name="kqdm">
- <Property name="property">kqdm</Property>
</DataColumn>
</DataGrid>
</Container>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1405.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1405.view.xml
index f97a42c..1c5ed9a 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1405.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1405.view.xml
@@ -6,139 +6,147 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1405</Property>
<PropertyDef name="dyxyid">
- <Property/>
+ <Property></Property>
<Property name="label">鍔ㄥ憳鍗忚id</Property>
</PropertyDef>
<PropertyDef name="dyqynm">
- <Property/>
+ <Property></Property>
<Property name="label">鍔ㄥ憳浼佷笟鍐呯爜</Property>
</PropertyDef>
<PropertyDef name="htkhbh">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓瀹㈡埛缂栧彿</Property>
</PropertyDef>
<PropertyDef name="htkhmc">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓瀹㈡埛鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="htbh">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓缂栧彿</Property>
</PropertyDef>
<PropertyDef name="htlb">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓绫诲埆</Property>
</PropertyDef>
<PropertyDef name="htbt">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓鏍囬</Property>
</PropertyDef>
<PropertyDef name="cpid">
- <Property/>
+ <Property></Property>
<Property name="label">浜у搧id</Property>
</PropertyDef>
<PropertyDef name="spbm">
- <Property/>
+ <Property></Property>
<Property name="label">鍟嗗搧缂栫爜</Property>
</PropertyDef>
<PropertyDef name="htspsl">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓鍟嗗搧鏁伴噺</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="htspdj">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓鍟嗗搧鍗曚环</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="zje">
- <Property/>
+ <Property></Property>
<Property name="label">鎬婚噾棰�</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="htqdr">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓绛捐鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="htqdsj">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓绛捐鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="htsxsj">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓鐢熸晥鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="htjzsj">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓鎴鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="htcjr">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓鍒涘缓浜�</Property>
</PropertyDef>
<PropertyDef name="htcjsj">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓鍒涘缓鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="htdbgjlbz">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓鐨勫彉鏇磋褰曟爣蹇�</Property>
</PropertyDef>
<PropertyDef name="htbgyy">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓鍙樻洿鍘熷洜</Property>
</PropertyDef>
<PropertyDef name="htlx">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓绫诲瀷</Property>
</PropertyDef>
<PropertyDef name="yhtbh">
- <Property/>
+ <Property></Property>
<Property name="label">鍘熷悎鍚岀紪鍙�</Property>
</PropertyDef>
<PropertyDef name="zffs">
- <Property/>
+ <Property></Property>
<Property name="label">鏀粯鏂瑰紡</Property>
</PropertyDef>
<PropertyDef name="ywcsl">
- <Property/>
+ <Property></Property>
<Property name="label">宸插畬鎴愭暟閲�</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="ywcslje">
- <Property/>
+ <Property></Property>
<Property name="label">宸插畬鎴愭暟閲忛噾棰�</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="bz">
- <Property/>
+ <Property></Property>
<Property name="label">澶囨敞</Property>
</PropertyDef>
<PropertyDef name="ghzl">
- <Property/>
+ <Property></Property>
<Property name="label">渚涜揣璐ㄩ噺</Property>
</PropertyDef>
<PropertyDef name="zdbzsl">
- <Property/>
+ <Property></Property>
<Property name="label">鏈�浣庝繚闅滄暟閲�</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="ysbzyq">
- <Property/>
+ <Property></Property>
<Property name="label">杩愯緭鍖呰瑕佹眰</Property>
</PropertyDef>
<PropertyDef name="ghxysj">
- <Property/>
+ <Property></Property>
<Property name="label">渚涜揣鍝嶅簲鏃堕棿锛堝皬鏃讹級</Property>
+ <Property name="dataType">Integer</Property>
</PropertyDef>
<PropertyDef name="jfbj">
- <Property/>
+ <Property></Property>
<Property name="label">浜や粯鏍囧噯</Property>
</PropertyDef>
<PropertyDef name="xyzt">
- <Property/>
+ <Property></Property>
<Property name="label">鍗忚鐘舵��</Property>
</PropertyDef>
<PropertyDef name="sxh">
- <Property/>
+ <Property></Property>
<Property name="label">椤哄簭鍙�</Property>
+ <Property name="dataType">Integer</Property>
</PropertyDef>
<PropertyDef name="sfyx">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁鏈夋晥</Property>
</PropertyDef>
<PropertyDef name="bizId">
@@ -283,86 +291,11 @@
<DataColumn name="htspdj">
<Property name="property">htspdj</Property>
</DataColumn>
- <DataColumn name="zje">
- <Property name="property">zje</Property>
- </DataColumn>
- <DataColumn name="htqdr">
- <Property name="property">htqdr</Property>
- </DataColumn>
- <DataColumn name="htqdsj">
- <Property name="property">htqdsj</Property>
- </DataColumn>
- <DataColumn name="htsxsj">
- <Property name="property">htsxsj</Property>
- </DataColumn>
- <DataColumn name="htjzsj">
- <Property name="property">htjzsj</Property>
- </DataColumn>
- <DataColumn name="htcjr">
- <Property name="property">htcjr</Property>
- </DataColumn>
- <DataColumn name="htcjsj">
- <Property name="property">htcjsj</Property>
- </DataColumn>
- <DataColumn name="htdbgjlbz">
- <Property name="property">htdbgjlbz</Property>
- </DataColumn>
- <DataColumn name="htbgyy">
- <Property name="property">htbgyy</Property>
- </DataColumn>
- <DataColumn name="htlx">
- <Property name="property">htlx</Property>
- </DataColumn>
- <DataColumn name="yhtbh">
- <Property name="property">yhtbh</Property>
- </DataColumn>
- <DataColumn name="zffs">
- <Property name="property">zffs</Property>
- </DataColumn>
- <DataColumn name="ywcsl">
- <Property name="property">ywcsl</Property>
- </DataColumn>
- <DataColumn name="ywcslje">
- <Property name="property">ywcslje</Property>
- </DataColumn>
- <DataColumn name="bz">
- <Property name="property">bz</Property>
- </DataColumn>
- <DataColumn name="ghzl">
- <Property name="property">ghzl</Property>
- </DataColumn>
- <DataColumn name="zdbzsl">
- <Property name="property">zdbzsl</Property>
- </DataColumn>
- <DataColumn name="ysbzyq">
- <Property name="property">ysbzyq</Property>
- </DataColumn>
- <DataColumn name="ghxysj">
- <Property name="property">ghxysj</Property>
- </DataColumn>
- <DataColumn name="jfbj">
- <Property name="property">jfbj</Property>
- </DataColumn>
- <DataColumn name="xyzt">
- <Property name="property">xyzt</Property>
- </DataColumn>
- <DataColumn name="sxh">
- <Property name="property">sxh</Property>
- </DataColumn>
- <DataColumn name="sfyx">
- <Property name="property">sfyx</Property>
- </DataColumn>
- <DataColumn name="bizId">
- <Property name="property">bizId</Property>
- </DataColumn>
<DataColumn name="updateTime">
<Property name="property">updateTime</Property>
</DataColumn>
<DataColumn name="czbz">
<Property name="property">czbz</Property>
- </DataColumn>
- <DataColumn name="kqdm">
- <Property name="property">kqdm</Property>
</DataColumn>
</DataGrid>
</Container>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1408.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1408.view.xml
index 4b1b242..43d9191 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1408.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1408.view.xml
@@ -6,95 +6,105 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1408</Property>
<PropertyDef name="dyqynm">
- <Property/>
+ <Property></Property>
<Property name="label">鍔ㄥ憳浼佷笟缂栧彿</Property>
</PropertyDef>
<PropertyDef name="pzflbm">
- <Property/>
+ <Property></Property>
<Property name="label">鍝佺鍒嗙被缂栫爜</Property>
</PropertyDef>
<PropertyDef name="jldwflbm">
- <Property/>
+ <Property></Property>
<Property name="label">璁￠噺鍗曚綅鍒嗙被缂栫爜</Property>
</PropertyDef>
<PropertyDef name="dylb">
- <Property/>
+ <Property></Property>
<Property name="label">绫诲埆</Property>
</PropertyDef>
<PropertyDef name="dywz">
- <Property/>
+ <Property></Property>
<Property name="label">鍔ㄥ憳浣嶇疆</Property>
</PropertyDef>
<PropertyDef name="dywzjd">
- <Property/>
+ <Property></Property>
<Property name="label">鍔ㄥ憳浣嶇疆缁忓害</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="dywzwd">
- <Property/>
+ <Property></Property>
<Property name="label">鍔ㄥ憳浣嶇疆绾害</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="crl">
- <Property/>
+ <Property></Property>
<Property name="label">浠撳閲�</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="cbl">
- <Property/>
+ <Property></Property>
<Property name="label">鍌ㄥ閲�</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="rjgnl">
- <Property/>
+ <Property></Property>
<Property name="label">鏃ュ姞宸ヨ兘鍔�</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="jpsnl">
- <Property/>
+ <Property></Property>
<Property name="label">鏃ラ厤閫佽兘鍔�</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="dyqyzrr">
- <Property/>
+ <Property></Property>
<Property name="label">鍔ㄥ憳浼佷笟璐ｄ换浜�</Property>
</PropertyDef>
<PropertyDef name="zrrdh">
- <Property/>
+ <Property></Property>
<Property name="label">璐ｄ换浜虹數璇�</Property>
</PropertyDef>
<PropertyDef name="dyqyllr">
- <Property/>
+ <Property></Property>
<Property name="label">鍔ㄥ憳浼佷笟l鑱旂粶浜�</Property>
</PropertyDef>
<PropertyDef name="llrdh">
- <Property/>
+ <Property></Property>
<Property name="label">鑱旂粶浜虹數璇�</Property>
</PropertyDef>
<PropertyDef name="pscph">
- <Property/>
+ <Property></Property>
<Property name="label">閰嶉�佽溅鐗屽彿</Property>
</PropertyDef>
<PropertyDef name="pscllx">
- <Property/>
+ <Property></Property>
<Property name="label">閰嶉�佽溅杈嗙被鍨�</Property>
</PropertyDef>
<PropertyDef name="djrq">
- <Property/>
+ <Property></Property>
<Property name="label">鐧昏鏃ユ湡</Property>
+ <Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="yxrq">
- <Property/>
+ <Property></Property>
<Property name="label">鐢熸晥鏃ユ湡</Property>
+ <Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="sxrq">
- <Property/>
+ <Property></Property>
<Property name="label">澶辨晥鏃ユ湡</Property>
+ <Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="sxh">
- <Property/>
+ <Property></Property>
<Property name="label">椤哄簭鍙�</Property>
+ <Property name="dataType">Integer</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">
@@ -242,50 +252,8 @@
<DataColumn name="dyqyzrr">
<Property name="property">dyqyzrr</Property>
</DataColumn>
- <DataColumn name="zrrdh">
- <Property name="property">zrrdh</Property>
- </DataColumn>
- <DataColumn name="dyqyllr">
- <Property name="property">dyqyllr</Property>
- </DataColumn>
- <DataColumn name="llrdh">
- <Property name="property">llrdh</Property>
- </DataColumn>
- <DataColumn name="pscph">
- <Property name="property">pscph</Property>
- </DataColumn>
- <DataColumn name="pscllx">
- <Property name="property">pscllx</Property>
- </DataColumn>
- <DataColumn name="djrq">
- <Property name="property">djrq</Property>
- </DataColumn>
- <DataColumn name="yxrq">
- <Property name="property">yxrq</Property>
- </DataColumn>
- <DataColumn name="sxrq">
- <Property name="property">sxrq</Property>
- </DataColumn>
- <DataColumn name="sxh">
- <Property name="property">sxh</Property>
- </DataColumn>
- <DataColumn name="sfyx">
- <Property name="property">sfyx</Property>
- </DataColumn>
- <DataColumn name="bz">
- <Property name="property">bz</Property>
- </DataColumn>
- <DataColumn name="bizId">
- <Property name="property">bizId</Property>
- </DataColumn>
- <DataColumn name="updateTime">
- <Property name="property">updateTime</Property>
- </DataColumn>
<DataColumn name="czbz">
<Property name="property">czbz</Property>
- </DataColumn>
- <DataColumn name="kqdm">
- <Property name="property">kqdm</Property>
</DataColumn>
</DataGrid>
</Container>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1409.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1409.view.xml
index 262978d..91323fc 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1409.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1409.view.xml
@@ -6,32 +6,33 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1409</Property>
<PropertyDef name="dyyjid">
- <Property/>
+ <Property></Property>
<Property name="label">鍔ㄥ憳棰勮id</Property>
</PropertyDef>
<PropertyDef name="dyqynm">
- <Property/>
+ <Property></Property>
<Property name="label">鍔ㄥ憳浼佷笟缂栧彿</Property>
</PropertyDef>
<PropertyDef name="yjsj">
- <Property/>
+ <Property></Property>
<Property name="label">棰勮鏃堕棿</Property>
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
</PropertyDef>
<PropertyDef name="yjsl">
- <Property/>
+ <Property></Property>
<Property name="label">棰勮鏁伴噺</Property>
+ <Property name="dataType">Integer</Property>
</PropertyDef>
<PropertyDef name="sfzxyj">
- <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">
@@ -39,31 +40,32 @@
<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>
- <Reference name="yjmx">
+ <PropertyDef name="yjmx">
+ <Property></Property>
<Property name="label">棰勮鏄庣粏</Property>
<Property name="dataType">[dtYjmx]</Property>
- </Reference>
+ </PropertyDef>
</DataType>
<DataType name="dtYjmx">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlYJMX</Property>
<PropertyDef name="dyyjmxid">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="dyyjid">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="yjlx">
- <Property/>
+ <Property></Property>
</PropertyDef>
<PropertyDef name="bz">
- <Property/>
+ <Property></Property>
</PropertyDef>
</DataType>
</Model>
@@ -188,9 +190,6 @@
<DataColumn name="kqdm">
<Property name="property">kqdm</Property>
</DataColumn>
- <DataColumn name="yjmx">
- <Property name="property">yjmx</Property>
- </DataColumn>
</DataGrid>
</Container>
<Dialog id="dialogMain">
@@ -274,11 +273,6 @@
<Property name="property">kqdm</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">yjmx</Property>
- <Property name="property">yjmx</Property>
- <Editor/>
- </AutoFormElement>
</AutoForm>
<Panel>
<Property name="caption">棰勮鏄庣粏</Property>
@@ -290,7 +284,7 @@
<Property name="text">鑿滃崟鏍忥細</Property>
</Label>
<Button layoutConstraint="left">
- <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("jcbgfjmx");
+ <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("yjmx");
list.insert({});</ClientEvent>
<Property name="caption">鏂板</Property>
<Property name="exClassName">btn-default</Property>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1410.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1410.view.xml
index e418211..45349ee 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1410.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1410.view.xml
@@ -6,51 +6,51 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1410</Property>
<PropertyDef name="scjgddid">
- <Property/>
+ <Property></Property>
<Property name="label">鐢熶骇鍔犲伐璁㈠崟id</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="htkhbh">
- <Property/>
+ <Property></Property>
<Property name="label">瀹㈡埛缂栧彿</Property>
</PropertyDef>
<PropertyDef name="htid">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓id</Property>
</PropertyDef>
<PropertyDef name="htspid">
- <Property/>
+ <Property></Property>
<Property name="label">鍚堝悓鍟嗗搧ID</Property>
</PropertyDef>
<PropertyDef name="pzflbh">
- <Property/>
+ <Property></Property>
<Property name="label">鍝佺鍒嗙被缂栧彿</Property>
</PropertyDef>
<PropertyDef name="jlppbh">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涚伯鍝佺墝缂栧彿</Property>
</PropertyDef>
<PropertyDef name="jlcpbh">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涚伯浜у搧缂栧彿</Property>
</PropertyDef>
<PropertyDef name="jldwflbm">
- <Property/>
+ <Property></Property>
<Property name="label">璁￠噺鍗曚綅鍒嗙被缂栫爜</Property>
</PropertyDef>
<PropertyDef name="ddrq">
@@ -58,55 +58,55 @@
<Property name="label">鐢熶骇璁㈠崟鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="ddsl">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">璁㈠崟鏁伴噺</Property>
</PropertyDef>
<PropertyDef name="jhfs">
- <Property/>
+ <Property></Property>
<Property name="label">浜よ揣鏂瑰紡</Property>
</PropertyDef>
<PropertyDef name="bzyq">
- <Property/>
+ <Property></Property>
<Property name="label">鍖呰瑕佹眰</Property>
</PropertyDef>
<PropertyDef name="zlyq">
- <Property/>
+ <Property></Property>
<Property name="label">璐ㄩ噺瑕佹眰</Property>
</PropertyDef>
<PropertyDef name="jlzt">
- <Property/>
+ <Property></Property>
<Property name="label">璁板綍鐘舵��</Property>
</PropertyDef>
<PropertyDef name="ddzl">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">璁㈠崟閲嶉噺</Property>
</PropertyDef>
<PropertyDef name="sjsl">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">瀹為檯鏁伴噺</Property>
</PropertyDef>
<PropertyDef name="sjzl">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">瀹為檯閲嶉噺</Property>
</PropertyDef>
<PropertyDef name="scddlx">
- <Property/>
+ <Property></Property>
<Property name="label">鐢熶骇璁㈠崟绫诲瀷</Property>
</PropertyDef>
<PropertyDef name="ddid">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涚伯閲囪喘璁㈠崟id</Property>
</PropertyDef>
<PropertyDef name="jlccjhid">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涚伯绛规帾璁″垝id</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">
@@ -114,11 +114,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>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1411.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1411.view.xml
index f0568c2..5c3df7b 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1411.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1411.view.xml
@@ -5,100 +5,100 @@
<Model>
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1411</Property>
- <PropertyDef name="rkfkjlid">
- <Property/>
- <Property name="label">杞﹁締ID</Property>
+ <PropertyDef name="cph">
+ <Property></Property>
+ <Property name="label">杞︾墝鍙�</Property>
</PropertyDef>
<PropertyDef name="jlgljgbh">
- <Property/>
+ <Property></Property>
<Property name="label">鍐涚伯绠＄悊鏈烘瀯缂栧彿</Property>
</PropertyDef>
<PropertyDef name="jlgljgmc">
- <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="cph">
- <Property/>
- <Property name="label">杞︾墝鍙�</Property>
- </PropertyDef>
<PropertyDef name="cllx">
- <Property/>
+ <Property></Property>
<Property name="label">杞﹁締绫诲瀷</Property>
</PropertyDef>
<PropertyDef name="clzt">
- <Property/>
+ <Property></Property>
<Property name="label">杞﹁締鐘舵��</Property>
</PropertyDef>
<PropertyDef name="sfnbcl">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁鍐呴儴杞﹁締</Property>
</PropertyDef>
<PropertyDef name="bd4gkh">
- <Property/>
+ <Property></Property>
<Property name="label">缁戝畾4G鍗″彿</Property>
</PropertyDef>
<PropertyDef name="bdbdh">
- <Property/>
+ <Property></Property>
<Property name="label">缁戝畾鍖楁枟鍙�</Property>
</PropertyDef>
<PropertyDef name="jsr">
- <Property/>
+ <Property></Property>
<Property name="label">椹鹃┒浜�</Property>
</PropertyDef>
<PropertyDef name="lxdh">
- <Property/>
+ <Property></Property>
<Property name="label">鑱旂郴鐢佃瘽</Property>
</PropertyDef>
<PropertyDef name="sfzh">
- <Property/>
+ <Property></Property>
<Property name="label">韬唤璇佸彿</Property>
</PropertyDef>
<PropertyDef name="jsz">
- <Property/>
+ <Property></Property>
<Property name="label">椹鹃┒璇�</Property>
</PropertyDef>
<PropertyDef name="xsz">
- <Property/>
+ <Property></Property>
<Property name="label">琛岄┒璇�</Property>
</PropertyDef>
<PropertyDef name="clcxc">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">杞︾闀�</Property>
</PropertyDef>
<PropertyDef name="clcxk">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">杞︾瀹�</Property>
</PropertyDef>
<PropertyDef name="clcxg">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">杞︾楂�</Property>
</PropertyDef>
+ <PropertyDef name="clcxz">
+ <Property name="dataType">Double</Property>
+ <Property name="label">杞﹁締杞介噸</Property>
+ </PropertyDef>
<PropertyDef name="dz">
- <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">
@@ -210,23 +210,14 @@
<RowSelectorColumn>
<Property name="caption">涓婁紶</Property>
</RowSelectorColumn>
- <DataColumn name="rkfkjlid">
- <Property name="property">rkfkjlid</Property>
- </DataColumn>
<DataColumn name="jlgljgbh">
<Property name="property">jlgljgbh</Property>
</DataColumn>
<DataColumn name="jlgljgmc">
<Property name="property">jlgljgmc</Property>
</DataColumn>
- <DataColumn name="jlqybh">
- <Property name="property">jlqybh</Property>
- </DataColumn>
<DataColumn name="jlqymc">
<Property name="property">jlqymc</Property>
- </DataColumn>
- <DataColumn name="jgzdbh">
- <Property name="property">jgzdbh</Property>
</DataColumn>
<DataColumn name="jgzdmc">
<Property name="property">jgzdmc</Property>
@@ -249,18 +240,6 @@
<DataColumn name="bdbdh">
<Property name="property">bdbdh</Property>
</DataColumn>
- <DataColumn name="jsr">
- <Property name="property">jsr</Property>
- </DataColumn>
- <DataColumn name="lxdh">
- <Property name="property">lxdh</Property>
- </DataColumn>
- <DataColumn name="sfzh">
- <Property name="property">sfzh</Property>
- </DataColumn>
- <DataColumn name="jsz">
- <Property name="property">jsz</Property>
- </DataColumn>
<DataColumn name="xsz">
<Property name="property">xsz</Property>
</DataColumn>
@@ -273,26 +252,11 @@
<DataColumn name="clcxg">
<Property name="property">clcxg</Property>
</DataColumn>
- <DataColumn name="dz">
- <Property name="property">dz</Property>
- </DataColumn>
- <DataColumn name="sfyx">
- <Property name="property">sfyx</Property>
- </DataColumn>
<DataColumn name="bz">
<Property name="property">bz</Property>
</DataColumn>
- <DataColumn name="bizId">
- <Property name="property">bizId</Property>
- </DataColumn>
- <DataColumn name="updateTime">
- <Property name="property">updateTime</Property>
- </DataColumn>
<DataColumn name="czbz">
<Property name="property">czbz</Property>
- </DataColumn>
- <DataColumn name="kqdm">
- <Property name="property">kqdm</Property>
</DataColumn>
</DataGrid>
</Container>
@@ -327,8 +291,8 @@
<Property name="labelSeparator">:</Property>
<Property name="labelAlign">left</Property>
<AutoFormElement>
- <Property name="name">rkfkjlid</Property>
- <Property name="property">rkfkjlid</Property>
+ <Property name="name">cph</Property>
+ <Property name="property">cph</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -359,11 +323,6 @@
<AutoFormElement>
<Property name="name">jgzdmc</Property>
<Property name="property">jgzdmc</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">cph</Property>
- <Property name="property">cph</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -432,6 +391,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">clcxz</Property>
+ <Property name="property">clcxz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">dz</Property>
<Property name="property">dz</Property>
<Editor/>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1412.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1412.view.xml
index ce62141..fec36c6 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1412.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1412.view.xml
@@ -6,62 +6,66 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1412</Property>
<PropertyDef name="clyshjid">
- <Property/>
+ <Property></Property>
<Property name="label">杞﹁締杩愯緭鐜ID</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="psdh">
- <Property/>
- <Property name="label">閰嶉�佸崟鍙�</Property>
+ <PropertyDef name="ysdh">
+ <Property></Property>
+ <Property name="label">杩愰�佸崟鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="ydlx">
+ <Property></Property>
+ <Property name="label">杩愬崟绫诲瀷</Property>
</PropertyDef>
<PropertyDef name="cph">
- <Property/>
+ <Property></Property>
<Property name="label">杞︾墝鍙风爜</Property>
</PropertyDef>
<PropertyDef name="jcsj">
- <Property/>
+ <Property></Property>
<Property name="label">鐩戞祴鏃堕棿</Property>
<Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="jcwdz">
- <Property/>
+ <Property></Property>
<Property name="label">娓╁害鍊�</Property>
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
- <PropertyDef name="sdz">
- <Property/>
+ <PropertyDef name="jcsdz">
+ <Property></Property>
<Property name="label">婀垮害鍊�</Property>
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="wdsfzc">
- <Property/>
+ <Property></Property>
<Property name="label">娓╁害鏄惁姝ｅ父锛�</Property>
</PropertyDef>
<PropertyDef name="sdsfzc">
- <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">
@@ -188,8 +192,11 @@
<DataColumn name="jgzdmc">
<Property name="property">jgzdmc</Property>
</DataColumn>
- <DataColumn name="psdh">
- <Property name="property">psdh</Property>
+ <DataColumn name="ysdh">
+ <Property name="property">ysdh</Property>
+ </DataColumn>
+ <DataColumn name="ydlx">
+ <Property name="property">ydlx</Property>
</DataColumn>
<DataColumn name="cph">
<Property name="property">cph</Property>
@@ -200,8 +207,9 @@
<DataColumn name="jcwdz">
<Property name="property">jcwdz</Property>
</DataColumn>
- <DataColumn name="sdz">
- <Property name="property">sdz</Property>
+ <DataColumn>
+ <Property name="property">jcsdz</Property>
+ <Property name="name">jcsdz</Property>
</DataColumn>
<DataColumn name="wdsfzc">
<Property name="property">wdsfzc</Property>
@@ -285,9 +293,14 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">psdh</Property>
- <Property name="property">psdh</Property>
+ <Property name="name">ysdh</Property>
+ <Property name="property">ysdh</Property>
<Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ydlx</Property>
+ <Property name="property">ydlx</Property>
+ <Editor/>
</AutoFormElement>
<AutoFormElement>
<Property name="name">cph</Property>
@@ -305,8 +318,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sdz</Property>
- <Property name="property">sdz</Property>
+ <Property name="name">jcsdz</Property>
+ <Property name="property">jcsdz</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1413.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1413.view.xml
index c1c3288..beb6e6b 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1413.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1413.view.xml
@@ -6,55 +6,55 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1413</Property>
<PropertyDef name="lxid">
- <Property/>
+ <Property></Property>
<Property name="label">璺嚎id</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="lxbm">
- <Property/>
+ <Property></Property>
<Property name="label">璺嚎缂栫爜</Property>
</PropertyDef>
<PropertyDef name="cfd">
- <Property/>
+ <Property></Property>
<Property name="label">鍑哄彂鍦�</Property>
</PropertyDef>
<PropertyDef name="mdd">
- <Property/>
+ <Property></Property>
<Property name="label">鐩殑鍦�</Property>
</PropertyDef>
<PropertyDef name="cfdjd">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">鍑哄彂鍦扮粡搴�</Property>
</PropertyDef>
<PropertyDef name="cfdwd">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">鍑哄彂鍦扮含搴�</Property>
</PropertyDef>
<PropertyDef name="mddjd">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">鐩殑鍦扮粡搴�</Property>
</PropertyDef>
<PropertyDef name="mddwd">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">鐩殑鍦扮含搴�</Property>
</PropertyDef>
<PropertyDef name="sfyx">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁鏈夋晥</Property>
</PropertyDef>
<PropertyDef name="bizId">
@@ -73,15 +73,16 @@
<Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
- <Reference name="lxzbmx">
+ <PropertyDef name="lxzbmx">
+ <Property></Property>
<Property name="label">鍧愭爣鏄庣粏</Property>
<Property name="dataType">[dtLxzbmx]</Property>
- </Reference>
+ </PropertyDef>
</DataType>
<DataType name="dtLxzbmx">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlLXZBMX</Property>
<PropertyDef name="zbdid">
- <Property/>
+ <Property></Property>
<Property name="label">鍧愭爣鐐规槑缁唅d</Property>
</PropertyDef>
<PropertyDef name="zbdwd">
@@ -89,7 +90,7 @@
<Property name="label">鍧愭爣鐐圭粡搴�</Property>
</PropertyDef>
<PropertyDef name="zbdjd">
- <Property name="dataType">double</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">鍧愭爣鐐圭含搴�</Property>
</PropertyDef>
<PropertyDef name="sxh">
@@ -369,7 +370,7 @@
<Property name="text">鑿滃崟鏍忥細</Property>
</Label>
<Button layoutConstraint="left">
- <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("jcbgfjmx");
+ <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("lxzbmx");
list.insert({});</ClientEvent>
<Property name="caption">鏂板</Property>
<Property name="exClassName">btn-default</Property>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java b/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
index 50c502f..81f43a3 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
@@ -314,8 +314,12 @@
public static String API_CODE_KNZCJL = "KNZCJL";
//鎺ュ彛缂栫爜-1212 鍑哄叆搴撹褰� --璺緞(CRKJL)
public static String API_CODE_CRKJL = "CRKJL";
+ //鎺ュ彛缂栫爜-1213 鍑哄叆搴撶粨绠楄褰� --璺緞(CRKJSJL)
+ public static String API_CODE_CRKJSJL = "CRKJSJL";
//鎺ュ彛缂栫爜-1214 璐ㄦ鏈烘瀯 --璺緞(ZJJG)
public static String API_CODE_ZJJG = "ZJJG";
+ //鎺ュ彛缂栫爜-1215 鏍峰搧鐧昏淇℃伅 --璺緞(YPDJXX)
+ public static String API_CODE_YPDJXX = "YPDJXX";
//鎺ュ彛缂栫爜-1216 璐ㄦ鎶ュ憡 --璺緞(ZJBG)
public static String API_CODE_ZJBG = "ZJBG";
//鎺ュ彛缂栫爜-1217 淇濊川鏈熼璀﹁鍒� --璺緞(BZQYJGZ)
@@ -336,19 +340,41 @@
public static String API_CODE_NHJL = "NHJL";
//鎺ュ彛缂栫爜-1305 璋冨害閰嶉�佷换鍔� --璺緞(DDPSRW)
public static String API_CODE_DDPSRW = "DDPSRW";
- //鎺ュ彛缂栫爜-1401 鍔ㄥ憳浼佷笟 --璺緞(DYQY)
+ //鎺ュ彛缂栫爜-1306 鍖楁枟浣嶇疆淇℃伅 --璺緞(BDWZXX)
+ public static String API_CODE_BDWZXX = "BDWZXX";
+ //鎺ュ彛缂栫爜-1307 杩愯緭浠诲姟鍖楁枟淇℃伅 --璺緞(YSRWBDXX)
+ public static String API_CODE_YSRWBDXX = "YSRWBDXX";
+ //鎺ュ彛缂栫爜-1308 瑙嗛棰勮鍛婅 --璺緞(SPYJGJ)
+ public static String API_CODE_SPYJGJ = "SPYJGJ";
+ //鎺ュ彛缂栫爜-1309 涓夐�氭暟鎹� --璺緞(STSJ)
+ public static String API_CODE_STSJ = "STSJ";
+ //鎺ュ彛缂栫爜-1401 鐢熶骇璐ㄩ噺閾� --璺緞(SCZLL)
+ public static String API_CODE_SCZLL = "SCZLL";
+ //鎺ュ彛缂栫爜-1402 鍙ｆ劅璇勪环 --璺緞(KGPJ)
+ public static String API_CODE_KGPJ = "KGPJ";
+ //鎺ュ彛缂栫爜-1403 鍔ㄥ憳浼佷笟 --璺緞(DYQY)
public static String API_CODE_DYQY = "DYQY";
- //鎺ュ彛缂栫爜-1402 鍔ㄥ憳鍗忚 --璺緞(DYXY)
+ //鎺ュ彛缂栫爜-1404 鍔ㄥ憳鍟嗗搧 --璺緞(DYSP)
+ public static String API_CODE_DYSP = "DYSP";
+ //鎺ュ彛缂栫爜-1405 鍔ㄥ憳鍗忚 --璺緞(DYXY)
public static String API_CODE_DYXY = "DYXY";
- //鎺ュ彛缂栫爜-1403 鍔ㄥ憳鑳藉姏 --璺緞(DYNL)
+ //鎺ュ彛缂栫爜-1406 鍔ㄥ憳鍗忚鍙樻洿 --璺緞(DYXYBG)
+ public static String API_CODE_DYXYBG = "DYXYBG";
+ //鎺ュ彛缂栫爜-1407 鍔ㄥ憳鍗忚鎵ц鏄庣粏 --璺緞(DYXYZXMX)
+ public static String API_CODE_DYXYZXMX = "DYXYZXMX";
+ //鎺ュ彛缂栫爜-1408 鍔ㄥ憳鑳藉姏 --璺緞(DYNL)
public static String API_CODE_DYNL = "DYNL";
- //鎺ュ彛缂栫爜-1404 鍔ㄥ憳棰勮 --璺緞(DYYJ)
+ //鎺ュ彛缂栫爜-1409 鍔ㄥ憳棰勮 --璺緞(DYYJ)
public static String API_CODE_DYYJ = "DYYJ";
- //鎺ュ彛缂栫爜-1405 鐢熶骇鍔犲伐璁㈠崟 --璺緞(SCJGDD)
+ //鎺ュ彛缂栫爜-1410 鐢熶骇鍔犲伐璁㈠崟 --璺緞(SCJGDD)
public static String API_CODE_SCJGDD = "SCJGDD";
- //鎺ュ彛缂栫爜-1406 杩愯緭璺嚎 --璺緞(YSLX)
+ //鎺ュ彛缂栫爜-1411 杞﹁締淇℃伅 --璺緞(CLXX)
+ public static String API_CODE_CLXX = "CLXX";
+ //鎺ュ彛缂栫爜-1412 杞﹁締杩愯緭鐜 --璺緞(CLYSHJ)
+ public static String API_CODE_CLYSHJ = "CLYSHJ";
+ //鎺ュ彛缂栫爜-1413 杩愯緭璺嚎 --璺緞(YSLX)
public static String API_CODE_YSLX = "YSLX";
- //鎺ュ彛缂栫爜-1407 搴旀�ヨ皟搴� --璺緞(YJDD)
+ //鎺ュ彛缂栫爜- 搴旀�ヨ皟搴� --璺緞(YJDD)
public static String API_CODE_YJDD = "YJDD";
}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1220.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1220.java
index c3b00fe..1be6c03 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1220.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1220.java
@@ -27,7 +27,8 @@
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
private String kcyjgcid; //浣跨敤鐨勫憡璀﹁鍒橧D
- private String yjsj; //棰勮鏃堕棿
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date yjsj; //棰勮鏃堕棿
private String cpbh; //浜у搧缂栧彿
private String cpmc; //浜у搧鍚嶇О
private String gjdj; //鍛婅绛夌骇
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1301.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1301.java
index 29fab2c..66e1043 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1301.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1301.java
@@ -22,24 +22,25 @@
private String lqjcid; //绮儏妫�娴媔d
private String jlqybh; //鍐涚伯浼佷笟缂栧彿
- private String ssqymc; //鍐涚伯浼佷笟鍚嶇О
+ private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
private String cfbh; //浠撴埧缂栧彿
private String sscfmc; //浠撴埧鍚嶇О
private String ajbh; //寤掗棿缂栧彿
private String ajmc; //寤掗棿鍚嶇О
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date jcsj; //妫�娴嬫椂闂�
- private double cw; //浠撴俯
- private double sw; //浠撴箍
- private double ww; //澶栨俯
- private double ws; //澶栨箍
- private double pjlw; //骞冲潎绮俯
- private double zglw; //鏈�楂樼伯娓�
- private double zdlw; //鏈�浣庣伯娓�
- private double pjlx; //骞冲潎绮箍
- private double zglx; //鏈�楂樼伯婀�
- private double zdlx; //鏈�浣庣伯婀�
+ private Double cw; //浠撴俯
+ private Double sw; //浠撴箍
+ private Double ww; //澶栨俯
+ private Double ws; //澶栨箍
+ private Double pjlw; //骞冲潎绮俯
+ private Double zglw; //鏈�楂樼伯娓�
+ private Double zdlw; //鏈�浣庣伯娓�
+ private Double pjlx; //骞冲潎绮箍
+ private Double zglx; //鏈�楂樼伯婀�
+ private Double zdlx; //鏈�浣庣伯婀�
private String jcjg; //妫�娴嬬粨鏋�
private List<WhjlWDZJH> wdzjh; //娓╁害鍊奸泦鍚�
private List<WhjlXDZJH> xdzjh; //婀垮害鍊奸泦鍚�
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1302.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1302.java
index 68f4547..e23964c 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1302.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1302.java
@@ -29,8 +29,8 @@
private String rwbh; //璋冨害浠诲姟缂栧彿
private String psclid; //閰嶉�佽溅鐗屽彿
private Date cjsj; //閲囬泦鏃堕棿
- private double wdz; //娓╁害鍊�
- private double xdz; //婀垮害鍊�
+ private Double wdz; //娓╁害鍊�
+ private Double xdz; //婀垮害鍊�
private String wdzsfhg; //娓╁害鍊兼槸鍚﹀悎鏍�
private String xdzsfhg; //婀垮害鍊兼槸鍚﹀悎鏍�
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1303.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1303.java
index 01f991d..e8eef7d 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1303.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1303.java
@@ -23,10 +23,11 @@
private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date gjsj; //鍛婅鏃堕棿
private String gjbt; //鍛婅鏍囬
private String gjms; //鍛婅鎻忚堪
- private String gjjb; //鍛婅绾у埆
+ private Integer gjjb; //鍛婅绾у埆
//鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
@JSONField(serialize = false)
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java
index 8614015..b7a0b38 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1304.java
@@ -28,10 +28,11 @@
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
private String ajbh; //寤掗棿缂栧彿
private String sbbh; //璁惧缂栧彿
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date cjsj; //閲囬泦鏃堕棿
- private String nhz; //鑳借�楀��
- private String nhxzz; //鑳借�椾慨姝ｅ��
- private String nhzl; //鑳借�楀閲�
+ private Double nhz; //鑳借�楀��
+ private Double nhxzz; //鑳借�椾慨姝ｅ��
+ private Double nhzl; //鑳借�楀閲�
private String nhxm; //鑳借�楅」鐩�
private String bz; //澶囨敞
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1305.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1305.java
index 40f5af1..4bee450 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1305.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1305.java
@@ -6,6 +6,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* 鍌ㄨ繍鐜-璋冨害閰嶉�佷换鍔�
@@ -19,27 +20,32 @@
*/
private static final long serialVersionUID = 1L;
- private String psclid; //閰嶉�佽溅杈咺D
- private String cphm; //杞︾墝鍙风爜
- private String lspzbm; //鍝佺缂栧彿
- private String lspzmc; //鍝佺鍚嶇О
- private String cpbh; //浜у搧缂栧彿
- private String cpmc; //浜у搧鍚嶇О
- private String sldwid; //璁￠噺鍗曚綅id
- private double pssl; //閰嶉�佹暟閲�
- private String pszt; //閰嶉�佺姸鎬�
- private double sdsl; //閫佸埌鏁伴噺
+ private String ddpsrwid; //璋冨害閰嶉�佷换鍔d
+ private String ddrwlx; //璋冨害浠诲姟绫诲瀷
+ private String jlqybh; //鍐涚伯浼佷笟缂栧彿
+ private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
+ private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
+ private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
+ private String yjfayjhbh; //搴旀�ユ柟妗堜笌璁″垝缂栧彿
+ @JSONField(format = "yyyy-MM-dd")
+ private Date rwrq; //浠诲姟鏃ユ湡
+ private String rwbh; //浠诲姟缂栧彿
+ private String rwbt; //浠诲姟鏍囬
+ private String rwms; //浠诲姟鎻忚堪
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date yqsdsj; //瑕佹眰閫佽揪鏃堕棿
- private Date yskssj; //杩愰�佸紑濮嬫椂闂�
- private Date ysjssj; //杩愰�佺粨鏉熸椂闂�
- private String jsyxm; //椹鹃┒鍛樺鍚�
- private String jsysfzh; //椹鹃┒鍛樿韩浠借瘉鍙�
- private String jsydh; //椹鹃┒鍛樼數璇�
- private Date lssj; //鎻芥敹鏃堕棿
- private Date sdqrsj; //閫佽揪纭鏃堕棿
- private String sdqrr; //閫佽揪纭浜�
- private String ckm; //鍑哄簱鐮�
- private String bdkh; //鍖楁枟鍗″彿
+ private String mddxzqhbm; //鐩殑鍦拌鏀垮尯鍒掔紪鐮�
+ private String mdddz; //杩愰�佺洰鐨勫湴鍦板潃
+ private String mddzb; //杩愰�佺洰鐨勫湴鍧愭爣
+ private String shdwmc; //鏀惰揣鍗曚綅鍚嶇О
+ private String shlxr; //鏀惰揣鑱旂郴浜�
+ private String shlxrdh; //鏀惰揣鑱旂郴浜虹數璇�
+ private String rwfzr; //浠诲姟璐熻矗浜�
+ private String lxid; //璺嚎id
+ private List<WhjlRwwz> rwwz; //浠诲姟闇�瑕侀厤閫佺殑鐗╄祫
+ private List<WhjlPscl> pscl; //閰嶉�佽溅杈�
+ private String rwzt; //浠诲姟鐘舵��
+
//鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
@JSONField(serialize = false)
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1306.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1306.java
index bbe5c2e..ce06a36 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1306.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1306.java
@@ -22,9 +22,9 @@
private String bdlswzid; //鍖楁枟浣嶇疆ID
private String bdkh; //鍖楁枟鍗″彿
- private String jd; //缁忓害
- private String wd; //绾害
- private String hbgd; //娴锋嫈楂樺害
+ private Double jd; //缁忓害
+ private Double wd; //绾害
+ private Double hbgd; //娴锋嫈楂樺害
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date sbsj; //涓婃姤鏃堕棿
private String xhly; //淇″彿鏉ユ簮
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1308.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1308.java
index 8385838..d948829 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1308.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1308.java
@@ -24,8 +24,9 @@
private String xzqhmc; //琛屾斂鍖哄垝鍚嶇О
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
- private String gjsj; //鍛婅鏃堕棿
- private String gjjb; //鍛婅绾у埆
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date gjsj; //鍛婅鏃堕棿
+ private Integer gjjb; //鍛婅绾у埆
private String gjbt; //鍛婅鏍囬
private String gjms; //鍛婅鎻忚堪
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1309.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1309.java
index e6c8d8c..eda665d 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1309.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1309.java
@@ -24,16 +24,17 @@
private String DIVISION_NAME; //琛屾斂鍖哄垝鍚嶇О
private String STATION_CODE; //绔欑偣缂栫爜
private String STATION_NAME; //绔欑偣鍚嶇О
+ @JSONField(format = "yyyy-MM-dd")
private Date STAT_DATE; //缁熻鏃ユ湡
- private double NUM_TOTAL_DATA; //涓婃姤鏁版嵁鏁伴噺
- private double NUM_YES_DATA; //涓婃姤鏁版嵁鎴愬姛鏁�
- private double NUM_NOT_DATA; //涓婃姤鏁版嵁澶辫触鏁�
- private double NUM_TOTAL_SYS; //搴旂敤绯荤粺鏁伴噺
- private double NUM_YES_SYS; //绯荤粺姝ｅ父鏁伴噺
- private double NUM_NOT_SYS; //绯荤粺闈炴甯告暟閲�
- private double NUM_TOTAL_CAMERA; //鎽勫儚澶存甯告暟閲�
- private double NUM_YES_CAMERA; //鎽勫儚澶存甯告暟
- private double NUM_NOT_CAMERA; //鎽勫儚澶村紓甯告暟
+ private Integer NUM_TOTAL_DATA; //涓婃姤鏁版嵁鏁伴噺
+ private Integer NUM_YES_DATA; //涓婃姤鏁版嵁鎴愬姛鏁�
+ private Integer NUM_NOT_DATA; //涓婃姤鏁版嵁澶辫触鏁�
+ private Integer NUM_TOTAL_SYS; //搴旂敤绯荤粺鏁伴噺
+ private Integer NUM_YES_SYS; //绯荤粺姝ｅ父鏁伴噺
+ private Integer NUM_NOT_SYS; //绯荤粺闈炴甯告暟閲�
+ private Integer NUM_TOTAL_CAMERA; //鎽勫儚澶存甯告暟閲�
+ private Integer NUM_YES_CAMERA; //鎽勫儚澶存甯告暟
+ private Integer NUM_NOT_CAMERA; //鎽勫儚澶村紓甯告暟
//鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
@JSONField(serialize = false)
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1402.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1402.java
index e849e88..95e6728 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1402.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1402.java
@@ -31,13 +31,14 @@
private String jljgqybh; //鍔犲伐浼佷笟缂栧彿
private String jljgqymc; //鍔犲伐浼佷笟鍚嶇О
private String pflb; //璇勫垎绫诲埆
- private String pjsj; //璇勪环鏃堕棿
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date pjsj; //璇勪环鏃堕棿
private String pjr; //璇勪环浜�
- private String zhpj; //缁煎悎璇勪环
- private String pjwg; //澶栬
- private String pjqw; //姘斿懗
- private String pjskx; //閫傚彛鎬�
- private String pjwd; //鍛抽亾
+ private Double zhpj; //缁煎悎璇勪环
+ private Double pjwg; //澶栬
+ private Double pjqw; //姘斿懗
+ private Double pjskx; //閫傚彛鎬�
+ private Double pjwd; //鍛抽亾
private String zlfk; //璐ㄩ噺鍙嶉
private String cppc; //浜у搧鎵规
private String sfyx; //鏄惁鏈夋晥
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1403.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1403.java
index 0a7a663..27ae5f6 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1403.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1403.java
@@ -26,34 +26,34 @@
private String qydh; //浼佷笟鐢佃瘽
private String qylxr; //浼佷笟鑱旂郴浜�
private String qydz; //浼佷笟鍦板潃
- private String qyjd; //浼佷笟缁忓害
- private String qywd; //浼佷笟绾害
+ private Double qyjd; //浼佷笟缁忓害
+ private Double qywd; //浼佷笟绾害
private String qyxzqhmc; //浼佷笟琛屾斂鍖哄垝鍚嶇О
private String qyxzqhdm; //浼佷笟琛屾斂鍖哄垝浠ｇ爜
- private String xynl; //鍝嶅簲鑳藉姏
+ private Double xynl; //鍝嶅簲鑳藉姏
private String xysd; //鍝嶅簲閫熷害
- private String sbzs; //璁惧鎬绘暟
- private String yyzs; //浜哄憳鎬绘暟
- private String nx; //濂虫��
- private String ssmz; //灏戞暟姘戞棌
- private String gcdy; //鍏变骇鍏氬憳
- private String zgzg; //鍦ㄥ矖鑱屽伐
- private String qyjyglry; //浼佷笟缁忚惀绠＄悊浜哄憳
- private String zyjsry; //涓撲笟鎶�鏈汉鍛�
- private String jsgr; //鎶�鏈伐浜�
- private String cqzg; //闀挎湡鑱屽伐
- private String lszg; //涓存椂鑱屽伐
- private String qtcyry; //鍏朵粬浠庝笟浜哄憳
- private String yjs; //鐮旂┒鐢�
- private String dxbk; //澶у鏈
- private String dxzk; //澶у涓撶
- private String zzrs; //涓笓
- private String gz; //楂樹腑
- private String czjyx; //鍒濅腑鍙婁互涓�
- private String z35syx; //35宀佸強浠ヤ笅
- private String z36z45; //36鑷�45
- private String z46z54; //46鑷�54
- private String z55ys; //55浠ヤ笂
+ private Double sbzs; //璁惧鎬绘暟
+ private Double yyzs; //浜哄憳鎬绘暟
+ private Double nx; //濂虫��
+ private Double ssmz; //灏戞暟姘戞棌
+ private Double gcdy; //鍏变骇鍏氬憳
+ private Double zgzg; //鍦ㄥ矖鑱屽伐
+ private Double qyjyglry; //浼佷笟缁忚惀绠＄悊浜哄憳
+ private Double zyjsry; //涓撲笟鎶�鏈汉鍛�
+ private Double jsgr; //鎶�鏈伐浜�
+ private Double cqzg; //闀挎湡鑱屽伐
+ private Double lszg; //涓存椂鑱屽伐
+ private Double qtcyry; //鍏朵粬浠庝笟浜哄憳
+ private Double yjs; //鐮旂┒鐢�
+ private Double dxbk; //澶у鏈
+ private Double dxzk; //澶у涓撶
+ private Double zzrs; //涓笓
+ private Double gz; //楂樹腑
+ private Double czjyx; //鍒濅腑鍙婁互涓�
+ private Double z35syx; //35宀佸強浠ヤ笅
+ private Double z36z45; //36鑷�45
+ private Double z46z54; //46鑷�54
+ private Double z55ys; //55浠ヤ笂
private String sfyx; //鏄惁鏈夋晥
private String bz; //澶囨敞
private List<WhjlDYQYRY> dyqyry; //鍔ㄥ憳浼佷笟浜哄憳
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1404.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1404.java
index 36c5474..0dd9818 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1404.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1404.java
@@ -31,12 +31,13 @@
private String ppmc; //鍝佺墝鍚嶇О
private String cpbh; //浜у搧缂栧彿
private String cpmc; //浜у搧鍚嶇О
- private String dj; //鍗曚环
- private String scrq; //鐢熶骇鏃ユ湡
+ private Double dj; //鍗曚环
+ @JSONField(format = "yyyy-MM-dd")
+ private Date scrq; //鐢熶骇鏃ユ湡
private String cppc; //鎵规
- private String sl; //鏁伴噺
+ private Double sl; //鏁伴噺
private String sldwbm; //鏁伴噺鍗曚綅缂栫爜
- private String zl; //閲嶉噺
+ private Double zl; //閲嶉噺
private String zldwbm; //閲嶉噺鍗曚綅缂栫爜
private String sfyx ; //鏄惁鏈夋晥
private String bz; //澶囨敞
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java
index a20d97c..23e7a1d 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java
@@ -9,7 +9,7 @@
import java.util.List;
/**
- * 鍔ㄥ憳浼佷笟
+ * 鍔ㄥ憳鍗忚
*
*/
@Data
@@ -29,30 +29,34 @@
private String htbt; //鍚堝悓鏍囬
private String cpid; //浜у搧id
private String spbm; //鍟嗗搧缂栫爜
- private String htspsl; //鍚堝悓鍟嗗搧鏁伴噺
- private String htspdj; //鍚堝悓鍟嗗搧鍗曚环
- private String zje; //鎬婚噾棰�
+ private Double htspsl; //鍚堝悓鍟嗗搧鏁伴噺
+ private Double htspdj; //鍚堝悓鍟嗗搧鍗曚环
+ private Double zje; //鎬婚噾棰�
private String htqdr; //鍚堝悓绛捐浜�
- private String htqdsj; //鍚堝悓绛捐鏃堕棿
+ @JSONField(format = "YYYY-MM-dd HH:mm:ss")
+ private Date htqdsj; //鍚堝悓绛捐鏃堕棿
+ @JSONField(format = "YYYYMMDD")
private String htsxsj; //鍚堝悓鐢熸晥鏃ユ湡
+ @JSONField(format = "YYYYMMDD")
private String htjzsj; //鍚堝悓鎴鏃ユ湡
private String htcjr; //鍚堝悓鍒涘缓浜�
+ @JSONField(format = "YYYY-MM-dd HH:mm:ss")
private String htcjsj; //鍚堝悓鍒涘缓鏃堕棿
private String htdbgjlbz; //鍚堝悓鐨勫彉鏇磋褰曟爣蹇�
private String htbgyy; //鍚堝悓鍙樻洿鍘熷洜
private String htlx; //鍚堝悓绫诲瀷
private String yhtbh; //鍘熷悎鍚岀紪鍙�
private String zffs; //鏀粯鏂瑰紡
- private String ywcsl; //宸插畬鎴愭暟閲�
- private String ywcslje; //宸插畬鎴愭暟閲忛噾棰�
+ private Double ywcsl; //宸插畬鎴愭暟閲�
+ private Double ywcslje; //宸插畬鎴愭暟閲忛噾棰�
private String bz; //澶囨敞
private String ghzl; //渚涜揣璐ㄩ噺
- private String zdbzsl; //鏈�浣庝繚闅滄暟閲�
+ private Double zdbzsl; //鏈�浣庝繚闅滄暟閲�
private String ysbzyq; //杩愯緭鍖呰瑕佹眰
- private String ghxysj; //渚涜揣鍝嶅簲鏃堕棿锛堝皬鏃讹級
+ private Integer ghxysj; //渚涜揣鍝嶅簲鏃堕棿锛堝皬鏃讹級
private String jfbj; //浜や粯鏍囧噯
private String xyzt; //鍗忚鐘舵��
- private String sxh; //椤哄簭鍙�
+ private Integer sxh; //椤哄簭鍙�
private String sfyx; //鏄惁鏈夋晥
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1408.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1408.java
index 27ab0b9..adebd05 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1408.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1408.java
@@ -24,22 +24,25 @@
private String jldwflbm; //璁￠噺鍗曚綅鍒嗙被缂栫爜
private String dylb; //绫诲埆
private String dywz; //鍔ㄥ憳浣嶇疆
- private String dywzjd; //鍔ㄥ憳浣嶇疆缁忓害
- private String dywzwd; //鍔ㄥ憳浣嶇疆绾害
- private String crl; //浠撳閲�
- private String cbl; //鍌ㄥ閲�
- private String rjgnl; //鏃ュ姞宸ヨ兘鍔�
- private String jpsnl; //鏃ラ厤閫佽兘鍔�
+ private Double dywzjd; //鍔ㄥ憳浣嶇疆缁忓害
+ private Double dywzwd; //鍔ㄥ憳浣嶇疆绾害
+ private Double crl; //浠撳閲�
+ private Double cbl; //鍌ㄥ閲�
+ private Double rjgnl; //鏃ュ姞宸ヨ兘鍔�
+ private Double jpsnl; //鏃ラ厤閫佽兘鍔�
private String dyqyzrr; //鍔ㄥ憳浼佷笟璐ｄ换浜�
private String zrrdh; //璐ｄ换浜虹數璇�
private String dyqyllr; //鍔ㄥ憳浼佷笟l鑱旂粶浜�
private String llrdh; //鑱旂粶浜虹數璇�
private String pscph; //閰嶉�佽溅鐗屽彿
private String pscllx; //閰嶉�佽溅杈嗙被鍨�
- private String djrq; //鐧昏鏃ユ湡
- private String yxrq; //鐢熸晥鏃ユ湡
- private String sxrq; //澶辨晥鏃ユ湡
- private String sxh; //椤哄簭鍙�
+ @JSONField(format = "yyyy-MM-dd")
+ private Date djrq; //鐧昏鏃ユ湡
+ @JSONField(format = "yyyy-MM-dd")
+ private Date yxrq; //鐢熸晥鏃ユ湡
+ @JSONField(format = "yyyy-MM-dd")
+ private Date sxrq; //澶辨晥鏃ユ湡
+ private Integer sxh; //椤哄簭鍙�
private String sfyx; //鏄惁鏈夋晥
private String bz; //澶囨敞
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1409.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1409.java
index a8fc17d..8592e74 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1409.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1409.java
@@ -22,8 +22,9 @@
private String dyyjid; //鍔ㄥ憳棰勮id
private String dyqynm; //鍔ㄥ憳浼佷笟缂栧彿
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date yjsj; //棰勮鏃堕棿
- private String yjsl; //棰勮鏁伴噺
+ private Integer yjsl; //棰勮鏁伴噺
private String sfzxyj; //鏄惁鏈�鏂伴璀�
private String bz; //澶囨敞
private List<WhjlYJMX> yjmx; //棰勮鏄庣粏
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1410.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1410.java
index 73e5634..1acc7ae 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1410.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1410.java
@@ -31,15 +31,16 @@
private String jlppbh; //鍐涚伯鍝佺墝缂栧彿
private String jlcpbh; //鍐涚伯浜у搧缂栧彿
private String jldwflbm; //璁￠噺鍗曚綅鍒嗙被缂栫爜
+ @JSONField(format = "yyyy-MM-dd")
private Date ddrq; //鐢熶骇璁㈠崟鏃ユ湡
- private double ddsl; //璁㈠崟鏁伴噺
+ private Double ddsl; //璁㈠崟鏁伴噺
private String jhfs; //浜よ揣鏂瑰紡
private String bzyq; //鍖呰瑕佹眰
private String zlyq; //璐ㄩ噺瑕佹眰
private String jlzt; //璁板綍鐘舵��
- private double ddzl; //璁㈠崟閲嶉噺
- private double sjsl; //瀹為檯鏁伴噺
- private double sjzl; //瀹為檯閲嶉噺
+ private Double ddzl; //璁㈠崟閲嶉噺
+ private Double sjsl; //瀹為檯鏁伴噺
+ private Double sjzl; //瀹為檯閲嶉噺
private String scddlx; //鐢熶骇璁㈠崟绫诲瀷
private String ddid; //鍐涚伯閲囪喘璁㈠崟id
private String jlccjhid; //鍐涚伯绛规帾璁″垝id
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1411.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1411.java
index 9d26e0e..e399fdc 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1411.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1411.java
@@ -19,14 +19,13 @@
*/
private static final long serialVersionUID = 1L;
- private String rkfkjlid; //杞﹁締ID
+ private String cph; //杞︾墝鍙�
private String jlgljgbh; //鍐涚伯绠＄悊鏈烘瀯缂栧彿
private String jlgljgmc; //鍐涚伯绠＄悊鏈烘瀯鍚嶇О
private String jlqybh; //鍐涚伯浼佷笟缂栧彿
private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
- private String cph; //杞︾墝鍙�
private String cllx; //杞﹁締绫诲瀷
private String clzt; //杞﹁締鐘舵��
private String sfnbcl; //鏄惁鍐呴儴杞﹁締
@@ -37,9 +36,10 @@
private String sfzh; //韬唤璇佸彿
private String jsz; //椹鹃┒璇�
private String xsz; //琛岄┒璇�
- private double clcxc; //杞︾闀�
- private double clcxk; //杞︾瀹�
- private double clcxg; //杞︾楂�
+ private Double clcxc; //杞︾闀�
+ private Double clcxk; //杞︾瀹�
+ private Double clcxg; //杞︾楂�
+ private Double clcxz; //杞﹁締杞介噸
private String dz; //鍦板潃
private String sfyx; //鏄惁鏈夋晥
private String bz; //澶囨敞
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1412.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1412.java
index 5a777d6..fa98612 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1412.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1412.java
@@ -24,11 +24,13 @@
private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
- private String psdh; //閰嶉�佸崟鍙�
+ private String ysdh; //杩愰�佸崟鍙�
+ private String ydlx; //杩愬崟绫诲瀷
private String cph; //杞︾墝鍙风爜
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date jcsj; //鐩戞祴鏃堕棿
- private double jcwdz; //娓╁害鍊�
- private double sdz; //婀垮害鍊�
+ private Double jcwdz; //娓╁害鍊�
+ private Double jcsdz; //婀垮害鍊�
private String wdsfzc; //娓╁害鏄惁姝ｅ父锛�
private String sdsfzc; //婀垮害鏄惁姝ｅ父锛�
private String cyr; //鎵胯繍浜�
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1413.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1413.java
index 9e57573..3a7f312 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1413.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1413.java
@@ -28,10 +28,10 @@
private String lxbm; //璺嚎缂栫爜
private String cfd; //鍑哄彂鍦�
private String mdd; //鐩殑鍦�
- private double cfdjd; //鍑哄彂鍦扮粡搴�
- private double cfdwd; //鍑哄彂鍦扮含搴�
- private double mddjd; //鐩殑鍦扮粡搴�
- private double mddwd; //鐩殑鍦扮含搴�
+ private Double cfdjd; //鍑哄彂鍦扮粡搴�
+ private Double cfdwd; //鍑哄彂鍦扮含搴�
+ private Double mddjd; //鐩殑鍦扮粡搴�
+ private Double mddwd; //鐩殑鍦扮含搴�
private String sfyx; //鏄惁鏈夋晥
private List<WhjlLXZBMX> lxzbmx; //璺嚎鍧愭爣鏄庣粏
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlInoutDel.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlInoutDel.java
index 00d5c14..e6772ff 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlInoutDel.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlInoutDel.java
@@ -64,7 +64,7 @@
private String bgy;//淇濈鍛�
private String ckfs;//鍑哄簱鏂瑰紡
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private String djsj;//鐧昏鏃堕棿
+ private Date djsj;//鐧昏鏃堕棿
private String zz;//绔欓暱
private String jjy;//璐ㄦ鍛�
private int sxh;//椤哄簭鍙�
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlLXZBMX.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlLXZBMX.java
index 306b2b1..50f5718 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlLXZBMX.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlLXZBMX.java
@@ -16,8 +16,8 @@
*/
private static final long serialVersionUID = 1L;
private String zbdid; //鍧愭爣鐐规槑缁唅d
- private double zbdwd; //鍧愭爣鐐圭粡搴�
- private double zbdjd; //鍧愭爣鐐圭含搴�
+ private Double zbdwd; //鍧愭爣鐐圭粡搴�
+ private Double zbdjd; //鍧愭爣鐐圭含搴�
private Integer sxh; //椤哄簭鍙�
}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlPscl.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlPscl.java
new file mode 100644
index 0000000..65f9d03
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlPscl.java
@@ -0,0 +1,51 @@
+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;
+
+/**
+ * 閰嶉�佽溅杈�
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlPscl implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private String psclid; //閰嶉�佽溅杈咺D
+ private String cphm; //杞︾墝鍙风爜
+ private String lspzbm; //鍝佺缂栧彿
+ private String lspzmc; //鍝佺鍚嶇О
+ private String cpbh; //浜у搧缂栧彿
+ private String cpmc; //浜у搧鍚嶇О
+ private String sldwbh; //璁￠噺鍗曚綅缂栧彿
+ private Double pszl; //閰嶉�侀噸閲�
+ private String pszt; //閰嶉�佺姸鎬�
+ private Double sdzl; //閫佸埌閲嶉噺
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date yqsdsj; //瑕佹眰閫佽揪鏃堕棿
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date yskssj; //杩愰�佸紑濮嬫椂闂�
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date ysjssj; //杩愰�佺粨鏉熸椂闂�
+ private String jsyxm; //椹鹃┒鍛樺鍚�
+ private String jsysfzh; //椹鹃┒鍛樿韩浠借瘉鍙�
+ private String jsydh; //椹鹃┒鍛樼數璇�
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date lssj; //鎻芥敹鏃堕棿
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date sdqrsj; //閫佽揪纭鏃堕棿
+ private String sdqrr; //閫佽揪纭浜�
+ private String ckm; //鍑哄簱鐮�
+ private String bdkh; //鍖楁枟鍗″彿
+
+
+
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlRwwz.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlRwwz.java
new file mode 100644
index 0000000..cddeb2c
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlRwwz.java
@@ -0,0 +1,34 @@
+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;
+
+/**
+ * 浠诲姟闇�瑕侀厤閫佺殑鐗╄祫
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlRwwz implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ private String pswzid; //閰嶉�佺墿璧処D
+ private String yjfajgid; //搴旀�ユ柟妗堢粨鏋淚D
+ private String lspzbm; //鍝佺缂栧彿
+ private String lspzmc; //鍝佺鍚嶇О
+ private String cpbh; //浜у搧缂栧彿
+ private String cpmc; //浜у搧鍚嶇О
+ private String sldwbh; //璁￠噺鍗曚綅缂栧彿
+ private Double pszl; //閰嶉�侀噸閲�
+ private Double ckzl; //鍑哄簱閲嶉噺
+ private Double sdzl; //閫佽揪閲嶉噺
+
+
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlWDZJH.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlWDZJH.java
index 82b0a67..dc30f9a 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlWDZJH.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlWDZJH.java
@@ -17,8 +17,8 @@
*/
private static final long serialVersionUID = 1L;
- private String sxh; //椤哄簭鍙�
- private double wdz; //娓╁害鍊�
+ private Integer sxh; //椤哄簭鍙�
+ private Double wdz; //娓╁害鍊�
private String hwbh; //璐т綅缂栧彿
private String jcjg; //妫�娴嬬粨鏋�
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlXDZJH.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlXDZJH.java
index f60b48b..31162c2 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlXDZJH.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlXDZJH.java
@@ -17,8 +17,8 @@
*/
private static final long serialVersionUID = 1L;
- private String sxh; //椤哄簭鍙�
- private double sdz; //婀垮害鍊�
+ private Integer sxh; //椤哄簭鍙�
+ private Double sdz; //婀垮害鍊�
private String hwbh; //璐т綅缂栧彿
private String jcjg; //妫�娴嬬粨鏋�
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1212PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1212PR.java
index 874db4f..ec39b1e 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1212PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1212PR.java
@@ -45,7 +45,7 @@
*/
@DataProvider
public List<WhjlApi1212> listData() {
- List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1214);
+ List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1212);
if (null == result || result.isEmpty()) {
return null;
}
@@ -76,7 +76,7 @@
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
infoData.setInteType(WhjlConstant.API_CATEGORY_12);
- infoData.setInteId(WhjlConstant.API_CODE_1214);
+ infoData.setInteId(WhjlConstant.API_CODE_1212);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
infoData.setData(JSON.toJSONString(data));
@@ -120,7 +120,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1214);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1212);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -139,7 +139,7 @@
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
infoData.setInteType(WhjlConstant.API_CATEGORY_12);
- infoData.setInteId(WhjlConstant.API_CODE_1214);
+ infoData.setInteId(WhjlConstant.API_CODE_1212);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1301PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1301PR.java
index 1f318a4..3b90287 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1301PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1301PR.java
@@ -74,7 +74,7 @@
ApiInfoData infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_13);
infoData.setInteId(WhjlConstant.API_CODE_1301);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
@@ -119,7 +119,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1301);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_13, WhjlConstant.API_CODE_1301);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -137,7 +137,7 @@
infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_13);
infoData.setInteId(WhjlConstant.API_CODE_1301);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1302PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1302PR.java
index cc168d6..733b3a1 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1302PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1302PR.java
@@ -119,7 +119,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1302);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_13, WhjlConstant.API_CODE_1302);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -137,7 +137,7 @@
infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_13);
infoData.setInteId(WhjlConstant.API_CODE_1302);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1401PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1401PR.java
index 39966b0..d24f458 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1401PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1401PR.java
@@ -75,7 +75,7 @@
ApiInfoData infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1401);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
@@ -120,7 +120,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1401);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_14, WhjlConstant.API_CODE_1401);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -138,7 +138,7 @@
infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1401);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1402PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1402PR.java
index 75761da..4aa2a60 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1402PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1402PR.java
@@ -75,7 +75,7 @@
ApiInfoData infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1402);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
@@ -120,7 +120,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1402);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_14, WhjlConstant.API_CODE_1402);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -138,7 +138,7 @@
infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1402);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1403PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1403PR.java
index be20002..5f54659 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1403PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1403PR.java
@@ -75,7 +75,7 @@
ApiInfoData infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1403);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
@@ -120,7 +120,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1403);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_14, WhjlConstant.API_CODE_1403);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -138,7 +138,7 @@
infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1403);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1404PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1404PR.java
index a8ba950..5d010c0 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1404PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1404PR.java
@@ -75,7 +75,7 @@
ApiInfoData infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1404);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
@@ -120,7 +120,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1404);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_14, WhjlConstant.API_CODE_1404);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -138,7 +138,7 @@
infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1404);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1405PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1405PR.java
index d4a6414..0ca91b7 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1405PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1405PR.java
@@ -75,7 +75,7 @@
ApiInfoData infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1405);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
@@ -120,7 +120,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1405);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_14, WhjlConstant.API_CODE_1405);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -138,7 +138,7 @@
infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1405);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1406PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1406PR.java
index 60c96b2..a077716 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1406PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1406PR.java
@@ -75,7 +75,7 @@
ApiInfoData infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1406);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
@@ -120,7 +120,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1406);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_14, WhjlConstant.API_CODE_1406);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -138,7 +138,7 @@
infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1406);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1407PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1407PR.java
index f98c4ec..ca028f9 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1407PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1407PR.java
@@ -75,7 +75,7 @@
ApiInfoData infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1407);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
@@ -120,7 +120,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1407);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_14, WhjlConstant.API_CODE_1407);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -138,7 +138,7 @@
infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1407);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1408PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1408PR.java
index 246e98e..11aa186 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1408PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1408PR.java
@@ -75,7 +75,7 @@
ApiInfoData infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1408);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
@@ -120,7 +120,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1408);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_14, WhjlConstant.API_CODE_1408);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -138,7 +138,7 @@
infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1408);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1409PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1409PR.java
index 661263e..aa08bf8 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1409PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1409PR.java
@@ -75,7 +75,7 @@
ApiInfoData infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1409);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
@@ -120,7 +120,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1409);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_14, WhjlConstant.API_CODE_1409);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -138,7 +138,7 @@
infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1409);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1410PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1410PR.java
index 34d3c9f..bba06b5 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1410PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1410PR.java
@@ -75,7 +75,7 @@
ApiInfoData infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1410);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
@@ -120,7 +120,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1410);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_14, WhjlConstant.API_CODE_1410);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -138,7 +138,7 @@
infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1410);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1411PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1411PR.java
index 8c0897b..af0bd4e 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1411PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1411PR.java
@@ -75,7 +75,7 @@
ApiInfoData infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1411);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
@@ -120,7 +120,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1411);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_14, WhjlConstant.API_CODE_1411);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -138,7 +138,7 @@
infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1411);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1412PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1412PR.java
index d665360..f0e1443 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1412PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1412PR.java
@@ -75,7 +75,7 @@
ApiInfoData infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1412);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
@@ -120,7 +120,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1412);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_14, WhjlConstant.API_CODE_1412);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -138,7 +138,7 @@
infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1412);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1413PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1413PR.java
index 22b3abf..ab5fa90 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1413PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1413PR.java
@@ -75,7 +75,7 @@
ApiInfoData infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1413);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
@@ -120,7 +120,7 @@
}
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1413);
+ ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_14, WhjlConstant.API_CODE_1413);
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -138,7 +138,7 @@
infoData = new ApiInfoData();
infoData.setId(data.getBizId());
infoData.setKqdm(data.getKqdm());
- infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_14);
infoData.setInteId(WhjlConstant.API_CODE_1413);
infoData.setUpdateTime(new Date());
infoData.setDataId(data.getBizId());
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
index 9da5b89..eef3e64 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
@@ -216,9 +216,11 @@
case "1212":
return WhjlConstant.API_CODE_CRKJL;
case "1213":
- return WhjlConstant.API_CODE_ZJJG;
+ return WhjlConstant.API_CODE_CRKJSJL;
case "1214":
return WhjlConstant.API_CODE_ZJJG;
+ case "1215":
+ return WhjlConstant.API_CODE_YPDJXX;
case "1216":
return WhjlConstant.API_CODE_ZJBG;
case "1217":
@@ -239,20 +241,40 @@
return WhjlConstant.API_CODE_NHJL;
case "1305":
return WhjlConstant.API_CODE_DDPSRW;
+ case "1306":
+ return WhjlConstant.API_CODE_BDWZXX;
+ case "1307":
+ return WhjlConstant.API_CODE_YSRWBDXX;
+ case "1308":
+ return WhjlConstant.API_CODE_SPYJGJ;
+ case "1309":
+ return WhjlConstant.API_CODE_STSJ;
case "1401":
- return WhjlConstant.API_CODE_DYQY;
+ return WhjlConstant.API_CODE_SCZLL;
case "1402":
- return WhjlConstant.API_CODE_DYXY;
+ return WhjlConstant.API_CODE_KGPJ;
case "1403":
- return WhjlConstant.API_CODE_DYNL;
+ return WhjlConstant.API_CODE_DYQY;
case "1404":
- return WhjlConstant.API_CODE_DYYJ;
+ return WhjlConstant.API_CODE_DYSP;
case "1405":
- return WhjlConstant.API_CODE_SCJGDD;
+ return WhjlConstant.API_CODE_DYXY;
case "1406":
- return WhjlConstant.API_CODE_YSLX;
+ return WhjlConstant.API_CODE_DYXYBG;
case "1407":
- return WhjlConstant.API_CODE_YJDD;
+ return WhjlConstant.API_CODE_DYXYZXMX;
+ case "1408":
+ return WhjlConstant.API_CODE_DYNL;
+ case "1409":
+ return WhjlConstant.API_CODE_DYYJ;
+ case "1410":
+ return WhjlConstant.API_CODE_SCJGDD;
+ case "1411":
+ return WhjlConstant.API_CODE_CLXX;
+ case "1412":
+ return WhjlConstant.API_CODE_CLYSHJ;
+ case "1413":
+ return WhjlConstant.API_CODE_YSLX;
default:
return inteId;
}
diff --git a/src/main/resources/templates/home/home-whjl.html b/src/main/resources/templates/home/home-whjl.html
index 6405a58..2dc16c6 100644
--- a/src/main/resources/templates/home/home-whjl.html
+++ b/src/main/resources/templates/home/home-whjl.html
@@ -222,6 +222,9 @@
<dd>
<a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1219.d">鐗╄祫搴撳瓨棰勮瑙勫垯</a>
</dd>
+ <dd>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1220.d">鐗╄祫搴撳瓨棰勮璁板綍</a>
+ </dd>
</dl>
</li>
@@ -312,10 +315,19 @@
<a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1408.d">鍔ㄥ憳鑳藉姏</a>
</dd>
<dd>
- <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1409.d">鍔ㄥ憳璀﹀姏</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1409.d">鍔ㄥ憳棰勮</a>
</dd>
<dd>
- <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1410.d">鍔ㄥ憳鍗忚鎵ц鏄庣粏</a>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1410.d">鐢熶骇鍔犲伐璁㈠崟</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1411.d">杞﹁締淇℃伅</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1412.d">杞﹁締杩愯緭鐜</a>
+ </dd>
+ <dd>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1413.d">杩愯緭璺嚎</a>
</dd>
</dl>
</li>
--
Gitblit v1.9.3