Merge remote-tracking branch 'origin/ht' into ht

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/EAS_YszxfpApplyResult.java

@@ -27,6 +27,7 @@ public class EAS_YszxfpApplyResult extends BaseBean {
     @Autowired
     private ConfigProp configProp;
     public String getApproveResult(JSONObject returnJson, String type) {
+        logger_683a4c66.error("EAS_YszxfpApplyResult start  :  returnJson = " + returnJson + "  type = "+ type);
         HttpPost post = null;
         String result = "E";
         try {
@@ -41,7 +42,7 @@ public class EAS_YszxfpApplyResult extends BaseBean {
             post = new HttpPost(url);
             post.setHeader(HTTP.CONTENT_TYPE, "application/json; charset=UTF-8");
             post.setHeader("Accept", "application/json; charset=UTF-8");
-            logger_683a4c66.error("Authorization----"+configProp.getUrl_password());
+            logger_683a4c66.error("Authorization--getUrl_password--"+configProp.getUrl_password());
 //            post.setHeader("Authorization", Util.null2String(getPropValue("htportaloaUrl", "url_password")).trim());
             post.setHeader("Authorization",configProp.getUrl_password());
             StringEntity entity = new StringEntity(returnJson.toString(), "UTF-8");

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java

@@ -48,10 +48,12 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ
 
         Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
         Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
+        String newoperate = String.valueOf(requestInfoMap.getOrDefault("operate", -1));
         RequestInfo requestInfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
         try {
             String requestid = requestInfo.getRequestid();
             logger_c29b3679.error(String.valueOf("ARSPaymentRecepitAction--start--" + requestid));
+            logger_c29b3679.error(String.valueOf("newoperate--" + newoperate));
             try {
                 String workflowid = requestInfo.getWorkflowid();
                 logger_c29b3679.error( "workflowid--" + workflowid) ;
@@ -120,13 +122,15 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ
                 obj.put("OAREQUESTID", requestid);
                 // x
                 //TODO custom 已处理 edit
-                obj.put("BUSINESSUNITSYS", hrm.getWorkcode(map.get("CLR")));
-//                obj.put("BUSINESSUNITSYS", "");
+//                obj.put("BUSINESSUNITSYS", hrm.getWorkcode(map.get("CLR")));
+                obj.put("BUSINESSUNITSYS", "");
                 // x
 
                 obj.put("BUSINESSUNIT", map.get("GZGSBM"));
                 obj.put("OAID", workflowid);
-                obj.put("OPERATETYPE", operate);
+
+                logger_c29b3679.error(" operate " + operate);
+                obj.put("OPERATETYPE", 1);
                 logger_c29b3679.error(" obj " + obj.toJSONString());
                 HttpClient client = new DefaultHttpClient();
 

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SCFAndEASApplyUserSyncAction.java

@@ -116,6 +116,7 @@ public class SCFAndEASApplyUserSyncAction extends BaseBean implements Action, Es
                     obj.put("checkFlag", "2");
                     obj.put("ITFID", "HT01BZ033");
                     obj.put("items", JSONArray.parseArray(JSON.toJSONString(list1)));
+                    logger_c018d513.error("getApproveResult 入参" + obj);
 //                    EAS_YszxfpApplyResult mGetResult = new EAS_YszxfpApplyResult();
                     String result = mGetResult.getApproveResult(obj, "SCFAndEASApplyUser");
                     logger_c018d513.error(String.valueOf(requestid + "调用报账系统同步流程发起人信息返回值：" + result));

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_FICO_COC_CREATIONAction.java

@@ -62,6 +62,7 @@ public class ZOA_FICO_COC_CREATIONAction extends BaseBean implements Action, Esb
                     map.put(name, value);
                 }
                 String sqyw = map.get("SQYW");
+                logger_8236b79b.error("ZOA_FICO_COC_CREATIONAction map ==" + map );
                 logger_8236b79b.error(String.valueOf("----------ZOA_FICO_COC_CREATIONAction sqyw = " + sqyw + "--------"));
                 String[] returnStr = null;
                 if ("0".equals(sqyw)) {

secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/EasTzlhtSpzfApplicationService.java

@@ -83,8 +83,12 @@ public class EasTzlhtSpzfApplicationService {
         if ("N".equals(optType)) {//流程作废
             isYX = "1";
         }
-        String sql = "update " + tablename + " set sfyx ='" + isYX + "' where requestId = " + requestId;
-        rs.executeSql(sql,poolname);
+
+        String sql = "update e10_core_business.dbo." + tablename + " set sfyx ='" + isYX + "' where id = " + requestId;
+
+        log.error("sql:"+sql);
+        boolean b1 = rs.executeSql(sql, poolname);
+        log.error("b1:"+b1);
         res.setIsTat("S");
         res.setMessage("接口调用成功！");
         return res;

secondev-ht-njwebservice/src/main/java/com/weaver/seconddev/njwebservice/OutToDoWorkflowService.java

@@ -41,6 +41,7 @@ public class OutToDoWorkflowService {
         rs.executeSql(sql,poolname);
         if (rs.next()){
             Long userId = Util.getLongValue(rs.getString("id"));
+            log.error("outToDoWorkflowCount  userId:"+userId);
             int toDoWorkflowRequestCount = workflowService.getToDoWorkflowRequestCount(userId, param.getConditions());
             log.error("待办数量："+toDoWorkflowRequestCount);
             return String.valueOf(toDoWorkflowRequestCount);
@@ -53,7 +54,7 @@ public class OutToDoWorkflowService {
 //        String pc_url = Util.null2String(this.getPropValue("htportaloaUrl", "pc_url")).trim();
 //        String mobile_url = Util.null2String(this.getPropValue("htportaloaUrl", "mobile_url")).trim();
 
-        log.error("outToDoWorkflowCount入参:"+param);
+        log.error("outToDoWorkflowList入参:"+param);
 //        ToDoRequestReq param = JSON.parseObject(json, ToDoRequestReq.class);
         // todo 访问ip 配置
         String pc_url = "";
@@ -71,6 +72,7 @@ public class OutToDoWorkflowService {
             log.error("用户id:"+userId);
             WorkflowRequestInfo[] info = workflowService.getToDoWorkflowRequestList(Integer.parseInt(param.getPageNo()), Integer.parseInt(param.getPageSize()),
                     Integer.parseInt(param.getRecordCount()), userId, param.getConditions());
+            log.error("info:"+info.length);
 
             res.setMsg("find:" + info.length);
             ToDoWorkFlow[] todo = new ToDoWorkFlow[info.length];