Merge branch 'dev'

zxl

2025-03-14 23b688e436a89845e92d861adb5875e625e90d9f

Merge branch 'dev'

 business/src/main/java/com/ycl/controller/HiddenAdminController.java

@@ -49,7 +49,6 @@
    @ApiOperation(value = "批量修改", notes = "批量修改")
    @PreAuthorize("@ss.hasPermi('hiddenAdmin:edit')")
    public Result updateList(@RequestBody List<HiddenAdminForm> forms){
        System.out.println(forms + "==============");
        return hiddenAdminService.updateList(forms);
    }


 business/src/main/java/com/ycl/controller/ProjectUnitRegistrationInfoController.java

@@ -80,4 +80,11 @@
    public Result list() {
        return projectUnitRegistrationInfoService.all();
    }

    @PostMapping("/getUnitRegistrationInfoByName")
    @ApiOperation(value = "更具单位名获得数据库已存在信息", notes = "更具单位名获得数据库已存在信息")
    public Result getUnitRegistrationInfoByName(@RequestBody ProjectUnitRegistrationInfoForm form){

        return projectUnitRegistrationInfoService.getUnitRegistrationInfoByName(form.getProjectUnit());
    }
}

 business/src/main/java/com/ycl/domain/entity/HiddenAdmin.java

@@ -30,7 +30,7 @@

    @TableField("sort")
    /**  */
    private String sort;
    private Long sort;

    @TableField("columns")
    /**  */

 business/src/main/java/com/ycl/domain/vo/HiddenAdminVO.java

@@ -28,15 +28,15 @@
    @ApiModelProperty("业主单位")
    private String display;

    /**  */
    /**  排序*/
    @ApiModelProperty("")
    private String sort;
    private Long sort;

    /**  */
    /**  列名*/
    @ApiModelProperty("")
    private String columns;

    /**  */
    /**  前端插槽用列名 可能为空*/
    @ApiModelProperty("")
    private String slotName;


 business/src/main/java/com/ycl/service/ProjectUnitRegistrationInfoService.java

@@ -62,4 +62,6 @@
     * @return
     */
    Result all();

    Result getUnitRegistrationInfoByName(String name);
}

 business/src/main/java/com/ycl/service/impl/HiddenAdminServiceImpl.java

@@ -16,6 +16,7 @@
import org.springframework.util.Assert;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;

@@ -128,6 +129,7 @@
        List<HiddenAdmin> entities = baseMapper.selectList(null);
        List<HiddenAdminVO> vos = entities.stream()
                .map(entity -> HiddenAdminVO.getVoByEntity(entity, null))
                .sorted(Comparator.comparing(HiddenAdminVO:: getSort))
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }
@@ -135,7 +137,6 @@
    @Override
    public Result updateList(List<HiddenAdminForm> forms) {
        baseMapper.updateList(forms);
//        this.saveBatch(forms);
        return Result.ok("修改成功");
    }
}

 business/src/main/java/com/ycl/service/impl/ProjectUnitRegistrationInfoServiceImpl.java

@@ -140,4 +140,12 @@
                .collect(Collectors.toList());
        return Result.ok().data(vos);
    }

    @Override
    public Result getUnitRegistrationInfoByName(String name) {
        List<ProjectUnitRegistrationInfo> entity = new LambdaQueryChainWrapper<>(baseMapper)
                .like(ProjectUnitRegistrationInfo::getProjectUnit,name)
                .list();
        return Result.ok().data(entity);
    }
}

 business/src/main/resources/mapper/HiddenAdminMapper.xml

@@ -45,6 +45,7 @@
            t_hidden_admin THA
        WHERE
            THA.deleted = 0
        order by THA.sort
    </select>