Commit eb208835 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.6.3' into MVP1.6.3

parents d1b729ad 8235756e
......@@ -16,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.vo.QiWeiUserVo;
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.HttpHeaders;
import org.springframework.http.MediaType;
......@@ -27,9 +23,6 @@ import org.springframework.security.authentication.AuthenticationServiceExceptio
import org.springframework.stereotype.Service;
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.time.*;
import java.time.format.DateTimeFormatter;
......@@ -278,9 +271,19 @@ 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");
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;
tools = null;
reimburse = new EkpQiwiChuchai();
reimburse.setFdDataSource(dataSource);
if (Common.isNotNull(datas.getString("applyTimeFormat"))) {
......@@ -301,28 +304,64 @@ 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;
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("随行人员");
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");
} else {
tools += ";" + tool.getString("label");
i = 0;
try {
toolList = JSON.parseArray(formData.getString("出行工具"), JSONObject.class);
if (toolList != null && !toolList.isEmpty()) {
for (JSONObject tool : toolList) {
if (i++ == 0) {
tools = tool.getString("label");
} else {
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);
}
}
}
}
} 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