fix点检内容-编辑、删除、批量删除

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckContent/controller/CmmsSpotcheckContentController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.cmmsSpotcheckContent.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,9 +28,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -162,9 +161,15 @@ public class CmmsSpotcheckContentController extends JeecgController<CmmsSpotchec
 	public Result<String> edit(@RequestBody CmmsSpotcheckContentAddDTO dto) {
 		CmmsSpotcheckContent cmmsSpotcheckContent = CmmsSpotcheckContentConvert.INSTANCE.convert(dto);
 
-		Map<String, Object> columnMap = new HashMap<>();
-		columnMap.put("spotcheckcontid",dto.getId());
-		spotcheckContentItemService.removeByMap(columnMap);
+		LambdaQueryWrapper<CmmsSpotcheckContentItem> lambdaQueryWrapper = new LambdaQueryWrapper();
+		lambdaQueryWrapper.eq(CmmsSpotcheckContentItem::getSpotcheckcontid,dto.getId());
+		spotcheckContentItemService.remove(lambdaQueryWrapper);
+
+		if(cmmsSpotcheckContent.getStatus()!=null && !"".equals(cmmsSpotcheckContent.getStatus())){
+			if(cmmsSpotcheckContent.getStatus().equals("0")){
+				cmmsSpotcheckContentService.updateStatusByEquipmentid(cmmsSpotcheckContent.getEquipmentid(),"1");
+			}
+		}
 
 		List<CmmsSpotcheckContentItem> contentItemList = dto.getSpotcheckContentItemList();
 		if (contentItemList != null && contentItemList.size() > 0) {
@@ -187,9 +192,9 @@ public class CmmsSpotcheckContentController extends JeecgController<CmmsSpotchec
 	//@RequiresPermissions("org.jeecg.modules:cmms_spotcheck_content:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		Map<String, Object> columnMap = new HashMap<>();
-		columnMap.put("spotcheckcontid",id);
-		spotcheckContentItemService.removeByMap(columnMap);
+		LambdaQueryWrapper<CmmsSpotcheckContentItem> lambdaQueryWrapper = new LambdaQueryWrapper();
+		lambdaQueryWrapper.eq(CmmsSpotcheckContentItem::getSpotcheckcontid,id);
+		spotcheckContentItemService.remove(lambdaQueryWrapper);
 		cmmsSpotcheckContentService.removeById(id);
 		return Result.OK("删除成功!");
 	}
@@ -206,9 +211,9 @@ public class CmmsSpotcheckContentController extends JeecgController<CmmsSpotchec
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		for (String id: Arrays.asList(ids.split(","))){
-			Map<String, Object> columnMap = new HashMap<>();
-			columnMap.put("spotcheckcontid",id);
-			spotcheckContentItemService.removeByMap(columnMap);
+			LambdaQueryWrapper<CmmsSpotcheckContentItem> lambdaQueryWrapper = new LambdaQueryWrapper();
+			lambdaQueryWrapper.eq(CmmsSpotcheckContentItem::getSpotcheckcontid,id);
+			spotcheckContentItemService.remove(lambdaQueryWrapper);
 		}
 		this.cmmsSpotcheckContentService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");