Skip to content

A
apps-collaboration
Commit 767990e2 authored by gaoyingwei's avatar gaoyingwei
Browse files
Options

update:修改传给门户的总价参数

parent 914208af
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 7 deletions
src/main/java/com/seeyon/apps/collaboration/controller/CollaborationController.java
View file @ 767990e2
...@@ -2371,12 +2371,16 @@ public class CollaborationController extends BaseController { ...@@ -2371,12 +2371,16 @@ public class CollaborationController extends BaseController {
FormDataMasterBean master = cap4FormManager.getDataMasterBeanById(formrecordid, formBean, null) ; FormDataMasterBean master = cap4FormManager.getDataMasterBeanById(formrecordid, formBean, null) ;
String namekeytotalprice = master.getFormTable().getFieldMap4Display().get("总价").getName(); String namekeytotalprice = master.getFormTable().getFieldMap4Display().get("总价").getName();
BigDecimal sumprice1 = new BigDecimal("0");
if("XDLC".equals(ctpTemplate.getTempleteNumber())) if("XDLC".equals(ctpTemplate.getTempleteNumber()))
{ {
String zjvalue = request.getParameter("zj"); String zjvalue = request.getParameter("zj");
master.getAllDataMap().put(namekeytotalprice,zjvalue); master.getAllDataMap().put(namekeytotalprice,zjvalue);
//project chengMing add:天津:保存入库 //project chengMing add:天津:保存入库
refreshField(formBean.getMasterTableBean().getTableName(),namekeytotalprice,zjvalue,summary.getFormRecordid()); refreshField(formBean.getMasterTableBean().getTableName(),namekeytotalprice,zjvalue,summary.getFormRecordid());
sumprice1 = new BigDecimal(zjvalue);
}else {
sumprice1 = (BigDecimal)master.getAllDataMap().get(namekeytotalprice);
} }
/*String namekey = master.getFormTable().getFieldMap4Display().get("编号").getName(); /*String namekey = master.getFormTable().getFieldMap4Display().get("编号").getName();
...@@ -2450,15 +2454,16 @@ public class CollaborationController extends BaseController { ...@@ -2450,15 +2454,16 @@ public class CollaborationController extends BaseController {
String namekeyurgent = master.getFormTable().getFieldMap4Display().get("加急").getName(); String namekeyurgent = master.getFormTable().getFieldMap4Display().get("加急").getName();
String urgent = (String)master.getAllDataMap().get(namekeyurgent); String urgent = (String)master.getAllDataMap().get(namekeyurgent);
BigDecimal totalprice = (BigDecimal) master.getAllDataMap().get(namekeytotalprice); // BigDecimal totalprice = (BigDecimal) master.getAllDataMap().get(namekeytotalprice);
String namekeyunitprice = master.getFormTable().getFieldMap4Display().get("单价").getName(); String namekeyunitprice = master.getFormTable().getFieldMap4Display().get("单价").getName();
BigDecimal unitprice = (BigDecimal)master.getAllDataMap().get(namekeyunitprice); BigDecimal unitprice = (BigDecimal)master.getAllDataMap().get(namekeyunitprice);
String remark = master.getFormTable().getFieldMap4Display().get("备注").getName(); String remark = master.getFormTable().getFieldMap4Display().get("备注").getName();
String remarks = (String)master.getAllDataMap().get(remark); String remarks = (String)master.getAllDataMap().get(remark);
DIC_DATA_URL = DIC_DATA_URL+"?id="+code+"&printStatus="+1+"&pageSize="+pageSize1+"&cover="+cover1+"&coverSize="+coverSize1+"&nevinSize="+nevinSize1+"&insertSize="+insertSize1+"&machinetype="+machinetype1+"&distribution="+distribution1+"&pagesided="+pagesided1+"&urgent="+urgent+"&aggregate="+totalprice+"&price="+unitprice+"&remark="+remarks; DIC_DATA_URL = DIC_DATA_URL+"?id="+code+"&printStatus="+1+"&pageSize="+pageSize1+"&cover="+cover1+"&coverSize="+coverSize1+"&nevinSize="+nevinSize1+"&insertSize="+insertSize1+"&machinetype="+machinetype1+"&distribution="+distribution1+"&pagesided="+pagesided1+"&urgent="+urgent+"&aggregate="+sumprice1+"&price="+unitprice+"&remark="+remarks;
try { try {
Map<String, Object> respnose = restTemplate.postForObject(DIC_DATA_URL, null, Map.class); Map<String, Object> respnose = restTemplate.postForObject(DIC_DATA_URL, null, Map.class);
if(!(Boolean) respnose.get("success")){ if(!(Boolean) respnose.get("success")){
......
src/main/java/com/seeyon/ctp/rest/resources/CollaborationResource.java
View file @ 767990e2
...@@ -7787,10 +7787,12 @@ public class CollaborationResource extends BaseResource { ...@@ -7787,10 +7787,12 @@ public class CollaborationResource extends BaseResource {
Map<String , Object> main = isNull(param.get("main")) ? null : (Map<String , Object>)param.get("main") ; //主表数据 Map<String , Object> main = isNull(param.get("main")) ? null : (Map<String , Object>)param.get("main") ; //主表数据
List<Object> sub = isNull(param.get("sub")) ? null : (List<Object>)param.get("sub"); //重复表数据 List<Object> sub = isNull(param.get("sub")) ? null : (List<Object>)param.get("sub"); //重复表数据
if(main != null && !main.isEmpty()) { if(main != null && !main.isEmpty()) {
if (main.get("confidentiality").equals("是")){ if (!param.get("templateCode").equals("JGLC")) {
main.put("confidentiality",1); if (main.get("confidentiality").equals("是")) {
}else { main.put("confidentiality", 1);
main.put("confidentiality",0); } else {
main.put("confidentiality", 0);
}
} }
Map<String, String> yingsheguanxiMap = (Map<String, String>)mped.get("main") ; Map<String, String> yingsheguanxiMap = (Map<String, String>)mped.get("main") ;
Set<String> mainSet = main.keySet() ; Set<String> mainSet = main.keySet() ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment