1.修改pda维修页面

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicPdaController.java

@@ -19,7 +19,9 @@ package com.logpm.basic.controller;
 
 import com.logpm.basic.entity.BasicPdaEntity;
 import com.logpm.basic.excel.BasicPdaExcel;
+import com.logpm.basic.feign.IBasicPdarecordsClient;
 import com.logpm.basic.service.IBasicPdaService;
+import com.logpm.basic.service.IBasicPdarecordsService;
 import com.logpm.basic.vo.BasicPdaVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -62,7 +64,7 @@ public class BasicPdaController extends BladeController {
 
 	private final IBasicPdaService basicPdaService;
 
-	private final IDictBizClient iDictBizClient;
+	private final IBasicPdarecordsService basicPdarecordsService;
 
 	/**
 	 * pda信息 详情
@@ -138,7 +140,10 @@ public class BasicPdaController extends BladeController {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(basicPdaService.deleteLogic(Func.toLongList(ids)));
+		List<Long> longs = Func.toLongList(ids);
+		//删除维修记录
+		basicPdarecordsService.deleteByMasterId(longs);
+		return R.status(basicPdaService.deleteLogic(longs));
 	}
 
 

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicPdarecordsService.java

@@ -49,5 +49,10 @@ public interface IBasicPdarecordsService extends BaseService<BasicPdarecordsEnti
 	 * @return
 	 */
 	List<BasicPdarecordsExcel> exportBasicPdarecords(Wrapper<BasicPdarecordsEntity> queryWrapper);
-
+	/**
+	 * 删除维修记录
+	 *
+	 * @return
+	 */
+	Integer deleteByMasterId(List<Long> longs);
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicDelineMiddleServiceImpl.java

@@ -64,6 +64,7 @@ public class BasicDelineMiddleServiceImpl extends BaseServiceImpl<BasicDelineMid
 	@Override
 	public Boolean saveByDTO(BasicDelineDTO basicDeline) {
 		ArrayList<BasicDelineMiddleEntity> list = new ArrayList<>();
+		//子表新增
 		basicDeline.getDelinenode().forEach(e->{
 			BasicDelineMiddleEntity basicDelineMiddleEntity = new BasicDelineMiddleEntity();
 			basicDelineMiddleEntity.setDelineId(basicDeline.getId());

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicPdarecordsServiceImpl.java

@@ -16,7 +16,9 @@
  */
 package com.logpm.basic.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.basic.dto.BasicPdarecordsDTO;
+import com.logpm.basic.entity.BasicLineNodeEntity;
 import com.logpm.basic.entity.BasicPdarecordsEntity;
 import com.logpm.basic.vo.BasicPdarecordsVO;
 import com.logpm.basic.excel.BasicPdarecordsExcel;
@@ -52,4 +54,10 @@ public class BasicPdarecordsServiceImpl extends BaseServiceImpl<BasicPdarecordsM
 		return basicPdarecordsList;
 	}
 
+	@Override
+	public Integer deleteByMasterId(List<Long> longs) {
+		QueryWrapper<BasicPdarecordsEntity> wrapper = new QueryWrapper();
+		return baseMapper.delete(wrapper.lambda().in(BasicPdarecordsEntity::getMasterId,longs));
+	}
+
 }