|
|
|
@ -11,6 +11,7 @@ import com.hxhq.business.domain.GyzjFfjlJcgj; |
|
|
|
import com.hxhq.business.domain.StudyGyzj; |
|
|
|
import com.hxhq.business.dto.gyzj.FfjlDetailDto; |
|
|
|
import com.hxhq.business.dto.gyzj.FfjlListDto; |
|
|
|
import com.hxhq.business.dto.gyzj.ListDto; |
|
|
|
import com.hxhq.business.enums.zykgl.*; |
|
|
|
import com.hxhq.business.enums.zykgl.JlztEnum; |
|
|
|
import com.hxhq.business.form.gyzj.*; |
|
|
|
@ -47,6 +48,9 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i |
|
|
|
@Autowired |
|
|
|
private IStudyGyzjService studyGyzjService; |
|
|
|
|
|
|
|
|
|
|
|
//region 发放记录 |
|
|
|
|
|
|
|
/** |
|
|
|
* 详情 |
|
|
|
* |
|
|
|
@ -232,6 +236,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i |
|
|
|
for (GyzjFfjl gyzjFfjl : gyzjFfjlList) { |
|
|
|
//申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； |
|
|
|
gyzjFfjl.setJlzt(JlztEnum.dgd.getValue()); |
|
|
|
gyzjFfjl.setDazt(DaztEnum.ygd.getValue()); |
|
|
|
// 稽查轨迹 |
|
|
|
gyzjFfjlJcgjList.add(gyzjFfjlJcgjService.getJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark())); |
|
|
|
} |
|
|
|
@ -263,6 +268,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i |
|
|
|
} |
|
|
|
//申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； |
|
|
|
gyzjFfjlOld.setJlzt(JlztEnum.dgd.getValue()); |
|
|
|
gyzjFfjlOld.setDazt(DaztEnum.ygd.getValue()); |
|
|
|
this.updateById(gyzjFfjlOld); |
|
|
|
//稽查轨迹 |
|
|
|
gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); |
|
|
|
@ -492,6 +498,246 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//endregion |
|
|
|
|
|
|
|
//region 档案管理 |
|
|
|
|
|
|
|
/** |
|
|
|
* 查询发放记录列表 |
|
|
|
* |
|
|
|
* @param form 发放记录 |
|
|
|
* @return 发放记录集合 |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public List<FfjlListDto> queryArchiveList(FfjlSearchForm form){ |
|
|
|
QueryWrapper<GyzjFfjl> queryWrapper = Wrappers.query(); |
|
|
|
queryWrapper.eq("t.del_flag", "0"); |
|
|
|
if (form.getJyzt() != null && form.getJyzt().intValue() > 0) { |
|
|
|
queryWrapper.eq("t.jyzt", form.getJyzt()); |
|
|
|
} |
|
|
|
if (form.getJlzt() != null && form.getJlzt().intValue() > 0) { |
|
|
|
queryWrapper.eq("t.jlzt", form.getJlzt()); |
|
|
|
} |
|
|
|
if (StringUtils.isNoneBlank(form.getMc())) { |
|
|
|
queryWrapper.and(p -> p.like("t.`mc`", form.getMc())); |
|
|
|
} |
|
|
|
if (StringUtils.isNoneBlank(form.getBh())) { |
|
|
|
queryWrapper.and(p -> p.like("t.`bh`", form.getBh())); |
|
|
|
} |
|
|
|
if (StringUtils.isNoneBlank(form.getStartDateCk())) { |
|
|
|
queryWrapper.and(p -> p.apply("t.ffrq>={0}", form.getStartDateCk())); |
|
|
|
} |
|
|
|
if (StringUtils.isNoneBlank(form.getEndDateCk())) { |
|
|
|
queryWrapper.apply("t.ffrq>={0}", form.getStartDateCk()); |
|
|
|
} |
|
|
|
if (StringUtils.isNoneBlank(form.getStartDateRk())) { |
|
|
|
queryWrapper.and(p -> p.apply("t.rkrq>={0}", form.getStartDateRk())); |
|
|
|
} |
|
|
|
if (StringUtils.isNoneBlank(form.getEndDateRk())) { |
|
|
|
queryWrapper.apply("t.ghrq>={0}", form.getEndDateRk()); |
|
|
|
} |
|
|
|
if (form.getMdId() != null && form.getMdId().intValue() > 0) { |
|
|
|
queryWrapper.and(p -> p.apply("find_in_set({0}, t.`md_ids`) or t.md_ids={0}", form.getMdId())); |
|
|
|
} |
|
|
|
queryWrapper.orderByDesc("t.id"); |
|
|
|
return baseMapper.queryList(queryWrapper); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 同意归档 |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public void tygd(ArchiveForm form){ |
|
|
|
SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); |
|
|
|
//验证签名人密码 |
|
|
|
checkPassword(qmr,form.getQmrmm(),false); |
|
|
|
if (form.getId() == null || form.getId().longValue() < 0) { |
|
|
|
throw new ServiceException("参数id不正确"); |
|
|
|
} |
|
|
|
GyzjFfjl gyzjFfjlOld = this.getById(form.getId()); |
|
|
|
if (gyzjFfjlOld == null) { |
|
|
|
throw new ServiceException("发放记录不存在或已删除"); |
|
|
|
} |
|
|
|
if (!gyzjFfjlOld.getJlzt().equals(JlztEnum.dgd.getValue())) { |
|
|
|
throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是待归档状态，不能操作"); |
|
|
|
} |
|
|
|
gyzjFfjlOld.setJlzt(JlztEnum.gd.getValue()); |
|
|
|
this.updateById(gyzjFfjlOld); |
|
|
|
//稽查轨迹 |
|
|
|
gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 拒绝归档 |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public void jjgd(ArchiveForm form){ |
|
|
|
SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); |
|
|
|
//验证签名人密码 |
|
|
|
checkPassword(qmr,form.getQmrmm(),false); |
|
|
|
if (form.getId() == null || form.getId().longValue() < 0) { |
|
|
|
throw new ServiceException("参数id不正确"); |
|
|
|
} |
|
|
|
GyzjFfjl gyzjFfjlOld = this.getById(form.getId()); |
|
|
|
if (gyzjFfjlOld == null) { |
|
|
|
throw new ServiceException("发放记录不存在或已删除"); |
|
|
|
} |
|
|
|
if (!gyzjFfjlOld.getJlzt().equals(JlztEnum.dgd.getValue())) { |
|
|
|
throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是待归档状态，不能操作"); |
|
|
|
} |
|
|
|
gyzjFfjlOld.setJlzt(JlztEnum.ysd.getValue()); |
|
|
|
gyzjFfjlOld.setDazt(DaztEnum.wgd.getValue()); |
|
|
|
this.updateById(gyzjFfjlOld); |
|
|
|
//稽查轨迹 |
|
|
|
Map<String, String> formData = new LinkedHashMap<>(); |
|
|
|
formData.put("原因", form.getRemark()); |
|
|
|
gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 同意解档 |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public void tyjd(ArchiveForm form){ |
|
|
|
SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); |
|
|
|
//验证签名人密码 |
|
|
|
checkPassword(qmr,form.getQmrmm(),false); |
|
|
|
if (form.getId() == null || form.getId().longValue() < 0) { |
|
|
|
throw new ServiceException("参数id不正确"); |
|
|
|
} |
|
|
|
GyzjFfjl gyzjFfjlOld = this.getById(form.getId()); |
|
|
|
if (gyzjFfjlOld == null) { |
|
|
|
throw new ServiceException("发放记录不存在或已删除"); |
|
|
|
} |
|
|
|
if (!gyzjFfjlOld.getJlzt().equals(JlztEnum.djd.getValue())) { |
|
|
|
throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是待解档状态，不能操作"); |
|
|
|
} |
|
|
|
gyzjFfjlOld.setJlzt(JlztEnum.ysd.getValue()); |
|
|
|
gyzjFfjlOld.setDazt(DaztEnum.wgd.getValue()); |
|
|
|
this.updateById(gyzjFfjlOld); |
|
|
|
//稽查轨迹 |
|
|
|
gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 拒绝解档 |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public void jjjd(ArchiveForm form){ |
|
|
|
SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); |
|
|
|
//验证签名人密码 |
|
|
|
checkPassword(qmr,form.getQmrmm(),false); |
|
|
|
if (form.getId() == null || form.getId().longValue() < 0) { |
|
|
|
throw new ServiceException("参数id不正确"); |
|
|
|
} |
|
|
|
GyzjFfjl gyzjFfjlOld = this.getById(form.getId()); |
|
|
|
if (gyzjFfjlOld == null) { |
|
|
|
throw new ServiceException("发放记录不存在或已删除"); |
|
|
|
} |
|
|
|
if (!gyzjFfjlOld.getJlzt().equals(JlztEnum.djd.getValue())) { |
|
|
|
throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是待解档状态，不能操作"); |
|
|
|
} |
|
|
|
gyzjFfjlOld.setJlzt(JlztEnum.gd.getValue()); |
|
|
|
this.updateById(gyzjFfjlOld); |
|
|
|
//稽查轨迹 |
|
|
|
Map<String, String> formData = new LinkedHashMap<>(); |
|
|
|
formData.put("原因", form.getRemark()); |
|
|
|
gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 同意借阅 |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public void tyjy(ArchiveForm form){ |
|
|
|
SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); |
|
|
|
//验证签名人密码 |
|
|
|
checkPassword(qmr,form.getQmrmm(),false); |
|
|
|
if (form.getId() == null || form.getId().longValue() < 0) { |
|
|
|
throw new ServiceException("参数id不正确"); |
|
|
|
} |
|
|
|
GyzjFfjl gyzjFfjlOld = this.getById(form.getId()); |
|
|
|
if (gyzjFfjlOld == null) { |
|
|
|
throw new ServiceException("发放记录不存在或已删除"); |
|
|
|
} |
|
|
|
if (!gyzjFfjlOld.getJyzt().equals(JyztEnum.djy.getValue())) { |
|
|
|
throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是待借阅状态，不能操作"); |
|
|
|
} |
|
|
|
gyzjFfjlOld.setJyzt(JyztEnum.jyz.getValue()); |
|
|
|
gyzjFfjlOld.setJyksrq(form.getJyksrq()); |
|
|
|
gyzjFfjlOld.setJyjsrq(form.getJyjsrq()); |
|
|
|
this.updateById(gyzjFfjlOld); |
|
|
|
//稽查轨迹 |
|
|
|
Map<String, String> formData = new LinkedHashMap<>(); |
|
|
|
formData.put("开始日期", DateUtils.dateTime(form.getJyksrq())); |
|
|
|
formData.put("结束日期", DateUtils.dateTime(form.getJyjsrq())); |
|
|
|
gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 拒绝借阅 |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public void jjjy(ArchiveForm form){ |
|
|
|
SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); |
|
|
|
//验证签名人密码 |
|
|
|
checkPassword(qmr,form.getQmrmm(),false); |
|
|
|
if (form.getId() == null || form.getId().longValue() < 0) { |
|
|
|
throw new ServiceException("参数id不正确"); |
|
|
|
} |
|
|
|
GyzjFfjl gyzjFfjlOld = this.getById(form.getId()); |
|
|
|
if (gyzjFfjlOld == null) { |
|
|
|
throw new ServiceException("发放记录不存在或已删除"); |
|
|
|
} |
|
|
|
if (!gyzjFfjlOld.getJyzt().equals(JyztEnum.djy.getValue())) { |
|
|
|
throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是待借阅状态，不能操作"); |
|
|
|
} |
|
|
|
gyzjFfjlOld.setJyzt(JyztEnum.wjy.getValue()); |
|
|
|
gyzjFfjlOld.setJyksrq(form.getJyksrq()); |
|
|
|
gyzjFfjlOld.setJyjsrq(form.getJyjsrq()); |
|
|
|
this.updateById(gyzjFfjlOld); |
|
|
|
//稽查轨迹 |
|
|
|
Map<String, String> formData = new LinkedHashMap<>(); |
|
|
|
formData.put("开始日期", DateUtils.dateTime(form.getJyksrq())); |
|
|
|
formData.put("结束日期", DateUtils.dateTime(form.getJyjsrq())); |
|
|
|
formData.put("原因", form.getRemark()); |
|
|
|
gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 确认归还 |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public void qrgh(ArchiveForm form){ |
|
|
|
SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); |
|
|
|
//验证签名人密码 |
|
|
|
checkPassword(qmr,form.getQmrmm(),false); |
|
|
|
if (form.getId() == null || form.getId().longValue() < 0) { |
|
|
|
throw new ServiceException("参数id不正确"); |
|
|
|
} |
|
|
|
GyzjFfjl gyzjFfjlOld = this.getById(form.getId()); |
|
|
|
if (gyzjFfjlOld == null) { |
|
|
|
throw new ServiceException("发放记录不存在或已删除"); |
|
|
|
} |
|
|
|
if (!gyzjFfjlOld.getJyzt().equals(JyztEnum.jyz.getValue())) { |
|
|
|
throw new ServiceException("发放记录【" + gyzjFfjlOld.getMc() + "】不是借阅中状态，不能操作"); |
|
|
|
} |
|
|
|
gyzjFfjlOld.setJyzt(JyztEnum.wjy.getValue()); |
|
|
|
this.updateById(gyzjFfjlOld); |
|
|
|
//稽查轨迹 |
|
|
|
gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//endregion |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
* 验证密码 |
|
|
|
|
15881625488@163.com
2 months ago