update：更新下单加急字段

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

@@ -4080,6 +4080,9 @@ public class CollaborationController extends BaseController {
         map.put("appCode",appCode);
         String loginNameMd5 = getMd5(loginName+"eetrust"+appCode);
         map.put("loginNameMd5",loginNameMd5);
+		LOG.info("appcode：-------------------"+appCode+"-------");
+		LOG.info("loginName：-------------------"+loginName+"-------");
+		LOG.info("loginNameMd5：-------------------"+loginNameMd5+"-------");
         //发送请求
         url = url+"?appCode={appCode}&loginName={loginName}&loginNameMd5={loginNameMd5}";
         RestTemplate rest = new RestTemplate();

src/main/java/com/seeyon/apps/collaboration/manager/ColManagerImpl.java

@@ -144,6 +144,7 @@ import net.joinwork.bpm.engine.wapi.WorkflowBpmContext;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.commons.logging.Log;
 import org.json.JSONException;
@@ -11323,9 +11324,17 @@ public class ColManagerImpl implements ColManager {
             Long formrecordid = summary.getFormRecordid() ;
             com.seeyon.cap4.form.bean.FormBean formBean = cap4FormManager.getForm(formappid, false) ;
             FormDataMasterBean master = cap4FormManager.getDataMasterBeanById(formrecordid, formBean, null) ;
+//            String namekeyurgent = master.getFormTable().getFieldMap4Display().get("加急").getName();
+//            String urgent = (String)master.getAllDataMap().get(namekeyurgent);
+//            orderDetail.setIsUrgent(Integer.valueOf(urgent));
             String namekeyurgent = master.getFormTable().getFieldMap4Display().get("加急").getName();
-            String urgent = (String)master.getAllDataMap().get(namekeyurgent);
-            orderDetail.setIsUrgent(Integer.valueOf(urgent));
+            String  urgent = (String)master.getAllDataMap().get(namekeyurgent);
+            CtpEnumItem ctpEnumItem;
+            if(StringUtils.isNotBlank(urgent)) {
+                ctpEnumItem = enumManagerNew.getEnumItem(Long.valueOf(urgent));
+                String urgent1 = ctpEnumItem.getShowvalue();
+                orderDetail.setIsUrgent(urgent1);
+            }
         }
         if (flipInfo != null) {
             flipInfo.setParams(map);

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

@@ -17,7 +17,7 @@ public class OrderDetailVO {
     private Integer erpState;    //打印状态
     private String stateValue;   //当前待办人
     private String startMemberName;  //发起人
-    private Integer isUrgent;   //是否加急
+    private String isUrgent;   //是否加急
 
     public OrderDetailVO() {
 
@@ -103,15 +103,15 @@ public class OrderDetailVO {
         this.startMemberName = startMemberName;
     }
 
-    public Integer getIsUrgent() {
+    public String getIsUrgent() {
         return isUrgent;
     }
 
-    public void setIsUrgent(Integer isUrgent) {
+    public void setIsUrgent(String isUrgent) {
         this.isUrgent = isUrgent;
     }
 
-        public OrderDetailVO(Long summaryId, String subject, Long startMemberId, Date createDate, Date updateDate, Integer state, Integer generalState, Integer erpState, String stateValue, String startMemberName, Integer isUrgent) {
+        public OrderDetailVO(Long summaryId, String subject, Long startMemberId, Date createDate, Date updateDate, Integer state, Integer generalState, Integer erpState, String stateValue, String startMemberName, String isUrgent) {
         this.summaryId = summaryId;
         this.subject = subject;
         this.startMemberId = startMemberId;

src/main/java/com/seeyon/ctp/portal/sso/MySSOLoginHandshake.java

@@ -48,7 +48,7 @@ public class MySSOLoginHandshake extends SSOLoginHandshakeAbstract {
         {
             // 票据验证成功, 获取用户唯一标识
             String passport = sid.getPassport();
-            log.info("ticket:"+ticket);
+            log.info("系统获取到的ticket:"+ticket);
             log.info("单点登录成功! 用户唯一标识: " + passport);
             return passport;
         }

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

@@ -7797,13 +7797,15 @@ public class CollaborationResource  extends BaseResource {
             }
             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", "特急件");
-                } else if (main.get("urgent").equals("1")) {
-                    main.put("urgent", "加急件");
-                } else if (main.get("urgent").equals("2")) {
+                LOGGER.info("-----------------urgent:"+main.get("urgent"));
+                if (main.get("urgent").toString().equals("0")) {
+                    main.put("urgent", "特急(<4H)");
+                } else if (main.get("urgent").toString().equals("1")) {
+                    main.put("urgent", "加急(<8H)");
+                } else if (main.get("urgent").toString().equals("2")) {
                     main.put("urgent", "平件");
                 }
+                LOGGER.info("-------------------urgent:"+main.get("urgent"));
             }
             if (param.get("templateCode").equals("XDLC") || param.get("templateCode").equals("ECXDLC")) {
                 String cover = (String) main.get("cover");
@@ -7872,14 +7874,20 @@ public class CollaborationResource  extends BaseResource {
                     for (CtpEnumBean enumBean:enumMap.values()) {
                         if (enumBean.getEnumname().equals(enumName)){
                             items = enumBean.getItems();
+                            if (enumName.equals("加急"))
+                            LOGGER.info("-------------------urgent:"+enumName);
                             break;
                         }
                     }
 //                    List<CtpEnumItem> metaItems = enumManager.getItemListByShowValue(main.get(key)+"");
+                    if (enumName.equals("加急"))
+                        LOGGER.info("-------------------items:"+items.size());
                     if (items.size()>0){
                         for (CtpEnumItem enumItem:items) {
                             if (enumItem.getShowvalue().equals(main.get(key))) {
                                 value = String.valueOf(enumItem.getId());
+                                if (enumName.equals("加急"))
+                                LOGGER.info("-------------------urgent:"+value);
                                 break;
                             }
                         }
@@ -8236,6 +8244,7 @@ public class CollaborationResource  extends BaseResource {
             map.put("msg", "erpState不能为空.");
             return ok(map);
         }
+        LOGGER.info("erp抓单："+startDate);
         List<ColSummary> printSummary =colManager.getPrintSummary(generalState,erpState,startDate,endDate);
         List<PrintDataVO> print = new ArrayList<PrintDataVO>();
         for(ColSummary data : printSummary) {
@@ -8468,7 +8477,7 @@ public class CollaborationResource  extends BaseResource {
             if(StringUtils.isNotBlank(urgent)) {
                 ctpEnumItem = enumManagerNew.getEnumItem(Long.valueOf(urgent));
                 String urgent1 = ctpEnumItem.getShowvalue();
-                printdata.setDistribution(urgent1);
+                printdata.setUrgent(urgent1);
             }
 
             String namekeysenior = master.getFormTable().getFieldMap4Display().get("高级").getName();

src/main/webapp/WEB-INF/jsp/apps/collaboration/stateDetail.jsp

@@ -105,12 +105,12 @@
                     if (txt === 3)
                         return '生产完成';
                 }
-                if (c === 7){
-                    if (txt === 0)
-                        return '否';
-                    if (txt === 1)
-                        return '是';
-                }
+                // if (c === 7){
+                //     if (txt === 0)
+                //         return '否';
+                //     if (txt === 1)
+                //         return '是';
+                // }
                 return txt;
             }
         });

src/test/resources/data/ECXDLC.xml

@@ -26,7 +26,8 @@
     <field display="配送方式" third="distribution"/> 
     <field display="备注" third="remark"/>
 	<field display="加急" third="urgent" /> 
-	<field display="总价" third="urgent" /> 
+	<field display="总价" third="aggregate" /> 
+	<field display="内页颜色" third="neivinColor" /> 
   </main>
   
 </form>

src/test/resources/data/ECXDLCQT.xml

@@ -16,7 +16,7 @@
     <field display="配送方式" third="distribution"/> 
     <field display="客户备注" third="remark"/>
 	<field display="加急" third="urgent" /> 
-	<field display="总价" third="urgent" /> 
+	<field display="总价" third="aggregate" /> 
   </main>
   
 </form>

src/test/resources/data/XDLC.xml

@@ -26,6 +26,7 @@
     <field display="配送方式" third="distribution"/> 
     <field display="备注" third="remark"/>
 	<field display="加急" third="urgent" /> 
+	<field display="内页颜色" third="neivinColor" /> 
   </main>
   
 </form>

src/test/resources/data/url.properties

+menhu=http://192.168.3.43:8080/
+erp=http://192.168.3.44:8080/webapi/config/getAmount
+#统一认证
+authServerIp=192.168.3.49
+authServerPort=80
+authAppCode=oasystem
+authServerName=
+#认证系统编码
+menghuAppCode=menghu
+oaAppCode=oasystem
+erpAppCode=oasystem
+docAppCode=oasystem
+#读取权限url
+getQXUrl=http://192.168.3.49/api/auth/FederatedAppsServlet
+#获取统一认证token
+getTicketUrl=http://192.168.3.49/api/auth/FederatedSsoServlet
\ No newline at end of file