Changes11

Fixiaobai

2023-11-09 3059430a0db3f75426e435c06090358646fc3792

 mes-basic/src/main/java/com/chinaztt/mes/basic/controller/ParamController.java

@@ -59,6 +59,19 @@
   private final ParamService paramService;

   private DictUtils dictUtils;



   @ApiOperation(value = "分页模板查询", notes = "分页查询")
   @GetMapping("/pageInModel")
   @PreAuthorize("@pms.hasPermission('technology_param_view','product_workbench')")
   public R getParamPageInModel(Page page, ParamDTO param) {
      QueryWrapper<Param> gen = QueryWrapperUtil.gen(param);
      gen.lambda().eq(Param::getParentId,0L);
      return R.ok(paramService.page(page, gen));
   }


   /**
    * 分页查询
    *
@@ -92,7 +105,7 @@
            oneMap.put("paramItem",pojo.get("parameterItem"));
            oneMap.put("paramItemTwo","");
            oneMap.put("paramItemThree","");
            oneMap.put("oneId",pojo.get("id"));
            oneMap.put("oneId",StringUtils.defaultString( String.valueOf(pojo.get("id")),""));
            oneMap.put("paramType",StringUtils.defaultString((String) pojo.get("type"),""));
            oneMap.put("paramFormat",StringUtils.defaultString((String) pojo.get("parameterFormat"),""));
            oneMap.put("unit",StringUtils.defaultString((String) pojo.get("unit"),""));
@@ -122,9 +135,9 @@
               Map<String,Object> allMap = new HashMap<>();
               allMap.put("code",pojo.get("code"));
               allMap.put("paramItem",StringUtils.defaultString((String) pojo.get("parameterItem"),""));
               allMap.put("oneId",pojo.get("id"));
               allMap.put("twoId",second.get("id"));
               allMap.put("threeId",t.getId());
               allMap.put("oneId",StringUtils.defaultString( String.valueOf(pojo.get("id")),""));
               allMap.put("twoId",StringUtils.defaultString( String.valueOf(second.get("id")) ,""));
               allMap.put("threeId",StringUtils.defaultString(String.valueOf(t.getId()),""));
               allMap.put("paramItemTwo",StringUtils.defaultString((String) second.get("parameterItem"),""));
               allMap.put("paramItemThree",StringUtils.defaultString(t.getParameterItem(),""));
               allMap.put("paramType",StringUtils.defaultString(t.getType(),""));