修改

jinlin

2024-01-31 9025b9cf7ec8610003d445a31d93e35e7bd73c2e

 modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java

@@ -14,7 +14,7 @@
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.project.dto.EnvironDto;
import com.zt.life.modules.project.model.Environ;
import com.zt.life.modules.project.service.EnvironService;
import com.zt.life.modules.project.service.*;
import com.zt.life.sys.dto.OssDto;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
@@ -52,6 +52,9 @@
    private EnvironService environService;

    @Autowired
    private ProjectService projectService;

    @Autowired
    private SysOssConfigService sysOssConfigService;

    @Autowired
@@ -68,8 +71,8 @@
            @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
            @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 = "code", value = "编号", dataType = Constant.QT.STRING, format = "CODE^LK"),
            @ApiImplicitParam(name = "softwareName", value = "软件名称", dataType = Constant.QT.STRING, format = "software_name^EQ"),})
            @ApiImplicitParam(name = "code", value = "编号", dataType = Constant.QT.STRING, format = "a.CODE^LK"),
            @ApiImplicitParam(name = "softwareName", value = "软件名称", dataType = Constant.QT.STRING, format = "p.software_name^LK"),})
    public PageResult<Environ> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {

        return PageResult.ok(environService.page(queryFilter));
@@ -116,7 +119,9 @@
        //效验数据
        AssertUtils.isArrayEmpty(ids, "id");
        environService.delete(ids);

        projectService.deleteItem(ids,"environ_analysis","environ_id");
        projectService.deleteItem(ids,"environ_hardware_resources","environ_id");
        projectService.deleteItem(ids,"environ_software_resources","environ_id");
        return Result.ok();
    }