Commit bc0ee881 by Lenovo

调机修改

parent 06ebe087
...@@ -53,7 +53,8 @@ public class StatisticalController{ ...@@ -53,7 +53,8 @@ public class StatisticalController{
if(message == null){ if(message == null){
// 参数校验为通过 // 参数校验为通过
PageEntity<StatisticalEntity> list = statisticalService.getStatisticalList(bean); PageEntity<StatisticalEntity> list = statisticalService.getStatisticalList(bean);
if(list == null){// 查询结果为空 // 查询结果为空
if (list == null) {
responseBean.setMessage(GConstants.EMPTY); responseBean.setMessage(GConstants.EMPTY);
responseBean.setStatus(ErrorCode.STATUS_CODE_2001); responseBean.setStatus(ErrorCode.STATUS_CODE_2001);
return responseBean; return responseBean;
......
...@@ -76,8 +76,9 @@ public class StatisticalService extends BaseService<StatisticalDao> { ...@@ -76,8 +76,9 @@ public class StatisticalService extends BaseService<StatisticalDao> {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String format = sdf.format(date); String format = sdf.format(date);
if ("05".equals(e.getVerifType())) { if ("05".equals(e.getVerifType())) {
if (null != startTime && format == startTime) { //调机类型,如果当天为开航时间,有效期为1天,否则设置为负数,前端判断有效期为负数,显示--
e.setExpiryDate(10 + ""); if (null != startTime && format.equals(startTime)) {
e.setExpiryDate(1 + "");
} else { } else {
e.setExpiryDate(-10 + ""); e.setExpiryDate(-10 + "");
} }
......
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