Commit eb7f31b9 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.13' into MVP1.7.13

parents 95f6e43c 926b7ca0
...@@ -28,7 +28,7 @@ import lombok.Data; ...@@ -28,7 +28,7 @@ import lombok.Data;
@Data @Data
public class TGzEmpInfoPushGzVoSkill { public class TGzEmpInfoPushGzVoSkill {
private String orderId; private Integer orderId;
private String skillName; private String skillName;
private String skillDate; private String skillDate;
private String skillOrg; private String skillOrg;
......
...@@ -151,7 +151,7 @@ public class GzConfig { ...@@ -151,7 +151,7 @@ public class GzConfig {
// 发送POST请求 // 发送POST请求
String result = restTemplate.exchange(gzEmpInfoUrl, HttpMethod.POST, entity, String.class).getBody(); String result = restTemplate.exchange(gzEmpInfoUrl, HttpMethod.POST, entity, String.class).getBody();
returnMap.put("responseData", result); returnMap.put("responseData", result);
System.out.println(result); // System.out.println(result);
if (result != null && result.contains("code") && result.contains("data")) { if (result != null && result.contains("code") && result.contains("data")) {
JSONObject resultObject = JSON.parseObject(result); JSONObject resultObject = JSON.parseObject(result);
......
...@@ -94,6 +94,7 @@ public class TGzPushEntryServiceImpl extends ServiceImpl<TGzPushEntryMapper, TGz ...@@ -94,6 +94,7 @@ public class TGzPushEntryServiceImpl extends ServiceImpl<TGzPushEntryMapper, TGz
} }
// 先改为推送中 // 先改为推送中
findInfo.setPushTime(LocalDateTime.now());
findInfo.setPushStatus(CommonConstants.THREE_STRING); findInfo.setPushStatus(CommonConstants.THREE_STRING);
findInfo.setFailReason(""); findInfo.setFailReason("");
findInfo.setUpdateBy(user.getId()); findInfo.setUpdateBy(user.getId());
......
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