Commit d54e70ae authored by hongguangwu's avatar hongguangwu

MVP1.6.3-HCM HCM的出差接口-历史单子出行工具、人员,置为空,人数为1

parent 6ff7cf86
...@@ -2,7 +2,6 @@ package com.yifu.cloud.plus.v1.permission.service.impl; ...@@ -2,7 +2,6 @@ package com.yifu.cloud.plus.v1.permission.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONException;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.permission.config.WxConfig; import com.yifu.cloud.plus.v1.permission.config.WxConfig;
...@@ -17,10 +16,6 @@ import com.yifu.cloud.plus.v1.yifu.insurances.util.LocalDateUtil; ...@@ -17,10 +16,6 @@ import com.yifu.cloud.plus.v1.yifu.insurances.util.LocalDateUtil;
import com.yifu.cloud.plus.v1.yifu.permission.entity.EkpQiwiChuchai; import com.yifu.cloud.plus.v1.yifu.permission.entity.EkpQiwiChuchai;
import com.yifu.cloud.plus.v1.yifu.permission.vo.QiWeiUserVo; import com.yifu.cloud.plus.v1.yifu.permission.vo.QiWeiUserVo;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data;
import org.apache.commons.codec.binary.Hex;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpEntity; import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
...@@ -28,9 +23,6 @@ import org.springframework.security.authentication.AuthenticationServiceExceptio ...@@ -28,9 +23,6 @@ import org.springframework.security.authentication.AuthenticationServiceExceptio
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.*; import java.time.*;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
...@@ -282,6 +274,12 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi ...@@ -282,6 +274,12 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
String tools; String tools;
String dataSource = "HCM"; String dataSource = "HCM";
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
List<JSONObject> toolList;
Map<String, String> toolMap = new HashMap<>();
toolMap.put("1","飞机");
toolMap.put("2","自驾");
toolMap.put("3","汽车");
toolMap.put("4","高铁火车");
for (JSONObject datas : dataList) { for (JSONObject datas : dataList) {
person = null; person = null;
renShu = 1; renShu = 1;
...@@ -308,6 +306,20 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi ...@@ -308,6 +306,20 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
formData = JSON.parseObject(datas.getString("formData")); formData = JSON.parseObject(datas.getString("formData"));
try { try {
int i = 0;
try {
toolList = JSON.parseArray(formData.getString("随行人员"), JSONObject.class);
if (toolList != null && !toolList.isEmpty()) {
for (JSONObject tool : toolList) {
if (i++ == 0) {
person = tool.getString("name");
} else {
person += "," + tool.getString("name");
}
renShu++;
}
}
} catch (Exception e) {
person = formData.getString("随行人员"); person = formData.getString("随行人员");
renShu = 1; renShu = 1;
if (Common.isNotNull(person)) { if (Common.isNotNull(person)) {
...@@ -319,14 +331,30 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi ...@@ -319,14 +331,30 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
renShu +=renShu2; renShu +=renShu2;
} }
} }
List<JSONObject> toolList = JSON.parseArray(formData.getString("出行工具"), JSONObject.class); }
int i = 0; i = 0;
try {
toolList = JSON.parseArray(formData.getString("出行工具"), JSONObject.class);
if (toolList != null && !toolList.isEmpty()) { if (toolList != null && !toolList.isEmpty()) {
for (JSONObject tool : toolList) { for (JSONObject tool : toolList) {
if (i++ == 0) { if (i++ == 0) {
tools = tool.getString("label"); tools = tool.getString("label");
} else { } else {
tools += "," + tool.getString("label"); tools += ";" + tool.getString("label");
}
}
}
} catch (Exception e) {
tools = formData.getString("出行工具");
String[] toolArr = tools.split(",");
i = 0;
for (String tool : toolArr) {
if (toolMap.get(tool) != null) {
if (i++ == 0) {
tools = toolMap.get(tool);
} else {
tools += ";" + toolMap.get(tool);
}
} }
} }
} }
......
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