anderx лет назад: 7
Родитель
Сommit
ef1fdd1877

+ 1 - 1
src/main/java/com/goafanti/common/dao/TTaskHoursMapper.java

@@ -80,5 +80,5 @@ public interface TTaskHoursMapper {
 
 	List<TOrderTaskListBo> getOrderDunData(String name, String taskId, String starTime, String endTime);
 
-	List<TOrderTaskListBo> getTaskHoursData( @Param("name")String name,  @Param("taskId")String taskId,  @Param("starTime")String starTime,  @Param("endTime")String endTime);
+	List<TOrderTaskListBo> getTaskHoursData( @Param("name")String name,  @Param("taskId")String taskId,  @Param("startTime")String startTime,  @Param("endTime")String endTime);
 }

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TTaskHoursMapper.xml

@@ -336,8 +336,8 @@
   	<if test="taskId != null and taskId != ''">
   	and a.id= #{taskId,jdbcType=VARCHAR}
   	</if>
-  	<if test="starTime !=null and endTime !=null starTime !='' and endTime !=''">
-  	and a.task_start_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+  	<if test="startTime !=null and endTime !=null and startTime !='' and endTime !=''">
+  	and a.task_start_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
   	order by  a.task_start_time desc
   </select>

+ 1 - 1
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -411,7 +411,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	@RequestMapping(value = "/technicianBackOrder", method = RequestMethod.POST)
 	public Result technicianBackOrder(String orderNo,String reason){
 		Result res = new Result();
-		int i=orderNewService.technicianBackOrder(orderNo, reason);
+		int i=orderNewService.updatetechnicianBackOrder(orderNo, reason);
 		if (i==-1) {
 			res.getError().add(buildError("不符合驳回条件","不符合驳回条件"));
 			return res;

+ 1 - 1
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -159,7 +159,7 @@ public interface OrderNewService {
 	int updateOrderOver(String orderNo);
 	OrderRefundDetailBo orderRefundDetail(String id);
 	int updateOrderRefund(TOrderRefundWithBLOBs t);
-	int technicianBackOrder(String orderNo, String reason);
+	int updatetechnicianBackOrder(String orderNo, String reason);
 	List<OrderDunTaskBo> selectAllOrderDun();
 	void updateOrderDun(TOrderDun tDun);
 	void addNoticAndSendEmail(String orderNo, OrderDunTaskBo t, Integer code)throws UnsupportedEncodingException, MessagingException;

+ 2 - 2
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -562,9 +562,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 	@Override
-	public int technicianBackOrder(String orderNo,String reason) {
+	public int updatetechnicianBackOrder(String orderNo,String reason) {
 		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
-		if (t.getSettlementAmount().compareTo(new BigDecimal(0))==0||
+		if (t.getSettlementAmount().compareTo(new BigDecimal(0))!=0||
 				t.getProcessStatus()>ProcessStatus.YPZXSGLY.getCode()) {
 			return -1;
 		}

+ 3 - 3
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -248,9 +248,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 	@SuppressWarnings("null")
 	@Override
-	public XSSFWorkbook exportTaskHoursListData(String name, String taskId, String starTime, String endTime) {
-		if(endTime!=null) endTime=endTime+" 23:59:59";
-		List<TOrderTaskListBo> list=tTaskHoursMapper.getTaskHoursData(name,taskId,starTime,endTime);
+	public XSSFWorkbook exportTaskHoursListData(String name, String taskId, String startTime, String endTime) {
+		if(StringUtils.isNoneBlank(endTime)) endTime=endTime+" 23:59:59";
+		List<TOrderTaskListBo> list=tTaskHoursMapper.getTaskHoursData(name,taskId,startTime,endTime);
 		if (list==null && list.size()==0) {
 			return null;
 		}