|
@@ -34,6 +34,7 @@ import com.taobao.api.ApiException;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import okhttp3.*;
|
|
import okhttp3.*;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
+import org.apache.logging.log4j.util.Strings;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
@@ -284,8 +285,16 @@ public class TongbuServiceImpl implements TongbuService {
|
|
|
log.info("数据实例id:" + formInstId);
|
|
log.info("数据实例id:" + formInstId);
|
|
|
|
|
|
|
|
log.info("传参解析中......");
|
|
log.info("传参解析中......");
|
|
|
- JSONObject jsonObject = JSON.parseObject(data);
|
|
|
|
|
- System.out.println("表单数据解析:" + jsonObject);
|
|
|
|
|
|
|
+ JSONObject jsonObject = new JSONObject();
|
|
|
|
|
+ if (Strings.isNotBlank(data)){
|
|
|
|
|
+ jsonObject = JSON.parseObject(data);
|
|
|
|
|
+ System.out.println("表单数据解析:" + jsonObject);
|
|
|
|
|
+ }else {
|
|
|
|
|
+ Map formData = ydClient.queryData(YDParam.builder()
|
|
|
|
|
+ .formInstanceId(formInstId)
|
|
|
|
|
+ .build(), YDConf.FORM_QUERY.retrieve_id).getFormData();
|
|
|
|
|
+ jsonObject = JSON.parseObject(JSON.toJSONString(formData));
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
//时间格式一:定义时间格式
|
|
//时间格式一:定义时间格式
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|