Commit 5cef4e44 authored by hongguangwu's avatar hongguangwu

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

parent 49e64045
...@@ -16,10 +16,6 @@ import com.yifu.cloud.plus.v1.yifu.insurances.util.LocalDateUtil; ...@@ -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.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;
...@@ -27,9 +23,6 @@ import org.springframework.security.authentication.AuthenticationServiceExceptio ...@@ -27,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;
...@@ -281,6 +274,7 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi ...@@ -281,6 +274,7 @@ 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;
for (JSONObject datas : dataList) { for (JSONObject datas : dataList) {
person = null; person = null;
renShu = 1; renShu = 1;
...@@ -307,19 +301,33 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi ...@@ -307,19 +301,33 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi
formData = JSON.parseObject(datas.getString("formData")); formData = JSON.parseObject(datas.getString("formData"));
try { try {
person = formData.getString("随行人员"); toolList = JSON.parseArray(formData.getString("随行人员"), JSONObject.class);
renShu = 1; int i = 0;
if (Common.isNotNull(person)) { if (toolList != null && !toolList.isEmpty()) {
renShu1 = person.split(",").length; for (JSONObject tool : toolList) {
renShu2 = person.split(",").length; if (i++ == 0) {
if (renShu1 > renShu2) { person = tool.getString("name");
renShu +=renShu1; } else {
} else { person += "," + tool.getString("name");
renShu +=renShu2; }
renShu++;
}
} else {
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);
int i = 0; toolList = JSON.parseArray(formData.getString("出行工具"), JSONObject.class);
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) {
......
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