From 1f58397c76098fcbe8cf766ea3325d14708de10b Mon Sep 17 00:00:00 2001 From: zhanglei Date: Tue, 25 May 2021 17:08:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=96=9C=E7=9B=B8=E9=80=A2=E7=94=B5?= =?UTF-8?q?=E5=AD=90=E7=AD=BE=E7=BA=A6=E9=87=8D=E5=8F=91=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../util/KHSQContractSignActionTwoUtil.java | 46 ++++++++++++++----- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/src/com/tenwa/app/manage/util/KHSQContractSignActionTwoUtil.java b/src/com/tenwa/app/manage/util/KHSQContractSignActionTwoUtil.java index deb2073d3..3a7851fa7 100644 --- a/src/com/tenwa/app/manage/util/KHSQContractSignActionTwoUtil.java +++ b/src/com/tenwa/app/manage/util/KHSQContractSignActionTwoUtil.java @@ -9,6 +9,8 @@ import java.util.List; import java.util.Map; import java.util.ResourceBundle; +import com.qiyuesuo.sdk.v2.utils.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -555,17 +557,37 @@ public class KHSQContractSignActionTwoUtil { } return "合同下载成功！"; } - - public String messageSend(String subjectId,Long signContractId){ - SdkClient client = this.getSdkClient(subjectId); - ContractNoticeRequest request = new ContractNoticeRequest(signContractId); - String response = client.service(request); - SdkResponse responseObj = JSONUtils.toQysResponse(response); - if(responseObj.getCode() == 0) { - return "success"; - } else { - System.out.println("短信重发失败："+responseObj.getCode()+":"+responseObj.getMessage()); - return responseObj.getMessage(); - } + + /** + * 合同催签 + * @param subjectId + * @param signContractId + * @return + */ + public String messageSend(String subjectId,Long signContractId) throws Exception{ + Contract contract = this.getContract(subjectId, signContractId).getResult(); + logger.info("messageSend#20210521 查询合同信息 contract=" + JSONUtils.toJson(contract)); + if("COMPLETE".equals(contract.getStatus())){ + logger.info("messageSend#20210521 查询合同信息已签约完成。"); + return "success"; + } + List signatories = contract.getSignatories(); + if(CollectionUtils.isNotEmpty(signatories)) { + SdkClient client = this.getSdkClient(subjectId); + for (Signatory signatory : signatories) { + if (StringUtils.isNotEmpty(signatory.getTenantType()) && "PERSONAL".equals(signatory.getTenantType()) + && StringUtils.isNotEmpty(signatory.getStatus()) && "SIGNING".equals(signatory.getStatus())) { + logger.info("messageSend#20210521 当前客户状态签署中，重新发送短信。signatory=" + JSONUtils.toJson(signatory)); + ContractNoticeRequest request = new ContractNoticeRequest(signContractId); + request.setSigantoryId(signatory.getId()); + String response = client.service(request); + SdkResponse responseObj = JSONUtils.toQysResponse(response); + logger.info("messageSend#20210521 重新发送短信返回。response=" + response); + logger.info("messageSend#20210521 重新发送短信返回。response=" + +responseObj.getCode()+":"+responseObj.getMessage()); + + } + } + } + return "success"; } } From 7bfc6eb6f168d33b1bb1cabf79112ff956144db3 Mon Sep 17 00:00:00 2001 From: ap007 Date: Wed, 26 May 2021 15:12:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0alt+7=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Frame/page/js/as_debug.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/WebContent/Frame/page/js/as_debug.js b/WebContent/Frame/page/js/as_debug.js index abe81a6d4..64019afe2 100644 --- a/WebContent/Frame/page/js/as_debug.js +++ b/WebContent/Frame/page/js/as_debug.js @@ -121,8 +121,8 @@ var AsDebug = { }, reloadCache:function(CacheType){ var sReturn = RunJavaMethod("com.amarsoft.app.util.ReloadCacheConfigAction","reloadCache","ConfigName="+CacheType); - if(sReturn=="SUCCESS") alert( "重载模板缓存成功"); // 刷新参数缓存成功！ - else alert( "重载模板缓存失败" ); // 刷新参数缓存失败！ + if(sReturn=="SUCCESS") alert( "重载"+CacheType+"成功"); // 刷新参数缓存成功！ + else alert( "重载"+CacheType+"失败" ); // 刷新参数缓存失败！ }, /** * 重置自定义类型的缓存 @@ -233,6 +233,9 @@ function keydownAction(event){ }else if(event.altKey && event.keyCode == 53){ //alt+5 清空模板缓存 AsDebug.reloadCache('ObjectWindow缓存'); return true; + }else if(event.altKey && event.keyCode == 55){ + AsDebug.reloadCache('菜单'); + return true; } else if ( event.altKey && event.keyCode === 56 ) { //alt+8 清空产品缓存 by zhulh AsDebug.reloadCacheCustom('产品参数,核算交易定义' ); return true; From 80ae6a4b576db05889a868b5cde4728c6e14d6d8 Mon Sep 17 00:00:00 2001 From: gityjf <2211675158@qq.com> Date: Tue, 1 Jun 2021 09:36:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/ProductManage/ProductConfig/ProductCatalogList.jsp | 2 +- WebContent/ProductManage/ProductsBusinessList.jsp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WebContent/ProductManage/ProductConfig/ProductCatalogList.jsp b/WebContent/ProductManage/ProductConfig/ProductCatalogList.jsp index f2e399ec6..e4eb1367a 100644 --- a/WebContent/ProductManage/ProductConfig/ProductCatalogList.jsp +++ b/WebContent/ProductManage/ProductConfig/ProductCatalogList.jsp @@ -8,7 +8,7 @@ ASObjectModel doTemp = new ASObjectModel("PRD_ProductCatalogList"); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //设置为Grid风格 - dwTemp.setPageSize(20); + dwTemp.setPageSize(pageSize==null?20:Integer.parseInt(pageSize)); dwTemp.setParameter("SortNo", sortNo+"%"); dwTemp.genHTMLObjectWindow(""); String flag="false"; diff --git a/WebContent/ProductManage/ProductsBusinessList.jsp b/WebContent/ProductManage/ProductsBusinessList.jsp index 85cf9b11a..1991b7109 100644 --- a/WebContent/ProductManage/ProductsBusinessList.jsp +++ b/WebContent/ProductManage/ProductsBusinessList.jsp @@ -9,7 +9,7 @@ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "1"; //只读模式 - dwTemp.setPageSize(10); + dwTemp.setPageSize(pageSize==null?10:Integer.parseInt(pageSize)); dwTemp.genHTMLObjectWindow(""); //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 From 8d81e5969f3834b73dc313138d1471f1195b42da Mon Sep 17 00:00:00 2001 From: ap007 Date: Wed, 2 Jun 2021 09:58:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=82=AE=E5=82=A8=E8=B5=84=E6=96=B9JBO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 5 +++++ src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO.java | 4 ++++ src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_HIS.java | 4 ++++ src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_TEMP.java | 4 ++++ src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO.java | 4 ++++ src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO_TEMP.java | 4 ++++ 6 files changed, 25 insertions(+) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index 954f30099..b0fb7833e 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -143,6 +143,7 @@ + @@ -292,6 +293,7 @@ + @@ -805,6 +807,7 @@ + @@ -1076,6 +1079,7 @@ + @@ -2812,6 +2816,7 @@ + diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO.java index 55fb1ff49..8ce98454d 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO.java @@ -341,4 +341,8 @@ public interface LB_CONTRACT_INFO{ * 中车合同号 STRING(32)
*/ public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER"; + /** + * 资方名称 STRING(10)
+ */ + public static final String CORPUS_SOURCE = "CORPUS_SOURCE"; } \ No newline at end of file diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_HIS.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_HIS.java index b8998ed78..9b6b12fa0 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_HIS.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_HIS.java @@ -329,4 +329,8 @@ public interface LB_CONTRACT_INFO_HIS{ * 中车合同号 STRING(32)
*/ public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER"; + /** + * 资方名称 STRING(10)
+ */ + public static final String CORPUS_SOURCE = "CORPUS_SOURCE"; } \ No newline at end of file diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_TEMP.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_TEMP.java index 1bcb44c02..bae40922b 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_TEMP.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_TEMP.java @@ -333,4 +333,8 @@ public interface LB_CONTRACT_INFO_TEMP{ * 中车合同号 STRING(32)
*/ public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER"; + /** + * 资方名称 STRING(10)
+ */ + public static final String CORPUS_SOURCE = "CORPUS_SOURCE"; } \ No newline at end of file diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO.java index 54d0297fd..023036b35 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO.java @@ -265,4 +265,8 @@ public interface LB_PROJECT_INFO{ * 中车合同号 STRING(32)
*/ public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER"; + /** + * 资方名称 STRING(10)
+ */ + public static final String CORPUS_SOURCE = "CORPUS_SOURCE"; } \ No newline at end of file diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO_TEMP.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO_TEMP.java index 729e815a0..ee7bece3d 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO_TEMP.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO_TEMP.java @@ -265,4 +265,8 @@ public interface LB_PROJECT_INFO_TEMP{ * 中车合同号 STRING(32)
*/ public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER"; + /** + * 资方名称 STRING(10)
+ */ + public static final String CORPUS_SOURCE = "CORPUS_SOURCE"; } \ No newline at end of file