新增业务接收数据接口

@@ -27,6 +27,14 @@ public class SysDictController {
     @Autowired
     SysDictService sysDictService;
 
+
+    @ApiOperation("根据复机编码查询子集编码和名称")
+    @GetMapping ("getSysDictChildByParentCode")
+    public Result getSysDictChildByParentCode(@ApiParam("父级编码") @RequestParam String dcode) {
+        return sysDictService.getSysDictChildByParentCode(dcode);
+    }
+
+
     @ApiOperation("获取字典表父级集合")
     @PostMapping("getSysDictParent")
     public Result<PageInfo<GetSysDictParentVo>> getSysDictParent(@RequestBody SysDictVo request) {

@@ -73,4 +73,6 @@ public interface SysDictMapper {
     List<SysDict> selectAll();
 
     int deleteByTypeId(@Param("typeid") String typeid);
+
+    List<SysDict> getSysDictChildByParentCode(@Param("dcode") String dcode);
 }

 package com.pashanhoo.dictionary.service;
 
 import com.github.pagehelper.PageInfo;
+import com.pashanhoo.common.Result;
 import com.pashanhoo.dictionary.model.dto.SysDict;
 import com.pashanhoo.dictionary.model.vo.EditDictVo;
 import com.pashanhoo.dictionary.model.vo.GetSysDictParentVo;
@@ -100,4 +101,11 @@ public interface SysDictService {
      */
     List<SysDict> selectAll();
 
+    /**
+     * 根据复机编码查询子集编码和名称
+     * @param dcode
+     * @return
+     */
+    Result getSysDictChildByParentCode(String dcode);
+
 }

@@ -2,6 +2,7 @@ package com.pashanhoo.dictionary.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.pashanhoo.common.Result;
 import com.pashanhoo.dictionary.dao.SysDictMapper;
 import com.pashanhoo.dictionary.model.dto.SysDict;
 import com.pashanhoo.dictionary.model.vo.EditDictVo;
@@ -165,6 +166,12 @@ public class SysDictServiceImpl implements SysDictService {
         return sysDictMapper.selectAll();
     }
 
+    @Override
+    public Result getSysDictChildByParentCode(String dcode) {
+        List<SysDict> list=sysDictMapper.getSysDictChildByParentCode(dcode);
+        return Result.ok(list);
+    }
+
 
     private List<SysDict> getAllSysDict(List<SysDict> dicts, List<SysDict> result) {
 

@@ -57,8 +57,8 @@ public class DgLendDO implements Serializable {
     /**
      * 借阅日期
      */
-    @TableField("JYRQ")
-    private Date jyrq;
+    @TableField("QSSJ")
+    private Date qssj;
 
     /**
      * 归还日期
@@ -73,10 +73,10 @@ public class DgLendDO implements Serializable {
     private String pzr;
 
     /**
-     * 借阅期限
+     * 借阅截止日期
      */
-    @TableField("JYQX")
-    private String jyqx;
+    @TableField("JZRQ")
+    private Date jzrq;
 
     /**
      * 借出理由

@@ -72,10 +72,10 @@ public class DgLendDetailVO implements Serializable {
     @ApiModelProperty(name = "ghr", value = "归还人")
     private String ghr;
     /**
-     * 归还时间
+     * 归还日期
      */
-    @ApiModelProperty(name = "ghsj", value = "归还时间")
-    private String ghsj;
+    @ApiModelProperty(name = "ghrq", value = "归还日期")
+    private String ghrq;
     /**
      * 借阅状态
      */

@@ -144,6 +144,15 @@ public class DgReceiveDO implements Serializable {
      */
     @TableField("STATE")
     private String state;
-
+    /**
+     * 登记业务编码
+     */
+    @TableField("DJYWBM")
+    private String djywbm;
+    /**
+     * 登记业务名称
+     */
+    @TableField("DJYWMC")
+    private String djywmc;
 
 }

@@ -144,6 +144,15 @@ public class DgReceiveSearchRequest extends PageInfo implements Serializable {
      */
     @ApiModelProperty(name = "state", value = "整理状态(0：待处理，1：已归档)")
     private String state;
-
+    /**
+     * 登记业务编码
+     */
+    @ApiModelProperty(name = "djywbm", value = "登记业务编码")
+    private String djywbm;
+    /**
+     * 登记业务名称
+     */
+    @ApiModelProperty(name = "djywmc", value = "登记业务名称")
+    private String djywmc;
 
 }

@@ -44,5 +44,5 @@ public interface DgReceiveService extends IService<DgReceiveDO> {
      * @param request
      * @return
     */
-    Page searchDgReceiveList(DgReceiveSearchRequest request);
+    Result searchDgReceiveList(DgReceiveSearchRequest request);
 }

@@ -19,10 +19,7 @@ import com.pashanhoo.business.service.DgBusinessService;
 import com.pashanhoo.common.Result;
 import com.pashanhoo.receive.entity.DgReceiveConverter;
 import com.pashanhoo.receive.entity.DgReceiveDO;
-import com.pashanhoo.receive.entity.vo.AddDgReceiveRequest;
-import com.pashanhoo.receive.entity.vo.DgReceiveDetailVO;
-import com.pashanhoo.receive.entity.vo.UpdateDgReceiveRequest;
-import com.pashanhoo.receive.entity.vo.DgReceiveSearchRequest;
+import com.pashanhoo.receive.entity.vo.*;
 import com.pashanhoo.receive.mapper.DgReceiveMapper;
 import com.pashanhoo.receive.service.DgReceiveService;
 import com.pashanhoo.receiverelation.entity.DgReceiveRelationConverter;
@@ -191,17 +188,16 @@ public class DgReceiveServiceImpl extends ServiceImpl<DgReceiveMapper, DgReceive
      * @return
      */
     @Override
-    public Page searchDgReceiveList(DgReceiveSearchRequest request) {
+    public Result searchDgReceiveList(DgReceiveSearchRequest request) {
         Page<DgReceiveDO> pageParam = new Page<DgReceiveDO>(request.getCurrentPage(), request.getPageSize());
         QueryWrapper<DgReceiveDO> wrapper = new QueryWrapper<>();
-        //设置默认排序
-        wrapper = "desc".equals(request.getSortOrder()) ? wrapper.orderByDesc(request.getSortField()) :  wrapper.orderByAsc(request.getSortField());
-
-        //TODO 根据当前情况设置wrapper条件
-
+        wrapper.eq(request.getYwh()!=null && !"".equals(request.getYwh()),"YWH",request.getYwh());
+        wrapper.eq(request.getDjywbm()!=null && !"".equals(request.getDjywbm()),"DJYWBM",request.getDjywbm());
+        wrapper.eq(request.getDjlx()!=null && !"".equals(request.getDjlx()),"DJLX",request.getDjlx());
+        wrapper.eq(request.getYwlyjbm()!=null && !"".equals(request.getYwlyjbm()),"YWLYJBM",request.getYwlyjbm());
         Page page = this.page(pageParam, wrapper);
-        //将查询出来的DO List转为 ListVO List并重新设置到page对象中，并返回page对象
-        return page.setRecords(dgreceiveConverter.doList2ListVOList(page.getRecords()));
+        List<DgReceiveListVO> list=dgreceiveConverter.doList2ListVOList(page.getRecords());
+        return Result.ok(list);
     }
 
 }

@@ -13,4 +13,7 @@ import com.pashanhoo.receiverelation.entity.DgReceiveRelationDO;
  */
 public interface DgReceiveRelationMapper extends BaseMapper<DgReceiveRelationDO> {
 
+
+
+
 }

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

@@ -18,46 +18,72 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="档案补录信息列表VO")
-//TODO 该类属性暂时是完整的全部属性，需进行个性化的增删
+
 public class DgArchivesReplenishListVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-     * 修改标识码
+     * 补录标识码
      */
-    @ApiModelProperty(name = "bsmModify", value = "修改标识码")
-    private String bsmModify;
+    @ApiModelProperty(name = "bsm_modify", value = "补录标识码")
+    private String bsm_modify;
 
     /**
-     * 档案标识码
+     * 补录时间
      */
-    @ApiModelProperty(name = "bsmArchives", value = "档案标识码")
-    private String bsmArchives;
+    @ApiModelProperty(name = "xgsj", value = "补录时间")
+    private Date xgsj;
 
     /**
-     * 原档案信息
+     * 补录人
      */
-    @ApiModelProperty(name = "blbh", value = "原档案信息")
-    private String blbh;
-
+    @ApiModelProperty(name = "xgr", value = "补录人")
+    private String xgr;
     /**
-     * 修改时间
+     * 业务类型名称
      */
-    @ApiModelProperty(name = "xgsj", value = "修改时间")
-    private Date xgsj;
-
+    @ApiModelProperty(name = "djjgmc", value = "业务类型名称")
+    private String djjgmc;
     /**
-     * 修改人
+     * 登记类型
      */
-    @ApiModelProperty(name = "xgr", value = "修改人")
-    private String xgr;
-
+    @ApiModelProperty(name = "djlx", value = "登记类型")
+    private String djlx;
     /**
-     * 备注
+     * 档案号
      */
-    @ApiModelProperty(name = "bz", value = "备注")
-    private String bz;
-
+    @ApiModelProperty(name = "ajh", value = "档案号")
+    private String ajh;
+    /**
+     * 业务号
+     */
+    @ApiModelProperty(name = "ywh", value = "业务号")
+    private String ywh;
+    /**
+     * 不动产单元号
+     */
+    @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 = "bdcdy_num", value = "不动产单元号数量")
+    private String bdcdy_num;
 
 }

@@ -19,39 +19,42 @@ import com.pashanhoo.common.PageInfo;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="档案补录信息列表查询请求实体")
-//TODO 初始查询条件是全部，需要根据情况自行删减
 public class DgArchivesReplenishSearchRequest extends PageInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /**
-     * 修改标识码
+     * 业务号
      */
-    @ApiModelProperty(name = "bsmModify", value = "修改标识码")
-    private String bsmModify;
+    @ApiModelProperty(name = "ywh", value = "业务号")
+    private String ywh;
 
     /**
-     * 档案标识码
+     * 登记业务编码
      */
-    @ApiModelProperty(name = "bsmArchives", value = "档案标识码")
-    private String bsmArchives;
-
+    @ApiModelProperty(name = "djywbm", value = "登记业务编码")
+    private String djywbm;
+    /**
+     * 登记业务名称
+     */
+    @ApiModelProperty(name = "djywmc", value = "登记业务名称")
+    private String djywmc;
     /**
-     * 原档案信息
+     * 登记类型
      */
-    @ApiModelProperty(name = "blbh", value = "原档案信息")
-    private String blbh;
+    @ApiModelProperty(name = "djlx", value = "登记类型")
+    private String djlx;
 
     /**
-     * 修改时间
+     * 补录时间
      */
-    @ApiModelProperty(name = "xgsj", value = "修改时间")
+    @ApiModelProperty(name = "xgsj", value = "补录时间")
     private Date xgsj;
 
     /**
-     * 修改人
+     *补录人
      */
-    @ApiModelProperty(name = "xgr", value = "修改人")
+    @ApiModelProperty(name = "xgr", value = "补录人")
     private String xgr;
 
     /**

@@ -3,6 +3,10 @@ package com.pashanhoo.replenish.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pashanhoo.replenish.entity.DgArchivesReplenishDO;
+import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO;
+import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishSearchRequest;
+
+import java.util.List;
 
 /**
  * <p>
@@ -14,4 +18,6 @@ import com.pashanhoo.replenish.entity.DgArchivesReplenishDO;
  */
 public interface DgArchivesReplenishMapper extends BaseMapper<DgArchivesReplenishDO> {
 
+    List<DgArchivesReplenishListVO> search(DgArchivesReplenishSearchRequest searchRequest);
+
 }

@@ -3,6 +3,7 @@ package com.pashanhoo.replenish.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.pashanhoo.common.Result;
 import com.pashanhoo.replenish.entity.*;
 import com.pashanhoo.replenish.entity.vo.AddDgArchivesReplenishRequest;
 import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishDetailVO;
@@ -44,5 +45,5 @@ public interface DgArchivesReplenishService extends IService<DgArchivesReplenish
      * @param request
      * @return
     */
-    Page searchDgArchivesReplenishList(DgArchivesReplenishSearchRequest request);
+    Result searchDgArchivesReplenishList(DgArchivesReplenishSearchRequest request);
 }

@@ -2,18 +2,18 @@ package com.pashanhoo.replenish.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pashanhoo.replenish.entity.*;
-import com.pashanhoo.replenish.entity.vo.AddDgArchivesReplenishRequest;
-import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishDetailVO;
-import com.pashanhoo.replenish.entity.vo.DgArchivesReplenishSearchRequest;
-import com.pashanhoo.replenish.entity.vo.UpdateDgArchivesReplenishRequest;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.pashanhoo.common.Result;
+import com.pashanhoo.replenish.entity.DgArchivesReplenishConverter;
+import com.pashanhoo.replenish.entity.DgArchivesReplenishDO;
+import com.pashanhoo.replenish.entity.vo.*;
 import com.pashanhoo.replenish.mapper.DgArchivesReplenishMapper;
 import com.pashanhoo.replenish.service.DgArchivesReplenishService;
 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>
@@ -71,17 +71,11 @@ public class DgArchivesReplenishServiceImpl extends ServiceImpl<DgArchivesReplen
      * @return
      */
     @Override
-    public Page searchDgArchivesReplenishList(DgArchivesReplenishSearchRequest request) {
-        Page<DgArchivesReplenishDO> pageParam = new Page<DgArchivesReplenishDO>(request.getCurrentPage(), request.getPageSize());
-        QueryWrapper<DgArchivesReplenishDO> 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(dgarchivesreplenishConverter.doList2ListVOList(page.getRecords()));
+    public Result searchDgArchivesReplenishList(DgArchivesReplenishSearchRequest request) {
+        PageHelper.startPage(request.getCurrentPage(), request.getPageSize());
+        List<DgArchivesReplenishListVO> list= dgarchivesreplenishMapper.search(request);
+        PageInfo<DgArchivesReplenishListVO> pageInfo = new PageInfo<DgArchivesReplenishListVO>(list);
+        return Result.ok(pageInfo);
     }
 
 }

@@ -11,9 +11,47 @@
         <result column="XGR" property="xgr" />
         <result column="BZ" property="bz" />
     </resultMap>
+    <!-- 通用查询映射结果 -->
+    <resultMap id="SearchResultMap" type="com.pashanhoo.replenish.entity.vo.DgArchivesReplenishListVO">
+        <id column="BSM_MODIFY" property="bsm_modify" />
+        <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, 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
+        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
+          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>

@@ -14,7 +14,7 @@
         <result column="QSSJ" property="qssj" />
         <result column="JZRQ" property="jzrq" />
         <result column="GHR" property="ghr" />
-        <result column="GHSJ" property="ghsj" />
+        <result column="GHRQ" property="ghrq" />
         <result column="JYZT" property="jyzt" />
         <result column="DA_NUM" property="da_num" />
     </resultMap>
@@ -59,7 +59,7 @@
     </resultMap>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        BSM_LEND, JYR, JYDW, LXDW, TXDZ, JYRQ, GHRQ, PZR, JYQX, JCLY, LYMD, BZ, PZSJ
+        BSM_LEND, JYR, JYDW, LXDW, TXDZ, JYRQ, GHRQ, PZR, JZRQ, JCLY, LYMD, BZ, PZSJ
     </sql>
     <update id="updateArchivesStatus">
         update dg_archives b
@@ -106,7 +106,7 @@
         a.qssj,
         a.jzrq,
         a.ghr,
-        a.ghsj,
+        a.ghrq,
         a.jyzt
         from dg_lend a, dg_archives b,dg_lend_catalog c,dg_bdcdy e,dg_business f
         where b.BSM_ARCHIVES=c.BSM_ARCHIVES

@@ -267,6 +267,13 @@
         select *
         from SYS_DICT
     </select>
+    <select id="getSysDictChildByParentCode" resultType="com.pashanhoo.dictionary.model.dto.SysDict">
+        select dcode,dname
+        from sys_dict t where parentid =(select dictid from sys_dict where dcode = #{dcode,jdbcType=VARCHAR} )
+            CONNECT by PRIOR t.dictid = t.parentid
+        start with dcode = #{dcode,jdbcType=VARCHAR}
+        ORDER  siblings  BY t.sort
+    </select>
 
     <delete id="deleteByTypeId">
         delete  from SYS_DICT where TYPEID = #{typeid,jdbcType=VARCHAR} and PARENTID is not null