diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY132_CheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY132_CheckAction.java index 13e65dc..7e38645 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY132_CheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY132_CheckAction.java @@ -67,26 +67,28 @@ public class ZSRM_PUR_INFO_GY132_CheckAction extends BaseBean implements Action, Cell cq1 = cq[k]; String nameq = cq1.getName().toUpperCase(); String valueq = Util.null2String(cq1.getValue()); + logger_69d789ca.error("workflow_action_ZSRM_PUR_INFO_GY132_CheckAction nameq --" + nameq); + logger_69d789ca.error("workflow_action_ZSRM_PUR_INFO_GY132_CheckAction valueq --" + valueq); map.put(nameq, valueq); } str[j][0] = requestid + "_" + j; - str[j][1] = map.get("CGZZ"); - str[j][2] = map.get("CGZ"); - str[j][3] = map.get("WL"); - str[j][4] = map.get("GYSZHH"); - str[j][5] = map.get("DDDW"); - str[j][6] = map.get("JBDW"); - str[j][7] = map.get("JBDWFZ"); - str[j][8] = map.get("ZSDLS"); - str[j][9] = map.get("BZDLS"); - str[j][10] = map.get("YTJJHSJ"); - str[j][11] = map.get("XSGMSDM"); - str[j][12] = map.get("JLFL"); - str[j][13] = map.get("YXQSRQ").replaceAll("-", ""); - str[j][14] = map.get("YXJZRQ").replaceAll("-", ""); - str[j][15] = map.get("JJG"); - str[j][16] = map.get("JGDW"); - str[j][17] = map.get("GYSWLZ"); + str[j][1] = null2String(map.get("CGZZ")); + str[j][2] = null2String(map.get("CGZ")); + str[j][3] = null2String(map.get("WL")); + str[j][4] = null2String(map.get("GYSZHH")); + str[j][5] = null2String(map.get("DDDW")); + str[j][6] = null2String(map.get("JBDW")); + str[j][7] = null2String(map.get("JBDWFZ")); + str[j][8] = null2String(map.get("ZSDLS")); + str[j][9] = null2String(map.get("BZDLS")); + str[j][10] = null2String(map.get("YTJJHSJ")); + str[j][11] = null2String(map.get("XSGMSDM")); + str[j][12] = null2String(map.get("JLFL")); + str[j][13] = null2String(map.get("YXQSRQ")).replaceAll("-", ""); + str[j][14] = null2String(map.get("YXJZRQ")).replaceAll("-", ""); + str[j][15] = null2String(map.get("JJG")); + str[j][16] = null2String(map.get("JGDW")); + str[j][17] = null2String(map.get("GYSWLZ")); str[j][18] = "X"; str[j][19] = map.get("HB"); str[j][20] = requestid; @@ -130,4 +132,16 @@ public class ZSRM_PUR_INFO_GY132_CheckAction extends BaseBean implements Action, } return map; } + + public static String null2String(String s){ + return s == null ? "" : s; + } + + public static String null2String(Object o){ + return o == null ? "" : o.toString(); + } + + public static String null2String(String s1,String s2){ + return s1 == null ? (s2 == null ? "" : s2) : s1; + } }