From 24a427846e654ff70973ab7665b357ba709dadd6 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期一, 21 六月 2021 17:13:13 +0800
Subject: [PATCH] 1、优化采购，新增物品退还等细节功能，以及流程审批通知2、优化报修和采购互通3、优化巡检任务
---
service-api/src/main/java/com/java110/api/bmo/inspection/impl/InspectionBMOImpl.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/inspection/impl/InspectionBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/inspection/impl/InspectionBMOImpl.java
old mode 100644
new mode 100755
index 42db10b..fb608c0
--- a/service-api/src/main/java/com/java110/api/bmo/inspection/impl/InspectionBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/inspection/impl/InspectionBMOImpl.java
@@ -4,10 +4,12 @@
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.inspection.IInspectionBMO;
import com.java110.core.context.DataFlowContext;
+import com.java110.dto.inspectionPlan.InspectionTaskDto;
import com.java110.intf.community.IInspectionPlanInnerServiceSMO;
import com.java110.intf.community.IInspectionRoutePointRelInnerServiceSMO;
import com.java110.dto.inspectionPlan.InspectionPlanDto;
import com.java110.dto.inspectionPlan.InspectionRoutePointRelDto;
+import com.java110.intf.community.IInspectionTaskInnerServiceSMO;
import com.java110.po.inspection.InspectionPlanPo;
import com.java110.po.inspection.InspectionPointPo;
import com.java110.po.inspection.InspectionRoutePo;
@@ -31,12 +33,14 @@
@Service("inspectionBMOImpl")
public class InspectionBMOImpl extends ApiBaseBMO implements IInspectionBMO {
-
@Autowired
private IInspectionPlanInnerServiceSMO inspectionPlanInnerServiceSMOImpl;
@Autowired
private IInspectionRoutePointRelInnerServiceSMO inspectionRoutePointRelInnerServiceSMOImpl;
+
+ @Autowired
+ private IInspectionTaskInnerServiceSMO inspectionTaskInnerServiceSMOImpl;
/**
* 娣诲姞灏忓尯淇℃伅
@@ -46,9 +50,12 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public void deleteInspectionPlan(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
InspectionPlanPo inspectionPlanPo = BeanConvertUtil.covertBean(paramInJson, InspectionPlanPo.class);
-
+ InspectionTaskDto inspectionTaskDto = new InspectionTaskDto();
+ inspectionTaskDto.setInspectionPlanId(inspectionPlanPo.getInspectionPlanId());
+ //鏍规嵁宸℃璁″垝id鏌ヨ宸℃浠诲姟
+ List<InspectionTaskDto> inspectionTaskDtos = inspectionTaskInnerServiceSMOImpl.queryInspectionTasks(inspectionTaskDto);
+ Assert.listIsNull(inspectionTaskDtos, "璇ュ贰妫�璁″垝姝ｅ湪浣跨敤锛屼笉鑳藉垹闄わ紒");
super.delete(dataFlowContext, inspectionPlanPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_INSPECTION_PLAN);
}
@@ -112,10 +119,12 @@
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
public void deleteInspectionPoint(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
-
InspectionPointPo inspectionPointPo = BeanConvertUtil.covertBean(paramInJson, InspectionPointPo.class);
-
+ InspectionRoutePointRelDto inspectionRoutePointRelDto = new InspectionRoutePointRelDto();
+ inspectionRoutePointRelDto.setInspectionId(inspectionPointPo.getInspectionId());
+ //鏌ヨ宸℃鐐瑰贰妫�璺嚎鍏崇郴琛�
+ List<InspectionRoutePointRelDto> inspectionRoutePointRelDtos = inspectionRoutePointRelInnerServiceSMOImpl.queryInspectionRoutePointRels(inspectionRoutePointRelDto);
+ Assert.listIsNull(inspectionRoutePointRelDtos, "璇ュ贰妫�鐐规鍦ㄤ娇鐢紝涓嶈兘鍒犻櫎锛�");
super.delete(dataFlowContext, inspectionPointPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_INSPECTION);
}
@@ -156,8 +165,12 @@
*/
public void deleteInspectionRoute(JSONObject paramInJson, DataFlowContext dataFlowContext) {
InspectionRoutePo inspectionRoutePo = BeanConvertUtil.covertBean(paramInJson, InspectionRoutePo.class);
+ InspectionPlanDto inspectionPlanDto = new InspectionPlanDto();
+ inspectionPlanDto.setInspectionRouteId(inspectionRoutePo.getInspectionRouteId());
+ //鏍规嵁宸℃璺嚎id鏌ヨ宸℃璁″垝
+ List<InspectionPlanDto> inspectionPlanDtos = inspectionPlanInnerServiceSMOImpl.queryInspectionPlans(inspectionPlanDto);
+ Assert.listIsNull(inspectionPlanDtos, "璇ュ贰妫�璺嚎姝ｅ湪浣跨敤锛屼笉鑳藉垹闄わ紒");
super.delete(dataFlowContext, inspectionRoutePo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_INSPECTION_ROUTE);
-
}
/**
@@ -224,4 +237,16 @@
super.insert(dataFlowContext, inspectionRoutePo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_INSPECTION_ROUTE);
}
+ /**
+ * 娣诲姞宸℃璺嚎淇℃伅
+ *
+ * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
+ * @param dataFlowContext 鏁版嵁涓婁笅鏂�
+ * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
+ */
+ public void updateInspectionRoutePointRel(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ InspectionRoutePointRelPo inspectionRoutePointRelPo = BeanConvertUtil.covertBean(paramInJson, InspectionRoutePointRelPo.class);
+ super.update(dataFlowContext, inspectionRoutePointRelPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_INSPECTION_ROUTE_POINT_REL);
+ }
+
}
--
Gitblit v1.8.0