Merge remote-tracking branch 'origin/master'

xyc

2024-11-04 e48a56c2171f023f1978b0b6aec9befd43e7a9dc

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/ParamDataController.java

@@ -25,7 +25,7 @@


/**
 * param_data_expect
 * param_data
 *
 * @author zt generator
 * @since 1.0.0 2024-03-04
@@ -42,9 +42,12 @@
           @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
            @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
            @ApiImplicitParam(name = "name", value = "名称", dataType = Constant.QT.STRING, format = "NAME^LK"),
            @ApiImplicitParam(name = "reliabDistribType", value = "可靠性分布", dataType = Constant.QT.STRING, format = "reliab_distrib_type^EQ"),
            @ApiImplicitParam(name = "repairDistribType", value = "维修分布", dataType = Constant.QT.STRING, format = "repair_distrib_type^EQ"),
            @ApiImplicitParam(name = "repairable", value = "可维修", dataType = Constant.QT.STRING, format = "repairable^EQ"),
            @ApiImplicitParam(name = "basicJoinCompute", value = "参与计算", dataType = Constant.QT.STRING, format = "basic_join_compute^EQ"),
            @ApiImplicitParam(name = "nodeType", value = "类型", dataType = Constant.QT.STRING),
            @ApiImplicitParam(name = "srcId", value = "上级ID", dataType = Constant.QT.STRING),
            @ApiImplicitParam(name = "pageCode", value = "", dataType = Constant.QT.STRING)})
            @ApiImplicitParam(name = "srcId", value = "上级ID", dataType = Constant.QT.STRING)})
    public Result<List<ParamData>> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {

        return Result.ok(paramDataService.page(queryFilter));
@@ -71,12 +74,11 @@
    @PostMapping("save")
    public Result save(@RequestBody ParamData paramData) {
        //效验数据
        for (ParamData expect : paramData.getDataThreeList()) {
            if (expect.getId()!=null){
                paramDataService.update(expect);
        for (ParamData data : paramData.getDataThreeList()) {
            if (data.getId()!=null){
                paramDataService.update(data);
            }else{
                expect.setPageCode(paramData.getPageCode());
                paramDataService.insert(expect);
                paramDataService.insert(data);
            }
        }
        return Result.ok();