|
@@ -18,6 +18,7 @@ import org.jeecg.modules.ordermanager.entity.HwOrderProcessDetail;
|
|
|
import org.jeecg.modules.ordermanager.mapper.HwOrderMapper;
|
|
import org.jeecg.modules.ordermanager.mapper.HwOrderMapper;
|
|
|
import org.jeecg.modules.ordermanager.service.IHwOrderProcessDetailService;
|
|
import org.jeecg.modules.ordermanager.service.IHwOrderProcessDetailService;
|
|
|
import org.jeecg.modules.ordermanager.service.IHwOrderService;
|
|
import org.jeecg.modules.ordermanager.service.IHwOrderService;
|
|
|
|
|
+import org.jeecg.modules.requiremanager.mapper.HwRequirementMapper;
|
|
|
import org.jeecg.modules.requiremanager.service.IHwEnrollmentService;
|
|
import org.jeecg.modules.requiremanager.service.IHwEnrollmentService;
|
|
|
import org.jeecg.modules.requiremanager.service.IHwRequirementService;
|
|
import org.jeecg.modules.requiremanager.service.IHwRequirementService;
|
|
|
import org.jeecg.modules.requiremanager.service.impl.HwRequirementServiceImpl;
|
|
import org.jeecg.modules.requiremanager.service.impl.HwRequirementServiceImpl;
|
|
@@ -49,7 +50,7 @@ public class HwOrderServiceImpl extends ServiceImpl<HwOrderMapper, HwOrder> impl
|
|
|
@Resource
|
|
@Resource
|
|
|
private HwOrderMapper hwOrderMapper;
|
|
private HwOrderMapper hwOrderMapper;
|
|
|
@Resource
|
|
@Resource
|
|
|
- private HwRequirementServiceImpl hwRequirementService;
|
|
|
|
|
|
|
+ private HwRequirementMapper hwRequirementMapper;
|
|
|
@Resource
|
|
@Resource
|
|
|
private IHwUserService hwUserService;
|
|
private IHwUserService hwUserService;
|
|
|
|
|
|
|
@@ -273,7 +274,7 @@ public class HwOrderServiceImpl extends ServiceImpl<HwOrderMapper, HwOrder> impl
|
|
|
String id = requestMap.get("orderId"); //订单主键id
|
|
String id = requestMap.get("orderId"); //订单主键id
|
|
|
HwOrderAPI hwOrderAPI = this.getHwOrderAPIById(id);
|
|
HwOrderAPI hwOrderAPI = this.getHwOrderAPIById(id);
|
|
|
hwOrderAPI.setWorkContract(OSSConfig.JAVA4ALL_SAVE_PATH+hwOrderAPI.getWorkContract());
|
|
hwOrderAPI.setWorkContract(OSSConfig.JAVA4ALL_SAVE_PATH+hwOrderAPI.getWorkContract());
|
|
|
- HwRequirementAPI hwRequirementAPI=hwRequirementService.getRequirementById(String.valueOf(hwOrderAPI.getRequirementId()));
|
|
|
|
|
|
|
+ HwRequirementAPI hwRequirementAPI=hwRequirementMapper.getRequirementById(String.valueOf(hwOrderAPI.getRequirementId()));
|
|
|
List<HwOrderProcessDetailAPI> hwOrderProcessDetailAPIList=hwOrderProcessDetailService.getOrderProcessDetailAPIListByOrderId(hwOrderAPI.getId());
|
|
List<HwOrderProcessDetailAPI> hwOrderProcessDetailAPIList=hwOrderProcessDetailService.getOrderProcessDetailAPIListByOrderId(hwOrderAPI.getId());
|
|
|
returnMap.put("hwOrderAPI", hwOrderAPI);
|
|
returnMap.put("hwOrderAPI", hwOrderAPI);
|
|
|
returnMap.put("hwOrderProcessDetailAPIList", hwOrderProcessDetailAPIList);
|
|
returnMap.put("hwOrderProcessDetailAPIList", hwOrderProcessDetailAPIList);
|