update:更新发送协同、返回门户协同、定时器返回门户接口

src/main/java/com/seeyon/apps/collaboration/controller/CollaborationController.java

@@ -2392,8 +2392,20 @@ public class CollaborationController extends BaseController {
 						}
 
 
+						String namekeydistribution = master.getFormTable().getFieldMap4Display().get("配送方式").getName();
+						String distribution = (String) master.getAllDataMap().get(namekeydistribution);
+						String distribution1 = null;
+						if (StringUtils.isNotBlank(distribution)) {
+							ctpEnumItem = enumManagerNew.getEnumItem(Long.valueOf(distribution));
+							distribution1 = ctpEnumItem.getShowvalue();
+						}
+
 						String namekeyurgent = master.getFormTable().getFieldMap4Display().get("加急").getName();
 						String  urgent = (String)master.getAllDataMap().get(namekeyurgent);
+						if (urgent.equals("0"))
+							urgent = "1";
+						if (urgent.equals("1"))
+							urgent = "0";
 
                   /*String namekey = master.getFormTable().getFieldMap4Display().get("编号").getName();
                   String  code = (String)master.getAllDataMap().get(namekey);*/
@@ -2464,13 +2476,6 @@ public class CollaborationController extends BaseController {
 								machinetype1 = ctpEnumItem.getShowvalue();
 							}
 
-							String namekeydistribution = master.getFormTable().getFieldMap4Display().get("配送方式").getName();
-							String distribution = (String) master.getAllDataMap().get(namekeydistribution);
-							String distribution1 = null;
-							if (StringUtils.isNotBlank(distribution)) {
-								ctpEnumItem = enumManagerNew.getEnumItem(Long.valueOf(distribution));
-								distribution1 = ctpEnumItem.getShowvalue();
-							}
 
 							String namekeypagesided = master.getFormTable().getFieldMap4Display().get("单双面").getName();
 							String pagesided = (String) master.getAllDataMap().get(namekeypagesided);
@@ -2481,12 +2486,21 @@ public class CollaborationController extends BaseController {
 							}
 							String remark = master.getFormTable().getFieldMap4Display().get("备注").getName();
 							String remarks = (String)master.getAllDataMap().get(remark);
+							if ("ECXDLC".equals(ctpTemplate.getTempleteNumber())){
+								String namekeyunitprice = master.getFormTable().getFieldMap4Display().get("优惠价").getName();
+								sumprice1 = (BigDecimal)master.getAllDataMap().get(namekeyunitprice);
+							}
 
 							DIC_DATA_URL = DIC_DATA_URL+"?id="+code+"&printStatus="+1+"&pageSize="+pageSize1+"&cover="+covers+"&coverSize="+coverSize1+"&nevinSize="+nevinSize1+"&insertSize="+insertSize1+"&machinetype="+machinetype1+"&distribution="+distribution1+"&pagesided="+pagesided1+"&urgent="+urgent+"&aggregate="+sumprice1+"&price="+price+"&remark="+remarks;
 						}else {
+							if ("ECXDLCQT".equals(ctpTemplate.getTempleteNumber())){
+								String namekeyunitprice = master.getFormTable().getFieldMap4Display().get("优惠价").getName();
+								sumprice1 = (BigDecimal)master.getAllDataMap().get(namekeyunitprice);
+							}
+
 							String remark = master.getFormTable().getFieldMap4Display().get("客户备注").getName();
 							String remarks = (String)master.getAllDataMap().get(remark);
-							DIC_DATA_URL = DIC_DATA_URL+"?id="+code+"&printStatus="+1+"&urgent="+urgent+"&aggregate="+sumprice1+"&price="+price+"&remark="+remarks;
+							DIC_DATA_URL = DIC_DATA_URL+"?id="+code+"&printStatus="+1+"&urgent="+urgent+"&aggregate="+sumprice1+"&price="+price+"&remark="+remarks+"&distribution="+distribution1;
 						}
 
 //                        BigDecimal totalprice = (BigDecimal) master.getAllDataMap().get(namekeytotalprice);

src/main/java/com/seeyon/apps/collaboration/vo/PrintDataVO.java

@@ -39,7 +39,24 @@ public class PrintDataVO {
     private String otherColor;  //其他颜色
     private String senior;  //高级
     private BigDecimal typesettingPrice; //排版费
+    private BigDecimal youhuijia;  //优惠价
+    private String createDate;  //开单时间
 
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public BigDecimal getYouhuijia() {
+        return youhuijia;
+    }
+
+    public void setYouhuijia(BigDecimal youhuijia) {
+        this.youhuijia = youhuijia;
+    }
     public PrintDataVO() {
         super();
     }

src/main/java/com/seeyon/ctp/rest/resources/CollaborationResource.java

@@ -7795,6 +7795,14 @@ public class CollaborationResource  extends BaseResource {
                     main.put("confidentiality", 0);
                 }
             }
+            if (param.get("templateCode").equals("XDLC") || param.get("templateCode").equals("ECXDLC")
+            || param.get("templateCode").equals("XDLCQT") || param.get("templateCode").equals("ECXDLCQT")) {
+                if (main.get("urgent").equals("0")) {
+                    main.put("urgent", 1);
+                } else {
+                    main.put("urgent", 0);
+                }
+            }
             if (param.get("templateCode").equals("XDLC") || param.get("templateCode").equals("ECXDLC")) {
                 String cover = (String) main.get("cover");
                 String[] covers = cover.split(",");
@@ -8261,6 +8269,8 @@ public class CollaborationResource  extends BaseResource {
             if (date != null)
                 printdata.setDate(sdf.format(date));
 
+            printdata.setCreateDate(sdf.format(data.getCreateDate()));
+
             String documentnumber = master.getFormTable().getFieldMap4Display().get("文档编号").getName();
             String  document = (String)master.getAllDataMap().get(documentnumber);
             printdata.setNumber(document);
@@ -8395,7 +8405,37 @@ public class CollaborationResource  extends BaseResource {
                 String remark = master.getFormTable().getFieldMap4Display().get("备注").getName();
                 String remarks = (String)master.getAllDataMap().get(remark);
                 printdata.setRemark(remarks);
+
+                String typesettingPrice = master.getFormTable().getFieldMap4Display().get("排版费").getName();
+                if (master.getAllDataMap().get(typesettingPrice) != null) {
+                    BigDecimal typesettingPrice1 = (BigDecimal) master.getAllDataMap().get(typesettingPrice);
+                    printdata.setTypesettingPrice(typesettingPrice1);
+                }else
+                    printdata.setTypesettingPrice(new BigDecimal("0"));
+
+                if (template.getTempleteNumber().equals("ECXDLC")){
+                    String youhuijia = master.getFormTable().getFieldMap4Display().get("优惠价").getName();
+                    if (master.getAllDataMap().get(youhuijia) != null) {
+                        BigDecimal youhuijia1 = (BigDecimal) master.getAllDataMap().get(youhuijia);
+                        printdata.setYouhuijia(youhuijia1);
+                    }else
+                        printdata.setYouhuijia(new BigDecimal("0"));
+                }else
+                    printdata.setYouhuijia(new BigDecimal("0"));
+
             }else {
+                printdata.setTypesettingPrice(new BigDecimal("0"));
+
+                if (template.getTempleteNumber().equals("ECXDLCQT")){
+                    String youhuijia = master.getFormTable().getFieldMap4Display().get("优惠价").getName();
+                    if (master.getAllDataMap().get(youhuijia) != null) {
+                        BigDecimal youhuijia1 = (BigDecimal) master.getAllDataMap().get(youhuijia);
+                        printdata.setYouhuijia(youhuijia1);
+                    }else
+                        printdata.setYouhuijia(new BigDecimal("0"));
+                }else
+                    printdata.setYouhuijia(new BigDecimal("0"));
+
                 String remark = master.getFormTable().getFieldMap4Display().get("业务备注").getName();
                 String remarks = (String)master.getAllDataMap().get(remark);
                 printdata.setRemark(remarks);
@@ -8437,7 +8477,7 @@ public class CollaborationResource  extends BaseResource {
 //            BigDecimal  unitprice = (BigDecimal)master.getAllDataMap().get(namekeyunitprice);
             printdata.setUnitprice(new BigDecimal("0"));
 
-            printdata.setTypesettingPrice(new BigDecimal("0"));
+//            printdata.setTypesettingPrice(new BigDecimal("0"));
 
 
             print.add(printdata);