Commit 90bd8e6d by 王力

Merge branch 'dev_engineer_recommand0714' into 'develop'

Dev engineer recommand0714

See merge request !238
2 parents 4e50659c f43c4c68
......@@ -3,7 +3,12 @@ package com.dituhui.pea.order.dao;
import com.dituhui.pea.order.entity.OrgTeamEngineer;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface OrgTeamEngineerMPDao extends BaseMapper<OrgTeamEngineer> {
@Select("select * from org_team_engineer where team_id = #{teamId}")
List<OrgTeamEngineer> selectByTeamId(String teamId);
}
......@@ -227,6 +227,8 @@ public class OrderAssignImpl implements OrderAssign {
throw new BusinessException("改约日期不能小于今日");
}
LocalDate originDate = order.getDt(); // 改约前的日期
// 更新order_request表为未指派
order.setAppointmentStatus("NOT_ASSIGNED");
order.setDt(expectBegin.toLocalDate());
......@@ -238,7 +240,7 @@ public class OrderAssignImpl implements OrderAssign {
// 更新order_appointment表为未指派
LambdaUpdateWrapper<OrderAppointment> appWrapper = new LambdaUpdateWrapper<>();
appWrapper.set(OrderAppointment::getStatus, "RESCHEDULED")
.eq(OrderAppointment::getOrderId, orderId).eq(OrderAppointment::getDt, order.getDt());
.eq(OrderAppointment::getOrderId, orderId).eq(OrderAppointment::getDt, originDate);
orderAppointmentMPDao.update(null, appWrapper);
// 登记事件
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!