diff --git a/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java new file mode 100644 index 000000000..9d2338a9f --- /dev/null +++ b/src/main/java/com/glxp/api/controller/basic/BasicHospTypeController.java @@ -0,0 +1,165 @@ +package com.glxp.api.controller.basic; + + +import cn.hutool.core.stream.StreamUtil; +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageInfo; +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.dao.basic.BasicHospTypeRelDao; +import com.glxp.api.entity.basic.BasicHospTypeEntity; +import com.glxp.api.entity.basic.BasicHospTypeRelEntity; +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; +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.BasicHospTypeRelService; +import com.glxp.api.service.basic.BasicHospTypeService; +import com.glxp.api.util.StreamUtils; +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; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +public class BasicHospTypeController { + + @Resource + BasicHospTypeService basicHospTypeService; + + @Resource + BasicHospTypeRelService basicHospTypeRelService; + + + + @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 basicHospTypeEntities=basicHospTypeService.filterHospTypeList(basicHospTypeFilterRequest); + PageInfo pageInfo = new PageInfo<>(basicHospTypeEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicHospTypeEntities); + + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwms/basic/hosp/type/menuList") + public BaseResponse menuList(BasicHospTypeFilterRequest basicHospTypeFilterRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List basicHospTypeEntities=basicHospTypeService.getMenuList(basicHospTypeFilterRequest); + + return ResultVOUtils.success(basicHospTypeEntities); + } + + @PostMapping("/udiwms/basic/hosp/type/save") + 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,"插入失败!"); + } + return ResultVOUtils.success(); + } + + + @PostMapping("/udiwms/basic/hosp/type/update") + public BaseResponse update(@RequestBody BasicHospTypeRequest basicHospTypeRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + Boolean falg=basicHospTypeService.updateBasicHospType(basicHospTypeRequest); + if(!falg){ + return ResultVOUtils.error(999,"更新失败!"); + } + return ResultVOUtils.success(); + } + + @GetMapping("/udiwms/basic/hosp/type/delect") + 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); + + if (StringUtils.isNotBlank(msg)){ + return ResultVOUtils.error(999,msg); + } + return ResultVOUtils.success(); + } + + @GetMapping("/udiwms/basic/hosp/type/getTree") + public BaseResponse getTree() { + List basicHospTypeEntities=basicHospTypeService.getTreeList(); + return ResultVOUtils.success(basicHospTypeEntities); + } + + @PostMapping("/udiwms/basic/hosp/type/bindRel") + 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); + return ResultVOUtils.success(); + } + + @GetMapping("/udiwms/basic/hosp/type/bindList") + public BaseResponse bindList(FilterUdiRelRequest filterUdiRelRequest) { + + filterUdiRelRequest.setDiType(1); + List udiRelevanceResponses = basicHospTypeService.filterUdiGp(filterUdiRelRequest); + //查询分类关联表,存在的制灰 + List basicHospTypeRelEntityList=basicHospTypeRelService.getBasicHospTypeRelList(filterUdiRelRequest.getBindId()); + for (UdiRelevanceResponse obj:udiRelevanceResponses){ + for (BasicHospTypeRelEntity obj2:basicHospTypeRelEntityList){ + if(obj2.getRelId().equals(String.valueOf(obj.getId()))){ + obj.setBindCheck(true); + break; + } + } + } + PageInfo pageInfo = new PageInfo<>(udiRelevanceResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiRelevanceResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/udiwms/basic/hosp/type/unbindRel") + 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); + return ResultVOUtils.success(); + } + +} diff --git a/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java index fe4c3045e..40ac9bb68 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java @@ -3,16 +3,14 @@ package com.glxp.api.dao.basic; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.basic.BasicHospTypeEntity; import java.util.List; -import org.apache.ibatis.annotations.Param; +import com.glxp.api.res.basic.BasicHospTypeResponse; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +@Mapper public interface BasicHospTypeDao extends BaseMapper { - int updateBatch(List list); - - int updateBatchSelective(List list); - int batchInsert(@Param("list") List list); + List getTreeList(); - int insertOrUpdate(BasicHospTypeEntity record); - int insertOrUpdateSelective(BasicHospTypeEntity record); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/basic/BasicUdirelTypeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicUdirelTypeDao.java deleted file mode 100644 index c0f3e6970..000000000 --- a/src/main/java/com/glxp/api/dao/basic/BasicUdirelTypeDao.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.glxp.api.dao.basic; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.basic.BasicUdirelTypeEntity; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface BasicUdirelTypeDao extends BaseMapper { - int updateBatch(List list); - - int updateBatchSelective(List list); - - int batchInsert(@Param("list") List list); - - int insertOrUpdate(BasicUdirelTypeEntity record); - - int insertOrUpdateSelective(BasicUdirelTypeEntity record); -} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/req/basic/BasicHospTypeFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BasicHospTypeFilterRequest.java new file mode 100644 index 000000000..03edcedd1 --- /dev/null +++ b/src/main/java/com/glxp/api/req/basic/BasicHospTypeFilterRequest.java @@ -0,0 +1,13 @@ +package com.glxp.api.req.basic; + +import com.glxp.api.res.basic.BasicErpUnitsResponse; +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.List; + +@Data +public class BasicHospTypeFilterRequest extends ListPageRequest { + + private String name; +} diff --git a/src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java b/src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java new file mode 100644 index 000000000..18da850ec --- /dev/null +++ b/src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java @@ -0,0 +1,18 @@ +package com.glxp.api.req.basic; + +import com.glxp.api.entity.basic.UdiProductEntity; +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.List; + +@Data +public class BasicHospTypeRequest{ + + private Integer id; + private String code; + private String parentCode; + private String name; + private String remark; + List ids; +} diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index d5d40884a..4d9aed4c9 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -61,5 +61,7 @@ public class FilterUdiRelRequest extends ListPageRequest { private String companyName; private String bindRlIds; + private String bindCode; + private String bindId;//在绑定时为了不错乱填写的是code } diff --git a/src/main/java/com/glxp/api/res/basic/BasicHospTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicHospTypeResponse.java new file mode 100644 index 000000000..d11b90151 --- /dev/null +++ b/src/main/java/com/glxp/api/res/basic/BasicHospTypeResponse.java @@ -0,0 +1,26 @@ +package com.glxp.api.res.basic; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +@Data +public class BasicHospTypeResponse { + + private Integer id; + private String code; + private String parentCode; + private String name; + private String remark; + private Date createTime; + private Date updateTime; + private String createUser; + private String updateUser; + private String label; + + +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index 0e17562fd..87873a817 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -86,6 +86,8 @@ public class UdiRelevanceResponse { private Boolean isSelect; + private Boolean bindCheck; + //关联查询字典 private String unitFk; //供应商ID diff --git a/src/main/java/com/glxp/api/service/basic/BasicHospTypeRelService.java b/src/main/java/com/glxp/api/service/basic/BasicHospTypeRelService.java new file mode 100644 index 000000000..f6bfae5c0 --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/BasicHospTypeRelService.java @@ -0,0 +1,17 @@ +package com.glxp.api.service.basic; + +import com.glxp.api.entity.basic.BasicHospTypeEntity; +import com.glxp.api.entity.basic.BasicHospTypeRelEntity; +import com.glxp.api.req.basic.BasicHospTypeFilterRequest; +import com.glxp.api.req.basic.BasicHospTypeRequest; +import com.glxp.api.req.basic.FilterUdiRelRequest; +import com.glxp.api.res.basic.BasicHospTypeResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; + +import java.util.List; + +public interface BasicHospTypeRelService { + + List getBasicHospTypeRelList(String code); + +} diff --git a/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java b/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java new file mode 100644 index 000000000..a767600e8 --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java @@ -0,0 +1,34 @@ +package com.glxp.api.service.basic; + +import com.glxp.api.entity.basic.BasicHospTypeEntity; +import com.glxp.api.req.basic.BasicHospTypeFilterRequest; +import com.glxp.api.req.basic.BasicHospTypeRequest; +import com.glxp.api.req.basic.FilterUdiRelRequest; +import com.glxp.api.res.basic.BasicHospTypeResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; + + +import java.util.List; + +public interface BasicHospTypeService { + + List filterHospTypeList(BasicHospTypeFilterRequest basicHospTypeFilterRequest); + + List getMenuList(BasicHospTypeFilterRequest basicHospTypeFilterRequest); + + Boolean saveBasicHospType(BasicHospTypeRequest basicHospTypeRequest); + + boolean updateBasicHospType(BasicHospTypeRequest basicHospTypeRequest); + + String delectBasicHospType(BasicHospTypeRequest basicHospTypeRequest); + + List getTreeList(); + + boolean bindHospProduct(BasicHospTypeRequest basicHospTypeRequest); + + boolean unbindHospProduct(BasicHospTypeRequest basicHospTypeRequest); + + List filterUdiGp(FilterUdiRelRequest filterUdiRelRequest); + + +} diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeRelServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeRelServiceImpl.java new file mode 100644 index 000000000..957a4a5ad --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeRelServiceImpl.java @@ -0,0 +1,46 @@ +package com.glxp.api.service.basic.impl; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.basic.BasicHospTypeDao; +import com.glxp.api.dao.basic.BasicHospTypeRelDao; +import com.glxp.api.dao.basic.UdiRelevanceDao; +import com.glxp.api.entity.basic.BasicHospTypeEntity; +import com.glxp.api.entity.basic.BasicHospTypeRelEntity; +import com.glxp.api.req.basic.BasicHospTypeFilterRequest; +import com.glxp.api.req.basic.BasicHospTypeRequest; +import com.glxp.api.req.basic.FilterUdiRelRequest; +import com.glxp.api.res.basic.BasicHospTypeResponse; +import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.service.auth.CustomerService; +import com.glxp.api.service.basic.BasicHospTypeRelService; +import com.glxp.api.service.basic.BasicHospTypeService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +@Service +public class BasicHospTypeRelServiceImpl implements BasicHospTypeRelService { + + @Resource + BasicHospTypeRelDao basicHospTypeRelDao; + + + @Override + public List getBasicHospTypeRelList(String code) { + List basicHospTypeRelEntityList=new ArrayList<>(); + QueryWrapper ew=new QueryWrapper<>(); + if(StrUtil.isNotEmpty(code)){ + ew.eq("code",code); + basicHospTypeRelEntityList =basicHospTypeRelDao.selectList(ew); + } + + + return basicHospTypeRelEntityList; + } +} diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java new file mode 100644 index 000000000..881133629 --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java @@ -0,0 +1,178 @@ +package com.glxp.api.service.basic.impl; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.basic.BasicHospTypeDao; +import com.glxp.api.dao.basic.BasicHospTypeRelDao; +import com.glxp.api.dao.basic.UdiRelevanceDao; +import com.glxp.api.entity.basic.BasicCorpEntity; +import com.glxp.api.entity.basic.BasicHospTypeEntity; +import com.glxp.api.entity.basic.BasicHospTypeRelEntity; +import com.glxp.api.req.basic.BasicHospTypeFilterRequest; +import com.glxp.api.req.basic.BasicHospTypeRequest; +import com.glxp.api.req.basic.FilterUdiRelRequest; +import com.glxp.api.res.basic.BasicHospTypeResponse; +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 javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +@Service +public class BasicHospTypeServiceImpl implements BasicHospTypeService { + + @Resource + BasicHospTypeDao basicHospTypeDao; + + @Resource + CustomerService customerService; + + @Resource + BasicHospTypeRelDao basicHospTypeRelDao; + + @Resource + UdiRelevanceDao udiRelevanceDao; + + + + + @Override + public List filterHospTypeList(BasicHospTypeFilterRequest basicHospTypeFilterRequest) { + if (basicHospTypeFilterRequest == null) { + return Collections.emptyList(); + } + if (basicHospTypeFilterRequest.getPage() != null) { + int offset = (basicHospTypeFilterRequest.getPage() - 1) * basicHospTypeFilterRequest.getLimit(); + PageHelper.offsetPage(offset, basicHospTypeFilterRequest.getLimit()); + } + QueryWrapper ew=new QueryWrapper<>(); + if (StrUtil.isNotEmpty(basicHospTypeFilterRequest.getName())){ + ew.like("name",basicHospTypeFilterRequest.getName()); + } + List data = basicHospTypeDao.selectList(ew); + return data; + } + + @Override + public List getMenuList(BasicHospTypeFilterRequest basicHospTypeFilterRequest) { + QueryWrapper ew=new QueryWrapper<>(); + List data = basicHospTypeDao.selectList(ew); + return data; + } + + @Override + public Boolean saveBasicHospType(BasicHospTypeRequest basicHospTypeRequest) { + 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+""); + //获取数据库最大的code + QueryWrapper 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; + } + return falg; + } + + @Override + public boolean updateBasicHospType(BasicHospTypeRequest basicHospTypeRequest) { + 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; + } + return falg; + } + + @Override + public String delectBasicHospType(BasicHospTypeRequest basicHospTypeRequest) { + + //查询有没有自己的子集 + QueryWrapper ew=new QueryWrapper<>(); + ew.eq("parentCode",basicHospTypeRequest.getCode()); + Long count=basicHospTypeDao.selectCount(ew); + if(count>0){ + return "请先删除该节点底下的数据!"; + } + //查询有没有产品绑定 + QueryWrapper ew2=new QueryWrapper<>(); + ew2.eq("code",basicHospTypeRequest.getCode()); + count=basicHospTypeRelDao.selectCount(ew2); + if(count>0){ + return "该节点还存在产品,请先删除!"; + } + + basicHospTypeDao.deleteById(basicHospTypeRequest.getId()); + + return ""; + } + + @Override + public List getTreeList() { + return basicHospTypeDao.getTreeList(); + } + + @Override + public boolean bindHospProduct(BasicHospTypeRequest basicHospTypeRequest) { + + List basicHospTypeRelEntityList=new ArrayList<>(); + for (String obj:basicHospTypeRequest.getIds()){ + BasicHospTypeRelEntity basicHospTypeRelEntity=new BasicHospTypeRelEntity(); + basicHospTypeRelEntity.setCode(basicHospTypeRequest.getCode()); + basicHospTypeRelEntity.setRelId(obj); + basicHospTypeRelEntityList.add(basicHospTypeRelEntity); + } + basicHospTypeRelDao.batchInsert(basicHospTypeRelEntityList); + return true; + } + + @Override + public boolean unbindHospProduct(BasicHospTypeRequest basicHospTypeRequest) { + + QueryWrapper ew=new QueryWrapper<>(); + ew.eq("code",basicHospTypeRequest.getCode()); + ew.in("relId",basicHospTypeRequest.getIds()); + basicHospTypeRelDao.delete(ew); + return true; + } + + @Override + public List filterUdiGp(FilterUdiRelRequest filterUdiRelRequest) { + if (filterUdiRelRequest == null) { + return Collections.emptyList(); + } + if (filterUdiRelRequest.getPage() != null) { + int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit()); + } + + List data = udiRelevanceDao.filterUdiGp(filterUdiRelRequest); + return data; + } +} diff --git a/src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml index 759d5e85c..d469b6cc5 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicHospTypeDao.xml @@ -18,270 +18,11 @@ id, code, parentCode, `name`, remark, createTime, updateTime, `createUser`, updateUser - - - update basic_hosp_type - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.code,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.parentCode,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.name,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.createTime,jdbcType=TIMESTAMP} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.updateTime,jdbcType=TIMESTAMP} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.createUser,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.updateUser,jdbcType=VARCHAR} - - - - where id in - - #{item.id,jdbcType=INTEGER} - - - - - update basic_hosp_type - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.code,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.parentCode,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.name,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.createTime,jdbcType=TIMESTAMP} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.updateTime,jdbcType=TIMESTAMP} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.createUser,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.updateUser,jdbcType=VARCHAR} - - - - - where id in - - #{item.id,jdbcType=INTEGER} - - - - - insert into basic_hosp_type - (code, parentCode, `name`, remark, createTime, updateTime, `createUser`, updateUser - ) - values - - (#{item.code,jdbcType=VARCHAR}, #{item.parentCode,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}, - #{item.remark,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP}, - #{item.createUser,jdbcType=VARCHAR}, #{item.updateUser,jdbcType=VARCHAR}) - - - - - insert into basic_hosp_type - - - id, - - code, - parentCode, - `name`, - remark, - createTime, - updateTime, - `createUser`, - updateUser, - - values - - - #{id,jdbcType=INTEGER}, - - #{code,jdbcType=VARCHAR}, - #{parentCode,jdbcType=VARCHAR}, - #{name,jdbcType=VARCHAR}, - #{remark,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}, - #{createUser,jdbcType=VARCHAR}, - #{updateUser,jdbcType=VARCHAR}, - - on duplicate key update - - - id = #{id,jdbcType=INTEGER}, - - code = #{code,jdbcType=VARCHAR}, - parentCode = #{parentCode,jdbcType=VARCHAR}, - `name` = #{name,jdbcType=VARCHAR}, - remark = #{remark,jdbcType=VARCHAR}, - createTime = #{createTime,jdbcType=TIMESTAMP}, - updateTime = #{updateTime,jdbcType=TIMESTAMP}, - `createUser` = #{createUser,jdbcType=VARCHAR}, - updateUser = #{updateUser,jdbcType=VARCHAR}, - - - - - insert into basic_hosp_type - - - id, - - - code, - - - parentCode, - - - `name`, - - - remark, - - - createTime, - - - updateTime, - - - `createUser`, - - - updateUser, - - - values - - - #{id,jdbcType=INTEGER}, - - - #{code,jdbcType=VARCHAR}, - - - #{parentCode,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{remark,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - #{createUser,jdbcType=VARCHAR}, - - - #{updateUser,jdbcType=VARCHAR}, - - - on duplicate key update - - - id = #{id,jdbcType=INTEGER}, - - - code = #{code,jdbcType=VARCHAR}, - - - parentCode = #{parentCode,jdbcType=VARCHAR}, - - - `name` = #{name,jdbcType=VARCHAR}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - createTime = #{createTime,jdbcType=TIMESTAMP}, - - - updateTime = #{updateTime,jdbcType=TIMESTAMP}, - - - `createUser` = #{createUser,jdbcType=VARCHAR}, - - - updateUser = #{updateUser,jdbcType=VARCHAR}, - - - + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/basic/BasicHospTypeRelDao.xml b/src/main/resources/mybatis/mapper/basic/BasicHospTypeRelDao.xml index 61b7ccbda..2fa22b669 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicHospTypeRelDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicHospTypeRelDao.xml @@ -72,9 +72,9 @@ (id, code, relId) values (#{id,jdbcType=INTEGER}, #{code,jdbcType=VARCHAR}, #{relId,jdbcType=VARCHAR}) - on duplicate key update - id = #{id,jdbcType=INTEGER}, - code = #{code,jdbcType=VARCHAR}, + on duplicate key update + id = #{id,jdbcType=INTEGER}, + code = #{code,jdbcType=VARCHAR}, relId = #{relId,jdbcType=VARCHAR} @@ -103,7 +103,7 @@ #{relId,jdbcType=VARCHAR}, - on duplicate key update + on duplicate key update id = #{id,jdbcType=INTEGER}, diff --git a/src/main/resources/mybatis/mapper/basic/BasicUdirelTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicUdirelTypeDao.xml deleted file mode 100644 index cbe8fb863..000000000 --- a/src/main/resources/mybatis/mapper/basic/BasicUdirelTypeDao.xml +++ /dev/null @@ -1,261 +0,0 @@ - - - - - - - - - - - - - - - - - - id, pId, `name`, remark, createTime, updateTime, `createUser`, updateUser - - - - update basic_udirel_type - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.pId,jdbcType=INTEGER} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.name,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.createTime,jdbcType=TIMESTAMP} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.updateTime,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.createUser,jdbcType=VARCHAR} - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.updateUser,jdbcType=VARCHAR} - - - - where id in - - #{item.id,jdbcType=INTEGER} - - - - - update basic_udirel_type - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.pId,jdbcType=INTEGER} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.name,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.remark,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.createTime,jdbcType=TIMESTAMP} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.updateTime,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.createUser,jdbcType=VARCHAR} - - - - - - - when id = #{item.id,jdbcType=INTEGER} then #{item.updateUser,jdbcType=VARCHAR} - - - - - where id in - - #{item.id,jdbcType=INTEGER} - - - - - insert into basic_udirel_type - (pId, `name`, remark, createTime, updateTime, `createUser`, updateUser) - values - - (#{item.pId,jdbcType=INTEGER}, #{item.name,jdbcType=VARCHAR}, #{item.remark,jdbcType=VARCHAR}, - #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=VARCHAR}, #{item.createUser,jdbcType=VARCHAR}, - #{item.updateUser,jdbcType=VARCHAR}) - - - - - insert into basic_udirel_type - - - id, - - pId, - `name`, - remark, - createTime, - updateTime, - `createUser`, - updateUser, - - values - - - #{id,jdbcType=INTEGER}, - - #{pId,jdbcType=INTEGER}, - #{name,jdbcType=VARCHAR}, - #{remark,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=VARCHAR}, - #{createUser,jdbcType=VARCHAR}, - #{updateUser,jdbcType=VARCHAR}, - - on duplicate key update - - - id = #{id,jdbcType=INTEGER}, - - pId = #{pId,jdbcType=INTEGER}, - `name` = #{name,jdbcType=VARCHAR}, - remark = #{remark,jdbcType=VARCHAR}, - createTime = #{createTime,jdbcType=TIMESTAMP}, - updateTime = #{updateTime,jdbcType=VARCHAR}, - `createUser` = #{createUser,jdbcType=VARCHAR}, - updateUser = #{updateUser,jdbcType=VARCHAR}, - - - - - insert into basic_udirel_type - - - id, - - - pId, - - - `name`, - - - remark, - - - createTime, - - - updateTime, - - - `createUser`, - - - updateUser, - - - values - - - #{id,jdbcType=INTEGER}, - - - #{pId,jdbcType=INTEGER}, - - - #{name,jdbcType=VARCHAR}, - - - #{remark,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=VARCHAR}, - - - #{createUser,jdbcType=VARCHAR}, - - - #{updateUser,jdbcType=VARCHAR}, - - - on duplicate key update - - - id = #{id,jdbcType=INTEGER}, - - - pId = #{pId,jdbcType=INTEGER}, - - - `name` = #{name,jdbcType=VARCHAR}, - - - remark = #{remark,jdbcType=VARCHAR}, - - - createTime = #{createTime,jdbcType=TIMESTAMP}, - - - updateTime = #{updateTime,jdbcType=VARCHAR}, - - - `createUser` = #{createUser,jdbcType=VARCHAR}, - - - updateUser = #{updateUser,jdbcType=VARCHAR}, - - - - \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 52245349c..24f9d7071 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -304,10 +304,16 @@ FROM basic_products inner JOIN basic_udirel ON basic_products.uuid = basic_udirel.uuid + + right JOIN basic_hosp_type_rel on basic_hosp_type_rel.relId = basic_udirel.id + AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') + + AND basic_hosp_type_rel.code = #{bindCode} + AND supName LIKE concat('%', #{supName}, '%')