Browse Source

feat:[资源库管理][麻精药台账]新增

master
15881625488@163.com 3 weeks ago
parent
commit
b0f5deff07
4 changed files with 117 additions and 71 deletions
  1. +57
    -59
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyTz.java
  2. +20
    -5
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyTzService.java
  3. +3
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java
  4. +37
    -6
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyTzServiceImpl.java

+ 57
- 59
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyTz.java View File

@ -18,105 +18,103 @@ public class MjyTz extends MpBaseEntity
/** 麻精药id */
private Long mjyId;
/** 使用人id */
private Long syrId;
/** 领取人名称 */
private String lqrMc;
/** 领取人id */
private Long lqrId;
/** 归还人名称 */
private String ghrMc;
/** 发放人id */
private Long ffrId;
/** 发放人名称 */
private String ffrMc;
/** 归还人id */
private Long ghrId;
/** 接收人名称 */
private String jsrMc;
/** 接收人id */
private Long jsrId;
/** 签名人id */
private Long qmrId;
/** 操作类型 */
private String czlx;
/** 签名人名称 */
private String qmrMc;
/** 操作量 */
/** 签名意义 */
private String qmyy;
/** 操作内容 */
private String cznr;
public void setMjyId(Long mjyId)
{
this.mjyId = mjyId;
public static long getSerialVersionUID() {
return serialVersionUID;
}
public Long getMjyId()
{
public Long getMjyId() {
return mjyId;
}
public void setSyrId(Long syrId)
{
this.syrId = syrId;
public void setMjyId(Long mjyId) {
this.mjyId = mjyId;
}
public Long getSyrId()
{
return syrId;
public String getLqrMc() {
return lqrMc;
}
public void setLqrId(Long lqrId)
{
this.lqrId = lqrId;
public void setLqrMc(String lqrMc) {
this.lqrMc = lqrMc;
}
public Long getLqrId()
{
return lqrId;
public String getGhrMc() {
return ghrMc;
}
public void setFfrId(Long ffrId)
{
this.ffrId = ffrId;
public void setGhrMc(String ghrMc) {
this.ghrMc = ghrMc;
}
public Long getFfrId()
{
return ffrId;
public String getFfrMc() {
return ffrMc;
}
public void setGhrId(Long ghrId)
{
this.ghrId = ghrId;
public void setFfrMc(String ffrMc) {
this.ffrMc = ffrMc;
}
public Long getGhrId()
{
return ghrId;
public String getJsrMc() {
return jsrMc;
}
public void setJsrId(Long jsrId)
{
this.jsrId = jsrId;
public void setJsrMc(String jsrMc) {
this.jsrMc = jsrMc;
}
public Long getJsrId()
{
return jsrId;
public Long getQmrId() {
return qmrId;
}
public void setCzlx(String czlx)
{
this.czlx = czlx;
public void setQmrId(Long qmrId) {
this.qmrId = qmrId;
}
public String getCzlx()
{
return czlx;
public String getQmrMc() {
return qmrMc;
}
public void setCznr(String cznr)
{
this.cznr = cznr;
public void setQmrMc(String qmrMc) {
this.qmrMc = qmrMc;
}
public String getQmyy() {
return qmyy;
}
public void setQmyy(String qmyy) {
this.qmyy = qmyy;
}
public String getCznr()
{
public String getCznr() {
return cznr;
}
public void setCznr(String cznr) {
this.cznr = cznr;
}
}

+ 20
- 5
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyTzService.java View File

@ -1,6 +1,8 @@
package com.hxhq.business.service;
import java.util.List;
import com.hxhq.business.domain.MjyJcgj;
import com.hxhq.business.domain.MjyTz;
import com.baomidou.mybatisplus.extension.service.IService;
@ -12,12 +14,25 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IMjyTzService extends IService<MjyTz>
{
/**
* 查询麻精药-台账列表
*
* @param mjyTz 麻精药-台账
* @return 麻精药-台账集合
* 查询台账列表
* @param mjyId 麻精药id
* @return
*/
public List<MjyTz> queryList(MjyTz mjyTz);
public List<MjyTz> queryListByMjyId(Long mjyId);
/**
* 新增稽查轨迹
* @param mjyId 麻精药id
* @param lqrMc 领取人名称
* @param ghrMc 归还人名称
* @param ffrMc 发放人名称
* @param jsrMc 接收人名称
* @param qmrId 签名人id
* @param qmrMc 签名人名称
* @param qmyy 签名意义
* @param cznr 操作内容
*/
public void saveTz(Long mjyId, String lqrMc, String ghrMc, String ffrMc, String jsrMc,Long qmrId,String qmrMc,String qmyy,String cznr);
}

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

@ -730,7 +730,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.wsd.getValue(), jcnr, SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
//endregion
//台账 todo
//region 台账 todo
//endregion
//更新状态为已发放修改库存为0 是否关联最后一次发放记录 todo
mjyOld.setZjzt(ZjztEnum.yff.getValue());

+ 37
- 6
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyTzServiceImpl.java View File

@ -3,6 +3,7 @@ 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.MjyJcgj;
import org.springframework.stereotype.Service;
import com.hxhq.business.mapper.MjyTzMapper;
import com.hxhq.business.domain.MjyTz;
@ -18,17 +19,47 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class MjyTzServiceImpl extends ServiceImpl<MjyTzMapper, MjyTz> implements IMjyTzService
{
/**
* 查询麻精药-台账列表
*
* @param mjyTz 麻精药-台账
* @return 麻精药-台账
* 查询台账列表
* @param mjyId 麻精药id
* @return
*/
@Override
public List<MjyTz> queryList(MjyTz mjyTz)
{
public List<MjyTz> queryListByMjyId(Long mjyId){
QueryWrapper<MjyTz> queryWrapper = Wrappers.query();
if(mjyId==null){
throw new SecurityException("麻精药id不能为空");
}
queryWrapper.eq("mjy_id",mjyId);
queryWrapper.orderByDesc("id");
return this.list(queryWrapper);
}
/**
* 新增稽查轨迹
* @param mjyId 麻精药id
* @param lqrMc 领取人名称
* @param ghrMc 归还人名称
* @param ffrMc 发放人名称
* @param jsrMc 接收人名称
* @param qmrId 签名人id
* @param qmrMc 签名人名称
* @param qmyy 签名意义
* @param cznr 操作内容
*/
@Override
public void saveTz(Long mjyId, String lqrMc, String ghrMc, String ffrMc, String jsrMc,Long qmrId,String qmrMc,String qmyy,String cznr){
MjyTz mjyTz = new MjyTz();
mjyTz.setMjyId(mjyId);
mjyTz.setLqrMc(lqrMc);
mjyTz.setGhrMc(ghrMc);
mjyTz.setFfrMc(ffrMc);
mjyTz.setJsrMc(jsrMc);
mjyTz.setQmrId(qmrId);
mjyTz.setQmrMc(qmrMc);
mjyTz.setQmyy(qmyy);
mjyTz.setCznr(cznr);
this.save(mjyTz);
}
}

Loading…
Cancel
Save