eln_TD
/
eln_svr
9
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

feat:[资源库管理][日志记录]

master
HanLong 2 months ago
parent
0915e84a9d
commit
83ba84c773
10 changed files with 232 additions and 110 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +11
    -2
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspFfjlJcgjService.java
  2. +19
    -2
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspJcgjService.java
  3. +17
    -2
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspRkjlJcgjService.java
  4. +33
    -13
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlJcgjServiceImpl.java
  5. +19
    -18
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlServiceImpl.java
  6. +43
    -13
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspJcgjServiceImpl.java
  7. +42
    -13
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlJcgjServiceImpl.java
  8. +17
    -16
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlServiceImpl.java
  9. +30
    -30
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java
  10. +1
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java

+ 11
- 2
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspFfjlJcgjService.java View File

@ -1,6 +1,8 @@
package com.hxhq.business.service;
import java.util.List;
import com.hxhq.business.domain.GspFfjl;
import com.hxhq.business.domain.GspFfjlJcgj;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hxhq.business.domain.GspJcgj;
@ -24,7 +26,7 @@ public interface IGspFfjlJcgjService extends IService
/**
* 新增稽查轨迹
* @param ffjlId 发放记录id
* @param gspFfjl 发放记录
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称
* @param jcmcEn 稽查名称-英文
@ -33,7 +35,14 @@ public interface IGspFfjlJcgjService extends IService
* @param jcnrEn 稽查内容 - 英文
* @param qmr 稽查人
*/
public void saveJcgj(Long ffjlId, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr);
public void saveJcgj(GspFfjl gspFfjl, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr);
/**
* 保存稽查轨迹-并保留日志
* @param gspFfjl
* @param jcgj
*/
public void saveWithLog(GspFfjl gspFfjl, GspFfjlJcgj jcgj);
/**
* 生成稽查轨迹

+ 19
- 2
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspJcgjService.java View File

@ -1,8 +1,11 @@
package com.hxhq.business.service;
import java.util.List;
import com.hxhq.business.domain.Gsp;
import com.hxhq.business.domain.GspJcgj;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hxhq.business.domain.Sj;
import com.hxhq.business.domain.SjJcgj;
import com.hxhq.system.api.domain.SysUser;
@ -24,7 +27,7 @@ public interface IGspJcgjService extends IService
/**
* 新增稽查轨迹
* @param gspId 供试品id
* @param gsp 供试品
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称
* @param jcmcEn 稽查名称-英文
@ -33,7 +36,21 @@ public interface IGspJcgjService extends IService
* @param jcnrEn 稽查内容-英文
* @param qmr 签名人
*/
public void saveJcgj(Long gspId, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr);
public void saveJcgj(Gsp gsp, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr);
/**
* 批量保存稽查轨迹-并保留日志
* @param gsp
* @param jcgjList
*/
void saveBatchWithLog(Gsp gsp, List<GspJcgj> jcgjList);
/**
* 保存稽查轨迹-并保留日志
* @param gsp
* @param jcgj
*/
void saveWithLog(Gsp gsp, GspJcgj jcgj);
/**
* 生成稽查轨迹

+ 17
- 2
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspRkjlJcgjService.java View File

@ -3,6 +3,7 @@ package com.hxhq.business.service;
import java.util.List;
import com.hxhq.business.domain.GspJcgj;
import com.hxhq.business.domain.GspRkjl;
import com.hxhq.business.domain.GspRkjlJcgj;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hxhq.system.api.domain.SysUser;
@ -25,7 +26,7 @@ public interface IGspRkjlJcgjService extends IService
/**
* 新增稽查轨迹
* @param gspRkjlId 供试品入库id
* @param gspRkjl 供试品入库记录
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称
* @param jcmcEn 稽查名称-英文
@ -34,7 +35,21 @@ public interface IGspRkjlJcgjService extends IService
* @param jcnrEn 稽查内容-英文
* @param qmr 签名人
*/
public void saveJcgj(Long gspRkjlId, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr);
public void saveJcgj(GspRkjl gspRkjl, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr);
/**
* 批量保存稽查轨迹-并记录日志
* @param gspRkjl
* @param jcgjList
*/
void saveBatchWithLog(GspRkjl gspRkjl, List<GspRkjlJcgj> jcgjList);
/**
* 保存稽查轨迹-并记录日志
* @param gspRkjl
* @param jcgj
*/
void saveWithLog(GspRkjl gspRkjl, GspRkjlJcgj jcgj);
/**
* 生成稽查轨迹

+ 33
- 13
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlJcgjServiceImpl.java View File

@ -3,9 +3,13 @@ package com.hxhq.business.service.impl;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.hxhq.business.domain.GspFfjl;
import com.hxhq.business.domain.GspJcgj;
import com.hxhq.business.domain.MjyFfjlJcgj;
import com.hxhq.business.service.ISystemLogService;
import com.hxhq.system.api.domain.SysUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import com.hxhq.business.mapper.GspFfjlJcgjMapper;
import com.hxhq.business.domain.GspFfjlJcgj;
@ -21,6 +25,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class GspFfjlJcgjServiceImpl extends ServiceImpl<GspFfjlJcgjMapper, GspFfjlJcgj> implements IGspFfjlJcgjService
{
@Autowired
private ISystemLogService systemLogService;
/**
* 查询供试品发放记录-稽查轨迹列表
*
@ -39,19 +47,31 @@ public class GspFfjlJcgjServiceImpl extends ServiceImpl
}
@Override
public void saveJcgj(Long ffjlId, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr) {
GspFfjlJcgj gspFfjlJcgj = new GspFfjlJcgj();
gspFfjlJcgj.setFfjlId(ffjlId);
gspFfjlJcgj.setJcgjlx(jcgjlx);
gspFfjlJcgj.setJcmc(jcmc);
gspFfjlJcgj.setJcmcEn(jcmcEn);
gspFfjlJcgj.setJcmcys(jcmcys);
gspFfjlJcgj.setJcnr(jcnr);
gspFfjlJcgj.setJcnrEn(jcnrEn);
gspFfjlJcgj.setQmrId(qmr.getUserId());
gspFfjlJcgj.setQmrMc(qmr.getNickName());
gspFfjlJcgj.setQmrMcEn(qmr.getUserName());
this.save(gspFfjlJcgj);
@Async
public void saveJcgj(GspFfjl gspFfjl, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr) {
GspFfjlJcgj jcgj = new GspFfjlJcgj();
jcgj.setFfjlId(gspFfjl.getId());
jcgj.setJcgjlx(jcgjlx);
jcgj.setJcmc(jcmc);
jcgj.setJcmcEn(jcmcEn);
jcgj.setJcmcys(jcmcys);
jcgj.setJcnr(jcnr);
jcgj.setJcnrEn(jcnrEn);
jcgj.setQmrId(qmr.getUserId());
jcgj.setQmrMc(qmr.getNickName());
jcgj.setQmrMcEn(qmr.getUserName());
this.save(jcgj);
systemLogService.saveInfo(gspFfjl.getBh(), gspFfjl.getBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
}
@Override
@Async
public void saveWithLog(GspFfjl gspFfjl, GspFfjlJcgj jcgj) {
this.save(jcgj);
systemLogService.saveInfo(gspFfjl.getBh(), gspFfjl.getBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
}
@Override

+ 19
- 18
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlServiceImpl.java View File

@ -149,7 +149,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
formDataEn.put("Transfer Condition", zytj);
formDataEn.put("Purpose", mdIds);
formDataEn.put("Comment", remark);
gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", "Distribution",
gspFfjlJcgjService.saveJcgj(gspFfjl, JcgjlxEnum.lc.getValue(), "领取发放", "Distribution",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), ffr1);
//endregion
}
@ -216,7 +216,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
formDataEn.put("Warehouse Keeper 2", jsr2.getNickName());
}
formDataEn.put("Comment", form.getRemark());
gspFfjlJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "归还", "Return",
gspFfjlJcgjService.saveJcgj(gspFfjl, JcgjlxEnum.lc.getValue(), "归还", "Return",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), jsr1);
//endregion
}
@ -249,7 +249,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请解档", "Apply for De-archiving",
gspFfjlJcgjService.saveJcgj(gspFfjl, JcgjlxEnum.lc.getValue(), "申请解档", "Apply for De-archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
@ -301,7 +301,10 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
gspFfjlJcgj.setQmrId(SecurityUtils.getUserId());
gspFfjlJcgj.setQmrMc(SecurityUtils.getNickName());
gspFfjlJcgj.setQmrMcEn(SecurityUtils.getUsername());
gspFfjlJcgjService.saveWithLog(gspFfjl, gspFfjlJcgj);
gspFfjlJcgjList.add(gspFfjlJcgj);
//endregion
GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
@ -312,7 +315,6 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
archiveLogService.saveInfo(ArchiveLogTypeEnum.gsplqff, gspFfjl.getId(), gspFfjl.getMc(), gspFfjl.getBh(), mdMcs, "申请归档");
}
this.saveOrUpdateBatch(gspFfjlList);
gspFfjlJcgjService.saveBatch(gspFfjlJcgjList);
}
}
@ -343,7 +345,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档","Apply for Archiving",
gspFfjlJcgjService.saveJcgj(gspFfjl, JcgjlxEnum.lc.getValue(), "申请归档","Apply for Archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
@ -397,13 +399,12 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
gspFfjlJcgj.setQmrId(SecurityUtils.getUserId());
gspFfjlJcgj.setQmrMc(SecurityUtils.getNickName());
gspFfjlJcgj.setQmrMcEn(SecurityUtils.getUsername());
gspFfjlJcgjService.saveWithLog(gspFfjl, gspFfjlJcgj);
gspFfjlJcgjList.add(gspFfjlJcgj);
//endregion
}
this.saveOrUpdateBatch(gspFfjlList);
gspFfjlJcgjService.saveBatch(gspFfjlJcgjList);
}
/**
@ -435,7 +436,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", "Lock",
gspFfjlJcgjService.saveJcgj(gspFfjl, JcgjlxEnum.lc.getValue(), "锁定发放记录", "Lock",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
}
@ -471,7 +472,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", "Unlock",
gspFfjlJcgjService.saveJcgj(gspFfjl, JcgjlxEnum.lc.getValue(), "解锁发放记录", "Unlock",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
}
@ -521,7 +522,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
formDataEn.put("Start Date", DateUtils.dateTime(form.getStartDate()));
formDataEn.put("End Date", DateUtils.dateTime(form.getEndDate()));
formDataEn.put("Comment", form.getRemark());
gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", "Apply for Check-out",
gspFfjlJcgjService.saveJcgj(gspFfjl, JcgjlxEnum.lc.getValue(), "申请借阅", "Apply for Check-out",
JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
@ -560,7 +561,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "补充说明", "Sign",
gspFfjlJcgjService.saveJcgj(gspFfjl, JcgjlxEnum.lc.getValue(), "补充说明", "Sign",
JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
}
@ -586,7 +587,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "同意归档", "Approve Archiving",
gspFfjlJcgjService.saveJcgj(gspFfjl, JcgjlxEnum.lc.getValue(), "同意归档", "Approve Archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
@ -621,7 +622,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", "Reject Archiving",
gspFfjlJcgjService.saveJcgj(gspFfjl, JcgjlxEnum.lc.getValue(), "拒绝归档", "Reject Archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
@ -656,7 +657,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "同意解档", "Approve De-archiving",
gspFfjlJcgjService.saveJcgj(gspFfjl, JcgjlxEnum.lc.getValue(), "同意解档", "Approve De-archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
@ -691,7 +692,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", "Reject De-archiving",
gspFfjlJcgjService.saveJcgj(gspFfjl, JcgjlxEnum.lc.getValue(), "拒绝解档", "Reject De-archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
@ -728,7 +729,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", "Approve Check-out",
gspFfjlJcgjService.saveJcgj(gspFfjl, JcgjlxEnum.lc.getValue(), "同意借阅", "Approve Check-out",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
@ -763,7 +764,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", "Reject Check-out",
gspFfjlJcgjService.saveJcgj(gspFfjl, JcgjlxEnum.lc.getValue(), "拒绝借阅", "Reject Check-out",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
GspFfjlListDto gspFfjlListDto = baseMapper.queryInfo(gspFfjl.getId());
@ -798,7 +799,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspFfjlJcgjService.saveJcgj(gspFfjl.getId(), JcgjlxEnum.lc.getValue(), "确认归还", "Check-out End Confirmation",
gspFfjlJcgjService.saveJcgj(gspFfjl, JcgjlxEnum.lc.getValue(), "确认归还", "Check-out End Confirmation",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);

+ 43
- 13
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspJcgjServiceImpl.java View File

@ -5,11 +5,15 @@ import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.hxhq.business.domain.Gsp;
import com.hxhq.business.domain.MjyJcgj;
import com.hxhq.business.domain.SjJcgj;
import com.hxhq.business.service.ISystemLogService;
import com.hxhq.common.core.domain.MpBaseEntity;
import com.hxhq.common.core.utils.StringUtils;
import com.hxhq.system.api.domain.SysUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import com.hxhq.business.mapper.GspJcgjMapper;
import com.hxhq.business.domain.GspJcgj;
@ -25,6 +29,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class GspJcgjServiceImpl extends ServiceImpl<GspJcgjMapper, GspJcgj> implements IGspJcgjService
{
@Autowired
private ISystemLogService systemLogService;
/**
* 查询供试品管理-稽查轨迹列表
*
@ -51,19 +59,41 @@ public class GspJcgjServiceImpl extends ServiceImpl impl
}
@Override
public void saveJcgj(Long gspId, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr) {
GspJcgj gspJcgj = new GspJcgj();
gspJcgj.setGspId(gspId);
gspJcgj.setJcgjlx(jcgjlx);
gspJcgj.setJcmc(jcmc);
gspJcgj.setJcmcEn(jcmcEn);
gspJcgj.setJcmcys(jcmcys);
gspJcgj.setJcnr(jcnr);
gspJcgj.setJcnr(jcnrEn);
gspJcgj.setQmrId(qmr.getUserId());
gspJcgj.setQmrMc(qmr.getNickName());
gspJcgj.setQmrMcEn(qmr.getUserName());
this.save(gspJcgj);
public void saveJcgj(Gsp gsp, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr) {
GspJcgj jcgj = new GspJcgj();
jcgj.setGspId(gsp.getId());
jcgj.setJcgjlx(jcgjlx);
jcgj.setJcmc(jcmc);
jcgj.setJcmcEn(jcmcEn);
jcgj.setJcmcys(jcmcys);
jcgj.setJcnr(jcnr);
jcgj.setJcnr(jcnrEn);
jcgj.setQmrId(qmr.getUserId());
jcgj.setQmrMc(qmr.getNickName());
jcgj.setQmrMcEn(qmr.getUserName());
this.save(jcgj);
systemLogService.saveInfo(gsp.getBh(), gsp.getBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
}
@Override
@Async
public void saveBatchWithLog(Gsp gsp, List<GspJcgj> jcgjList) {
this.saveBatch(jcgjList);
for (GspJcgj jcgj : jcgjList) {
systemLogService.saveInfo(gsp.getBh(), gsp.getBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
}
}
@Override
@Async
public void saveWithLog(Gsp gsp, GspJcgj jcgj) {
this.save(jcgj);
systemLogService.saveInfo(gsp.getBh(), gsp.getBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
}
@Override

+ 42
- 13
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlJcgjServiceImpl.java View File

@ -3,7 +3,11 @@ package com.hxhq.business.service.impl;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.hxhq.business.domain.GspRkjl;
import com.hxhq.business.service.ISystemLogService;
import com.hxhq.system.api.domain.SysUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import com.hxhq.business.mapper.GspRkjlJcgjMapper;
import com.hxhq.business.domain.GspRkjlJcgj;
@ -19,6 +23,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class GspRkjlJcgjServiceImpl extends ServiceImpl<GspRkjlJcgjMapper, GspRkjlJcgj> implements IGspRkjlJcgjService
{
@Autowired
private ISystemLogService systemLogService;
/**
* 查询供试品入库记录-稽查轨迹列表
*
@ -37,19 +44,41 @@ public class GspRkjlJcgjServiceImpl extends ServiceImpl
}
@Override
public void saveJcgj(Long gspRkjlId, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr) {
GspRkjlJcgj gspRkjlJcgj = new GspRkjlJcgj();
gspRkjlJcgj.setGspRkjlId(gspRkjlId);
gspRkjlJcgj.setJcgjlx(jcgjlx);
gspRkjlJcgj.setJcmc(jcmc);
gspRkjlJcgj.setJcmcEn(jcmcEn);
gspRkjlJcgj.setJcmcys(jcmcys);
gspRkjlJcgj.setJcnr(jcnr);
gspRkjlJcgj.setJcnrEn(jcnrEn);
gspRkjlJcgj.setQmrId(qmr.getUserId());
gspRkjlJcgj.setQmrMc(qmr.getNickName());
gspRkjlJcgj.setQmrMcEn(qmr.getUserName());
this.save(gspRkjlJcgj);
@Async
public void saveJcgj(GspRkjl gspRkjl, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr) {
GspRkjlJcgj jcgj = new GspRkjlJcgj();
jcgj.setGspRkjlId(gspRkjl.getId());
jcgj.setJcgjlx(jcgjlx);
jcgj.setJcmc(jcmc);
jcgj.setJcmcEn(jcmcEn);
jcgj.setJcmcys(jcmcys);
jcgj.setJcnr(jcnr);
jcgj.setJcnrEn(jcnrEn);
jcgj.setQmrId(qmr.getUserId());
jcgj.setQmrMc(qmr.getNickName());
jcgj.setQmrMcEn(qmr.getUserName());
this.save(jcgj);
systemLogService.saveInfo(gspRkjl.getMc(), gspRkjl.getMc(), jcgj.getJcmc(), jcgj.getJcmcEn(),
jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
}
@Override
@Async
public void saveBatchWithLog(GspRkjl gspRkjl, List<GspRkjlJcgj> jcgjList) {
this.saveBatch(jcgjList);
for (GspRkjlJcgj jcgj : jcgjList) {
systemLogService.saveInfo(gspRkjl.getMc(), gspRkjl.getMc(), jcgj.getJcmc(), jcgj.getJcmcEn(),
jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
}
}
@Override
@Async
public void saveWithLog(GspRkjl gspRkjl, GspRkjlJcgj jcgj) {
this.save(jcgj);
systemLogService.saveInfo(gspRkjl.getMc(), gspRkjl.getMc(), jcgj.getJcmc(), jcgj.getJcmcEn(),
jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
}
@Override

+ 17
- 16
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlServiceImpl.java View File

@ -96,7 +96,7 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getQmbz());
gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "新增供试品入库记录", "Add", JcmcysEnum.blue.getValue(),
gspRkjlJcgjService.saveJcgj(gspRkjl, JcgjlxEnum.lc.getValue(), "新增供试品入库记录", "Add", JcmcysEnum.blue.getValue(),
JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
}
@ -137,7 +137,7 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
gspRkjlJcgj.setRemark(form.getQmbz());
gspRkjlJcgjList.add(gspRkjlJcgj);
}
gspRkjlJcgjService.saveBatch(gspRkjlJcgjList);
gspRkjlJcgjService.saveBatchWithLog(gspRkjl, gspRkjlJcgjList);
}
@Override
@ -163,7 +163,7 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "锁定供试品入库记录", "Lock",
gspRkjlJcgjService.saveJcgj(gspRkjl, JcgjlxEnum.lc.getValue(), "锁定供试品入库记录", "Lock",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
}
@ -191,7 +191,7 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "解锁供试品入库记录", "Unlock",
gspRkjlJcgjService.saveJcgj(gspRkjl, JcgjlxEnum.lc.getValue(), "解锁供试品入库记录", "Unlock",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
}
@ -235,11 +235,12 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
gspRkjlJcgj.setQmrMc(SecurityUtils.getNickName());
gspRkjlJcgj.setQmrMcEn(SecurityUtils.getUsername());
gspRkjlJcgjList.add(gspRkjlJcgj);
gspRkjlJcgjService.saveWithLog(gspRkjl, gspRkjlJcgj);
//endregion
}
this.saveOrUpdateBatch(gspRkjlList);
gspRkjlJcgjService.saveBatch(gspRkjlJcgjList);
}
@Override
@ -266,7 +267,7 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "申请解档", "Apply for De-archiving",
gspRkjlJcgjService.saveJcgj(gspRkjl, JcgjlxEnum.lc.getValue(), "申请解档", "Apply for De-archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
}
@ -313,12 +314,12 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
gspRkjlJcgj.setQmrId(SecurityUtils.getUserId());
gspRkjlJcgj.setQmrMc(SecurityUtils.getNickName());
gspRkjlJcgj.setQmrMcEn(SecurityUtils.getUsername());
gspRkjlJcgjService.saveWithLog(gspRkjl, gspRkjlJcgj);
gspRkjlJcgjList.add(gspRkjlJcgj);
//endregion
}
this.saveOrUpdateBatch(gspRkjlList);
gspRkjlJcgjService.saveBatch(gspRkjlJcgjList);
}
}
@ -349,7 +350,7 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "申请归档","Apply for Archiving",
gspRkjlJcgjService.saveJcgj(gspRkjl, JcgjlxEnum.lc.getValue(), "申请归档","Apply for Archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
}
@ -387,7 +388,7 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
formDataEn.put("Start Date", DateUtils.dateTime(form.getStartDate()));
formDataEn.put("End Date", DateUtils.dateTime(form.getEndDate()));
formDataEn.put("Comment", form.getRemark());
gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", "Apply for Check-out",
gspRkjlJcgjService.saveJcgj(gspRkjl, JcgjlxEnum.lc.getValue(), "申请借阅", "Apply for Check-out",
JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
}
@ -414,7 +415,7 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "同意归档", "Approve Archiving",
gspRkjlJcgjService.saveJcgj(gspRkjl, JcgjlxEnum.lc.getValue(), "同意归档", "Approve Archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
//通知
noticeService.save("供试品入库记录【"+gspRkjl.getMc()+"】同意归档",gspRkjl.getGdsqrId(),getUrlQz("rkjlList"));
@ -442,7 +443,7 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", "Reject Archiving",
gspRkjlJcgjService.saveJcgj(gspRkjl, JcgjlxEnum.lc.getValue(), "拒绝归档", "Reject Archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
//通知
noticeService.save("供试品入库记录【"+gspRkjl.getMc()+"】拒绝归档",gspRkjl.getGdsqrId(),getUrlQz("rkjlList"));
@ -470,7 +471,7 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "同意解档", "Approve De-archiving",
gspRkjlJcgjService.saveJcgj(gspRkjl, JcgjlxEnum.lc.getValue(), "同意解档", "Approve De-archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
//通知
noticeService.save("供试品入库记录【"+gspRkjl.getMc()+"】同意解档",gspRkjl.getGdsqrId(),getUrlQz("rkjlList"));
@ -498,7 +499,7 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", "Reject De-archiving",
gspRkjlJcgjService.saveJcgj(gspRkjl, JcgjlxEnum.lc.getValue(), "拒绝解档", "Reject De-archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
//通知
noticeService.save("供试品入库记录【"+gspRkjl.getMc()+"】拒绝解档",gspRkjl.getGdsqrId(),getUrlQz("rkjlList"));
@ -528,7 +529,7 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", "Approve Check-out",
gspRkjlJcgjService.saveJcgj(gspRkjl, JcgjlxEnum.lc.getValue(), "同意借阅", "Approve Check-out",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
//通知
noticeService.save("供试品入库记录【"+gspRkjl.getMc()+"】同意借阅",gspRkjl.getGdsqrId(),getUrlQz("rkjlList"));
@ -556,7 +557,7 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", "Reject Check-out",
gspRkjlJcgjService.saveJcgj(gspRkjl, JcgjlxEnum.lc.getValue(), "拒绝借阅", "Reject Check-out",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
//通知
noticeService.save("供试品入库记录【"+gspRkjl.getMc()+"】拒绝借阅",gspRkjl.getGdsqrId(),getUrlQz("rkjlList"));
@ -584,7 +585,7 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspRkjlJcgjService.saveJcgj(gspRkjl.getId(), JcgjlxEnum.lc.getValue(), "确认归还", "Check-out End Confirmation",
gspRkjlJcgjService.saveJcgj(gspRkjl, JcgjlxEnum.lc.getValue(), "确认归还", "Check-out End Confirmation",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
//通知
noticeService.save("供试品入库记录【"+gspRkjl.getMc()+"】确认归还",gspRkjl.getGdsqrId(),getUrlQz("rkjlList"));

+ 30
- 30
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java View File

@ -142,7 +142,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
gspJcgj.setRemark(form.getQmbz());
gspJcgj.setQmrId(qmr.getUserId());
gspJcgj.setQmrMc(qmr.getNickName());
gspJcgjService.save(gspJcgj);
gspJcgjService.saveWithLog(gsp, gspJcgj);
}
@Override
@ -196,7 +196,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
gspJcgj.setRemark(form.getBjbz());
gspJcgjList.add(gspJcgj);
}
gspJcgjService.saveBatch(gspJcgjList);
gspJcgjService.saveBatchWithLog(gspOld, gspJcgjList);
}
@ -243,7 +243,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
gspJcgj.setQmrId(qmr.getUserId());
gspJcgj.setQmrMc(qmr.getNickName());
gspJcgj.setQmrMcEn(qmr.getUserName());
gspJcgjService.save(gspJcgj);
gspJcgjService.saveWithLog(gspOld, gspJcgj);
//endregion
//region 更新
@ -290,9 +290,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
queryWrapper.in("id", form.getIds());
queryWrapper.isNull("zcg_id");
List<Gsp> gspList = this.list(queryWrapper);
List<GspJcgj> gspJcgjList = new ArrayList<>();
if (gspList.size() <= form.getIds().length) {
throw new ServiceException("药剂已被发放,请不要重复发放");
throw new ServiceException("供试品已被发放,请不要重复发放");
}
String glyj = "";
for (Gsp gsp : gspList) {
@ -333,7 +332,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
gspJcgj.setQmrId(SecurityUtils.getUserId());
gspJcgj.setQmrMc(SecurityUtils.getNickName());
gspJcgj.setQmrMcEn(SecurityUtils.getUsername());
gspJcgjList.add(gspJcgj);
gspJcgjService.saveWithLog(gsp, gspJcgj);
//endregion
}
if (com.hxhq.common.core.utils.StringUtils.isBlank(zcg.getGlyj())) {
@ -344,7 +344,6 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
zcg.setZt(zcgJyztEnum.jyz.getValue());
zcgService.updateById(zcg);
this.saveOrUpdateBatch(gspList);
gspJcgjService.saveBatch(gspJcgjList);
}
@Override
@ -390,7 +389,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
formDataEn.put("Transfer Condition", form.getZytj());
formDataEn.put("Purpose", form.getMdMcs());
formDataEn.put("Comment", form.getRemark());
gspJcgjService.saveJcgj(gspOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", "Distribution", JcmcysEnum.green.getValue(),
gspJcgjService.saveJcgj(gspOld, JcgjlxEnum.lc.getValue(), "领取发放", "Distribution", JcmcysEnum.green.getValue(),
JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn),
ffr1);
//endregion
@ -444,7 +443,6 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
queryWrapper.in("id", gspIdList);
queryWrapper.eq("zjzt", ZjztEnum.rk.getValue());
List<Gsp> gspList = this.list(queryWrapper);
List<GspJcgj> gspJcgjList = new ArrayList<>();
List<GspTz> mjyTzList = new ArrayList<>();
if (gspList.size() <= form.getList().size()) {
throw new ServiceException("存在供试品不是入库状态，不能发放");
@ -458,7 +456,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
gspFfjlService.ff(gsp.getKc(),gsp.getKcdw(),plffItemFilter.get(0).getZytj(),plffItemFilter.get(0).getRemark(),plffItemFilter.get(0).getMdIds(),gsp,lqr1,lqr2,ffr1,ffr2,now);
//region 稽查轨迹
GspJcgj gspJcgj = plffJcgj(plffItemFilter, gsp);
gspJcgjList.add(gspJcgj);
gspJcgjService.saveWithLog(gsp, gspJcgj);
//endregion
//region 台账
GspTz gspTz = new GspTz();
@ -497,7 +496,6 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
throw new ServiceException("供试品【" + gsp.getMc() + "】不存在或已删除");
}
}
gspJcgjService.saveBatch(gspJcgjList);
gspTzService.saveBatch(mjyTzList);
this.saveOrUpdateBatch(gspList);
}
@ -582,7 +580,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
gspOld.setKcbjrId(qmr.getUserId());
gspOld.setKcbjrMc(qmr.getNickName());
this.updateById(gspOld);
gspJcgjService.saveBatch(gspJcgjList);
gspJcgjService.saveBatchWithLog(gspOld, gspJcgjList);
}
@Override
@ -632,7 +630,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
gspJcgj.setQmrId(qmr.getUserId());
gspJcgj.setQmrMc(qmr.getNickName());
gspJcgj.setQmrMcEn(qmr.getUserName());
gspJcgjService.save(gspJcgj);
gspJcgjService.saveWithLog(gspOld, gspJcgj);
//endregion
//region 更新
@ -692,11 +690,12 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
gspJcgj.setQmrMc(qmr.getNickName());
gspJcgj.setQmrMcEn(qmr.getUserName());
gspJcgjList.add(gspJcgj);
gspJcgjService.saveWithLog(gsp, gspJcgj);
//endregion
}
this.saveOrUpdateBatch(gspList);
gspJcgjService.saveBatch(gspJcgjList);
}
@Override
@ -721,7 +720,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspJcgjService.saveJcgj(gspOld.getId(), JcgjlxEnum.lc.getValue(), "锁定供试品", "Lock ",
gspJcgjService.saveJcgj(gspOld, JcgjlxEnum.lc.getValue(), "锁定供试品", "Lock ",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
}
@ -749,7 +748,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspJcgjService.saveJcgj(gspOld.getId(), JcgjlxEnum.lc.getValue(), "解锁供试品", "Unlock ",
gspJcgjService.saveJcgj(gspOld, JcgjlxEnum.lc.getValue(), "解锁供试品", "Unlock ",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
}
@ -801,7 +800,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
gspJcgj.setQmrId(qmr.getUserId());
gspJcgj.setQmrMc(qmr.getNickName());
gspJcgj.setQmrMcEn(qmr.getUserName());
gspJcgjService.save(gspJcgj);
gspJcgjService.saveWithLog(gspOld, gspJcgj);
// 台账
gspTzService.saveTz(gspOld.getId(), qmr,
@ -867,6 +866,8 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
gspJcgj.setQmrMc(qmr.getNickName());
gspJcgj.setQmrMcEn(qmr.getUserName());
gspJcgjList.add(gspJcgj);
gspJcgjService.saveWithLog(gsp, gspJcgj);
// 台账
GspTz gspTz = new GspTz();
@ -881,7 +882,6 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
gspTz.setRemark(itemForm.getRemark());
gspTzs.add(gspTz);
}
gspJcgjService.saveBatch(gspJcgjList);
gspTzService.saveBatch(gspTzs);
}
@ -922,7 +922,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
formDataEn.put("Start Date", DateUtils.dateTime(form.getStartDate()));
formDataEn.put("End Date", DateUtils.dateTime(form.getEndDate()));
formDataEn.put("Comment", form.getRemark());
gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", "Apply for Check-out",
gspJcgjService.saveJcgj(gsp, JcgjlxEnum.lc.getValue(), "申请借阅", "Apply for Check-out",
JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "申请借阅");
@ -958,7 +958,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请解档", "申请解档",
gspJcgjService.saveJcgj(gsp, JcgjlxEnum.lc.getValue(), "申请解档", "申请解档",
JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "申请解档");
@ -991,7 +991,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请归档", "Apply for Archiving",
gspJcgjService.saveJcgj(gsp, JcgjlxEnum.lc.getValue(), "申请归档", "Apply for Archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "申请归档");
@ -1029,7 +1029,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "申请归档", "Apply for Archiving",
gspJcgjService.saveJcgj(gsp, JcgjlxEnum.lc.getValue(), "申请归档", "Apply for Archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "申请归档");
@ -1099,7 +1099,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
formDataEn.put("Warehouse Keeper 2", jsr2.getNickName());
}
formDataEn.put("Comment", form.getRemark());
gspJcgjService.saveJcgj(gspOld.getId(), JcgjlxEnum.lc.getValue(), "归还", "Return",
gspJcgjService.saveJcgj(gspOld, JcgjlxEnum.lc.getValue(), "归还", "Return",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), jsr1);
//endregion
@ -1159,7 +1159,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "同意归档", "Approve Archiving",
gspJcgjService.saveJcgj(gsp, JcgjlxEnum.lc.getValue(), "同意归档", "Approve Archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "同意归档");
@ -1190,7 +1190,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", "Reject Archiving",
gspJcgjService.saveJcgj(gsp, JcgjlxEnum.lc.getValue(), "拒绝归档", "Reject Archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "拒绝归档");
@ -1221,7 +1221,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "同意解档", "Approve De-archiving",
gspJcgjService.saveJcgj(gsp, JcgjlxEnum.lc.getValue(), "同意解档", "Approve De-archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "同意解档");
@ -1252,7 +1252,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", "Reject De-archiving",
gspJcgjService.saveJcgj(gsp, JcgjlxEnum.lc.getValue(), "拒绝解档", "Reject De-archiving",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "拒绝解档");
@ -1285,7 +1285,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", "Approve Check-out",
gspJcgjService.saveJcgj(gsp, JcgjlxEnum.lc.getValue(), "同意借阅", "Approve Check-out",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "同意借阅");
@ -1316,7 +1316,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", "Reject Check-out",
gspJcgjService.saveJcgj(gsp, JcgjlxEnum.lc.getValue(), "拒绝借阅", "Reject Check-out",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "拒绝借阅");
@ -1347,7 +1347,7 @@ public class GspServiceImpl extends ServiceImpl implements IGspS
Map<String, String> formDataEn = new LinkedHashMap<>();
formDataEn.put("Comment", form.getRemark());
gspJcgjService.saveJcgj(gsp.getId(), JcgjlxEnum.lc.getValue(), "确认归还", "Check-out End Confirmation",
gspJcgjService.saveJcgj(gsp, JcgjlxEnum.lc.getValue(), "确认归还", "Check-out End Confirmation",
JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(formDataEn), qmr);
archiveLogService.saveInfo(ArchiveLogTypeEnum.gsp, gsp.getId(), gsp.getMc(), gsp.getPh(), gsp.getGg() + gsp.getGgdw(), "确认归还");

+ 1
- 1
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java View File

@ -1184,7 +1184,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
//稽查轨迹
SjJcgj jcgj = sjJcgjService.genJcgj(sj.getId(), JcgjlxEnum.lc.getValue(), "到期自动归还", "Check-out End on Time",
JcmcysEnum.green.getValue(), null, null, null);
sjJcgjService.saveWithLog(sj, jcgj);
sjJcgjService.save(jcgj);
}
this.updateBatchById(sjList);
}

Write Preview
Loading…
Cancel
Save