新增档案修改查询数据接口

+package com.pashanhoo.common.util;
+
+public class SysCodeUtil {
+
+    /**
+     * 获取编号
+     * @param ctype
+     * @param taskNo
+     * @param taskChild
+     */
+    public static  String getSequence(String ctype,String taskNo,String taskChild){
+        //1、查询数据是否存在
+        //2、如果存在在修改编号值
+        //3、不存在则新增
+        return "";
+    }
+
+
+
+}

@@ -65,8 +65,6 @@ public class DgArchivesModifyController {
     @PostMapping("search")
     @ApiOperation(value = "根据条件进行列表查询")
     public Result searchDgArchivesModifyList(@RequestBody DgArchivesModifySearchRequest request) {
-        //TODO 默认排序条件设置
-        request.defaultFillPageProp("","");
-        return Result.ok(dgarchivesmodifyService.searchDgArchivesModifyList(request));
+        return dgarchivesmodifyService.searchDgArchivesModifyList(request);
     }
 }

@@ -18,64 +18,73 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="档案修改信息列表VO")
-//TODO 该类属性暂时是完整的全部属性，需进行个性化的增删
+
 public class DgArchivesModifyListVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-     * 修改标识码
+     * 案卷标识码
      */
-    @ApiModelProperty(name = "bsmModify", value = "修改标识码")
-    private String bsmModify;
+    @ApiModelProperty(name = "bsm_archives", value = "案卷标识码")
+    private String bsm_archives;
 
     /**
-     * 档案标识码
+     * 修改时间
      */
-    @ApiModelProperty(name = "bsmArchives", value = "档案标识码")
-    private String bsmArchives;
+    @ApiModelProperty(name = "xgsj", value = "修改时间")
+    private Date xgsj;
 
     /**
-     * 修改编号
+     * 修改人
      */
-    @ApiModelProperty(name = "xgbh", value = "修改编号")
-    private String xgbh;
-
+    @ApiModelProperty(name = "xgr", value = "修改人")
+    private String xgr;
     /**
-     * 原档案信息
+     * 业务类型名称
      */
-    @ApiModelProperty(name = "ydaxx", value = "原档案信息")
-    private String ydaxx;
-
+    @ApiModelProperty(name = "djjgmc", value = "业务类型名称")
+    private String djjgmc;
     /**
-     * 现档案信息
+     * 登记类型
      */
-    @ApiModelProperty(name = "xdaxx", value = "现档案信息")
-    private String xdaxx;
-
+    @ApiModelProperty(name = "djlx", value = "登记类型")
+    private String djlx;
     /**
-     * 修改内容
+     * 档案号
      */
-    @ApiModelProperty(name = "xgnr", value = "修改内容")
-    private String xgnr;
-
+    @ApiModelProperty(name = "ajh", value = "档案号")
+    private String ajh;
     /**
-     * 修改时间
+     * 业务号
      */
-    @ApiModelProperty(name = "xgsj", value = "修改时间")
-    private Date xgsj;
-
+    @ApiModelProperty(name = "ywh", value = "业务号")
+    private String ywh;
     /**
-     * 修改人
+     * 不动产单元号
      */
-    @ApiModelProperty(name = "xgr", value = "修改人")
-    private String xgr;
-
+    @ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
+    private String bdcdyh;
+    /**
+     * 权利人
+     */
+    @ApiModelProperty(name = "qlr", value = "权利人")
+    private String qlr;
+    /**
+     * 义务人
+     */
+    @ApiModelProperty(name = "ywr", value = "义务人")
+    private String ywr;
+    /**
+     * 不动产证件号码
+     */
+    @ApiModelProperty(name = "bdcqzh", value = "不动产证件号码")
+    private String bdcqzh;
     /**
-     * 备注
+     * 不动产单元号数量
      */
-    @ApiModelProperty(name = "bz", value = "备注")
-    private String bz;
+    @ApiModelProperty(name = "bdcdy_num", value = "不动产单元号数量")
+    private String bdcdy_num;
 
 
 }

@@ -23,60 +23,53 @@ import com.pashanhoo.common.PageInfo;
 public class DgArchivesModifySearchRequest extends PageInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
     /**
-     * 修改标识码
+     * 登记业务名称
      */
-    @ApiModelProperty(name = "bsmModify", value = "修改标识码")
-    private String bsmModify;
-
+    @ApiModelProperty(name = "djywmc", value = "登记业务名称")
+    private String djywmc;
     /**
-     * 档案标识码
+     * 登记类型
      */
-    @ApiModelProperty(name = "bsmArchives", value = "档案标识码")
-    private String bsmArchives;
-
+    @ApiModelProperty(name = "djlx", value = "登记类型")
+    private String djlx;
     /**
-     * 修改编号
+     * 修改人
      */
-    @ApiModelProperty(name = "xgbh", value = "修改编号")
-    private String xgbh;
-
+    @ApiModelProperty(name = "xgr", value = "修改人")
+    private String xgr;
     /**
-     * 原档案信息
+     * 修改起始时间
      */
-    @ApiModelProperty(name = "ydaxx", value = "原档案信息")
-    private String ydaxx;
-
+    @ApiModelProperty(name = "xgqssj", value = "修改起始时间")
+    private Date xgqssj;
     /**
-     * 现档案信息
+     * 修改截止时间
      */
-    @ApiModelProperty(name = "xdaxx", value = "现档案信息")
-    private String xdaxx;
-
+    @ApiModelProperty(name = "xgjzsj", value = "修改截止时间")
+    private Date xgjzsj;
     /**
-     * 修改内容
+     * 档案号
      */
-    @ApiModelProperty(name = "xgnr", value = "修改内容")
-    private String xgnr;
-
+    @ApiModelProperty(name = "ajh", value = "档案号")
+    private String ajh;
     /**
-     * 修改时间
+     * 业务号
      */
-    @ApiModelProperty(name = "xgsj", value = "修改时间")
-    private Date xgsj;
-
+    @ApiModelProperty(name = "ywh", value = "业务号")
+    private String ywh;
     /**
-     * 修改人
+     * 不动产单元号
      */
-    @ApiModelProperty(name = "xgr", value = "修改人")
-    private String xgr;
-
+    @ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
+    private String bdcdyh;
     /**
-     * 备注
+     * 不动产权证号
      */
-    @ApiModelProperty(name = "bz", value = "备注")
-    private String bz;
+    @ApiModelProperty(name = "bdcqzh", value = "不动产权证号")
+    private String bdcqzh;
+
+
 
 
 }

@@ -3,6 +3,10 @@ package com.pashanhoo.modify.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pashanhoo.modify.entity.DgArchivesModifyDO;
+import com.pashanhoo.modify.entity.vo.DgArchivesModifyListVO;
+import com.pashanhoo.modify.entity.vo.DgArchivesModifySearchRequest;
+
+import java.util.List;
 
 /**
  * <p>
@@ -14,4 +18,7 @@ import com.pashanhoo.modify.entity.DgArchivesModifyDO;
  */
 public interface DgArchivesModifyMapper extends BaseMapper<DgArchivesModifyDO> {
 
+
+    List<DgArchivesModifyListVO> searchDgArchivesModifyList(DgArchivesModifySearchRequest request);
+
 }

@@ -3,6 +3,7 @@ package com.pashanhoo.modify.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.pashanhoo.common.Result;
 import com.pashanhoo.modify.entity.DgArchivesModifyDO;
 import com.pashanhoo.modify.entity.vo.AddDgArchivesModifyRequest;
 import com.pashanhoo.modify.entity.vo.DgArchivesModifyDetailVO;
@@ -44,5 +45,5 @@ public interface DgArchivesModifyService extends IService<DgArchivesModifyDO> {
      * @param request
      * @return
     */
-    Page searchDgArchivesModifyList(DgArchivesModifySearchRequest request);
+    Result searchDgArchivesModifyList(DgArchivesModifySearchRequest request);
 }

 package com.pashanhoo.modify.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.pashanhoo.common.Result;
 import com.pashanhoo.modify.entity.DgArchivesModifyConverter;
 import com.pashanhoo.modify.entity.DgArchivesModifyDO;
-import com.pashanhoo.modify.entity.vo.AddDgArchivesModifyRequest;
-import com.pashanhoo.modify.entity.vo.DgArchivesModifyDetailVO;
-import com.pashanhoo.modify.entity.vo.DgArchivesModifySearchRequest;
-import com.pashanhoo.modify.entity.vo.UpdateDgArchivesModifyRequest;
+import com.pashanhoo.modify.entity.vo.*;
 import com.pashanhoo.modify.mapper.DgArchivesModifyMapper;
 import com.pashanhoo.modify.service.DgArchivesModifyService;
+import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 档案修改信息 服务实现类
@@ -75,17 +78,11 @@ public class DgArchivesModifyServiceImpl extends ServiceImpl<DgArchivesModifyMap
      * @return
      */
     @Override
-    public Page searchDgArchivesModifyList(DgArchivesModifySearchRequest request) {
-        Page<DgArchivesModifyDO> pageParam = new Page<DgArchivesModifyDO>(request.getCurrentPage(), request.getPageSize());
-        QueryWrapper<DgArchivesModifyDO> wrapper = new QueryWrapper<>();
-        //设置默认排序
-        wrapper = "desc".equals(request.getSortOrder()) ? wrapper.orderByDesc(request.getSortField()) : wrapper.orderByAsc(request.getSortField());
-
-        //TODO 根据当前情况设置wrapper条件
-
-        Page page = this.page(pageParam, wrapper);
-        //将查询出来的DO List转为 ListVO List并重新设置到page对象中，并返回page对象
-        return page.setRecords(dgarchivesmodifyConverter.doList2ListVOList(page.getRecords()));
+    public Result searchDgArchivesModifyList(DgArchivesModifySearchRequest request) {
+        PageHelper.startPage(request.getCurrentPage(), request.getPageSize());
+        List<DgArchivesModifyListVO> list= dgarchivesmodifyMapper.searchDgArchivesModifyList(request);
+        PageInfo<DgArchivesModifyListVO> pageInfo = new PageInfo<DgArchivesModifyListVO>(list);
+        return Result.ok(pageInfo);
     }
 
 }

@@ -24,10 +24,10 @@ public class DgArchivesReplenishListVO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 补录标识码
+     * 档案标识码
      */
-    @ApiModelProperty(name = "bsm_modify", value = "补录标识码")
-    private String bsm_modify;
+    @ApiModelProperty(name = "bsm_archives", value = "档案标识码")
+    private String bsm_archives;
 
     /**
      * 补录时间

@@ -14,9 +14,47 @@
         <result column="XGR" property="xgr" />
         <result column="BZ" property="bz" />
     </resultMap>
-
+    <!-- 通用查询映射结果 -->
+    <resultMap id="SearchResultMap" type="com.pashanhoo.modify.entity.vo.DgArchivesModifyListVO">
+        <id column="BSM_ARCHIVES" property="bsm_archives" />
+        <result column="XGSJ" property="xgsj" />
+        <result column="XGR" property="xgr" />
+        <result column="DJLX" property="djlx" />
+        <result column="DJJGMC" property="djjgmc" />
+        <result column="AJH" property="ajh" />
+        <result column="YWH" property="ywh" />
+        <result column="BDCDYH" property="bdcdyh" />
+        <result column="QLR" property="qlr" />
+        <result column="YWR" property="ywr" />
+        <result column="BDCQZH" property="bdcqzh" />
+        <result column="BDCDY_NUM" property="bdcdy_num" />
+    </resultMap>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         BSM_MODIFY, BSM_ARCHIVES, XGBH, YDAXX, XDAXX, XGNR, XGSJ, XGR, BZ
     </sql>
+    <select id="searchDgArchivesModifyList" resultMap="SearchResultMap">
+        select a.bsm_archives,a.xgsj,a.xgr,b.djlx,b.djjgmc,d.ajh,b.ywh,c.bdcdyh,c.qlr,c.ywr,c.BDCQZH,count(1) over(partition by c.bdcdyh) bdcdy_num
+        from dg_archives_modify a, dg_business b, dg_bdcdy c,dg_archives d
+        where a.bsm_archives = d.bsm_archives
+        and a.bsm_archives=d.bsm_archives
+        and c.bsm_archives=d.bsm_archives
+        <if test="ywh != null and ywh!='' ">
+            and b.ywh=#{ywh,jdbcType=VARCHAR}
+        </if>
+        <if test="djjgbm != null and djjgbm!='' ">
+            and b.djjgbm=#{djjgbm,jdbcType=VARCHAR}
+        </if>
+        <if test="djlx != null and djlx!='' ">
+            and b.djlx=#{djlx,jdbcType=VARCHAR}
+        </if>
+        <if test="xgr != null and xgr!='' ">
+            and a.xgr=#{xgr,jdbcType=VARCHAR}
+        </if>
+        <if test="xgsj != null and xgsj!='' ">
+            and a.xgsj=#{xgsj,jdbcType=VARCHAR}
+        </if>
+
+
+    </select>
 </mapper>

@@ -13,7 +13,7 @@
     </resultMap>
     <!-- 通用查询映射结果 -->
     <resultMap id="SearchResultMap" type="com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO">
-        <id column="BSM_MODIFY" property="bsm_modify" />
+        <id column="BSM_ARCHIVES" property="bsm_archives" />
         <result column="XGSJ" property="xgsj" />
         <result column="XGR" property="xgr" />
         <result column="DJLX" property="djlx" />
@@ -32,7 +32,7 @@
         BSM_MODIFY, BSM_ARCHIVES, BLBH, XGSJ, XGR, BZ
     </sql>
     <select id="search" resultMap="SearchResultMap">
-        select a.bsm_modify,a.xgsj,a.xgr,b.djlx,b.djjgmc,d.ajh,b.ywh,c.bdcdyh,c.qlr,c.ywr,c.BDCQZH,count(1) over(partition by c.bdcdyh) bdcdy_num
+        select a.bsm_archives,a.xgsj,a.xgr,b.djlx,b.djjgmc,d.ajh,b.ywh,c.bdcdyh,c.qlr,c.ywr,c.BDCQZH,count(1) over(partition by c.bdcdyh) bdcdy_num
         from dg_archives_replenish a, dg_business b, dg_bdcdy c,dg_archives d
         where a.bsm_archives = d.bsm_archives
           and a.bsm_archives=d.bsm_archives