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

物资分类带代码迁移

Browse Source
master
anthonywj 3 years ago
parent 1a5279e608
commit 9f65dda33c
8 changed files with 190 additions and 66 deletions
Show Stats Download Patch File Download Diff File

1
pom.xml
Unescape Escape View File

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

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

@ -1,11 +1,15 @@
package com.glxp.api.controller.basic; package com.glxp.api.controller.basic;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; 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.BasicHospTypeEntity;
import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.req.basic.BasicHospTypeFilterRequest; import com.glxp.api.req.basic.BasicHospTypeFilterRequest;
import com.glxp.api.req.basic.BasicHospTypeRequest; import com.glxp.api.req.basic.BasicHospTypeRequest;
import com.glxp.api.req.basic.FilterUdiRelRequest; 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.BasicHospTypeResponse;
import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.service.basic.BasicHospTypeService; 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.StringUtils;
import com.glxp.api.util.udi.FilterUdiUtils;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -30,15 +36,13 @@ public class BasicHospTypeController {
BasicHospTypeService basicHospTypeService; BasicHospTypeService basicHospTypeService;
@GetMapping("/udiwms/basic/hosp/type/filter") @GetMapping("/udiwms/basic/hosp/type/filter")
public BaseResponse filterBasicUnitMaintain(BasicHospTypeFilterRequest basicHospTypeFilterRequest, BindingResult bindingResult) { public BaseResponse filterBasicUnitMaintain(BasicHospTypeFilterRequest basicHospTypeFilterRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); 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); PageInfo<BasicHospTypeEntity> pageInfo = new PageInfo<>(basicHospTypeEntities);
PageSimpleResponse<BasicHospTypeEntity> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<BasicHospTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());
@ -47,14 +51,20 @@ public class BasicHospTypeController {
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
@GetMapping("/udiwms/basic/hosp/type/menuList") @PostMapping("/udiwms/basic/hosp/type/menuList")
public BaseResponse menuList(BasicHospTypeFilterRequest basicHospTypeFilterRequest, BindingResult bindingResult) { public BaseResponse menuList(@RequestBody BasicHospTypeFilterRequest basicHospTypeFilterRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); 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); return ResultVOUtils.success(basicHospTypeEntities);
} }
@ -65,45 +75,68 @@ public class BasicHospTypeController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
Boolean falg=basicHospTypeService.saveBasicHospType(basicHospTypeRequest); if(StrUtil.isEmpty(basicHospTypeRequest.getName())){
if(!falg){ return ResultVOUtils.error(999, "名字不能为空！");
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(); return ResultVOUtils.success();
} }
@PostMapping("/udiwms/basic/hosp/type/update") @PostMapping("/udiwms/basic/hosp/type/update")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse update(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) { public BaseResponse update(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); 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); falg = basicHospTypeService.updateBasicHospType(basicHospTypeRequest);
if(!falg){ if (!falg) {
return ResultVOUtils.error(999,"更新失败！"); return ResultVOUtils.error(999, "更新失败！");
} }
return ResultVOUtils.success(); return ResultVOUtils.success();
} }
@GetMapping("/udiwms/basic/hosp/type/delect") @GetMapping("/udiwms/basic/hosp/type/delect")
@Log(title = "单据管理", businessType = BusinessType.DELETE)
public BaseResponse delect(BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) { public BaseResponse delect(BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
String msg=basicHospTypeService.delectBasicHospType(basicHospTypeRequest); String msg = basicHospTypeService.delectBasicHospType(basicHospTypeRequest);
if (StringUtils.isNotBlank(msg)){ if (StringUtils.isNotBlank(msg)) {
return ResultVOUtils.error(999,msg); return ResultVOUtils.error(999, msg);
} }
return ResultVOUtils.success(); return ResultVOUtils.success();
} }
@GetMapping("/udiwms/basic/hosp/type/getTree") @GetMapping("/udiwms/basic/hosp/type/getTree")
public BaseResponse getTree() { public BaseResponse getTree() {
List<BasicHospTypeResponse> basicHospTypeEntities=basicHospTypeService.getTreeList(); List<BasicHospTypeResponse> basicHospTypeEntities = basicHospTypeService.getTreeList();
return ResultVOUtils.success(basicHospTypeEntities); return ResultVOUtils.success(basicHospTypeEntities);
} }
@ -114,14 +147,37 @@ public class BasicHospTypeController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
Boolean falg=basicHospTypeService.bindHospProduct(basicHospTypeRequest); Boolean falg = basicHospTypeService.bindHospProduct(basicHospTypeRequest);
return ResultVOUtils.success(); return ResultVOUtils.success();
} }
@Resource
UdiRelevanceService udiRelevanceService;
@GetMapping("/udiwms/basic/hosp/type/bindList") @GetMapping("/udiwms/basic/hosp/type/bindList")
public BaseResponse bindList(FilterUdiRelRequest filterUdiRelRequest) { public BaseResponse bindList(FilterUdiRelRequest filterUdiRelRequest) {
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); filterUdiRelRequest.setDiType(1);
}
List<UdiRelevanceResponse> udiRelevanceResponses = basicHospTypeService.filterUdiGp(filterUdiRelRequest); List<UdiRelevanceResponse> udiRelevanceResponses = basicHospTypeService.filterUdiGp(filterUdiRelRequest);
PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses); PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(udiRelevanceResponses);
PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>(); PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
@ -132,13 +188,14 @@ public class BasicHospTypeController {
@PostMapping("/udiwms/basic/hosp/type/unbindRel") @PostMapping("/udiwms/basic/hosp/type/unbindRel")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse unbindRel(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) { public BaseResponse unbindRel(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
Boolean falg=basicHospTypeService.unbindHospProduct(basicHospTypeRequest); Boolean falg = basicHospTypeService.unbindHospProduct(basicHospTypeRequest);
return ResultVOUtils.success(); return ResultVOUtils.success();
} }

2
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<BasicHospTypeResponse> getTreeList();
List<BasicHospTypeEntity> selectLowTypeAll(@Param("code") String code);
} }

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

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

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; import java.util.Arrays;
@Component //@Component
@EnableScheduling //@EnableScheduling
public class SyncHeartTask implements SchedulingConfigurer { public class SyncHeartTask implements SchedulingConfigurer {
final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class); final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class);

20
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 id, code,name as label,parentCode FROM basic_hosp_type ORDER BY id DESC
</select> </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