Commit 5449a841 authored by yajun.zhang's avatar yajun.zhang

添加查询时间条件

parent feccee0b
package cn.quantgroup.customer.rest.vo.thirdworkorder; package cn.quantgroup.customer.rest.vo.thirdworkorder;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -112,6 +113,7 @@ public class ThirdWorkOrderExportVo implements Serializable { ...@@ -112,6 +113,7 @@ public class ThirdWorkOrderExportVo implements Serializable {
/** /**
* 订单状态 * 订单状态
*/ */
@ExcelIgnore
private Integer orderStatus; private Integer orderStatus;
......
...@@ -264,7 +264,9 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService { ...@@ -264,7 +264,9 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
if (StringUtils.isNotBlank(param.getAcceptUser())){ if (StringUtils.isNotBlank(param.getAcceptUser())){
conditionSql.append("and assignee.assignee='"+param.getAcceptUser()+"' "); conditionSql.append("and assignee.assignee='"+param.getAcceptUser()+"' ");
} }
if (StringUtils.isNotBlank(param.getStartTime()) &&StringUtils.isNotBlank(param.getEndTime()) ) {
conditionSql.append("and lc.create_time >='" + param.getStartTime() + "' and lc.create_time <= '"+param.getEndTime()+"'");
}
if (StringUtils.isNotBlank(conditionSql.toString())){ if (StringUtils.isNotBlank(conditionSql.toString())){
sql.append(" where "+conditionSql.toString().substring(3)); sql.append(" where "+conditionSql.toString().substring(3));
countSql.append(" where "+conditionSql.toString().substring(3)); countSql.append(" where "+conditionSql.toString().substring(3));
......
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