Skip to content

荆蔚杰 / java.archive

Go to a project
Toggle navigation
Toggle navigation pinning
0dfce04b by 夏齐
Options

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

1 parent d95181f6
Inline Side-by-side
Showing 18 changed files with 277 additions and 279 deletions
......@@ -3,7 +3,7 @@ package com.pashanhoo.archive.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pashanhoo.archive.entity.DgArchivesDO;
import com.pashanhoo.archive.entity.vo.DgArchivesSearchRequest;
import org.apache.ibatis.annotations.Param;
import java.util.List;
......@@ -17,5 +17,6 @@ import java.util.List;
*/
public interface DgArchivesMapper extends BaseMapper<DgArchivesDO> {
boolean updateArchivesInfoByReceiveIdList(@Param("idList") List<String> idList,@Param("dazt") String dazt);
}
......
package com.pashanhoo.common.util.SysCode;
import org.mapstruct.Mapper;
/**
* @author
* @since 2021-11-05
*/
@Mapper(componentModel = "spring")
public interface SysCodeConverter {
SysCodeDO addRequest2DO(SysCodeVO request);
}
package com.pashanhoo.common.util.SysCode;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("SYS_CODE")
public class SysCodeDO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(value = "CID", type = IdType.UUID)
private String cid;
/**
* 类型
*/
@TableField("CTYPE")
private String ctype;
/**
* 任务编码
*/
@TableField("TASKNO")
private String taskno;
/**
* 任务名称
*/
@TableField("TASKNAME")
private String taskname;
/**
* 状态
*/
@TableField("STATE")
private String state;
/**
* 任务值
*/
@TableField("TASKVALUE")
private String taskvalue;
/**
* 任务子类
*/
@TableField("TASKCHILD")
private String taskchild;
}
package com.pashanhoo.common.util.SysCode;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
public interface SysCodeMapper extends BaseMapper<SysCodeDO> {
}
package com.pashanhoo.common.util.SysCode;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List;
@Component
public class SysCodeUtil {
@Autowired
private SysCodeMapper sysCodeMapper;
@Autowired
private SysCodeConverter converter;
/**
* 编号生成规则
* @param sysCodeVO
* @return
*/
public String getSequence(SysCodeVO sysCodeVO){
//1、查询数据是否存在
SysCodeDO sysCodeDO=queryInfoByCondition(sysCodeVO);
String taskvalue="";
if(sysCodeDO!=null){
//2、如果存在在修改编号值
taskvalue=Integer.valueOf(sysCodeDO.getTaskvalue())+1+"";
sysCodeDO.setTaskvalue(taskvalue);
sysCodeMapper.updateById(sysCodeDO);
}else {
//3、不存在则新增
taskvalue= getTaskValue(Integer.valueOf(sysCodeVO.getTaskchild()));
sysCodeVO.setTaskvalue(taskvalue);
sysCodeVO.setTaskname("自动生成序列号");
SysCodeDO sysCodeDO1=converter.addRequest2DO(sysCodeVO);
sysCodeMapper.insert(sysCodeDO1);
}
return taskvalue;
}
private SysCodeDO queryInfoByCondition(SysCodeVO sysCodeVO){
QueryWrapper<SysCodeDO> wrapper = new QueryWrapper<>();
wrapper.eq(sysCodeVO.getCtype()!=null && !"".equals(sysCodeVO.getCtype()),"CTYPE",sysCodeVO.getCtype());
wrapper.eq(sysCodeVO.getTaskno()!=null && !"".equals(sysCodeVO.getTaskno()),"TASKNO",sysCodeVO.getTaskno());
wrapper.eq("STATE","1");
wrapper.eq(sysCodeVO.getTaskchild()!=null && !"".equals(sysCodeVO.getTaskchild()),"TASKCHILD",sysCodeVO.getTaskchild());
SysCodeDO sysCodeDO=sysCodeMapper.selectOne(wrapper);
return sysCodeDO;
}
private String getTaskValue(int length){
List<String> list=new ArrayList<String>(length-1);
String num="";
for (int i = 0; i <list.size() ; i++) {
num+="0";
}
num=num+1;
return num;
}
}
package com.pashanhoo.common.util.SysCode;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="编号公共类VO实体")
public class SysCodeVO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 类型
*/
@ApiModelProperty(name = "ctype", value = "类型")
private String ctype;
/**
* 任务编码
*/
@ApiModelProperty(name = "taskno", value = "任务编码")
private String taskno;
/**
* 任务名称
*/
@ApiModelProperty(name = "taskname", value = "任务名称")
private String taskname;
/**
* 状态
*/
@ApiModelProperty(name = "state", value = "状态")
private String state;
/**
* 任务值
*/
@ApiModelProperty(name = "taskvalue", value = "任务值")
private String taskvalue;
/**
* 任务子类
*/
@ApiModelProperty(name = "taskchild", value = "任务子类")
private String taskchild;
}
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 "";
}
}
......@@ -2,15 +2,14 @@ package com.pashanhoo.receive.controller;
import com.pashanhoo.common.Result;
import com.pashanhoo.receive.entity.vo.AddDgReceiveRequest;
import com.pashanhoo.receive.entity.vo.UpdateDgReceiveRequest;
import com.pashanhoo.receive.entity.vo.DgReceiveSearchRequest;
import com.pashanhoo.receive.service.DgReceiveService;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
......@@ -29,40 +28,23 @@ public class DgReceiveController {
private DgReceiveService dgreceiveService;
@PostMapping("insertDgReceive")
@ApiOperation("新增档案接收记录")
@ApiOperation("新增接收记录接口")
public Result insertDgReceive(@RequestBody AddDgReceiveRequest request){
return dgreceiveService.insertDgReceive(request);
}
@DeleteMapping("deleteDgReceiveByIds")
@ApiOperation(value = "批量删除档案接收记录")
public Result deleteDgReceiveByIds(@ApiParam("档案接收记录ID列表") @RequestParam(value = "idList") List<String> idList) {
if(dgreceiveService.removeByIds(idList)) {
return Result.ok("删除成功");
@PostMapping("search")
@ApiOperation(value = "根据条件进行列表查询")
public Result searchDgReceiveList(@RequestBody DgReceiveSearchRequest request) {
return dgreceiveService.searchDgReceiveList(request);
}
return Result.error("删除失败");
@PostMapping("addBatchArchies")
@ApiOperation("批量归档")
public Result addBatchArchies(@ApiParam("接收记录ID列表") @RequestParam(value = "idList") List<String> idList){
return dgreceiveService.addBatchArchies(idList);
}
@PutMapping("updateDgReceive")
@ApiOperation("修改档案接收记录")
public Result updateDgReceive(@RequestBody UpdateDgReceiveRequest request){
if(dgreceiveService.updateDgReceive(request)) {
return Result.ok("修改成功");
}
return Result.error("修改失败");
}
@GetMapping("getDgReceiveDetailById")
@ApiOperation(value = "读取明细")
public Result getDgReceiveDetailById(@ApiParam("档案接收记录ID") @RequestParam String id){
return Result.ok(dgreceiveService.getDgReceiveDetailById(id));
}
@PostMapping("search")
@ApiOperation(value = "根据条件进行列表查询")
public Result searchDgReceiveList(@RequestBody DgReceiveSearchRequest request) {
//TODO 默认排序条件设置
request.defaultFillPageProp("","");
return Result.ok(dgreceiveService.searchDgReceiveList(request));
}
}
......
......@@ -154,5 +154,10 @@ public class DgReceiveDO implements Serializable {
*/
@TableField("DJYWMC")
private String djywmc;
/**
* 业务标识码
*/
@TableField("BSM_YW")
private String bsm_yw;
}
......
package com.pashanhoo.receive.entity.vo;
import java.math.BigDecimal;
import java.util.Date;
import java.io.Serializable;
import com.pashanhoo.common.PageInfo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import com.pashanhoo.common.PageInfo;
import java.io.Serializable;
/**
* <p>
......@@ -20,139 +19,33 @@ import com.pashanhoo.common.PageInfo;
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="档案接收记录列表查询请求实体")
//TODO 初始查询条件是全部，需要根据情况自行删减
public class DgReceiveSearchRequest extends PageInfo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 接收标识码
*/
@ApiModelProperty(name = "bmsReceive", value = "接收标识码")
private String bmsReceive;
/**
* 业务来源编码
* 业务号
*/
@ApiModelProperty(name = "ywlyjbm", value = "业务来源编码")
private String ywlyjbm;
@ApiModelProperty(name = "ywh", value = "业务号")
private String ywh;
/**
* 权利类型
*/
@ApiModelProperty(name = "qllx", value = "权利类型")
private String qllx;
/**
* 登记类型
*/
@ApiModelProperty(name = "djlx", value = "登记类型")
private String djlx;
/**
* 收件人员
*/
@ApiModelProperty(name = "sjry", value = "收件人员")
private String sjry;
/**
* 收件时间
*/
@ApiModelProperty(name = "sjsj", value = "收件时间")
private Date sjsj;
/**
* 业务号
*/
@ApiModelProperty(name = "ywh", value = "业务号")
private String ywh;
/**
* 不动产单元号
*/
@ApiModelProperty(name = "bdcdyh", value = "不动产单元号")
private String bdcdyh;
/**
* 单元总数
*/
@ApiModelProperty(name = "dyzs", value = "单元总数")
private BigDecimal dyzs;
/**
* 不动产权证号
*/
@ApiModelProperty(name = "bdcqzh", value = "不动产权证号")
private String bdcqzh;
/**
* 权利人
*/
@ApiModelProperty(name = "qlr", value = "权利人")
private String qlr;
/**
* 权利人证件号码
*/
@ApiModelProperty(name = "zjhm", value = "权利人证件号码")
private String zjhm;
/**
* 义务人
*/
@ApiModelProperty(name = "ywr", value = "义务人")
private String ywr;
/**
* 坐落
*/
@ApiModelProperty(name = "zl", value = "坐落")
private String zl;
/**
* 登记时间
* 业务来源编码
*/
@ApiModelProperty(name = "djsj", value = "登记时间")
private Date djsj;
@ApiModelProperty(name = "ywlyjbm", value = "业务来源编码")
private String ywlyjbm;
/**
* 接收时间
*/
@ApiModelProperty(name = "jssj", value = "接收时间")
private Date jssj;
/**
* 推送机构编码
*/
@ApiModelProperty(name = "tsjgbm", value = "推送机构编码")
private String tsjgbm;
/**
* 归档方式(1：按业务归档，2：按单元归档，3：档案补充归档)
*/
@ApiModelProperty(name = "gdfs", value = "归档方式(1：按业务归档，2：按单元归档，3：档案补充归档)")
private String gdfs;
/**
* 归档时间
*/
@ApiModelProperty(name = "gdsj", value = "归档时间")
private Date gdsj;
/**
* 整理状态(0：待处理，1：已归档)
*/
@ApiModelProperty(name = "state", value = "整理状态(0：待处理，1：已归档)")
private String state;
/**
* 登记业务编码
*/
@ApiModelProperty(name = "djywbm", value = "登记业务编码")
private String djywbm;
/**
* 登记业务名称
*/
@ApiModelProperty(name = "djywmc", value = "登记业务名称")
private String djywmc;
}
......
......@@ -2,6 +2,9 @@ package com.pashanhoo.receive.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pashanhoo.receive.entity.DgReceiveDO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
......@@ -13,4 +16,6 @@ import com.pashanhoo.receive.entity.DgReceiveDO;
*/
public interface DgReceiveMapper extends BaseMapper<DgReceiveDO> {
boolean updateReceiveBatch(@Param("idList") List<String> idList,@Param("state") String state);
}
......
......@@ -9,6 +9,8 @@ import com.pashanhoo.receive.entity.vo.UpdateDgReceiveRequest;
import com.pashanhoo.receive.entity.vo.DgReceiveSearchRequest;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
/**
* <p>
* 档案接收记录 服务类
......@@ -18,31 +20,28 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
* @since 2021-11-05
*/
public interface DgReceiveService extends IService<DgReceiveDO> {
/**
* 新增记录
* 根据条件进行列表查询
* @param request
* @return
*/
Result insertDgReceive(AddDgReceiveRequest request);
Result searchDgReceiveList(DgReceiveSearchRequest request);
/**
* 根据主键查询记录详情
* @param id
* 批量归档
* @param idList
* @return
*/
DgReceiveDetailVO getDgReceiveDetailById(String id);
Result addBatchArchies(List<String> idList);
/**
* 修改单条记录
* 新增接收记录接口
* @param request
* @return
*/
boolean updateDgReceive(UpdateDgReceiveRequest request);
Result insertDgReceive(AddDgReceiveRequest request);
/**
* 根据条件进行列表查询
* @param request
* @return
*/
Result searchDgReceiveList(DgReceiveSearchRequest request);
}
......
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pashanhoo.archive.entity.DgArchivesConverter;
import com.pashanhoo.archive.entity.DgArchivesDO;
import com.pashanhoo.archive.entity.vo.AddDgArchivesRequest;
import com.pashanhoo.archive.mapper.DgArchivesMapper;
import com.pashanhoo.archive.service.DgArchivesService;
import com.pashanhoo.bdcdy.entity.DgBdcdyConverter;
import com.pashanhoo.bdcdy.entity.DgBdcdyDO;
......@@ -31,6 +32,7 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.ArrayList;
......@@ -63,6 +65,8 @@ public class DgReceiveServiceImpl extends ServiceImpl<DgReceiveMapper, DgReceive
@Autowired
private DgArchivesService archivesService;
@Autowired
private DgArchivesMapper dgarchivesMapper;
@Autowired
private DgArchivesConverter archivesConverter;
@Autowired
private DgReceiveRelationService relationService;
......@@ -159,29 +163,6 @@ public class DgReceiveServiceImpl extends ServiceImpl<DgReceiveMapper, DgReceive
bdcdyService.saveBatch(bdcdyDOList);
return Result.ok();
}
/**
* 根据主键查询记录详情
* @param id
* @return
*/
@Override
public DgReceiveDetailVO getDgReceiveDetailById(String id) {
DgReceiveDO dgreceiveDO = this.getById(id);
return dgreceiveConverter.do2DetailVO(dgreceiveDO);
}
/**
* 修改单条记录
* @param request
* @return
*/
@Override
public boolean updateDgReceive(UpdateDgReceiveRequest request) {
DgReceiveDO dgreceiveDO = dgreceiveConverter.updateRequest2DO(request);
return this.updateById(dgreceiveDO);
}
/**
* 根据条件进行列表查询
* @param request
......@@ -192,12 +173,28 @@ public class DgReceiveServiceImpl extends ServiceImpl<DgReceiveMapper, DgReceive
Page<DgReceiveDO> pageParam = new Page<DgReceiveDO>(request.getCurrentPage(), request.getPageSize());
QueryWrapper<DgReceiveDO> wrapper = new QueryWrapper<>();
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.getQllx()!=null && !"".equals(request.getQllx()),"QLLX",request.getQllx());
wrapper.eq(request.getDjlx()!=null && !"".equals(request.getDjlx()),"DJLX",request.getDjlx());
wrapper.eq(request.getYwlyjbm()!=null && !"".equals(request.getYwlyjbm()),"YWLYJBM",request.getYwlyjbm());
wrapper.eq("STATE","0");
Page page = this.page(pageParam, wrapper);
List<DgReceiveListVO> list=dgreceiveConverter.doList2ListVOList(page.getRecords());
return Result.ok(list);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result addBatchArchies(List<String> idList) {
//更新接收表归档时间和归档状态
boolean receiveFlag=dgreceiveMapper.updateReceiveBatch(idList,"1");//整理状态(0：待处理，1：已归档)
//查询接收表和档案表的关联关系表找出对应的档案
//档案状态（1：正在接收；2：正在补录；3：正在修改；4：在库；5：正在销毁；6：已销毁；7：正在借阅；8：已借阅）
boolean archivesFlag=dgarchivesMapper.updateArchivesInfoByReceiveIdList(idList,"4");
if(receiveFlag && archivesFlag){
return Result.ok("操作成功");
}else{
return Result.ok("操作失败");
}
}
}
......
package com.pashanhoo.receiverelation.controller;
import com.pashanhoo.common.Result;
import com.pashanhoo.receiverelation.entity.vo.AddDgReceiveRelationRequest;
import com.pashanhoo.receiverelation.entity.vo.UpdateDgReceiveRelationRequest;
import com.pashanhoo.receiverelation.entity.vo.DgReceiveRelationSearchRequest;
import com.pashanhoo.receiverelation.service.DgReceiveRelationService;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
/**
* <p>
* 档案接收关联表 前端控制器
* </p>
*
* @author
* @since 2021-11-10
*/
@RestController
@RequestMapping("/system/dgReceiveRelation/")
@Api(tags = "档案接收关联表接口")
public class DgReceiveRelationController {
@Autowired
private DgReceiveRelationService dgreceiverelationService;
@PostMapping("insertDgReceiveRelation")
@ApiOperation("新增档案接收关联表")
public Result insertDgReceiveRelation(@RequestBody AddDgReceiveRelationRequest request){
if(dgreceiverelationService.insertDgReceiveRelation(request)){
return Result.ok();
}
return Result.error("新增失败");
}
@DeleteMapping("deleteDgReceiveRelationByIds")
@ApiOperation(value = "批量删除档案接收关联表")
public Result deleteDgReceiveRelationByIds(@ApiParam("档案接收关联表ID列表") @RequestParam(value = "idList") List<String> idList) {
if(dgreceiverelationService.removeByIds(idList)) {
return Result.ok("删除成功");
}
return Result.error("删除失败");
}
@PutMapping("updateDgReceiveRelation")
@ApiOperation("修改档案接收关联表")
public Result updateDgReceiveRelation(@RequestBody UpdateDgReceiveRelationRequest request){
if(dgreceiverelationService.updateDgReceiveRelation(request)) {
return Result.ok("修改成功");
}
return Result.error("修改失败");
}
@GetMapping("getDgReceiveRelationDetailById")
@ApiOperation(value = "读取明细")
public Result getDgReceiveRelationDetailById(@ApiParam("档案接收关联表ID") @RequestParam String id){
return Result.ok(dgreceiverelationService.getDgReceiveRelationDetailById(id));
}
@PostMapping("search")
@ApiOperation(value = "根据条件进行列表查询")
public Result searchDgReceiveRelationList(@RequestBody DgReceiveRelationSearchRequest request) {
//TODO 默认排序条件设置
request.defaultFillPageProp("","");
return Result.ok(dgreceiverelationService.searchDgReceiveRelationList(request));
}
}
......@@ -18,7 +18,6 @@ import com.pashanhoo.common.PageInfo;
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="档案接收关联表列表查询请求实体")
//TODO 初始查询条件是全部，需要根据情况自行删减
public class DgReceiveRelationSearchRequest extends PageInfo implements Serializable {
private static final long serialVersionUID = 1L;
......
......@@ -33,5 +33,15 @@
<sql id="Base_Column_List">
BSM_ARCHIVES, AJBT, ZTC, FLH, MLH, AJH, ND, JS, YS, BGQX, QSRQ, ZZRQ, MJ, HH, CFWZ, CJR, CJRQ, HCR, BZ, SMZT, DAZT, CDJGBM, DALY
</sql>
<update id="updateArchivesInfoByReceiveIdList">
update DG_ARCHIVES a set a.dazt=#{dazt,jdbcType=VARCHAR} where exists (
select 1 from dg_receive_relation b where a.BSM_ARCHIVES=b.BSM_ARCHIVES
and b.bms_receive in
<foreach collection="idList" index="index" item="item"
separator="," open="(" close=")">
#{item,jdbcType=VARCHAR}
</foreach>
)
</update>
</mapper>
......
......@@ -30,4 +30,13 @@
<sql id="Base_Column_List">
BMS_RECEIVE, YWLYJBM, QLLX, DJLX, SJRY, SJSJ, YWH, BDCDYH, DYZS, BDCQZH, QLR, ZJHM, YWR, ZL, DJSJ, JSSJ, TSJGBM, GDFS, GDSJ, STATE
</sql>
<update id="updateReceiveBatch">
update dg_receive b
set b.state = #{state,jdbcType=VARCHAR},b.gdsj=sysdate
where BMS_RECEIVE in
<foreach collection="idList" index="index" item="item"
separator="," open="(" close=")">
#{item,jdbcType=VARCHAR}
</foreach>
</update>
</mapper>
......
<?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.pashanhoo.common.util.SysCode.SysCodeMapper">
</mapper>
\ No newline at end of file