设备分类

“linengliang”

2023-08-29 14b1e801322db00b6b0d8dd059b9720adeb21bd8

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionParametersTemplateController.java

@@ -16,6 +16,7 @@
import org.jeecg.common.system.query.QueryGenerator;
//import org.jeecg.modules.base.service.IUnitService;
import org.jeecg.modules.eam.entity.PrecisionParameters;
import org.jeecg.modules.eam.entity.PrecisionParametersCategory;
import org.jeecg.modules.eam.entity.PrecisionParametersTemplate;
import org.jeecg.modules.eam.entity.PrecisionParametersTemplateDetail;
import org.jeecg.modules.eam.service.IPrecisionParametersCategoryService;
@@ -77,12 +78,29 @@
            List<PrecisionParametersTemplateDetail> precisionParametersTemplateDetailList = precisionParametersTemplateDetailService.lambdaQuery().eq(PrecisionParametersTemplateDetail::getPrecisionParametersTemplateId, record.getId()).eq(PrecisionParametersTemplateDetail::getDelFlag, CommonConstant.DEL_FLAG_0).list();
            for (PrecisionParametersTemplateDetail precisionParametersTemplateDetail : precisionParametersTemplateDetailList) {
                PrecisionParameters precisionParameters = precisionParametersService.getById(precisionParametersTemplateDetail.getPrecisionParametersId());
                precisionParametersTemplateDetail.setPrecisionParametersNum(precisionParameters.getNum());
                precisionParametersTemplateDetail.setPrecisionParametersName(precisionParameters.getName());
                precisionParametersTemplateDetail.setPrecisionParametersCategory(precisionParametersCategoryService.getById(precisionParameters.getPrecisionParametersCategoryId()).getName());
//            precisionParametersTemplateDetail.setUnit(unitService.getById(precisionParameters.getUnitId()).getName());
                String unitName = sysBaseApi.getUnitNameById(precisionParameters.getUnitId());
                precisionParametersTemplateDetail.setUnit(unitName);

                    if(precisionParameters != null){
                        String num = precisionParameters.getNum();
                        String name =precisionParameters.getName();
                        if (num!=null){
                            precisionParametersTemplateDetail.setPrecisionParametersNum(num);
                        }
                       if (name!=null){
                           precisionParametersTemplateDetail.setPrecisionParametersName(name);
                       }
                        String id = precisionParameters.getPrecisionParametersCategoryId();
                        if (id!=null){
                            PrecisionParametersCategory precisionParametersCategory = precisionParametersCategoryService.getById(id);
                            precisionParametersTemplateDetail.setPrecisionParametersCategory(precisionParametersCategory.getName());
                        }
                    }else{
                        precisionParametersTemplateDetail.setPrecisionParametersCategory("/");
                    }
                    if (precisionParameters!=null){
                        String unitName = sysBaseApi.getUnitNameById(precisionParameters.getUnitId());
                        precisionParametersTemplateDetail.setUnit(unitName);
                    }


            }
            record.setPrecisionParametersTemplateDetailList(precisionParametersTemplateDetailList);