Commit ebaa383d authored by hongguangwu's avatar hongguangwu

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

parent 5d145056
......@@ -275,6 +275,11 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
String dataSource = "HCM";
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) {
person = null;
renShu = 1;
......@@ -301,9 +306,9 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
formData = JSON.parseObject(datas.getString("formData"));
try {
int i = 0;
try {
toolList = JSON.parseArray(formData.getString("随行人员"), JSONObject.class);
int i = 0;
if (toolList != null && !toolList.isEmpty()) {
for (JSONObject tool : toolList) {
if (i++ == 0) {
......@@ -327,9 +332,9 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
}
}
}
i = 0;
try {
toolList = JSON.parseArray(formData.getString("出行工具"), JSONObject.class);
int i = 0;
if (toolList != null && !toolList.isEmpty()) {
for (JSONObject tool : toolList) {
if (i++ == 0) {
......@@ -341,6 +346,17 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
}
} 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);
}
}
}
}
} catch (Exception e ) {
person = "-";
......
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