报事报修新增临时字段

zhongrj

2023-11-29 3ed08103da531a4d1564b6fedb2ac27b0319eff5

报事报修新增临时字段

 src/main/java/org/springblade/modules/grid/controller/GridmanController.java

@@ -28,8 +28,6 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.grid.excel.GridExcel;
import org.springblade.modules.grid.excel.GridImporter;
import org.springblade.modules.grid.excel.GridmanExcel;
import org.springblade.modules.grid.excel.GridmanImporter;
import org.springframework.web.bind.annotation.*;
@@ -146,5 +144,16 @@
        return R.success("操作成功");
    }

    /**
     * 网格员查询
     * @param gridman
     * @return
     */
    @GetMapping("/getGridmanList")
    public R getGridmanList(GridmanVO gridman) {
        return R.data(gridmanService.getGridmanList(gridman));
    }



}

 src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.java

@@ -40,5 +40,10 @@
     */
    List<GridmanVO> selectGridmanPage(IPage page,@Param("gridman") GridmanVO gridman);


    /**
     * 网格员查询
     * @param gridman
     * @return
     */
    List<GridmanVO> getGridmanList(@Param("gridman") GridmanVO gridman);
}

 src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml

@@ -35,5 +35,19 @@
        </if>
    </select>

    <!--自定义分页查询-->
    <select id="getGridmanList" resultType="org.springblade.modules.grid.vo.GridmanVO">
        select
        jgm.*
        from jczz_gridman jgm
        where jgm.is_deleted = 0
        <if test="gridman.gridmanName!=null and gridman.gridmanName!=''">
            and jgm.gridman_name like concat('%',#{gridman.gridmanName},'%')
        </if>
        <if test="gridman.mobile!=null and gridman.mobile!=''">
            and jgm.mobile like concat('%',#{gridman.mobile},'%')
        </if>
    </select>


</mapper>

 src/main/java/org/springblade/modules/grid/service/IGridmanService.java

@@ -55,4 +55,11 @@
     * @param isCovered
     */
    void importGridman(List<GridmanExcel> data, Boolean isCovered);

    /**
     * 网格员查询
     * @param gridman
     * @return
     */
    List<GridmanVO> getGridmanList(GridmanVO gridman);
}

 src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java

@@ -164,4 +164,14 @@
            saveOrUpdateGridman(gridmanEntity);
        }
    }

    /**
     * 网格员查询
     * @param gridman
     * @return
     */
    @Override
    public List<GridmanVO> getGridmanList(GridmanVO gridman) {
        return baseMapper.getGridmanList(gridman);
    }
}

 src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java

@@ -28,6 +28,7 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
import org.springblade.modules.task.service.ITaskReportForRepairsService;
import org.springblade.modules.task.vo.TaskReportForRepairsVO;
@@ -162,5 +163,15 @@
        return R.data(taskReportForRepairsService.getStatistics(AuthUtil.getUserId()));
    }

    /**
     * 更新状态--临时接口
     * @param gridman
     * @return
     */
    @PostMapping("/updateView")
    public R updateView(@Valid @RequestBody GridmanEntity gridman) {
        return R.status(taskReportForRepairsService.updateView(gridman));
    }


}

 src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java

@@ -119,4 +119,11 @@
     */
    @ApiModelProperty(value = "事发地地址")
    private String address;


    /**
     * 临时用  1：已查看  2：未查看
     */
    @ApiModelProperty(value = "临时用  1：已查看  2：未查看")
    private Integer viewType;
}

 src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.java

@@ -18,6 +18,7 @@

import liquibase.pro.packaged.P;
import org.apache.ibatis.annotations.Param;
import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -54,4 +55,11 @@
    TaskReportStatistics getStatisticsCount(@Param("userId") Long userId);

    Integer getStatistics(Long userId);

    /**
     * 更新状态--临时接口
     * @param gridman
     * @return
     */
    int updateView(GridmanEntity gridman);
}

 src/main/java/org/springblade/modules/task/mapper/TaskReportForRepairsMapper.xml

@@ -40,6 +40,12 @@
        <if test="vo.confirmFlag != null">
            AND jtrfr.confirm_flag = #{vo.confirmFlag}
        </if>
        <if test="vo.status != null">
            AND jtrfr.status = #{vo.status}
        </if>
        <if test="vo.viewType != null">
            AND jtrfr.view_type = #{vo.viewType}
        </if>
        <if test="vo.roleName!=null and vo.roleName!=''">
            <if test="vo.roleName=='网格员'">
                <choose>
@@ -88,5 +94,10 @@

    </select>

    <!--更新状态-临时接口-->
    <update id="updateView">
        update jczz_task_report_for_repairs set view_type = 1
    </update>


</mapper>

 src/main/java/org/springblade/modules/task/service/ITaskReportForRepairsService.java

@@ -16,6 +16,7 @@
 */
package org.springblade.modules.task.service;

import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springblade.core.mp.base.BaseService;
@@ -67,4 +68,11 @@
    boolean checkReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs);

    Integer getStatistics(Long userId);

    /**
     * 更新状态--临时接口
     * @param gridman
     * @return
     */
    boolean updateView(GridmanEntity gridman);
}

 src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java

@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
@@ -149,4 +150,15 @@
    public Integer getStatistics(Long userId) {
        return baseMapper.getStatistics(userId);
    }

    /**
     * 更新状态--临时接口
     * @param gridman
     * @return
     */
    @Override
    public boolean updateView(GridmanEntity gridman) {
        baseMapper.updateView(gridman);
        return true;
    }
}