Showing
1 changed file
with
6 additions
and
0 deletions
| ... | ... | @@ -12,7 +12,9 @@ import com.lframework.starter.web.core.components.redis.RedisHandler; |
| 12 | 12 | import com.lframework.starter.web.core.components.security.SecurityUtil; |
| 13 | 13 | import com.lframework.starter.web.core.utils.*; |
| 14 | 14 | import com.lframework.starter.web.inner.service.system.SysUserService; |
| 15 | +import com.lframework.xingyun.basedata.entity.Workshop; | |
| 15 | 16 | import com.lframework.xingyun.basedata.service.customer.CustomerService; |
| 17 | +import com.lframework.xingyun.basedata.service.workshop.WorkshopService; | |
| 16 | 18 | import com.lframework.xingyun.sc.entity.CustomerCredit; |
| 17 | 19 | import com.lframework.xingyun.sc.entity.OrderInfoChangeRecord; |
| 18 | 20 | import com.lframework.starter.web.core.impl.BaseMpServiceImpl; |
| ... | ... | @@ -71,6 +73,8 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR |
| 71 | 73 | private MessageHandler messageHandler; |
| 72 | 74 | @Resource |
| 73 | 75 | private FlowTaskWrapperMapper flowTaskWrapperMapper; |
| 76 | + @Resource | |
| 77 | + private WorkshopService workshopService; | |
| 74 | 78 | |
| 75 | 79 | |
| 76 | 80 | @Override |
| ... | ... | @@ -207,6 +211,8 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR |
| 207 | 211 | data.setDeptId(vo.getDeptId()); |
| 208 | 212 | } |
| 209 | 213 | if (!StringUtil.isBlank(vo.getWorkshopId())) { |
| 214 | + Workshop workshop = workshopService.findById(vo.getWorkshopId()); | |
| 215 | + data.setWorkshopName(workshop == null ? null : workshop.getName()); | |
| 210 | 216 | data.setWorkshopId(vo.getWorkshopId()); |
| 211 | 217 | } |
| 212 | 218 | if (vo.getTotalQuantity() != null) { | ... | ... |