Commit 55e0192d authored by hongguangwu's avatar hongguangwu

Merge branch 'MVP1.6.3-HCM' into develop

# Conflicts:
#	yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/QiWeiServiceImpl.java
parents 65181e8a 6ff7cf86
...@@ -278,9 +278,13 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi ...@@ -278,9 +278,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,28 +305,34 @@ public class QiWeiServiceImpl extends ServiceImpl<EkpQiweiChuchaiMapper, EkpQiwi ...@@ -301,28 +305,34 @@ 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"));
person = formData.getString("随行人员");
renShu = 1; try {
if (Common.isNotNull(person)) { person = formData.getString("随行人员");
renShu1 = person.split(",").length; renShu = 1;
renShu2 = person.split(",").length; if (Common.isNotNull(person)) {
if (renShu1 > renShu2) { renShu1 = person.split(",").length;
renShu +=renShu1; renShu2 = person.split(",").length;
} else { if (renShu1 > renShu2) {
renShu +=renShu2; renShu +=renShu1;
}
}
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 { } 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.setFdRenShu(renShu);
reimburse.setFdPerson(person); 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