diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java index 3c12be7..3e7f561 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java @@ -205,4 +205,19 @@ public class ConfigMaterialCategoryController extends JeecgController editQyty(@RequestBody ConfigMaterialCategory configMaterialCategory) { + configMaterialCategoryService.editQyty(configMaterialCategory); + return Result.OK("编辑成功!"); + } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java index 9b54f31..c88434a 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java @@ -184,4 +184,13 @@ public class ConfigMaterialInfoController extends JeecgController wlqianyi(@RequestBody ConfigMaterialInfo configMaterialInfo) { + configMaterialInfoService.wlqianyi(configMaterialInfo); + return Result.OK("操作成功!"); + } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialMedicationController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialMedicationController.java index 1fcc4e3..f757dc2 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialMedicationController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialMedicationController.java @@ -183,4 +183,23 @@ public class ConfigMaterialMedicationController extends JeecgController editQyty(@RequestBody ConfigMaterialMedication configMaterialMedication) { + configMaterialMedicationService.editQyty(configMaterialMedication); + return Result.OK("操作成功!"); + } + + + @AutoLog(value = "物料用药类型-迁移") + @ApiOperation(value="物料用药类型-迁移", notes="物料用药类型-迁移") + @RequiresPermissions("ConfigMaterial:config_material_medication:edit") + @RequestMapping(value = "/editQianyi", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result editQianyi(@RequestBody ConfigMaterialMedication configMaterialMedication) { + configMaterialMedicationService.editQianyi(configMaterialMedication); + return Result.OK("迁移成功!"); + } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialTypeController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialTypeController.java index 063336c..a03781c 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialTypeController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialTypeController.java @@ -181,4 +181,14 @@ public class ConfigMaterialTypeController extends JeecgController editQyty(@RequestBody ConfigMaterialType configMaterialType) { + configMaterialTypeService.editQyty(configMaterialType); + return Result.OK("编辑成功!"); + } + } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java index 01d76f7..cf18169 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java @@ -87,4 +87,7 @@ public class ConfigMaterialCategory implements Serializable { private Integer categoryRowSpan; @TableField(exist = false) private Integer typeRowSpan; + + @TableField(exist = false) + private Integer num; } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java index efa2ad5..34d30d9 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; import lombok.Data; @@ -80,4 +78,12 @@ public class ConfigMaterialMedication implements Serializable { /**所属部门*/ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; + + @TableField(exist = false) + private String levle;//当前所在层级 1一级 2二级 3三级 + + @TableField(exist = false) + private String qycj;//迁移至第几层 0三级 1二级 2一级 + + } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java index 5eb211c..f33a6f7 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; import lombok.Data; @@ -75,4 +73,7 @@ public class ConfigMaterialType implements Serializable { /**所属部门*/ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; + + @TableField(exist = false) + private Integer num; } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java index 7d6e58a..0a1522a 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java @@ -19,4 +19,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface ConfigMaterialCategoryMapper extends BaseMapper { IPage selectMaterialList(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List selectIssjList(); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java index 3287f1c..d1b1d27 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java @@ -2,6 +2,7 @@ package com.nu.modules.ConfigMaterial.mapper; import java.util.List; +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialCategory; import org.apache.ibatis.annotations.Param; import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ConfigMaterialInfoMapper extends BaseMapper { + void editQyty(ConfigMaterialInfo configMaterialInfo); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialMedicationMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialMedicationMapper.java index c698745..93964f4 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialMedicationMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialMedicationMapper.java @@ -14,4 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ConfigMaterialMedicationMapper extends BaseMapper { + void editQyty(ConfigMaterialMedication configMaterialMedication); + + void deleteOne(@Param("id") String id); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialTypeMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialTypeMapper.java index 7ac2b10..7845870 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialTypeMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialTypeMapper.java @@ -14,4 +14,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ConfigMaterialTypeMapper extends BaseMapper { + List selectIssjList(); + + void editQyty(ConfigMaterialType configMaterialType); + + void deleteOne(@Param("id") String id); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml index 0fee51d..7130ee8 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml @@ -20,4 +20,10 @@ order by a.sort asc,b.id asc,c.id asc ) a ${ew.customSqlSegment} + + + \ No newline at end of file diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml index 7b73c47..817bc90 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml @@ -1,5 +1,20 @@ - + + + + update nu_config_material_info set iz_enabled = #{izEnabled} + + + and category_id = #{categoryId} + + + and type_id = #{typeId} + + + and medication_id = #{medicationId} + + + \ No newline at end of file diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialMedicationMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialMedicationMapper.xml index da939af..4b17675 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialMedicationMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialMedicationMapper.xml @@ -2,4 +2,19 @@ + + update nu_config_material_medication set iz_enabled = #{izEnabled} + + + and category_id = #{categoryId} + + + and type_id = #{typeId} + + + + + delete from nu_config_material_medication where id = #{id} + + \ No newline at end of file diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialTypeMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialTypeMapper.xml index cbf9043..6a4b237 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialTypeMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialTypeMapper.xml @@ -2,4 +2,22 @@ + + + + + update nu_config_material_type set iz_enabled = #{izEnabled} + + + and category_id = #{categoryId} + + + + + delete from nu_config_material_type where id = #{id} + + \ No newline at end of file diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialCategoryService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialCategoryService.java index f04b824..9e48589 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialCategoryService.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialCategoryService.java @@ -20,4 +20,6 @@ public interface IConfigMaterialCategoryService extends IService selectMaterialList(Page page, QueryWrapper queryWrapper); List> getMaterialTreeData(ConfigMaterialCategory configMaterialCategory); + + void editQyty(ConfigMaterialCategory configMaterialCategory); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialInfoService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialInfoService.java index 553deee..072095d 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialInfoService.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialInfoService.java @@ -11,4 +11,5 @@ import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo; */ public interface IConfigMaterialInfoService extends IService { + void wlqianyi(ConfigMaterialInfo configMaterialInfo); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialMedicationService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialMedicationService.java index e5d55be..d40cf13 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialMedicationService.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialMedicationService.java @@ -11,4 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IConfigMaterialMedicationService extends IService { + void editQyty(ConfigMaterialMedication configMaterialMedication); + + void editQianyi(ConfigMaterialMedication configMaterialMedication); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialTypeService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialTypeService.java index 87ca862..e0e17e4 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialTypeService.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialTypeService.java @@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IConfigMaterialTypeService extends IService { + void editQyty(ConfigMaterialType configMaterialType); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java index 30c3f9d..b052459 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.ConfigMaterial.entity.ConfigMaterialCategory; +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo; import com.nu.modules.ConfigMaterial.entity.ConfigMaterialMedication; import com.nu.modules.ConfigMaterial.entity.ConfigMaterialType; import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialCategoryMapper; +import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialInfoMapper; import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialMedicationMapper; import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialTypeMapper; import com.nu.modules.ConfigMaterial.service.IConfigMaterialCategoryService; @@ -33,6 +35,10 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl selectMaterialList(Page page, QueryWrapper queryWrapper) { IPage pageList = baseMapper.selectMaterialList(page,queryWrapper); @@ -131,6 +137,15 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl list3 = configMaterialMedicationMapper.selectList(medicationQueryWrapper); + + //查询物料类别下是否有物料数据 + List onesjlist =baseMapper.selectIssjList(); + + //查询物料类型下是否有物料数据 + List twosjlist =configMaterialTypeMapper.selectIssjList(); + + + List> wllxMapList = new ArrayList>(); for(ConfigMaterialType par : list2){ Map wllxMap = new HashMap(); @@ -144,9 +159,18 @@ public class ConfigMaterialCategoryServiceImpl extends ServiceImpl implements IConfigMaterialInfoService { + @Override + public void wlqianyi(ConfigMaterialInfo configMaterialInfo) { + if (StringUtils.isEmpty(configMaterialInfo.getTypeId())){ + configMaterialInfo.setTypeId(""); + } + if (StringUtils.isEmpty(configMaterialInfo.getMedicationId())){ + configMaterialInfo.setMedicationId( ""); + } + baseMapper.updateById(configMaterialInfo); + } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialMedicationServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialMedicationServiceImpl.java index d271c99..a0f24ef 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialMedicationServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialMedicationServiceImpl.java @@ -1,12 +1,26 @@ package com.nu.modules.ConfigMaterial.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialCategory; +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo; import com.nu.modules.ConfigMaterial.entity.ConfigMaterialMedication; +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialType; +import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialCategoryMapper; +import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialInfoMapper; import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialMedicationMapper; +import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialTypeMapper; import com.nu.modules.ConfigMaterial.service.IConfigMaterialMedicationService; +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.jeecg.common.system.vo.LoginUser; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.Date; +import java.util.List; + /** * @Description: 物料用药类型 * @Author: jeecg-boot @@ -16,4 +30,216 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ConfigMaterialMedicationServiceImpl extends ServiceImpl implements IConfigMaterialMedicationService { + + @Autowired + public ConfigMaterialInfoMapper configMaterialInfoMapper; + + @Autowired + public ConfigMaterialTypeMapper configMaterialTypeMapper; + + @Autowired + public ConfigMaterialCategoryMapper configMaterialCategoryMapper; + + @Override + public void editQyty(ConfigMaterialMedication configMaterialMedication) { + baseMapper.updateById(configMaterialMedication); + + ConfigMaterialInfo configMaterialInfo = new ConfigMaterialInfo(); + configMaterialInfo.setMedicationId(configMaterialMedication.getId()); + configMaterialInfo.setIzEnabled(configMaterialMedication.getIzEnabled()); + configMaterialInfoMapper.editQyty(configMaterialInfo); + } + + @Override + public void editQianyi(ConfigMaterialMedication configMaterialMedication) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(StringUtils.equals("2",configMaterialMedication.getLevle())){//当前层级 二级 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id",configMaterialMedication.getId()); + ConfigMaterialType configMaterialType = configMaterialTypeMapper.selectOne(queryWrapper); + configMaterialTypeMapper.deleteOne(configMaterialType.getId());//先删除当前分类信息 + + QueryWrapper wlqueryWrapper = new QueryWrapper<>(); + wlqueryWrapper.eq("type_id",configMaterialType.getId()); + List wllist = configMaterialInfoMapper.selectList(wlqueryWrapper); + + if(StringUtils.equals("0",configMaterialMedication.getQycj())){//迁移层级 0三级 + //插入三级分类信息 + ConfigMaterialMedication configMaterialMedication3 = new ConfigMaterialMedication(); + configMaterialMedication3.setId(configMaterialMedication.getId()); + configMaterialMedication3.setCategoryId(configMaterialMedication.getCategoryId()); + configMaterialMedication3.setTypeId(configMaterialMedication.getTypeId()); + configMaterialMedication3.setMedicationName(configMaterialType.getTypeName()); + configMaterialMedication3.setCreateBy(configMaterialType.getCreateBy()); + configMaterialMedication3.setCreateTime(configMaterialType.getCreateTime()); + configMaterialMedication3.setUpdateBy(loginUser.getRealname()); + configMaterialMedication3.setUpdateTime(new Date()); + configMaterialMedication3.setIzEnabled(configMaterialType.getIzEnabled()); + configMaterialMedication3.setDelFlag("0"); + configMaterialMedication3.setSysOrgCode(configMaterialType.getSysOrgCode()); + baseMapper.insert(configMaterialMedication3); + + for(ConfigMaterialInfo par : wllist){ + par.setCategoryId(configMaterialMedication.getCategoryId()); + par.setTypeId(configMaterialMedication.getTypeId()); + par.setMedicationId(configMaterialMedication.getId()); + configMaterialInfoMapper.updateById(par); + } + + + }else if (StringUtils.equals("1",configMaterialMedication.getQycj())){//迁移层级 1二级 + //添加二级分类信息 + ConfigMaterialType configMaterialType2 = new ConfigMaterialType(); + configMaterialType2.setCategoryId(configMaterialMedication.getCategoryId()); + configMaterialType2.setId(configMaterialMedication.getId()); + configMaterialType2.setTypeName(configMaterialType.getTypeName()); + configMaterialType2.setIzEnabled(configMaterialType.getIzEnabled()); + configMaterialType2.setCreateBy(configMaterialType.getCreateBy()); + configMaterialType2.setCreateTime(configMaterialType.getCreateTime()); + configMaterialType2.setDelFlag("0"); + configMaterialType2.setSysOrgCode(configMaterialType.getSysOrgCode()); + configMaterialType2.setUpdateBy(loginUser.getRealname()); + configMaterialType2.setUpdateTime(new Date()); + configMaterialTypeMapper.insert(configMaterialType2); + + //查询当前分类下的所有三级分类 + QueryWrapper queryWrapper2 = new QueryWrapper<>(); + queryWrapper2.eq("type_id",configMaterialType.getId()); + List list = baseMapper.selectList(queryWrapper2); + for(ConfigMaterialMedication par : list){ + par.setTypeId(configMaterialMedication.getId()); + par.setCategoryId(configMaterialMedication.getCategoryId()); + baseMapper.updateById(par); + } + + + for(ConfigMaterialInfo par : wllist){ + par.setCategoryId(configMaterialMedication.getCategoryId()); + par.setTypeId(configMaterialMedication.getId()); + par.setMedicationId(""); + configMaterialInfoMapper.updateById(par); + } + + }else if (StringUtils.equals("2",configMaterialMedication.getQycj())) {//迁移层级 2一级 + //添加一级分类信息 + ConfigMaterialCategory configMaterialCategory = new ConfigMaterialCategory(); + configMaterialCategory.setId(configMaterialMedication.getId()); + configMaterialCategory.setCategoryName(configMaterialType.getTypeName()); + configMaterialCategory.setCreateBy(configMaterialType.getCreateBy()); + configMaterialCategory.setCreateTime(configMaterialType.getCreateTime()); + configMaterialCategory.setUpdateBy(loginUser.getRealname()); + configMaterialCategory.setUpdateTime(new Date()); + configMaterialCategory.setIzEnabled(configMaterialType.getIzEnabled()); + configMaterialCategory.setDelFlag("0"); + configMaterialCategory.setSysOrgCode(configMaterialType.getSysOrgCode()); + configMaterialCategoryMapper.insert(configMaterialCategory); + //查询当前分类下的所有三级分类 + QueryWrapper queryWrapper2 = new QueryWrapper<>(); + queryWrapper2.eq("type_id",configMaterialType.getId()); + List list = baseMapper.selectList(queryWrapper2); + for(ConfigMaterialMedication par : list){ + baseMapper.deleteOne(par.getId());//删除三级分类信息并插入二级分类信息 + ConfigMaterialType configMaterialType1 = new ConfigMaterialType(); + configMaterialType1.setId(par.getId()); + configMaterialType1.setCategoryId(configMaterialMedication.getId()); + configMaterialType1.setTypeName(par.getMedicationName()); + configMaterialType1.setIzEnabled(par.getIzEnabled()); + configMaterialType1.setCreateBy(par.getCreateBy()); + configMaterialType1.setCreateTime(par.getCreateTime()); + configMaterialType1.setDelFlag("0"); + configMaterialType1.setSysOrgCode(par.getSysOrgCode()); + configMaterialType1.setUpdateBy(loginUser.getRealname()); + configMaterialType1.setUpdateTime(new Date()); + configMaterialTypeMapper.insert(configMaterialType1); + } + + + for(ConfigMaterialInfo par : wllist){ + par.setCategoryId(configMaterialMedication.getId()); + par.setTypeId(""); + par.setMedicationId(""); + configMaterialInfoMapper.updateById(par); + } + } + + }else if(StringUtils.equals("3",configMaterialMedication.getLevle())){//当前层级 三级 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id",configMaterialMedication.getId()); + ConfigMaterialMedication configMaterialMedication1 = baseMapper.selectOne(queryWrapper); + baseMapper.deleteOne(configMaterialMedication.getId());//先删除当前分类信息 + + + + QueryWrapper wlqueryWrapper = new QueryWrapper<>(); + wlqueryWrapper.eq("medication_id",configMaterialMedication1.getId()); + List wllist = configMaterialInfoMapper.selectList(wlqueryWrapper); + + if(StringUtils.equals("0",configMaterialMedication.getQycj())) {//迁移层级 0三级 + //插入三级分类信息 + ConfigMaterialMedication configMaterialMedication2 = new ConfigMaterialMedication(); + configMaterialMedication2.setCategoryId(configMaterialMedication.getCategoryId()); + configMaterialMedication2.setTypeId(configMaterialMedication.getTypeId()); + configMaterialMedication2.setId(configMaterialMedication.getId()); + configMaterialMedication2.setMedicationName(configMaterialMedication1.getMedicationName()); + configMaterialMedication2.setCreateBy(configMaterialMedication1.getCreateBy()); + configMaterialMedication2.setCreateTime(configMaterialMedication1.getCreateTime()); + configMaterialMedication2.setIzEnabled(configMaterialMedication1.getIzEnabled()); + configMaterialMedication2.setDelFlag("0"); + configMaterialMedication2.setUpdateBy(loginUser.getRealname()); + configMaterialMedication2.setUpdateTime(new Date()); + baseMapper.insert(configMaterialMedication2); + + for(ConfigMaterialInfo par : wllist){ + par.setCategoryId(configMaterialMedication.getCategoryId()); + par.setTypeId(configMaterialMedication.getTypeId()); + par.setMedicationId(configMaterialMedication.getId()); + configMaterialInfoMapper.updateById(par); + } + + }else if (StringUtils.equals("1",configMaterialMedication.getQycj())){//迁移层级 1二级 + ConfigMaterialType configMaterialType = new ConfigMaterialType(); + //添加二级分类信息 + configMaterialType.setCategoryId(configMaterialMedication.getCategoryId()); + configMaterialType.setId(configMaterialMedication.getId()); + configMaterialType.setTypeName(configMaterialMedication1.getMedicationName()); + configMaterialType.setCreateBy(configMaterialMedication1.getCreateBy()); + configMaterialType.setCreateTime(configMaterialMedication1.getCreateTime()); + configMaterialType.setIzEnabled(configMaterialMedication1.getIzEnabled()); + configMaterialType.setDelFlag("0"); + configMaterialType.setUpdateBy(loginUser.getRealname()); + configMaterialType.setUpdateTime(new Date()); + configMaterialType.setSysOrgCode(configMaterialMedication1.getSysOrgCode()); + configMaterialTypeMapper.insert(configMaterialType); + + for(ConfigMaterialInfo par : wllist){ + par.setCategoryId(configMaterialMedication.getCategoryId()); + par.setTypeId(configMaterialMedication.getId()); + par.setMedicationId(""); + configMaterialInfoMapper.updateById(par); + } + + } else if (StringUtils.equals("2",configMaterialMedication.getQycj())){//迁移层级 2一级 + //添加一级分类信息 + ConfigMaterialCategory configMaterialCategory = new ConfigMaterialCategory(); + configMaterialCategory.setId(configMaterialMedication.getId()); + configMaterialCategory.setCategoryName(configMaterialMedication1.getMedicationName()); + configMaterialCategory.setCreateBy(configMaterialMedication1.getCreateBy()); + configMaterialCategory.setCreateTime(configMaterialMedication1.getCreateTime()); + configMaterialCategory.setUpdateBy(loginUser.getRealname()); + configMaterialCategory.setUpdateTime(new Date()); + configMaterialCategory.setIzEnabled(configMaterialMedication1.getIzEnabled()); + configMaterialCategory.setDelFlag("0"); + configMaterialCategory.setSysOrgCode(configMaterialMedication1.getSysOrgCode()); + configMaterialCategoryMapper.insert(configMaterialCategory); + + for(ConfigMaterialInfo par : wllist){ + par.setCategoryId(configMaterialMedication.getId()); + par.setTypeId(""); + par.setMedicationId(""); + configMaterialInfoMapper.updateById(par); + } + + } + } + } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialTypeServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialTypeServiceImpl.java index 25e241d..765a069 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialTypeServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialTypeServiceImpl.java @@ -1,8 +1,13 @@ package com.nu.modules.ConfigMaterial.service.impl; +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo; +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialMedication; import com.nu.modules.ConfigMaterial.entity.ConfigMaterialType; +import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialInfoMapper; +import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialMedicationMapper; import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialTypeMapper; import com.nu.modules.ConfigMaterial.service.IConfigMaterialTypeService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,4 +21,29 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ConfigMaterialTypeServiceImpl extends ServiceImpl implements IConfigMaterialTypeService { + @Autowired + public ConfigMaterialTypeMapper configMaterialTypeMapper; + + @Autowired + public ConfigMaterialMedicationMapper configMaterialMedicationMapper; + + + @Autowired + public ConfigMaterialInfoMapper configMaterialInfoMapper; + @Override + public void editQyty(ConfigMaterialType configMaterialType) { + + configMaterialTypeMapper.updateById(configMaterialType); + + ConfigMaterialMedication configMaterialMedication = new ConfigMaterialMedication(); + configMaterialMedication.setTypeId(configMaterialType.getId()); + configMaterialMedication.setIzEnabled(configMaterialType.getIzEnabled()); + configMaterialMedicationMapper.editQyty(configMaterialMedication); + + + ConfigMaterialInfo configMaterialInfo = new ConfigMaterialInfo(); + configMaterialInfo.setTypeId(configMaterialType.getId()); + configMaterialInfo.setIzEnabled(configMaterialType.getIzEnabled()); + configMaterialInfoMapper.editQyty(configMaterialInfo); + } }