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

fix：[资源库管理]给药制剂bug

master
15881625488@163.com 3 months ago
parent
5c5945ff1a
commit
a748287d89
3 changed files with 76 additions and 68 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -22
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java
  2. +71
    -43
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
  3. +5
    -3
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java

+ 0
- 22
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java View File

@ -136,7 +136,6 @@ public class GyzjController extends BaseController
@RequiresPermissions("business:resource:gyzj:jd")
public AjaxResult jd(@RequestBody JdForm form)
{
form.setQmrId(SecurityUtils.getUserId());
gyzjService.jd(form);
return AjaxResult.success("操作成功");
}
@ -148,7 +147,6 @@ public class GyzjController extends BaseController
@RequiresPermissions("business:resource:gyzj:gd")
public AjaxResult plgd(@RequestBody GdForm form)
{
form.setQmrId(SecurityUtils.getUserId());
gyzjService.plgd(form);
return AjaxResult.success("操作成功");
}
@ -160,7 +158,6 @@ public class GyzjController extends BaseController
@RequiresPermissions("business:resource:gyzj:gd")
public AjaxResult gd(@RequestBody GdForm form)
{
form.setQmrId(SecurityUtils.getUserId());
gyzjService.gd(form);
return AjaxResult.success("操作成功");
}
@ -173,7 +170,6 @@ public class GyzjController extends BaseController
@RequiresPermissions("business:resource:gyzj:sd")
public AjaxResult plsd(@RequestBody SdForm form)
{
form.setQmrId(SecurityUtils.getUserId());
gyzjService.plsd(form);
return AjaxResult.success("操作成功");
}
@ -185,7 +181,6 @@ public class GyzjController extends BaseController
@RequiresPermissions("business:resource:gyzj:sd")
public AjaxResult sd(@RequestBody SdForm form)
{
form.setQmrId(SecurityUtils.getUserId());
gyzjService.sd(form);
return AjaxResult.success("操作成功");
}
@ -198,7 +193,6 @@ public class GyzjController extends BaseController
@RequiresPermissions("business:resource:gyzj:js")
public AjaxResult js(@RequestBody JsForm form)
{
form.setQmrId(SecurityUtils.getUserId());
gyzjService.js(form);
return AjaxResult.success("操作成功");
}
@ -210,7 +204,6 @@ public class GyzjController extends BaseController
@RequiresPermissions({"business:resource:gyzj:czyj","business:studyGyzj:czyj","business:nonTrialGyzj:czyj","business:drugGyzj:czyj"})
public AjaxResult plczyj(@RequestBody PlczyjForm form)
{
form.setClrId(SecurityUtils.getUserId());
gyzjService.plczyj(form);
return AjaxResult.success("操作成功");
}
@ -222,7 +215,6 @@ public class GyzjController extends BaseController
@RequiresPermissions("business:resource:gyzj:czyj")
public AjaxResult czyj(@RequestBody CzyjForm form)
{
form.setClrId(SecurityUtils.getUserId());
gyzjService.czyj(form);
return AjaxResult.success("操作成功");
}
@ -234,7 +226,6 @@ public class GyzjController extends BaseController
@RequiresPermissions("business:resource:gyzj:czrq")
public AjaxResult plczrq(@RequestBody PlczrqForm form)
{
form.setClrId(SecurityUtils.getUserId());
gyzjService.plczrq(form);
return AjaxResult.success("操作成功");
}
@ -246,7 +237,6 @@ public class GyzjController extends BaseController
@RequiresPermissions("business:resource:gyzj:czrq")
public AjaxResult czrq(@RequestBody CzrqForm form)
{
form.setClrId(SecurityUtils.getUserId());
gyzjService.czrq(form);
return AjaxResult.success("操作成功");
}
@ -259,7 +249,6 @@ public class GyzjController extends BaseController
@RequiresPermissions("business:resource:gyzj:ysff")
public AjaxResult ysff(@RequestBody YsffForm form)
{
form.setFfrId(SecurityUtils.getUserId());
gyzjService.ysff(form);
return AjaxResult.success("操作成功");
}
@ -297,7 +286,6 @@ public class GyzjController extends BaseController
@RequiresPermissions({"business:resource:gyzj:bj","business:studyGyzj:bj","business:nonTrialGyzj:bj","business:drugGyzj:bj"})
public AjaxResult bj(@RequestBody BjForm form)
{
form.setQmrId(SecurityUtils.getUserId());
gyzjService.bj(form);
return AjaxResult.success("操作成功");
}
@ -310,7 +298,6 @@ public class GyzjController extends BaseController
@RequiresPermissions("business:resource:gyzj:shbj")
public AjaxResult shbj(@RequestBody ShbjForm form)
{
form.setQmrId(SecurityUtils.getUserId());
gyzjService.shbj(form);
return AjaxResult.success("操作成功");
}
@ -324,7 +311,6 @@ public class GyzjController extends BaseController
@RequiresPermissions({"business:resource:gyzj:xgkc","business:studyGyzj:xgkc","business:nonTrialGyzj:xgkc","business:drugGyzj:xgkc"})
public AjaxResult xgkc(@RequestBody XgkcForm form)
{
form.setQmrId(SecurityUtils.getUserId());
gyzjService.xgkc(form);
return AjaxResult.success("操作成功");
}
@ -337,7 +323,6 @@ public class GyzjController extends BaseController
@RequiresPermissions("business:resource:gyzj:shxgkc")
public AjaxResult shxgkc(@RequestBody ShxgkcForm form)
{
form.setQmrId(SecurityUtils.getUserId());
gyzjService.shxgkc(form);
return AjaxResult.success("操作成功");
}
@ -349,8 +334,6 @@ public class GyzjController extends BaseController
@RequiresPermissions({"business:studyGyzj:gh","business:nonTrialGyzj:gh","business:drugGyzj:gh"})
public AjaxResult sqgh(@RequestBody GhForm form)
{
form.setQmrId(SecurityUtils.getUserId());
form.setJsr1Id(SecurityUtils.getUserId());
gyzjService.sqgh(form);
return AjaxResult.success("操作成功");
}
@ -362,8 +345,6 @@ public class GyzjController extends BaseController
@RequiresPermissions({"business:resource:gyzj:gh"})
public AjaxResult gh(@RequestBody GhForm form)
{
form.setQmrId(SecurityUtils.getUserId());
form.setJsr1Id(SecurityUtils.getUserId());
gyzjService.gh(form);
return AjaxResult.success("操作成功");
}
@ -376,7 +357,6 @@ public class GyzjController extends BaseController
@RequiresPermissions({"business:studyGyzj:rk","business:nonTrialGyzj:rk","business:drugGyzj:rk"})
public AjaxResult sqrk(@RequestBody RkForm form)
{
form.setJsr1Id(SecurityUtils.getUserId());
gyzjService.sqrk(form);
return AjaxResult.success("操作成功");
}
@ -388,7 +368,6 @@ public class GyzjController extends BaseController
@RequiresPermissions({"business:resource:gyzj:rk"})
public AjaxResult rk(@RequestBody RkForm form)
{
form.setJsr1Id(SecurityUtils.getUserId());
gyzjService.rk(form);
return AjaxResult.success("操作成功");
}
@ -400,7 +379,6 @@ public class GyzjController extends BaseController
@RequiresPermissions("business:resource:gyzj:jy")
public AjaxResult jy(@RequestBody JyForm form)
{
form.setQmrId(SecurityUtils.getUserId());
gyzjService.jy(form);
return AjaxResult.success("操作成功");
}

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

@ -140,8 +140,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
@Override
@Transactional(rollbackFor = Exception.class)
public void jd(JdForm form) {
SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
checkPassword(qmr,form.getQmrmm());
if (form.getId() == null || form.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
}
@ -156,7 +157,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
gyzjOld.setZjzt(ZjztEnum.djd.getValue());
this.updateById(gyzjOld);
//稽查轨迹
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
}
@ -168,8 +169,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
@Override
@Transactional(rollbackFor = Exception.class)
public void jy(JyForm form) {
SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
checkPassword(qmr,form.getQmrmm());
if (form.getId() == null || form.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
}
@ -192,7 +194,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
Map<String, String> formData = new LinkedHashMap<>();
formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate()));
formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(),formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(),formData, qmr, form.getRemark());
}
/**
@ -203,8 +205,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
@Override
@Transactional(rollbackFor = Exception.class)
public void plgd(GdForm form) {
SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
checkPassword(qmr,form.getQmrmm());
if (form.getIds().length < 0) {
throw new ServiceException("参数ids不正确");
}
@ -222,7 +225,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
//申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档；
gyzj.setZjzt(ZjztEnum.dgd.getValue());
//稽查轨迹
gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark()));
gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark()));
}
this.updateBatchById(gyzjList);
gyzjJcgjService.saveBatch(gyzjJcgjList);
@ -237,8 +240,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
@Override
@Transactional(rollbackFor = Exception.class)
public void gd(GdForm form) {
SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
checkPassword(qmr,form.getQmrmm());
if (form.getId() == null || form.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
}
@ -253,7 +257,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
gyzjOld.setZjzt(ZjztEnum.dgd.getValue());
this.updateById(gyzjOld);
//稽查轨迹
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark());
}
@ -265,8 +269,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
@Override
@Transactional(rollbackFor = Exception.class)
public void plsd(SdForm form) {
SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
checkPassword(qmr,form.getQmrmm());
if (form.getIds().length < 0) {
throw new ServiceException("参数ids不正确");
}
@ -282,7 +287,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
//锁定
gyzj.setZjzt(ZjztEnum.ysd.getValue());
//region 稽查轨迹
gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark()));
gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark()));
}
this.updateBatchById(gyzjList);
gyzjJcgjService.saveBatch(gyzjJcgjList);
@ -297,8 +302,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
@Override
@Transactional(rollbackFor = Exception.class)
public void sd(SdForm form) {
SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
checkPassword(qmr,form.getQmrmm());
if (form.getId() == null || form.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
}
@ -312,7 +318,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
gyzjOld.setZjzt(ZjztEnum.ysd.getValue());
this.updateById(gyzjOld);
//稽查轨迹
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.orange.getValue(),null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark());
}
@ -324,8 +330,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
@Override
@Transactional(rollbackFor = Exception.class)
public void js(JsForm form) {
SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
checkPassword(qmr,form.getQmrmm());
if (form.getId() == null || form.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
}
@ -340,7 +347,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
gyzjOld.setZjzt(ZjztEnum.rk.getValue());
this.updateById(gyzjOld);
//稽查轨迹
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "解锁给药制剂", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "解锁给药制剂", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
}
/**
@ -389,7 +396,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
formData.put("处置原因", gyzjPlffItemFilter.get(0).getCzyy());
formData.put("处置量", gyzjPlffItemFilter.get(0).getCzl() + gyzj.getKcdw());
formData.put("处置人", clr.getNickName());
gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.orange.getValue(),formData, SecurityUtils.getLoginUser().getSysUser(), null));
gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.orange.getValue(),formData, clr, null));
//台账
gyzjTzList.add(gyzjTzService.getTz(gyzj.getId(),null,null,null,null,null,null,null,null,clr,"处置药剂",gyzjPlffItemFilter.get(0).getCzl(),gyzj.getKcdw(),gyzjPlffItemFilter.get(0).getCzyy()));
@ -450,7 +457,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
formData.put("处置原因", form.getCzyy());
formData.put("处置量", form.getCzl() + gyzjOld.getKcdw());
formData.put("处置人", clr.getNickName());
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null);
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), formData, clr, null);
//台账
gyzjTzService.saveTz(gyzjOld.getId(),null,null,null,null,null,null,null,null,clr,"处置药剂",form.getCzl(),gyzjOld.getKcdw(),form.getCzyy());
this.updateById(gyzjOld);
@ -465,9 +472,15 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
@Override
@Transactional(rollbackFor = Exception.class)
public void plczrq(PlczrqForm form) {
SysUser clr = sysUserService.selectUserById(form.getClrId());
SysUser clr = SecurityUtils.getLoginUser().getSysUser();
SysUser fhr = sysUserService.selectUserById(form.getFhrId());
SysUser jdr = sysUserService.selectUserById(form.getJdrId());
//验证处理人密码
checkPassword(clr,form.getClrmm());
//验证复核人密码
checkPassword(fhr,form.getFhrmm());
//验证监督人密码
checkPassword(jdr,form.getJdrmm());
if (form.getIds().length < 0) {
throw new ServiceException("参数ids不正确");
}
@ -492,7 +505,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
formData.put("处置方式", gyzjPlffItemFilter.get(0).getCzfs());
formData.put("处置原因", gyzjPlffItemFilter.get(0).getCzyy());
formData.put("处置人", clr.getNickName());
gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null));
formData.put("复核人", fhr.getNickName());
formData.put("监督人", jdr.getNickName());
gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, clr, null));
//台账
gyzjTzList.add(gyzjTzService.getTz(gyzj.getId(),null,null,null,null,null,null,null,null,clr,"处置容器",null,null,gyzjPlffItemFilter.get(0).getCzyy()));
gyzj.setRqzt(RqztEnum.ycz.getValue());
@ -513,7 +528,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
@Override
@Transactional(rollbackFor = Exception.class)
public void czrq(CzrqForm form) {
SysUser clr = sysUserService.selectUserById(form.getClrId());
SysUser clr = SecurityUtils.getLoginUser().getSysUser();
SysUser fhr = sysUserService.selectUserById(form.getFhrId());
SysUser jdr = sysUserService.selectUserById(form.getJdrId());
//验证处理人密码
@ -542,7 +557,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
formData.put("处置人", clr.getNickName());
formData.put("复核人", fhr.getNickName());
formData.put("监督人", jdr.getNickName());
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null);
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), formData, clr,null);
//台账
gyzjTzService.saveTz(gyzjOld.getId(),null,null,null,null,null,null,null,null,clr,"处置容器",null,null,form.getCzyy());
gyzjOld.setRqzt(RqztEnum.ycz.getValue());
@ -560,7 +575,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
public void ysff(YsffForm form) {
SysUser lqr1 = sysUserService.selectUserById(form.getLqr1Id());
SysUser lqr2 = sysUserService.selectUserById(form.getLqr2Id());
SysUser ffr1 = sysUserService.selectUserById(form.getFfrId());
SysUser ffr1 = SecurityUtils.getLoginUser().getSysUser();
//验证领取人1密码
checkPassword(lqr1,form.getLqr1mm());
//验证领取人2密码
@ -593,7 +608,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
formData.put("钥匙1领取人", lqr1.getNickName());
formData.put("钥匙2领取人", lqr2.getNickName());
formData.put("发放人", ffr1.getNickName());
gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "钥匙发放", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null));
gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "钥匙发放", JcmcysEnum.green.getValue(), formData, ffr1,null));
}
if (StringUtils.isBlank(zcg.getGlyj())) {
zcg.setGlyj(glyj);
@ -653,8 +668,12 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
formData.put("出库量", gyzjOld.getKc() + gyzjOld.getKcdw());
formData.put("转移条件", form.getZytj());
formData.put("出库毛重", form.getCkmz() + gyzjOld.getKcdw());
formData.put("目的", form.getMdIds());
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),form.getRemark());
formData.put("目的", form.getMdMcs()+(StringUtils.isNoneBlank(form.getMdOther())?(","+form.getMdOther()):""));
formData.put("领取人", lqr1.getNickName());
formData.put("领取人2", lqr2.getNickName());
formData.put("发放人", ffr1.getNickName());
formData.put("发放人2", ffr2.getNickName());
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1,form.getRemark());
//台账
gyzjTzService.saveTz(gyzjOld.getId(),lqr1,lqr2,null,null,ffr1,ffr2,null,null,null,"领取发放",gyzjOld.getKc(),gyzjOld.getKcdw(),form.getRemark());
@ -719,8 +738,12 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
formData.put("出库量", gyzj.getKc() + gyzj.getKcdw());
formData.put("转移条件", plffItemFilter.get(0).getZytj());
formData.put("出库毛重", plffItemFilter.get(0).getCkmz() + gyzj.getKcdw());
formData.put("目的", plffItemFilter.get(0).getMdIds());
gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),plffItemFilter.get(0).getRemark()));
formData.put("目的", plffItemFilter.get(0).getMdMcs()+(StringUtils.isNoneBlank(plffItemFilter.get(0).getMdOther())?(","+plffItemFilter.get(0).getMdOther()):""));
formData.put("领取人", lqr1.getNickName());
formData.put("领取人2", lqr2.getNickName());
formData.put("发放人", ffr1.getNickName());
formData.put("发放人2", ffr2.getNickName());
gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), formData, ffr1,plffItemFilter.get(0).getRemark()));
//台账
gyzjTzList.add(gyzjTzService.getTz(gyzj.getId(),lqr1,lqr2,null,null,ffr1,ffr2,null,null,null,"领取发放",gyzj.getKc(),gyzj.getKcdw(),plffItemFilter.get(0).getRemark()));
//region 更新发放信息
@ -750,8 +773,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
@Override
@Transactional(rollbackFor = Exception.class)
public void bj(BjForm form) {
SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
checkPassword(qmr,form.getQmrmm());
if (form.getId() == null || form.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
}
@ -772,7 +796,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
throw new ServiceException("你没有修改任何内容");
}
for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请编辑", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(),null));
gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请编辑", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr,null));
}
gyzjOld.setMcbj(form.getMc());
gyzjOld.setNdbj(form.getNd());
@ -798,8 +822,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
@Override
@Transactional(rollbackFor = Exception.class)
public void shbj(ShbjForm form) {
SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
checkPassword(qmr,form.getQmrmm());
if (form.getId() == null || form.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
}
@ -824,9 +849,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
gyzjOld.setNddw(gyzjOld.getNddwbj());
gyzjOld.setNd(gyzjOld.getNdbj());
gyzjOld.setMc(gyzjOld.getMcbj());
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意编辑", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null);
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意编辑", JcmcysEnum.green.getValue(), formData,qmr,null);
} else {
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝编辑", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null);
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝编辑", JcmcysEnum.red.getValue(), formData, qmr,null);
}
//清空编辑信息
gyzjOld.setMcbj(null);
@ -852,8 +877,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
@Override
@Transactional(rollbackFor = Exception.class)
public void xgkc(XgkcForm form) {
SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
checkPassword(qmr,form.getQmrmm());
if (form.getId() == null || form.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
}
@ -875,7 +901,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
//region 稽查轨迹
for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "修改库存申请", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(),null));
gyzjJcgjList.add(gyzjJcgjService.getJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "修改库存申请", JcmcysEnum.green.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr,null));
}
//endregion
@ -899,8 +925,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
@Override
@Transactional(rollbackFor = Exception.class)
public void shxgkc(ShxgkcForm form) {
SysUser qmr=SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getQmrmm());
checkPassword(qmr,form.getQmrmm());
if (form.getId() == null || form.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
}
@ -919,14 +946,14 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
formData.put("申请备注", gyzjOld.getKcbjbz());
formData.put("审核备注", form.getRemark());
if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) {
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意修改库存", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null);
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意修改库存", JcmcysEnum.green.getValue(), formData, qmr,null);
gyzjOld.setKcdw(gyzjOld.getKcdwbj());
gyzjOld.setKc(gyzjOld.getKcbj());
} else {
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝修改库存", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null);
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝修改库存", JcmcysEnum.red.getValue(), formData, qmr,null);
}
//台账
gyzjTzService.getTz(gyzjOld.getId(),null,null,null,null,null,null,null,null,null,"修改库存",gyzjOld.getKcbj(),gyzjOld.getKcdw(),gyzjOld.getKcbjbz());
gyzjTzService.saveTz(gyzjOld.getId(),null,null,null,null,null,null,null,null,qmr,"修改库存",gyzjOld.getKcbj(),gyzjOld.getKcdw(),gyzjOld.getKcbjbz());
gyzjOld.setKcbj(null);
gyzjOld.setKcdwbj(null);
@ -944,9 +971,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
@Override
@Transactional(rollbackFor = Exception.class)
public void sqgh(GhForm form) {
SysUser ghr1 = SecurityUtils.getLoginUser().getSysUser();
SysUser ghr2 = sysUserService.selectUserById(form.getGhr2Id());
//验证归还人1密码
checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getGhr1mm());
checkPassword(ghr1,form.getGhr1mm());
//验证归还人2密码
checkPassword(ghr2,form.getGhr2mm());
@ -970,7 +998,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
formData.put("转移条件", form.getGhzytj());
formData.put("归还人1", SecurityUtils.getNickName());
formData.put("归还人2", ghr2.getNickName());
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), formData, ghr1, form.getRemark());
//endregion
gyzjOld.setGhzytj(form.getGhzytj());
@ -1033,7 +1061,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
formData.put("使用量", syl + gyzjOld.getKcdw());
formData.put("库管员1", jsr1.getNickName());
formData.put("库管员2", jsr2.getNickName());
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), SecurityUtils.getNickName());
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), formData, jsr1, SecurityUtils.getNickName());
// 更新
gyzjOld.setKc(form.getRkl());
@ -1081,7 +1109,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
formData.put("转移条件", form.getRkzytj());
formData.put("签名人1", qmr1.getNickName());
formData.put("签名人2", qmr2.getNickName());
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "给药制剂入库", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark());
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "给药制剂入库", JcmcysEnum.green.getValue(), formData, qmr1, form.getRemark());
//endregion
gyzjOld.setRkzytj(form.getRkzytj());
@ -1133,13 +1161,13 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
if (form.getQmyy().equals(ShXgkcEnum.ty.getValue())) {
SysUser qmr1 = sysUserService.selectUserById(form.getQmr1Id());
SysUser qmr2 = sysUserService.selectUserById(form.getQmr2Id());
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意入库", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null);
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意入库", JcmcysEnum.green.getValue(), formData, jsr1,null);
gyzjOld.setKc(form.getRkl());
gyzjOld.setZjzt(ZjztEnum.rk.getValue());
//台账
gyzjTzService.saveTz(gyzjOld.getId(),null,null,qmr1,qmr2,null,null,jsr1,jsr2,null,"给药制剂入库",form.getRkl(),gyzjOld.getKcdw(),form.getRemark());
} else {
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝入库", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(),null);
gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝入库", JcmcysEnum.red.getValue(), formData, jsr1,null);
}
// 更新
gyzjOld.setRkzytj(null);

+ 5
- 3
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java View File

@ -27,7 +27,6 @@ public class GyzjJcnrUtil {
mapJcnr.put("监督人","Supervisor");
mapJcnr.put("钥匙1领取人","Key 1 User");
mapJcnr.put("钥匙2领取人","Key 2 User");
mapJcnr.put("发放人","Issuer");
mapJcnr.put("出库量","Out Amount");
mapJcnr.put("转移条件","Transfer Condition");
mapJcnr.put("出库毛重","Check-out Gross Weight");
@ -43,10 +42,13 @@ public class GyzjJcnrUtil {
mapJcnr.put("入库条件","Check-in Condition");
mapJcnr.put("入库净重","Check-in Net Weight");
mapJcnr.put("入库量","Total Amount");
mapJcnr.put("申请备注","Apply Comment");
mapJcnr.put("领取人","Recipient");
mapJcnr.put("领取人2","Recipient 2");
mapJcnr.put("发放人","Issuer");
mapJcnr.put("发放人2","Issuer 2");
mapJcnr.put("目的","目的");
mapJcnr.put("申请备注","Apply Comment");
mapJcnr.put("审核备注","Approve Comment");
//endregion
//region 稽查名称

Write Preview
Loading…
Cancel
Save