From 24da09489db83167c91f5920a92ea19f29d96829 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 10 十一月 2023 20:14:03 +0800
Subject: [PATCH] 优化上海接口同步
---
src/main/java/com/fzzy/api/entity/Api1502.java | 305 ++++++------
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java | 30 -
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java | 2
src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutSettle.java | 9
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java | 2
src/main/java/com/fzzy/api/view/repository/Api1201Rep.java | 8
src/main/java/com/fzzy/api/entity/Api1207.java | 2
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java | 3
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java | 51 +
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 61 +
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 21
src/main/java/com/fzzy/api/view/repository/Api1404Rep.java | 8
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java | 39 -
src/main/java/com/fzzy/api/entity/Api1503.java | 345 ++++++------
src/main/java/com/fzzy/api/entity/Api1501.java | 555 +++++++++++-----------
15 files changed, 729 insertions(+), 712 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1207.java b/src/main/java/com/fzzy/api/entity/Api1207.java
index ac83714..20b598f 100644
--- a/src/main/java/com/fzzy/api/entity/Api1207.java
+++ b/src/main/java/com/fzzy/api/entity/Api1207.java
@@ -32,7 +32,7 @@
@Id
@PropertyDef(label = "鍊掍粨鍗曞彿" )
- @Column(name = "dcdh", length = 32)
+ @Column(name = "dcdh", length = 33)
private String dcdh;
@PropertyDef(label = "鍊掍粨绫诲瀷" )
diff --git a/src/main/java/com/fzzy/api/entity/Api1501.java b/src/main/java/com/fzzy/api/entity/Api1501.java
index f9b71ae..ce44acc 100644
--- a/src/main/java/com/fzzy/api/entity/Api1501.java
+++ b/src/main/java/com/fzzy/api/entity/Api1501.java
@@ -5,14 +5,11 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
-
import java.io.Serializable;
-import java.math.BigDecimal;
import java.util.Date;
/**
@@ -49,556 +46,556 @@
private Date bbsj;
@PropertyDef(label = "璐у竵璧勯噾鏈熸湯浣欓(鍏�)" )
- @Column(name = "hbjjqmye", precision = 20, scale = 2)
- private BigDecimal hbjjqmye;
+ @Column(name = "hbjjqmye")
+ private Double hbjjqmye;
@PropertyDef(label = "璐у竵璧勯噾骞村垵浣欓(鍏�)" )
- @Column(name = "hbjjncye", precision = 20, scale = 2)
- private BigDecimal hbjjncye;
+ @Column(name = "hbjjncye")
+ private Double hbjjncye;
@PropertyDef(label = "浜ゆ槗鎬ч噾铻嶈祫浜ф湡鏈綑棰�(鍏�)" )
- @Column(name = "jyxjrzcqmye", precision = 20, scale = 2)
- private BigDecimal jyxjrzcqmye;
+ @Column(name = "jyxjrzcqmye")
+ private Double jyxjrzcqmye;
@PropertyDef(label = "浜ゆ槗鎬ч噾铻嶈祫浜у勾鍒濅綑棰�(鍏�)" )
- @Column(name = "jyxjrzcncye", precision = 20, scale = 2)
- private BigDecimal jyxjrzcncye;
+ @Column(name = "jyxjrzcncye")
+ private Double jyxjrzcncye;
@PropertyDef(label = "琛嶇敓閲戣瀺璧勪骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "ysjrzcqmye", precision = 20, scale = 2)
- private BigDecimal ysjrzcqmye;
+ @Column(name = "ysjrzcqmye")
+ private Double ysjrzcqmye;
@PropertyDef(label = "琛嶇敓閲戣瀺璧勪骇骞村垵浣欓(鍏�)" )
- @Column(name = "ysjrzcncye", precision = 20, scale = 2)
- private BigDecimal ysjrzcncye;
+ @Column(name = "ysjrzcncye")
+ private Double ysjrzcncye;
@PropertyDef(label = "搴旀敹绁ㄦ嵁鏈熸湯浣欓(鍏�)" )
- @Column(name = "yspjqmye", precision = 20, scale = 2)
- private BigDecimal yspjqmye;
+ @Column(name = "yspjqmye")
+ private Double yspjqmye;
@PropertyDef(label = "搴旀敹绁ㄦ嵁骞村垵浣欓(鍏�)" )
- @Column(name = "yspjncye", precision = 20, scale = 2)
- private BigDecimal yspjncye;
+ @Column(name = "yspjncye")
+ private Double yspjncye;
@PropertyDef(label = "搴旀敹璐︽鏈熸湯浣欓(鍏�)" )
- @Column(name = "yszkqmye", precision = 20, scale = 2)
- private BigDecimal yszkqmye;
+ @Column(name = "yszkqmye")
+ private Double yszkqmye;
@PropertyDef(label = "搴旀敹璐︽骞村垵浣欓(鍏�)" )
- @Column(name = "yszkncye", precision = 20, scale = 2)
- private BigDecimal yszkncye;
+ @Column(name = "yszkncye")
+ private Double yszkncye;
@PropertyDef(label = "棰勪粯娆鹃」鏈熸湯浣欓(鍏�)" )
- @Column(name = "yuskxqmye", precision = 20, scale = 2)
- private BigDecimal yuskxqmye;
+ @Column(name = "yuskxqmye")
+ private Double yuskxqmye;
@PropertyDef(label = "棰勪粯娆鹃」骞村垵浣欓(鍏�)" )
- @Column(name = "yuskxncye", precision = 20, scale = 2)
- private BigDecimal yuskxncye;
+ @Column(name = "yuskxncye")
+ private Double yuskxncye;
@PropertyDef(label = "鍏朵粬搴旀敹娆炬湡鏈綑棰�(鍏�)" )
- @Column(name = "qtyszkqmye", precision = 20, scale = 2)
- private BigDecimal qtyszkqmye;
+ @Column(name = "qtyszkqmye")
+ private Double qtyszkqmye;
@PropertyDef(label = "鍏朵粬搴旀敹娆惧勾鍒濅綑棰�(鍏�)" )
- @Column(name = "qtyszkncye", precision = 20, scale = 2)
- private BigDecimal qtyszkncye;
+ @Column(name = "qtyszkncye")
+ private Double qtyszkncye;
@PropertyDef(label = "瀛樿揣鏈熸湯浣欓(鍏�)" )
- @Column(name = "chqmye", precision = 20, scale = 2)
- private BigDecimal chqmye;
+ @Column(name = "chqmye")
+ private Double chqmye;
@PropertyDef(label = "瀛樿揣骞村垵浣欓(鍏�)" )
- @Column(name = "chncye", precision = 20, scale = 2)
- private BigDecimal chncye;
+ @Column(name = "chncye")
+ private Double chncye;
@PropertyDef(label = "鍚堝悓璧勪骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "htzcqmye", precision = 20, scale = 2)
- private BigDecimal htzcqmye;
+ @Column(name = "htzcqmye")
+ private Double htzcqmye;
@PropertyDef(label = "鍚堝悓璧勪骇骞村垵浣欓(鍏�)" )
- @Column(name = "htzcncye", precision = 20, scale = 2)
- private BigDecimal htzcncye;
+ @Column(name = "htzcncye")
+ private Double htzcncye;
@PropertyDef(label = "鎸佹湁寰呭敭璧勪骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "cydszcqmye", precision = 20, scale = 2)
- private BigDecimal cydszcqmye;
+ @Column(name = "cydszcqmye")
+ private Double cydszcqmye;
@PropertyDef(label = "鎸佹湁寰呭敭璧勪骇骞村垵浣欓(鍏�)" )
- @Column(name = "cydszcncye", precision = 20, scale = 2)
- private BigDecimal cydszcncye;
+ @Column(name = "cydszcncye")
+ private Double cydszcncye;
@PropertyDef(label = "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "ynndqfldzcqmye", precision = 20, scale = 2)
- private BigDecimal ynndqfldzcqmye;
+ @Column(name = "ynndqfldzcqmye")
+ private Double ynndqfldzcqmye;
@PropertyDef(label = "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇骞村垵浣欓(鍏�)" )
- @Column(name = "ynndqfldzcncye", precision = 20, scale = 2)
- private BigDecimal ynndqfldzcncye;
+ @Column(name = "ynndqfldzcncye")
+ private Double ynndqfldzcncye;
@PropertyDef(label = "鍏朵粬娴佸姩璧勪骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "qtldzcqmye", precision = 20, scale = 2)
- private BigDecimal qtldzcqmye;
+ @Column(name = "qtldzcqmye")
+ private Double qtldzcqmye;
@PropertyDef(label = "鍏朵粬娴佸姩璧勪骇骞村垵浣欓(鍏�)" )
- @Column(name = "qtldzcncye", precision = 20, scale = 2)
- private BigDecimal qtldzcncye;
+ @Column(name = "qtldzcncye")
+ private Double qtldzcncye;
@PropertyDef(label = "娴佸姩璧勪骇鍚堣鏈熸湯浣欓(鍏�)" )
- @Column(name = "ldzchjqmye", precision = 20, scale = 2)
- private BigDecimal ldzchjqmye;
+ @Column(name = "ldzchjqmye")
+ private Double ldzchjqmye;
@PropertyDef(label = "娴佸姩璧勪骇鍚堣骞村垵浣欓(鍏�)" )
- @Column(name = "ldzchjncye", precision = 20, scale = 2)
- private BigDecimal ldzchjncye;
+ @Column(name = "ldzchjncye")
+ private Double ldzchjncye;
@PropertyDef(label = "鍊哄埜鎶曡祫鏈熸湯浣欓(鍏�)" )
- @Column(name = "zjtzqmye", precision = 20, scale = 2)
- private BigDecimal zjtzqmye;
+ @Column(name = "zjtzqmye")
+ private Double zjtzqmye;
@PropertyDef(label = "鍊哄埜鎶曡祫骞村垵浣欓(鍏�)" )
- @Column(name = "zjtzncye", precision = 20, scale = 2)
- private BigDecimal zjtzncye;
+ @Column(name = "zjtzncye")
+ private Double zjtzncye;
@PropertyDef(label = "鍏朵粬鍊哄埜鎶曡祫鏈熸湯浣欓(鍏�)" )
- @Column(name = "qtzqtzqmye", precision = 20, scale = 2)
- private BigDecimal qtzqtzqmye;
+ @Column(name = "qtzqtzqmye")
+ private Double qtzqtzqmye;
@PropertyDef(label = "鍏朵粬鍊哄埜鎶曡祫骞村垵浣欓(鍏�)" )
- @Column(name = "qtzqtzncye", precision = 20, scale = 2)
- private BigDecimal qtzqtzncye;
+ @Column(name = "qtzqtzncye")
+ private Double qtzqtzncye;
@PropertyDef(label = "闀挎湡搴旀敹娆炬湡鏈綑棰�(鍏�)" )
- @Column(name = "cqyskqmye", precision = 20, scale = 2)
- private BigDecimal cqyskqmye;
+ @Column(name = "cqyskqmye")
+ private Double cqyskqmye;
@PropertyDef(label = "闀挎湡搴旀敹娆惧勾鍒濅綑棰�(鍏�)" )
- @Column(name = "cqyskncye", precision = 20, scale = 2)
- private BigDecimal cqyskncye;
+ @Column(name = "cqyskncye")
+ private Double cqyskncye;
@PropertyDef(label = "闀挎湡鑲℃潈鎶曡祫鏈熸湯浣欓(鍏�)" )
- @Column(name = "cqgqtzqmye", precision = 20, scale = 2)
- private BigDecimal cqgqtzqmye;
+ @Column(name = "cqgqtzqmye")
+ private Double cqgqtzqmye;
@PropertyDef(label = "闀挎湡鑲℃潈鎶曡祫骞村垵浣欓(鍏�)" )
- @Column(name = "cqgqtzncye", precision = 20, scale = 2)
- private BigDecimal cqgqtzncye;
+ @Column(name = "cqgqtzncye")
+ private Double cqgqtzncye;
@PropertyDef(label = "鍏朵粬鏉冪泭宸ュ叿鎶曡祫鏈熸湯浣欓(鍏�)" )
- @Column(name = "qtqygjtzqmye", precision = 20, scale = 2)
- private BigDecimal qtqygjtzqmye;
+ @Column(name = "qtqygjtzqmye")
+ private Double qtqygjtzqmye;
@PropertyDef(label = "鍏朵粬鏉冪泭宸ュ叿鎶曡祫骞村垵浣欓(鍏�)" )
- @Column(name = "qtqygjtzncye", precision = 20, scale = 2)
- private BigDecimal qtqygjtzncye;
+ @Column(name = "qtqygjtzncye")
+ private Double qtqygjtzncye;
@PropertyDef(label = "鍏朵粬闈炴祦鍔ㄩ噾铻嶈祫浜ф湡鏈綑棰�(鍏�)" )
- @Column(name = "qtfldjrzcqmye", precision = 20, scale = 2)
- private BigDecimal qtfldjrzcqmye;
+ @Column(name = "qtfldjrzcqmye")
+ private Double qtfldjrzcqmye;
@PropertyDef(label = "鍏朵粬闈炴祦鍔ㄩ噾铻嶈祫浜у勾鍒濅綑棰�(鍏�)" )
- @Column(name = "qtfldjrzcncye", precision = 20, scale = 2)
- private BigDecimal qtfldjrzcncye;
+ @Column(name = "qtfldjrzcncye")
+ private Double qtfldjrzcncye;
@PropertyDef(label = "鎶曡祫鎬ф埧鍦颁骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "tzxfdcqmye", precision = 20, scale = 2)
- private BigDecimal tzxfdcqmye;
+ @Column(name = "tzxfdcqmye")
+ private Double tzxfdcqmye;
@PropertyDef(label = "鎶曡祫鎬ф埧鍦颁骇骞村垵浣欓(鍏�)" )
- @Column(name = "tzxfdcncye", precision = 20, scale = 2)
- private BigDecimal tzxfdcncye;
+ @Column(name = "tzxfdcncye")
+ private Double tzxfdcncye;
@PropertyDef(label = "鍥哄畾璧勪骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "gdzcqmye", precision = 20, scale = 2)
- private BigDecimal gdzcqmye;
+ @Column(name = "gdzcqmye")
+ private Double gdzcqmye;
@PropertyDef(label = "鍥哄畾璧勪骇骞村垵浣欓(鍏�)" )
- @Column(name = "gdzcncye", precision = 20, scale = 2)
- private BigDecimal gdzcncye;
+ @Column(name = "gdzcncye")
+ private Double gdzcncye;
@PropertyDef(label = "鍦ㄥ缓宸ョ▼鏈熸湯浣欓(鍏�)" )
- @Column(name = "zjgcqmye", precision = 20, scale = 2)
- private BigDecimal zjgcqmye;
+ @Column(name = "zjgcqmye")
+ private Double zjgcqmye;
@PropertyDef(label = "鍦ㄥ缓宸ョ▼骞村垵浣欓(鍏�)" )
- @Column(name = "zjgcncye", precision = 20, scale = 2)
- private BigDecimal zjgcncye;
+ @Column(name = "zjgcncye")
+ private Double zjgcncye;
@PropertyDef(label = "鐢熶骇鎬х敓鐗╄祫浜ф湡鏈綑棰�(鍏�)" )
- @Column(name = "scxswzcqmye", precision = 20, scale = 2)
- private BigDecimal scxswzcqmye;
+ @Column(name = "scxswzcqmye")
+ private Double scxswzcqmye;
@PropertyDef(label = "鐢熶骇鎬х敓鐗╄祫浜у勾鍒濅綑棰�(鍏�)" )
- @Column(name = "scxswzcncye", precision = 20, scale = 2)
- private BigDecimal scxswzcncye;
+ @Column(name = "scxswzcncye")
+ private Double scxswzcncye;
@PropertyDef(label = "娌规皵璧勪骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "yqzcqmye", precision = 20, scale = 2)
- private BigDecimal yqzcqmye;
+ @Column(name = "yqzcqmye")
+ private Double yqzcqmye;
@PropertyDef(label = "娌规皵璧勪骇骞村垵浣欓(鍏�)" )
- @Column(name = "yqzcncye", precision = 20, scale = 2)
- private BigDecimal yqzcncye;
+ @Column(name = "yqzcncye")
+ private Double yqzcncye;
@PropertyDef(label = "鏃犲舰璧勪骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "wxzcqmye", precision = 20, scale = 2)
- private BigDecimal wxzcqmye;
+ @Column(name = "wxzcqmye")
+ private Double wxzcqmye;
@PropertyDef(label = "鏃犲舰璧勪骇骞村垵浣欓(鍏�)" )
- @Column(name = "wxzcncye", precision = 20, scale = 2)
- private BigDecimal wxzcncye;
+ @Column(name = "wxzcncye")
+ private Double wxzcncye;
@PropertyDef(label = "寮�鍙戞敮鍑烘湡鏈綑棰�(鍏�)" )
- @Column(name = "kfzcqmye", precision = 20, scale = 2)
- private BigDecimal kfzcqmye;
+ @Column(name = "kfzcqmye")
+ private Double kfzcqmye;
@PropertyDef(label = "寮�鍙戞敮鍑哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "kfzcncye", precision = 20, scale = 2)
- private BigDecimal kfzcncye;
+ @Column(name = "kfzcncye")
+ private Double kfzcncye;
@PropertyDef(label = "鍟嗚獕鏈熸湯浣欓(鍏�)" )
- @Column(name = "syqmye", precision = 20, scale = 2)
- private BigDecimal syqmye;
+ @Column(name = "syqmye")
+ private Double syqmye;
@PropertyDef(label = "鍟嗚獕骞村垵浣欓(鍏�)" )
- @Column(name = "syncye", precision = 20, scale = 2)
- private BigDecimal syncye;
+ @Column(name = "syncye")
+ private Double syncye;
@PropertyDef(label = "闀挎湡寰呮憡璐圭敤鏈熸湯浣欓(鍏�)" )
- @Column(name = "cqdtfyqmye", precision = 20, scale = 2)
- private BigDecimal cqdtfyqmye;
+ @Column(name = "cqdtfyqmye")
+ private Double cqdtfyqmye;
@PropertyDef(label = "闀挎湡寰呮憡璐圭敤骞村垵浣欓(鍏�)" )
- @Column(name = "cqdtfyncye", precision = 20, scale = 2)
- private BigDecimal cqdtfyncye;
+ @Column(name = "cqdtfyncye")
+ private Double cqdtfyncye;
@PropertyDef(label = "閫掑欢鎵�寰楃◣璧勪骇鏈熸湯浣欓(鍏�)" )
- @Column(name = "dysdszcqmye", precision = 20, scale = 2)
- private BigDecimal dysdszcqmye;
+ @Column(name = "dysdszcqmye")
+ private Double dysdszcqmye;
@PropertyDef(label = "閫掑欢鎵�寰楃◣璧勪骇骞村垵浣欓(鍏�)" )
- @Column(name = "dysdszcncye", precision = 20, scale = 2)
- private BigDecimal dysdszcncye;
+ @Column(name = "dysdszcncye")
+ private Double dysdszcncye;
@PropertyDef(label = "鍏朵粬闈炴祦鍔ㄨ祫浜ф湡鏈綑棰�(鍏�)" )
- @Column(name = "qtfldzcqmye", precision = 20, scale = 2)
- private BigDecimal qtfldzcqmye;
+ @Column(name = "qtfldzcqmye")
+ private Double qtfldzcqmye;
@PropertyDef(label = "鍏朵粬闈炴祦鍔ㄨ祫浜у勾鍒濅綑棰�(鍏�)" )
- @Column(name = "qtfldzcncye", precision = 20, scale = 2)
- private BigDecimal qtfldzcncye;
+ @Column(name = "qtfldzcncye")
+ private Double qtfldzcncye;
@PropertyDef(label = "闈炴祦鍔ㄨ祫浜у悎璁℃湡鏈綑棰�(鍏�)" )
- @Column(name = "fldzcqmye", precision = 20, scale = 2)
- private BigDecimal fldzcqmye;
+ @Column(name = "fldzcqmye")
+ private Double fldzcqmye;
@PropertyDef(label = "闈炴祦鍔ㄨ祫浜у悎璁″勾鍒濅綑棰�(鍏�)" )
- @Column(name = "fldzcncye", precision = 20, scale = 2)
- private BigDecimal fldzcncye;
+ @Column(name = "fldzcncye")
+ private Double fldzcncye;
@PropertyDef(label = "璧勪骇鎬昏鏈熸湯浣欓(鍏�)" )
- @Column(name = "zczjqmye", precision = 20, scale = 2)
- private BigDecimal zczjqmye;
+ @Column(name = "zczjqmye")
+ private Double zczjqmye;
@PropertyDef(label = "璧勪骇鎬昏骞村垵浣欓(鍏�)" )
- @Column(name = "zczjncye", precision = 20, scale = 2)
- private BigDecimal zczjncye;
+ @Column(name = "zczjncye")
+ private Double zczjncye;
@PropertyDef(label = "鐭湡鍊熸鏈熸湯浣欓(鍏�)" )
- @Column(name = "dqjkmye", precision = 20, scale = 2)
- private BigDecimal dqjkqmye;
+ @Column(name = "dqjkmye")
+ private Double dqjkqmye;
@PropertyDef(label = "鐭湡鍊熸骞村垵浣欓(鍏�)" )
- @Column(name = "dqjkncye", precision = 20, scale = 2)
- private BigDecimal dqjkncye;
+ @Column(name = "dqjkncye")
+ private Double dqjkncye;
@PropertyDef(label = "浜ゆ槗鎬ч噾铻嶈礋鍊烘湡鏈綑棰�(鍏�)" )
- @Column(name = "jyxjrfzqmye", precision = 20, scale = 2)
- private BigDecimal jyxjrfzqmye;
+ @Column(name = "jyxjrfzqmye")
+ private Double jyxjrfzqmye;
@PropertyDef(label = "浜ゆ槗鎬ч噾铻嶈礋鍊哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "jyxjrfzncye", precision = 20, scale = 2)
- private BigDecimal jyxjrfzncye;
+ @Column(name = "jyxjrfzncye")
+ private Double jyxjrfzncye;
@PropertyDef(label = "琛嶇敓閲戣瀺璐熷�烘湡鏈綑棰�(鍏�)" )
- @Column(name = "ysjrfzqmye", precision = 20, scale = 2)
- private BigDecimal ysjrfzqmye;
+ @Column(name = "ysjrfzqmye")
+ private Double ysjrfzqmye;
@PropertyDef(label = "琛嶇敓閲戣瀺璐熷�哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "ysjrfzncye", precision = 20, scale = 2)
- private BigDecimal ysjrfzncye;
+ @Column(name = "ysjrfzncye")
+ private Double ysjrfzncye;
@PropertyDef(label = "搴斾粯绁ㄦ嵁鏈熸湯浣欓(鍏�)" )
- @Column(name = "ldfzyspjqmye", precision = 20, scale = 2)
- private BigDecimal ldfzyspjqmye;
+ @Column(name = "ldfzyspjqmye")
+ private Double ldfzyspjqmye;
@PropertyDef(label = "搴斾粯绁ㄦ嵁骞村垵浣欓(鍏�)" )
- @Column(name = "ldfzyspjncye", precision = 20, scale = 2)
- private BigDecimal ldfzyspjncye;
+ @Column(name = "ldfzyspjncye")
+ private Double ldfzyspjncye;
@PropertyDef(label = "搴斾粯璐︽鏈熸湯浣欓(鍏�)" )
- @Column(name = "ldfzyszkqmye", precision = 20, scale = 2)
- private BigDecimal ldfzyszkqmye;
+ @Column(name = "ldfzyszkqmye")
+ private Double ldfzyszkqmye;
@PropertyDef(label = "搴斾粯璐︽骞村垵浣欓(鍏�)" )
- @Column(name = "ldfzyszkncye", precision = 20, scale = 2)
- private BigDecimal ldfzyszkncye;
+ @Column(name = "ldfzyszkncye")
+ private Double ldfzyszkncye;
@PropertyDef(label = "棰勬敹娆鹃」鏈熸湯浣欓(鍏�)" )
- @Column(name = "ldfzyuskxqmye", precision = 20, scale = 2)
- private BigDecimal ldfzyuskxqmye;
+ @Column(name = "ldfzyuskxqmye")
+ private Double ldfzyuskxqmye;
@PropertyDef(label = "棰勬敹娆鹃」骞村垵浣欓(鍏�)" )
- @Column(name = "ldfzyuskxncye", precision = 20, scale = 2)
- private BigDecimal ldfzyuskxncye;
+ @Column(name = "ldfzyuskxncye")
+ private Double ldfzyuskxncye;
@PropertyDef(label = "鍚堝悓璐熷�烘湡鏈綑棰�(鍏�)" )
- @Column(name = "htfzqmye", precision = 20, scale = 2)
- private BigDecimal htfzqmye;
+ @Column(name = "htfzqmye")
+ private Double htfzqmye;
@PropertyDef(label = "鍚堝悓璐熷�哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "htfzncye", precision = 20, scale = 2)
- private BigDecimal htfzncye;
+ @Column(name = "htfzncye")
+ private Double htfzncye;
@PropertyDef(label = "搴斾粯鑱屽伐钖叕鏈熸湯浣欓(鍏�)" )
- @Column(name = "yfzgxcqmye", precision = 20, scale = 2)
- private BigDecimal yfzgxcqmye;
+ @Column(name = "yfzgxcqmye")
+ private Double yfzgxcqmye;
@PropertyDef(label = "搴斾粯鑱屽伐钖叕骞村垵浣欓(鍏�)" )
- @Column(name = "yfzgxcncye", precision = 20, scale = 2)
- private BigDecimal yfzgxcncye;
+ @Column(name = "yfzgxcncye")
+ private Double yfzgxcncye;
@PropertyDef(label = "搴斾氦绋庤垂鏈熸湯浣欓(鍏�)" )
- @Column(name = "yjsfqmye", precision = 20, scale = 2)
- private BigDecimal yjsfqmye;
+ @Column(name = "yjsfqmye")
+ private Double yjsfqmye;
@PropertyDef(label = "搴斾氦绋庤垂骞村垵浣欓(鍏�)" )
- @Column(name = "yjsfncye", precision = 20, scale = 2)
- private BigDecimal yjsfncye;
+ @Column(name = "yjsfncye")
+ private Double yjsfncye;
@PropertyDef(label = "鍏朵粬搴斾粯娆炬湡鏈綑棰�(鍏�)" )
- @Column(name = "qtyfkqmye", precision = 20, scale = 2)
- private BigDecimal qtyfkqmye;
+ @Column(name = "qtyfkqmye")
+ private Double qtyfkqmye;
@PropertyDef(label = "鍏朵粬搴斾粯娆惧勾鍒濅綑棰�(鍏�)" )
- @Column(name = "qtyfkncye", precision = 20, scale = 2)
- private BigDecimal qtyfkncye;
+ @Column(name = "qtyfkncye")
+ private Double qtyfkncye;
@PropertyDef(label = "鎸佹湁寰呭敭璐熷�烘湡鏈綑棰�(鍏�)" )
- @Column(name = "cydsfzqmye", precision = 20, scale = 2)
- private BigDecimal cydsfzqmye;
+ @Column(name = "cydsfzqmye")
+ private Double cydsfzqmye;
@PropertyDef(label = "鎸佹湁寰呭敭璐熷�哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "cydsfzncye", precision = 20, scale = 2)
- private BigDecimal cydsfzncye;
+ @Column(name = "cydsfzncye")
+ private Double cydsfzncye;
@PropertyDef(label = "涓�骞村唴鍒版湡鐨勯潪娴佸姩璐熷�烘湡鏈綑棰�(鍏�)" )
- @Column(name = "ynddqfldfzqmye", precision = 20, scale = 2)
- private BigDecimal ynddqfldfzqmye;
+ @Column(name = "ynddqfldfzqmye")
+ private Double ynddqfldfzqmye;
@PropertyDef(label = "涓�骞村唴鍒版湡鐨勯潪娴佸姩璐熷�哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "ynddqfldfzncye", precision = 20, scale = 2)
- private BigDecimal ynddqfldfzncye;
+ @Column(name = "ynddqfldfzncye")
+ private Double ynddqfldfzncye;
@PropertyDef(label = "鍏朵粬娴佸姩璐熷�烘湡鏈綑棰�(鍏�)" )
- @Column(name = "qtldfzqmye", precision = 20, scale = 2)
- private BigDecimal qtldfzqmye;
+ @Column(name = "qtldfzqmye")
+ private Double qtldfzqmye;
@PropertyDef(label = "鍏朵粬娴佸姩璐熷�哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "qtldfzncye", precision = 20, scale = 2)
- private BigDecimal qtldfzncye;
+ @Column(name = "qtldfzncye")
+ private Double qtldfzncye;
@PropertyDef(label = "娴佸姩璐熷�哄悎璁℃湡鏈綑棰�(鍏�)" )
- @Column(name = "ldfzhjqmye", precision = 20, scale = 2)
- private BigDecimal ldfzhjqmye;
+ @Column(name = "ldfzhjqmye")
+ private Double ldfzhjqmye;
@PropertyDef(label = "娴佸姩璐熷�哄悎璁″勾鍒濅綑棰�(鍏�)" )
- @Column(name = "ldfzhjncye", precision = 20, scale = 2)
- private BigDecimal ldfzhjncye;
+ @Column(name = "ldfzhjncye")
+ private Double ldfzhjncye;
@PropertyDef(label = "闀挎湡鍊熸鏈熸湯浣欓(鍏�)" )
- @Column(name = "cqjkqmye", precision = 20, scale = 2)
- private BigDecimal cqjkqmye;
+ @Column(name = "cqjkqmye")
+ private Double cqjkqmye;
@PropertyDef(label = "闀挎湡鍊熸骞村垵浣欓(鍏�)" )
- @Column(name = "cqjkncye", precision = 20, scale = 2)
- private BigDecimal cqjkncye;
+ @Column(name = "cqjkncye")
+ private Double cqjkncye;
@PropertyDef(label = "搴斾粯鍊哄埜鏈熸湯浣欓(鍏�)" )
- @Column(name = "yfzqqmye", precision = 20, scale = 2)
- private BigDecimal yfzqqmye;
+ @Column(name = "yfzqqmye")
+ private Double yfzqqmye;
@PropertyDef(label = "搴斾粯鍊哄埜骞村垵浣欓(鍏�)" )
- @Column(name = "yfzqncye", precision = 20, scale = 2)
- private BigDecimal yfzqncye;
+ @Column(name = "yfzqncye")
+ private Double yfzqncye;
@PropertyDef(label = "鍏朵腑锛氫紭鍏堣偂鏈熸湯浣欓(鍏�)" )
- @Column(name = "yfzqyxgqmye", precision = 20, scale = 2)
- private BigDecimal yfzqyxgqmye;
+ @Column(name = "yfzqyxgqmye")
+ private Double yfzqyxgqmye;
@PropertyDef(label = "鍏朵腑锛氫紭鍏堣偂骞村垵浣欓(鍏�)" )
- @Column(name = "yfzqyxgncye", precision = 20, scale = 2)
- private BigDecimal yfzqyxgncye;
+ @Column(name = "yfzqyxgncye")
+ private Double yfzqyxgncye;
@PropertyDef(label = "姘哥画鍊烘湡鏈綑棰�(鍏�)" )
- @Column(name = "yfzqyxzqmye", precision = 20, scale = 2)
- private BigDecimal yfzqyxzqmye;
+ @Column(name = "yfzqyxzqmye")
+ private Double yfzqyxzqmye;
@PropertyDef(label = "姘哥画鍊哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "yfzqyxzncye", precision = 20, scale = 2)
- private BigDecimal yfzqyxzncye;
+ @Column(name = "yfzqyxzncye")
+ private Double yfzqyxzncye;
@PropertyDef(label = "闀挎湡搴斾粯娆炬湡鏈綑棰�(鍏�)" )
- @Column(name = "cqyfkqmye", precision = 20, scale = 2)
- private BigDecimal cqyfkqmye;
+ @Column(name = "cqyfkqmye")
+ private Double cqyfkqmye;
@PropertyDef(label = "闀挎湡搴斾粯娆惧勾鍒濅綑棰�(鍏�)" )
- @Column(name = "cqyfkncye", precision = 20, scale = 2)
- private BigDecimal cqyfkncye;
+ @Column(name = "cqyfkncye")
+ private Double cqyfkncye;
@PropertyDef(label = "棰勮璐熷�烘湡鏈綑棰�(鍏�)" )
- @Column(name = "ysfzqmye", precision = 20, scale = 2)
- private BigDecimal ysfzqmye;
+ @Column(name = "ysfzqmye")
+ private Double ysfzqmye;
@PropertyDef(label = "棰勮璐熷�哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "ysfzncye", precision = 20, scale = 2)
- private BigDecimal ysfzncye;
+ @Column(name = "ysfzncye")
+ private Double ysfzncye;
@PropertyDef(label = "閫掑欢鏀剁泭鏈熸湯浣欓(鍏�)" )
- @Column(name = "dysyqmye", precision = 20, scale = 2)
- private BigDecimal dysyqmye;
+ @Column(name = "dysyqmye")
+ private Double dysyqmye;
@PropertyDef(label = "閫掑欢鏀剁泭骞村垵浣欓(鍏�)" )
- @Column(name = "dysyncye", precision = 20, scale = 2)
- private BigDecimal dysyncye;
+ @Column(name = "dysyncye")
+ private Double dysyncye;
@PropertyDef(label = "閫掑欢鎵�寰楃◣璐熷�烘湡鏈綑棰�(鍏�)" )
- @Column(name = "dysdsfzqmye", precision = 20, scale = 2)
- private BigDecimal dysdsfzqmye;
+ @Column(name = "dysdsfzqmye")
+ private Double dysdsfzqmye;
@PropertyDef(label = "閫掑欢鎵�寰楃◣璐熷�哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "dysdsfzncye", precision = 20, scale = 2)
- private BigDecimal dysdsfzncye;
+ @Column(name = "dysdsfzncye")
+ private Double dysdsfzncye;
@PropertyDef(label = "鍏朵粬闈炴祦鍔ㄨ礋鍊烘湡鏈綑棰�(鍏�)" )
- @Column(name = "qtfldfzqmye", precision = 20, scale = 2)
- private BigDecimal qtfldfzqmye;
+ @Column(name = "qtfldfzqmye")
+ private Double qtfldfzqmye;
@PropertyDef(label = "鍏朵粬闈炴祦鍔ㄨ礋鍊哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "qtfldfzncye", precision = 20, scale = 2)
- private BigDecimal qtfldfzncye;
+ @Column(name = "qtfldfzncye")
+ private Double qtfldfzncye;
@PropertyDef(label = "闈炴祦鍔ㄨ礋鍊哄悎璁℃湡鏈綑棰�(鍏�)" )
- @Column(name = "fldfzhjqmye", precision = 20, scale = 2)
- private BigDecimal fldfzhjqmye;
+ @Column(name = "fldfzhjqmye")
+ private Double fldfzhjqmye;
@PropertyDef(label = "闈炴祦鍔ㄨ礋鍊哄悎璁″勾鍒濅綑棰�(鍏�)" )
- @Column(name = "fldfzhjncye", precision = 20, scale = 2)
- private BigDecimal fldfzhjncye;
+ @Column(name = "fldfzhjncye")
+ private Double fldfzhjncye;
@PropertyDef(label = "璐熷�哄悎璁℃湡鏈綑棰�(鍏�)" )
- @Column(name = "fzhjqmye", precision = 20, scale = 2)
- private BigDecimal fzhjqmye;
+ @Column(name = "fzhjqmye")
+ private Double fzhjqmye;
@PropertyDef(label = "璐熷�哄悎璁″勾鍒濅綑棰�(鍏�)" )
- @Column(name = "fzhjncye", precision = 20, scale = 2)
- private BigDecimal fzhjncye;
+ @Column(name = "fzhjncye")
+ private Double fzhjncye;
@PropertyDef(label = "瀹炴敹璧勬湰(鎴栬偂鏈�)鏈熸湯浣欓(鍏�)" )
- @Column(name = "sszbqmye", precision = 20, scale = 2)
- private BigDecimal sszbqmye;
+ @Column(name = "sszbqmye")
+ private Double sszbqmye;
@PropertyDef(label = "瀹炴敹璧勬湰(鎴栬偂鏈�)骞村垵浣欓(鍏�)" )
- @Column(name = "sszbncye", precision = 20, scale = 2)
- private BigDecimal sszbncye;
+ @Column(name = "sszbncye")
+ private Double sszbncye;
@PropertyDef(label = "鍏朵粬鏉冪泭宸ュ叿鏈熸湯浣欓(鍏�)" )
- @Column(name = "qtqygjqmye", precision = 20, scale = 2)
- private BigDecimal qtqygjqmye;
+ @Column(name = "qtqygjqmye")
+ private Double qtqygjqmye;
@PropertyDef(label = "鍏朵粬鏉冪泭宸ュ叿骞村垵浣欓(鍏�)" )
- @Column(name = "qtqygjncye", precision = 20, scale = 2)
- private BigDecimal qtqygjncye;
+ @Column(name = "qtqygjncye")
+ private Double qtqygjncye;
@PropertyDef(label = "鍏朵腑锛氫紭鍏堣偂鏈熸湯浣欓(鍏�)" )
- @Column(name = "qtqygjyxgqmye", precision = 20, scale = 2)
- private BigDecimal qtqygjyxgqmye;
+ @Column(name = "qtqygjyxgqmye")
+ private Double qtqygjyxgqmye;
@PropertyDef(label = "鍏朵腑锛氫紭鍏堣偂骞村垵浣欓(鍏�)" )
- @Column(name = "qtqygjyxgncye", precision = 20, scale = 2)
- private BigDecimal qtqygjyxgncye;
+ @Column(name = "qtqygjyxgncye")
+ private Double qtqygjyxgncye;
@PropertyDef(label = "姘哥画鍊烘湡鏈綑棰�(鍏�)" )
- @Column(name = "qtqygjyxzqmye", precision = 20, scale = 2)
- private BigDecimal qtqygjyxzqmye;
+ @Column(name = "qtqygjyxzqmye")
+ private Double qtqygjyxzqmye;
@PropertyDef(label = "姘哥画鍊哄勾鍒濅綑棰�(鍏�)" )
- @Column(name = "qtqygjyxzncye", precision = 20, scale = 2)
- private BigDecimal qtqygjyxzncye;
+ @Column(name = "qtqygjyxzncye")
+ private Double qtqygjyxzncye;
@PropertyDef(label = "璧勬湰鍏Н鏈熸湯浣欓(鍏�)" )
- @Column(name = "zbgjqmye", precision = 20, scale = 2)
- private BigDecimal zbgjqmye;
+ @Column(name = "zbgjqmye")
+ private Double zbgjqmye;
@PropertyDef(label = "璧勬湰鍏Н骞村垵浣欓(鍏�)" )
- @Column(name = "zbgjncye", precision = 20, scale = 2)
- private BigDecimal zbgjncye;
+ @Column(name = "zbgjncye")
+ private Double zbgjncye;
@PropertyDef(label = "鍑忥細搴撳瓨鑲℃湡鏈綑棰�(鍏�)" )
- @Column(name = "jkcgqmye", precision = 20, scale = 2)
- private BigDecimal jkcgqmye;
+ @Column(name = "jkcgqmye")
+ private Double jkcgqmye;
@PropertyDef(label = "鍑忥細搴撳瓨鑲″勾鍒濅綑棰�(鍏�)" )
- @Column(name = "jkcgncye", precision = 20, scale = 2)
- private BigDecimal jkcgncye;
+ @Column(name = "jkcgncye")
+ private Double jkcgncye;
@PropertyDef(label = "鍏朵粬缁煎悎鏀剁泭鏈熸湯浣欓(鍏�)" )
- @Column(name = "qtzhsyqmye", precision = 20, scale = 2)
- private BigDecimal qtzhsyqmye;
+ @Column(name = "qtzhsyqmye")
+ private Double qtzhsyqmye;
@PropertyDef(label = "鍏朵粬缁煎悎鏀剁泭骞村垵浣欓(鍏�)" )
- @Column(name = "qtzhsyncye", precision = 20, scale = 2)
- private BigDecimal qtzhsyncye;
+ @Column(name = "qtzhsyncye")
+ private Double qtzhsyncye;
@PropertyDef(label = "涓撻」鍌ㄥ鏈熸湯浣欓(鍏�)" )
- @Column(name = "zxcbqmye", precision = 20, scale = 2)
- private BigDecimal zxcbqmye;
+ @Column(name = "zxcbqmye")
+ private Double zxcbqmye;
@PropertyDef(label = "涓撻」鍌ㄥ骞村垵浣欓(鍏�)" )
- @Column(name = "zxcbncye", precision = 20, scale = 2)
- private BigDecimal zxcbncye;
+ @Column(name = "zxcbncye")
+ private Double zxcbncye;
@PropertyDef(label = "鐩堜綑鍏Н鏈熸湯浣欓(鍏�)" )
- @Column(name = "yygjqmye", precision = 20, scale = 2)
- private BigDecimal yygjqmye;
+ @Column(name = "yygjqmye")
+ private Double yygjqmye;
@PropertyDef(label = "鐩堜綑鍏Н骞村垵浣欓(鍏�)" )
- @Column(name = "yygjncye", precision = 20, scale = 2)
- private BigDecimal yygjncye;
+ @Column(name = "yygjncye")
+ private Double yygjncye;
@PropertyDef(label = "鏈垎閰嶅埄娑︽湡鏈綑棰�(鍏�)" )
- @Column(name = "wfplrqmye", precision = 20, scale = 2)
- private BigDecimal wfplrqmye;
+ @Column(name = "wfplrqmye")
+ private Double wfplrqmye;
@PropertyDef(label = "鏈垎閰嶅埄娑﹀勾鍒濅綑棰�(鍏�)" )
- @Column(name = "wfplrncye", precision = 20, scale = 2)
- private BigDecimal wfplrncye;
+ @Column(name = "wfplrncye")
+ private Double wfplrncye;
@PropertyDef(label = "鎵�鏈夎�呮潈鐩�(鎴栬偂涓滄潈鐩�)鍚堣鏈熸湯浣欓(鍏�)" )
- @Column(name = "syzqyqmye", precision = 20, scale = 2)
- private BigDecimal syzqyqmye;
+ @Column(name = "syzqyqmye")
+ private Double syzqyqmye;
@PropertyDef(label = "鎵�鏈夎�呮潈鐩�(鎴栬偂涓滄潈鐩�)鍚堣骞村垵浣欓(鍏�)" )
- @Column(name = "syzqyncye", precision = 20, scale = 2)
- private BigDecimal syzqyncye;
+ @Column(name = "syzqyncye")
+ private Double syzqyncye;
@PropertyDef(label = "璐熷�哄拰鎵�鏈夎�呮潈鐩�(鎴栬偂涓滅泭)鎬昏鏈熸湯浣欓(鍏�)" )
- @Column(name = "fzhsyzqyqmye", precision = 20, scale = 2)
- private BigDecimal fzhsyzqyqmye;
+ @Column(name = "fzhsyzqyqmye")
+ private Double fzhsyzqyqmye;
@PropertyDef(label = "璐熷�哄拰鎵�鏈夎�呮潈鐩�(鎴栬偂涓滅泭)鎬昏骞村垵浣欓(鍏�)" )
- @Column(name = "fzhsyzqyncye", precision = 20, scale = 2)
- private BigDecimal fzhsyzqyncye;
+ @Column(name = "fzhsyzqyncye")
+ private Double fzhsyzqyncye;
@PropertyDef(label = "鎿嶄綔鏍囧織" )
@Column(name = "czbz", length = 1)
diff --git a/src/main/java/com/fzzy/api/entity/Api1502.java b/src/main/java/com/fzzy/api/entity/Api1502.java
index 1b7af48..cefeb30 100644
--- a/src/main/java/com/fzzy/api/entity/Api1502.java
+++ b/src/main/java/com/fzzy/api/entity/Api1502.java
@@ -12,7 +12,6 @@
import javax.persistence.Table;
import java.io.Serializable;
-import java.math.BigDecimal;
import java.util.Date;
/**
@@ -49,308 +48,308 @@
private Date bbsj;
@PropertyDef(label = "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺鏈湀鏁�(鍏�)" )
- @Column(name = "jyhdxjllbys", precision = 20, scale = 2)
- private BigDecimal jyhdxjllbys;
+ @Column(name = "jyhdxjllbys")
+ private Double jyhdxjllbys;
@PropertyDef(label = "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺鏈勾绱鏁�(鍏�)" )
- @Column(name = "jyhdxjllbnljs", precision = 20, scale = 2)
- private BigDecimal jyhdxjllbnljs;
+ @Column(name = "jyhdxjllbnljs")
+ private Double jyhdxjllbnljs;
@PropertyDef(label = "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾鏈湀鏁�(鍏�)" )
- @Column(name = "xssplwxjbys", precision = 20, scale = 2)
- private BigDecimal xssplwxjbys;
+ @Column(name = "xssplwxjbys")
+ private Double xssplwxjbys;
@PropertyDef(label = "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾鏈勾绱鏁�(鍏�)" )
- @Column(name = "xssplwxjbnljs", precision = 20, scale = 2)
- private BigDecimal xssplwxjbnljs;
+ @Column(name = "xssplwxjbnljs")
+ private Double xssplwxjbnljs;
@PropertyDef(label = "鏀跺埌鐨勭◣璐硅繑杩樻湰鏈堟暟(鍏�)" )
- @Column(name = "sffhbys", precision = 20, scale = 2)
- private BigDecimal sffhbys;
+ @Column(name = "sffhbys")
+ private Double sffhbys;
@PropertyDef(label = "鏀跺埌鐨勭◣璐硅繑杩樻湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "sffhbnljs", precision = 20, scale = 2)
- private BigDecimal sffhbnljs;
+ @Column(name = "sffhbnljs")
+ private Double sffhbnljs;
@PropertyDef(label = "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾鏈湀鏁�(鍏�)" )
- @Column(name = "qtjyhdxjbys", precision = 20, scale = 2)
- private BigDecimal qtjyhdxjbys;
+ @Column(name = "qtjyhdxjbys")
+ private Double qtjyhdxjbys;
@PropertyDef(label = "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾鏈勾绱鏁�(鍏�)" )
- @Column(name = "qtjyhdxjbnljs", precision = 20, scale = 2)
- private BigDecimal qtjyhdxjbnljs;
+ @Column(name = "qtjyhdxjbnljs")
+ private Double qtjyhdxjbnljs;
@PropertyDef(label = "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚鏈湀鏁�(鍏�)" )
- @Column(name = "jyhdxjlrbys", precision = 20, scale = 2)
- private BigDecimal jyhdxjlrbys;
+ @Column(name = "jyhdxjlrbys")
+ private Double jyhdxjlrbys;
@PropertyDef(label = "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚鏈勾绱鏁�(鍏�)" )
- @Column(name = "jyhdxjlrbnljs", precision = 20, scale = 2)
- private BigDecimal jyhdxjlrbnljs;
+ @Column(name = "jyhdxjlrbnljs")
+ private Double jyhdxjlrbnljs;
@PropertyDef(label = "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾鏈湀鏁�(鍏�)" )
- @Column(name = "gmsplwzfbys", precision = 20, scale = 2)
- private BigDecimal gmsplwzfbys;
+ @Column(name = "gmsplwzfbys")
+ private Double gmsplwzfbys;
@PropertyDef(label = "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾鏈勾绱鏁�(鍏�)" )
- @Column(name = "gmsplwzfbnljs", precision = 20, scale = 2)
- private BigDecimal gmsplwzfbnljs;
+ @Column(name = "gmsplwzfbnljs")
+ private Double gmsplwzfbnljs;
@PropertyDef(label = "鏀粯缁欒亴宸ュ強涓鸿亴宸ユ敮浠樼殑鐜伴噾鏈湀鏁�(鍏�)" )
- @Column(name = "zfzgxjbys", precision = 20, scale = 2)
- private BigDecimal zfzgxjbys;
+ @Column(name = "zfzgxjbys")
+ private Double zfzgxjbys;
@PropertyDef(label = "鏀粯缁欒亴宸ュ強涓鸿亴宸ユ敮浠樼殑鐜伴噾鏈勾绱鏁�(鍏�)" )
- @Column(name = "zfzgxjbnljs", precision = 20, scale = 2)
- private BigDecimal zfzgxjbnljs;
+ @Column(name = "zfzgxjbnljs")
+ private Double zfzgxjbnljs;
@PropertyDef(label = "鏀粯鐨勫悇椤圭◣璐规湰鏈堟暟(鍏�)" )
- @Column(name = "zfxxsfbys", precision = 20, scale = 2)
- private BigDecimal zfxxsfbys;
+ @Column(name = "zfxxsfbys")
+ private Double zfxxsfbys;
@PropertyDef(label = "鏀粯鐨勫悇椤圭◣璐规湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "zfxxsfbnljs", precision = 20, scale = 2)
- private BigDecimal zfxxsfbnljs;
+ @Column(name = "zfxxsfbnljs")
+ private Double zfxxsfbnljs;
@PropertyDef(label = "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾鏈湀鏁�(鍏�)" )
- @Column(name = "zfqtjyhdxjbys", precision = 20, scale = 2)
- private BigDecimal zfqtjyhdxjbys;
+ @Column(name = "zfqtjyhdxjbys")
+ private Double zfqtjyhdxjbys;
@PropertyDef(label = "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾鏈勾绱鏁�(鍏�)" )
- @Column(name = "zfqtjyhdxjbnljs", precision = 20, scale = 2)
- private BigDecimal zfqtjyhdxjbnljs;
+ @Column(name = "zfqtjyhdxjbnljs")
+ private Double zfqtjyhdxjbnljs;
@PropertyDef(label = "缁忚惀娲诲姩鐜伴噾娴佸嚭灏忚鏈湀鏁�(鍏�)" )
- @Column(name = "jyhdxjlcbys", precision = 20, scale = 2)
- private BigDecimal jyhdxjlcbys;
+ @Column(name = "jyhdxjlcbys")
+ private Double jyhdxjlcbys;
@PropertyDef(label = "缁忚惀娲诲姩鐜伴噾娴佸嚭灏忚鏈勾绱鏁�(鍏�)" )
- @Column(name = "jyhdxjlcbnljs", precision = 20, scale = 2)
- private BigDecimal jyhdxjlcbnljs;
+ @Column(name = "jyhdxjlcbnljs")
+ private Double jyhdxjlcbnljs;
@PropertyDef(label = "缁忚惀娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰濇湰鏈堟暟(鍏�)" )
- @Column(name = "jyhdxjlljebys", precision = 20, scale = 2)
- private BigDecimal jyhdxjlljebys;
+ @Column(name = "jyhdxjlljebys")
+ private Double jyhdxjlljebys;
@PropertyDef(label = "缁忚惀娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰濇湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "jyhdxjlljebnljs", precision = 20, scale = 2)
- private BigDecimal jyhdxjlljebnljs;
+ @Column(name = "jyhdxjlljebnljs")
+ private Double jyhdxjlljebnljs;
@PropertyDef(label = "浜屻�佹姇璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛氭湰鏈堟暟(鍏�)" )
- @Column(name = "tzhdxjllbys", precision = 20, scale = 2)
- private BigDecimal tzhdxjllbys;
+ @Column(name = "tzhdxjllbys")
+ private Double tzhdxjllbys;
@PropertyDef(label = "浜屻�佹姇璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛氭湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "tzhdxjllbnljs", precision = 20, scale = 2)
- private BigDecimal tzhdxjllbnljs;
+ @Column(name = "tzhdxjllbnljs")
+ private Double tzhdxjllbnljs;
@PropertyDef(label = "鏀跺洖鎶曡祫鏀跺埌鐨勭幇閲戞湰鏈堟暟(鍏�)" )
- @Column(name = "shtzxjbys", precision = 20, scale = 2)
- private BigDecimal shtzxjbys;
+ @Column(name = "shtzxjbys")
+ private Double shtzxjbys;
@PropertyDef(label = "鏀跺洖鎶曡祫鏀跺埌鐨勭幇閲戞湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "shtzxjbnljs", precision = 20, scale = 2)
- private BigDecimal shtzxjbnljs;
+ @Column(name = "shtzxjbnljs")
+ private Double shtzxjbnljs;
@PropertyDef(label = "鍙栧緱鎶曡祫鏀剁泭鏀跺埌鐨勭幇閲戞湰鏈堟暟(鍏�)" )
- @Column(name = "qdtzsyxjbys", precision = 20, scale = 2)
- private BigDecimal qdtzsyxjbys;
+ @Column(name = "qdtzsyxjbys")
+ private Double qdtzsyxjbys;
@PropertyDef(label = "鍙栧緱鎶曡祫鏀剁泭鏀跺埌鐨勭幇閲戞湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "qdtzsyxjbnljs", precision = 20, scale = 2)
- private BigDecimal qdtzsyxjbnljs;
+ @Column(name = "qdtzsyxjbnljs")
+ private Double qdtzsyxjbnljs;
@PropertyDef(label = "澶勭疆鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀跺洖鐨勭幇閲戝噣棰濇湰鏈堟暟(鍏�)" )
- @Column(name = "czgdzcdxjjebys", precision = 20, scale = 2)
- private BigDecimal czgdzcdxjjebys;
+ @Column(name = "czgdzcdxjjebys")
+ private Double czgdzcdxjjebys;
@PropertyDef(label = "澶勭疆鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀跺洖鐨勭幇閲戝噣棰濇湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "czgdzcdxjjebnljs", precision = 20, scale = 2)
- private BigDecimal czgdzcdxjjebnljs;
+ @Column(name = "czgdzcdxjjebnljs")
+ private Double czgdzcdxjjebnljs;
@PropertyDef(label = "澶勭疆瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀跺埌鐨勭幇閲戝噣棰濇湰鏈堟暟(鍏�)" )
- @Column(name = "czqtdwxjjebys", precision = 20, scale = 2)
- private BigDecimal czqtdwxjjebys;
+ @Column(name = "czqtdwxjjebys")
+ private Double czqtdwxjjebys;
@PropertyDef(label = "澶勭疆瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀跺埌鐨勭幇閲戝噣棰濇湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "czqtdwxjjebnljs", precision = 20, scale = 2)
- private BigDecimal czqtdwxjjebnljs;
+ @Column(name = "czqtdwxjjebnljs")
+ private Double czqtdwxjjebnljs;
@PropertyDef(label = "鏀跺埌鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾鏈湀鏁�(鍏�)" )
- @Column(name = "sdqttzxjbys", precision = 20, scale = 2)
- private BigDecimal sdqttzxjbys;
+ @Column(name = "sdqttzxjbys")
+ private Double sdqttzxjbys;
@PropertyDef(label = "鏀跺埌鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾鏈勾绱鏁�(鍏�)" )
- @Column(name = "sdqttzxjbnljs", precision = 20, scale = 2)
- private BigDecimal sdqttzxjbnljs;
+ @Column(name = "sdqttzxjbnljs")
+ private Double sdqttzxjbnljs;
@PropertyDef(label = "鎶曡祫娲诲姩鐜伴噾娴佸叆灏忚鏈湀鏁�(鍏�)" )
- @Column(name = "tzhdxjlrbys", precision = 20, scale = 2)
- private BigDecimal tzhdxjlrbys;
+ @Column(name = "tzhdxjlrbys")
+ private Double tzhdxjlrbys;
@PropertyDef(label = "鎶曡祫娲诲姩鐜伴噾娴佸叆灏忚鏈勾绱鏁�(鍏�)" )
- @Column(name = "tzhdxjlrbnljs", precision = 20, scale = 2)
- private BigDecimal tzhdxjlrbnljs;
+ @Column(name = "tzhdxjlrbnljs")
+ private Double tzhdxjlrbnljs;
@PropertyDef(label = "璐缓鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀粯鐨勭幇閲戞湰鏈堟暟(鍏�)" )
- @Column(name = "gjgdzcdxjbys", precision = 20, scale = 2)
- private BigDecimal gjgdzcdxjbys;
+ @Column(name = "gjgdzcdxjbys")
+ private Double gjgdzcdxjbys;
@PropertyDef(label = "璐缓鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀粯鐨勭幇閲戞湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "gjgdzcdxjbnljs", precision = 20, scale = 2)
- private BigDecimal gjgdzcdxjbnljs;
+ @Column(name = "gjgdzcdxjbnljs")
+ private Double gjgdzcdxjbnljs;
@PropertyDef(label = "鎶曡祫鏀粯鐨勭幇閲戞湰鏈堟暟(鍏�)" )
- @Column(name = "tzzfxjbys", precision = 20, scale = 2)
- private BigDecimal tzzfxjbys;
+ @Column(name = "tzzfxjbys")
+ private Double tzzfxjbys;
@PropertyDef(label = "鎶曡祫鏀粯鐨勭幇閲戞湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "tzzfxjbnljs", precision = 20, scale = 2)
- private BigDecimal tzzfxjbnljs;
+ @Column(name = "tzzfxjbnljs")
+ private Double tzzfxjbnljs;
@PropertyDef(label = "鍙栧緱瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀粯鐨勭幇閲戝噣棰濇湰鏈堟暟(鍏�)" )
- @Column(name = "qdzgsdzfxjjebys", precision = 20, scale = 2)
- private BigDecimal qdzgsdzfxjjebys;
+ @Column(name = "qdzgsdzfxjjebys")
+ private Double qdzgsdzfxjjebys;
@PropertyDef(label = "鍙栧緱瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀粯鐨勭幇閲戝噣棰濇湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "qdzgsdzfxjjebnljs", precision = 20, scale = 2)
- private BigDecimal qdzgsdzfxjjebnljs;
+ @Column(name = "qdzgsdzfxjjebnljs")
+ private Double qdzgsdzfxjjebnljs;
@PropertyDef(label = "鏀粯鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾鏈湀鏁�(鍏�)" )
- @Column(name = "zfqttzxjbys", precision = 20, scale = 2)
- private BigDecimal zfqttzxjbys;
+ @Column(name = "zfqttzxjbys")
+ private Double zfqttzxjbys;
@PropertyDef(label = "鏀粯鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾鏈勾绱鏁�(鍏�)" )
- @Column(name = "zfqttzxjbnljs", precision = 20, scale = 2)
- private BigDecimal zfqttzxjbnljs;
+ @Column(name = "zfqttzxjbnljs")
+ private Double zfqttzxjbnljs;
@PropertyDef(label = "鎶曡祫娲诲姩鐜伴噾娴佸嚭灏忚鏈湀鏁�(鍏�)" )
- @Column(name = "tzhdxjlcbys", precision = 20, scale = 2)
- private BigDecimal tzhdxjlcbys;
+ @Column(name = "tzhdxjlcbys")
+ private Double tzhdxjlcbys;
@PropertyDef(label = "鎶曡祫娲诲姩鐜伴噾娴佸嚭灏忚鏈勾绱鏁�(鍏�)" )
- @Column(name = "tzhdxjlcbnljs", precision = 20, scale = 2)
- private BigDecimal tzhdxjlcbnljs;
+ @Column(name = "tzhdxjlcbnljs")
+ private Double tzhdxjlcbnljs;
@PropertyDef(label = "鎶曡祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰濇湰鏈堟暟(鍏�)" )
- @Column(name = "tzhdcsxjlljebys", precision = 20, scale = 2)
- private BigDecimal tzhdcsxjlljebys;
+ @Column(name = "tzhdcsxjlljebys")
+ private Double tzhdcsxjlljebys;
@PropertyDef(label = "鎶曡祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰濇湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "tzhdcsxjlljebnljs", precision = 20, scale = 2)
- private BigDecimal tzhdcsxjlljebnljs;
+ @Column(name = "tzhdcsxjlljebnljs")
+ private Double tzhdcsxjlljebnljs;
@PropertyDef(label = "涓夈�佺璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛氭湰鏈堟暟(鍏�)" )
- @Column(name = "cchdxjllbys", precision = 20, scale = 2)
- private BigDecimal cchdxjllbys;
+ @Column(name = "cchdxjllbys")
+ private Double cchdxjllbys;
@PropertyDef(label = "涓夈�佺璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛氭湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "cchdxjllbnljs", precision = 20, scale = 2)
- private BigDecimal cchdxjllbnljs;
+ @Column(name = "cchdxjllbnljs")
+ private Double cchdxjllbnljs;
@PropertyDef(label = "鍚告敹鎶曡祫鏀跺埌鐨勭幇閲戞湰鏈堟暟(鍏�)" )
- @Column(name = "xstzxjbys", precision = 20, scale = 2)
- private BigDecimal xstzxjbys;
+ @Column(name = "xstzxjbys")
+ private Double xstzxjbys;
@PropertyDef(label = "鍚告敹鎶曡祫鏀跺埌鐨勭幇閲戞湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "xstzxjbnljs", precision = 20, scale = 2)
- private BigDecimal xstzxjbnljs;
+ @Column(name = "xstzxjbnljs")
+ private Double xstzxjbnljs;
@PropertyDef(label = "鍙栧緱鍊熸鏀跺埌鐨勭幇閲戞湰鏈堟暟(鍏�)" )
- @Column(name = "qdjkxjbys", precision = 20, scale = 2)
- private BigDecimal qdjkxjbys;
+ @Column(name = "qdjkxjbys")
+ private Double qdjkxjbys;
@PropertyDef(label = "鍙栧緱鍊熸鏀跺埌鐨勭幇閲戞湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "qdjkxjbnljs", precision = 20, scale = 2)
- private BigDecimal qdjkxjbnljs;
+ @Column(name = "qdjkxjbnljs")
+ private Double qdjkxjbnljs;
@PropertyDef(label = "鏀跺埌鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾鏈湀鏁�(鍏�)" )
- @Column(name = "sdqtczxjbys", precision = 20, scale = 2)
- private BigDecimal sdqtczxjbys;
+ @Column(name = "sdqtczxjbys")
+ private Double sdqtczxjbys;
@PropertyDef(label = "鏀跺埌鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾鏈勾绱鏁�(鍏�)" )
- @Column(name = "sdqtczxjbnljs", precision = 20, scale = 2)
- private BigDecimal sdqtczxjbnljs;
+ @Column(name = "sdqtczxjbnljs")
+ private Double sdqtczxjbnljs;
@PropertyDef(label = "绛硅祫娲诲姩鐜伴噾娴佸叆灏忚鏈湀鏁�(鍏�)" )
- @Column(name = "czhdxjlrbys", precision = 20, scale = 2)
- private BigDecimal czhdxjlrbys;
+ @Column(name = "czhdxjlrbys")
+ private Double czhdxjlrbys;
@PropertyDef(label = "绛硅祫娲诲姩鐜伴噾娴佸叆灏忚鏈勾绱鏁�(鍏�)" )
- @Column(name = "czhdxjlrbnljs", precision = 20, scale = 2)
- private BigDecimal czhdxjlrbnljs;
+ @Column(name = "czhdxjlrbnljs")
+ private Double czhdxjlrbnljs;
@PropertyDef(label = "鍋胯繕鍊哄姟鏀粯鐨勭幇閲戞湰鏈堟暟(鍏�)" )
- @Column(name = "chzwzfxjbys", precision = 20, scale = 2)
- private BigDecimal chzwzfxjbys;
+ @Column(name = "chzwzfxjbys")
+ private Double chzwzfxjbys;
@PropertyDef(label = "鍋胯繕鍊哄姟鏀粯鐨勭幇閲戞湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "chzwzfxjbnljs", precision = 20, scale = 2)
- private BigDecimal chzwzfxjbnljs;
+ @Column(name = "chzwzfxjbnljs")
+ private Double chzwzfxjbnljs;
@PropertyDef(label = "鍒嗛厤鑲″埄銆佸埄娑︽垨鍋夸粯鍒╂伅鏀粯鐨勭幇閲戞湰鏈堟暟(鍏�)" )
- @Column(name = "fpgldxjbys", precision = 20, scale = 2)
- private BigDecimal fpgldxjbys;
+ @Column(name = "fpgldxjbys")
+ private Double fpgldxjbys;
@PropertyDef(label = "鍒嗛厤鑲″埄銆佸埄娑︽垨鍋夸粯鍒╂伅鏀粯鐨勭幇閲戞湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "fpgldxjbnljs", precision = 20, scale = 2)
- private BigDecimal fpgldxjbnljs;
+ @Column(name = "fpgldxjbnljs")
+ private Double fpgldxjbnljs;
@PropertyDef(label = "鏀粯鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾鏈湀鏁�(鍏�)" )
- @Column(name = "zfqtdxjbys", precision = 20, scale = 2)
- private BigDecimal zfqtdxjbys;
+ @Column(name = "zfqtdxjbys")
+ private Double zfqtdxjbys;
@PropertyDef(label = "鏀粯鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾鏈勾绱鏁�(鍏�)" )
- @Column(name = "zfqtdxjbnljs", precision = 20, scale = 2)
- private BigDecimal zfqtdxjbnljs;
+ @Column(name = "zfqtdxjbnljs")
+ private Double zfqtdxjbnljs;
@PropertyDef(label = "绛硅祫娲诲姩鐜伴噾娴佸嚭灏忚鏈湀鏁�(鍏�)" )
- @Column(name = "czhdxjlcbys", precision = 20, scale = 2)
- private BigDecimal czhdxjlcbys;
+ @Column(name = "czhdxjlcbys")
+ private Double czhdxjlcbys;
@PropertyDef(label = "绛硅祫娲诲姩鐜伴噾娴佸嚭灏忚鏈勾绱鏁�(鍏�)" )
- @Column(name = "czhdxjlcbnljs", precision = 20, scale = 2)
- private BigDecimal czhdxjlcbnljs;
+ @Column(name = "czhdxjlcbnljs")
+ private Double czhdxjlcbnljs;
@PropertyDef(label = "绛硅祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰濇湰鏈堟暟(鍏�)" )
- @Column(name = "cchdxjlljebys", precision = 20, scale = 2)
- private BigDecimal cchdxjlljebys;
+ @Column(name = "cchdxjlljebys")
+ private Double cchdxjlljebys;
@PropertyDef(label = "绛硅祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰濇湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "cchdxjlljebnljs", precision = 20, scale = 2)
- private BigDecimal cchdxjlljebnljs;
+ @Column(name = "cchdxjlljebnljs")
+ private Double cchdxjlljebnljs;
@PropertyDef(label = "鍥涖�佹眹鐜囧彉鍔ㄥ鐜伴噾鍙婄幇閲戠瓑浠风墿鐨勫奖鍝嶆湰鏈堟暟(鍏�)" )
- @Column(name = "hlbdxjyxbys", precision = 20, scale = 2)
- private BigDecimal hlbdxjyxbys;
+ @Column(name = "hlbdxjyxbys")
+ private Double hlbdxjyxbys;
@PropertyDef(label = "鍥涖�佹眹鐜囧彉鍔ㄥ鐜伴噾鍙婄幇閲戠瓑浠风墿鐨勫奖鍝嶆湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "hlbdxjyxbnljs", precision = 20, scale = 2)
- private BigDecimal hlbdxjyxbnljs;
+ @Column(name = "hlbdxjyxbnljs")
+ private Double hlbdxjyxbnljs;
@PropertyDef(label = "浜斻�佺幇閲戝強鐜伴噾绛変环鐗╁噣澧炲姞棰濇湰鏈堟暟(鍏�)" )
- @Column(name = "xjdjwjzebys", precision = 20, scale = 2)
- private BigDecimal xjdjwjzebys;
+ @Column(name = "xjdjwjzebys")
+ private Double xjdjwjzebys;
@PropertyDef(label = "浜斻�佺幇閲戝強鐜伴噾绛変环鐗╁噣澧炲姞棰濇湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "xjdjwjzebnljs", precision = 20, scale = 2)
- private BigDecimal xjdjwjzebnljs;
+ @Column(name = "xjdjwjzebnljs")
+ private Double xjdjwjzebnljs;
@PropertyDef(label = "鍔狅細鏈熷垵鐜伴噾鍙婄幇閲戠瓑浠风墿浣欓鏈湀鏁�(鍏�)" )
- @Column(name = "qcxjdjwyebys", precision = 20, scale = 2)
- private BigDecimal qcxjdjwyebys;
+ @Column(name = "qcxjdjwyebys")
+ private Double qcxjdjwyebys;
@PropertyDef(label = "鍔狅細鏈熷垵鐜伴噾鍙婄幇閲戠瓑浠风墿浣欓鏈勾绱鏁�(鍏�)" )
- @Column(name = "qcxjdjwyebnljs", precision = 20, scale = 2)
- private BigDecimal qcxjdjwyebnljs;
+ @Column(name = "qcxjdjwyebnljs")
+ private Double qcxjdjwyebnljs;
@PropertyDef(label = "鍏�佹湡鏈幇閲戝強鐜伴噾绛変环鐗╀綑棰濇湰鏈堟暟(鍏�)" )
- @Column(name = "qmxjdjwyebys", precision = 20, scale = 2)
- private BigDecimal qmxjdjwyebys;
+ @Column(name = "qmxjdjwyebys")
+ private Double qmxjdjwyebys;
@PropertyDef(label = "鍏�佹湡鏈幇閲戝強鐜伴噾绛変环鐗╀綑棰濇湰骞寸疮璁℃暟(鍏�)" )
- @Column(name = "qmxjdjwyebnljs", precision = 20, scale = 2)
- private BigDecimal qmxjdjwyebnljs;
+ @Column(name = "qmxjdjwyebnljs")
+ private Double qmxjdjwyebnljs;
@PropertyDef(label = "鎿嶄綔鏍囧織" )
@Column(name = "czbz", length = 1)
diff --git a/src/main/java/com/fzzy/api/entity/Api1503.java b/src/main/java/com/fzzy/api/entity/Api1503.java
index 250d8d8..eb250da 100644
--- a/src/main/java/com/fzzy/api/entity/Api1503.java
+++ b/src/main/java/com/fzzy/api/entity/Api1503.java
@@ -12,7 +12,6 @@
import javax.persistence.Table;
import java.io.Serializable;
-import java.math.BigDecimal;
import java.util.Date;
/**
@@ -49,348 +48,348 @@
private Date bbsj;
@PropertyDef(label = "涓�銆佽惀涓氭敹鍏ユ湰鏈熶綑棰�(鍏�)" )
- @Column(name = "yyzsrbqye", precision = 20, scale = 2)
- private BigDecimal yyzsrbqye;
+ @Column(name = "yyzsrbqye")
+ private Double yyzsrbqye;
@PropertyDef(label = "涓�銆佽惀涓氭敹鍏ユ湰骞寸疮璁�(鍏�)" )
- @Column(name = "yyzsrbnlj", precision = 20, scale = 2)
- private BigDecimal yyzsrbnlj;
+ @Column(name = "yyzsrbnlj")
+ private Double yyzsrbnlj;
@PropertyDef(label = "鍑忥細钀ヤ笟鎴愭湰鏈湡浣欓(鍏�)" )
- @Column(name = "yycbbqye", precision = 20, scale = 2)
- private BigDecimal yycbbqye;
+ @Column(name = "yycbbqye")
+ private Double yycbbqye;
@PropertyDef(label = "鍑忥細钀ヤ笟鎴愭湰鏈勾绱(鍏�)" )
- @Column(name = "yycbbnlj", precision = 20, scale = 2)
- private BigDecimal yycbbnlj;
+ @Column(name = "yycbbnlj")
+ private Double yycbbnlj;
@PropertyDef(label = "绋庨噾鍙婇檮鍔犳湰鏈熶綑棰�(鍏�)" )
- @Column(name = "sjjfjbqye", precision = 20, scale = 2)
- private BigDecimal sjjfjbqye;
+ @Column(name = "sjjfjbqye")
+ private Double sjjfjbqye;
@PropertyDef(label = "绋庨噾鍙婇檮鍔犳湰骞寸疮璁�(鍏�)" )
- @Column(name = "sjjfjbnlj", precision = 20, scale = 2)
- private BigDecimal sjjfjbnlj;
+ @Column(name = "sjjfjbnlj")
+ private Double sjjfjbnlj;
@PropertyDef(label = "閿�鍞垂鐢ㄦ湰鏈熶綑棰�(鍏�)" )
- @Column(name = "xsfybqye", precision = 20, scale = 2)
- private BigDecimal xsfybqye;
+ @Column(name = "xsfybqye")
+ private Double xsfybqye;
@PropertyDef(label = "閿�鍞垂鐢ㄦ湰骞寸疮璁�(鍏�)" )
- @Column(name = "xsfybnlj", precision = 20, scale = 2)
- private BigDecimal xsfybnlj;
+ @Column(name = "xsfybnlj")
+ private Double xsfybnlj;
@PropertyDef(label = "绠＄悊璐圭敤鏈湡浣欓(鍏�)" )
- @Column(name = "glfybqye", precision = 20, scale = 2)
- private BigDecimal glfybqye;
+ @Column(name = "glfybqye")
+ private Double glfybqye;
@PropertyDef(label = "绠＄悊璐圭敤鏈勾绱(鍏�)" )
- @Column(name = "glfybnlj", precision = 20, scale = 2)
- private BigDecimal glfybnlj;
+ @Column(name = "glfybnlj")
+ private Double glfybnlj;
@PropertyDef(label = "鐮斿彂璐圭敤鏈湡浣欓(鍏�)" )
- @Column(name = "yffybqye", precision = 20, scale = 2)
- private BigDecimal yffybqye;
+ @Column(name = "yffybqye")
+ private Double yffybqye;
@PropertyDef(label = "鐮斿彂璐圭敤鏈勾绱(鍏�)" )
- @Column(name = "yffybnlj", precision = 20, scale = 2)
- private BigDecimal yffybnlj;
+ @Column(name = "yffybnlj")
+ private Double yffybnlj;
@PropertyDef(label = "璐㈠姟璐圭敤鏈湡浣欓(鍏�)" )
- @Column(name = "cwfybqye", precision = 20, scale = 2)
- private BigDecimal cwfybqye;
+ @Column(name = "cwfybqye")
+ private Double cwfybqye;
@PropertyDef(label = "璐㈠姟璐圭敤鏈勾绱(鍏�)" )
- @Column(name = "cwfybnlj", precision = 20, scale = 2)
- private BigDecimal cwfybnlj;
+ @Column(name = "cwfybnlj")
+ private Double cwfybnlj;
@PropertyDef(label = "鍏朵腑锛氬埄鎭垂鐢ㄦ湰鏈熶綑棰�(鍏�)" )
- @Column(name = "lxfybqye", precision = 20, scale = 2)
- private BigDecimal lxfybqye;
+ @Column(name = "lxfybqye")
+ private Double lxfybqye;
@PropertyDef(label = "鍏朵腑锛氬埄鎭垂鐢ㄦ湰骞寸疮璁�(鍏�)" )
- @Column(name = "lxfybnlj", precision = 20, scale = 2)
- private BigDecimal lxfybnlj;
+ @Column(name = "lxfybnlj")
+ private Double lxfybnlj;
@PropertyDef(label = "鍒╂伅鏀跺叆鏈湡浣欓(鍏�)" )
- @Column(name = "lxsrbqye", precision = 20, scale = 2)
- private BigDecimal lxsrbqye;
+ @Column(name = "lxsrbqye")
+ private Double lxsrbqye;
@PropertyDef(label = "鍒╂伅鏀跺叆鏈勾绱(鍏�)" )
- @Column(name = "lxsrbnlj", precision = 20, scale = 2)
- private BigDecimal lxsrbnlj;
+ @Column(name = "lxsrbnlj")
+ private Double lxsrbnlj;
@PropertyDef(label = "鍔狅細鍏朵粬鏀剁泭鏈湡浣欓(鍏�)" )
- @Column(name = "qtsybqye", precision = 20, scale = 2)
- private BigDecimal qtsybqye;
+ @Column(name = "qtsybqye")
+ private Double qtsybqye;
@PropertyDef(label = "鍔狅細鍏朵粬鏀剁泭鏈勾绱(鍏�)" )
- @Column(name = "qtsybnlj", precision = 20, scale = 2)
- private BigDecimal qtsybnlj;
+ @Column(name = "qtsybnlj")
+ private Double qtsybnlj;
@PropertyDef(label = "鎶曡祫鏀剁泭(鎹熷け浠モ��-鈥濆彿濉垪)鏈湡浣欓(鍏�)" )
- @Column(name = "tzsybqye", precision = 20, scale = 2)
- private BigDecimal tzsybqye;
+ @Column(name = "tzsybqye")
+ private Double tzsybqye;
@PropertyDef(label = "鎶曡祫鏀剁泭(鎹熷け浠モ��-鈥濆彿濉垪)鏈勾绱(鍏�)" )
- @Column(name = "tzsybnlj", precision = 20, scale = 2)
- private BigDecimal tzsybnlj;
+ @Column(name = "tzsybnlj")
+ private Double tzsybnlj;
@PropertyDef(label = "鍏朵腑锛氬鑱旇惀浼佷笟鍜屽悎钀ヤ紒涓氱殑鎶曡祫鏀剁泭鏈湡浣欓(鍏�)" )
- @Column(name = "lyqytzsybqye", precision = 20, scale = 2)
- private BigDecimal lyqytzsybqye;
+ @Column(name = "lyqytzsybqye")
+ private Double lyqytzsybqye;
@PropertyDef(label = "鍏朵腑锛氬鑱旇惀浼佷笟鍜屽悎钀ヤ紒涓氱殑鎶曡祫鏀剁泭鏈勾绱(鍏�)" )
- @Column(name = "lyqytzsybnlj", precision = 20, scale = 2)
- private BigDecimal lyqytzsybnlj;
+ @Column(name = "lyqytzsybnlj")
+ private Double lyqytzsybnlj;
@PropertyDef(label = "鍏厑浠峰�煎彉鍔ㄦ敹鐩�(鎹熷け浠モ��-鈥濆彿濉垪)鏈湡浣欓(鍏�)" )
- @Column(name = "gyjzbdsybqye", precision = 20, scale = 2)
- private BigDecimal gyjzbdsybqye;
+ @Column(name = "gyjzbdsybqye")
+ private Double gyjzbdsybqye;
@PropertyDef(label = "鍏厑浠峰�煎彉鍔ㄦ敹鐩�(鎹熷け浠モ��-鈥濆彿濉垪)鏈勾绱(鍏�)" )
- @Column(name = "gyjzbdsybnlj", precision = 20, scale = 2)
- private BigDecimal gyjzbdsybnlj;
+ @Column(name = "gyjzbdsybnlj")
+ private Double gyjzbdsybnlj;
@PropertyDef(label = "璧勪骇鍑忓�兼崯澶�(鎹熷け浠モ��-鈥濆～鍒�)鏈湡浣欓(鍏�)" )
- @Column(name = "zcjzssbqye", precision = 20, scale = 2)
- private BigDecimal zcjzssbqye;
+ @Column(name = "zcjzssbqye")
+ private Double zcjzssbqye;
@PropertyDef(label = "鏈勾绱(鍏�)" )
- @Column(name = "zcjzssbnlj", precision = 20, scale = 2)
- private BigDecimal zcjzssbnlj;
+ @Column(name = "zcjzssbnlj")
+ private Double zcjzssbnlj;
@PropertyDef(label = "璧勪骇澶勭疆鏀剁泭(鎹熷け浠モ��-鈥濆～鍒�)鏈湡浣欓(鍏�)" )
- @Column(name = "zcczsybqye", precision = 20, scale = 2)
- private BigDecimal zcczsybqye;
+ @Column(name = "zcczsybqye")
+ private Double zcczsybqye;
@PropertyDef(label = "璧勪骇澶勭疆鏀剁泭(鎹熷け浠モ��-鈥濆～鍒�)鏈勾绱(鍏�)" )
- @Column(name = "zcczsybnlj", precision = 20, scale = 2)
- private BigDecimal zcczsybnlj;
+ @Column(name = "zcczsybnlj")
+ private Double zcczsybnlj;
@PropertyDef(label = "浜屻�佽惀涓氬埄娑�(浜忔崯浠モ�滐紞鈥濆彿濉垪)鏈湡浣欓(鍏�)" )
- @Column(name = "yylrbqye", precision = 20, scale = 2)
- private BigDecimal yylrbqye;
+ @Column(name = "yylrbqye")
+ private Double yylrbqye;
@PropertyDef(label = "浜屻�佽惀涓氬埄娑�(浜忔崯浠モ�滐紞鈥濆彿濉垪)鏈勾绱(鍏�)" )
- @Column(name = "yylrbnlj", precision = 20, scale = 2)
- private BigDecimal yylrbnlj;
+ @Column(name = "yylrbnlj")
+ private Double yylrbnlj;
@PropertyDef(label = "鍔狅細钀ヤ笟澶栨敹鍏ユ湰鏈熶綑棰�(鍏�)" )
- @Column(name = "yywsrbqye", precision = 20, scale = 2)
- private BigDecimal yywsrbqye;
+ @Column(name = "yywsrbqye")
+ private Double yywsrbqye;
@PropertyDef(label = "鍔狅細钀ヤ笟澶栨敹鍏ユ湰骞寸疮璁�(鍏�)" )
- @Column(name = "yywsrbnlj", precision = 20, scale = 2)
- private BigDecimal yywsrbnlj;
+ @Column(name = "yywsrbnlj")
+ private Double yywsrbnlj;
@PropertyDef(label = "鍑忥細钀ヤ笟澶栨敮鍑烘湰鏈熶綑棰�(鍏�)" )
- @Column(name = "yywzcbqye", precision = 20, scale = 2)
- private BigDecimal yywzcbqye;
+ @Column(name = "yywzcbqye")
+ private Double yywzcbqye;
@PropertyDef(label = "鍑忥細钀ヤ笟澶栨敮鍑烘湰骞寸疮璁�(鍏�)" )
- @Column(name = "yywzcbnlj", precision = 20, scale = 2)
- private BigDecimal yywzcbnlj;
+ @Column(name = "yywzcbnlj")
+ private Double yywzcbnlj;
@PropertyDef(label = "涓夈�佸埄娑︽�婚(浜忔崯鎬婚浠モ�滐紞鈥濆彿濉垪)鏈湡浣欓(鍏�)" )
- @Column(name = "lrzebqye", precision = 20, scale = 2)
- private BigDecimal lrzebqye;
+ @Column(name = "lrzebqye")
+ private Double lrzebqye;
@PropertyDef(label = "涓夈�佸埄娑︽�婚(浜忔崯鎬婚浠モ�滐紞鈥濆彿濉垪)鏈勾绱(鍏�)" )
- @Column(name = "lrzebnlj", precision = 20, scale = 2)
- private BigDecimal lrzebnlj;
+ @Column(name = "lrzebnlj")
+ private Double lrzebnlj;
@PropertyDef(label = "鍑忥細鎵�寰楃◣璐圭敤鏈湡浣欓(鍏�)" )
- @Column(name = "sdsfybqye", precision = 20, scale = 2)
- private BigDecimal sdsfybqye;
+ @Column(name = "sdsfybqye")
+ private Double sdsfybqye;
@PropertyDef(label = "鍑忥細鎵�寰楃◣璐圭敤鏈勾绱(鍏�)" )
- @Column(name = "sdsfybnlj", precision = 20, scale = 2)
- private BigDecimal sdsfybnlj;
+ @Column(name = "sdsfybnlj")
+ private Double sdsfybnlj;
@PropertyDef(label = "鍥涖�佸噣鍒╂鼎(鍑�浜忔崯浠モ�滐紞鈥濆彿濉垪)鏈湡浣欓(鍏�)" )
- @Column(name = "jlrbqye", precision = 20, scale = 2)
- private BigDecimal jlrbqye;
+ @Column(name = "jlrbqye")
+ private Double jlrbqye;
@PropertyDef(label = "鍥涖�佸噣鍒╂鼎(鍑�浜忔崯浠モ�滐紞鈥濆彿濉垪)鏈勾绱(鍏�)" )
- @Column(name = "jlrbnlj", precision = 20, scale = 2)
- private BigDecimal jlrbnlj;
+ @Column(name = "jlrbnlj")
+ private Double jlrbnlj;
@PropertyDef(label = "鎸佺画缁忚惀鍑�鍒╂鼎(鍑�浜忔崯浠モ��-鈥濆彿濉垪)鏈湡浣欓(鍏�)" )
- @Column(name = "cxjyjlrbqye", precision = 20, scale = 2)
- private BigDecimal cxjyjlrbqye;
+ @Column(name = "cxjyjlrbqye")
+ private Double cxjyjlrbqye;
@PropertyDef(label = "鎸佺画缁忚惀鍑�鍒╂鼎(鍑�浜忔崯浠モ��-鈥濆彿濉垪)鏈勾绱(鍏�)" )
- @Column(name = "cxjyjlrbnlj", precision = 20, scale = 2)
- private BigDecimal cxjyjlrbnlj;
+ @Column(name = "cxjyjlrbnlj")
+ private Double cxjyjlrbnlj;
@PropertyDef(label = "缁堟缁忚惀鍑�鍒╂鼎(鍑�浜忔崯浠モ��-鈥濆彿濉垪)鏈湡浣欓(鍏�)" )
- @Column(name = "zzjyjlrbqye", precision = 20, scale = 2)
- private BigDecimal zzjyjlrbqye;
+ @Column(name = "zzjyjlrbqye")
+ private Double zzjyjlrbqye;
@PropertyDef(label = "缁堟缁忚惀鍑�鍒╂鼎(鍑�浜忔崯浠モ��-鈥濆彿濉垪)鏈勾绱(鍏�)" )
- @Column(name = "zzjyjlrbnlj", precision = 20, scale = 2)
- private BigDecimal zzjyjlrbnlj;
+ @Column(name = "zzjyjlrbnlj")
+ private Double zzjyjlrbnlj;
@PropertyDef(label = "浜斻�佸叾浠栫患鍚堟敹鐩婄殑绋庡悗鍑�棰濇湰鏈熶綑棰�(鍏�)" )
- @Column(name = "qtzhsyjebqye", precision = 20, scale = 2)
- private BigDecimal qtzhsyjebqye;
+ @Column(name = "qtzhsyjebqye")
+ private Double qtzhsyjebqye;
@PropertyDef(label = "浜斻�佸叾浠栫患鍚堟敹鐩婄殑绋庡悗鍑�棰濇湰骞寸疮璁�(鍏�)" )
- @Column(name = "qtzhsyjebnlj", precision = 20, scale = 2)
- private BigDecimal qtzhsyjebnlj;
+ @Column(name = "qtzhsyjebnlj")
+ private Double qtzhsyjebnlj;
@PropertyDef(label = "(涓�)涓嶈兘閲嶅垎绫昏繘鎹熺泭鐨勫叾浠栫患鍚堟敹鐩婃湰鏈熶綑棰�(鍏�)" )
- @Column(name = "bnflzhsybqye", precision = 20, scale = 2)
- private BigDecimal bnflzhsybqye;
+ @Column(name = "bnflzhsybqye")
+ private Double bnflzhsybqye;
@PropertyDef(label = "(涓�)涓嶈兘閲嶅垎绫昏繘鎹熺泭鐨勫叾浠栫患鍚堟敹鐩婃湰骞寸疮璁�(鍏�)" )
- @Column(name = "bnflzhsybnlj", precision = 20, scale = 2)
- private BigDecimal bnflzhsybnlj;
+ @Column(name = "bnflzhsybnlj")
+ private Double bnflzhsybnlj;
@PropertyDef(label = "1.閲嶆柊璁￠噺璁惧畾鍙楃泭璁″垝鍙樺姩棰濇湰鏈熶綑棰�(鍏�)" )
- @Column(name = "cxjlbdebqye", precision = 20, scale = 2)
- private BigDecimal cxjlbdebqye;
+ @Column(name = "cxjlbdebqye")
+ private Double cxjlbdebqye;
@PropertyDef(label = "1.閲嶆柊璁￠噺璁惧畾鍙楃泭璁″垝鍙樺姩棰濇湰骞寸疮璁�(鍏�)" )
- @Column(name = "cxjlbdebnlj", precision = 20, scale = 2)
- private BigDecimal cxjlbdebnlj;
+ @Column(name = "cxjlbdebnlj")
+ private Double cxjlbdebnlj;
@PropertyDef(label = "2.鏉冪泭娉曚笅涓嶈兘杞崯鐩婄殑鍏朵粬缁煎悎鏀剁泭鏈湡浣欓(鍏�)" )
- @Column(name = "qyfbnzsybqye", precision = 20, scale = 2)
- private BigDecimal qyfbnzsybqye;
+ @Column(name = "qyfbnzsybqye")
+ private Double qyfbnzsybqye;
@PropertyDef(label = "2.鏉冪泭娉曚笅涓嶈兘杞崯鐩婄殑鍏朵粬缁煎悎鏀剁泭鏈勾绱(鍏�)" )
- @Column(name = "qyfbnzsybnlj", precision = 20, scale = 2)
- private BigDecimal qyfbnzsybnlj;
+ @Column(name = "qyfbnzsybnlj")
+ private Double qyfbnzsybnlj;
@PropertyDef(label = "3.鍏朵粬鏉冪泭宸ュ叿鎶曡祫鍏厑浠峰�煎彉鍔ㄦ湰鏈熶綑棰�(鍏�)" )
- @Column(name = "qtqygjjzbdbqye", precision = 20, scale = 2)
- private BigDecimal qtqygjjzbdbqye;
+ @Column(name = "qtqygjjzbdbqye")
+ private Double qtqygjjzbdbqye;
@PropertyDef(label = "3.鍏朵粬鏉冪泭宸ュ叿鎶曡祫鍏厑浠峰�煎彉鍔ㄦ湰骞寸疮璁�(鍏�)" )
- @Column(name = "qtqygjjzbdbnlj", precision = 20, scale = 2)
- private BigDecimal qtqygjjzbdbnlj;
+ @Column(name = "qtqygjjzbdbnlj")
+ private Double qtqygjjzbdbnlj;
@PropertyDef(label = "4.浼佷笟鑷韩淇＄敤椋庨櫓鍏厑浠峰�煎彉鍔ㄦ湰鏈熶綑棰�(鍏�)" )
- @Column(name = "qyxyfxbdbqye", precision = 20, scale = 2)
- private BigDecimal qyxyfxbdbqye;
+ @Column(name = "qyxyfxbdbqye")
+ private Double qyxyfxbdbqye;
@PropertyDef(label = "4.浼佷笟鑷韩淇＄敤椋庨櫓鍏厑浠峰�煎彉鍔ㄦ湰骞寸疮璁�(鍏�)" )
- @Column(name = "qyxyfxbdbnlj", precision = 20, scale = 2)
- private BigDecimal qyxyfxbdbnlj;
+ @Column(name = "qyxyfxbdbnlj")
+ private Double qyxyfxbdbnlj;
@PropertyDef(label = "5.鍏朵粬鏈湡浣欓(鍏�)" )
- @Column(name = "bnflzhsyqtbqye", precision = 20, scale = 2)
- private BigDecimal bnflzhsyqtbqye;
+ @Column(name = "bnflzhsyqtbqye")
+ private Double bnflzhsyqtbqye;
@PropertyDef(label = "5.鍏朵粬鏈勾绱(鍏�)" )
- @Column(name = "bnflzhsyqtbnlj", precision = 20, scale = 2)
- private BigDecimal bnflzhsyqtbnlj;
+ @Column(name = "bnflzhsyqtbnlj")
+ private Double bnflzhsyqtbnlj;
@PropertyDef(label = "1.鏉冪泭娉曚笅鍙浆鎹熺泭鐨勫叾浠栫患鍚堟敹鐩婃湰鏈熶綑棰�(鍏�)" )
- @Column(name = "qyfkzsybqye", precision = 20, scale = 2)
- private BigDecimal qyfkzsybqye;
+ @Column(name = "qyfkzsybqye")
+ private Double qyfkzsybqye;
@PropertyDef(label = "1.鏉冪泭娉曚笅鍙浆鎹熺泭鐨勫叾浠栫患鍚堟敹鐩婃湰骞寸疮璁�(鍏�)" )
- @Column(name = "qyfkzsybnlj", precision = 20, scale = 2)
- private BigDecimal qyfkzsybnlj;
+ @Column(name = "qyfkzsybnlj")
+ private Double qyfkzsybnlj;
@PropertyDef(label = "2.鍏朵粬鍊烘潈鎶曡祫鍏厑浠峰�煎彉鍔ㄦ湰鏈熶綑棰�(鍏�)" )
- @Column(name = "qtzqjzbdbqye", precision = 20, scale = 2)
- private BigDecimal qtzqjzbdbqye;
+ @Column(name = "qtzqjzbdbqye")
+ private Double qtzqjzbdbqye;
@PropertyDef(label = "2.鍏朵粬鍊烘潈鎶曡祫鍏厑浠峰�煎彉鍔ㄦ湰骞寸疮璁�(鍏�)" )
- @Column(name = "qtzqjzbdbnlj", precision = 20, scale = 2)
- private BigDecimal qtzqjzbdbnlj;
+ @Column(name = "qtzqjzbdbnlj")
+ private Double qtzqjzbdbnlj;
@PropertyDef(label = "3.鍙緵鍑哄敭閲戣瀺璧勪骇鍏厑浠峰�煎彉鍔ㄦ崯鐩婃湰鏈熶綑棰�(鍏�)" )
- @Column(name = "kgcszcbdsybqye", precision = 20, scale = 2)
- private BigDecimal kgcszcbdsybqye;
+ @Column(name = "kgcszcbdsybqye")
+ private Double kgcszcbdsybqye;
@PropertyDef(label = "3.鍙緵鍑哄敭閲戣瀺璧勪骇鍏厑浠峰�煎彉鍔ㄦ崯鐩婃湰骞寸疮璁�(鍏�)" )
- @Column(name = "kgcszcbdsybnlj", precision = 20, scale = 2)
- private BigDecimal kgcszcbdsybnlj;
+ @Column(name = "kgcszcbdsybnlj")
+ private Double kgcszcbdsybnlj;
@PropertyDef(label = "4.閲戣瀺璧勪骇閲嶅垎绫昏鍏ュ叾浠栫患鍚堟敹鐩婄殑閲戦鏈湡浣欓(鍏�)" )
- @Column(name = "jrzcflsyjebqye", precision = 20, scale = 2)
- private BigDecimal jrzcflsyjebqye;
+ @Column(name = "jrzcflsyjebqye")
+ private Double jrzcflsyjebqye;
@PropertyDef(label = "4.閲戣瀺璧勪骇閲嶅垎绫昏鍏ュ叾浠栫患鍚堟敹鐩婄殑閲戦鏈勾绱(鍏�)" )
- @Column(name = "jrzcflsyjebnlj", precision = 20, scale = 2)
- private BigDecimal jrzcflsyjebnlj;
+ @Column(name = "jrzcflsyjebnlj")
+ private Double jrzcflsyjebnlj;
@PropertyDef(label = "5.鎸佹湁鑷冲埌鏈熸姇璧勯噸鍒嗙被涓哄彲渚涘嚭鍞噾铻嶈祫浜ф崯鐩婃湰鏈熶綑棰�(鍏�)" )
- @Column(name = "cydqtzzcsybqye", precision = 20, scale = 2)
- private BigDecimal cydqtzzcsybqye;
+ @Column(name = "cydqtzzcsybqye")
+ private Double cydqtzzcsybqye;
@PropertyDef(label = "5.鎸佹湁鑷冲埌鏈熸姇璧勯噸鍒嗙被涓哄彲渚涘嚭鍞噾铻嶈祫浜ф崯鐩婃湰骞寸疮璁�(鍏�)" )
- @Column(name = "cydqtzzcsybnlj", precision = 20, scale = 2)
- private BigDecimal cydqtzzcsybnlj;
+ @Column(name = "cydqtzzcsybnlj")
+ private Double cydqtzzcsybnlj;
@PropertyDef(label = "6.鍏朵粬鍊烘潈鎶曡祫淇＄敤鍑忓�煎噯澶囨湰鏈熶綑棰�(鍏�)" )
- @Column(name = "qtzqtzjzbqye", precision = 20, scale = 2)
- private BigDecimal qtzqtzjzbqye;
+ @Column(name = "qtzqtzjzbqye")
+ private Double qtzqtzjzbqye;
@PropertyDef(label = "6.鍏朵粬鍊烘潈鎶曡祫淇＄敤鍑忓�煎噯澶囨湰骞寸疮璁�(鍏�)" )
- @Column(name = "qtzqtzjzbnlj", precision = 20, scale = 2)
- private BigDecimal qtzqtzjzbnlj;
+ @Column(name = "qtzqtzjzbnlj")
+ private Double qtzqtzjzbnlj;
@PropertyDef(label = "7.鐜伴噾娴侀噺濂楁湡鎹熺泭鐨勬湁鏁堥儴鍒嗘湰鏈熶綑棰�(鍏�)" )
- @Column(name = "zjllsybqye", precision = 20, scale = 2)
- private BigDecimal zjllsybqye;
+ @Column(name = "zjllsybqye")
+ private Double zjllsybqye;
@PropertyDef(label = "7.鐜伴噾娴侀噺濂楁湡鎹熺泭鐨勬湁鏁堥儴鍒嗘湰骞寸疮璁�(鍏�)" )
- @Column(name = "zjllsybnlj", precision = 20, scale = 2)
- private BigDecimal zjllsybnlj;
+ @Column(name = "zjllsybnlj")
+ private Double zjllsybnlj;
@PropertyDef(label = "8.澶栧竵璐㈠姟鎶ヨ〃鎶樼畻宸鏈湡浣欓(鍏�)" )
- @Column(name = "wbcwbbcebqye", precision = 20, scale = 2)
- private BigDecimal wbcwbbcebqye;
+ @Column(name = "wbcwbbcebqye")
+ private Double wbcwbbcebqye;
@PropertyDef(label = "8.澶栧竵璐㈠姟鎶ヨ〃鎶樼畻宸鏈勾绱(鍏�)" )
- @Column(name = "wbcwbbcebnlj", precision = 20, scale = 2)
- private BigDecimal wbcwbbcebnlj;
+ @Column(name = "wbcwbbcebnlj")
+ private Double wbcwbbcebnlj;
@PropertyDef(label = "9.鍏朵粬鏈湡浣欓(鍏�)" )
- @Column(name = "cflsybqye", precision = 20, scale = 2)
- private BigDecimal cflsybqye;
+ @Column(name = "cflsybqye")
+ private Double cflsybqye;
@PropertyDef(label = "9.鍏朵粬鏈勾绱(鍏�)" )
- @Column(name = "cflsybnlj", precision = 20, scale = 2)
- private BigDecimal cflsybnlj;
+ @Column(name = "cflsybnlj")
+ private Double cflsybnlj;
@PropertyDef(label = "鍏�佺患鍚堟敹鐩婃�婚鏈湡浣欓(鍏�)" )
- @Column(name = "zhsyzebqye", precision = 20, scale = 2)
- private BigDecimal zhsyzebqye;
+ @Column(name = "zhsyzebqye")
+ private Double zhsyzebqye;
@PropertyDef(label = "鍏�佺患鍚堟敹鐩婃�婚鏈勾绱(鍏�)" )
- @Column(name = "zhsyzebnlj", precision = 20, scale = 2)
- private BigDecimal zhsyzebnlj;
+ @Column(name = "zhsyzebnlj")
+ private Double zhsyzebnlj;
@PropertyDef(label = "涓冦�佹瘡鑲℃敹鐩婏細鏈湡浣欓(鍏�)" )
- @Column(name = "mgsybqye", precision = 20, scale = 2)
- private BigDecimal mgsybqye;
+ @Column(name = "mgsybqye")
+ private Double mgsybqye;
@PropertyDef(label = "涓冦�佹瘡鑲℃敹鐩婏細鏈勾绱(鍏�)" )
- @Column(name = "mgsybnlj", precision = 20, scale = 2)
- private BigDecimal mgsybnlj;
+ @Column(name = "mgsybnlj")
+ private Double mgsybnlj;
@PropertyDef(label = "(涓�)鍩烘湰姣忚偂鏀剁泭鏈湡浣欓(鍏�)" )
- @Column(name = "jbmgsybqye", precision = 20, scale = 2)
- private BigDecimal jbmgsybqye;
+ @Column(name = "jbmgsybqye")
+ private Double jbmgsybqye;
@PropertyDef(label = "(涓�)鍩烘湰姣忚偂鏀剁泭鏈勾绱(鍏�)" )
- @Column(name = "jbmgsybnlj", precision = 20, scale = 2)
- private BigDecimal jbmgsybnlj;
+ @Column(name = "jbmgsybnlj")
+ private Double jbmgsybnlj;
@PropertyDef(label = "(浜�)绋�閲婃瘡鑲℃敹鐩婃湰鏈熶綑棰�(鍏�)" )
- @Column(name = "xsmgsybqye", precision = 20, scale = 2)
- private BigDecimal xsmgsybqye;
+ @Column(name = "xsmgsybqye")
+ private Double xsmgsybqye;
@PropertyDef(label = "(浜�)绋�閲婃瘡鑲℃敹鐩婃湰骞寸疮璁�(鍏�)" )
- @Column(name = "xsmgsybnlj", precision = 20, scale = 2)
- private BigDecimal xsmgsybnlj;
+ @Column(name = "xsmgsybnlj")
+ private Double xsmgsybnlj;
@PropertyDef(label = "鎿嶄綔鏍囧織" )
@Column(name = "czbz", length = 1)
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1201Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1201Rep.java
index f53e26f..e145f39 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1201Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1201Rep.java
@@ -27,4 +27,12 @@
@Query("from Api1201 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
List<Api1201> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+
+ /**
+ * 鏍规嵁bizId鏌ヨ鏁版嵁
+ * @param bizId
+ * @return
+ */
+ @Query("from Api1201 where bizId =:bizId")
+ List<Api1201> getDataByBizId(@Param("bizId") String bizId);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1404Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1404Rep.java
index 28d1c37..caf239d 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1404Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1404Rep.java
@@ -29,4 +29,12 @@
@Query("from Api1404 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
List<Api1404> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+
+ /**
+ * 鏍规嵁bizId鏌ヨ鏁版嵁
+ * @param bizId
+ * @return
+ */
+ @Query("from Api1404 where bizId =:bizId")
+ List<Api1404> getDataByBizId(@Param("bizId") String bizId);
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutSettle.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutSettle.java
index 5768940..a3b2317 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutSettle.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40InoutSettle.java
@@ -19,7 +19,7 @@
@Id
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "娴佹按鍙�", description = "缁撶畻鏃ユ湡锛坹yyyMMdd锛�+4浣嶉『搴忓彿缁勬垚")
+ @PropertyDef(label = "娴佹按鍙�",description = "缁撶畻鏃ユ湡锛坹yyyMMdd锛�+4浣嶉『搴忓彿缁勬垚")
private String id;
@Column(name = "COMPANY_ID_", length = 10)
@@ -76,14 +76,14 @@
private String payee;
@Column(name = "PAYEE_ID_")
- @PropertyDef(label = "鏀舵浜鸿韩浠借瘉鍙�")
+ @PropertyDef(label = "鏀舵浜虹渷浠借瘉鍙�")
private String payeeId;
@Column(name = "BANK_CATEGORY_", length = 10)
@PropertyDef(label = "閾惰琛屽埆浠ｇ爜")
private String bankCategory;
- @Column(name = "BANK_CODE_", length = 20)
+ @Column(name = "BANK_CODE_", length = 40)
@PropertyDef(label = "寮�鎴疯鍙�")
private String bankCode;
@@ -91,7 +91,7 @@
@PropertyDef(label = "寮�鎴疯鍚嶇О")
private String bank;
- @Column(name = "BANK_NUM_", length = 20)
+ @Column(name = "BANK_NUM_", length = 40)
@PropertyDef(label = "閾惰璐﹀彿")
private String bankNum;
@@ -110,5 +110,4 @@
@Column(name = "UPDATE_TIME_")
@PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
private Date updateTime;
-
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
index 6144701..03b7474 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1202.java
@@ -1,14 +1,14 @@
package com.fzzy.async.fzzy40.impl;
import com.fzzy.api.Constant;
-import com.fzzy.api.entity.Api1105;
-import com.fzzy.api.entity.Api1202;
-import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.DateUtil;
+import com.fzzy.api.view.repository.Api1201Rep;
import com.fzzy.api.view.repository.Api1202Rep;
+import com.fzzy.api.view.repository.Api1404Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40InoutNoticeIn;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
@@ -48,7 +48,11 @@
@Autowired
private ApiTriggerService apiTriggerService;
@Autowired
+ private Api1201Rep api1201Rep;
+ @Autowired
private Api1202Rep api1202Rep;
+ @Autowired
+ private Api1404Rep api1404Rep;
@Autowired
private ApiCommonService commonService;
@Autowired
@@ -86,6 +90,8 @@
List<Fz40InoutNoticeIn> listInoutNotice;
List<Api1202> api1202List;
List<Fz40InoutRecordItem> listInoutRecordItem;
+ List<Api1201> api1201List;
+ List<Api1404> api1404List;
for (Fz40InoutRecord sysData : list) {
if (sysData.getRecordStatus().equals("DEL") || sysData.getRecordStatus().equals("ERROR")) {
continue;
@@ -117,14 +123,21 @@
apiData.setSfzh(null == sysData.getUserId() ? "410183200010100000" : sysData.getUserId().trim());
- //鑾峰彇鍚堝悓鍙�
+ //鑾峰彇閫氱煡鍗曚俊鎭紝鏌ヨ鍚堝悓鍙峰拰璁″垝鏄庣粏鍙�
listInoutNotice = fzzySyncNoticeInRep.listInoutNoticeInById(sysData.getNoticeId());
if (null != listInoutNotice && listInoutNotice.size() > 0) {
+ //鍚堝悓鍙�
if (StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())) {
- apiData.setHth(api1105.getHwdm().substring(0, 18) + listInoutNotice.get(0).getContractId());
+ api1201List = api1201Rep.getDataByBizId(listInoutNotice.get(0).getContractId());
+ if(null != api1201List && api1201List.size() > 0){
+ apiData.setHth(api1201List.get(0).getHth());
+ }
}
if (StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())) {
- apiData.setJhmxh(listInoutNotice.get(0).getPlanId());
+ api1404List = api1404Rep.getDataByBizId(listInoutNotice.get(0).getPlanId());
+ if(null != api1404List && api1404List.size() > 0){
+ apiData.setJhmxh(api1404List.get(0).getJhmxdh());
+ }
}
}
@@ -160,6 +173,9 @@
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
+ if (null == sysData.getFullWeightTime()) {
+ sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
+ }
if (!sysData.getFullWeightTime().after(sysData.getRegisterTime())) {
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
}
@@ -171,6 +187,9 @@
//鐨噸淇℃伅
apiData.setPz(sysData.getEmptyWeight());
+ if (null == sysData.getEmptyWeightTime()) {
+ sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
+ }
if (!sysData.getEmptyWeightTime().after(sysData.getFullWeightTime())) {
sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 60));
}
@@ -202,12 +221,7 @@
apiData.setBizId(sysData.getId());
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
- api1202List = api1202Rep.getDataById(apiData.getRkywdh());
- if (null == api1202List || api1202List.isEmpty()) {
- apiData.setCzbz(Constant.CZBZ_I);
- } else {
- apiData.setCzbz(api1202List.get(0).getCzbz());
- }
+
//鍒ゆ柇鏄惁涓鸿埞杩�
if (StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")) {
listInoutRecordItem = fzzy40SyncInoutRecordItemRep.findDataByRecordId(sysData.getId());
@@ -225,11 +239,22 @@
apiData.setMz(fz40InoutRecordItem.getFullWeight());
apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
apiData.setJz(fz40InoutRecordItem.getSettleWeight());
-
+ api1202List = api1202Rep.getDataById(apiData.getRkywdh());
+ if (null == api1202List || api1202List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1202List.get(0).getCzbz());
+ }
api1202Rep.save(apiData);
idNum++;
}
} else {
+ api1202List = api1202Rep.getDataById(apiData.getRkywdh());
+ if (null == api1202List || api1202List.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(api1202List.get(0).getCzbz());
+ }
//淇濆瓨鏁版嵁
api1202Rep.save(apiData);
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
index 227d1b6..daa4666 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1203.java
@@ -174,8 +174,7 @@
apiData.setZkl(StringUtils.isEmpty(zkl)?"":zkl.substring(1));
if("UNPASS".equals(sysData.getCheckStatus())){
apiData.setJyjg("0");
- }
- if("PASS".equals(sysData.getCheckStatus())){
+ }else {
apiData.setJyjg("1");
}
apiData.setJyrxm(sysData.getCheckUser());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java
index a97d794..c0c268d 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1204.java
@@ -7,18 +7,10 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.*;
-import com.fzzy.async.fzzy30.repository.FzzySync1202Rep;
-import com.fzzy.async.fzzy35.repository.Fzzy35Sync1202Rep;
-import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.entity.Fz40InoutSettle;
-import com.fzzy.async.fzzy40.entity.Fz40InoutNoticeIn;
-import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
-import com.fzzy.async.fzzy40.entity.Fz40InoutSettle;
-import com.fzzy.async.fzzy40.repository.Fzzy40Sync1107Rep;
-import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1204Rep;
-import com.fzzy.async.fzzy40.repository.Fzzy40SyncNoticeInRep;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -40,11 +32,7 @@
private final static String INOUT_TYPE_IN = "IN";
@Autowired
- private Fzzy40Sync1202Rep fzzy40Sync1202Rep;
- @Autowired
private Fzzy40Sync1204Rep fzzy40Sync1204Rep;
- @Autowired
- private Fzzy40SyncNoticeInRep fzzySyncNoticeInRep;
@Autowired
private ApiLogRep apiLogRep;
@Autowired
@@ -83,32 +71,17 @@
Api1204 apiData;
Api1105 api1105;
- List<Fz40InoutRecord> fz40InoutRecords;
- Fz40InoutRecord fz40InoutRecord;
for (Fz40InoutSettle sysData : list) {
-
- //鑾峰彇绮鍏ュ簱淇℃伅
- fz40InoutRecords = fzzy40Sync1202Rep.listInoutRecordById(sysData.getId());
- if (null == fz40InoutRecords || fz40InoutRecords.isEmpty()) {
- continue;
- }
- fz40InoutRecord = fz40InoutRecords.get(0);
- if (!deptId.equals(fz40InoutRecord.getDeptId())) {
- continue;
- }
-
- //鑾峰彇璐т綅淇℃伅
- api1105 = commonService.getApi1105Cache(fz40InoutRecord.getDepotId());
- if (null == api1105) {
- continue;
- }
apiData = new Api1204();
//鍏ュ簱缁撶畻鍗曞彿:搴撳尯浠ｇ爜 + yyMMdd + 4涓洪『搴忓彿
apiData.setRkjsdh(kqdm + sysData.getId().substring(2));
- //璐т綅浠ｇ爜
- apiData.setHwdm(api1105.getHwdm());
+ if(StringUtils.isNotEmpty(sysData.getDepotId())){
+ api1105 = commonService.getApi1105Cache(sysData.getDepotId());
+ //璐т綅浠ｇ爜
+ apiData.setHwdm(api1105.getHwdm());
+ }
//缁撶畻閲嶉噺銆佺粨绠楀崟浠枫�佺粨绠楅噾棰濄�佺粨绠楁椂闂�
apiData.setJssl(sysData.getSettleWeight());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index f0f74c2..dcb39c9 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -1,15 +1,11 @@
package com.fzzy.async.fzzy40.impl;
import com.fzzy.api.Constant;
-import com.fzzy.api.entity.Api1105;
-import com.fzzy.api.entity.Api1205;
-import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.api.utils.DateUtil;
-import com.fzzy.api.view.repository.Api1205Rep;
-import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.api.view.repository.*;
import com.fzzy.async.fzzy40.entity.Fz40InoutNoticeOut;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.entity.Fz40InoutRecordItem;
@@ -22,8 +18,6 @@
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
-import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -46,7 +40,11 @@
@Autowired
private ApiTriggerService apiTriggerService;
@Autowired
+ private Api1201Rep api1201Rep;
+ @Autowired
private Api1205Rep api1205Rep;
+ @Autowired
+ private Api1404Rep api1404Rep;
@Autowired
private ApiCommonService commonService;
@Autowired
@@ -59,7 +57,7 @@
* @param start
* @param end
*/
- public void syncData(String kqdm, String deptId, Date start, Date end) {
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
log.info("-------------1205鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
@@ -115,12 +113,19 @@
//鑾峰彇鍚堝悓鍙�
listInoutNotice = fzzySyncNoticeOutRep.listInoutNoticeOutById(sysData.getNoticeId());
- if(null != listInoutNotice && listInoutNotice.size() >0){
- if(StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())){
- apiData.setHth(api1105.getHwdm().substring(0,18) + listInoutNotice.get(0).getContractId());
+ if (null != listInoutNotice && listInoutNotice.size() > 0) {
+ //鍚堝悓鍙�
+ if (StringUtils.isNotEmpty(listInoutNotice.get(0).getContractId())) {
+ List<Api1201> api1201List = api1201Rep.getDataByBizId(listInoutNotice.get(0).getContractId());
+ if(null != api1201List && api1201List.size() > 0){
+ apiData.setHth(api1201List.get(0).getHth());
+ }
}
- if(StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())){
- apiData.setJhmxh(listInoutNotice.get(0).getPlanId());
+ if (StringUtils.isNotEmpty(listInoutNotice.get(0).getPlanId())) {
+ List<Api1404> api1404List = api1404Rep.getDataByBizId(listInoutNotice.get(0).getContractId());
+ if(null != api1404List && api1404List.size() > 0){
+ apiData.setJhmxh(api1404List.get(0).getJhmxdh());
+ }
}
}
@@ -154,6 +159,9 @@
//鐨噸淇℃伅
apiData.setPz(sysData.getEmptyWeight());
+ if (null == sysData.getEmptyWeightTime()) {
+ sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
+ }
if(!sysData.getEmptyWeightTime().after(sysData.getRegisterTime())){
sysData.setEmptyWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 25));
}
@@ -163,6 +171,9 @@
//姣涢噸淇℃伅
apiData.setMz(sysData.getFullWeight());
+ if (null == sysData.getFullWeightTime()) {
+ sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
+ }
if(!sysData.getFullWeightTime().after(sysData.getEmptyWeightTime())){
sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getEmptyWeightTime(), 60));
}
@@ -176,6 +187,9 @@
sysData.setCompleteTime(DateUtils.addMinutes(sysData.getFullWeightTime(), 10));
}
apiData.setCmsj(sysData.getCompleteTime());
+ if(StringUtils.isNotEmpty(sysData.getSettleId())){
+ apiData.setCkjsdh(sysData.getSettleId());
+ }
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
apiData.setZhgxsj(sysData.getUpdateTime());
@@ -186,12 +200,6 @@
apiData.setSyncTime(new Date());
log.info("1201---鍚屾鏁版嵁锛歿}",apiData.toString());
- api1205List = api1205Rep.getDataById(apiData.getCkywdh());
- if(null == api1205List || api1205List.isEmpty()){
- apiData.setCzbz(Constant.CZBZ_I);
- }else {
- apiData.setCzbz(api1205List.get(0).getCzbz());
- }
//鍒ゆ柇鏄惁涓鸿埞杩�
if(StringUtils.isNotEmpty(sysData.getTransType()) && sysData.getTransType().equals("3")){
listInoutRecordItem = fzzy40SyncInoutRecordItemRep.findDataByRecordId(sysData.getId());
@@ -209,10 +217,23 @@
apiData.setMz(fz40InoutRecordItem.getFullWeight());
apiData.setPz(fz40InoutRecordItem.getEmptyWeight());
apiData.setJz(fz40InoutRecordItem.getSettleWeight());
+
+ api1205List = api1205Rep.getDataById(apiData.getCkywdh());
+ if(null == api1205List || api1205List.isEmpty()){
+ apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1205List.get(0).getCzbz());
+ }
api1205Rep.save(apiData);
idNum ++;
}
}else {
+ api1205List = api1205Rep.getDataById(apiData.getCkywdh());
+ if(null == api1205List || api1205List.isEmpty()){
+ apiData.setCzbz(Constant.CZBZ_I);
+ }else {
+ apiData.setCzbz(api1205List.get(0).getCzbz());
+ }
//淇濆瓨鏁版嵁
api1205Rep.save(apiData);
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
index 223a9ea..d5bda63 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1206.java
@@ -2,18 +2,13 @@
import com.fzzy.api.Constant;
import com.fzzy.api.entity.Api1102;
-import com.fzzy.api.entity.Api1105;
import com.fzzy.api.entity.Api1206;
import com.fzzy.api.entity.ApiLog;
-import com.fzzy.api.service.ApiCommonService;
-import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1206Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy40.entity.Fz40InoutRecord;
import com.fzzy.async.fzzy40.entity.Fz40InoutSettle;
-import com.fzzy.async.fzzy40.repository.Fzzy40Sync1202Rep;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1204Rep;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,15 +30,9 @@
private final static String INOUT_TYPE_OUT = "OUT";
@Autowired
- private Fzzy40Sync1202Rep fzzySync1202Rep;
- @Autowired
private Fzzy40Sync1204Rep fzzySync1204Rep;
@Autowired
- private ApiTriggerService apiTriggerService;
- @Autowired
private Api1206Rep api1206Rep;
- @Autowired
- private ApiCommonService commonService;
@Autowired
private Api1102Rep api1102Rep;
@Autowired
@@ -80,26 +69,7 @@
Api1102 api1201 = api1102Rep.findById(kqdm).get();
Api1206 apiData;
- Api1105 api1105;
- List<Fz40InoutRecord> fz40InoutRecords;
- Fz40InoutRecord fz40InoutRecord;
for (Fz40InoutSettle sysData : list) {
-
- //鑾峰彇绮鍑哄簱淇℃伅
- fz40InoutRecords = fzzySync1202Rep.listInoutRecordById(sysData.getId());
- if (null == fz40InoutRecords || fz40InoutRecords.isEmpty()) {
- continue;
- }
- fz40InoutRecord = fz40InoutRecords.get(0);
- if (!deptId.equals(fz40InoutRecord.getDeptId())) {
- continue;
- }
-
- //鑾峰彇璐т綅淇℃伅
- api1105 = commonService.getApi1105Cache(fz40InoutRecord.getDepotId());
- if (null == api1105) {
- continue;
- }
apiData = new Api1206();
//鍏ュ簱缁撶畻鍗曞彿:搴撳尯浠ｇ爜 + yyMMdd + 4涓洪『搴忓彿
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 1ada75e..2e0b758 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -56,6 +56,8 @@
private Api1202Rep api1202Rep;
@Autowired
private Api1205Rep api1205Rep;
+ @Autowired
+ private Api1404Rep api1404Rep;
@Override
public String getProtocol() {
@@ -354,6 +356,12 @@
api1202.setRkjsdh("0");
}
+ //璁剧疆绮杞崲骞村害
+ List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
+ if(null != api1404List && api1404List.size() >0){
+ api1202.setLhnd(api1404List.get(0).getShnd());
+ }
+
//璁剧疆鎵规鍙�
api1202.setPch(apiData.getHwdm() + apiData.getShnd());
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -418,8 +426,15 @@
if (StringUtils.isEmpty(api1205.getCkjsdh())) {
api1205.setCkjsdh("0");
}
+
+ //璁剧疆绮杞崲骞村害
+ List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
+ if(null != api1404List && api1404List.size() >0){
+ api1205.setLhnd(api1404List.get(0).getShnd());
+ }
+
//璁剧疆鎵规鍙�
- api1205.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getCmsj(), "yyyy"));
+ api1205.setPch(apiData.getHwdm() + apiData.getShnd());
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1205);
@@ -430,9 +445,9 @@
Api1206 apiData = (Api1206) data;
BeanUtils.copyProperties(apiData, api1206);
api1206.setBjw(ShAreaBjw.getBjw(code));
- List<Api1205> api1205List = api1205Rep.getDataById(apiData.getCkjsdh());
+// List<Api1205> api1205List = api1205Rep.getDataById(apiData.getCkjsdh());
//璁剧疆鎵规鍙�
- api1206.setPch(api1205List.get(0).getHwdm() + DateFormatUtils.format(api1205List.get(0).getCmsj(), "yyyy"));
+// api1206.setPch(api1205List.get(0).getHwdm() + DateFormatUtils.format(api1205List.get(0).getCmsj(), "yyyy"));
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1206);
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
index b68ef72..e2cd350 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
@@ -216,6 +216,8 @@
private String bjw;
private String bydh = "鏃�";
private String jjdh = "鏃�";
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String lhnd;
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "璁拌处鏃ユ湡")
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
index e58a675..e3c72be 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
@@ -176,4 +176,6 @@
@PropertyDef(label = "妫�鏂ょ被鍨�")
private String jjlx = "鏃�";
+
+ private String lhnd;
}
--
Gitblit v1.9.3