jinlin
2023-12-08 c4d808b6d41a77603ebffbd0cf599e9fa1234ab0
修改
3个文件已修改
22 ■■■■ 已修改文件
modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java
@@ -68,9 +68,9 @@
    @GetMapping("getDto")
    @ApiOperation("信息")
    public Result<ConfigItemChangeDto> getDto(Long projectId, Long ChangeId) {
        ConfigItemChangeDto data = configItemChangeService.getDto(projectId, ChangeId);
        if (ChangeId!=null) {
    public Result<ConfigItemChangeDto> getDto(Long projectId, Long changeId) {
        ConfigItemChangeDto data = configItemChangeService.getDto(projectId, changeId);
        if (changeId!=null) {
            for (WarehouseConfigItem configItem  : data.getConfigItemList()) {
                Long configItemId = configItem.getId();
                OssDto ossDto = sysOssConfigService.getOssByBusiType(configItemId, "config_item_warehouse");
modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java
@@ -161,21 +161,21 @@
        return true;
    }
    public ConfigItemChangeDto getDto(Long projectId, Long warehouseId) {
    public ConfigItemChangeDto getDto(Long projectId, Long changeId) {
        ConfigItemChangeDto data = new ConfigItemChangeDto();
        if (warehouseId != null) {
            data.setId(warehouseId);
            ConfigItemChange configItemChange = this.get(warehouseId);
        if (changeId != null) {
            data.setId(changeId);
            ConfigItemChange configItemChange = this.get(changeId);
            data.setConfigItemChange(configItemChange);
            if (projectId == null) {
                projectId = configItemChange.getProjectId();
            }
            List<WarehouseCmAudit> CmAuditList = cmAuditService.getList(warehouseId);
            List<WarehouseCmAudit> CmAuditList = cmAuditService.getList(changeId);
            data.setCmAuditList(CmAuditList);
            List<WarehouseQaAudit> QaAuditList = qaAuditService.getList(warehouseId);
            List<WarehouseQaAudit> QaAuditList = qaAuditService.getList(changeId);
            data.setQaAuditList(QaAuditList);
            List<WarehouseConfigItem> ConfigItemList = configItemService.getList(warehouseId);
            List<WarehouseConfigItem> ConfigItemList = configItemService.getList(changeId);
            data.setConfigItemList(ConfigItemList);
        } else {
web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
@@ -421,7 +421,7 @@
      // 获取信息
      async getInfo() {
        let params = {
          warehouseId: this.dataForm.id,
          changeId: this.dataForm.id,
          projectId: this.dataForm.projectId
        }
        let res = await this.$http.get(`/configItemChange/ConfigItemChange/getDto`, {params: params})