市政工程|工业工程 查询历史请求方式修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringIndustryController.java

@@ -110,8 +110,8 @@ public class ZEngineeringIndustryController extends BaseController {
      */
     @SaCheckPermission("zdsz:engineeringIndustry:query")
     @GetMapping("/{id}/{type}")
-    public R<ZEngineeringIndustryVo> query(@NotNull(message = "主键不能为空") @PathVariable String id, @NotNull(message = "节点类型不能为空") @PathVariable String type) {
-        return R.ok(iZEngineeringIndustryService.query(id,type));
+    public R<ZEngineeringIndustryVo> query(@NotNull(message = "主键不能为空") @PathVariable String id) {
+        return R.ok(iZEngineeringIndustryService.query(id));
     }
 
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringIndustryVo.java

@@ -20,7 +20,7 @@ import java.util.List;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class ZEngineeringIndustryVo extends BaseEntity implements Serializable {
+public class ZEngineeringIndustryVo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -109,6 +109,8 @@ public class ZEngineeringIndustryVo extends BaseEntity implements Serializable {
     private String enginClassification;
 
     private ZEngineeringNodeBo zEngineeringNodeBo;
+
     private List<ZEngineeringNodeBo> zEngineeringNodeBoList;
+
     private List<ZEngiineeringPhotoVo> pics;
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringIndustryService.java

@@ -47,5 +47,5 @@ public interface IZEngineeringIndustryService {
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
-    ZEngineeringIndustryVo query(String id, String type);
+    ZEngineeringIndustryVo query(String id);
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringIndustryServiceImpl.java

@@ -87,7 +87,6 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     }
 
     private LambdaQueryWrapper<ZEngineeringIndustry> buildQueryWrapper(ZEngineeringIndustryBo bo) {
-        Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<ZEngineeringIndustry> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringIndustry::getEnginType, bo.getEnginType());
         lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringIndustry::getEnginName, bo.getEnginName());
@@ -231,12 +230,11 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
     }
 
     @Override
-    public ZEngineeringIndustryVo query(String id, String type) {
+    public ZEngineeringIndustryVo query(String id) {
         ZEngineeringIndustryVo zEngineeringIndustryVo = baseMapper.selectVoById(id);
         ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
         zEngineeringNodeBo.setCreateTime(zEngineeringIndustryVo.getCreateTime());
         zEngineeringNodeBo.setCivliId(zEngineeringIndustryVo.getId());
-        zEngineeringNodeBo.setType(type);
         zEngineeringIndustryVo.setZEngineeringNodeBo(izEngineeringNodeService.query(zEngineeringNodeBo));
         return zEngineeringIndustryVo;
     }