From 510ffba9bf36d73191c736cee495d8f0839e571f Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期六, 04 十一月 2023 18:02:30 +0800
Subject: [PATCH] 提交测试武汉接口
---
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1216.view.xml | 14
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java | 2
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml | 168 +++---
src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java | 30
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlPDMX.java | 36 +
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1210.view.xml | 189 ++++++
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1207.java | 4
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlYQSB.java | 3
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1214.view.xml | 120 +++-
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java | 2
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1208.view.xml | 34 +
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java | 4
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml | 540 ++++++++++++++++++++
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJCNL.java | 9
src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java | 20
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1213.java | 3
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java | 2
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml | 137 +---
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlInoutDel.java | 2
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1209.view.xml | 101 +++
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJCXM.java | 25
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1213PR.java | 1
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java | 2
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java | 20
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1207.view.xml | 7
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java | 73 +-
28 files changed, 1,235 insertions(+), 317 deletions(-)
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1207.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1207.java
index b5b2330..26b5987 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1207.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1207.java
@@ -77,11 +77,11 @@
apiData.setJljgqymc(sysData.getCustomerName()); //鍔犲伐浼佷笟鍚嶇О
apiData.setHtkhbh(sysData.getCustomerId()); //鍚堝悓瀹㈡埛缂栧彿
apiData.setHtkhmc(sysData.getCustomerName()); //鍚堝悓瀹㈡埛鍚嶇О
- apiData.setHtspdj(sysData.getPrice()); //鍚堝悓鍟嗗搧鍗曚环
+// apiData.setHtspdj(sysData.getPrice()); //鍚堝悓鍟嗗搧鍗曚环
apiData.setHtspsl(sysData.getContactAmount()); //鍚堝悓鍟嗗搧鏁伴噺
apiData.setSpbm(sysData.getFoodType()); //鍟嗗搧缂栫爜
apiData.setZje(sysData.getMoney()); //鎬婚噾棰�
- apiData.setHtqdr(sysData.getSignUser()); //鍚堝悓绛捐浜�
+ apiData.setHrqdr(sysData.getSignUser()); //鍚堝悓绛捐浜�
apiData.setHtqdsj(sysData.getSigningTime()); //鍚堝悓绛捐鏃堕棿
apiData.setHtsxrq(sysData.getBeginTime()); //鍚堝悓鐢熸晥鏃ユ湡
apiData.setHtjzrq(sysData.getEndTime()); //鍚堝悓鎴鏃堕棿
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java
index 6e14d13..7cdeb19 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1214.java
@@ -61,7 +61,7 @@
apiData = new WhjlApi1212();
apiData.setCrkid(sysData.getId()); //鍑哄叆搴撹褰旾D
apiData.setJlqybh(""); //鍐涚伯浼佷笟缂栧彿
- apiData.setSsqymc(""); //鍐涚伯浼佷笟鍚嶇О
+ apiData.setJlqymc(""); //鍐涚伯浼佷笟鍚嶇О
apiData.setJgzdbh(""); //鍐涗緵绔欑偣缂栧彿
apiData.setJgzdmc(""); //鍐涗緵绔欑偣鍚嶇О
apiData.setYwrq(ContextUtil.getCurZero(sysData.getRegisterTime())); //涓氬姟鏃ユ湡
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 08e7708..b30b077 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml
@@ -6,76 +6,75 @@
<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">
<Property name="dataType">Double</Property>
<Property name="label">鍚堝悓鍟嗗搧鏁伴噺</Property>
- <Property name="displayFormat">#0.00</Property>
</PropertyDef>
<PropertyDef name="spbm">
- <Property></Property>
+ <Property/>
<Property name="label">鍟嗗搧缂栫爜</Property>
</PropertyDef>
<PropertyDef name="zje">
<Property name="dataType">Double</Property>
<Property name="label">鎬婚噾棰�</Property>
</PropertyDef>
- <PropertyDef name="htqdr">
- <Property></Property>
+ <PropertyDef name="hrqdr">
+ <Property/>
<Property name="label">鍚堝悓绛捐浜�</Property>
</PropertyDef>
<PropertyDef name="htqdsj">
- <Property name="dataType">DateTime</Property>
+ <Property name="dataType">Date</Property>
<Property name="label">鍚堝悓绛捐鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="htsxrq">
@@ -84,34 +83,34 @@
</PropertyDef>
<PropertyDef name="htjzrq">
<Property name="dataType">Date</Property>
- <Property name="label">鍚堝悓鎴鏃堕棿</Property>
+ <Property name="label">鍚堝悓鎴鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="htcjr">
- <Property></Property>
+ <Property/>
<Property name="label">鍚堝悓鍒涘缓浜�</Property>
</PropertyDef>
<PropertyDef name="htcjsj">
- <Property name="dataType">DateTime</Property>
+ <Property name="dataType">Date</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">
@@ -119,32 +118,27 @@
<Property name="label">宸插畬鎴愭暟閲�</Property>
</PropertyDef>
<PropertyDef name="ywcslje">
- <Property></Property>
+ <Property name="dataType">Double</Property>
<Property name="label">宸插畬鎴愭暟閲忛噾棰�</Property>
</PropertyDef>
<PropertyDef name="htbz">
- <Property></Property>
+ <Property/>
<Property name="label">鍚堝悓澶囨敞</Property>
</PropertyDef>
- <PropertyDef name="xh">
- <Property></Property>
- <Property name="label">搴忓彿</Property>
- <Property name="dataType">Integer</Property>
- </PropertyDef>
- <PropertyDef name="sfyx">
- <Property></Property>
- <Property name="label">鏄惁鏈夋晥</Property>
- </PropertyDef>
<PropertyDef name="htzt">
- <Property></Property>
+ <Property/>
<Property name="label">鍚堝悓鐘舵��</Property>
</PropertyDef>
- <PropertyDef name="hrqdr">
- <Property></Property>
- <Property name="label">鍚堝悓绛捐浜�</Property>
+ <PropertyDef name="xh">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">搴忓彿</Property>
+ </PropertyDef>
+ <PropertyDef name="sfyx">
+ <Property/>
+ <Property name="label">鏄惁鏈夋晥</Property>
</PropertyDef>
<PropertyDef name="bz">
- <Property></Property>
+ <Property/>
<Property name="label">澶囨敞</Property>
</PropertyDef>
<PropertyDef name="bizId">
@@ -168,14 +162,11 @@
<Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
- <PropertyDef name="htspqdList">
+ <PropertyDef name="htspqd">
<Property></Property>
- </PropertyDef>
- <Reference name="htspqd">
- <Property name="parameter">$${this.htspqdList}</Property>
- <Property name="dataProvider">whjlApi1206PR#listItem</Property>
+ <Property name="label">鍚堝悓鍟嗗搧娓呭崟</Property>
<Property name="dataType">[dtItem]</Property>
- </Reference>
+ </PropertyDef>
</DataType>
<DataType name="dtItem">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlQDItem</Property>
@@ -432,12 +423,6 @@
<Property name="labelSeparator">:</Property>
<Property name="labelAlign">left</Property>
<AutoFormElement>
- <Property name="name">htlx</Property>
- <Property name="property">htlx</Property>
- <Property name="editorType">RadioGroup</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">htid</Property>
<Property name="property">htid</Property>
<Editor/>
@@ -463,6 +448,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">htlx</Property>
+ <Property name="property">htlx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">htbh</Property>
<Property name="property">htbh</Property>
<Editor/>
@@ -475,38 +465,22 @@
<AutoFormElement>
<Property name="name">jljgqybh</Property>
<Property name="property">jljgqybh</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">----鐢ㄤ簬閲囪喘鍚堝悓----</Property>
- </TextEditor>
- </Editor>
+ <Editor/>
</AutoFormElement>
<AutoFormElement>
<Property name="name">jljgqymc</Property>
<Property name="property">jljgqymc</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">----鐢ㄤ簬閲囪喘鍚堝悓----</Property>
- </TextEditor>
- </Editor>
+ <Editor/>
</AutoFormElement>
<AutoFormElement>
<Property name="name">htkhbh</Property>
<Property name="property">htkhbh</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">----鐢ㄤ簬閿�鍞悎鍚�----</Property>
- </TextEditor>
- </Editor>
+ <Editor/>
</AutoFormElement>
<AutoFormElement>
<Property name="name">htkhmc</Property>
<Property name="property">htkhmc</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">----鐢ㄤ簬閿�鍞悎鍚�----</Property>
- </TextEditor>
- </Editor>
+ <Editor/>
</AutoFormElement>
<AutoFormElement>
<Property name="name">htspdj</Property>
@@ -529,8 +503,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">htqdr</Property>
- <Property name="property">htqdr</Property>
+ <Property name="name">hrqdr</Property>
+ <Property name="property">hrqdr</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -571,7 +545,6 @@
<AutoFormElement>
<Property name="name">htgylx</Property>
<Property name="property">htgylx</Property>
- <Property name="trigger">listDropLX</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -600,18 +573,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">hrqdr</Property>
- <Property name="property">hrqdr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">htzt</Property>
<Property name="property">htzt</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">htlx</Property>
- <Property name="property">htlx</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1207.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1207.view.xml
index f945355..fa1955e 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1207.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1207.view.xml
@@ -93,7 +93,7 @@
<Property></Property>
<Property name="label">鍝佺鍚嶇О</Property>
</PropertyDef>
- <PropertyDef name="cpbm">
+ <PropertyDef name="cpbh">
<Property></Property>
<Property name="label">浜у搧缂栧彿</Property>
</PropertyDef>
@@ -333,7 +333,6 @@
</DataColumn>
<DataColumn name="cfbh">
<Property name="property">cfbh</Property>
- <Property
</DataColumn>
<DataColumn name="jldwmc">
<Property name="property">jldwmc</Property>
@@ -467,8 +466,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">cpbm</Property>
- <Property name="property">cpbm</Property>
+ <Property name="name">cpbh</Property>
+ <Property name="property">cpbh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1208.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1208.view.xml
index 716fed3..a0afd32 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1208.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1208.view.xml
@@ -25,11 +25,19 @@
<Property></Property>
<Property name="label">鍐涗緵绔欑偣缂栧彿</Property>
</PropertyDef>
+ <PropertyDef name="hwmc">
+ <Property/>
+ <Property name="label">璐т綅鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="hwbh">
+ <Property/>
+ <Property name="label">璐т綅缂栫爜</Property>
+ </PropertyDef>
<PropertyDef name="jgzdmc">
<Property></Property>
<Property name="label">鍐涗緵绔欑偣鍚嶇О</Property>
</PropertyDef>
- <PropertyDef name="cpbm">
+ <PropertyDef name="cpbh">
<Property></Property>
<Property name="label">浜у搧缂栧彿</Property>
</PropertyDef>
@@ -383,8 +391,23 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">cpbm</Property>
- <Property name="property">cpbm</Property>
+ <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">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cpbh</Property>
+ <Property name="property">cpbh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -545,11 +568,6 @@
<AutoFormElement>
<Property name="name">czbz</Property>
<Property name="property">czbz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">kqdm</Property>
- <Property name="property">kqdm</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1209.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1209.view.xml
index 510f199..0c93018 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1209.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1209.view.xml
@@ -6,40 +6,41 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1209</Property>
<PropertyDef name="kctzcpcrjlid">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳瓨鍙拌处鍑哄叆璁板綍ID</Property>
</PropertyDef>
<PropertyDef name="kctzcppcid">
- <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="crlx">
- <Property/>
+ <Property></Property>
<Property name="label">鍑哄叆绫诲瀷</Property>
</PropertyDef>
<PropertyDef name="jllx">
- <Property/>
+ <Property></Property>
<Property name="label">璁板綍绫诲瀷</Property>
</PropertyDef>
<PropertyDef name="jlsj">
- <Property/>
+ <Property></Property>
<Property name="label">璁板綍鏃堕棿</Property>
+ <Property name="dataType">DateTime</Property>
</PropertyDef>
<PropertyDef name="crqsl">
<Property name="dataType">Double</Property>
@@ -371,6 +372,88 @@
<Editor/>
</AutoFormElement>
</AutoForm>
+ <Panel layout="regionPadding:5">
+ <Property name="caption">鐩樼偣鏄庣粏</Property>
+ <Property name="height">400</Property>
+ <Buttons/>
+ <Children>
+ <Container layout="regionPadding:10">
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("pdnx");
+list.insert({});</ClientEvent>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dataGridDetail.currentEntity");
+if(!data){
+ return;
+}
+data.remove();</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ </Button>
+ </Container>
+ <DataGrid id="dataGridDetail">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">#.pdmx</Property>
+ <DataColumn name="htspid">
+ <Property name="property">htspid</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="ddid">
+ <Property name="property">ddid</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="lspzbm">
+ <Property name="property">lspzbm</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="lspzmc">
+ <Property name="property">lspzmc</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="cpbh">
+ <Property name="property">cpbh</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="cpmc">
+ <Property name="property">cpmc</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="spsl">
+ <Property name="property">spsl</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="spdj">
+ <Property name="property">spdj</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="je">
+ <Property name="property">je</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="ywcsl">
+ <Property name="property">ywcsl</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="ywcje">
+ <Property name="property">ywcje</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="bz">
+ <Property name="property">bz</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
</Children>
<Tools/>
</Dialog>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1210.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1210.view.xml
index 91e4257..8ae1b6f 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1210.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1210.view.xml
@@ -6,31 +6,31 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1210</Property>
<PropertyDef name="kcpdjlid">
- <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="ajbh">
- <Property/>
+ <Property></Property>
<Property name="label">寤掗棿缂栧彿</Property>
</PropertyDef>
<PropertyDef name="ajmc">
- <Property/>
+ <Property></Property>
<Property name="label">寤掗棿鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="pdrq">
@@ -38,23 +38,23 @@
<Property name="label">鐩樼偣鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="pdkj">
- <Property/>
+ <Property></Property>
<Property name="label">鐩樼偣浼氳</Property>
</PropertyDef>
<PropertyDef name="bgy">
- <Property/>
+ <Property></Property>
<Property name="label">淇濈鍛�</Property>
</PropertyDef>
<PropertyDef name="fzr">
- <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">
@@ -62,12 +62,16 @@
<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>
+ <PropertyDef name="pdmx">
+ <Property name="dataType">[dtPdmx]</Property>
+ <Property name="label">pdmx</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -92,6 +96,80 @@
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtPdmx">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlPDMX</Property>
+ <PropertyDef name="kcpdjlmxid">
+ <Property/>
+ <Property name="label">搴撳瓨鐩樼偣璁板綍鏄庣粏ID</Property>
+ </PropertyDef>
+ <PropertyDef name="kcpdjlid">
+ <Property/>
+ <Property name="label">搴撳瓨鐩樼偣璁板綍ID</Property>
+ </PropertyDef>
+ <PropertyDef name="kctzbh">
+ <Property/>
+ <Property name="label">搴撳瓨鍙板笎ID</Property>
+ </PropertyDef>
+ <PropertyDef name="cpbh">
+ <Property/>
+ <Property name="label">浜у搧缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="cpmc">
+ <Property/>
+ <Property name="label">浜у搧鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="jldwbm">
+ <Property/>
+ <Property name="label">璁￠噺鍗曚綅缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="jldwmc">
+ <Property/>
+ <Property name="label">璁￠噺鍗曚綅鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="jsdwbm">
+ <Property/>
+ <Property name="label">璁℃暟鍗曚綅缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="jsdwmc">
+ <Property/>
+ <Property name="label">璁℃暟鍗曚綅鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="zmkcs">
+ <Property/>
+ <Property name="label">甯愰潰搴撳瓨閲嶉噺</Property>
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="sjkcs">
+ <Property/>
+ <Property name="label">瀹為檯搴撳瓨閲嶉噺</Property>
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="cszl">
+ <Property/>
+ <Property name="label">闀挎暟閲嶉噺</Property>
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="dszl">
+ <Property/>
+ <Property name="label">鐭暟閲嶉噺</Property>
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="qtzl">
+ <Property/>
+ <Property name="label">娆犳潯閲嶉噺</Property>
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="wtzl">
+ <Property/>
+ <Property name="label">鏈彁閲嶉噺</Property>
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="ytzl">
+ <Property/>
+ <Property name="label">宸叉彁閲嶉噺</Property>
+ <Property name="dataType">Double</Property>
</PropertyDef>
</DataType>
</Model>
@@ -235,6 +313,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();
@@ -341,6 +420,88 @@
<Editor/>
</AutoFormElement>
</AutoForm>
+ <Panel layout="regionPadding:5">
+ <Property name="caption">鐩樼偣鏄庣粏</Property>
+ <Property name="height">400</Property>
+ <Buttons/>
+ <Children>
+ <Container layout="regionPadding:10">
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("pdmx");
+list.insert({});</ClientEvent>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dataGridDetail.currentEntity");
+if(!data){
+ return;
+}
+data.remove();</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ </Button>
+ </Container>
+ <DataGrid id="dataGridDetail">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">#.pdmx</Property>
+ <DataColumn name="kcpdjlmxid">
+ <Property name="property">kcpdjlmxid</Property>
+ </DataColumn>
+ <DataColumn name="kcpdjlid">
+ <Property name="property">kcpdjlid</Property>
+ </DataColumn>
+ <DataColumn name="kctzbh">
+ <Property name="property">kctzbh</Property>
+ </DataColumn>
+ <DataColumn name="cpbh">
+ <Property name="property">cpbh</Property>
+ </DataColumn>
+ <DataColumn name="cpmc">
+ <Property name="property">cpmc</Property>
+ </DataColumn>
+ <DataColumn name="jldwbm">
+ <Property name="property">jldwbm</Property>
+ </DataColumn>
+ <DataColumn name="jldwmc">
+ <Property name="property">jldwmc</Property>
+ </DataColumn>
+ <DataColumn name="jsdwbm">
+ <Property name="property">jsdwbm</Property>
+ </DataColumn>
+ <DataColumn name="jsdwmc">
+ <Property name="property">jsdwmc</Property>
+ </DataColumn>
+ <DataColumn name="zmkcs">
+ <Property name="property">zmkcs</Property>
+ </DataColumn>
+ <DataColumn name="sjkcs">
+ <Property name="property">sjkcs</Property>
+ </DataColumn>
+ <DataColumn name="cszl">
+ <Property name="property">cszl</Property>
+ </DataColumn>
+ <DataColumn name="dszl">
+ <Property name="property">dszl</Property>
+ </DataColumn>
+ <DataColumn name="qtzl">
+ <Property name="property">qtzl</Property>
+ </DataColumn>
+ <DataColumn name="wtzl">
+ <Property name="property">wtzl</Property>
+ </DataColumn>
+ <DataColumn name="ytzl">
+ <Property name="property">ytzl</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
</Children>
<Tools/>
</Dialog>
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 ec977cd..7c24f0a 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml
@@ -13,7 +13,7 @@
<Property></Property>
<Property name="label">鍐涚伯浼佷笟缂栧彿</Property>
</PropertyDef>
- <PropertyDef name="ssqymc">
+ <PropertyDef name="jlqymc">
<Property></Property>
<Property name="label">鍐涚伯浼佷笟鍚嶇О</Property>
</PropertyDef>
@@ -123,6 +123,234 @@
<Property></Property>
<Property name="label">澶囨敞</Property>
</PropertyDef>
+ <PropertyDef name="crkmx">
+ <Property></Property>
+ <Property name="label">鍑哄叆搴撴槑缁�</Property>
+ <Property name="dataType">[dtCrkmx]</Property>
+ </PropertyDef>
+ <PropertyDef name="zjbgwj">
+ <Property></Property>
+ <Property name="label">璐ㄦ鎶ュ憡鏂囦欢</Property>
+ <Property name="dataType">[dtZjbgwj]</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtCrkmx">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlInoutDel</Property>
+ <PropertyDef name="crkmxid">
+ <Property></Property>
+ <Property name="label">鍑哄叆搴撴槑缁咺D</Property>
+ </PropertyDef>
+ <PropertyDef name="ajbh">
+ <Property></Property>
+ <Property name="label">寤掗棿缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="ajmc">
+ <Property></Property>
+ <Property name="label">寤掗棿鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="hwbh">
+ <Property></Property>
+ <Property name="label">璐т綅缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="hwmc">
+ <Property></Property>
+ <Property name="label">璐т綅鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="kctzbh">
+ <Property></Property>
+ <Property name="label">搴撳瓨鍙板笎ID</Property>
+ </PropertyDef>
+ <PropertyDef name="kctzcppcid">
+ <Property></Property>
+ <Property name="label">搴撳瓨鍙板笎浜у搧鎵规ID</Property>
+ </PropertyDef>
+ <PropertyDef name="psmxid">
+ <Property></Property>
+ <Property name="label">閰嶉�佽溅杈嗘槑缁咺D</Property>
+ </PropertyDef>
+ <PropertyDef name="yjfamxid">
+ <Property></Property>
+ <Property name="label">搴旀�ユ柟妗堟槑缁咺D</Property>
+ </PropertyDef>
+ <PropertyDef name="lspzbm">
+ <Property></Property>
+ <Property name="label">鍝佺缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="lspzmc">
+ <Property></Property>
+ <Property name="label">鍝佺鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="cpbh">
+ <Property></Property>
+ <Property name="label">浜у搧缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="cpmc">
+ <Property></Property>
+ <Property name="label">浜у搧鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="jldwbm">
+ <Property></Property>
+ <Property name="label">璁￠噺鍗曚綅缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="jldwmc">
+ <Property></Property>
+ <Property name="label">璁￠噺鍗曚綅鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="jsdwbm">
+ <Property></Property>
+ <Property name="label">璁℃暟鍗曚綅缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="jsdwmc">
+ <Property></Property>
+ <Property name="label">璁℃暟鍗曚綅鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="crlx">
+ <Property></Property>
+ <Property name="label">鍑哄簱绫诲瀷</Property>
+ </PropertyDef>
+ <PropertyDef name="crksl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍑哄叆搴撴暟閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="crkzl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍑哄叆搴撻噸閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="qcsl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鏈熷垵鏁伴噺</Property>
+ </PropertyDef>
+ <PropertyDef name="qmsl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鏈熸湯鏁伴噺</Property>
+ </PropertyDef>
+ <PropertyDef name="qczl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鏈熷垵閲嶉噺</Property>
+ </PropertyDef>
+ <PropertyDef name="qmzl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鏈熸湭閲嶉噺 </Property>
+ </PropertyDef>
+ <PropertyDef name="shsl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鎹熻�楁暟閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="shzl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鎹熻�楅噸閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="ysyq">
+ <Property></Property>
+ <Property name="label">楠屾敹瑕佹眰</Property>
+ </PropertyDef>
+ <PropertyDef name="sfhx">
+ <Property></Property>
+ <Property name="label">鏄惁鏍搁攢</Property>
+ </PropertyDef>
+ <PropertyDef name="qkxm">
+ <Property></Property>
+ <Property name="label">娆犳椤圭洰</Property>
+ </PropertyDef>
+ <PropertyDef name="dj">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍗曚环</Property>
+ </PropertyDef>
+ <PropertyDef name="je">
+ <Property name="dataType">Double</Property>
+ <Property name="label">閲戦</Property>
+ </PropertyDef>
+ <PropertyDef name="cpdj">
+ <Property></Property>
+ <Property name="label">绛夌骇</Property>
+ </PropertyDef>
+ <PropertyDef name="cd">
+ <Property></Property>
+ <Property name="label">浜у湴</Property>
+ </PropertyDef>
+ <PropertyDef name="sccj">
+ <Property></Property>
+ <Property name="label">鐢熶骇鍘傚</Property>
+ </PropertyDef>
+ <PropertyDef name="gg">
+ <Property></Property>
+ <Property name="label">瑙勬牸鍨嬪彿</Property>
+ </PropertyDef>
+ <PropertyDef name="cppc">
+ <Property></Property>
+ <Property name="label">浜у搧鎵规</Property>
+ </PropertyDef>
+ <PropertyDef name="scrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鐢熶骇鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="bzq">
+ <Property name="dataType">Double</Property>
+ <Property name="label">淇濊川鏈�</Property>
+ </PropertyDef>
+ <PropertyDef name="bzqjzrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">淇濊川鏈熸埅鑷虫棩鏈�</Property>
+ </PropertyDef>
+ <PropertyDef name="bgy">
+ <Property></Property>
+ <Property name="label">淇濈鍛�</Property>
+ </PropertyDef>
+ <PropertyDef name="ckfs">
+ <Property></Property>
+ <Property name="label">鍑哄簱鏂瑰紡</Property>
+ </PropertyDef>
+ <PropertyDef name="djsj">
+ <Property></Property>
+ <Property name="label">鐧昏鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="zz">
+ <Property></Property>
+ <Property name="label">绔欓暱</Property>
+ </PropertyDef>
+ <PropertyDef name="jjy">
+ <Property></Property>
+ <Property name="label">璐ㄦ鍛�</Property>
+ </PropertyDef>
+ <PropertyDef name="sxh">
+ <Property name="dataType">int</Property>
+ <Property name="label">椤哄簭鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="bz">
+ <Property></Property>
+ <Property name="label">澶囨敞</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtZjbgwj">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlCheck</Property>
+ <PropertyDef name="jybgwjid">
+ <Property></Property>
+ <Property name="label">妫�楠屾姤鍛婃枃浠秈d</Property>
+ </PropertyDef>
+ <PropertyDef name="jyrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">妫�楠屾棩鏈�</Property>
+ </PropertyDef>
+ <PropertyDef name="jylx">
+ <Property></Property>
+ <Property name="label">妫�楠岀被鍨�</Property>
+ </PropertyDef>
+ <PropertyDef name="wjlx">
+ <Property></Property>
+ <Property name="label">鏂囦欢绫诲瀷</Property>
+ </PropertyDef>
+ <PropertyDef name="wjm">
+ <Property></Property>
+ <Property name="label">鏂囦欢鍚�</Property>
+ </PropertyDef>
+ <PropertyDef name="wjlj">
+ <Property></Property>
+ <Property name="label">鏂囦欢璺緞</Property>
+ </PropertyDef>
+ <PropertyDef name="wjdx">
+ <Property></Property>
+ <Property name="label">鏂囦欢澶у皬</Property>
+ </PropertyDef>
</DataType>
</Model>
<View layout="regionPadding:10">
@@ -139,7 +367,7 @@
<Property name="text">鑿滃崟鏍忥細</Property>
</Label>
<Button layoutConstraint="left">
- <ClientEvent name="onClick">view.get("#dsMain").insert();
+ <ClientEvent name="onClick">view.get("#dsMain").insert({});
view.get("#dialogMain").show();</ClientEvent>
<Property name="iconClass">fa fa-plus</Property>
<Property name="caption">鏂板</Property>
@@ -221,7 +449,7 @@
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="ssqymc">
- <Property name="property">ssqymc</Property>
+ <Property name="property">jlqymc</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="jgzdmc">
@@ -267,6 +495,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();
@@ -303,8 +532,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ssqymc</Property>
- <Property name="property">ssqymc</Property>
+ <Property name="name">jlqymc</Property>
+ <Property name="property">jlqymc</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -455,6 +684,307 @@
<Editor/>
</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/>
+ <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("zjbgwj");
+list.insert({});</ClientEvent>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dataGridDetail.currentEntity");
+if(!data){
+ return;
+}
+data.remove();</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ </Button>
+ </Container>
+ <DataGrid id="dataGridDetail">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">#.zjbgwj</Property>
+ <DataColumn name="jybgwjid">
+ <Property name="property">jybgwjid</Property>
+ </DataColumn>
+ <DataColumn name="jyrq">
+ <Property name="property">jyrq</Property>
+ </DataColumn>
+ <DataColumn name="jylx">
+ <Property name="property">jylx</Property>
+ </DataColumn>
+ <DataColumn name="wjlx">
+ <Property name="property">wjlx</Property>
+ </DataColumn>
+ <DataColumn name="wjm">
+ <Property name="property">wjm</Property>
+ </DataColumn>
+ <DataColumn name="wjlj">
+ <Property name="property">wjlj</Property>
+ </DataColumn>
+ <DataColumn name="wjdx">
+ <Property name="property">wjdx</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
</Children>
<Tools/>
</Dialog>
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 2556059..c2566f6 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml
@@ -109,13 +109,10 @@
<Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
- <Reference name="jsmx">
- <Property name="parameter">$${this.jsmxList}</Property>
- <Property name="dataProvider">whjlApi1213PR#listItem</Property>
+ <PropertyDef name="jsmx">
+ <Property></Property>
+ <Property name="label">缁撶畻鏄庣粏璁板綍</Property>
<Property name="dataType">[dtItem]</Property>
- </Reference>
- <PropertyDef name="jsmxList">
- <Property/>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -266,88 +263,59 @@
<RowSelectorColumn>
<Property name="caption">涓婁紶</Property>
</RowSelectorColumn>
- <DataColumn name="kcpdjlid">
- <Property name="property">kcpdjlid</Property>
+ <DataColumn name="rkfkjlid">
+ <Property name="property">rkfkjlid</Property>
+ </DataColumn>
+ <DataColumn name="crkid">
+ <Property name="property">crkid</Property>
</DataColumn>
<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>
</DataColumn>
<DataColumn name="jgzdmc">
<Property name="property">jgzdmc</Property>
</DataColumn>
- <DataColumn name="zcsj">
- <Property name="property">zcsj</Property>
+ <DataColumn name="skrsfzh">
+ <Property name="property">skrsfzh</Property>
</DataColumn>
- <DataColumn name="zcajbh">
- <Property name="property">zcajbh</Property>
+ <DataColumn name="skrdh">
+ <Property name="property">skrdh</Property>
</DataColumn>
- <DataColumn name="zccfmc">
- <Property name="property">zccfmc</Property>
+ <DataColumn name="khh">
+ <Property name="property">khh</Property>
</DataColumn>
- <DataColumn name="zrajbh">
- <Property name="property">zrajbh</Property>
+ <DataColumn name="yhkh">
+ <Property name="property">yhkh</Property>
</DataColumn>
- <DataColumn name="zrajmc">
- <Property name="property">zrajmc</Property>
+ <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="jsmx">
+ <Property name="property">jsmx</Property>
+ </DataColumn>
</DataGrid>
</Container>
- <Container layoutConstraint="bottom">
- <Property name="exClassName">bg-color</Property>
- <DataPilot layoutConstraint="right">
- <Property name="dataSet">dsMain</Property>
- <Property name="itemCodes">pageSize,pages</Property>
- </DataPilot>
- </Container>
- <UpdateAction id="updateSave">
- <Property name="dataResolver">whjlApi1213PR#saveData</Property>
- <UpdateItem>
- <Property name="dataPath">[#current]</Property>
- <Property name="dataSet">dsMain</Property>
- </UpdateItem>
- </UpdateAction>
- <AjaxAction id="ajaxDel">
- <Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
- <Property name="service">whjlApi1213PR#delData</Property>
- </AjaxAction>
- <AjaxAction id="ajaxPush">
- <Property name="service">whjlApi1213PR#pushData</Property>
- </AjaxAction>
- <Dialog id="dialogLog">
- <Property name="width">90%</Property>
- <Property name="height">90%</Property>
- <Property name="caption">涓婁紶璁板綍</Property>
- <Property name="iconClass">fa fa-sliders</Property>
- <Buttons>
- <Button>
- <ClientEvent name="onClick">self.get("parent").hide();</ClientEvent>
- <Property name="caption">鍏抽棴</Property>
- <Property name="iconClass">fa fa-times</Property>
- </Button>
- </Buttons>
- <Children>
- <Container>
- <IFrame id="iFrame">
- <Property name="path">com.fzzy.api.view.ApiLog.d</Property>
- <Property name="userData">
- <Entity>
- <Property name="deptId">deptId</Property>
- </Entity>
- </Property>
- </IFrame>
- </Container>
- </Children>
- <Tools/>
- </Dialog>
- <ListDropDown id="listDropYN">
- <Property name="items">鏄�,鍚�</Property>
- </ListDropDown>
<Dialog id="dialogMain" layout="regionPadding:10;padding:5">
<Property name="width">85%</Property>
<Property name="closeable">false</Property>
@@ -513,16 +481,6 @@
<Property name="property">kqdm</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">jsmx</Property>
- <Property name="property">jsmx</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jsmxList</Property>
- <Property name="property">jsmxList</Property>
- <Editor/>
- </AutoFormElement>
</AutoForm>
</Children>
</FieldSet>
@@ -581,5 +539,55 @@
</Children>
<Tools/>
</Dialog>
+ <Container layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </Container>
+ <UpdateAction id="updateSave">
+ <Property name="dataResolver">whjlApi1213PR#saveData</Property>
+ <UpdateItem>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="dataSet">dsMain</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDel">
+ <Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
+ <Property name="service">whjlApi1213PR#delData</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxPush">
+ <Property name="service">whjlApi1213PR#pushData</Property>
+ </AjaxAction>
+ <Dialog id="dialogLog">
+ <Property name="width">90%</Property>
+ <Property name="height">90%</Property>
+ <Property name="caption">涓婁紶璁板綍</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍏抽棴</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <Container>
+ <IFrame id="iFrame">
+ <Property name="path">com.fzzy.api.view.ApiLog.d</Property>
+ <Property name="userData">
+ <Entity>
+ <Property name="deptId">deptId</Property>
+ </Entity>
+ </Property>
+ </IFrame>
+ </Container>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <ListDropDown id="listDropYN">
+ <Property name="items">鏄�,鍚�</Property>
+ </ListDropDown>
</View>
</ViewConfig>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1214.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1214.view.xml
index 2c8c879..ac35a07 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1214.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1214.view.xml
@@ -137,21 +137,13 @@
<Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
- <Reference name="jcnl">
- <Property name="parameter">$${this.jcnlList}</Property>
- <Property name="dataProvider">whjlApi1214PR#listJCNL</Property>
+ <PropertyDef name="jcnl">
+ <Property></Property>
<Property name="dataType">[dtJCNL]</Property>
- </Reference>
- <Reference name="yqsb">
- <Property name="parameter">$${this.yqsbList}</Property>
- <Property name="dataProvider">whjlApi1214PR#listYQSB</Property>
- <Property name="dataType">[dtYQSB]</Property>
- </Reference>
- <PropertyDef name="jcnlList">
- <Property/>
</PropertyDef>
- <PropertyDef name="yqsbList">
- <Property/>
+ <PropertyDef name="yqsb">
+ <Property></Property>
+ <Property name="dataType">[dtYQSB]</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -180,17 +172,17 @@
</DataType>
<DataType name="dtJCNL">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlJCNL</Property>
- <PropertyDef name="bzbm">
+ <PropertyDef name="jcnlid">
+ <Property/>
+ <Property name="label">妫�娴嬭兘鍔汭D</Property>
+ </PropertyDef>
+ <PropertyDef name="zjbzid">
<Property></Property>
<Property name="label">璐ㄦ鏍囧噯缂栫爜</Property>
</PropertyDef>
<PropertyDef name="bzmxbm">
<Property></Property>
<Property name="label">鏍囧噯鏄庣粏缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="jcxmdjbm">
- <Property></Property>
- <Property name="label">妫�娴嬮」鐩瓑绾х紪鐮�</Property>
</PropertyDef>
<PropertyDef name="jcly">
<Property></Property>
@@ -208,23 +200,31 @@
<Property name="dataType">int</Property>
<Property name="label">搴忓彿</Property>
</PropertyDef>
+ <PropertyDef name="jcxm">
+ <Property name="dataType">[dtJcxm]</Property>
+ <Property name="label">妫�娴嬭兘鍔涚殑椤圭洰</Property>
+ </PropertyDef>
</DataType>
<DataType name="dtYQSB">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlYQSB</Property>
+ <PropertyDef name="yqsbid">
+ <Property></Property>
+ <Property name="label">浠櫒璁惧ID</Property>
+ </PropertyDef>
<PropertyDef name="yqsbbm">
- <Property/>
+ <Property></Property>
<Property name="label">浠櫒璁惧缂栫爜</Property>
</PropertyDef>
<PropertyDef name="yqsbmc">
- <Property/>
+ <Property></Property>
<Property name="label">浠櫒璁惧鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="ggxh">
- <Property/>
+ <Property></Property>
<Property name="label">瑙勬牸鍨嬪彿</Property>
</PropertyDef>
<PropertyDef name="zzgb">
- <Property/>
+ <Property></Property>
<Property name="label">鍒堕�犲浗鍒�</Property>
</PropertyDef>
<PropertyDef name="jg">
@@ -232,7 +232,7 @@
<Property name="label">浠锋牸</Property>
</PropertyDef>
<PropertyDef name="gznf">
- <Property/>
+ <Property></Property>
<Property name="label">璐疆骞翠唤</Property>
</PropertyDef>
<PropertyDef name="syl">
@@ -242,6 +242,21 @@
<PropertyDef name="xh">
<Property name="dataType">int</Property>
<Property name="label">搴忓彿</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtJcxm">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlJCXM</Property>
+ <PropertyDef name="jclnxmid">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="zjbzmxid">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="xh">
+ <Property name="dataType">Integer</Property>
+ </PropertyDef>
+ <PropertyDef name="bz">
+ <Property/>
</PropertyDef>
</DataType>
</Model>
@@ -613,14 +628,14 @@
<DataGrid id="dataGridJCNL">
<Property name="dataSet">dsMain</Property>
<Property name="dataPath">#.jcnl</Property>
- <DataColumn name="bzbm">
- <Property name="property">bzbm</Property>
+ <DataColumn name="jcnlid">
+ <Property name="property">jcnlid</Property>
+ </DataColumn>
+ <DataColumn name="zjbzid">
+ <Property name="property">zjbzid</Property>
</DataColumn>
<DataColumn name="bzmxbm">
<Property name="property">bzmxbm</Property>
- </DataColumn>
- <DataColumn name="jcxmdjbm">
- <Property name="property">jcxmdjbm</Property>
</DataColumn>
<DataColumn name="jcly">
<Property name="property">jcly</Property>
@@ -633,6 +648,52 @@
</DataColumn>
<DataColumn name="xh">
<Property name="property">xh</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
+ <Panel layout="regionPadding:5">
+ <Property name="caption">妫�娴嬭兘鍔涚殑椤圭洰</Property>
+ <Property name="height">400</Property>
+ <Buttons/>
+ <Children>
+ <Container layout="regionPadding:10">
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("jcnl").get("jcxm");
+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("#dgJcxm.currentEntity");
+if(!data){
+ return;
+}
+data.remove();</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ </Button>
+ </Container>
+ <DataGrid id="dgJcxm">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">#.jcnl.jcxm</Property>
+ <DataColumn name="jclnxmid">
+ <Property name="property">jclnxmid</Property>
+ </DataColumn>
+ <DataColumn name="zjbzmxid">
+ <Property name="property">zjbzmxid</Property>
+ </DataColumn>
+ <DataColumn name="xh">
+ <Property name="property">xh</Property>
+ </DataColumn>
+ <DataColumn name="bz">
+ <Property name="property">bz</Property>
</DataColumn>
</DataGrid>
</Children>
@@ -669,6 +730,9 @@
<Property name="dataSet">dsMain</Property>
<Property name="dataPath">#.yqsb</Property>
<DataColumn name="yqsbbm">
+ <Property name="property">yqsbid</Property>
+ </DataColumn>
+ <DataColumn name="yqsbbm">
<Property name="property">yqsbbm</Property>
</DataColumn>
<DataColumn name="yqsbmc">
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1216.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1216.view.xml
index 67434d2..b8e4ae5 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1216.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1216.view.xml
@@ -61,14 +61,16 @@
<Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
- <Reference name="jcmx">
- <Property name="label">妫�娴嬫槑缁�</Property>
+ <PropertyDef name="jcmx">
+ <Property></Property>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
<Property name="dataType">[dtCheckItm]</Property>
- </Reference>
- <Reference name="jcbgwj">
- <Property name="label">妫�娴嬫姤鍛婃枃浠�</Property>
+ </PropertyDef>
+ <PropertyDef name="jcbgwj">
+ <Property></Property>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
<Property name="dataType">[dtCheckFile]</Property>
- </Reference>
+ </PropertyDef>
</DataType>
<DataType name="dtCheckItm">
<Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlCheckItm</Property>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java b/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
index 7e34939..50c502f 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
@@ -131,7 +131,7 @@
*/
public static String API_CODE_1211 = "1211";
/**
- * 鎺ュ彛缂栫爜-1212 搴撳唴杞粨璁板綍鏁版嵁鎺ュ彛
+ * 鎺ュ彛缂栫爜-1212 鍑哄叆搴撹褰曟暟鎹帴鍙�
*/
public static String API_CODE_1212 = "1212";
/**
@@ -140,7 +140,7 @@
public static String API_CODE_1213 = "1213";
/**
* /**
- * 鎺ュ彛缂栫爜-1214 鍑哄叆搴撹褰曟暟鎹帴鍙�
+ * 鎺ュ彛缂栫爜-1214 璐ㄦ鏈烘瀯
*/
public static String API_CODE_1214 = "1214";
/**
@@ -310,18 +310,32 @@
public static String API_CODE_KCTZCRJL = "KCTZCRJL";
//鎺ュ彛缂栫爜-1211 搴撳瓨鐩樼偣璁板綍 --璺緞(KCPDJL)
public static String API_CODE_KCPDJL = "KCPDJL";
- //鎺ュ彛缂栫爜-1212 搴撳唴杞粨璁板綍 --璺緞(KNZCJL)
+ //鎺ュ彛缂栫爜- 搴撳唴杞粨璁板綍 --璺緞(KNZCJL)
public static String API_CODE_KNZCJL = "KNZCJL";
- //鎺ュ彛缂栫爜-1213 鍑哄叆搴撹褰� --璺緞(CRKJL)
+ //鎺ュ彛缂栫爜-1212 鍑哄叆搴撹褰� --璺緞(CRKJL)
public static String API_CODE_CRKJL = "CRKJL";
- //鎺ュ彛缂栫爜-1301 璐ㄦ鏈烘瀯 --璺緞(ZJJG)
+ //鎺ュ彛缂栫爜-1214 璐ㄦ鏈烘瀯 --璺緞(ZJJG)
public static String API_CODE_ZJJG = "ZJJG";
- //鎺ュ彛缂栫爜-1302 璐ㄦ鎶ュ憡 --璺緞(ZJBG)
+ //鎺ュ彛缂栫爜-1216 璐ㄦ鎶ュ憡 --璺緞(ZJBG)
public static String API_CODE_ZJBG = "ZJBG";
- //鎺ュ彛缂栫爜-1303 绮儏妫�娴嬭褰� --璺緞(LQJCJL)
- public static String API_CODE_LQJCJL = "LQJCJL";
+ //鎺ュ彛缂栫爜-1217 淇濊川鏈熼璀﹁鍒� --璺緞(BZQYJGZ)
+ public static String API_CODE_BZQYJGZ = "BZQYJGZ";
+ //鎺ュ彛缂栫爜-1218 淇濊川鏈熼璀﹁褰�--璺緞(BZQYJJL)
+ public static String API_CODE_BZQYJJL = "BZQYJJL";
+ //鎺ュ彛缂栫爜-1219 鐗╄祫搴撳瓨棰勮瑙勫垯--璺緞(WZKCYJGZ)
+ public static String API_CODE_WZKCYJGZ = "WZKCYJGZ";
+ //鎺ュ彛缂栫爜-1220 鐗╄祫搴撳瓨棰勮瑙勫垯--璺緞(WZKCYJJL)
+ public static String API_CODE_WZKCYJJL = "WZKCYJJL";
+ //鎺ュ彛缂栫爜-1301 娓╂箍搴︽娴嬭褰� --璺緞(WSDJCJL)
+ public static String API_CODE_WSDJCJL = "WSDJCJL";
+ //鎺ュ彛缂栫爜-1302 杩愯緭鐜妫�娴嬭褰� --璺緞(YSHJJCJL)
+ public static String API_CODE_YSHJJCJL = "YSHJJCJL";
+ //鎺ュ彛缂栫爜-1303 娓╂箍搴﹀憡璀﹁褰� --璺緞(WSDGJJL)
+ public static String API_CODE_WSDGJJL = "WSDGJJL";
//鎺ュ彛缂栫爜-1304 鑳借�楄褰� --璺緞(NHJL)
public static String API_CODE_NHJL = "NHJL";
+ //鎺ュ彛缂栫爜-1305 璋冨害閰嶉�佷换鍔� --璺緞(DDPSRW)
+ public static String API_CODE_DDPSRW = "DDPSRW";
//鎺ュ彛缂栫爜-1401 鍔ㄥ憳浼佷笟 --璺緞(DYQY)
public static String API_CODE_DYQY = "DYQY";
//鎺ュ彛缂栫爜-1402 鍔ㄥ憳鍗忚 --璺緞(DYXY)
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java
index 00ccc12..562b3a9 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java
@@ -23,41 +23,44 @@
private static final long serialVersionUID = 1L;
- private String htid; //鍚堝悓ID
- private String jlqybh; //鍐涚伯浼佷笟缂栧彿
- private String ssqymc; //鍐涚伯浼佷笟鍚嶇О
- private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
- private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
- private String htlx; //鍚堝悓绫诲瀷
- private String htbh; //鍚堝悓缂栧彿
- private String htbt; //鍚堝悓鏍囬
- private String jljgqybh; //鍔犲伐浼佷笟缂栧彿
- private String jljgqymc; //鍔犲伐浼佷笟鍚嶇О
- private String htkhbh; //鍚堝悓瀹㈡埛缂栧彿
- private String htkhmc; //鍚堝悓瀹㈡埛鍚嶇О
- private Double htspdj; //鍚堝悓鍟嗗搧鍗曚环
- private Double htspsl; //鍚堝悓鍟嗗搧鏁伴噺
- private String spbm; //鍟嗗搧缂栫爜
- private Double zje; //鎬婚噾棰�
- private String htqdr; //鍚堝悓绛捐浜�
- private Date htqdsj; //鍚堝悓绛捐鏃堕棿
- private Date htsxrq; //鍚堝悓鐢熸晥鏃ユ湡
- private Date htjzrq; //鍚堝悓鎴鏃堕棿
- private String htcjr; //鍚堝悓鍒涘缓浜�
- private Date htcjsj; //鍚堝悓鍒涘缓鏃堕棿
- private String htdbgjlbz; //鍚堝悓鐨勫彉鏇磋褰曟爣蹇�
- private String htbgyy; //鍚堝悓鍙樻洿鍘熷洜
- private String htgylx; //鍚堝悓渚涘簲绫诲瀷
- private String yhtbh; //鍘熷悎鍚岀紪鍙�
- private String zffs; //鏀粯鏂瑰紡
- private Double ywcsl; //宸插畬鎴愭暟閲�
- private Double ywcslje; //宸插畬鎴愭暟閲忛噾棰�
- private String htbz; //鍚堝悓澶囨敞
- private String htzt; //鍚堝悓鐘舵��
- private String hrqdr; //鍚堝悓鐘舵��
- private Integer xh; //搴忓彿
- private String sfyx; //鏄惁鏈夋晥
- private String bz; //澶囨敞
+ private String htid; //鍚堝悓ID
+ private String jlqybh; //鍐涚伯浼佷笟缂栧彿
+ private String ssqymc; //鍐涚伯浼佷笟鍚嶇О
+ private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
+ private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
+ private String htlx; //鍚堝悓绫诲瀷
+ private String htbh; //鍚堝悓缂栧彿
+ private String htbt; //鍚堝悓鏍囬
+ private String jljgqybh; //鍔犲伐浼佷笟缂栧彿
+ private String jljgqymc; //鍔犲伐浼佷笟鍚嶇О
+ private String htkhbh; //鍚堝悓瀹㈡埛缂栧彿
+ private String htkhmc; //鍚堝悓瀹㈡埛鍚嶇О
+ private String htspdj; //鍚堝悓鍟嗗搧鍗曚环
+ private Double htspsl; //鍚堝悓鍟嗗搧鏁伴噺
+ private String spbm; //鍟嗗搧缂栫爜
+ private Double zje; //鎬婚噾棰�
+ private String hrqdr; //鍚堝悓绛捐浜�
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date htqdsj; //鍚堝悓绛捐鏃堕棿
+ @JSONField(format = "yyyy-MM-dd")
+ private Date htsxrq; //鍚堝悓鐢熸晥鏃ユ湡
+ @JSONField(format = "yyyy-MM-dd")
+ private Date htjzrq; //鍚堝悓鎴鏃ユ湡
+ private String htcjr; //鍚堝悓鍒涘缓浜�
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ private Date htcjsj; //鍚堝悓鍒涘缓鏃堕棿
+ private String htdbgjlbz; //鍚堝悓鐨勫彉鏇磋褰曟爣蹇�
+ private String htbgyy; //鍚堝悓鍙樻洿鍘熷洜
+ private String htgylx; //鍚堝悓渚涘簲绫诲瀷
+ private String yhtbh; //鍘熷悎鍚岀紪鍙�
+ private String zffs; //鏀粯鏂瑰紡
+ private Double ywcsl; //宸插畬鎴愭暟閲�
+ private Double ywcslje; //宸插畬鎴愭暟閲忛噾棰�
+ private String htbz; //鍚堝悓澶囨敞
+ private String htzt; //鍚堝悓鐘舵��
+ private Integer xh; //搴忓彿
+ private String sfyx; //鏄惁鏈夋晥
+ private String bz; //澶囨敞
private List<WhjlQDItem> htspqd; //鍟嗗搧娓呭崟
//鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java
index ddc93f6..674fdb4 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1207.java
@@ -34,7 +34,7 @@
private String hwmc; //璐т綅鍚嶇О
private String lspzbm; //鍝佺缂栧彿
private String lspzmc; //鍝佺鍚嶇О
- private String cpbm; //浜у搧缂栧彿
+ private String cpbh; //浜у搧缂栧彿
private String cpmc; //浜у搧鍚嶇О
private String lqdw; //绮潈鍗曚綅
private String bgms; //淇濈妯″紡
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java
index 1ad54ea..0cd06b2 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1208.java
@@ -27,7 +27,9 @@
private String ssqymc; //鍐涚伯浼佷笟鍚嶇О
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
- private String cpbm; //浜у搧缂栧彿
+ private String hwmc; //鍐涗緵绔欑偣鍚嶇О
+ private String hwbh; //鍐涗緵绔欑偣鍚嶇О
+ private String cpbh; //浜у搧缂栧彿
private String cpmc; //浜у搧鍚嶇О
private String cpnd; //浜у搧骞村害
private String cpcd; //浜у搧浜у湴
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java
index 789fc25..09a8391 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1209.java
@@ -30,7 +30,7 @@
private String crlx; //鍑哄叆绫诲瀷
private String jllx; //璁板綍绫诲瀷
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
- private String jlsj; //璁板綍鏃堕棿
+ private Date jlsj; //璁板綍鏃堕棿
private Double crqsl; //鍑哄叆搴撳墠鏁伴噺
private Double crqzl; //鍑哄叆搴撳墠閲嶉噺
private Double crsl; //鍑哄叆鏁伴噺
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java
index 8e1163c..e001ae5 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1210.java
@@ -35,9 +35,11 @@
private String bgy; //淇濈鍛�
private String fzr; //璐熻矗浜�
private String sfyx; //鏄惁鏈夋晥
+ private List<WhjlPDMX> pdmx; //鐩樼偣鏄庣粏
//***************娉細鎺ュ彛涓笉闇�瑕佺洏鐐规竻鍗曪紝鐩樼偣娓呭崟鍙槸涓轰簡鎻愪氦鏃舵洿鏂板簱瀛樺埌搴撳瓨鎵规鍙板笎锛屼笂鎶ヨ繃鏉ョ殑搴撳瓨鎵规鍙拌处宸茬粡鏇存柊杩囦簡********************//
+
//鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
@JSONField(serialize = false)
private String bizId; //涓氬姟ID
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java
index 20a369d..bd4ceb6 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java
@@ -24,7 +24,7 @@
private String crkid; //鍑哄叆搴撹褰昳d
private String jlqybh; //鍐涚伯浼佷笟缂栧彿
- private String ssqymc; //鍐涚伯浼佷笟鍚嶇О
+ private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
private String jgzdbh; //鍐涗緵绔欑偣缂栧彿
private String jgzdmc; //鍐涗緵绔欑偣鍚嶇О
@JSONField(format = "yyyy-MM-dd")
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1213.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1213.java
index 09fcf84..50c3675 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1213.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1213.java
@@ -46,9 +46,6 @@
private String bz;//澶囨敞
private List<WhjlJSMX> jsmx;//缁撶畻鏄庣粏璁板綍
-
- private String jsmxList;
-
//鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
@JSONField(serialize = false)
private String bizId; //涓氬姟ID
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java
index ca8fe04..53f1aab 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1214.java
@@ -39,24 +39,22 @@
private String lxr;//鑱旂郴浜�
private String zgbm;//涓荤閮ㄩ棬
private String zjjgjb;//璐ㄦ鏈烘瀯绾у埆
- private int zcygs;//鍦ㄥ唽鍛樺伐鏁�
- private int gjzcrs;//楂樼骇鑱岀О浜烘暟
- private int zjzcrs;//涓骇鑱岀О浜烘暟
- private int cjzcrs;//鍒濈骇鑱岀О浜烘暟
- private int bs;//鍗氬＋浜烘暟
- private int ss;//纭曞＋浜烘暟
- private int xs;//瀛﹀＋浜烘暟
- private int dzsyx;//澶т笓鐢熶互涓�
+ private Integer zcygs;//鍦ㄥ唽鍛樺伐鏁�
+ private Integer gjzcrs;//楂樼骇鑱岀О浜烘暟
+ private Integer zjzcrs;//涓骇鑱岀О浜烘暟
+ private Integer cjzcrs;//鍒濈骇鑱岀О浜烘暟
+ private Integer bs;//鍗氬＋浜烘暟
+ private Integer ss;//纭曞＋浜烘暟
+ private Integer xs;//瀛﹀＋浜烘暟
+ private Integer dzsyx;//澶т笓鐢熶互涓�
private Double zgdzc;//鎬诲浐瀹氳祫浜�
private Double mj;//闈㈢Н
private String zcxz;//璧勪骇鎬ц川
- private int csspjcdrs;//浠庝簨椋熷搧妫�娴嬬殑浜烘暟
+ private Integer csspjcdrs;//浠庝簨椋熷搧妫�娴嬬殑浜烘暟
private String bz;//澶囨敞
private List<WhjlJCNL> jcnl;//妫�娴嬭兘鍔�
private List<WhjlYQSB> yqsb;//浠櫒璁惧
- private String jcnlList;
- private String yqsbList;
//鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
@JSONField(serialize = false)
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 bec0282..00d5c14 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlInoutDel.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlInoutDel.java
@@ -51,7 +51,7 @@
private String qkxm;//娆犳椤圭洰
private Double dj;//鍗曚环
private Double je;//閲戦
- private String dj1;//绛夌骇
+ private String cpdj;//绛夌骇
private String cd;//浜у湴
private String sccj;//鐢熶骇鍘傚
private String gg;//瑙勬牸鍨嬪彿
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJCNL.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJCNL.java
index 6fb9191..c8263b2 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJCNL.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJCNL.java
@@ -4,6 +4,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.util.List;
/**
* @Author: YYC
@@ -20,12 +21,12 @@
*/
private static final long serialVersionUID = 1L;
- private String bzbm;//璐ㄦ鏍囧噯缂栫爜
- private String bzmxbm;//鏍囧噯鏄庣粏缂栫爜
- private String jcxmdjbm;//妫�娴嬮」鐩瓑绾х紪鐮�
+ private String jcnlid;//妫�娴嬭兘鍔汭D
+ private String zjbzid;//璐ㄦ鏍囧噯缂栫爜
private String jcly;//妫�娴嬮鍩�
private String xzfw;//闄愬埗鑼冨洿
private String zzzmdm;//璧勮川璇佹槑浠ｇ爜
- private int xh;//搴忓彿
+ private Integer xh;//搴忓彿
+ private List<WhjlJCXM> jcxm;//妫�娴嬭兘鍔涚殑椤圭洰
}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJCXM.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJCXM.java
new file mode 100644
index 0000000..e8f0442
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlJCXM.java
@@ -0,0 +1,25 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * @Author: YYC
+ * @Description:杞粨鏄庣粏
+ * @DateTime: 2023-10-29 22:56
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlJCXM implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+ private String jclnxmid; //妫�娴嬭兘鍔涢」鐩甀D
+ private String zjbzmxid; //璐ㄦ鏍囧噯鏄庣粏ID
+ private Integer xh; //搴忓彿
+ private String bz; //澶囨敞
+
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlPDMX.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlPDMX.java
new file mode 100644
index 0000000..1805f76
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlPDMX.java
@@ -0,0 +1,36 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * @Author: YYC
+ * @Description:杞粨鏄庣粏
+ * @DateTime: 2023-10-29 22:56
+ **/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlPDMX implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+ private String kcpdjlmxid; //搴撳瓨鐩樼偣璁板綍鏄庣粏ID
+ private String kcpdjlid; //搴撳瓨鐩樼偣璁板綍ID
+ private String kctzbh; //搴撳瓨鍙板笎ID
+ private String cpbh; //浜у搧缂栧彿
+ private String cpmc; //浜у搧鍚嶇О
+ private String jldwbm; //璁￠噺鍗曚綅缂栫爜
+ private String jldwmc; //璁￠噺鍗曚綅鍚嶇О
+ private String jsdwbm; //璁℃暟鍗曚綅缂栫爜
+ private String jsdwmc; //璁℃暟鍗曚綅鍚嶇О
+ private Double zmkcs; //甯愰潰搴撳瓨閲嶉噺
+ private Double sjkcs; //瀹為檯搴撳瓨閲嶉噺
+ private Double cszl; //闀挎暟閲嶉噺
+ private Double dszl; //鐭暟閲嶉噺
+ private Double qtzl; //娆犳潯閲嶉噺
+ private Double wtzl; //鏈彁閲嶉噺
+ private Double ytzl; //宸叉彁閲嶉噺
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlYQSB.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlYQSB.java
index 5a0237d..a263c0c 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlYQSB.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlYQSB.java
@@ -18,6 +18,7 @@
*/
private static final long serialVersionUID = 1L;
+ private String yqsbid;//浠櫒璁惧ID
private String yqsbbm;//浠櫒璁惧缂栫爜
private String yqsbmc;//浠櫒璁惧鍚嶇О
private String ggxh;//瑙勬牸鍨嬪彿
@@ -25,6 +26,6 @@
private Double jg;//浠锋牸
private String gznf;//璐疆骞翠唤
private Double syl;//浣跨敤鐜�
- private int xh;//搴忓彿
+ private Integer xh;//搴忓彿
}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1213PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1213PR.java
index 3cd3c52..3517c37 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1213PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1213PR.java
@@ -127,7 +127,6 @@
*/
@DataResolver
public void saveData(WhjlApi1213 data) {
- data.setJsmxList(JSON.toJSONString(data.getJsmx()));
ApiInfoData infoData;
List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(WhjlConstant.API_CODE_1213, data.getBizId(), data.getKqdm());
if (apiInfoList.size() != 0) {
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java
index c6c5c06..b7e841e 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1214PR.java
@@ -130,8 +130,6 @@
*/
@DataResolver
public void saveData(WhjlApi1214 data) {
- data.setJcnlList(JSON.toJSONString(data.getJcnl()));
- data.setYqsbList(JSON.toJSONString(data.getYqsb()));
ApiInfoData infoData;
List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(WhjlConstant.API_CODE_1214, data.getBizId(), data.getKqdm());
if (apiInfoList.size() != 0) {
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
index e9aa15d..9da5b89 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
@@ -217,14 +217,28 @@
return WhjlConstant.API_CODE_CRKJL;
case "1213":
return WhjlConstant.API_CODE_ZJJG;
- case "1301":
+ case "1214":
return WhjlConstant.API_CODE_ZJJG;
- case "1302":
+ case "1216":
return WhjlConstant.API_CODE_ZJBG;
+ case "1217":
+ return WhjlConstant.API_CODE_BZQYJGZ;
+ case "1218":
+ return WhjlConstant.API_CODE_BZQYJJL;
+ case "1219":
+ return WhjlConstant.API_CODE_WZKCYJGZ;
+ case "1220":
+ return WhjlConstant.API_CODE_WZKCYJJL;
+ case "1301":
+ return WhjlConstant.API_CODE_WSDJCJL;
+ case "1302":
+ return WhjlConstant.API_CODE_YSHJJCJL;
case "1303":
- return WhjlConstant.API_CODE_LQJCJL;
+ return WhjlConstant.API_CODE_WSDGJJL;
case "1304":
return WhjlConstant.API_CODE_NHJL;
+ case "1305":
+ return WhjlConstant.API_CODE_DDPSRW;
case "1401":
return WhjlConstant.API_CODE_DYQY;
case "1402":
--
Gitblit v1.9.3