UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
wj 2 years ago
parent 1517d71b78 9f65dda33c
commit 943c02af52
14 changed files with 255 additions and 75 deletions
Show Stats Download Patch File Download Diff File

1
pom.xml
Unescape Escape View File

@ -411,6 +411,7 @@
<includes>
<include>**/*.xml</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>

29
src/main/java/com/glxp/api/controller/auth/DeptUserController.java
Unescape Escape View File

@ -6,11 +6,14 @@ import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.auth.DeptEntity;
import com.glxp.api.entity.auth.DeptUserEntity;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.req.auth.FilterDeptUserReqeust;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.auth.DeptUserResponse;
import com.glxp.api.service.auth.DeptService;
import com.glxp.api.service.auth.DeptUserService;
import com.glxp.api.service.auth.WarehouseUserService;
import com.glxp.api.service.inout.IoOrderService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -28,6 +31,12 @@ public class DeptUserController {
@Resource
DeptService deptService;
@Resource
IoOrderService ioOrderService;
@Resource
WarehouseUserService warehouseUserService;
@AuthRuleAnnotation("")
@GetMapping("udi/auth/dept/user/filter")
@ -52,6 +61,26 @@ public class DeptUserController {
@AuthRuleAnnotation("")
@PostMapping("udi/auth/dept/user/delete")
public BaseResponse delete(@RequestBody DeptUserEntity deptUserEntity) {
// 判断此用户是否创建单据
List<IoOrderEntity> ioOrderEntities = ioOrderService.selectList(deptUserEntity.getUserId());
if( ioOrderEntities != null && ioOrderEntities.size() != 0 ){
return ResultVOUtils.error(500,"该用户已创建单据,不能移除!");
}
//判断此用户是否与仓库有关联
List<String> listWareHouse = warehouseUserService.selectCodeByUser(deptUserEntity.getUserId() + "");
if( listWareHouse != null && listWareHouse.size() != 0){
return ResultVOUtils.error(500,"该用户已绑定仓库,不能移除!");
}
//判断此用户是否与除一级部门 还绑定其他部门
FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust();
filterDeptUserReqeust.setUserId(deptUserEntity.getUserId());
List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust);
if( deptUserEntities != null && deptUserEntities.size()>1){
return ResultVOUtils.error(500,"该用户已绑定多个部门,不能移除!");
}
boolean b = deptUserService.delete(deptUserEntity.getDeptId(), deptUserEntity.getUserId());
if (b)
return ResultVOUtils.success("移除成功！");

32
src/main/java/com/glxp/api/controller/auth/SysUserController.java
Unescape Escape View File

@ -6,14 +6,18 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.auth.DeptUserEntity;
import com.glxp.api.entity.auth.SysRole;
import com.glxp.api.entity.auth.WarehouseUserEntity;
import com.glxp.api.req.auth.FilterAuthUserRequest;
import com.glxp.api.req.auth.AuthUserSaveRequest;
import com.glxp.api.req.auth.FilterAuthUserRequest;
import com.glxp.api.req.auth.FilterDeptUserReqeust;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.auth.AuthAdminResponse;
import com.glxp.api.res.auth.DeptUserResponse;
@ -23,13 +27,9 @@ import com.glxp.api.service.auth.ISysRoleService;
import com.glxp.api.service.auth.WarehouseUserService;
import com.glxp.api.util.PasswordUtils;
import com.glxp.api.util.StreamUtils;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.util.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -264,9 +264,25 @@ public class SysUserController extends BaseController {
userService.updateAuthAdmin(authAdmin);
//默认插入第一部门
List<Long> deptCodeList=authUserSaveRequest.getDepts();
deptCodeList.add(1L);
authUserSaveRequest.setDepts(deptCodeList);
List<Long> deptCodeList = null;
FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust();
filterDeptUserReqeust.setUserId(authUserSaveRequest.getId());
List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust);
if(deptUserEntities == null){
deptCodeList.add(1L);
authUserSaveRequest.setDepts(deptCodeList);
}else{
Boolean checkDeptId=false;
for (DeptUserEntity deptUserEntity : deptUserEntities) {
if(deptUserEntity.getDeptId() == 1){
checkDeptId=true;
}
}
if(checkDeptId==false){
deptCodeList.add(1L);
authUserSaveRequest.setDepts(deptCodeList);
}
}
//修改所属部门
deptUserService.deleteByUser(authUserSaveRequest.getId());

103
src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java
Unescape Escape View File

@ -1,11 +1,15 @@
package com.glxp.api.controller.basic;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.basic.BasicHospTypeEntity;
import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.req.basic.BasicHospTypeFilterRequest;
import com.glxp.api.req.basic.BasicHospTypeRequest;
import com.glxp.api.req.basic.FilterUdiRelRequest;
@ -13,7 +17,9 @@ import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.basic.BasicHospTypeResponse;
import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.service.basic.BasicHospTypeService;
import com.glxp.api.service.basic.UdiRelevanceService;
import com.glxp.api.util.StringUtils;
import com.glxp.api.util.udi.FilterUdiUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -30,15 +36,13 @@ public class BasicHospTypeController {
BasicHospTypeService basicHospTypeService;
@GetMapping("/udiwms/basic/hosp/type/filter")
public BaseResponse filterBasicUnitMaintain(BasicHospTypeFilterRequest basicHospTypeFilterRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<BasicHospTypeEntity> basicHospTypeEntities=basicHospTypeService.filterHospTypeList(basicHospTypeFilterRequest);
List<BasicHospTypeEntity> basicHospTypeEntities = basicHospTypeService.filterHospTypeList(basicHospTypeFilterRequest);
PageInfo<BasicHospTypeEntity> pageInfo = new PageInfo<>(basicHospTypeEntities);
PageSimpleResponse<BasicHospTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
@ -47,81 +51,133 @@ public class BasicHospTypeController {
return ResultVOUtils.success(pageSimpleResponse);
}
@GetMapping("/udiwms/basic/hosp/type/menuList")
public BaseResponse menuList(BasicHospTypeFilterRequest basicHospTypeFilterRequest, BindingResult bindingResult) {
@PostMapping("/udiwms/basic/hosp/type/menuList")
public BaseResponse menuList(@RequestBody BasicHospTypeFilterRequest basicHospTypeFilterRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<BasicHospTypeEntity> basicHospTypeEntities=basicHospTypeService.getMenuList(basicHospTypeFilterRequest);
List<BasicHospTypeEntity> basicHospTypeEntities = basicHospTypeService.getMenuList(basicHospTypeFilterRequest);
return ResultVOUtils.success(basicHospTypeEntities);
}
@GetMapping("/udiwms/basic/hosp/type/getOneName")
public BaseResponse getOneName() {
BasicHospTypeEntity basicHospTypeEntities = basicHospTypeService.selectBasicHospTypeEntity();
return ResultVOUtils.success(basicHospTypeEntities);
}
@PostMapping("/udiwms/basic/hosp/type/save")
public BaseResponse save(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
public BaseResponse save(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
Boolean falg=basicHospTypeService.saveBasicHospType(basicHospTypeRequest);
if(!falg){
return ResultVOUtils.error(999,"插入失败！");
if(StrUtil.isEmpty(basicHospTypeRequest.getName())){
return ResultVOUtils.error(999, "名字不能为空！");
}
Boolean falg=basicHospTypeService.checkName(basicHospTypeRequest,1);
if(falg==false){
return ResultVOUtils.error(999, "院内分类名字已存在！");
}
falg = basicHospTypeService.saveBasicHospType(basicHospTypeRequest);
if (!falg) {
return ResultVOUtils.error(999, "插入失败！");
}
return ResultVOUtils.success();
}
@PostMapping("/udiwms/basic/hosp/type/update")
public BaseResponse update(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse update(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if(StrUtil.isEmpty(basicHospTypeRequest.getName())){
return ResultVOUtils.error(999, "名字不能为空！");
}
if(basicHospTypeRequest.getCode().equals(basicHospTypeRequest.getParentCode())){
return ResultVOUtils.error(999, "上级菜单不能选择自己！");
}
Boolean falg=basicHospTypeService.checkName(basicHospTypeRequest,2);
if(falg==false){
return ResultVOUtils.error(999, "院内分类名字已存在！");
}
Boolean falg=basicHospTypeService.updateBasicHospType(basicHospTypeRequest);
if(!falg){
return ResultVOUtils.error(999,"更新失败！");
falg = basicHospTypeService.updateBasicHospType(basicHospTypeRequest);
if (!falg) {
return ResultVOUtils.error(999, "更新失败！");
}
return ResultVOUtils.success();
}
@GetMapping("/udiwms/basic/hosp/type/delect")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse delect(BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String msg=basicHospTypeService.delectBasicHospType(basicHospTypeRequest);
String msg = basicHospTypeService.delectBasicHospType(basicHospTypeRequest);
if (StringUtils.isNotBlank(msg)){
return ResultVOUtils.error(999,msg);
if (StringUtils.isNotBlank(msg)) {
return ResultVOUtils.error(999, msg);
}
return ResultVOUtils.success();
}
@GetMapping("/udiwms/basic/hosp/type/getTree")
public BaseResponse getTree() {
List<BasicHospTypeResponse> basicHospTypeEntities=basicHospTypeService.getTreeList();
List<BasicHospTypeResponse> basicHospTypeEntities = basicHospTypeService.getTreeList();
return ResultVOUtils.success(basicHospTypeEntities);
}
@PostMapping("/udiwms/basic/hosp/type/bindRel")
public BaseResponse saveRel(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
public BaseResponse saveRel(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
Boolean falg=basicHospTypeService.bindHospProduct(basicHospTypeRequest);
Boolean falg = basicHospTypeService.bindHospProduct(basicHospTypeRequest);
return ResultVOUtils.success();
}
@Resource
UdiRelevanceService udiRelevanceService;
@GetMapping("/udiwms/basic/hosp/type/bindList")
public BaseResponse bindList(FilterUdiRelRequest filterUdiRelRequest) {
filterUdiRelRequest.setDiType(1);
if (StrUtil.isNotEmpty(filterUdiRelRequest.getUdiCode())) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiRelRequest.getUdiCode());
if (udiEntity != null) {
filterUdiRelRequest.setNameCode(udiEntity.getUdi());
filterUdiRelRequest.setUnionCode(udiEntity.getUdi());
}
}
//如果输入DI标识，精确找到不同层级对应的产品信息
if (StrUtil.isNotEmpty(filterUdiRelRequest.getUnionCode())) {
FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest();
filterUdiInfoRequest.setNameCode(filterUdiRelRequest.getUnionCode());
List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
if (temps != null && temps.size() > 0) {
filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid());
filterUdiRelRequest.setNameCode(filterUdiInfoRequest.getNameCode());
filterUdiRelRequest.setUnionCode(null);
}
} else {
//只查找主标识产品信息
filterUdiRelRequest.setDiType(1);
}
List<UdiRelevanceResponse> udiRelevanceResponses = basicHospTypeService.filterUdiGp(filterUdiRelRequest);
PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
@ -132,13 +188,14 @@ public class BasicHospTypeController {
@PostMapping("/udiwms/basic/hosp/type/unbindRel")
public BaseResponse unbindRel(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse unbindRel(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
Boolean falg=basicHospTypeService.unbindHospProduct(basicHospTypeRequest);
Boolean falg = basicHospTypeService.unbindHospProduct(basicHospTypeRequest);
return ResultVOUtils.success();
}

4
src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java
Unescape Escape View File

@ -15,5 +15,7 @@ public interface BasicHospTypeDao extends BaseMapperPlus<BasicHospTypeDao, Basic
List<BasicHospTypeResponse> getTreeList();
List<BasicHospTypeEntity> selectLowTypeAll(@Param("code") String code);
}
}

2
src/main/java/com/glxp/api/entity/purchase/SupCertRemindMsgEntity.java
Unescape Escape View File

@ -99,4 +99,6 @@ public class SupCertRemindMsgEntity {
@TableField(value = "remark")
private String remark;
@TableField(value = "remindCount")
private int remindCount;
}

4
src/main/java/com/glxp/api/req/basic/BasicHospTypeFilterRequest.java
Unescape Escape View File

@ -9,5 +9,7 @@ import java.util.List;
@Data
public class BasicHospTypeFilterRequest extends ListPageRequest {
private String name;
private String name;
private Integer type;
private String code;
}

4
src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java
Unescape Escape View File

@ -17,6 +17,8 @@ public interface BasicHospTypeService extends IService<BasicHospTypeEntity> {
List<BasicHospTypeEntity> getMenuList(BasicHospTypeFilterRequest basicHospTypeFilterRequest);
BasicHospTypeEntity selectBasicHospTypeEntity();
Boolean saveBasicHospType(BasicHospTypeRequest basicHospTypeRequest);
boolean updateBasicHospType(BasicHospTypeRequest basicHospTypeRequest);
@ -31,5 +33,7 @@ public interface BasicHospTypeService extends IService<BasicHospTypeEntity> {
List<UdiRelevanceResponse> filterUdiGp(FilterUdiRelRequest filterUdiRelRequest);
Boolean checkName(BasicHospTypeRequest basicHospTypeRequest, Integer type);
}

114
src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java
Unescape Escape View File

@ -17,15 +17,18 @@ import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.service.auth.CustomerService;
import com.glxp.api.service.basic.BasicHospTypeService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@Service
public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao,BasicHospTypeEntity> implements BasicHospTypeService {
@Transactional(rollbackFor = Exception.class)
public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao, BasicHospTypeEntity> implements BasicHospTypeService {
@Resource
BasicHospTypeDao basicHospTypeDao;
@ -38,8 +41,6 @@ public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao,Basic
UdiRelevanceDao udiRelevanceDao;
@Override
public List<BasicHospTypeEntity> filterHospTypeList(BasicHospTypeFilterRequest basicHospTypeFilterRequest) {
if (basicHospTypeFilterRequest == null) {
@ -49,9 +50,9 @@ public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao,Basic
int offset = (basicHospTypeFilterRequest.getPage() - 1) * basicHospTypeFilterRequest.getLimit();
PageHelper.offsetPage(offset, basicHospTypeFilterRequest.getLimit());
}
QueryWrapper<BasicHospTypeEntity> ew=new QueryWrapper<>();
if (StrUtil.isNotEmpty(basicHospTypeFilterRequest.getName())){
ew.like("name",basicHospTypeFilterRequest.getName());
QueryWrapper<BasicHospTypeEntity> ew = new QueryWrapper<>();
if (StrUtil.isNotEmpty(basicHospTypeFilterRequest.getName())) {
ew.like("name", basicHospTypeFilterRequest.getName());
}
List<BasicHospTypeEntity> data = basicHospTypeDao.selectList(ew);
return data;
@ -59,51 +60,65 @@ public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao,Basic
@Override
public List<BasicHospTypeEntity> getMenuList(BasicHospTypeFilterRequest basicHospTypeFilterRequest) {
QueryWrapper<BasicHospTypeEntity> ew=new QueryWrapper<>();
QueryWrapper<BasicHospTypeEntity> ew = new QueryWrapper<>();
ew.ne("code", 10000);
if (basicHospTypeFilterRequest.getType() != null && basicHospTypeFilterRequest.getType() == 1 && StrUtil.isNotEmpty(basicHospTypeFilterRequest.getCode())) {
List<BasicHospTypeEntity> basicHospTypeEntityList = basicHospTypeDao.selectLowTypeAll(basicHospTypeFilterRequest.getCode());
List<Integer> ids = basicHospTypeEntityList.stream().map(BasicHospTypeEntity::getId).collect(Collectors.toList());
ew.notIn("id", ids);
}
List<BasicHospTypeEntity> data = basicHospTypeDao.selectList(ew);
return data;
}
@Override
public BasicHospTypeEntity selectBasicHospTypeEntity() {
QueryWrapper<BasicHospTypeEntity> ew = new QueryWrapper<>();
ew.eq("code", 10000);
return basicHospTypeDao.selectOne(ew);
}
@Override
public Boolean saveBasicHospType(BasicHospTypeRequest basicHospTypeRequest) {
boolean falg=true;
BasicHospTypeEntity basicHospTypeEntity=new BasicHospTypeEntity();
boolean falg = true;
BasicHospTypeEntity basicHospTypeEntity = new BasicHospTypeEntity();
basicHospTypeEntity.setCreateTime(new Date());
basicHospTypeEntity.setUpdateTime(new Date());
basicHospTypeEntity.setName(basicHospTypeRequest.getName());
basicHospTypeEntity.setParentCode(basicHospTypeRequest.getParentCode());
basicHospTypeEntity.setRemark(basicHospTypeRequest.getRemark());
Long userId=customerService.getUserId();
basicHospTypeEntity.setCreateUser(userId+"");
basicHospTypeEntity.setUpdateUser(userId+"");
Long userId = customerService.getUserId();
basicHospTypeEntity.setCreateUser(userId + "");
basicHospTypeEntity.setUpdateUser(userId + "");
//获取数据库最大的code
QueryWrapper<BasicHospTypeEntity> ew=new QueryWrapper<>();
QueryWrapper<BasicHospTypeEntity> ew = new QueryWrapper<>();
ew.select("max(code) as code");
BasicHospTypeEntity code=basicHospTypeDao.selectOne(ew);
basicHospTypeEntity.setCode(Integer.valueOf(code.getCode())+1+"");
int count=basicHospTypeDao.insert(basicHospTypeEntity);
if(count==0){
falg=false;
BasicHospTypeEntity code = basicHospTypeDao.selectOne(ew);
basicHospTypeEntity.setCode(Integer.valueOf(code.getCode()) + 1 + "");
int count = basicHospTypeDao.insert(basicHospTypeEntity);
if (count == 0) {
falg = false;
}
return falg;
}
@Override
public boolean updateBasicHospType(BasicHospTypeRequest basicHospTypeRequest) {
boolean falg=true;
BasicHospTypeEntity basicHospTypeEntity=new BasicHospTypeEntity();
boolean falg = true;
BasicHospTypeEntity basicHospTypeEntity = new BasicHospTypeEntity();
basicHospTypeEntity.setId(basicHospTypeRequest.getId());
basicHospTypeEntity.setCreateTime(new Date());
basicHospTypeEntity.setUpdateTime(new Date());
basicHospTypeEntity.setName(basicHospTypeRequest.getName());
basicHospTypeEntity.setParentCode(basicHospTypeRequest.getParentCode());
basicHospTypeEntity.setRemark(basicHospTypeRequest.getRemark());
Long userId=customerService.getUserId();
basicHospTypeEntity.setCreateUser(userId+"");
basicHospTypeEntity.setUpdateUser(userId+"");
int count=basicHospTypeDao.updateById(basicHospTypeEntity);
if(count==0){
falg=false;
Long userId = customerService.getUserId();
basicHospTypeEntity.setCreateUser(userId + "");
basicHospTypeEntity.setUpdateUser(userId + "");
int count = basicHospTypeDao.updateById(basicHospTypeEntity);
if (count == 0) {
falg = false;
}
return falg;
}
@ -112,15 +127,15 @@ public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao,Basic
public String delectBasicHospType(BasicHospTypeRequest basicHospTypeRequest) {
//查询有没有自己的子集
QueryWrapper<BasicHospTypeEntity> ew=new QueryWrapper<>();
ew.eq("parentCode",basicHospTypeRequest.getCode());
Long count=basicHospTypeDao.selectCount(ew);
if(count>0){
QueryWrapper<BasicHospTypeEntity> ew = new QueryWrapper<>();
ew.eq("parentCode", basicHospTypeRequest.getCode());
Long count = basicHospTypeDao.selectCount(ew);
if (count > 0) {
return "请先删除该节点底下的数据！";
}
//查询有没有产品绑定
count=udiRelevanceDao.selectProductByRelCode(basicHospTypeRequest.getCode());
if(count>0){
count = udiRelevanceDao.selectProductByRelCode(basicHospTypeRequest.getCode());
if (count > 0) {
return "该节点还存在产品，请先删除！";
}
@ -137,9 +152,9 @@ public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao,Basic
@Override
public boolean bindHospProduct(BasicHospTypeRequest basicHospTypeRequest) {
List<UdiRelevanceEntity> udiRelevanceEntityList=new ArrayList<>();
for (String obj:basicHospTypeRequest.getIds()){
UdiRelevanceEntity udiRelevanceEntity=new UdiRelevanceEntity();
List<UdiRelevanceEntity> udiRelevanceEntityList = new ArrayList<>();
for (String obj : basicHospTypeRequest.getIds()) {
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
udiRelevanceEntity.setId(Long.valueOf(obj));
udiRelevanceEntity.setRelCode(basicHospTypeRequest.getCode());
udiRelevanceEntityList.add(udiRelevanceEntity);
@ -152,9 +167,9 @@ public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao,Basic
@Override
public boolean unbindHospProduct(BasicHospTypeRequest basicHospTypeRequest) {
List<UdiRelevanceEntity> udiRelevanceEntityList=new ArrayList<>();
for (String obj:basicHospTypeRequest.getIds()){
UdiRelevanceEntity udiRelevanceEntity=new UdiRelevanceEntity();
List<UdiRelevanceEntity> udiRelevanceEntityList = new ArrayList<>();
for (String obj : basicHospTypeRequest.getIds()) {
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
udiRelevanceEntity.setId(Long.valueOf(obj));
udiRelevanceEntity.setRelCode("");
udiRelevanceEntityList.add(udiRelevanceEntity);
@ -176,4 +191,27 @@ public class BasicHospTypeServiceImpl extends ServiceImpl<BasicHospTypeDao,Basic
List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiGp(filterUdiRelRequest);
return data;
}
@Override
public Boolean checkName(BasicHospTypeRequest basicHospTypeRequest, Integer type) {
Long sum = null;
//1添加
if (type == 1) {
//查看名字是不是重复
QueryWrapper<BasicHospTypeEntity> ew = new QueryWrapper<>();
ew.eq("name", basicHospTypeRequest.getName());
sum = basicHospTypeDao.selectCount(ew);
} else {
QueryWrapper<BasicHospTypeEntity> ew = new QueryWrapper<>();
ew.eq("name", basicHospTypeRequest.getName());
ew.ne("id", basicHospTypeRequest.getId());
sum = basicHospTypeDao.selectCount(ew);
}
if (sum > 0) {
return false;
} else {
return true;
}
}
}

2
src/main/java/com/glxp/api/service/inout/IoOrderService.java
Unescape Escape View File

@ -133,4 +133,6 @@ public interface IoOrderService {
* @return
*/
BaseResponse submitOrderToThrSys(ThrSystemDetailEntity thrSystemDetailEntity);
List<IoOrderEntity> selectList(Long userId);
}

6
src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
Unescape Escape View File

@ -831,6 +831,12 @@ public class IoOrderServiceImpl implements IoOrderService {
return ResultVOUtils.success("单据提交完成");
}
@Override
public List<IoOrderEntity> selectList(Long userId) {
List<IoOrderEntity> ioOrderEntities = orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("createUser",userId));
return ioOrderEntities;
}
/**
* 查询此单据关联的所有单据
*

3
src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java
Unescape Escape View File

@ -168,7 +168,8 @@ public class SupCertRemindMsgImpl implements SupCertRemindMsgService {
msgEntity.setHandleMsg(null); //处理方式重置为空
msgEntity.setUpdateTime(new Date());
msgEntity.setNextRemindTime(new Date());
msgEntity.setNextRemindTime(cn.hutool.core.date.DateUtil.parse(cn.hutool.core.date.DateUtil.offsetDay(new Date(), 1).toString("yyyy-MM-dd") + " 07:00:00"));
msgEntity.setRemindCount(msgEntity.getRemindCount() + 1);
if (null == msgEntity.getId()) {
log.info("新增资质预警：{}", JSONUtil.toJsonStr(msgEntity));
supCertRemindMsgDao.insert(msgEntity);

4
src/main/java/com/glxp/api/task/SyncHeartTask.java
Unescape Escape View File

@ -20,8 +20,8 @@ import javax.annotation.Resource;
import java.util.Arrays;
@Component
@EnableScheduling
//@Component
//@EnableScheduling
public class SyncHeartTask implements SchedulingConfigurer {
final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class);

22
src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml
Unescape Escape View File

@ -24,5 +24,25 @@
SELECT id, code,name as label,parentCode FROM basic_hosp_type ORDER BY id DESC
</select>
<select id="selectLowTypeAll" parameterType="java.lang.String" resultType="com.glxp.api.entity.basic.BasicHospTypeEntity">
WITH recursive table_a AS (
SELECT
*
FROM
basic_hosp_type ta
WHERE
code = #{code}
UNION ALL
SELECT
tb.*
FROM
basic_hosp_type tb
INNER JOIN table_a ON table_a.CODE = tb.parentCode
) SELECT
*
FROM
table_a
</select>
</mapper>
</mapper>

Write Preview
Loading…
Cancel
Save