Skip to content

A
api
Commit 5a89e4f7 by java-李谡
Options

Merge remote-tracking branch 'origin/dev-ls' into dev-ls

parents 84284d49 3ca8371d
Showing with 118 additions and 64 deletions
resources/mapper/modules/airport/OilAnalysisDao.xml
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
sta.arr_iata_id, sta.arr_iata_id,
sta.extra_oil_fuel_reason, sta.extra_oil_fuel_reason,
DATE_FORMAT(sta.update_date, '%Y/%m/%d')as updateDate, DATE_FORMAT(sta.update_date, '%Y/%m/%d')as updateDate,
DATE_FORMAT(sta.update_time, '%Y/%m/%d %H:%i:%s')as updateTime,
airArr.city_name as arrAirPortName, airArr.city_name as arrAirPortName,
airdep.city_name as depAirPortName, airdep.city_name as depAirPortName,
IFNULL(acType.type_name,'') as acTypeName IFNULL(acType.type_name,'') as acTypeName
......
src/com/ejweb/modules/airport/entity/OilAnalysisEntity.java
...@@ -44,31 +44,47 @@ public class OilAnalysisEntity { ...@@ -44,31 +44,47 @@ public class OilAnalysisEntity {
private String dispatcherName; // 签派人 private String dispatcherName; // 签派人
@ExcelField(title="总油量", type=0, align=1, sort=38 )
private String totalOil; // 总油量 @ExcelField(title="总油量(KGS)", type=0, align=1, sort=38 )
@ExcelField(title="起飞额外油量", type=0, align=1, sort=39 ) private Integer totalOilKGS; // 总油量
private String extraOilFuelTakeoff; // 起飞额外油量
@ExcelField(title="起飞额外油量原因", type=0, align=1, sort=40 ) @ExcelField(title="总油量(LBS)", type=0, align=1, sort=39 )
private Integer totalOilLBS; // 总油量
@ExcelField(title="起飞额外油量", type=0, align=1, sort=40 )
private Integer extraOilFuelTakeoff; // 起飞额外油量
@ExcelField(title="起飞额外油量原因", type=0, align=1, sort=41 )
private String extraOilFuelTakeoffReason; // 起飞额外油量原因 private String extraOilFuelTakeoffReason; // 起飞额外油量原因
@ExcelField(title="到达额外油量", type=0, align=1, sort=41 ) @ExcelField(title="到达额外油量", type=0, align=1, sort=42 )
private String extraOilFuelArr; // 到达额外油量 private Integer extraOilFuelArr; // 到达额外油量
@ExcelField(title="到达额外油量原因", type=0, align=1, sort=42 ) @ExcelField(title="到达额外油量原因", type=0, align=1, sort=43 )
private String extraOilFuelArrReason; // 到达额外油量原因 private String extraOilFuelArrReason; // 到达额外油量原因
@ExcelField(title="航路额外油量", type=0, align=1, sort=43 ) @ExcelField(title="航路额外油量", type=0, align=1, sort=44 )
private String extraOilFuelFlight; // 航路额外油量 private Integer extraOilFuelFlight; // 航路额外油量
@ExcelField(title="航路额外油量原因", type=0, align=1, sort=44 ) @ExcelField(title="航路额外油量原因", type=0, align=1, sort=45)
private String extraOilFuelFlightReason; // 航路额外油量原因 private String extraOilFuelFlightReason; // 航路额外油量原因
@ExcelField(title="其他额外油量", type=0, align=1, sort=45 ) @ExcelField(title="其他额外油量", type=0, align=1, sort=46 )
private String extraOilFuelOther; // 其他额外油量 private Integer extraOilFuelOther; // 其他额外油量
@ExcelField(title="其他额外油量原因", type=0, align=1, sort=46 ) @ExcelField(title="其他额外油量原因", type=0, align=1, sort=47 )
private String extraOilFuelOtherReason; // 起飞额外油量原因 private String extraOilFuelOtherReason; // 起飞额外油量原因
@ExcelField(title="数据更新时间", type=0, align=1, sort=47 )
private String updateDate; // 数据更新时间
@ExcelField(title="数据更新时间", type=0, align=1, sort=48 )
private String updateTime; // 数据更新时间
private String updateDate; // 数据更新时间
private String extraOilFuelReason; // 额外油加注原因 private String extraOilFuelReason; // 额外油加注原因
private String totalOil; // 总油量
public String getUpdateTime() {
return updateTime;
}
public void setUpdateTime(String updateTime) {
this.updateTime = updateTime;
}
public String getDispatcherAccount() { public String getDispatcherAccount() {
return dispatcherAccount; return dispatcherAccount;
...@@ -190,35 +206,35 @@ public class OilAnalysisEntity { ...@@ -190,35 +206,35 @@ public class OilAnalysisEntity {
this.extraOilFuelReason = extraOilFuelReason; this.extraOilFuelReason = extraOilFuelReason;
} }
public String getExtraOilFuelTakeoff() { public Integer getExtraOilFuelTakeoff() {
return extraOilFuelTakeoff; return extraOilFuelTakeoff;
} }
public void setExtraOilFuelTakeoff(String extraOilFuelTakeoff) { public void setExtraOilFuelTakeoff(Integer extraOilFuelTakeoff) {
this.extraOilFuelTakeoff = extraOilFuelTakeoff; this.extraOilFuelTakeoff = extraOilFuelTakeoff;
} }
public String getExtraOilFuelArr() { public Integer getExtraOilFuelArr() {
return extraOilFuelArr; return extraOilFuelArr;
} }
public void setExtraOilFuelArr(String extraOilFuelArr) { public void setExtraOilFuelArr(Integer extraOilFuelArr) {
this.extraOilFuelArr = extraOilFuelArr; this.extraOilFuelArr = extraOilFuelArr;
} }
public String getExtraOilFuelFlight() { public Integer getExtraOilFuelFlight() {
return extraOilFuelFlight; return extraOilFuelFlight;
} }
public void setExtraOilFuelFlight(String extraOilFuelFlight) { public void setExtraOilFuelFlight(Integer extraOilFuelFlight) {
this.extraOilFuelFlight = extraOilFuelFlight; this.extraOilFuelFlight = extraOilFuelFlight;
} }
public String getExtraOilFuelOther() { public Integer getExtraOilFuelOther() {
return extraOilFuelOther; return extraOilFuelOther;
} }
public void setExtraOilFuelOther(String extraOilFuelOther) { public void setExtraOilFuelOther(Integer extraOilFuelOther) {
this.extraOilFuelOther = extraOilFuelOther; this.extraOilFuelOther = extraOilFuelOther;
} }
...@@ -246,4 +262,21 @@ public class OilAnalysisEntity { ...@@ -246,4 +262,21 @@ public class OilAnalysisEntity {
public void setUpdateDate(String updateDate) { public void setUpdateDate(String updateDate) {
this.updateDate = updateDate; this.updateDate = updateDate;
} }
public Integer getTotalOilKGS() {
return totalOilKGS;
}
public void setTotalOilKGS(Integer totalOilKGS) {
this.totalOilKGS = totalOilKGS;
}
public Integer getTotalOilLBS() {
return totalOilLBS;
}
public void setTotalOilLBS(Integer totalOilLBS) {
this.totalOilLBS = totalOilLBS;
}
} }
src/com/ejweb/modules/airport/service/OilAnalysisService.java
...@@ -11,7 +11,10 @@ import org.springframework.util.StringUtils; ...@@ -11,7 +11,10 @@ import org.springframework.util.StringUtils;
import com.ejweb.core.base.PageEntity; import com.ejweb.core.base.PageEntity;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;import java.util.Collections; import com.github.pagehelper.PageInfo;
import sun.security.util.ArrayUtil;
import java.util.Collections;
import java.util.List; import java.util.List;
@Service @Service
...@@ -20,20 +23,17 @@ public class OilAnalysisService extends BaseService<OilAnalysisDao> { ...@@ -20,20 +23,17 @@ public class OilAnalysisService extends BaseService<OilAnalysisDao> {
@Autowired @Autowired
protected OilAnalysisDao oilAnalysisDao; protected OilAnalysisDao oilAnalysisDao;
public PageEntity <OilAnalysisEntity> getAnalysisData (OilAnalysisBean bean ,Boolean isPage) { public PageEntity<OilAnalysisEntity> getAnalysisData(OilAnalysisBean bean, Boolean isPage) {
if (isPage == true) if (isPage == true) {
{
PageHelper.startPage(bean.getPageNo(), bean.getPageSize()); PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
} }
//派遣员条件为账号和名字 //派遣员条件为账号和名字
if ( ! StringUtils.isEmpty(bean.getDispatcher()) ) if (!StringUtils.isEmpty(bean.getDispatcher())) {
{ if (bean.getDispatcher().matches("[\u4E00-\u9FA5]+")) {
if (bean.getDispatcher().matches("[\u4E00-\u9FA5]+"))
{
//内容是中文 //内容是中文
bean.setDispatcherZH(bean.getDispatcher()); bean.setDispatcherZH(bean.getDispatcher());
}else { } else {
//内容包含非中文 //内容包含非中文
bean.setDispatcherENG(bean.getDispatcher()); bean.setDispatcherENG(bean.getDispatcher());
} }
...@@ -41,75 +41,95 @@ public class OilAnalysisService extends BaseService<OilAnalysisDao> { ...@@ -41,75 +41,95 @@ public class OilAnalysisService extends BaseService<OilAnalysisDao> {
PageInfo<OilAnalysisEntity> pageInfo = null; PageInfo<OilAnalysisEntity> pageInfo = null;
List <OilAnalysisEntity> oilAnalysisEntityList = oilAnalysisDao.getOilAnalysisData(bean); List<OilAnalysisEntity> oilAnalysisEntityList = oilAnalysisDao.getOilAnalysisData(bean);
for (OilAnalysisEntity oilAnalysisEntity : oilAnalysisEntityList) for (OilAnalysisEntity oilAnalysisEntity : oilAnalysisEntityList) {
{
int index = oilAnalysisEntityList.indexOf(oilAnalysisEntity); int index = oilAnalysisEntityList.indexOf(oilAnalysisEntity);
oilAnalysisEntity.setNo(index+1); oilAnalysisEntity.setNo(index + 1);
String totalOil = oilAnalysisEntity.getTotalOil();
String[] oilArr = totalOil.split("/");
if (oilArr != null && oilArr.length == 2) {
String strKGS = oilArr[0];
String strLBS = oilArr[1];
if (strKGS.length() == 0)
{
strKGS = "0";
}
if (strLBS.length() == 0)
{
strKGS = "0";
}
oilAnalysisEntity.setTotalOilKGS(Integer.valueOf(strKGS.replaceAll("KGS","")));
oilAnalysisEntity.setTotalOilLBS(Integer.valueOf(strLBS.replaceAll("LBS","")));
}
String oilFuelReason = oilAnalysisEntity.getExtraOilFuelReason(); String oilFuelReason = oilAnalysisEntity.getExtraOilFuelReason();
if (!StringUtils.isEmpty(oilFuelReason)) if (!StringUtils.isEmpty(oilFuelReason)) {
{
String[] arr = oilFuelReason.split("\\|"); String[] arr = oilFuelReason.split("\\|");
for (int i = 0;i < arr.length;i++) for (int i = 0; i < arr.length; i++) {
{
String arrTemp = arr[i]; String arrTemp = arr[i];
String oilNum = ""; String oilNum = "";
String oilReason = ""; String oilReason = "";
String[] reasonArr = arrTemp.split(":"); String[] reasonArr = arrTemp.split(":");
if (arrTemp.indexOf(":") > 1) if (arrTemp.indexOf(":") > 1) {
{ if (reasonArr.length == 1) {
if (reasonArr.length == 1) //只有前面
{
//只有前面
oilNum = reasonArr[0]; oilNum = reasonArr[0];
oilReason = ""; oilReason = "";
}else if (reasonArr.length == 2){ } else if (reasonArr.length == 2) {
//前后都有 //前后都有
oilNum = reasonArr[0]; oilNum = reasonArr[0];
oilReason = reasonArr[1]; oilReason = reasonArr[1];
} }
}else { } else {
if (reasonArr.length == 1) if (reasonArr.length == 1) {
{
//只有后面 //只有后面
oilNum = ""; oilNum = "";
oilReason = reasonArr[1]; oilReason = reasonArr[1];
} }
} }
switch (i){ if (oilNum.length() == 0)
case 0 : {
oilNum = "0";
}
switch (i) {
case 0:
//起飞油量及原因 //起飞油量及原因
oilAnalysisEntity.setExtraOilFuelTakeoff(oilNum); oilAnalysisEntity.setExtraOilFuelTakeoff(Integer.valueOf(oilNum));
oilAnalysisEntity.setExtraOilFuelTakeoffReason(oilReason); oilAnalysisEntity.setExtraOilFuelTakeoffReason(oilReason);
break; break;
case 1 : case 1:
//到达额外油量及原因 //到达额外油量及原因
oilAnalysisEntity.setExtraOilFuelArr(oilNum); oilAnalysisEntity.setExtraOilFuelArr(Integer.valueOf(oilNum));
oilAnalysisEntity.setExtraOilFuelArrReason(oilReason); oilAnalysisEntity.setExtraOilFuelArrReason(oilReason);
break; break;
case 2 : case 2:
//航路额外油量及原因 //航路额外油量及原因
oilAnalysisEntity.setExtraOilFuelFlight(oilNum); oilAnalysisEntity.setExtraOilFuelFlight(Integer.valueOf(oilNum));
oilAnalysisEntity.setExtraOilFuelFlightReason(oilReason); oilAnalysisEntity.setExtraOilFuelFlightReason(oilReason);
break; break;
case 3 : case 3:
//其他额外油量及原因 //其他额外油量及原因
oilAnalysisEntity.setExtraOilFuelOther(oilNum); oilAnalysisEntity.setExtraOilFuelOther(Integer.valueOf(oilNum));
oilAnalysisEntity.setExtraOilFuelOtherReason(oilReason); oilAnalysisEntity.setExtraOilFuelOtherReason(oilReason);
break; break;
default : default:
} }
} }
} }
} }
if (oilAnalysisEntityList == null || oilAnalysisEntityList.size() == 0) { if (oilAnalysisEntityList == null || oilAnalysisEntityList.size() == 0) {
return null; return null;
} }
pageInfo = new PageInfo<OilAnalysisEntity>(oilAnalysisEntityList); pageInfo = new PageInfo<OilAnalysisEntity>(oilAnalysisEntityList);
if (pageInfo.getPages() < bean.getPageNo()) {// 页码大于总页数，则返回NULL if (pageInfo.getPages() < bean.getPageNo()) {// 页码大于总页数，则返回NULL
......
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