Merge remote-tracking branch 'origin/dev' into dev

db/zhjg.sql

@@ -22,13 +22,13 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
 DROP TABLE IF EXISTS `T_ZHJG_DCKH_RW`;
 CREATE TABLE `T_ZHJG_DCKH_RW`  (
-  `id` int(10) NOT NULL COMMENT '主键',
+  `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `rwmc` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '任务名称',
   `rwzt` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '任务状态',
-  `jjcd` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '紧急程度（正常、重要、紧急）',
   `dblx` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '督办类型',
   `qtdw` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '牵头单位',
-  `bjsx` datetime(6) NULL DEFAULT NULL COMMENT '办结时限',
+  `cydw` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '参与单位',
+  `bjsx` date NULL DEFAULT NULL COMMENT '办结时限',
   `xfsj` datetime(6) NULL DEFAULT NULL COMMENT '任务下发时间',
   `dbnr` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '督办内容',
   `dbfj` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '督办附件',
@@ -41,7 +41,8 @@ CREATE TABLE `T_ZHJG_DCKH_RW`  (
   `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '是否删除  -1：已删除  0：正常',
   `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '督查情况任务表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 20 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '督查督办任务表' ROW_FORMAT = Dynamic;
+
 
 
 -- ----------------------------
@@ -49,7 +50,7 @@ CREATE TABLE `T_ZHJG_DCKH_RW`  (
 -- ----------------------------
 DROP TABLE IF EXISTS `T_ZHJG_DCKH_RW_FF`;
 CREATE TABLE `T_ZHJG_DCKH_RW_FF`  (
-  `id` int(9) NOT NULL COMMENT '主键',
+  `id` int(9) NOT NULL AUTO_INCREMENT COMMENT '主键',
   `rwid` int(11) NULL DEFAULT NULL COMMENT '督办任务id',
   `rwmc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '督办任务名称',
   `dwmc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '承办单位名称',
@@ -63,6 +64,17 @@ CREATE TABLE `T_ZHJG_DCKH_RW_FF`  (
   `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '是否删除  -1：已删除  0：正常',
   `remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注信息',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '督查情况任务分发表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '督查督办任务分发表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- sys_menu 新增
+-- ----------------------------
+insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
+    values ( '61100', null, 'zhjg_zhjgdckhrwff', '1', null, '1', '61110', '0', '2018-05-15 21:35:18', '0', '2018-07-29 13:38:59', '待办任务');
+insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
+    values ( '61100', null, 'zhjg_zhjgdckhrwff_edit', '1', null, '1', '61111', '0', '2018-05-15 21:35:18', '1', '2018-07-29 13:38:59', '待办任务接收');
+insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
+    values ( '61100', null, 'zhjg_zhjgdckhrwff_del', '1', null, '1', '61112', '0', '2018-05-15 21:35:18', '2', '2018-07-29 13:38:59', '待办任务反馈');
+
 
 SET FOREIGN_KEY_CHECKS = 1;

src/main/java/com/elephant/framework/galaxy/aroad/module/common/file/UploadController.java

+package com.elephant.framework.galaxy.aroad.module.common.file;
+
+import com.alibaba.fastjson.JSON;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Objects;
+
+
+@RestController
+@RequestMapping("/upload")
+public class UploadController {
+    @Value("${prop.upload-folder}")
+    private String UPLOAD_FOLDER;
+    private Logger logger = LoggerFactory.getLogger(UploadController.class);
+
+    @PostMapping(value ="/singlefile",produces = "application/json; charset=utf-8")
+    public Object singleFileUpload(@RequestParam(value = "file")MultipartFile file) {
+        logger.debug("传入的文件参数：{}", JSON.toJSONString(file, true));
+        if (Objects.isNull(file) || file.isEmpty()) {
+            logger.error("文件为空");
+            return "文件为空，请重新上传";
+        }
+
+        try {
+            byte[] bytes = file.getBytes();
+            Path path = Paths.get(UPLOAD_FOLDER + file.getOriginalFilename());
+            //如果没有files文件夹，则创建
+            if (!Files.isWritable(path)) {
+                Files.createDirectories(Paths.get(UPLOAD_FOLDER));
+            }
+            //文件写入指定路径
+            Files.write(path, bytes);
+            logger.debug("文件写入成功...");
+            return "文件上传成功";
+        } catch (IOException e) {
+            e.printStackTrace();
+            return "后端异常...";
+        }
+    }
+}
+

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.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.zhjg.entity.ZhjgDckhRw;
@@ -10,6 +13,8 @@ import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 
+import javax.management.Query;
+
 
 /**
  * 督查情况任务表
@@ -23,6 +28,7 @@ import com.elephant.framework.galaxy.aroad.module.common.controller.BaseControll
 public class ZhjgDckhRwController extends BaseController  {
 
   private final  ZhjgDckhRwService zhjgDckhRwService;
+  private final ZhjgDckhRwFfService zhjgDckhRwFsService;
 
   /**
    * 分页查询
@@ -32,7 +38,7 @@ public class ZhjgDckhRwController extends BaseController  {
    */
   @GetMapping("/page")
   public R getZhjgDckhRwPage(Page page, ZhjgDckhRw zhjgDckhRw) {
-    return  new R<>(zhjgDckhRwService.page(page,Wrappers.query(zhjgDckhRw)));
+    return  new R<>(zhjgDckhRwService.selectRwForPage(page,zhjgDckhRw));
   }
 
 
@@ -54,7 +60,15 @@ public class ZhjgDckhRwController extends BaseController  {
   @SysLog("新增督查情况任务表")
   @PostMapping
   public R save(@RequestBody ZhjgDckhRw zhjgDckhRw){
-    return new R<>(zhjgDckhRwService.save(zhjgDckhRw));
+    String cydws = zhjgDckhRw.getCydw();
+
+    boolean rw=  zhjgDckhRwService.save(zhjgDckhRw);
+    if(cydws!=null){
+      String[] cydw = cydws.split(",");
+      zhjgDckhRwFsService.save(zhjgDckhRw,cydw);
+    }
+
+    return new R<>(rw);
   }
 
   /**

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/controller/ZhjgDckhRwFfController.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.ZhjgDckhRwFf;
+import com.elephant.framework.galaxy.aroad.module.zhjg.service.ZhjgDckhRwFfService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+
+/**
+ * 督查情况任务分发表
+ *
+ * @author zyw
+ * @date 2019-03-15 16:59:03
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhjg/zhjgdckhrwff")
+public class ZhjgDckhRwFfController extends BaseController  {
+
+  private final  ZhjgDckhRwFfService zhjgDckhRwFfService;
+
+  /**
+   * 分页查询
+   * @param page 分页对象
+   * @param zhjgDckhRwFf 督查情况任务分发表
+   * @return
+   */
+  @GetMapping("/page")
+  public R getZhjgDckhRwFfPage(Page page, ZhjgDckhRwFf zhjgDckhRwFf) {
+    return  new R<>(zhjgDckhRwFfService.page(page,Wrappers.query(zhjgDckhRwFf)));
+  }
+
+
+  /**
+   * 通过id查询督查情况任务分发表
+   * @param id id
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R getById(@PathVariable("id") Integer id){
+    return new R<>(zhjgDckhRwFfService.getById(id));
+  }
+
+  /**
+   * 新增督查情况任务分发表
+   * @param zhjgDckhRwFf 督查情况任务分发表
+   * @return R
+   */
+  @SysLog("新增督查情况任务分发表")
+  @PostMapping
+  public R save(@RequestBody ZhjgDckhRwFf zhjgDckhRwFf){
+    return new R<>(zhjgDckhRwFfService.save(zhjgDckhRwFf));
+  }
+
+  /**
+   * 修改督查情况任务分发表
+   * @param zhjgDckhRwFf 督查情况任务分发表
+   * @return R
+   */
+  @SysLog("修改督查情况任务分发表")
+  @PutMapping
+  public R updateById(@RequestBody ZhjgDckhRwFf zhjgDckhRwFf){
+    return new R<>(zhjgDckhRwFfService.updateById(zhjgDckhRwFf));
+  }
+
+  /**
+   * 通过id删除督查情况任务分发表
+   * @param id id
+   * @return R
+   */
+  @SysLog("删除督查情况任务分发表")
+  @DeleteMapping("/{id}")
+  public R removeById(@PathVariable Integer id){
+    return new R<>(zhjgDckhRwFfService.removeById(id));
+  }
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/entity/ZhjgDckhRw.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 com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -23,7 +28,7 @@ private static final long serialVersionUID = 1L;
   /**
    * 主键
    */
-  @TableId
+  @TableId(value = "id", type = IdType.AUTO)
   private Integer id;
   /**
    * 任务名称
@@ -34,9 +39,9 @@ private static final long serialVersionUID = 1L;
    */
   private String rwzt;
   /**
-   * 紧急程度（正常、重要、紧急）
+   * 参与单位
    */
-  private String jjcd;
+  private String cydw;
   /**
    * 督办类型
    */
@@ -48,7 +53,8 @@ private static final long serialVersionUID = 1L;
   /**
    * 办结时限
    */
-  private LocalDateTime bjsx;
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate bjsx;
   /**
    * 任务下发时间
    */

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/entity/ZhjgDckhRwFf.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-03-15 16:59:03
+ */
+@Data
+@TableName("T_ZHJG_DCKH_RW_FF")
+@EqualsAndHashCode(callSuper = true)
+public class ZhjgDckhRwFf extends Model<ZhjgDckhRwFf> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId(value = "id", type = IdType.AUTO)
+  private Integer id;
+  /**
+   * 督办任务id
+   */
+  private Integer rwid;
+  /**
+   * 督办任务名称
+   */
+  private String rwmc;
+  /**
+   * 承办单位名称
+   */
+  private String dwmc;
+  /**
+   * 承办单位代码
+   */
+  private String dwdm;
+  /**
+   * 状态
+   */
+  private String zt;
+  /**
+   * 创建人
+   */
+  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/mapper/ZhjgDckhRwFfMapper.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.ZhjgDckhRwFf;
+
+/**
+ * 督查情况任务分发表
+ *
+ * @author zyw
+ * @date 2019-03-15 16:59:03
+ */
+public interface ZhjgDckhRwFfMapper extends BaseMapper<ZhjgDckhRwFf> {
+
+}

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

 package com.elephant.framework.galaxy.aroad.module.zhjg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRw;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 督查情况任务表
@@ -11,4 +16,5 @@ import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRw;
  */
 public interface ZhjgDckhRwMapper extends BaseMapper<ZhjgDckhRw> {
 
+    IPage<List<ZhjgDckhRw>> selectRwForPage(Page page, @Param("rw") ZhjgDckhRw zhjgDckhRw);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/service/ZhjgDckhRwFfService.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.ZhjgDckhRw;
+import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRwFf;
+
+/**
+ * 督查情况任务分发表
+ *
+ * @author zyw
+ * @date 2019-03-15 16:59:03
+ */
+public interface ZhjgDckhRwFfService extends IService<ZhjgDckhRwFf> {
+
+    void save(ZhjgDckhRw zhjgDckhRw, String[] cydw);
+}

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

 package com.elephant.framework.galaxy.aroad.module.zhjg.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRw;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 /**
  * 督查情况任务表
@@ -10,5 +12,5 @@ import com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRw;
  * @date 2019-03-15 16:58:24
  */
 public interface ZhjgDckhRwService extends IService<ZhjgDckhRw> {
-
+    IPage selectRwForPage(Page page, ZhjgDckhRw zhjgDckhRw);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/service/impl/ZhjgDckhRwFfServiceImpl.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.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.service.ZhjgDckhRwFfService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 督查情况任务分发表
+ *
+ * @author zyw
+ * @date 2019-03-15 16:59:03
+ */
+@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/ZhjgDckhRwServiceImpl.java

 package com.elephant.framework.galaxy.aroad.module.zhjg.service.impl;
 
+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.mapper.ZhjgDckhRwMapper;
 import com.elephant.framework.galaxy.aroad.module.zhjg.service.ZhjgDckhRwService;
 import org.springframework.stereotype.Service;
-
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 /**
  * 督查情况任务表
  *
@@ -15,4 +16,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class ZhjgDckhRwServiceImpl extends ServiceImpl<ZhjgDckhRwMapper, ZhjgDckhRw> implements ZhjgDckhRwService {
 
+    @Override
+    public IPage selectRwForPage(Page page,ZhjgDckhRw zhjgDckhRw) {
+        return baseMapper.selectRwForPage(page,zhjgDckhRw);
+    }
 }

src/main/resources/application-dev.yml

@@ -30,3 +30,5 @@ mybatis-plus:
   mapper-locations: classpath:/mapper/*/*.xml
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+prop:
+  upload-folder: E:\file
\ No newline at end of file

src/main/resources/mapper/zhjg/ZhjgDckhRwFfMapper.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.ZhjgDckhRwFfMapper">
+
+  <resultMap id="zhjgDckhRwFfMap" type="com.elephant.framework.galaxy.aroad.module.zhjg.entity.ZhjgDckhRwFf">
+        <id property="id" column="id"/>
+        <result property="rwid" column="rwid"/>
+        <result property="rwmc" column="rwmc"/>
+        <result property="dwmc" column="dwmc"/>
+        <result property="dwdm" column="dwdm"/>
+        <result property="zt" column="zt"/>
+        <result property="creator" column="creator"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updatePerson" column="update_person"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="status" column="status"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="remarks" column="remarks"/>
+  </resultMap>
+</mapper>

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

@@ -8,7 +8,7 @@
         <id property="id" column="id"/>
         <result property="rwmc" column="rwmc"/>
         <result property="rwzt" column="rwzt"/>
-        <result property="jjcd" column="jjcd"/>
+        <result property="cydw" column="cydw"/>
         <result property="dblx" column="dblx"/>
         <result property="qtdw" column="qtdw"/>
         <result property="bjsx" column="bjsx"/>
@@ -24,4 +24,17 @@
         <result property="delFlag" column="del_flag"/>
         <result property="remarks" column="remarks"/>
   </resultMap>
+    <select id="selectRwForPage" resultMap="zhjgDckhRwMap">
+          select dr.*
+          from T_ZHJG_DCKH_RW dr
+          <where>
+                <if test="rw.rwmc!=null">
+                      dr.rwmc like CONCAT('%',#{rw.rwmc},'%')
+                </if>
+                <if test="rw.qtdw!=null">
+                      dr.qtdw =#{rw.qtdw}
+                </if>
+          </where>
+          order by create_time desc
+    </select>
 </mapper>