督查考核任务

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/controller/ZhjgDckhRwCbController.java

+package com.elephant.framework.galaxy.aroad.module.zhjg.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRwCb;
+import com.elephant.framework.galaxy.aroad.module.zhjg.service.ZhjgDckhRwCbService;
+import com.elephant.framework.galaxy.aroad.response.R;
+import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+import java.time.LocalDateTime;
+
+
+/**
+ * 任务催办
+ *
+ * @author zyw
+ * @date 2019-04-15 16:27:04
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhjg/zhjgdckhrwcb")
+public class ZhjgDckhRwCbController extends BaseController  {
+
+  private final ZhjgDckhRwCbService zhjgDckhRwCbService;
+
+  /**
+   * 分页查询
+   * @param page 分页对象
+   * @param zhjgDckhRwCb 任务催办
+   * @return
+   */
+  @GetMapping("/page")
+  public R getZhjgDckhRwCbPage(Page page, ZhjgDckhRwCb zhjgDckhRwCb) {
+    return  new R<>(zhjgDckhRwCbService.page(page,Wrappers.query(zhjgDckhRwCb)));
+  }
+
+
+  /**
+   * 通过id查询任务催办
+   * @param id id
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R getById(@PathVariable("id") Integer id){
+    return new R<>(zhjgDckhRwCbService.getById(id));
+  }
+
+  /**
+   * 新增任务催办
+   * @param zhjgDckhRwCb 任务催办
+   * @return R
+   */
+  @SysLog("新增任务催办")
+  @PostMapping
+  public R save(@RequestBody ZhjgDckhRwCb zhjgDckhRwCb){
+    zhjgDckhRwCb.setCbsj(LocalDateTime.now());
+    return new R<>(zhjgDckhRwCbService.save(zhjgDckhRwCb));
+  }
+
+  /**
+   * 修改任务催办
+   * @param zhjgDckhRwCb 任务催办
+   * @return R
+   */
+  @SysLog("修改任务催办")
+  @PutMapping
+  public R updateById(@RequestBody ZhjgDckhRwCb zhjgDckhRwCb){
+    return new R<>(zhjgDckhRwCbService.updateById(zhjgDckhRwCb));
+  }
+
+  /**
+   * 通过id删除任务催办
+   * @param id id
+   * @return R
+   */
+  @SysLog("删除任务催办")
+  @DeleteMapping("/{id}")
+  public R removeById(@PathVariable Integer id){
+    return new R<>(zhjgDckhRwCbService.removeById(id));
+  }
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/controller/ZhjgDckhRwController.java

 package com.elephant.framework.galaxy.aroad.module.zhjg.controller;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.elephant.framework.galaxy.aroad.module.zhjg.service.ZhjgDckhRwFfService;
-import com.elephant.framework.galaxy.aroad.response.R;
 import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRw;
+import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRwFf;
+import com.elephant.framework.galaxy.aroad.module.zhjg.service.ZhjgDckhRwFfService;
 import com.elephant.framework.galaxy.aroad.module.zhjg.service.ZhjgDckhRwService;
+import com.elephant.framework.galaxy.aroad.response.R;
+import com.elephant.framework.galaxy.aroad.util.SecurityUtils;
 import lombok.AllArgsConstructor;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.*;
-import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
-
-import javax.management.Query;
 
 
 /**
@@ -25,72 +27,132 @@ import javax.management.Query;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/zhjg/zhjgdckhrw")
-public class ZhjgDckhRwController extends BaseController  {
+public class ZhjgDckhRwController extends BaseController {
+
+    private final ZhjgDckhRwService zhjgDckhRwService;
+    private final ZhjgDckhRwFfService zhjgDckhRwFfService;
+    private static Integer loginDeptId = null;
 
-  private final  ZhjgDckhRwService zhjgDckhRwService;
-  private final ZhjgDckhRwFfService zhjgDckhRwFsService;
+    /**
+     * 分页查询
+     *
+     * @param page       分页对象
+     * @param zhjgDckhRw 督查情况任务表
+     * @return
+     */
+    @GetMapping("/page")
+    public R getZhjgDckhRwPage(Page page, ZhjgDckhRw zhjgDckhRw) {
+        IPage<T> iPage = null;
+        //是否具备创建任务的权限
+        boolean isCreatRw = SecurityUtils.isMenue("zhjg_dckhdctg_add");
+        if (isCreatRw) {
+            QueryWrapper<ZhjgDckhRw> queryWrapper = new QueryWrapper<>();
+            if (zhjgDckhRw.getRwmc() != null) {
+                queryWrapper.like("rwmc", zhjgDckhRw.getRwmc());
+            }
+            if (zhjgDckhRw.getZrdwid() != null) {
+                queryWrapper.eq("zrdwid", zhjgDckhRw.getZrdwid());
+            }
+             iPage = zhjgDckhRwService.page(page, queryWrapper);
+         } else {
+            //loginDeptId = SecurityUtils.getDeptId();
+            iPage = zhjgDckhRwService.selectRwForPage(page, zhjgDckhRw, loginDeptId);
+         }
 
-  /**
-   * 分页查询
-   * @param page 分页对象
-   * @param zhjgDckhRw 督查情况任务表
-   * @return
-   */
-  @GetMapping("/page")
-  public R getZhjgDckhRwPage(Page page, ZhjgDckhRw zhjgDckhRw) {
-    return  new R<>(zhjgDckhRwService.selectRwForPage(page,zhjgDckhRw));
-  }
 
+        return new R<>(iPage);
+    }
+
+    /**
+     * 待办分页查询
+     *
+     * @param page       分页对象
+     * @param zhjgDckhRw 督查情况任务表
+     * @return
+     */
+    @GetMapping("/db/page")
+    public R getZhjgDckhRwDbPage(Page page, ZhjgDckhRw zhjgDckhRw) {
+//    GalaxyUser galaxyUser = SecurityUtils.getUser();
+//    IloginDeptId = galaxyUser.getDeptId();
+//    zhjgDckhRw.setCydw(String.valueOf(deptId));
+        zhjgDckhRw.setRwzt("1");
+        return new R<>(zhjgDckhRwService.selectRwForPage(page, zhjgDckhRw, loginDeptId));
+    }
 
-  /**
-   * 通过id查询督查情况任务表
-   * @param id id
-   * @return R
-   */
-  @GetMapping("/{id}")
-  public R getById(@PathVariable("id") Integer id){
-    return new R<>(zhjgDckhRwService.getById(id));
-  }
+    /**
+     * 已办分页查询
+     *
+     * @param page       分页对象
+     * @param zhjgDckhRw 督查情况任务表
+     * @return
+     */
+    @GetMapping("/yb/page")
+    public R getZhjgDckhRwYbPage(Page page, ZhjgDckhRw zhjgDckhRw) {
+//    GalaxyUser galaxyUser = SecurityUtils.getUser();
+//    Integer deptId = galaxyUser.getDeptId();
+//    zhjgDckhRw.setCydw(String.valueOf(deptId));
+        zhjgDckhRw.setStatus("4");
+        return new R<>(zhjgDckhRwService.selectRwForPage(page, zhjgDckhRw, loginDeptId));
+    }
 
-  /**
-   * 新增督查情况任务表
-   * @param zhjgDckhRw 督查情况任务表
-   * @return R
-   */
-  @SysLog("新增督查情况任务表")
-  @PostMapping
-  public R save(@RequestBody ZhjgDckhRw zhjgDckhRw){
-    String cydws = zhjgDckhRw.getCydw();
 
-    boolean rw=  zhjgDckhRwService.save(zhjgDckhRw);
-    if(cydws!=null){
-      String[] cydw = cydws.split(",");
-      zhjgDckhRwFsService.save(zhjgDckhRw,cydw);
+    /**
+     * 通过id查询督查情况任务表
+     *
+     * @param id id
+     * @return R
+     */
+    @GetMapping("/{id}")
+    public R getById(@PathVariable("id") Integer id) {
+        return new R<>(zhjgDckhRwService.getById(id));
     }
 
-    return new R<>(rw);
-  }
+    /**
+     * 新增督查情况任务表
+     *
+     * @param zhjgDckhRw 督查情况任务表
+     * @return R
+     */
+    @SysLog("新增督查情况任务表")
+    @PostMapping
+    public R save(@RequestBody ZhjgDckhRw zhjgDckhRw) {
+        boolean rw = zhjgDckhRwService.save(zhjgDckhRw);
+        return new R<>(rw);
+    }
 
-  /**
-   * 修改督查情况任务表
-   * @param zhjgDckhRw 督查情况任务表
-   * @return R
-   */
-  @SysLog("修改督查情况任务表")
-  @PutMapping
-  public R updateById(@RequestBody ZhjgDckhRw zhjgDckhRw){
-    return new R<>(zhjgDckhRwService.updateById(zhjgDckhRw));
-  }
+    /**
+     * 修改督查情况任务表
+     *
+     * @param zhjgDckhRw 督查情况任务表
+     * @return R
+     */
+    @SysLog("修改督查情况任务表")
+    @PutMapping
+    public R updateById(@RequestBody ZhjgDckhRw zhjgDckhRw) {
+        return new R<>(zhjgDckhRwService.updateById(zhjgDckhRw));
+    }
 
-  /**
-   * 通过id删除督查情况任务表
-   * @param id id
-   * @return R
-   */
-  @SysLog("删除督查情况任务表")
-  @DeleteMapping("/{id}")
-  public R removeById(@PathVariable Integer id){
-    return new R<>(zhjgDckhRwService.removeById(id));
-  }
+    /**
+     * 通过id删除督查情况任务表
+     *
+     * @param id id
+     * @return R
+     */
+    @SysLog("删除督查情况任务表")
+    @DeleteMapping("/{id}")
+    public R removeById(@PathVariable Integer id) {
+        return new R<>(zhjgDckhRwService.removeById(id));
+    }
 
+    /**
+     * 通过id下发任务
+     *
+     * @param id id
+     * @return R
+     */
+    @SysLog("督查任务下发")
+    @PutMapping("/download/{id}")
+    public R downloadById(@PathVariable Integer id) {
+        return new R<>(zhjgDckhRwService.downloadById(id));
+    }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/controller/ZhjgDckhRwFkController.java

+package com.elephant.framework.galaxy.aroad.module.zhjg.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.response.R;
+import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRwFk;
+import com.elephant.framework.galaxy.aroad.module.zhjg.service.ZhjgDckhRwFkService;
+import com.elephant.framework.galaxy.aroad.util.SecurityUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+import java.time.LocalDateTime;
+
+
+/**
+ * 督查任务反馈
+ *
+ * @author zyw
+ * @date 2019-04-16 15:58:24
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhjg/zhjgdckhrwfk")
+public class ZhjgDckhRwFkController extends BaseController  {
+
+  private final  ZhjgDckhRwFkService zhjgDckhRwFkService;
+
+  /**
+   * 分页查询
+   * @param page 分页对象
+   * @param zhjgDckhRwFk 督查任务反馈
+   * @return
+   */
+  @GetMapping("/page")
+  public R getZhjgDckhRwFkPage(Page page, ZhjgDckhRwFk zhjgDckhRwFk) {
+    return  new R<>(zhjgDckhRwFkService.page(page,Wrappers.query(zhjgDckhRwFk)));
+  }
+
+
+  /**
+   * 通过id查询督查任务反馈
+   * @param id id
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R getById(@PathVariable("id") Integer id){
+    return new R<>(zhjgDckhRwFkService.getById(id));
+  }
+
+  /**
+   * 新增督查任务反馈
+   * @param zhjgDckhRwFk 督查任务反馈
+   * @return R
+   */
+  @SysLog("新增督查任务反馈")
+  @PostMapping
+  public R save(@RequestBody ZhjgDckhRwFk zhjgDckhRwFk){
+      Integer deptId = SecurityUtils.getUser().getDeptId();
+      zhjgDckhRwFk.setFkdw(deptId);
+      zhjgDckhRwFk.setFksj(LocalDateTime.now());
+    return new R<>(zhjgDckhRwFkService.save(zhjgDckhRwFk));
+  }
+
+  /**
+   * 修改督查任务反馈
+   * @param zhjgDckhRwFk 督查任务反馈
+   * @return R
+   */
+  @SysLog("修改督查任务反馈")
+  @PutMapping
+  public R updateById(@RequestBody ZhjgDckhRwFk zhjgDckhRwFk){
+    return new R<>(zhjgDckhRwFkService.updateById(zhjgDckhRwFk));
+  }
+
+  /**
+   * 通过id删除督查任务反馈
+   * @param id id
+   * @return R
+   */
+  @SysLog("删除督查任务反馈")
+  @DeleteMapping("/{id}")
+  public R removeById(@PathVariable Integer id){
+    return new R<>(zhjgDckhRwFkService.removeById(id));
+  }
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/entity/ZhjgDckhRw.java

@@ -23,81 +23,103 @@ import java.time.LocalDateTime;
 @TableName("t_zhjg_dckh_rw")
 @EqualsAndHashCode(callSuper = true)
 public class ZhjgDckhRw extends Model<ZhjgDckhRw> {
-private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-  /**
-   * 主键
-   */
-  @TableId(value = "id", type = IdType.AUTO)
-  private Integer id;
-  /**
-   * 任务名称
-   */
-  private String rwmc;
-  /**
-   * 任务状态
-   */
-  private String rwzt;
-  /**
-   * 参与单位
-   */
-  private String cydw;
-  /**
-   * 督办类型
-   */
-  private String dblx;
-  /**
-   * 牵头单位
-   */
-  private String qtdw;
-  /**
-   * 办结时限
-   */
- @DateTimeFormat(pattern = "yyyy-MM-dd")
-  private LocalDate bjsx;
-  /**
-   * 任务下发时间
-   */
-  private LocalDateTime xfsj;
-  /**
-   * 督办内容
-   */
-  private String dbnr;
-  /**
-   * 督办附件
-   */
-  private String dbfj;
-  /**
-   * 督办人
-   */
-  private String dbr;
-  /**
-   * 创建人
-   */
-  private String creator;
-  /**
-   * 创建时间
-   */
-  private LocalDateTime createTime;
-  /**
-   * 更新人
-   */
-  private String updatePerson;
-  /**
-   * 更新时间
-   */
-  private LocalDateTime updateTime;
-  /**
-   * 状态：根据具体需求定义
-   */
-  private String status;
-  /**
-   * 是否删除  -1：已删除  0：正常
-   */
-  private String delFlag;
-  /**
-   * 备注信息
-   */
-  private String remarks;
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 任务名称
+     */
+    private String rwmc;
+    /**
+     * 任务状态
+     */
+    private String rwzt;
+    /**
+     * 参与单位
+     */
+    private String cydw;
+    /**
+     * 参与人
+     */
+    private String cyr;
+    /**
+     * 参与单位id
+     */
+    private Integer cydwid;
+    /**
+     * 督办类型
+     */
+    private String dblx;
+    /**
+     * 责任单位
+     */
+    private String zrdw;
+    private Integer zrdwid;
+    /**
+     * 责任人
+     */
+    private String zrr;
+    /**
+     * 开始日期
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate ksrq;
+    /**
+     * 办理时限
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate blqx;
+    /**
+     * 任务下发时间
+     */
+    private LocalDateTime xfsj;
+    /**
+     * 督办内容
+     */
+    private String dbnr;
+    /**
+     * 督办附件
+     */
+    private String dbfj;
+    /**
+     * 督办人
+     */
+    private String dbr;
+    /**
+     * 督办人联系方式
+     */
+    private String dbrlxfs;
+    /**
+     * 创建人
+     */
+    private String creator;
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+    /**
+     * 更新人
+     */
+    private String updatePerson;
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+    /**
+     * 状态：根据具体需求定义
+     */
+    private String status;
+    /**
+     * 是否删除  -1：已删除  0：正常
+     */
+    private String delFlag;
+    /**
+     * 备注信息
+     */
+    private String remarks;
 
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/entity/ZhjgDckhRwCb.java

+package com.elephant.framework.galaxy.aroad.module.zhjg.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 任务催办
+ *
+ * @author zyw
+ * @date 2019-04-15 16:27:04
+ */
+@Data
+@TableName("t_zhjg_dckh_rw_cb")
+@EqualsAndHashCode(callSuper = true)
+public class ZhjgDckhRwCb extends Model<ZhjgDckhRwCb> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId(value = "id", type = IdType.AUTO)
+  private Integer id;
+  /**
+   * 任务id
+   */
+  private Integer rwid;
+  /**
+   * 任务名称
+   */
+  private String rwmc;
+  /**
+   * 催办标题
+   */
+  private String tgbt;
+  /**
+   * 催办内容
+   */
+  private String tgnr;
+  /**
+   * 状态
+   */
+  private String zt;
+  /**
+   * 催办单位
+   */
+  private String cbdw;
+  /**
+   *  催办时间
+   */
+  private LocalDateTime cbsj;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/entity/ZhjgDckhRwFf.java

@@ -41,7 +41,7 @@ private static final long serialVersionUID = 1L;
   /**
    * 承办单位代码
    */
-  private String dwdm;
+  private Integer dwdm;
   /**
    * 状态
    */

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/entity/ZhjgDckhRwFk.java

+package com.elephant.framework.galaxy.aroad.module.zhjg.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 督查任务反馈
+ *
+ * @author zyw
+ * @date 2019-04-16 15:58:24
+ */
+@Data
+@TableName("t_zhjg_dckh_rw_fk")
+@EqualsAndHashCode(callSuper = true)
+public class ZhjgDckhRwFk extends Model<ZhjgDckhRwFk> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId(value = "id", type = IdType.AUTO)
+  private Integer id;
+  /**
+   * 任务id
+   */
+  private Integer rwid;
+  /**
+   * 任务名称
+   */
+  private String rwmc;
+  /**
+   * 反馈内容
+   */
+  private String fknr;
+  /**
+   * 反馈时间
+   */
+  private LocalDateTime fksj;
+  /**
+   * 反馈单位
+   */
+  private Integer fkdw;
+  /**
+   * 上传文档
+   */
+  private String scwd;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/mapper/ZhjgDckhRwCbMapper.java

+package com.elephant.framework.galaxy.aroad.module.zhjg.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRwCb;
+
+/**
+ * 任务催办
+ *
+ * @author zyw
+ * @date 2019-04-15 16:27:04
+ */
+public interface ZhjgDckhRwCbMapper extends BaseMapper<ZhjgDckhRwCb> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/mapper/ZhjgDckhRwFfMapper.java

@@ -2,13 +2,18 @@ package com.elephant.framework.galaxy.aroad.module.zhjg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRwFf;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 督查情况任务分发表
  *
  * @author zyw
  * @date 2019-03-15 16:59:03
+ *
  */
 public interface ZhjgDckhRwFfMapper extends BaseMapper<ZhjgDckhRwFf> {
 
+    List<ZhjgDckhRwFf> selectListByRwid(@Param("rwid") Integer id);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/mapper/ZhjgDckhRwFkMapper.java

+package com.elephant.framework.galaxy.aroad.module.zhjg.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRwFk;
+
+/**
+ * 督查任务反馈
+ *
+ * @author zyw
+ * @date 2019-04-16 15:58:24
+ */
+public interface ZhjgDckhRwFkMapper extends BaseMapper<ZhjgDckhRwFk> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/mapper/ZhjgDckhRwMapper.java

@@ -16,5 +16,5 @@ import java.util.List;
  */
 public interface ZhjgDckhRwMapper extends BaseMapper<ZhjgDckhRw> {
 
-    IPage<List<ZhjgDckhRw>> selectRwForPage(Page page, @Param("rw") ZhjgDckhRw zhjgDckhRw);
+    IPage<List<ZhjgDckhRw>> selectRwForPage(Page page, @Param("khrw") ZhjgDckhRw zhjgDckhRw ,@Param("loginDeptId") Integer loginDeptId);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/service/ZhjgDckhRwCbService.java

+package com.elephant.framework.galaxy.aroad.module.zhjg.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRwCb;
+
+/**
+ * 任务催办
+ *
+ * @author zyw
+ * @date 2019-04-15 16:27:04
+ */
+public interface ZhjgDckhRwCbService extends IService<ZhjgDckhRwCb> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/service/ZhjgDckhRwFfService.java

@@ -12,5 +12,4 @@ import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRwFf;
  */
 public interface ZhjgDckhRwFfService extends IService<ZhjgDckhRwFf> {
 
-    void save(ZhjgDckhRw zhjgDckhRw, String[] cydw);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/service/ZhjgDckhRwFkService.java

+package com.elephant.framework.galaxy.aroad.module.zhjg.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRwFk;
+
+/**
+ * 督查任务反馈
+ *
+ * @author zyw
+ * @date 2019-04-16 15:58:24
+ */
+public interface ZhjgDckhRwFkService extends IService<ZhjgDckhRwFk> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/service/ZhjgDckhRwService.java

@@ -12,5 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  * @date 2019-03-15 16:58:24
  */
 public interface ZhjgDckhRwService extends IService<ZhjgDckhRw> {
-    IPage selectRwForPage(Page page, ZhjgDckhRw zhjgDckhRw);
+    IPage selectRwForPage(Page page, ZhjgDckhRw zhjgDckhRw,Integer loginDeptId);
+
+    boolean downloadById(Integer id);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/service/impl/ZhjgDckhRwCbServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.zhjg.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRwCb;
+import com.elephant.framework.galaxy.aroad.module.zhjg.mapper.ZhjgDckhRwCbMapper;
+import com.elephant.framework.galaxy.aroad.module.zhjg.service.ZhjgDckhRwCbService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 任务催办
+ *
+ * @author zyw
+ * @date 2019-04-15 16:27:04
+ */
+@Service
+public class ZhjgDckhRwCbServiceImpl extends ServiceImpl<ZhjgDckhRwCbMapper, ZhjgDckhRwCb> implements ZhjgDckhRwCbService {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/service/impl/ZhjgDckhRwFfServiceImpl.java

@@ -16,17 +16,4 @@ import org.springframework.stereotype.Service;
 @Service
 public class ZhjgDckhRwFfServiceImpl extends ServiceImpl<ZhjgDckhRwFfMapper, ZhjgDckhRwFf> implements ZhjgDckhRwFfService {
 
-    @Override
-    public void save(ZhjgDckhRw rw, String[] cydw) {
-        for (String cydwId:cydw){
-            ZhjgDckhRwFf  ff  = new ZhjgDckhRwFf();
-            ff.setRwid(rw.getId());
-            ff.setRwmc(rw.getRwmc());
-            ff.setDwdm(cydwId);
-            ff.setZt("0");
-            baseMapper.insert(ff);
-        }
-
-
-    }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/service/impl/ZhjgDckhRwFkServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.zhjg.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRwFk;
+import com.elephant.framework.galaxy.aroad.module.zhjg.mapper.ZhjgDckhRwFkMapper;
+import com.elephant.framework.galaxy.aroad.module.zhjg.service.ZhjgDckhRwFkService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 督查任务反馈
+ *
+ * @author zyw
+ * @date 2019-04-16 15:58:24
+ */
+@Service
+public class ZhjgDckhRwFkServiceImpl extends ServiceImpl<ZhjgDckhRwFkMapper, ZhjgDckhRwFk> implements ZhjgDckhRwFkService {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/service/impl/ZhjgDckhRwServiceImpl.java

 package com.elephant.framework.galaxy.aroad.module.zhjg.service.impl;
 
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRw;
+import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRwFf;
+import com.elephant.framework.galaxy.aroad.module.zhjg.mapper.ZhjgDckhRwFfMapper;
 import com.elephant.framework.galaxy.aroad.module.zhjg.mapper.ZhjgDckhRwMapper;
 import com.elephant.framework.galaxy.aroad.module.zhjg.service.ZhjgDckhRwService;
+import org.apache.commons.lang.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
 /**
  * 督查情况任务表
  *
@@ -16,8 +30,43 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 @Service
 public class ZhjgDckhRwServiceImpl extends ServiceImpl<ZhjgDckhRwMapper, ZhjgDckhRw> implements ZhjgDckhRwService {
 
+    @Autowired
+    private  ZhjgDckhRwFfMapper zhjgDckhRwFfMapper;
+
+    @Override
+    public IPage selectRwForPage(Page page,ZhjgDckhRw zhjgDckhRw,Integer loginDeptId) {
+
+        return baseMapper.selectRwForPage(page,zhjgDckhRw,loginDeptId);
+    }
+
     @Override
-    public IPage selectRwForPage(Page page,ZhjgDckhRw zhjgDckhRw) {
-        return baseMapper.selectRwForPage(page,zhjgDckhRw);
+    public boolean downloadById(Integer id) {
+        ZhjgDckhRw dckhRw = baseMapper.selectById(id);
+        int rwnum=0;
+        if (dckhRw!=null){
+            dckhRw.setRwzt("1");
+            dckhRw.setXfsj(LocalDateTime.now());
+            rwnum =  baseMapper.updateById(dckhRw);
+        }
+        if(dckhRw.getCydw()!=null){
+            String[] cydwids = dckhRw.getCydw().split(",");
+            for (int i = 0; i <cydwids.length ; i++) {
+                ZhjgDckhRwFf rwff = new ZhjgDckhRwFf();
+                rwff.setRwid(id);
+                rwff.setRwmc(dckhRw.getRwmc());
+                rwff.setDwdm(Integer.parseInt(cydwids[i]));
+                rwff.setZt("1");
+                rwff.setCreateTime(LocalDateTime.now());
+                zhjgDckhRwFfMapper.insert(rwff);
+            }
+        }
+
+
+        if (rwnum>0){
+            return true;
+        }else {
+            return false;
+        }
+
     }
 }

src/main/java/com/elephant/framework/galaxy/aroad/util/SecurityUtils.java

@@ -98,4 +98,28 @@ public class SecurityUtils {
         return roleIds;
     }
 
+    /**
+     * 获取登陆用户单位id
+     * @return
+     */
+    public Integer getDeptId() {
+        GalaxyUser galaxyUser = getUser();
+        Integer depId = galaxyUser.getDeptId();
+        return depId;
+    }
+
+    /**
+     * 获取用户角是否具备某个权限
+     *
+     * @return 角色集合
+     */
+    public boolean isMenue(String menue) {
+        Authentication authentication = getAuthentication();
+        Collection<? extends GrantedAuthority> authorities = authentication.getAuthorities();
+
+        List<Integer> roleIds = new ArrayList<>();
+        boolean isExits = authorities.stream().anyMatch(s->((GrantedAuthority) s).getAuthority().equals(menue));
+        return isExits;
+    }
+
 }

src/main/resources/application-dev.yml

 server:
-  port: 8989
+  port: 9999
 spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/aroad?useUnicode=true&characterEncoding=utf-8&useSSL=false
     username: root
-    password: 123456
+    password: root
   cache:
     type: redis
   redis:

src/main/resources/mapper/zhjg/ZhjgDckhRwCbMapper.xml

+<?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.elephant.framework.galaxy.aroad.module.zhjg.mapper.ZhjgDckhRwCbMapper">
+
+  <resultMap id="zhjgDckhRwCbMap" type="com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRwCb">
+        <id property="id" column="id"/>
+        <result property="rwid" column="rwid"/>
+        <result property="tgbt" column="tgbt"/>
+        <result property="tgnr" column="tgnr"/>
+        <result property="zt" column="zt"/>
+        <result property="cbdw" column="cbdw"/>
+        <result property="cbsj" column="cbsj"/>
+  </resultMap>
+</mapper>

src/main/resources/mapper/zhjg/ZhjgDckhRwFfMapper.xml

@@ -19,4 +19,15 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remarks" column="remarks"/>
   </resultMap>
+
+      <select id="selectListByRwid" resultMap="zhjgDckhRwFfMap">
+            select dr.*
+            from t_zhjg_dckh_rw_ff dr
+            <where>
+                  <if test="rwid!=null">
+                        dr.rwid =#{rwid}
+                  </if>
+            </where>
+
+      </select>
 </mapper>

src/main/resources/mapper/zhjg/ZhjgDckhRwFkMapper.xml

+<?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.elephant.framework.galaxy.aroad.module.zhjg.mapper.ZhjgDckhRwFkMapper">
+
+  <resultMap id="zhjgDckhRwFkMap" type="com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRwFk">
+        <id property="id" column="id"/>
+        <result property="rwid" column="rwid"/>
+        <result property="rwmc" column="rwmc"/>
+        <result property="fknr" column="fknr"/>
+        <result property="fksj" column="fksj"/>
+        <result property="fkdw" column="fkdw"/>
+        <result property="scwd" column="scwd"/>
+  </resultMap>
+</mapper>

src/main/resources/mapper/zhjg/ZhjgDckhRwMapper.xml

@@ -9,13 +9,19 @@
         <result property="rwmc" column="rwmc"/>
         <result property="rwzt" column="rwzt"/>
         <result property="cydw" column="cydw"/>
+        <result property="cydwid" column="cydwid"/>
+        <result property="cyr" column="cyr"/>
         <result property="dblx" column="dblx"/>
-        <result property="qtdw" column="qtdw"/>
-        <result property="bjsx" column="bjsx"/>
+        <result property="zrdw" column="zrdw"/>
+        <result property="zrdwid" column="zrdwid"/>
+        <result property="zrr" column="zrr"/>
+        <result property="ksrq" column="ksrq"/>
+        <result property="blqx" column="blqx"/>
         <result property="xfsj" column="xfsj"/>
         <result property="dbnr" column="dbnr"/>
         <result property="dbfj" column="dbfj"/>
         <result property="dbr" column="dbr"/>
+        <result property="dbrlxfs" column="dbrlxfs"/>
         <result property="creator" column="creator"/>
         <result property="createTime" column="create_time"/>
         <result property="updatePerson" column="update_person"/>
@@ -25,14 +31,32 @@
         <result property="remarks" column="remarks"/>
   </resultMap>
     <select id="selectRwForPage" resultMap="zhjgDckhRwMap">
-          select dr.*
-          from T_ZHJG_DCKH_RW dr
+          SELECT distinct
+          rw.*
+          FROM
+          t_zhjg_dckh_rw rw
+          LEFT JOIN
+          t_zhjg_dckh_rw_ff ff
+          on
+          ff.rwid=rw.id
           <where>
-                <if test="rw.rwmc!=null">
-                      dr.rwmc like CONCAT('%',#{rw.rwmc},'%')
+                <if test="khrw.rwmc!=null">
+                      rw.rwmc like CONCAT('%',#{khrw.rwmc},'%')
                 </if>
-                <if test="rw.qtdw!=null">
-                      dr.qtdw =#{rw.qtdw}
+                <if test="khrw.zrdwid!=null">
+                   and   rw.zrdwid =#{khrw.zrdwid}
+                </if>
+                <if test="khrw.cydw!=null">
+                      and  dr.rwmc like CONCAT('%',#{rw.cydw},'%')
+                </if>
+                <if test="loginDeptId!=null">
+                      and  ff.dwdm=#{loginDeptId}
+                </if>
+                <if test="khrw.rwzt!=null">
+                      and  ff.zt=#{khrw.rwzt}
+                </if>
+                <if test="khrw.status!=null">
+                      and  rw.rwzt=#{khrw.status}
                 </if>
           </where>
           order by create_time desc