优化

olive-console/src/main/java/com/zrqx/olive/project/dao/StatisticsProjectDao.java

@@ -16,20 +16,20 @@ public interface StatisticsProjectDao extends BaseMapper<StatisticsProject> {
 			+ "select id,project,customer,customer_id,name,status,DATE_FORMAT(start_time,'%Y-%m-%d') start_time,total_apply_time total,"
 			+ "DATE_FORMAT(end_time,'%Y-%m-%d') end_time,px,presale,to_be_allocated FROM t_statistics_project where 1=1 "
 			// 项目负责人
-			+ "<if test = 'form.name !=\"\" and form.name !=null'> "
+			+ "<if test = 'form.name !=null'> "
 			+ "AND name like concat('%', #{form.name},'%') "
 			+ "</if>"
-			+ "<if test = 'form.project !=\"\" and form.project !=null'> "
-			+ "AND project like concat('%',#{form.project},'%')"
+			+ "<if test = 'form.project !=null'> "
+			+ "AND project like concat(#{form.project},'%') "
 			+ "</if>"
-			+ "<if test = 'form.customer !=\"\" and form.customer !=null'> "
+			+ "<if test = 'form.customer !=null'> "
 			+ "AND customer like concat('%',#{form.customer},'%') "
 			+ "</if>"
 			// 项目状态
 			+ "<if test = 'form.status!=\"\" and form.status!=null'> "
 			+ " AND status = #{form.status} "
 			+ "</if>"
-			+ "<if test = 'form.presale!=\"\" and form.presale!=null'> "
+			+ "<if test = 'form.presale!=null'> "
 			+ " AND presale = #{form.presale} "
 			+ "</if>"
 			+ "</script>")

olive-console/src/main/java/com/zrqx/olive/timeApply/dao/TimeApplyChangeDao.java

@@ -133,7 +133,7 @@ public interface TimeApplyChangeDao extends BaseMapper<TimeApplyChange>{
 					+ " and status2 = 5"
 					+ "</if>" 
 			+ "</if>"
-					+" order by c.create_time desc"
+					+" order by create_time desc"
 			+ "</script>")
 	List<TimeApplyChangeVo> selectTimeApplyChange(@Param("form") TimeApplyChangeForm form);
 
@@ -145,7 +145,7 @@ public interface TimeApplyChangeDao extends BaseMapper<TimeApplyChange>{
 			+ "<if test = 'form.status == 3'>"
 			+ " and status2 = 3 "
 			+ "</if>"
-			+ " order by c.create_time desc"
+			+ " order by create_time desc"
 			+ "</script>")
 	List<TimeApplyChangeVo> pageTimeApply1(@Param("form") TimeApplyChangeForm form);
 	
@@ -157,7 +157,7 @@ public interface TimeApplyChangeDao extends BaseMapper<TimeApplyChange>{
 			+ "<if test = 'form.status == 3'>"
 			+ " and status2 = 3 "
 			+ "</if>"
-			+ " order by c.create_time desc"
+			+ " order by create_time desc"
 			+ "</script>")
 	List<TimeApplyChangeVo> pageTimeApply2(@Param("form") TimeApplyChangeForm form);
 	@Select("<script>"