Skip to content

huang.tao / jmai-platform

Go to a project
Commit 3735cd08 by huangtao
Options

用户

parent 732cec16
Expand all
Inline Side-by-side
Showing with 185 additions and 89 deletions
jmai-physic/src/main/java/com/jmai/physic/controller/PhysicAmpouleController.java
...@@ -10,6 +10,7 @@ import com.jmai.physic.entity.PhysicAmpoule; ...@@ -10,6 +10,7 @@ import com.jmai.physic.entity.PhysicAmpoule;
import com.jmai.physic.entity.PhysicStorageAmpoule; import com.jmai.physic.entity.PhysicStorageAmpoule;
import com.jmai.physic.service.PhysicAmpouleService; import com.jmai.physic.service.PhysicAmpouleService;
import com.jmai.physic.vo.PhysicAmpouleUseVO; import com.jmai.physic.vo.PhysicAmpouleUseVO;
import com.jmai.physic.vo.PhysicAmpouleVO;
import com.jmai.sys.aop.Auth; import com.jmai.sys.aop.Auth;
import com.jmai.sys.dto.ResponseData; import com.jmai.sys.dto.ResponseData;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -45,7 +46,7 @@ public class PhysicAmpouleController { ...@@ -45,7 +46,7 @@ public class PhysicAmpouleController {
@PostMapping("/listPage") @PostMapping("/listPage")
@ApiOperation(value = "查询") @ApiOperation(value = "查询")
public Page<PhysicAmpoule> listPage(@RequestBody PhysicAmpouleQueryReq req) { public Page<PhysicAmpouleVO> listPage(@RequestBody PhysicAmpouleQueryReq req) {
return physicAmpouleService.listPage(req); return physicAmpouleService.listPage(req);
} }
......
jmai-physic/src/main/java/com/jmai/physic/controller/PhysicDestroyCheckController.java
...@@ -6,6 +6,7 @@ import com.jmai.physic.dto.PhysicCheckQueryReq; ...@@ -6,6 +6,7 @@ import com.jmai.physic.dto.PhysicCheckQueryReq;
import com.jmai.physic.dto.PhysicDestroyCheckCreateReq; import com.jmai.physic.dto.PhysicDestroyCheckCreateReq;
import com.jmai.physic.entity.PhysicDestroyCheck; import com.jmai.physic.entity.PhysicDestroyCheck;
import com.jmai.physic.service.PhysicDestroyCheckService; import com.jmai.physic.service.PhysicDestroyCheckService;
import com.jmai.physic.vo.PhysicDestroyCheckVO;
import com.jmai.sys.aop.Auth; import com.jmai.sys.aop.Auth;
import com.jmai.sys.dto.ResponseData; import com.jmai.sys.dto.ResponseData;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -40,7 +41,7 @@ public class PhysicDestroyCheckController { ...@@ -40,7 +41,7 @@ public class PhysicDestroyCheckController {
} }
@PostMapping("/listPage") @PostMapping("/listPage")
@ApiOperation(value = "查询") @ApiOperation(value = "查询")
public Page<PhysicDestroyCheck> listPage(@RequestBody PhysicCheckQueryReq req) { public Page<PhysicDestroyCheckVO> listPage(@RequestBody PhysicCheckQueryReq req) {
return physicDestroyCheckService.listPage(req); return physicDestroyCheckService.listPage(req);
} }
......
jmai-physic/src/main/java/com/jmai/physic/controller/PhysicDestroyController.java
...@@ -8,6 +8,7 @@ import com.jmai.physic.entity.PhysicRecord; ...@@ -8,6 +8,7 @@ import com.jmai.physic.entity.PhysicRecord;
import com.jmai.physic.service.PhysicDestroyCheckService; import com.jmai.physic.service.PhysicDestroyCheckService;
import com.jmai.physic.service.PhysicDestroyService; import com.jmai.physic.service.PhysicDestroyService;
import com.jmai.physic.vo.PhysicApplyVO; import com.jmai.physic.vo.PhysicApplyVO;
import com.jmai.physic.vo.PhysicDestroyVO;
import com.jmai.sys.aop.Auth; import com.jmai.sys.aop.Auth;
import com.jmai.sys.dto.ResponseData; import com.jmai.sys.dto.ResponseData;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -42,7 +43,7 @@ public class PhysicDestroyController { ...@@ -42,7 +43,7 @@ public class PhysicDestroyController {
} }
@PostMapping("/listPage") @PostMapping("/listPage")
@ApiOperation(value = "查询") @ApiOperation(value = "查询")
public Page<PhysicDestroy> listPage(@RequestBody PhysicCheckQueryReq req) { public Page<PhysicDestroyVO> listPage(@RequestBody PhysicCheckQueryReq req) {
return physicDestroyService.listPage(req); return physicDestroyService.listPage(req);
} }
@PostMapping("/sign") @PostMapping("/sign")
......
jmai-physic/src/main/java/com/jmai/physic/controller/PhysicRecordController.java
...@@ -8,6 +8,7 @@ import com.jmai.physic.dto.PhysicRecordSignReq; ...@@ -8,6 +8,7 @@ import com.jmai.physic.dto.PhysicRecordSignReq;
import com.jmai.physic.entity.PhysicRecord; import com.jmai.physic.entity.PhysicRecord;
import com.jmai.physic.service.PhysicRecordService; import com.jmai.physic.service.PhysicRecordService;
import com.jmai.physic.vo.PhysicApplyVO; import com.jmai.physic.vo.PhysicApplyVO;
import com.jmai.physic.vo.PhysicRecordVO;
import com.jmai.sys.aop.Auth; import com.jmai.sys.aop.Auth;
import com.jmai.sys.dto.ResponseData; import com.jmai.sys.dto.ResponseData;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -44,7 +45,7 @@ public class PhysicRecordController { ...@@ -44,7 +45,7 @@ public class PhysicRecordController {
@PostMapping("/listPage") @PostMapping("/listPage")
@ApiOperation(value = "查询") @ApiOperation(value = "查询")
public Page<PhysicRecord> listPage(@RequestBody PhysicRecordQueryReq req) { public Page<PhysicRecordVO> listPage(@RequestBody PhysicRecordQueryReq req) {
return physicRecordService.listPage(req); return physicRecordService.listPage(req);
} }
......
jmai-physic/src/main/java/com/jmai/physic/controller/PhysicStorageAmpouleController.java
...@@ -6,6 +6,7 @@ import com.jmai.physic.dto.*; ...@@ -6,6 +6,7 @@ import com.jmai.physic.dto.*;
import com.jmai.physic.entity.PhysicRecord; import com.jmai.physic.entity.PhysicRecord;
import com.jmai.physic.entity.PhysicStorageAmpoule; import com.jmai.physic.entity.PhysicStorageAmpoule;
import com.jmai.physic.service.PhysicStorageAmpouleService; import com.jmai.physic.service.PhysicStorageAmpouleService;
import com.jmai.physic.vo.PhysicStorageAmpouleVO;
import com.jmai.sys.aop.Auth; import com.jmai.sys.aop.Auth;
import com.jmai.sys.dto.ResponseData; import com.jmai.sys.dto.ResponseData;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -42,7 +43,7 @@ public class PhysicStorageAmpouleController { ...@@ -42,7 +43,7 @@ public class PhysicStorageAmpouleController {
@PostMapping("/listPage") @PostMapping("/listPage")
@ApiOperation(value = "查询") @ApiOperation(value = "查询")
public Page<PhysicStorageAmpoule> listPage(@RequestBody PhysicAmpouleQueryReq req) { public Page<PhysicStorageAmpouleVO> listPage(@RequestBody PhysicAmpouleQueryReq req) {
return physicStorageAmpouleService.listPage(req); return physicStorageAmpouleService.listPage(req);
} }
......
jmai-physic/src/main/java/com/jmai/physic/entity/PhysicBill.java
...@@ -53,9 +53,9 @@ public class PhysicBill extends BaseVersionEntity { ...@@ -53,9 +53,9 @@ public class PhysicBill extends BaseVersionEntity {
@ApiModelProperty(value = "状态 0 -待验收 1 -已完成") @ApiModelProperty(value = "状态 0 -待验收 1 -已完成")
private Integer status; private Integer status;
private String ysUser; private String lyUser;
private String shUser; private String fhUser;
@ApiModelProperty(value = "结存") @ApiModelProperty(value = "结存")
private Integer balance; private Integer balance;
@ApiModelProperty(value = "总结存") @ApiModelProperty(value = "总结存")
......
jmai-physic/src/main/java/com/jmai/physic/entity/PhysicDestroy.java
...@@ -22,9 +22,11 @@ public class PhysicDestroy extends BaseVersionEntity { ...@@ -22,9 +22,11 @@ public class PhysicDestroy extends BaseVersionEntity {
@ApiModelProperty(value = "状态 0-代操作 1-待复核 2-已完成") @ApiModelProperty(value = "状态 0-代操作 1-待复核 2-已完成")
private Integer status; private Integer status;
private String czUser; private String czUser;
private String xhUser; private String fhUser;
private String images; private String images;
private Date destroyTime; private Date destroyTime;
} }
jmai-physic/src/main/java/com/jmai/physic/mapper/PhysicAmpouleMapper.java
...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicAmpouleQueryReq; import com.jmai.physic.dto.PhysicAmpouleQueryReq;
import com.jmai.physic.entity.PhysicAmpoule; import com.jmai.physic.entity.PhysicAmpoule;
import com.jmai.physic.vo.PhysicAmpouleUseVO; import com.jmai.physic.vo.PhysicAmpouleUseVO;
import com.jmai.physic.vo.PhysicAmpouleVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -13,7 +14,7 @@ import java.util.List; ...@@ -13,7 +14,7 @@ import java.util.List;
@Mapper @Mapper
public interface PhysicAmpouleMapper extends BaseMapper<PhysicAmpoule> { public interface PhysicAmpouleMapper extends BaseMapper<PhysicAmpoule> {
Page<PhysicAmpoule> selectAmpoulePage(Page<PhysicAmpoule> page, @Param("req") PhysicAmpouleQueryReq req); Page<PhysicAmpouleVO> selectAmpoulePage(Page<PhysicAmpouleVO> page, @Param("req") PhysicAmpouleQueryReq req);
/** /**
* 获取空安瓿药品数量 * 获取空安瓿药品数量
......
jmai-physic/src/main/java/com/jmai/physic/mapper/PhysicDestroyCheckMapper.java
...@@ -5,10 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -5,10 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicCheckQueryReq; import com.jmai.physic.dto.PhysicCheckQueryReq;
import com.jmai.physic.entity.PhysicBill; import com.jmai.physic.entity.PhysicBill;
import com.jmai.physic.entity.PhysicDestroyCheck; import com.jmai.physic.entity.PhysicDestroyCheck;
import com.jmai.physic.vo.PhysicDestroyCheckVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@Mapper @Mapper
public interface PhysicDestroyCheckMapper extends BaseMapper<PhysicDestroyCheck> { public interface PhysicDestroyCheckMapper extends BaseMapper<PhysicDestroyCheck> {
Page<PhysicDestroyCheck> selectCheckPage(Page<PhysicDestroyCheck> page, @Param("req") PhysicCheckQueryReq req); Page<PhysicDestroyCheckVO> selectCheckPage(Page<PhysicDestroyCheckVO> page, @Param("req") PhysicCheckQueryReq req);
} }
jmai-physic/src/main/java/com/jmai/physic/mapper/PhysicDestroyMapper.java
...@@ -5,10 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -5,10 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicCheckQueryReq; import com.jmai.physic.dto.PhysicCheckQueryReq;
import com.jmai.physic.entity.PhysicDestroy; import com.jmai.physic.entity.PhysicDestroy;
import com.jmai.physic.vo.PhysicDestroyVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@Mapper @Mapper
public interface PhysicDestroyMapper extends BaseMapper<PhysicDestroy> { public interface PhysicDestroyMapper extends BaseMapper<PhysicDestroy> {
Page<PhysicDestroy> selectDestroyPage(@Param("page") Page<PhysicDestroy> page, @Param("req") PhysicCheckQueryReq req); Page<PhysicDestroyVO> selectDestroyPage(@Param("page") Page<PhysicDestroyVO> page, @Param("req") PhysicCheckQueryReq req);
} }
jmai-physic/src/main/java/com/jmai/physic/mapper/PhysicRecordMapper.java
...@@ -5,10 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -5,10 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicRecordQueryReq; import com.jmai.physic.dto.PhysicRecordQueryReq;
import com.jmai.physic.entity.PhysicRecord; import com.jmai.physic.entity.PhysicRecord;
import com.jmai.physic.vo.PhysicRecordVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@Mapper @Mapper
public interface PhysicRecordMapper extends BaseMapper<PhysicRecord> { public interface PhysicRecordMapper extends BaseMapper<PhysicRecord> {
Page<PhysicRecord> selectRecordPage(Page<PhysicRecord> page,@Param("req") PhysicRecordQueryReq req); Page<PhysicRecordVO> selectRecordPage(Page<PhysicRecordVO> page, @Param("req") PhysicRecordQueryReq req);
} }
jmai-physic/src/main/java/com/jmai/physic/mapper/PhysicStorageAmpouleMapper.java
...@@ -5,10 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -5,10 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicAmpouleQueryReq; import com.jmai.physic.dto.PhysicAmpouleQueryReq;
import com.jmai.physic.entity.PhysicStorageAmpoule; import com.jmai.physic.entity.PhysicStorageAmpoule;
import com.jmai.physic.vo.PhysicStorageAmpouleVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@Mapper @Mapper
public interface PhysicStorageAmpouleMapper extends BaseMapper<PhysicStorageAmpoule> { public interface PhysicStorageAmpouleMapper extends BaseMapper<PhysicStorageAmpoule> {
Page<PhysicStorageAmpoule> selectAmpoulePage(Page<PhysicStorageAmpoule> page, @Param("req") PhysicAmpouleQueryReq req); Page<PhysicStorageAmpouleVO> selectAmpoulePage(Page<PhysicStorageAmpouleVO> page, @Param("req") PhysicAmpouleQueryReq req);
} }
jmai-physic/src/main/java/com/jmai/physic/service/PhysicAmpouleService.java
...@@ -7,13 +7,14 @@ import com.jmai.physic.dto.PhysicAmpouleSignReq; ...@@ -7,13 +7,14 @@ import com.jmai.physic.dto.PhysicAmpouleSignReq;
import com.jmai.physic.entity.PhysicAmpoule; import com.jmai.physic.entity.PhysicAmpoule;
import com.jmai.physic.entity.PhysicStorageAmpoule; import com.jmai.physic.entity.PhysicStorageAmpoule;
import com.jmai.physic.vo.PhysicAmpouleUseVO; import com.jmai.physic.vo.PhysicAmpouleUseVO;
import com.jmai.physic.vo.PhysicAmpouleVO;
import java.util.List; import java.util.List;
public interface PhysicAmpouleService { public interface PhysicAmpouleService {
void create(PhysicAmpouleCreateReq req); void create(PhysicAmpouleCreateReq req);
Page<PhysicAmpoule> listPage(PhysicAmpouleQueryReq req); Page<PhysicAmpouleVO> listPage(PhysicAmpouleQueryReq req);
List<PhysicAmpouleUseVO> analysis(); List<PhysicAmpouleUseVO> analysis();
......
jmai-physic/src/main/java/com/jmai/physic/service/PhysicDestroyCheckService.java
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.physic.dto.PhysicCheckQueryReq; import com.jmai.physic.dto.PhysicCheckQueryReq;
import com.jmai.physic.dto.PhysicDestroyCheckCreateReq; import com.jmai.physic.dto.PhysicDestroyCheckCreateReq;
import com.jmai.physic.entity.PhysicDestroyCheck; import com.jmai.physic.entity.PhysicDestroyCheck;
import com.jmai.physic.vo.PhysicDestroyCheckVO;
import com.jmai.sys.service.BaseService; import com.jmai.sys.service.BaseService;
public interface PhysicDestroyCheckService extends BaseService<PhysicDestroyCheck> { public interface PhysicDestroyCheckService extends BaseService<PhysicDestroyCheck> {
...@@ -11,5 +12,5 @@ public interface PhysicDestroyCheckService extends BaseService<PhysicDestroyChec ...@@ -11,5 +12,5 @@ public interface PhysicDestroyCheckService extends BaseService<PhysicDestroyChec
void create(PhysicDestroyCheckCreateReq req); void create(PhysicDestroyCheckCreateReq req);
Page<PhysicDestroyCheck> listPage(PhysicCheckQueryReq req); Page<PhysicDestroyCheckVO> listPage(PhysicCheckQueryReq req);
} }
jmai-physic/src/main/java/com/jmai/physic/service/PhysicDestroyService.java
...@@ -7,11 +7,12 @@ import com.jmai.physic.dto.PhysicDestroyCreateReq; ...@@ -7,11 +7,12 @@ import com.jmai.physic.dto.PhysicDestroyCreateReq;
import com.jmai.physic.dto.PhysicDestroySignReq; import com.jmai.physic.dto.PhysicDestroySignReq;
import com.jmai.physic.entity.PhysicDestroy; import com.jmai.physic.entity.PhysicDestroy;
import com.jmai.physic.entity.PhysicRecord; import com.jmai.physic.entity.PhysicRecord;
import com.jmai.physic.vo.PhysicDestroyVO;
public interface PhysicDestroyService { public interface PhysicDestroyService {
void create(PhysicDestroyCreateReq req); void create(PhysicDestroyCreateReq req);
Page<PhysicDestroy> listPage(PhysicCheckQueryReq req); Page<PhysicDestroyVO> listPage(PhysicCheckQueryReq req);
PhysicDestroy sign(PhysicDestroySignReq physicDestroySignReq); PhysicDestroy sign(PhysicDestroySignReq physicDestroySignReq);
......
jmai-physic/src/main/java/com/jmai/physic/service/PhysicRecordService.java
...@@ -5,13 +5,14 @@ import com.jmai.physic.dto.PhysicRecordCreateReq; ...@@ -5,13 +5,14 @@ import com.jmai.physic.dto.PhysicRecordCreateReq;
import com.jmai.physic.dto.PhysicRecordQueryReq; import com.jmai.physic.dto.PhysicRecordQueryReq;
import com.jmai.physic.dto.PhysicRecordSignReq; import com.jmai.physic.dto.PhysicRecordSignReq;
import com.jmai.physic.entity.PhysicRecord; import com.jmai.physic.entity.PhysicRecord;
import com.jmai.physic.vo.PhysicRecordVO;
import java.util.List; import java.util.List;
public interface PhysicRecordService { public interface PhysicRecordService {
List<PhysicRecord> physicRecordCreate(PhysicRecordCreateReq req); List<PhysicRecord> physicRecordCreate(PhysicRecordCreateReq req);
Page<PhysicRecord> listPage(PhysicRecordQueryReq req); Page<PhysicRecordVO> listPage(PhysicRecordQueryReq req);
PhysicRecord sign(PhysicRecordSignReq physicRecordSignReq); PhysicRecord sign(PhysicRecordSignReq physicRecordSignReq);
......
jmai-physic/src/main/java/com/jmai/physic/service/PhysicStorageAmpouleService.java
...@@ -6,11 +6,12 @@ import com.jmai.physic.dto.PhysicStorageAmpouleCreateReq; ...@@ -6,11 +6,12 @@ import com.jmai.physic.dto.PhysicStorageAmpouleCreateReq;
import com.jmai.physic.dto.PhysicStorageAmpouleSignReq; import com.jmai.physic.dto.PhysicStorageAmpouleSignReq;
import com.jmai.physic.entity.PhysicRecord; import com.jmai.physic.entity.PhysicRecord;
import com.jmai.physic.entity.PhysicStorageAmpoule; import com.jmai.physic.entity.PhysicStorageAmpoule;
import com.jmai.physic.vo.PhysicStorageAmpouleVO;
public interface PhysicStorageAmpouleService { public interface PhysicStorageAmpouleService {
void create(PhysicStorageAmpouleCreateReq req); void create(PhysicStorageAmpouleCreateReq req);
Page<PhysicStorageAmpoule> listPage(PhysicAmpouleQueryReq req); Page<PhysicStorageAmpouleVO> listPage(PhysicAmpouleQueryReq req);
PhysicStorageAmpoule sign(PhysicStorageAmpouleSignReq physicStorageAmpouleSignReq); PhysicStorageAmpoule sign(PhysicStorageAmpouleSignReq physicStorageAmpouleSignReq);
......
jmai-physic/src/main/java/com/jmai/physic/service/impl/PhysicAmpouleServiceImpl.java
...@@ -13,6 +13,7 @@ import com.jmai.physic.mapper.PhysicAmpouleMapper; ...@@ -13,6 +13,7 @@ import com.jmai.physic.mapper.PhysicAmpouleMapper;
import com.jmai.physic.service.PhysicAmpouleService; import com.jmai.physic.service.PhysicAmpouleService;
import com.jmai.physic.service.PhysicBillService; import com.jmai.physic.service.PhysicBillService;
import com.jmai.physic.vo.PhysicAmpouleUseVO; import com.jmai.physic.vo.PhysicAmpouleUseVO;
import com.jmai.physic.vo.PhysicAmpouleVO;
import com.jmai.sys.AbstractService; import com.jmai.sys.AbstractService;
import com.jmai.sys.consts.enums.RoleTypeEum; import com.jmai.sys.consts.enums.RoleTypeEum;
import com.jmai.sys.ctx.SpringContextUtils; import com.jmai.sys.ctx.SpringContextUtils;
...@@ -59,10 +60,10 @@ public class PhysicAmpouleServiceImpl extends AbstractService implements PhysicA ...@@ -59,10 +60,10 @@ public class PhysicAmpouleServiceImpl extends AbstractService implements PhysicA
} }
} }
@Override @Override
public Page<PhysicAmpoule> listPage(PhysicAmpouleQueryReq req) { public Page<PhysicAmpouleVO> listPage(PhysicAmpouleQueryReq req) {
Page<PhysicAmpoule> page = buildEmptyPage(req); Page<PhysicAmpouleVO> page = buildEmptyPage(req);
Page<PhysicAmpoule> ampoulePage= physicAmpouleMapper.selectAmpoulePage(page, req); Page<PhysicAmpouleVO> ampoulePage= physicAmpouleMapper.selectAmpoulePage(page, req);
return ampoulePage; return ampoulePage;
} }
......
jmai-physic/src/main/java/com/jmai/physic/service/impl/PhysicApplyServiceImpl.java
...@@ -147,9 +147,11 @@ public class PhysicApplyServiceImpl extends AbstractService implements PhysicApp ...@@ -147,9 +147,11 @@ public class PhysicApplyServiceImpl extends AbstractService implements PhysicApp
return physicApplyList.stream().map(o->{ return physicApplyList.stream().map(o->{
SysUser u = sysUserMapper.selectById(o.getCreateBy());
PhysicApplyVO vo =new PhysicApplyVO(); PhysicApplyVO vo =new PhysicApplyVO();
BeanUtil.copyProperties(o,vo); BeanUtil.copyProperties(o,vo);
vo.setPhysicApplyId(o.getId()); vo.setPhysicApplyId(o.getId());
vo.setCreateName(u.getName());
return vo; return vo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} }
......
jmai-physic/src/main/java/com/jmai/physic/service/impl/PhysicBillServiceImpl.java
...@@ -3,6 +3,7 @@ package com.jmai.physic.service.impl; ...@@ -3,6 +3,7 @@ package com.jmai.physic.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jmai.api.exception.ServiceException;
import com.jmai.physic.cloudsign.CloudsignService; import com.jmai.physic.cloudsign.CloudsignService;
import com.jmai.physic.dto.BillDTO; import com.jmai.physic.dto.BillDTO;
import com.jmai.physic.dto.PhysicBillQueryReq; import com.jmai.physic.dto.PhysicBillQueryReq;
...@@ -16,7 +17,10 @@ import com.jmai.physic.service.PhysicBillService; ...@@ -16,7 +17,10 @@ import com.jmai.physic.service.PhysicBillService;
import com.jmai.physic.vo.BillInfoVO; import com.jmai.physic.vo.BillInfoVO;
import com.jmai.physic.vo.BillQueryVO; import com.jmai.physic.vo.BillQueryVO;
import com.jmai.sys.AbstractService; import com.jmai.sys.AbstractService;
import com.jmai.sys.consts.enums.RoleTypeEum;
import com.jmai.sys.ctx.SpringContextUtils; import com.jmai.sys.ctx.SpringContextUtils;
import com.jmai.sys.entity.SysUser;
import com.jmai.sys.mapper.SysUserMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -33,6 +37,10 @@ public class PhysicBillServiceImpl extends AbstractService implements PhysicBill ...@@ -33,6 +37,10 @@ public class PhysicBillServiceImpl extends AbstractService implements PhysicBill
@Resource @Resource
private CloudsignService cloudsignService; private CloudsignService cloudsignService;
@Resource
private SysUserMapper sysUserMapper;
@Transactional @Transactional
@Override @Override
public void createBill(BillDTO billDTO) { public void createBill(BillDTO billDTO) {
...@@ -78,15 +86,21 @@ public class PhysicBillServiceImpl extends AbstractService implements PhysicBill ...@@ -78,15 +86,21 @@ public class PhysicBillServiceImpl extends AbstractService implements PhysicBill
Long userId = SpringContextUtils.getUserId(); Long userId = SpringContextUtils.getUserId();
String getstamp = cloudsignService.sign(physicBillSignReq.getEncryptedToken(), physicBillSignReq.getRelBizNo(), physicBillSignReq.getBase64SourceData()); String getstamp = cloudsignService.sign(physicBillSignReq.getEncryptedToken(), physicBillSignReq.getRelBizNo(), physicBillSignReq.getBase64SourceData());
PhysicBill bill = physicBillMapper.selectById(physicBillSignReq.getPhysicBillId()); PhysicBill bill = physicBillMapper.selectById(physicBillSignReq.getPhysicBillId());
SysUser sysUser = sysUserMapper.selectById(userId);
if(bill.getStatus().equals(0)){ if(bill.getStatus().equals(0)){
if(!RoleTypeEum.isPass(sysUser.getRoleAsList(),RoleTypeEum.LY)){
throw new ServiceException("需要领药人权限才可进行签名");
}
bill.setStatus(1); bill.setStatus(1);
SignInfoDTO signInfoDTO = new SignInfoDTO(getstamp, LocalDateTime.now(),userId); SignInfoDTO signInfoDTO = new SignInfoDTO(getstamp, LocalDateTime.now(),userId);
bill.setYsUser(JSONUtil.toJsonStr(signInfoDTO)); bill.setLyUser(JSONUtil.toJsonStr(signInfoDTO));
}else if(bill.getStatus().equals(1)) { }else if(bill.getStatus().equals(1)) {
if(!RoleTypeEum.isPass(sysUser.getRoleAsList(),RoleTypeEum.FH)){
throw new ServiceException("需要复核人权限才可进行签名");
}
bill.setStatus(2); bill.setStatus(2);
SignInfoDTO signInfoDTO = new SignInfoDTO(getstamp, LocalDateTime.now(), userId); SignInfoDTO signInfoDTO = new SignInfoDTO(getstamp, LocalDateTime.now(), userId);
; bill.setFhUser(JSONUtil.toJsonStr(signInfoDTO));
bill.setShUser(JSONUtil.toJsonStr(signInfoDTO));
} }
physicBillMapper.updateById(bill); physicBillMapper.updateById(bill);
return bill; return bill;
......
jmai-physic/src/main/java/com/jmai/physic/service/impl/PhysicDestroyCheckServiceImpl.java
...@@ -10,6 +10,7 @@ import com.jmai.physic.entity.PhysicDestroyCheckDetail; ...@@ -10,6 +10,7 @@ import com.jmai.physic.entity.PhysicDestroyCheckDetail;
import com.jmai.physic.mapper.PhysicDestroyCheckMapper; import com.jmai.physic.mapper.PhysicDestroyCheckMapper;
import com.jmai.physic.service.PhysicDestroyCheckDetailService; import com.jmai.physic.service.PhysicDestroyCheckDetailService;
import com.jmai.physic.service.PhysicDestroyCheckService; import com.jmai.physic.service.PhysicDestroyCheckService;
import com.jmai.physic.vo.PhysicDestroyCheckVO;
import com.jmai.sys.service.impl.BaseServiceImpl; import com.jmai.sys.service.impl.BaseServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -41,10 +42,10 @@ public class PhysicDestroyCheckServiceImpl extends BaseServiceImpl<PhysicDestroy ...@@ -41,10 +42,10 @@ public class PhysicDestroyCheckServiceImpl extends BaseServiceImpl<PhysicDestroy
} }
@Override @Override
public Page<PhysicDestroyCheck> listPage(PhysicCheckQueryReq req) { public Page<PhysicDestroyCheckVO> listPage(PhysicCheckQueryReq req) {
Page<PhysicDestroyCheck> page = buildEmptyPage(req); Page<PhysicDestroyCheckVO> page = buildEmptyPage(req);
Page<PhysicDestroyCheck> checkPage = physicDestroyCheckMapper.selectCheckPage(page, req); Page<PhysicDestroyCheckVO> checkPage = physicDestroyCheckMapper.selectCheckPage(page, req);
return checkPage; return checkPage;
} }
} }
jmai-physic/src/main/java/com/jmai/physic/service/impl/PhysicDestroyServiceImpl.java
...@@ -12,6 +12,7 @@ import com.jmai.physic.entity.PhysicWarehouse; ...@@ -12,6 +12,7 @@ import com.jmai.physic.entity.PhysicWarehouse;
import com.jmai.physic.mapper.PhysicDestroyMapper; import com.jmai.physic.mapper.PhysicDestroyMapper;
import com.jmai.physic.service.PhysicBillService; import com.jmai.physic.service.PhysicBillService;
import com.jmai.physic.service.PhysicDestroyService; import com.jmai.physic.service.PhysicDestroyService;
import com.jmai.physic.vo.PhysicDestroyVO;
import com.jmai.sys.AbstractService; import com.jmai.sys.AbstractService;
import com.jmai.sys.consts.enums.RoleTypeEum; import com.jmai.sys.consts.enums.RoleTypeEum;
import com.jmai.sys.ctx.SpringContextUtils; import com.jmai.sys.ctx.SpringContextUtils;
...@@ -50,9 +51,9 @@ public class PhysicDestroyServiceImpl extends AbstractService implements PhysicD ...@@ -50,9 +51,9 @@ public class PhysicDestroyServiceImpl extends AbstractService implements PhysicD
} }
@Override @Override
public Page<PhysicDestroy> listPage(PhysicCheckQueryReq req) { public Page<PhysicDestroyVO> listPage(PhysicCheckQueryReq req) {
Page<PhysicDestroy> page = buildEmptyPage(req); Page<PhysicDestroyVO> page = buildEmptyPage(req);
Page<PhysicDestroy> destroyPage = physicDestroyMapper.selectDestroyPage(page, req); Page<PhysicDestroyVO> destroyPage = physicDestroyMapper.selectDestroyPage(page, req);
return destroyPage; return destroyPage;
} }
...@@ -71,12 +72,12 @@ public class PhysicDestroyServiceImpl extends AbstractService implements PhysicD ...@@ -71,12 +72,12 @@ public class PhysicDestroyServiceImpl extends AbstractService implements PhysicD
SignInfoDTO signInfoDTO = new SignInfoDTO(getstamp, LocalDateTime.now(),userId); SignInfoDTO signInfoDTO = new SignInfoDTO(getstamp, LocalDateTime.now(),userId);
physicDestroy.setCzUser(JSONUtil.toJsonStr(signInfoDTO)); physicDestroy.setCzUser(JSONUtil.toJsonStr(signInfoDTO));
}else if(physicDestroy.getStatus().equals(1)){ }else if(physicDestroy.getStatus().equals(1)){
if(!RoleTypeEum.isPass(sysUser.getRoleAsList(),RoleTypeEum.XH)){ if(!RoleTypeEum.isPass(sysUser.getRoleAsList(),RoleTypeEum.FH)){
throw new ServiceException("需要验收人权限才可进行签名"); throw new ServiceException("需要复核人权限才可进行签名");
} }
physicDestroy.setStatus(2); physicDestroy.setStatus(2);
SignInfoDTO signInfoDTO = new SignInfoDTO(getstamp, LocalDateTime.now(),userId);; SignInfoDTO signInfoDTO = new SignInfoDTO(getstamp, LocalDateTime.now(),userId);;
physicDestroy.setXhUser(JSONUtil.toJsonStr(signInfoDTO)); physicDestroy.setFhUser(JSONUtil.toJsonStr(signInfoDTO));
f = true; f = true;
} }
......
jmai-physic/src/main/java/com/jmai/physic/service/impl/PhysicRecordServiceImpl.java
...@@ -13,6 +13,7 @@ import com.jmai.physic.entity.PhysicWarehouse; ...@@ -13,6 +13,7 @@ import com.jmai.physic.entity.PhysicWarehouse;
import com.jmai.physic.mapper.PhysicRecordMapper; import com.jmai.physic.mapper.PhysicRecordMapper;
import com.jmai.physic.service.PhysicBillService; import com.jmai.physic.service.PhysicBillService;
import com.jmai.physic.service.PhysicRecordService; import com.jmai.physic.service.PhysicRecordService;
import com.jmai.physic.vo.PhysicRecordVO;
import com.jmai.sys.AbstractService; import com.jmai.sys.AbstractService;
import com.jmai.sys.consts.BizFileTypes; import com.jmai.sys.consts.BizFileTypes;
import com.jmai.sys.consts.enums.RoleTypeEum; import com.jmai.sys.consts.enums.RoleTypeEum;
...@@ -75,9 +76,9 @@ public class PhysicRecordServiceImpl extends AbstractService implements PhysicRe ...@@ -75,9 +76,9 @@ public class PhysicRecordServiceImpl extends AbstractService implements PhysicRe
} }
@Override @Override
public Page<PhysicRecord> listPage(PhysicRecordQueryReq req) { public Page<PhysicRecordVO> listPage(PhysicRecordQueryReq req) {
Page<PhysicRecord> page = buildEmptyPage(req); Page<PhysicRecordVO> page = buildEmptyPage(req);
Page<PhysicRecord> recordPage = physicRecordMapper.selectRecordPage(page, req); Page<PhysicRecordVO> recordPage = physicRecordMapper.selectRecordPage(page, req);
return recordPage; return recordPage;
} }
...@@ -90,15 +91,16 @@ public class PhysicRecordServiceImpl extends AbstractService implements PhysicRe ...@@ -90,15 +91,16 @@ public class PhysicRecordServiceImpl extends AbstractService implements PhysicRe
PhysicRecord physicRecord = getInfo(physicRecordSignReq.getPhysicRecordId()); PhysicRecord physicRecord = getInfo(physicRecordSignReq.getPhysicRecordId());
SysUser sysUser = sysUserMapper.selectById(userId); SysUser sysUser = sysUserMapper.selectById(userId);
if(physicRecord.getStatus().equals(0)){ if(physicRecord.getStatus().equals(0)){
if(!RoleTypeEum.isPass(sysUser.getRoleAsList(),RoleTypeEum.DP)){ if(!RoleTypeEum.isPass(sysUser.getRoleAsList(),RoleTypeEum.FY)){
throw new ServiceException("需要调配人权限才可进行签名"); throw new ServiceException("需要发药人权限才可进行签名");
} }
physicRecord.setStatus(1); physicRecord.setStatus(1);
SignInfoDTO signInfoDTO = new SignInfoDTO(getstamp, LocalDateTime.now(),userId); SignInfoDTO signInfoDTO = new SignInfoDTO(getstamp, LocalDateTime.now(),userId);
physicRecord.setDpUser(JSONUtil.toJsonStr(signInfoDTO)); physicRecord.setDpUser(JSONUtil.toJsonStr(signInfoDTO));
}else if(physicRecord.getStatus().equals(1)) { }else if(physicRecord.getStatus().equals(1)) {
if (!RoleTypeEum.isPass(sysUser.getRoleAsList(), RoleTypeEum.FY)) { if (!RoleTypeEum.isPass(sysUser.getRoleAsList(), RoleTypeEum.DP)) {
throw new ServiceException("需要发药人权限才可进行签名"); throw new ServiceException("需要调配人权限才可进行签名");
} }
physicRecord.setStatus(2); physicRecord.setStatus(2);
SignInfoDTO signInfoDTO = new SignInfoDTO(getstamp, LocalDateTime.now(), userId); SignInfoDTO signInfoDTO = new SignInfoDTO(getstamp, LocalDateTime.now(), userId);
......
jmai-physic/src/main/java/com/jmai/physic/service/impl/PhysicStorageAmpouleServiceImpl.java
...@@ -12,6 +12,7 @@ import com.jmai.physic.entity.PhysicStorageAmpoule; ...@@ -12,6 +12,7 @@ import com.jmai.physic.entity.PhysicStorageAmpoule;
import com.jmai.physic.mapper.PhysicStorageAmpouleMapper; import com.jmai.physic.mapper.PhysicStorageAmpouleMapper;
import com.jmai.physic.service.PhysicBillService; import com.jmai.physic.service.PhysicBillService;
import com.jmai.physic.service.PhysicStorageAmpouleService; import com.jmai.physic.service.PhysicStorageAmpouleService;
import com.jmai.physic.vo.PhysicStorageAmpouleVO;
import com.jmai.sys.AbstractService; import com.jmai.sys.AbstractService;
import com.jmai.sys.consts.enums.RoleTypeEum; import com.jmai.sys.consts.enums.RoleTypeEum;
import com.jmai.sys.ctx.SpringContextUtils; import com.jmai.sys.ctx.SpringContextUtils;
...@@ -57,10 +58,10 @@ public class PhysicStorageAmpouleServiceImpl extends AbstractService implements ...@@ -57,10 +58,10 @@ public class PhysicStorageAmpouleServiceImpl extends AbstractService implements
} }
@Override @Override
public Page<PhysicStorageAmpoule> listPage(PhysicAmpouleQueryReq req) { public Page<PhysicStorageAmpouleVO> listPage(PhysicAmpouleQueryReq req) {
Page<PhysicStorageAmpoule> page = buildEmptyPage(req); Page<PhysicStorageAmpouleVO> page = buildEmptyPage(req);
Page<PhysicStorageAmpoule> ampoulePage= physicStorageAmpouleMapper.selectAmpoulePage(page, req); Page<PhysicStorageAmpouleVO> ampoulePage= physicStorageAmpouleMapper.selectAmpoulePage(page, req);
return ampoulePage; return ampoulePage;
} }
......
jmai-physic/src/main/java/com/jmai/physic/service/impl/PhysicWarehouseServiceImpl.java
...@@ -146,9 +146,11 @@ public class PhysicWarehouseServiceImpl extends AbstractService implements Phys ...@@ -146,9 +146,11 @@ public class PhysicWarehouseServiceImpl extends AbstractService implements Phys
queryWrapper.in(PhysicWarehouse::getStatus,statusList); queryWrapper.in(PhysicWarehouse::getStatus,statusList);
List<PhysicWarehouse> physicWarehouses = physicWarehouseMapper.selectList(queryWrapper); List<PhysicWarehouse> physicWarehouses = physicWarehouseMapper.selectList(queryWrapper);
return physicWarehouses.stream().map(o->{ return physicWarehouses.stream().map(o->{
SysUser u = sysUserMapper.selectById(o.getCreateBy());
PhysicWarehouseVO vo =new PhysicWarehouseVO(); PhysicWarehouseVO vo =new PhysicWarehouseVO();
BeanUtil.copyProperties(o,vo); BeanUtil.copyProperties(o,vo);
vo.setPhysicWarehouseId(o.getId()); vo.setPhysicWarehouseId(o.getId());
vo.setCreateName(u.getName());
return vo; return vo;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} }
......
jmai-physic/src/main/java/com/jmai/physic/vo/PhysicAmpouleVO.java 0 → 100644
package com.jmai.physic.vo;
import com.jmai.physic.entity.PhysicAmpoule;
import lombok.Data;
@Data
public class PhysicAmpouleVO extends PhysicAmpoule {
private String createName;
}
jmai-physic/src/main/java/com/jmai/physic/vo/PhysicApplyVO.java
...@@ -39,6 +39,8 @@ public class PhysicApplyVO { ...@@ -39,6 +39,8 @@ public class PhysicApplyVO {
@ApiModelProperty(value = "批号") @ApiModelProperty(value = "批号")
private String batchNo; private String batchNo;
private String createName;
@ApiModelProperty(value = "状态 0 -待领药 1-待审核 2 -待发药 3 -待复核 4 -完成") @ApiModelProperty(value = "状态 0 -待领药 1-待审核 2 -待发药 3 -待复核 4 -完成")
private Integer status; private Integer status;
...@@ -47,4 +49,6 @@ public class PhysicApplyVO { ...@@ -47,4 +49,6 @@ public class PhysicApplyVO {
private String lyUser; private String lyUser;
private String shUser; private String shUser;
private LocalDateTime createTime; private LocalDateTime createTime;
} }
jmai-physic/src/main/java/com/jmai/physic/vo/PhysicDestroyCheckVO.java 0 → 100644
package com.jmai.physic.vo;
import com.jmai.physic.entity.PhysicDestroyCheck;
import lombok.Data;
@Data
public class PhysicDestroyCheckVO extends PhysicDestroyCheck {
private String createName;
}
jmai-physic/src/main/java/com/jmai/physic/vo/PhysicDestroyVO.java 0 → 100644
package com.jmai.physic.vo;
import com.jmai.physic.entity.PhysicDestroy;
import lombok.Data;
@Data
public class PhysicDestroyVO extends PhysicDestroy {
private String createName;
}
jmai-physic/src/main/java/com/jmai/physic/vo/PhysicRecordVO.java 0 → 100644
package com.jmai.physic.vo;
import com.jmai.physic.entity.PhysicRecord;
import lombok.Data;
@Data
public class PhysicRecordVO extends PhysicRecord {
private String createName;
}
jmai-physic/src/main/java/com/jmai/physic/vo/PhysicStorageAmpouleVO.java 0 → 100644
package com.jmai.physic.vo;
import com.jmai.physic.entity.PhysicStorageAmpoule;
import lombok.Data;
@Data
public class PhysicStorageAmpouleVO extends PhysicStorageAmpoule {
private String createName;
}
jmai-physic/src/main/java/com/jmai/physic/vo/PhysicWarehouseVO.java
...@@ -43,6 +43,7 @@ public class PhysicWarehouseVO { ...@@ -43,6 +43,7 @@ public class PhysicWarehouseVO {
private LocalDateTime createTime; private LocalDateTime createTime;
private String createName;
private String ysUser; private String ysUser;
......
jmai-physic/src/main/resources/mapper/PhysicAmpouleMapper.xml
...@@ -3,20 +3,20 @@ ...@@ -3,20 +3,20 @@
<mapper namespace="com.jmai.physic.mapper.PhysicAmpouleMapper"> <mapper namespace="com.jmai.physic.mapper.PhysicAmpouleMapper">
<select id="selectAmpoulePage" resultType="com.jmai.physic.entity.PhysicAmpoule"> <select id="selectAmpoulePage" resultType="com.jmai.physic.vo.PhysicAmpouleVO">
select * from physic_ampoule select a.*,b.name as createName from physic_ampoule a left join sys_user b on a.create_by =b.id
where where
del_flag = 0 a.del_flag = 0
<if test="req.dateTime != null "> <if test="req.dateTime != null ">
and DATE_FORMAT(create_time, '%Y-%m-%d') = DATE_FORMAT(#{req.dateTime}, '%Y-%m-%d') and DATE_FORMAT(a.create_time, '%Y-%m-%d') = DATE_FORMAT(#{req.dateTime}, '%Y-%m-%d')
</if> </if>
<if test="req.physicName!=null and req.physicName !=''"> <if test="req.physicName!=null and req.physicName !=''">
and physic_name LIKE CONCAT('%', #{req.physicName}, '%') and a.physic_name LIKE CONCAT('%', #{req.physicName}, '%')
</if> </if>
<if test="req.deptId!=null"> <if test="req.deptId!=null">
and dept_id = #{req.deptId} and a.dept_id = #{req.deptId}
</if> </if>
order by create_time desc order by a.create_time desc
</select> </select>
<select id="selectLastMonthPhysicSum" resultType="com.jmai.physic.vo.PhysicAmpouleUseVO"> <select id="selectLastMonthPhysicSum" resultType="com.jmai.physic.vo.PhysicAmpouleUseVO">
select (IFNULL(sum(physic_num),0)) as physicNum,physic_name as physicName,physic_spec as physicSpec,factory_name as factoryName select (IFNULL(sum(physic_num),0)) as physicNum,physic_name as physicName,physic_spec as physicSpec,factory_name as factoryName
......
jmai-physic/src/main/resources/mapper/PhysicApplyMapper.xml
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
<select id="selectApplyPage" resultType="com.jmai.physic.vo.PhysicApplyVO"> <select id="selectApplyPage" resultType="com.jmai.physic.vo.PhysicApplyVO">
select a.id as physicApplyId, a.*, select a.id as physicApplyId, a.*,b.name as createName
(select dept_name from sys_dept d where d.id = a.ly_dept_id) as lyDeptName ,(select dept_name from sys_dept d where d.id = a.ly_dept_id) as lyDeptName
,(select dept_name from sys_dept d where d.id = a.fy_dept_id) as fyDeptName ,(select dept_name from sys_dept d where d.id = a.fy_dept_id) as fyDeptName
from physic_apply a from physic_apply a left join sys_user b on a.create_by =b.id
where a.del_flag =0 where a.del_flag =0
<if test="req.status !=null"> <if test="req.status !=null">
......
jmai-physic/src/main/resources/mapper/PhysicDestroyCheckMapper.xml
...@@ -3,16 +3,16 @@ ...@@ -3,16 +3,16 @@
<mapper namespace="com.jmai.physic.mapper.PhysicDestroyCheckMapper"> <mapper namespace="com.jmai.physic.mapper.PhysicDestroyCheckMapper">
<select id="selectCheckPage" resultType="com.jmai.physic.entity.PhysicDestroyCheck"> <select id="selectCheckPage" resultType="com.jmai.physic.vo.PhysicDestroyCheckVO">
select * from physic_destroy_check select a.*,b.name as createName from physic_destroy_check a left join sys_user b on a.create_by =b.id
where del_flag =0 and status=#{req.status} where a.del_flag =0 and a.status=#{req.status}
<if test="req.keyword != null and req.keyword != ''"> <if test="req.keyword != null and req.keyword != ''">
AND ( AND (
apply_name LIKE CONCAT('%', #{req.keyword}, '%') a.apply_name LIKE CONCAT('%', #{req.keyword}, '%')
OR apply_title LIKE CONCAT('%', #{req.keyword}, '%') OR a.apply_title LIKE CONCAT('%', #{req.keyword}, '%')
OR apply_reason LIKE CONCAT('%', #{req.keyword}, '%') OR a.apply_reason LIKE CONCAT('%', #{req.keyword}, '%')
) )
</if> </if>
order by a.create_time desc
</select> </select>
</mapper> </mapper>
jmai-physic/src/main/resources/mapper/PhysicDestroyMapper.xml
...@@ -3,19 +3,19 @@ ...@@ -3,19 +3,19 @@
<mapper namespace="com.jmai.physic.mapper.PhysicDestroyMapper"> <mapper namespace="com.jmai.physic.mapper.PhysicDestroyMapper">
<select id="selectDestroyPage" resultType="com.jmai.physic.entity.PhysicDestroy"> <select id="selectDestroyPage" resultType="com.jmai.physic.vo.PhysicDestroyVO">
select * from physic_destroy select a.*,b.name as createName from physic_destroy a left join sys_user b on a.create_by =b.id
where del_flag =0 where a.del_flag =0
<if test="req.status !=null"> <if test="req.status !=null">
and status=#{req.status} and a.status=#{req.status}
</if> </if>
<if test="req.keyword != null and req.keyword != ''"> <if test="req.keyword != null and req.keyword != ''">
AND ( AND (
sick_name LIKE CONCAT('%', #{req.keyword}, '%') a.sick_name LIKE CONCAT('%', #{req.keyword}, '%')
OR order_no LIKE CONCAT('%', #{req.keyword}, '%') OR a.order_no LIKE CONCAT('%', #{req.keyword}, '%')
OR surplus LIKE CONCAT('%', #{req.keyword}, '%') OR a.surplus LIKE CONCAT('%', #{req.keyword}, '%')
) )
</if> </if>
order by a.create_time desc
</select> </select>
</mapper> </mapper>
jmai-physic/src/main/resources/mapper/PhysicRecordMapper.xml
...@@ -2,25 +2,25 @@ ...@@ -2,25 +2,25 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jmai.physic.mapper.PhysicRecordMapper"> <mapper namespace="com.jmai.physic.mapper.PhysicRecordMapper">
<select id="selectRecordPage" resultType="com.jmai.physic.entity.PhysicRecord"> <select id="selectRecordPage" resultType="com.jmai.physic.vo.PhysicRecordVO">
select * from physic_record select a.*,b.name as createName from physic_record a left join sys_user b on a.create_by =b.id
where del_flag =0 where a.del_flag =0
<if test="req.status !=null"> <if test="req.status !=null">
and status=#{req.status} and a.status=#{req.status}
</if> </if>
<if test="req.keyword != null and req.keyword != ''"> <if test="req.keyword != null and req.keyword != ''">
AND ( AND (
physic_name LIKE CONCAT('%', #{req.keyword}, '%') a.physic_name LIKE CONCAT('%', #{req.keyword}, '%')
OR batch_no LIKE CONCAT('%', #{req.keyword}, '%') OR a.batch_no LIKE CONCAT('%', #{req.keyword}, '%')
OR sick_name LIKE CONCAT('%', #{req.keyword}, '%') OR a.sick_name LIKE CONCAT('%', #{req.keyword}, '%')
OR sick_id_card LIKE CONCAT('%', #{req.keyword}, '%') OR a.sick_id_card LIKE CONCAT('%', #{req.keyword}, '%')
OR hospital_number LIKE CONCAT('%', #{req.keyword}, '%') OR a.hospital_number LIKE CONCAT('%', #{req.keyword}, '%')
OR disease_name LIKE CONCAT('%', #{req.keyword}, '%') OR a.disease_name LIKE CONCAT('%', #{req.keyword}, '%')
OR prescription_number LIKE CONCAT('%', #{req.keyword}, '%') OR a.prescription_number LIKE CONCAT('%', #{req.keyword}, '%')
OR prescription_doctor LIKE CONCAT('%', #{req.keyword}, '%') OR a.prescription_doctor LIKE CONCAT('%', #{req.keyword}, '%')
) )
</if> </if>
order by a.create_time desc
</select> </select>
</mapper> </mapper>
jmai-physic/src/main/resources/mapper/PhysicStorageAmpouleMapper.xml
...@@ -3,19 +3,19 @@ ...@@ -3,19 +3,19 @@
<mapper namespace="com.jmai.physic.mapper.PhysicStorageAmpouleMapper"> <mapper namespace="com.jmai.physic.mapper.PhysicStorageAmpouleMapper">
<select id="selectAmpoulePage" resultType="com.jmai.physic.entity.PhysicStorageAmpoule"> <select id="selectAmpoulePage" resultType="com.jmai.physic.vo.PhysicStorageAmpouleVO">
select * from physic_storage_ampoule select a.*,b.name as createName from physic_storage_ampoule a left join sys_user b on a.create_by =b.id
where where
del_flag = 0 a.del_flag = 0
<if test="req.dateTime != null "> <if test="req.dateTime != null ">
and DATE_FORMAT(create_time, '%Y-%m-%d') = DATE_FORMAT(#{req.dateTime}, '%Y-%m-%d') and DATE_FORMAT(a.create_time, '%Y-%m-%d') = DATE_FORMAT(#{req.dateTime}, '%Y-%m-%d')
</if> </if>
<if test="req.physicName!=null and req.physicName !=''"> <if test="req.physicName!=null and req.physicName !=''">
and physic_name LIKE CONCAT('%', #{req.physicName}, '%') and a.physic_name LIKE CONCAT('%', #{req.physicName}, '%')
</if> </if>
<if test="req.deptId!=null"> <if test="req.deptId!=null">
and dept_id = #{req.deptId} and a.dept_id = #{req.deptId}
</if> </if>
order by create_time desc order by a.create_time desc
</select> </select>
</mapper> </mapper>
jmai-physic/src/main/resources/mapper/PhysicWarehouseMapper.xml
...@@ -8,8 +8,9 @@ ...@@ -8,8 +8,9 @@
WHERE DATE(expire_date) &lt; CURDATE() and expire_date is not null group by physic_name,physic_spec,factory_name WHERE DATE(expire_date) &lt; CURDATE() and expire_date is not null group by physic_name,physic_spec,factory_name
</select> </select>
<select id="selectWarehousePage" resultType="com.jmai.physic.vo.PhysicWarehouseVO"> <select id="selectWarehousePage" resultType="com.jmai.physic.vo.PhysicWarehouseVO">
select a.id as physicWarehouseId,a.*,b.dept_name as deptName from physic_warehouse a select a.id as physicWarehouseId,a.*,b.dept_name as deptName,u.name as createName from physic_warehouse a
left join sys_dept b on a.dept_id =b.id left join sys_dept b on a.dept_id =b.id
left join sys_user u on a.create_by =u.id
where a.del_flag =0 where a.del_flag =0
<if test="req.status !=null"> <if test="req.status !=null">
and a.status=#{req.status} and a.status=#{req.status}
......
jmai-sys/src/main/java/com/jmai/sys/dto/UserCreateReq.java
...@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -29,9 +30,12 @@ public class UserCreateReq { ...@@ -29,9 +30,12 @@ public class UserCreateReq {
@ApiModelProperty(value = "盐",hidden = true) @ApiModelProperty(value = "盐",hidden = true)
private String salt; private String salt;
@NotNull(message = "部门不能为空")
@ApiModelProperty(value = "组织（ID）") @ApiModelProperty(value = "组织（ID）")
private Long deptId; private Long deptId;
@NotBlank(message = "角色不能为空")
@ApiModelProperty(value = "用户角色（ID）列表（逗号隔开）") @ApiModelProperty(value = "用户角色（ID）列表（逗号隔开）")
private String roleList; private String roleList;
......
logs/jmai/error.log
This diff could not be displayed because it is too large.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment