修改

jinlin

2024-08-02 0d2203b4027ae3bf524d63da67202e778648e4cf

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/XhProductModelService.java

@@ -61,29 +61,43 @@
        super.deleteLogic(ids);
    }

    public List<XhProductModel> getAllTree(Boolean showXdy, Integer ztShow) {
    public List<XhProductModel> getAllTree(Boolean showXdy, Integer ztShow, Long productId) {
        List<XhProductModel> productList = null;
        if (showXdy) {
            productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                    Constant.Bool.NO).ne("product_type", 5).orderByAsc(Constant.TableColumn.SORT));
        } else {
            if (ztShow == 1) {
            if (productId != null) {
                productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                        Constant.Bool.NO).lt("product_type", 5).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
            } else if (ztShow == 2) {
                        Constant.Bool.NO).ne("product_type", 5).and(wrapper -> wrapper.eq("ship_id", productId).or().eq("id", productId)).orderByAsc(Constant.TableColumn.SORT));
            } else {
                productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                        Constant.Bool.NO).lt("product_type", 4).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
            } else if (ztShow == 3) {
                productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                        Constant.Bool.NO).lt("product_type", 3).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
            }else if (ztShow == 4) {
                productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                        Constant.Bool.NO).lt("product_type", 5).ne("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
            }else if (ztShow == 5) {
                productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                        Constant.Bool.NO).gt("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
                        Constant.Bool.NO).ne("product_type", 5).orderByAsc(Constant.TableColumn.SORT));
            }

        } else {
            if (productId == null) {
                if (ztShow == 1) {
                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                            Constant.Bool.NO).lt("product_type", 5).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
                } else if (ztShow == 2) {
                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                            Constant.Bool.NO).lt("product_type", 4).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
                } else if (ztShow == 3) {
                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                            Constant.Bool.NO).lt("product_type", 3).ne("product_type", 10).orderByAsc(Constant.TableColumn.SORT));
                } else if (ztShow == 4) {
                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                            Constant.Bool.NO).lt("product_type", 5).ne("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
                } else if (ztShow == 5) {
                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                            Constant.Bool.NO).gt("product_type", 1).orderByAsc(Constant.TableColumn.SORT));
                }
            } else {
                if (ztShow == 4) {
                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                            Constant.Bool.NO).lt("product_type", 5).ne("product_type", 1).and(wrapper -> wrapper.eq("ship_id", productId).or().eq("id", productId)).orderByAsc(Constant.TableColumn.SORT));
                } else if (ztShow == 5) {
                    productList = baseDao.selectList(new QueryWrapper<XhProductModel>().eq(Constant.TableColumn.IS_DELETE,
                            Constant.Bool.NO).gt("product_type", 1).and(wrapper -> wrapper.eq("ship_id", productId).or().eq("id", productId)).orderByAsc(Constant.TableColumn.SORT));
                }
            }
        }
        return TreeUtils.build(productList);
    }
@@ -137,7 +151,7 @@
        if (productList.size() > 0) {
            this.deleteByShipId(shipId);
        }
        if (dataList.size()>0){
        if (dataList.size() > 0) {
            paramDataService.deleteByShipId(shipId);
        }

@@ -293,43 +307,43 @@
                    itemEntity.setPageCode("expect");
                    itemEntity.setReliabDistribType(reliabType.get(reliabDistribType));
                    itemEntity.setBasicJoinCompute(isOrNot.get(basicJoinCompute));
                    if (StringUtils.isNotBlank(basicMtbfRegulate)){
                    if (StringUtils.isNotBlank(basicMtbfRegulate)) {
                        itemEntity.setBasicMtbfRegulate(Double.valueOf(basicMtbfRegulate));
                    }
                    if (StringUtils.isNotBlank(basicMtbfRegulSuccRate)){
                    if (StringUtils.isNotBlank(basicMtbfRegulSuccRate)) {
                        itemEntity.setBasicMtbfRegulSuccRate(Double.valueOf(basicMtbfRegulSuccRate));
                    }
                    if (StringUtils.isNotBlank(basicMtbfOperatingRatio)){
                    if (StringUtils.isNotBlank(basicMtbfOperatingRatio)) {
                        itemEntity.setBasicMtbfOperatingRatio(Double.valueOf(basicMtbfOperatingRatio));
                    }else{
                    } else {
                        itemEntity.setBasicMtbfOperatingRatio(1.0);
                    }
                    if (StringUtils.isNotBlank(taskMtbcfRegulate)){
                    if (StringUtils.isNotBlank(taskMtbcfRegulate)) {
                        itemEntity.setTaskMtbcfRegulate(Double.valueOf(taskMtbcfRegulate));
                    }
                    if (StringUtils.isNotBlank(taskMtbcfOtherParams2)){
                    if (StringUtils.isNotBlank(taskMtbcfOtherParams2)) {
                        itemEntity.setTaskMtbcfOtherParams2(Double.valueOf(taskMtbcfOtherParams2));
                    }
                    if (StringUtils.isNotBlank(taskMtbcfOtherParams3)){
                    if (StringUtils.isNotBlank(taskMtbcfOtherParams3)) {
                        itemEntity.setTaskMtbcfOtherParams3(Double.valueOf(taskMtbcfOtherParams3));
                    }
                    if (StringUtils.isNotBlank(taskMtbcfRegulSuccRate)){
                    if (StringUtils.isNotBlank(taskMtbcfRegulSuccRate)) {
                        itemEntity.setTaskMtbcfRegulSuccRate(Double.valueOf(taskMtbcfRegulSuccRate));
                    }
                    if (StringUtils.isNotBlank(taskMtbcfOperatingRatio)){
                    if (StringUtils.isNotBlank(taskMtbcfOperatingRatio)) {
                        itemEntity.setTaskMtbcfOperatingRatio(Double.valueOf(taskMtbcfOperatingRatio));
                    }else{
                    } else {
                        itemEntity.setTaskMtbcfOperatingRatio(1.0);
                    }
                    itemEntity.setRepairable(isOrNot.get(repairable));
                    itemEntity.setRepairDistribType(repairType.get(repairDistribType));
                    if (StringUtils.isNotBlank(repairMttcr)){
                    if (StringUtils.isNotBlank(repairMttcr)) {
                        itemEntity.setRepairMttcr(Double.valueOf(repairMttcr));
                    }
                    if (StringUtils.isNotBlank(repairMttcrOtherParams2)){
                    if (StringUtils.isNotBlank(repairMttcrOtherParams2)) {
                        itemEntity.setRepairMttcrOtherParams2(Double.valueOf(repairMttcrOtherParams2));
                    }
                    if (StringUtils.isNotBlank(repairMttcrOtherParams3)){
                    if (StringUtils.isNotBlank(repairMttcrOtherParams3)) {
                        itemEntity.setRepairMttcrOtherParams3(Double.valueOf(repairMttcrOtherParams3));
                    }
                    paramDataService.insert(itemEntity);