From f21ae344a9f99c542841e9e464fddedb7059f514 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期二, 05 九月 2023 09:05:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingDataVO.java | 136 ++++++-----
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingTaskVO.java | 120 ++++++++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java | 9
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/pushData.xml | 27 ++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 8
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/pushData.json | 122 +++++++++++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java | 193 ++++++++++-------
7 files changed, 465 insertions(+), 150 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingDataVO.java
index 79afada..4d4a44b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingDataVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingDataVO.java
@@ -18,104 +18,110 @@
/**
* 绯荤粺鎺ュ彛oid
*/
- private String classifyoid;
+ private String classifyOid;
/**
* 绯荤粺id
*/
- private String btmoid;
+ private String btmOid;
/**
* 绯荤粺id
*/
- private String btmid;
+ private String btmId;
/**
* 绯荤粺id
*/
- private String sendtype;
+ private String sendType;
+
+
+ /***
+ * 鍒嗙被鍚嶇О
+ */
+
+ private String classifyName;
/**
* 鏄惁鍒嗚В浠诲姟
*/
- private String sendflag;
+ private String sendFlag;
+
/**
* 绯荤粺id
*/
- private String classifyid;
+ private String classifyId;
- /**
- * 绯荤粺id
- */
- private String classifyname;
+ public String getClassifyOid() {
+ return classifyOid;
+ }
- public String getClassifyoid() {
- return classifyoid;
- }
+ public void setClassifyOid(String classifyOid) {
+ this.classifyOid = classifyOid;
+ }
- public void setClassifyoid(String classifyoid) {
- this.classifyoid = classifyoid;
- }
+ public String getBtmOid() {
+ return btmOid;
+ }
- public String getBtmoid() {
- return btmoid;
- }
+ public void setBtmOid(String btmOid) {
+ this.btmOid = btmOid;
+ }
- public void setBtmoid(String btmoid) {
- this.btmoid = btmoid;
- }
+ public String getBtmId() {
+ return btmId;
+ }
- public String getBtmid() {
- return btmid;
- }
+ public void setBtmId(String btmId) {
+ this.btmId = btmId;
+ }
- public void setBtmid(String btmid) {
- this.btmid = btmid;
- }
+ public String getSendType() {
+ return sendType;
+ }
- public String getSendtype() {
- return sendtype;
- }
+ public void setSendType(String sendType) {
+ this.sendType = sendType;
+ }
- public void setSendtype(String sendtype) {
- this.sendtype = sendtype;
- }
+ public String getSendFlag() {
+ return sendFlag;
+ }
- public String getSendflag() {
- return sendflag;
- }
+ public void setSendFlag(String sendFlag) {
+ this.sendFlag = sendFlag;
+ }
- public void setSendflag(String sendflag) {
- this.sendflag = sendflag;
- }
+ public String getClassifyId() {
+ return classifyId;
+ }
- public String getClassifyid() {
- return classifyid;
- }
+ public void setClassifyId(String classifyId) {
+ this.classifyId = classifyId;
+ }
- public void setClassifyid(String classifyid) {
- this.classifyid = classifyid;
- }
+ public String getClassifyName() {
+ return classifyName;
+ }
- public String getClassifyname() {
- return classifyname;
- }
+ public void setClassifyName(String classifyName) {
+ this.classifyName = classifyName;
+ }
- public void setClassifyname(String classifyname) {
- this.classifyname = classifyname;
- }
-
- @Override
- public String toString() {
- return "DockingDataDO{" +
- "classifyoid='" + classifyoid + '\'' +
- ", btmoid='" + btmoid + '\'' +
- ", btmid='" + btmid + '\'' +
- ", sendtype='" + sendtype + '\'' +
- ", sendflag='" + sendflag + '\'' +
- ", classifyid='" + classifyid + '\'' +
- ", classifyname='" + classifyname + '\'' +
- '}';
- }
+ /**
+ * 绯荤粺id
+ */
+ @Override
+ public String toString() {
+ return "DockingDataVO{" +
+ "classifyOid='" + classifyOid + '\'' +
+ ", btmOid='" + btmOid + '\'' +
+ ", btmId='" + btmId + '\'' +
+ ", sendType='" + sendType + '\'' +
+ ", classifyName='" + classifyName + '\'' +
+ ", sendFlag='" + sendFlag + '\'' +
+ ", classifyId='" + classifyId + '\'' +
+ '}';
+ }
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java
index d7c93c7..218f09c 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.code.vo.pagemodel;
import com.vci.ubcs.starter.revision.model.BaseModel;
+import io.swagger.annotations.ApiModelProperty;
/**
* 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｆ棩蹇楁樉绀哄璞�
@@ -15,46 +16,63 @@
*/
private static final long serialVersionUID = 4615707121064918548L;
+ private String uniqueCode;
+ /**
+ * 鍒嗙被oid
+ */
+ private String classifyOid;
+ /**
+ * 鍒嗙被id
+ */
+ private String classifyId;
+ /**
+ * 鍒嗙被name
+ */
+ private String classifyName;
/**
* 鎺ュ彛鐘舵��
*/
- private String interfacestatus;
+ private String interfaceStatus;
/**
* 鍙傛暟
*/
- private String paramstring;
+ private String paramString;
/**
* 杩斿洖
*/
- private String returnstring;
+ private String returnString;
/**
* 绯荤粺缂栧彿
*/
- private String systemcode;
+ private String systemCode;
/**
* 绯荤粺鍚嶇О
*/
- private String systemname;
+ private String systemName;
/**
* 绯荤粺id
*/
- private String systemoid;
+ private String systemOid;
/**
* 鎺ュ彛绫诲瀷
*/
private String type;
+ /**
+ * 浼犻�抶ml
+ */
+ private String sendXml;
/**
* 杩旇繕鎻愮ず
@@ -69,84 +87,54 @@
this.msg = msg;
}
- /**
- * 鑾峰彇 鎺ュ彛鐘舵��
- */
- public String getInterfacestatus (){
- return interfacestatus;
+ public String getInterfaceStatus() {
+ return interfaceStatus;
}
- /**
- * 璁剧疆 鎺ュ彛鐘舵��
- */
- public void setInterfacestatus (String interfacestatus){
- this.interfacestatus = interfacestatus;
- }
- /**
- * 鑾峰彇 鍙傛暟
- */
- public String getParamstring (){
- return paramstring;
+ public void setInterfaceStatus(String interfaceStatus) {
+ this.interfaceStatus = interfaceStatus;
}
- /**
- * 璁剧疆 鍙傛暟
- */
- public void setParamstring (String paramstring){
- this.paramstring = paramstring;
- }
- /**
- * 鑾峰彇 杩斿洖
- */
- public String getReturnstring (){
- return returnstring;
+ public String getParamString() {
+ return paramString;
}
- /**
- * 璁剧疆 杩斿洖
- */
- public void setReturnstring (String returnstring){
- this.returnstring = returnstring;
- }
- /**
- * 鑾峰彇 绯荤粺缂栧彿
- */
- public String getSystemcode (){
- return systemcode;
+ public void setParamString(String paramString) {
+ this.paramString = paramString;
}
- /**
- * 璁剧疆 绯荤粺缂栧彿
- */
- public void setSystemcode (String systemcode){
- this.systemcode = systemcode;
- }
- /**
- * 鑾峰彇 绯荤粺鍚嶇О
- */
- public String getSystemname (){
- return systemname;
+ public String getReturnString() {
+ return returnString;
}
- /**
- * 璁剧疆 绯荤粺鍚嶇О
- */
- public void setSystemname (String systemname){
- this.systemname = systemname;
- }
- /**
- * 鑾峰彇 绯荤粺id
- */
- public String getSystemoid (){
- return systemoid;
+ public void setReturnString(String returnString) {
+ this.returnString = returnString;
}
- /**
- * 璁剧疆 绯荤粺id
- */
- public void setSystemoid (String systemoid){
- this.systemoid = systemoid;
+ public String getSystemCode() {
+ return systemCode;
}
+
+ public void setSystemCode(String systemCode) {
+ this.systemCode = systemCode;
+ }
+
+ public String getSystemName() {
+ return systemName;
+ }
+
+ public void setSystemName(String systemName) {
+ this.systemName = systemName;
+ }
+
+ public String getSystemOid() {
+ return systemOid;
+ }
+
+ public void setSystemOid(String systemOid) {
+ this.systemOid = systemOid;
+ }
+
/**
* 鑾峰彇 鎺ュ彛绫诲瀷
*/
@@ -161,17 +149,62 @@
this.type = type;
}
+ public String getUniqueCode() {
+ return uniqueCode;
+ }
+
+ public void setUniqueCode(String uniqueCode) {
+ this.uniqueCode = uniqueCode;
+ }
+
+ public String getClassifyOid() {
+ return classifyOid;
+ }
+
+ public void setClassifyOid(String classifyOid) {
+ this.classifyOid = classifyOid;
+ }
+
+ public String getClassifyId() {
+ return classifyId;
+ }
+
+ public void setClassifyId(String classifyId) {
+ this.classifyId = classifyId;
+ }
+
+ public String getClassifyName() {
+ return classifyName;
+ }
+
+ public void setClassifyName(String classifyName) {
+ this.classifyName = classifyName;
+ }
+
+ public String getSendXml() {
+ return sendXml;
+ }
+
+ public void setSendXml(String sendXml) {
+ this.sendXml = sendXml;
+ }
+
@Override
public String toString() {
return "DockingLogeVO{" +
- "interfacestatus='" + interfacestatus + '\'' +
- ", paramstring='" + paramstring + '\'' +
- ", returnstring='" + returnstring + '\'' +
- ", systemcode='" + systemcode + '\'' +
- ", systemname='" + systemname + '\'' +
- ", systemoid='" + systemoid + '\'' +
- ", type='" + type + '\'' +
- ", msg='" + msg + '\'' +
- '}';
+ "uniqueCode='" + uniqueCode + '\'' +
+ ", classifyOid='" + classifyOid + '\'' +
+ ", classifyId='" + classifyId + '\'' +
+ ", classifyName='" + classifyName + '\'' +
+ ", interfaceStatus='" + interfaceStatus + '\'' +
+ ", paramString='" + paramString + '\'' +
+ ", returnString='" + returnString + '\'' +
+ ", systemCode='" + systemCode + '\'' +
+ ", systemName='" + systemName + '\'' +
+ ", systemOid='" + systemOid + '\'' +
+ ", type='" + type + '\'' +
+ ", sendXml='" + sendXml + '\'' +
+ ", msg='" + msg + '\'' +
+ '}';
}
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingTaskVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingTaskVO.java
index 8b23a74..e194de6 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingTaskVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingTaskVO.java
@@ -93,6 +93,126 @@
*/
private String dataOid;
+ public String getSysInfoOid() {
+ return sysInfoOid;
+ }
+
+ public void setSysInfoOid(String sysInfoOid) {
+ this.sysInfoOid = sysInfoOid;
+ }
+
+ public String getSystemOid() {
+ return systemOid;
+ }
+
+ public void setSystemOid(String systemOid) {
+ this.systemOid = systemOid;
+ }
+
+ public String getSystemCode() {
+ return systemCode;
+ }
+
+ public void setSystemCode(String systemCode) {
+ this.systemCode = systemCode;
+ }
+
+ public String getSystemName() {
+ return systemName;
+ }
+
+ public void setSystemName(String systemName) {
+ this.systemName = systemName;
+ }
+
+ public String getClassifyOid() {
+ return classifyOid;
+ }
+
+ public void setClassifyOid(String classifyOid) {
+ this.classifyOid = classifyOid;
+ }
+
+ public String getClassifyId() {
+ return classifyId;
+ }
+
+ public void setClassifyId(String classifyId) {
+ this.classifyId = classifyId;
+ }
+
+ public String getClassifyName() {
+ return classifyName;
+ }
+
+ public void setClassifyName(String classifyName) {
+ this.classifyName = classifyName;
+ }
+
+ public String getBtmOid() {
+ return btmOid;
+ }
+
+ public void setBtmOid(String btmOid) {
+ this.btmOid = btmOid;
+ }
+
+ public String getBtmId() {
+ return btmId;
+ }
+
+ public void setBtmId(String btmId) {
+ this.btmId = btmId;
+ }
+
+ public String getUniqueCode() {
+ return uniqueCode;
+ }
+
+ public void setUniqueCode(String uniqueCode) {
+ this.uniqueCode = uniqueCode;
+ }
+
+ public String getSendType() {
+ return sendType;
+ }
+
+ public void setSendType(String sendType) {
+ this.sendType = sendType;
+ }
+
+ public String getSendTypeText() {
+ return sendTypeText;
+ }
+
+ public void setSendTypeText(String sendTypeText) {
+ this.sendTypeText = sendTypeText;
+ }
+
+ public String getSendFlag() {
+ return sendFlag;
+ }
+
+ public void setSendFlag(String sendFlag) {
+ this.sendFlag = sendFlag;
+ }
+
+ public String getSendFlagText() {
+ return sendFlagText;
+ }
+
+ public void setSendFlagText(String sendFlagText) {
+ this.sendFlagText = sendFlagText;
+ }
+
+ public String getDataOid() {
+ return dataOid;
+ }
+
+ public void setDataOid(String dataOid) {
+ this.dataOid = dataOid;
+ }
+
@Override
public String toString() {
return "DockingTaskVO{" +
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/pushData.json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/pushData.json
new file mode 100644
index 0000000..be1085d
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/pushData.json
@@ -0,0 +1,122 @@
+{
+ "data": {
+ "object": {
+ "code": "02010200028",
+ "status": "Released",
+ "library": "wupin",
+ "classCode": "020102",
+ "pro": [
+ {
+ "filedName": "xiaoshouwl",
+ "outname": "閿�鍞墿鏂�",
+ "filedValue": "false"
+ },
+ {
+ "filedName": "xinghaoguige",
+ "outname": "瑙勬牸鍨嬪彿",
+ "filedValue": ""
+ },
+ {
+ "filedName": "createtime",
+ "outname": "鍒涘缓鏃堕棿",
+ "filedValue": ""
+ },
+ {
+ "filedName": "creator",
+ "outname": "鍒涘缓浜�",
+ "filedValue": "weidy"
+ },
+ {
+ "filedName": "lastmodifier",
+ "outname": "鏈�鍚庝慨鏀逛汉",
+ "filedValue": ""
+ },
+ {
+ "filedName": "secondfl",
+ "outname": "浜岀骇绠＄悊鍒嗙被",
+ "filedValue": "鍒嗙被鏍戜笂娌℃湁灞傜骇[none]"
+ },
+ {
+ "filedName": "caigouwl",
+ "outname": "閲囪喘鐗╂枡",
+ "filedValue": "false"
+ },
+ {
+ "filedName": "tuhao",
+ "outname": "鍥惧彿",
+ "filedValue": "TH-0033"
+ },
+ {
+ "filedName": "kucunwl",
+ "outname": "搴撳瓨鐗╂枡",
+ "filedValue": "false"
+ },
+ {
+ "filedName": "shifoupihaoguanli",
+ "outname": "鏄惁鎵瑰彿绠＄悊",
+ "filedValue": "false"
+ },
+ {
+ "filedName": "thrifl",
+ "outname": "涓夌骇绠＄悊鍒嗙被",
+ "filedValue": "鍒嗙被鏍戜笂娌℃湁灞傜骇[none]"
+ },
+ {
+ "filedName": "revisionvalue",
+ "outname": "鐗堟湰",
+ "filedValue": ""
+ },
+ {
+ "filedName": "firstfl",
+ "outname": "涓�绾х鐞嗗垎绫�",
+ "filedValue": "鍒嗙被鏍戜笂娌℃湁灞傜骇[none]"
+ },
+ {
+ "filedName": "chukufangshi",
+ "outname": "鍑哄簱鏂瑰紡",
+ "filedValue": "鍏堣繘鍏堝嚭"
+ },
+ {
+ "filedName": "hesuanfenlei",
+ "outname": "鏍哥畻鍒嗙被",
+ "filedValue": ""
+ },
+ {
+ "filedName": "jiliangdw",
+ "outname": "璁￠噺鍗曚綅",
+ "filedValue": ""
+ },
+ {
+ "filedName": "oldcode",
+ "outname": "鍘嗗彶缂栧彿",
+ "filedValue": ""
+ },
+ {
+ "filedName": "materialclassify",
+ "outname": "鐗╂枡鍒嗙被",
+ "filedValue": "020102"
+ },
+ {
+ "filedName": "id",
+ "outname": "浠ｅ彿",
+ "filedValue": "02010200028"
+ },
+ {
+ "filedName": "morengongys",
+ "outname": "渚涘簲鍟�",
+ "filedValue": ""
+ },
+ {
+ "filedName": "lcstatus",
+ "outname": "鐘舵��",
+ "filedValue": "Released"
+ },
+ {
+ "filedName": "zuixiaoqiding",
+ "outname": "鏈�灏忚捣璁㈤噺",
+ "filedValue": ""
+ }
+ ]
+ }
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/pushData.xml b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/pushData.xml
new file mode 100644
index 0000000..b95f145
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/attrmap/pushData.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<data>
+ <object code="02010200028" status="Released" library="wupin" classCode="020102">
+ <pro filedName="xiaoshouwl" outname="閿�鍞墿鏂�" filedValue="false"/>
+ <pro filedName="xinghaoguige" outname="瑙勬牸鍨嬪彿" filedValue=""/>
+ <pro filedName="createtime" outname="鍒涘缓鏃堕棿" filedValue=""/>
+ <pro filedName="creator" outname="鍒涘缓浜�" filedValue="weidy"/>
+ <pro filedName="lastmodifier" outname="鏈�鍚庝慨鏀逛汉" filedValue=""/>
+ <pro filedName="secondfl" outname="浜岀骇绠＄悊鍒嗙被" filedValue="鍒嗙被鏍戜笂娌℃湁灞傜骇[none]"/>
+ <pro filedName="caigouwl" outname="閲囪喘鐗╂枡" filedValue="false"/>
+ <pro filedName="tuhao" outname="鍥惧彿" filedValue="TH-0033"/>
+ <pro filedName="kucunwl" outname="搴撳瓨鐗╂枡" filedValue="false"/>
+ <pro filedName="shifoupihaoguanli" outname="鏄惁鎵瑰彿绠＄悊" filedValue="false"/>
+ <pro filedName="thrifl" outname="涓夌骇绠＄悊鍒嗙被" filedValue="鍒嗙被鏍戜笂娌℃湁灞傜骇[none]"/>
+ <pro filedName="revisionvalue" outname="鐗堟湰" filedValue=""/>
+ <pro filedName="firstfl" outname="涓�绾х鐞嗗垎绫�" filedValue="鍒嗙被鏍戜笂娌℃湁灞傜骇[none]"/>
+ <pro filedName="chukufangshi" outname="鍑哄簱鏂瑰紡" filedValue="鍏堣繘鍏堝嚭"/>
+ <pro filedName="hesuanfenlei" outname="鏍哥畻鍒嗙被" filedValue=""/>
+ <pro filedName="jiliangdw" outname="璁￠噺鍗曚綅" filedValue=""/>
+ <pro filedName="oldcode" outname="鍘嗗彶缂栧彿" filedValue=""/>
+ <pro filedName="materialclassify" outname="鐗╂枡鍒嗙被" filedValue="020102"/>
+ <pro filedName="id" outname="浠ｅ彿" filedValue="02010200028"/>
+ <pro filedName="morengongys" outname="渚涘簲鍟�" filedValue=""/>
+ <pro filedName="lcstatus" outname="鐘舵��" filedValue="Released"/>
+ <pro filedName="zuixiaoqiding" outname="鏈�灏忚捣璁㈤噺" filedValue=""/>
+ </object>
+</data>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
index 976d92a..97f1620 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -244,7 +244,7 @@
}
if(dockingTask_insert.size()!=0) {
-// dockingTaskService.saveBatch(dockingTask_insert);
+ dockingTaskService.saveBatch(dockingTask_insert);
}
//dockingTaskDaoI.updateByPrimaryKey鏂规硶鎶ラ敊浜嗭紝鎵�浠ユ墜鍐欎簡杩欎釜
boolean u = updateDockingDatasSendFlag(dataoid,SEND_FLAG_TRUE);
@@ -360,8 +360,10 @@
});
//鏌ヨ鎺ㄩ�佹帴鍙ｅ弬鏁�
DockingSystemConfig dockingSystemConfig = dockingSystemConfigService.getById(systeminfooid);
-
- boolean isGroupCodeFlage= dockingSystemConfig.getIsGroupCodeFlag().equals("true")?true:false;
+ boolean isGroupCodeFlage=false;
+ if(dockingSystemConfig!=null) {
+ isGroupCodeFlage = StringUtils.isBlank(dockingSystemConfig.getIsGroupCodeFlag())?false: Boolean.getBoolean(dockingSystemConfig.getIsGroupCodeFlag());
+ }
if(isGroupCodeFlage){
code=data.getOrDefault("groupcode","");
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
index 0507011..646d483 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
@@ -32,6 +32,12 @@
private IDockingLogeService dockingLogeService;
/***
+ * 闆嗘垚浠诲姟鏈嶅姟
+ */
+ @Autowired( required = false)
+ private IDockingTaskService dockingTaskService;
+
+ /***
* 闆嗘垚鎺ュ彛澶村崗璁湇鍔�
*/
@Autowired( required = false)
@@ -54,8 +60,7 @@
*/
@Override
public IPage<DockingTaskVO> gridDockingTask(DockingTask dockingTask, Query query) {
- IPage<DockingTask> pages=null;
-// IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask));
+ IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask));
return DockingTaskWrapper.build().pageVO(pages);
}
--
Gitblit v1.9.3