From 8676413693275fa7c8ba77263fb413198d3e56e7 Mon Sep 17 00:00:00 2001
From: Administrator <hbal>
Date: 星期五, 10 三月 2023 09:19:04 +0800
Subject: [PATCH] 增加字段committime
---
JavaSource/com/mandi/fendan/mapper/xmls/Fd_XSTDMapper.xml | 2 +-
JavaSource/com/mandi/fendan/util/persist/WaitXSTD.java | 9 +++++++++
JavaSource/applicationcontext.xml | 15 +++++++--------
JavaSource/com/mandi/fendan/service/impl/ErpService.java | 1 +
4 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/JavaSource/applicationcontext.xml b/JavaSource/applicationcontext.xml
index 6e05d72..13218fd 100644
--- a/JavaSource/applicationcontext.xml
+++ b/JavaSource/applicationcontext.xml
@@ -24,17 +24,16 @@
<bean id="hikari" class="com.zaxxer.hikari.HikariDataSource">
<property name="driverClassName" value="net.sourceforge.jtds.jdbc.Driver" />
- <property name="jdbcUrl" value="jdbc:jtds:sqlserver://10.1.1.9:1433;databaseName=goblin_test" />
+ <!--<property name="jdbcUrl" value="jdbc:jtds:sqlserver://10.1.1.9:1433;databaseName=IPASS" />
<property name="username" value="sa" />
- <property name="password" value="mingtai@80565" />
- <!--<property name="jdbcUrl"
- value="jdbc:jtds:sqlserver://127.0.0.1:1433;databaseName=goblin" />
- <property name="username" value="sa" />
- <property name="password" value="123" />-->
- <!--<property name="jdbcUrl"
+ <property name="password" value="mingtai@80565" />-->
+ <!-- <property name="jdbcUrl" value="jdbc:jtds:sqlserver://47.104.255.13;databaseName=goblin_10" />
+ <property name="username" value="goblin" />
+ <property name="password" value="goblin_2021" />-->
+ <property name="jdbcUrl"
value="jdbc:jtds:sqlserver://127.0.0.1:1433;databaseName=goblin" />
<property name="username" value="sa" />
- <property name="password" value="G1veMeP@ss" />-->
+ <property name="password" value="123" />
<property name="readOnly" value="false" />
<property name="connectionTimeout" value="30000" />
<property name="idleTimeout" value="600000" />
diff --git a/JavaSource/com/mandi/fendan/mapper/xmls/Fd_XSTDMapper.xml b/JavaSource/com/mandi/fendan/mapper/xmls/Fd_XSTDMapper.xml
index c53fda2..3feffd6 100644
--- a/JavaSource/com/mandi/fendan/mapper/xmls/Fd_XSTDMapper.xml
+++ b/JavaSource/com/mandi/fendan/mapper/xmls/Fd_XSTDMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.mandi.fendan.mapper.Fd_XSTDMapper">
<sql id="column">
- a.td_bmbh,a.td_bmmc,a.td_bz,a.td_djrq,a.td_fpbh, a.td_jylx, a.td_khbh,a.td_cqNo,
+ a.td_bmbh,a.td_bmmc,a.td_bz,a.td_djrq,a.td_fpbh, a.td_jylx, a.td_khbh,a.td_cqNo,a.committime,
CASE WHEN a.td_fpbh IS NULL THEN b.name WHEN a.td_fpbh= '' THEN b.name
WHEN a.td_ywdybh= '101' THEN '娌冲崡鎶ュ叧' WHEN a.td_ywdybh= '102' THEN '閮戝窞鎶ュ叧' WHEN a.td_ywdybh= '111' THEN '鏄庢櫉鎶ュ叧' WHEN a.td_ywdybh= '114' THEN '涔夌憺鎶ュ叧' ELSE '绉戞妧鎶ュ叧'
END td_khmc,
diff --git a/JavaSource/com/mandi/fendan/service/impl/ErpService.java b/JavaSource/com/mandi/fendan/service/impl/ErpService.java
index 2394b3d..faaed06 100644
--- a/JavaSource/com/mandi/fendan/service/impl/ErpService.java
+++ b/JavaSource/com/mandi/fendan/service/impl/ErpService.java
@@ -1624,6 +1624,7 @@
}
}
} catch (Exception e) {
+ log.error("閿�鍞笟鍔¤溅杈嗗嚭鍘傜▼搴�" + e.getMessage(),e);
throw new Exception(StringUtils.isEmpty(e.getMessage()) ? "閿�鍞笟鍔¤溅杈嗗嚭鍘傜▼搴忓嚭閿欙紒" : e.getMessage());
}
orr.setCode(0);
diff --git a/JavaSource/com/mandi/fendan/util/persist/WaitXSTD.java b/JavaSource/com/mandi/fendan/util/persist/WaitXSTD.java
index 5520b61..afffecc 100644
--- a/JavaSource/com/mandi/fendan/util/persist/WaitXSTD.java
+++ b/JavaSource/com/mandi/fendan/util/persist/WaitXSTD.java
@@ -28,6 +28,15 @@
private String td_cqNo;//涓�鍗￠�氬巶鍖虹紪鍙�
private String timeMinus; //鍒涘缓鏃跺樊
+ private String committime;
+
+ public String getCommittime() {
+ return committime;
+ }
+
+ public void setCommittime(String committime) {
+ this.committime = committime;
+ }
public String getTimeMinus() {
return timeMinus;
--
Gitblit v1.9.3