Commit e63828ca authored by hongguangwu's avatar hongguangwu

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

parent 3ecb59a2
......@@ -278,9 +278,13 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
int renShu;
int renShu1;
int renShu2;
String tools;
String dataSource = "HCM";
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
for (JSONObject datas : dataList) {
person = null;
renShu = 1;
tools = null;
reimburse = new EkpQiwiChuchai();
reimburse.setFdDataSource(dataSource);
if (Common.isNotNull(datas.getString("applyTimeFormat"))) {
......@@ -301,28 +305,34 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
if (Common.isNotNull(datas.getString("formData"))) {
formData = JSON.parseObject(datas.getString("formData"));
person = formData.getString("随行人员");
renShu = 1;
if (Common.isNotNull(person)) {
renShu1 = person.split(",").length;
renShu2 = person.split(",").length;
if (renShu1 > renShu2) {
renShu +=renShu1;
} else {
renShu +=renShu2;
}
}
List<JSONObject> toolList = JSON.parseArray(formData.getString("出行工具"), JSONObject.class);
String tools = null;
int i=0;
if (toolList != null && !toolList.isEmpty()) {
for (JSONObject tool : toolList) {
if (i++ == 0) {
tools = tool.getString("label");
try {
person = formData.getString("随行人员");
renShu = 1;
if (Common.isNotNull(person)) {
renShu1 = person.split(",").length;
renShu2 = person.split(",").length;
if (renShu1 > renShu2) {
renShu +=renShu1;
} else {
tools += ";" + tool.getString("label");
renShu +=renShu2;
}
}
List<JSONObject> toolList = JSON.parseArray(formData.getString("出行工具"), JSONObject.class);
int i = 0;
if (toolList != null && !toolList.isEmpty()) {
for (JSONObject tool : toolList) {
if (i++ == 0) {
tools = tool.getString("label");
} else {
tools += "," + tool.getString("label");
}
}
}
} catch (Exception e ) {
person = "-";
renShu = 1;
tools = null;
}
reimburse.setFdRenShu(renShu);
reimburse.setFdPerson(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