From 975c04c0181b3da82a79cb04abe6a2f1799eb363 Mon Sep 17 00:00:00 2001
From: hjg <hjg@123.com>
Date: 星期三, 22 十一月 2023 17:33:04 +0800
Subject: [PATCH] 科技LED、公司简称
---
JavaSource/com/mandi/fendan/service/impl/Fd_CompanyService.java | 1 +
JavaSource/com/mandi/fendan/util/Contants.java | 2 +-
JavaSource/com/mandi/fendan/mapper/Fd_CompanyMapper.java | 4 ++--
JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java | 2 +-
JavaSource/com/mandi/fendan/persist/Fd_Company.java | 11 +++++++++--
JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java | 9 +++++----
6 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/JavaSource/com/mandi/fendan/mapper/Fd_CompanyMapper.java b/JavaSource/com/mandi/fendan/mapper/Fd_CompanyMapper.java
index df4d6f9..7e05efe 100644
--- a/JavaSource/com/mandi/fendan/mapper/Fd_CompanyMapper.java
+++ b/JavaSource/com/mandi/fendan/mapper/Fd_CompanyMapper.java
@@ -27,9 +27,9 @@
@Delete("delete from fd_company where companyNo=#{companyNo}")
public int delByCompanyNo(String companyNo);
- @Update("update fd_company set cname=#{cname},companyNo=#{companyNo},ctime=#{ctime},hdpinyin=#{hdpinyin},name=#{name},note=#{note},pinyin=#{pinyin},hasSPR=#{hasSPR} where id=#{id} ")
+ @Update("update fd_company set cname=#{cname},companyNo=#{companyNo},ctime=#{ctime},hdpinyin=#{hdpinyin},name=#{name},shortName=#{shortName},note=#{note},pinyin=#{pinyin},hasSPR=#{hasSPR} where id=#{id} ")
public int update(Fd_Company fd_company);
- @Insert("insert into fd_company (id,cname,companyNo,ctime,hdpinyin,name,note,pinyin,hasSPR) values (#{id},#{cname},#{companyNo},#{ctime},#{hdpinyin},#{name},#{note},#{pinyin},#{hasSPR})")
+ @Insert("insert into fd_company (id,cname,companyNo,ctime,hdpinyin,name,shortName,note,pinyin,hasSPR) values (#{id},#{cname},#{companyNo},#{ctime},#{hdpinyin},#{name},#{shortName},#{note},#{pinyin},#{hasSPR})")
public int insert(Fd_Company fd_company);
/**
diff --git a/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java b/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
index b056fd7..12ae025 100644
--- a/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
+++ b/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
@@ -173,7 +173,7 @@
" when x.firstgbtime is not null then '寰呰' else '瀹屾垚' end zcStatus " ,
" from xs_taskmonitor x" ,
" join bussinesssheet bs on x.businessNo=bs.bussinessNo and bs.sstatus='鍦ㄥ姙' " ,
- " where sdepartNo=#{sdepartNo} and firstgbtime is not null and x.lastgbtime is null "
+ " where sdepartNo=#{sdepartNo} and firstgbtime is not null and x.lastgbtime is null order by jctime"
})
public List<Map> yRZcList(String sdepartNo);
diff --git a/JavaSource/com/mandi/fendan/persist/Fd_Company.java b/JavaSource/com/mandi/fendan/persist/Fd_Company.java
index eca5f9a..a075249 100644
--- a/JavaSource/com/mandi/fendan/persist/Fd_Company.java
+++ b/JavaSource/com/mandi/fendan/persist/Fd_Company.java
@@ -22,6 +22,7 @@
@Id
private String id;
private String cname;
+ private String shortName;
private String companyNo;
@Temporal(TemporalType.TIMESTAMP)
private Date ctime;
@@ -84,6 +85,12 @@
public void setHasSPR(boolean hasSPR) {
this.hasSPR = hasSPR;
}
-
-
+
+ public String getShortName() {
+ return shortName;
+ }
+
+ public void setShortName(String shortName) {
+ this.shortName = shortName;
+ }
}
diff --git a/JavaSource/com/mandi/fendan/service/impl/Fd_CompanyService.java b/JavaSource/com/mandi/fendan/service/impl/Fd_CompanyService.java
index 218fc8a..9fb0b07 100644
--- a/JavaSource/com/mandi/fendan/service/impl/Fd_CompanyService.java
+++ b/JavaSource/com/mandi/fendan/service/impl/Fd_CompanyService.java
@@ -155,6 +155,7 @@
c1.setCompanyNo(c.getCompanyNo());
c1.setHasSPR(c.isHasSPR());
c1.setName(c.getName());
+ c1.setShortName(c.getShortName());
cmper.update(c1);
this.cmper.delCYnexus(c.getCompanyNo());
orr.setItem(c1);
diff --git a/JavaSource/com/mandi/fendan/util/Contants.java b/JavaSource/com/mandi/fendan/util/Contants.java
index 409a2df..897fe38 100644
--- a/JavaSource/com/mandi/fendan/util/Contants.java
+++ b/JavaSource/com/mandi/fendan/util/Contants.java
@@ -51,7 +51,7 @@
//鏈夊彲鑳藉彉鍔ㄧ殑鍙橀噺锛屽垏璁颁笉瑕佸啓鎴恌inal浜嗭紝鍚﹀垯甯搁噺鍊肩紪璇戝埌鏂囦欢閲岄潰浜嗭紱閬囧埌涓�涓猣inal鐨勯棶棰橈紝鏇挎崲閰嶇疆鏂囦欢鏃犳晥锛屽緢閮侀椃锛屽師鏉ユ槸杩欓噷瀵艰嚧鐨勯棶棰橈紱鑱槑鍙嶈鑱槑璇紱
public static String msLedServiceAddr= "http://10.22.12.104:8080/APPService.asmx"; // 鏄庢櫉瑁呰溅 ABC鍖篖ED webservice
public static String yr_zcLedUrl = "http://10.4.12.97:8080/APPService.asmx"; // 涔夌憺LED 瑁呰溅 webservice
- public static String kj_zcLedUrl = "http://10.3.5.16:8080/APPService.asmx"; // 涔夌憺LED 瑁呰溅 webservice
+ public static String kj_zcLedUrl = "http://10.3.5.55:8088/APPService.asmx"; // 涔夌憺LED 瑁呰溅 webservice
//鍒嗗崟鍥炲啓nc绯荤粺娴嬭瘯鍦板潃
// public static String NCfdhx_url = "http://10.0.13.20:9090/api/Domain/mtcesb/servlet/PubAPIServlet";
diff --git a/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java b/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
index 6582071..ee76ae9 100644
--- a/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
+++ b/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
@@ -633,9 +633,10 @@
if("08".equals(fdb.getSdepartNo())) {
final String cph = currPch;
ThreadPoolUtil.getInstance().execute(()->{
- Map scanCodeParamMap = new HashMap();
+ // 杩欎釜鍦版柟涓嶅啀璇锋眰
+ /*Map scanCodeParamMap = new HashMap();
scanCodeParamMap.put("pch",cph);
- Wxhtmethod.post(Contants.yr_scanCodeNoticeUrl, scanCodeParamMap);
+ Wxhtmethod.post(Contants.yr_scanCodeNoticeUrl, scanCodeParamMap);*/
try {
synchronized (FdXSTDService.refreshYrLedLock) {
if (FdXSTDService.refreshYrLedLock) { // 绯荤粺绻佸繖
@@ -934,8 +935,8 @@
Map paramMap = new HashMap();
paramMap.put("strTitle",strTitle);
paramMap.put("strContent",strContent);
- Wxhtmethod.post(Contants.kj_zcLedUrl + "/SendLED",paramMap);
- log.info("kj_zcLedUrl: " + Contants.kj_zcLedUrl + ";title:" + strTitle + ",content:" + strContent);
+ String re = Wxhtmethod.post(Contants.kj_zcLedUrl + "/SendLED",paramMap);
+ log.info("鍥炲锛�" + re +";kj_zcLedUrl: " + Contants.kj_zcLedUrl + ";title:" + strTitle + ",content:" + strContent);
}
String fillWithZero(int str){
--
Gitblit v1.9.3