anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dailyfix' into release20210831

Browse Source
This commit is contained in:
gityjf 2021-06-02 16:19:23 +08:00
commit 79ddcae37c
10 changed files with 66 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
WebContent/Frame/page/js/as_debug.js
View File

@ -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;

2
WebContent/ProductManage/ProductConfig/ProductCatalogList.jsp
View File

@ -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";

2
WebContent/ProductManage/ProductsBusinessList.jsp
View File

@ -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、风格

5
WebContent/WEB-INF/etc/jbo/jbo_lease.xml
View File

@ -143,6 +143,7 @@
<attribute name="CHANNEL" label="渠道" type="STRING" length="32"/>
<attribute name="ZC_PROJECT_NUMBER" label="中车申请号" type="STRING" length="32"/>
<attribute name="ZC_CONTRACT_NUMBER" label="中车合同号" type="STRING" length="32"/>
<attribute name="CORPUS_SOURCE" label="资方名称" type="STRING" length="10"/>
</attributes>
<manager>
<managerProperties>
@ -292,6 +293,7 @@
<attribute name="CHANNEL" label="渠道" type="STRING" length="32"/>
<attribute name="ZC_PROJECT_NUMBER" label="中车申请号" type="STRING" length="32"/>
<attribute name="ZC_CONTRACT_NUMBER" label="中车合同号" type="STRING" length="32"/>
<attribute name="CORPUS_SOURCE" label="资方名称" type="STRING" length="10"/>
</attributes>
<manager>
<managerProperties>
@ -805,6 +807,7 @@
<attribute name="CHANNEL" label="渠道" type="STRING" length="32"/>
<attribute name="ZC_PROJECT_NUMBER" label="中车申请号" type="STRING" length="32"/>
<attribute name="ZC_CONTRACT_NUMBER" label="中车合同号" type="STRING" length="32"/>
<attribute name="CORPUS_SOURCE" label="资方名称" type="STRING" length="10"/>
</attributes>
<manager>
<managerProperties>
@ -1076,6 +1079,7 @@
<attribute name="CHANNEL" label="渠道" type="STRING" length="32"/>
<attribute name="ZC_PROJECT_NUMBER" label="中车申请号" type="STRING" length="32"/>
<attribute name="ZC_CONTRACT_NUMBER" label="中车合同号" type="STRING" length="32"/>
<attribute name="CORPUS_SOURCE" label="资方名称" type="STRING" length="10"/>
</attributes>
<manager>
<managerProperties>
@ -2812,6 +2816,7 @@
<attribute name="CHANNEL" label="渠道" type="STRING" length="32"/>
<attribute name="ZC_PROJECT_NUMBER" label="中车申请号" type="STRING" length="32"/>
<attribute name="ZC_CONTRACT_NUMBER" label="中车合同号" type="STRING" length="32"/>
<attribute name="CORPUS_SOURCE" label="资方名称" type="STRING" length="10"/>
</attributes>
<manager>
<managerProperties>

46
src/com/tenwa/app/manage/util/KHSQContractSignActionTwoUtil.java
View File

@ -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<Signatory> 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";
}
}

4
src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO.java
View File

@ -341,4 +341,8 @@ public interface LB_CONTRACT_INFO{
* 中车合同号 STRING(32)<br>
*/
public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER";
/**
* 资方名称 STRING(10)<br>
*/
public static final String CORPUS_SOURCE = "CORPUS_SOURCE";
}

4
src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_HIS.java
View File

@ -329,4 +329,8 @@ public interface LB_CONTRACT_INFO_HIS{
* 中车合同号 STRING(32)<br>
*/
public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER";
/**
* 资方名称 STRING(10)<br>
*/
public static final String CORPUS_SOURCE = "CORPUS_SOURCE";
}

4
src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_TEMP.java
View File

@ -333,4 +333,8 @@ public interface LB_CONTRACT_INFO_TEMP{
* 中车合同号 STRING(32)<br>
*/
public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER";
/**
* 资方名称 STRING(10)<br>
*/
public static final String CORPUS_SOURCE = "CORPUS_SOURCE";
}

4
src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO.java
View File

@ -265,4 +265,8 @@ public interface LB_PROJECT_INFO{
* 中车合同号 STRING(32)<br>
*/
public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER";
/**
* 资方名称 STRING(10)<br>
*/
public static final String CORPUS_SOURCE = "CORPUS_SOURCE";
}

4
src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO_TEMP.java
View File

@ -265,4 +265,8 @@ public interface LB_PROJECT_INFO_TEMP{
* 中车合同号 STRING(32)<br>
*/
public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER";
/**
* 资方名称 STRING(10)<br>
*/
public static final String CORPUS_SOURCE = "CORPUS_SOURCE";
}