liujie
2026-01-21 b7fd316f22e51db06a105e824daabe7692e28d01
update代码合并
6个文件已修改
36 ■■■■■ 已修改文件
admin-server/src/main/java/com/estate/expert/admin/controller/admin/ProjectController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-server/src/main/java/com/estate/expert/admin/controller/admin/RecordController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-server/src/main/java/com/estate/expert/admin/domain/repository/ClientParamMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-server/src/main/java/com/estate/expert/admin/service/ClientParamService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-server/src/main/java/com/estate/expert/admin/service/impl/ClientParamServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-server/src/main/resources/mapper/ClientParamMapper.xml 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-server/src/main/java/com/estate/expert/admin/controller/admin/ProjectController.java
@@ -1,9 +1,11 @@
package com.estate.expert.admin.controller.admin;
import com.estate.expert.admin.domain.business.client.clientparam.ClientParam;
import com.estate.expert.admin.domain.common.request.BatchReq;
import com.estate.expert.admin.domain.common.request.ProjectPageRequest;
import com.estate.expert.admin.domain.project.ProjectDto;
import com.estate.expert.admin.domain.user.User;
import com.estate.expert.admin.service.ClientParamService;
import com.estate.expert.admin.service.ProjectService;
import com.estate.expert.common.domain.Session;
import com.estate.expert.common.rpc.Result;
@@ -26,6 +28,8 @@
    @Resource
    private ProjectService projectService;
    @Resource
    private ClientParamService clientParamService;
    @ApiOperation("项目列表")
@@ -68,6 +72,13 @@
        return Result.success();
    }
    @ApiOperation("项目设置权限")
    @PostMapping("/setPermission")
    public Result setPermission(@RequestParam Integer projectId,String permission) {
        clientParamService.setPermission(projectId,permission);
        return Result.success();
    }
//    @PostMapping("/import")
admin-server/src/main/java/com/estate/expert/admin/controller/admin/RecordController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.estate.expert.admin.domain.business.check.Check;
import com.estate.expert.admin.domain.business.onduty.OnDuty;
import com.estate.expert.admin.domain.business.position.Position;
import com.estate.expert.admin.domain.common.request.AddCheckInfoRequest;
import com.estate.expert.admin.domain.common.request.AddOnDutyRequest;
@@ -227,9 +228,9 @@
     * 在岗情况列表查询
     * 支持"全部/我创建的"筛选
     */
    @ApiOperation("【APP】在岗情况列表")
    @ApiOperation(value = "【APP】在岗情况列表",response = OnDuty.class)
    @PostMapping("/onduty/list")
    public Result listOnDutyRecords(@ApiParam(hidden = true) Session session,
    public Result< PageRespMp<OnDuty>> listOnDutyRecords(@ApiParam(hidden = true) Session session,
                                    @RequestParam(value = "checkTaskId") Integer checkTaskId,
                                    @RequestParam(value = "mine", required = false) Boolean mine,
                                    @Validated @RequestBody PageReq pageReq) {
@@ -297,9 +298,9 @@
     * 检查情况列表查询
     * 支持"全部/我创建的"筛选
     */
    @ApiOperation("【APP】检查情况列表")
    @ApiOperation(value = "【APP】检查情况列表",response = Check.class)
    @PostMapping("/checkinfo/list")
    public Result listCheckInfoRecords(@ApiParam(hidden = true) Session session,
    public Result<PageRespMp<Check>> listCheckInfoRecords(@ApiParam(hidden = true) Session session,
                                       @RequestParam(value = "checkTaskId") Integer checkTaskId,
                                       @RequestParam(value = "mine", required = false) Boolean mine,
                                       @Validated @RequestBody PageReq pageReq) {
admin-server/src/main/java/com/estate/expert/admin/domain/repository/ClientParamMapper.java
@@ -20,4 +20,7 @@
    List<ReportTemplate> getTemplate(@Param("type") Integer type);
    void setPermission(@Param("projectId") Integer projectId, @Param("permission") String permission);
}
admin-server/src/main/java/com/estate/expert/admin/service/ClientParamService.java
@@ -20,4 +20,6 @@
    List<ReportTemplate> getTemplate(Integer type);
    void setPermission(Integer projectId, String permission);
}
admin-server/src/main/java/com/estate/expert/admin/service/impl/ClientParamServiceImpl.java
@@ -25,4 +25,11 @@
    public List<ReportTemplate> getTemplate(Integer type) {
        return this.baseMapper.getTemplate(type);
    }
    @Override
    public void setPermission(Integer projectId, String permission) {
        this.baseMapper.setPermission(projectId, permission);
    }
}
admin-server/src/main/resources/mapper/ClientParamMapper.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.estate.expert.admin.domain.repository.ClientParamMapper">
    <update id="setPermission">
      update project set permission = #{permission} where id = #{projectId}
    </update>
    <select id="getTemplate" resultType="com.estate.expert.admin.domain.report.ReportTemplate"