巡逻路线绑定修改

zengh

2021-07-19 5fcdba1711fb45d7a4acc9685db97400e7a38862

巡逻路线绑定修改

 src/main/java/org/springblade/modules/routeIn/controller/RouteinController.java

@@ -204,10 +204,10 @@
     * @return
     */
    @PostMapping("/selectList")
    public R selectList(String routeName, HttpServletResponse response) {
    public R selectList(String routeName,String id, HttpServletResponse response) {
        response.setHeader("Access-Control-Allow-Origin", "*");
        response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
        response.setHeader("Access-Control-Allow-Credentials", "true");
        return R.data(routeinService.selectList(routeName));
        return R.data(routeinService.selectList(routeName,id));
    }
}

 src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.java

@@ -42,5 +42,5 @@
    List<RouteinVO> tree();
    void insertlx(Routein routein);
    void updatelx(Integer id, String routeName, String regionId, String a, String rTime, String creatName, String remarks);
    List<RouteinVO> selectList(String routeName);
    List<RouteinVO> selectList(String routeName,String id);
}

 src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.xml

@@ -64,6 +64,9 @@
        <if test="routeName!=null and routeName!=''">
            and r.routeName  like '%${routeName}%'
        </if>
        <if test="id!=null and id!=''">
            AND d.snumber = #{id}
        </if>
    </select>

</mapper>

 src/main/java/org/springblade/modules/routeIn/service/IRouteinService.java

@@ -42,5 +42,5 @@
    List<RouteinVO> tree();
    void insertlx(Routein routein);
    void updatelx(Integer id, String routeName, String regionId, String a, String rTime, String creatName, String remarks);
    List<RouteinVO> selectList(String routeName);
    List<RouteinVO> selectList(String routeName,String id);
}

 src/main/java/org/springblade/modules/routeIn/service/impl/RouteinServiceImpl.java

@@ -59,8 +59,8 @@
    }

    @Override
    public List<RouteinVO> selectList(String routeName) {
        return baseMapper.selectList(routeName);
    public List<RouteinVO> selectList(String routeName,String id) {
        return baseMapper.selectList(routeName,id);
    }

}

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -225,11 +225,12 @@
    public R update(@Valid @RequestBody User user) {
        CacheUtil.clear(USER_CACHE);

        if (user.getOnline_status() == null || user.getOnline_status().equals("")){
            user.setOnline_status("0");
        if (user.getExamination_type() == null || user.getExamination_type().equals("")){
            user.setExamination_type("0");
        }
        if (user.getWork_status() == null || user.getWork_status().equals("")){
            user.setWork_status("0");

        if (user.getExamination_mx() == null || user.getExamination_mx().equals("")){
            user.setExamination_mx("正常");
        }

        return R.status(userService.updateUser(user));