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;
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、风格
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index b2c926e70..197a09f97 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/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";
}
}
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