Commit b994464c authored by hongguangwu's avatar hongguangwu

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

parent 61a26def
...@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.permission.service.impl; ...@@ -2,6 +2,7 @@ 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;
...@@ -278,9 +279,13 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi ...@@ -278,9 +279,13 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
int renShu; int renShu;
int renShu1; int renShu1;
int renShu2; int renShu2;
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");
for (JSONObject datas : dataList) { for (JSONObject datas : dataList) {
person = null;
renShu = 1;
tools = null;
reimburse = new EkpQiwiChuchai(); reimburse = new EkpQiwiChuchai();
reimburse.setFdDataSource(dataSource); reimburse.setFdDataSource(dataSource);
if (Common.isNotNull(datas.getString("applyTimeFormat"))) { if (Common.isNotNull(datas.getString("applyTimeFormat"))) {
...@@ -301,6 +306,8 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi ...@@ -301,6 +306,8 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
if (Common.isNotNull(datas.getString("formData"))) { if (Common.isNotNull(datas.getString("formData"))) {
formData = JSON.parseObject(datas.getString("formData")); formData = JSON.parseObject(datas.getString("formData"));
try {
person = formData.getString("随行人员"); person = formData.getString("随行人员");
renShu = 1; renShu = 1;
if (Common.isNotNull(person)) { if (Common.isNotNull(person)) {
...@@ -313,8 +320,7 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi ...@@ -313,8 +320,7 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
} }
} }
List<JSONObject> toolList = JSON.parseArray(formData.getString("出行工具"), JSONObject.class); List<JSONObject> toolList = JSON.parseArray(formData.getString("出行工具"), JSONObject.class);
String tools = null; int i = 0;
int i=0;
if (toolList != null && !toolList.isEmpty()) { if (toolList != null && !toolList.isEmpty()) {
for (JSONObject tool : toolList) { for (JSONObject tool : toolList) {
if (i++ == 0) { if (i++ == 0) {
...@@ -324,6 +330,12 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi ...@@ -324,6 +330,12 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
} }
} }
} }
} catch (Exception e ) {
person = "-";
renShu = 1;
tools = null;
}
reimburse.setFdRenShu(renShu); reimburse.setFdRenShu(renShu);
reimburse.setFdPerson(person); reimburse.setFdPerson(person);
reimburse.setFdAddress(formData.getString("出差地点")); reimburse.setFdAddress(formData.getString("出差地点"));
......
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