diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
index c117dfe68..48d5a1f7d 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp
@@ -106,6 +106,8 @@
doTemp.setReadOnly("FRAME_NUMBER2",false);
doTemp.setReadOnly("FRAME_NUMBER3",false);
doTemp.setReadOnly("FRAME_NUMBER4",false);
+ doTemp.setReadOnly("FRAME_BRAND",false);
+ doTemp.setReadOnly("FRAME_COLOR",false);
//第一车贷产品可以修改其他配置说明
if("DYCD".equals(operationType)){
doTemp.setReadOnly("MEMO",false);
diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp
index bf4d775d4..636860b48 100644
--- a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp
@@ -90,6 +90,6 @@
getObj(0,i,"CUSTOMER_NAME").innerHTML=''+getObj(0,i,"CUSTOMER_NAME").innerHTML+'';
}
}
- afterSearch();
+ //afterSearch();
<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/beforeApplication/BeforeApplicationConfigInfo.jsp b/WebContent/Tenwa/beforeApplication/BeforeApplicationConfigInfo.jsp
index 40966aecc..d89b34b3f 100644
--- a/WebContent/Tenwa/beforeApplication/BeforeApplicationConfigInfo.jsp
+++ b/WebContent/Tenwa/beforeApplication/BeforeApplicationConfigInfo.jsp
@@ -17,7 +17,7 @@
dwTemp.genHTMLObjectWindow(CurPage.getParameter("id"));
String sButtons[][] = {
- {"true","All","Button","保存","保存所有修改","as_save(0,returnList())","","","",""},
+ {"true","All","Button","保存","保存所有修改","as_save(0)","","","",""},
{"true","All","Button","返回","返回列表","returnList()","","","",""}
};
//sButtonPosition = "south";
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/LibraryDocUploadServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/LibraryDocUploadServiceImpl.java
index 4568e8617..95b135525 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/LibraryDocUploadServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/LibraryDocUploadServiceImpl.java
@@ -1,5 +1,6 @@
package apx.com.amarsoft.als.apzl.apply.business.doc.upload.service.impl;
+import java.awt.image.BufferedImage;
import java.io.DataOutputStream;
import java.io.File;
import java.io.FileOutputStream;
@@ -8,6 +9,7 @@ import java.net.URLDecoder;
import java.util.List;
import java.util.Map;
+import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -36,6 +38,9 @@ public class LibraryDocUploadServiceImpl implements LibraryDocUploadService {
ReturnMapUtil ReturnMapUtil) throws Exception {
Map testMap = (Map) MultipartDataUtil
.readRequestParam(request, "UTF-8");
+ System.out.println("=============文件上传参数================================");
+ System.out.println(testMap.toString());
+ System.out.println("=======================================");
fieldMap = (Map) testMap.get("fieldMap"); // 参数
fileList = (List>) testMap.get("fileList"); // 资料列表
String applyType = fieldMap.get("applytype") == null ? "" : fieldMap.get(
@@ -69,7 +74,6 @@ public class LibraryDocUploadServiceImpl implements LibraryDocUploadService {
}
library.setAttributeValue("Remark", remark);
tx.join(libraryManage);
- libraryManage.saveObject(library);
@SuppressWarnings("deprecation")
Configure CurConfig = Configure.getInstance();
BizObjectManager attrBm=JBOFactory.getBizObjectManager("jbo.app.tenwa.doc.LB_DOCATTRIBUTE",tx);
@@ -106,13 +110,20 @@ public class LibraryDocUploadServiceImpl implements LibraryDocUploadService {
String sFilePath = sFullPath.replace(sFileSavePath, "");
attr.setAttributeValue("FilePath",sFilePath);
attr.setAttributeValue("FullPath",sFullPath);
- attr.setAttributeValue("Content_Type", file.get("fileContentType"));
+ attr.setAttributeValue("Content_Type", isImage(f,file.get("fileContentType")));
attr.setAttributeValue("FileSize", file.get("fileSize"));
attrBm.saveObject(attr);
+ library.setAttributeValue("BUSINESS_CHECK", "DocCheck_0");
}
-
+ libraryManage.saveObject(library);
ReturnMapUtil.setReturnMap(null, RestfullConstant.baseProperty.get("success").toString(), "");
return ReturnMapUtil.getReturnMap();
}
-
+ public Object isImage(File file,Object object) throws Exception{
+ BufferedImage bi = ImageIO.read(file);
+ if(bi==null){
+ return object;
+ }
+ return "image/jpeg";
+ }
}
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/service/Impl/FlowDataServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/service/Impl/FlowDataServiceImpl.java
index e4f49db74..8ad483288 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/service/Impl/FlowDataServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/service/Impl/FlowDataServiceImpl.java
@@ -186,6 +186,9 @@ public class FlowDataServiceImpl implements FlowDataService{
throws Exception {
Map testMap = (Map) MultipartDataUtil
.readRequestParam(request, "UTF-8");
+ System.out.println("=======合同制作扣款卡保存参数========");
+ System.out.println(testMap);
+ System.out.println("====================");
fieldMap = (Map) testMap.get("fieldMap"); // 参数
Map body = new HashMap();
String projectId = fieldMap.get("project_id") == null ? "" : fieldMap.get("project_id").toString();
@@ -277,13 +280,14 @@ public class FlowDataServiceImpl implements FlowDataService{
String flowunid = fieldMap.get("flowunid") == null ? "" : fieldMap.get("flowunid").toString();
Map flowParms = ContractMakeControllerUtil.getFlowParms(flowunid);
String projectId = flowParms.get("ProjectId");
+ String projectNo = flowParms.get("ProjectNo");
BizObjectManager lectManage = JBOFactory.getFactory().getManager(LB_EQUIPMENT_CAR_TEMP.CLASS_NAME);
BizObject lect = lectManage.createQuery(" FLOWUNID=:FlowUnid ").setParameter("FlowUnid", flowunid).getSingleResult(false);
String distributor_id = sqlca.getString("select distributor_id from lb_project_info where id='"+projectId+"'");//获取经销商ID
BizObjectManager lgtManage = JBOFactory.getFactory().getManager(LM_GPS_ORDER_TEMP.CLASS_NAME);
- BizObject lgt = lgtManage.createQuery(" flowunid=:flowunid ").setParameter("flowunid", flowunid).getSingleResult(false);
+ BizObject lgt = lgtManage.createQuery(" APPLY_NO=:APPLY_NO ").setParameter("APPLY_NO", projectNo).getSingleResult(false);
if(lgt == null){
diff --git a/src_app_fresh/apx/com/amarsoft/als/business/action/submit/service/impl/FlowActionCommitServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/business/action/submit/service/impl/FlowActionCommitServiceImpl.java
index 84a733e0a..1c9312708 100644
--- a/src_app_fresh/apx/com/amarsoft/als/business/action/submit/service/impl/FlowActionCommitServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/business/action/submit/service/impl/FlowActionCommitServiceImpl.java
@@ -72,6 +72,9 @@ public class FlowActionCommitServiceImpl implements FlowActionCommitService {
Map testMap = (Map) MultipartDataUtil
.readRequestParam(request, "UTF-8");
+ System.out.println("=======提交参数========");
+ System.out.println(testMap);
+ System.out.println("====================");
this.fieldMap = (Map) testMap.get("fieldMap");
String type = this.fieldMap.get("submittype") == null ? ""
diff --git a/src_sql/鎶曚骇SQL/V20200521/tft_20200521.sql b/src_sql/鎶曚骇SQL/V20200521/tft_20200521.sql
index 82e981ff2..16070f70b 100644
--- a/src_sql/鎶曚骇SQL/V20200521/tft_20200521.sql
+++ b/src_sql/鎶曚骇SQL/V20200521/tft_20200521.sql
@@ -380,7 +380,12 @@ Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualn
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BeforeApplicationConfigInfo','0130','0130','1','O','updateorgid','updateorgid','String','','登记部门','','1','Text','1','1','','','','100','0','0','0','1','0',0,'','','','SYS_Designer','2020/07/04 10:47:39','SYS_Designer','2020/07/04 11:14:25','','','1','','','','');
Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BeforeApplicationConfigInfo','0140','0140','1','O','updatetime','updatetime','String','','登记时间','','1','Text','1','1','','','','100','0','0','0','1','0',0,'','','','SYS_Designer','2020/07/04 10:47:39','SYS_Designer','2020/07/04 11:14:25','','','1','','','','');
-
+-- app提交到经销复审，添加风险预警校验
+Insert Into SCENARIO_RELATIVE (scenarioid,groupid,modelid) Values ('业务申请流程','0020','0112');
+Insert Into SCENARIO_RELATIVE (scenarioid,groupid,modelid) Values ('业务申请流程','0020','0122');
+Insert Into SCENARIO_RELATIVE (scenarioid,groupid,modelid) Values ('业务申请流程','0020','0132');
+Insert Into SCENARIO_RELATIVE (scenarioid,groupid,modelid) Values ('业务申请流程','0020','0142');
+Insert Into SCENARIO_RELATIVE (scenarioid,groupid,modelid) Values ('业务申请流程','0020','0152');