diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java index 8add0ce4..e833b1ad 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java @@ -250,4 +250,14 @@ public class InvoicingApi { return Result.OK(pageList); } + + @ApiOperation(value = "查询全部供应商信息", notes = "查询全部供应商信息") + @AutoLog(value = "查询全部供应商信息") + @GetMapping(value = "/getGysList") + public Result>> getGysList(MaterialInfoEntity materialInfoEntityDto, + HttpServletRequest req) { + List> pageList = invoicingApi.getGysList(materialInfoEntityDto,req); + return Result.OK(pageList); + } + } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/qingling/api/QinglingApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/qingling/api/QinglingApi.java new file mode 100644 index 00000000..09c8f1da --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/qingling/api/QinglingApi.java @@ -0,0 +1,69 @@ +package com.nu.modules.pad.qingling.api; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nu.entity.*; +import com.nu.modules.invoicing.api.IInvoicingApi; +import com.nu.modules.invoicing.api.IQinglingApi; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang.StringUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/api/pad/qingling") +public class QinglingApi { + + + @Autowired + private IQinglingApi qinglingApi; + + @ApiOperation(value = "查询请领包下的信息", notes = "查询请领包下的信息") + @GetMapping(value = "/queryPackageList") + public Result> queryPackageList(MaterialInfoEntity materialInfoEntityDto, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = qinglingApi.queryPackageList(pageNo, pageSize, materialInfoEntityDto,req); + return Result.OK(pageList); + } + + + @ApiOperation(value = "查询请领包可请领的物料信息", notes = "查询请领包可请领的物料信息") + @GetMapping(value = "/queryWuliaoList") + public Result> queryWuliaoList(MaterialInfoEntity materialInfoEntityDto, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = qinglingApi.queryWuliaoList(pageNo, pageSize, materialInfoEntityDto,req); + return Result.OK(pageList); + } + + + @ApiOperation(value="请领包物料添加", notes="请领包物料添加") + @AutoLog(value = "请领包物料添加") + @PostMapping(value = "/addMaterialPackageList") + public Result addMaterialPackageList(@RequestBody List infoList) { + if (infoList == null || infoList.size() == 0){ + return Result.error("请选择要添加的物料！"); + } + String result = qinglingApi.addMaterialPackageList(infoList); + return Result.OK("添加成功！"); + } + + + @AutoLog(value = "通过id删除请购信息") + @ApiOperation(value="通过id删除请购信息", notes="通过id删除请购信息") + @DeleteMapping(value = "/deletePackageById") + public Result deletePackageById(@RequestParam(name="id",required=true) String id) { + qinglingApi.deletePackageById(id); + return Result.OK("删除成功!"); + } + + +} diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 9668cdb7..1b241c0a 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -91,7 +91,8 @@ public class ShiroConfig { } filterChainDefinitionMap.put("/api/tplink/videoStorage/**", "anon"); //视频缓存存储接口 -// filterChainDefinitionMap.put("/api/pad/invoicing/**", "anon"); //测试进销存对应的接口 + filterChainDefinitionMap.put("/api/pad/invoicing/**", "anon"); //测试进销存对应的接口 + filterChainDefinitionMap.put("/api/pad/qingling/**", "anon"); //测试请领对应的接口 filterChainDefinitionMap.put("/iot/tq/api/electricityMeter/**", "anon"); //电表回调 filterChainDefinitionMap.put("/api/pad/baseInfo/**", "anon"); //电表回调 filterChainDefinitionMap.put("/iot/tq/api/waterMeter/**", "anon"); //水表回调 diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java index 7e0ca76b..78a20395 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java @@ -82,4 +82,5 @@ public class CgdMainEntity implements Serializable { private String cgdParamInfo; private List cgdInfoList; + private String suppliers; } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/MaterialCategoryEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/MaterialCategoryEntity.java index 772c50d5..c971daa7 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/MaterialCategoryEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/MaterialCategoryEntity.java @@ -62,6 +62,7 @@ public class MaterialCategoryEntity implements Serializable { private Integer num; private String nuId; private String cgdId; + private String suppliers; private java.lang.String appIconPath; private java.lang.String appCheckIconPath; diff --git a/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java index e1cb78ac..b84ff9ad 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java @@ -125,4 +125,5 @@ public class MaterialInfoEntity implements Serializable { private String typeName; private String medicationName; private String isAdd; + private String delId; } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/MaterialPackageEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/MaterialPackageEntity.java new file mode 100644 index 00000000..095aa620 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/MaterialPackageEntity.java @@ -0,0 +1,45 @@ +package com.nu.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + +/** + * @Description: 护理单元请领包 + * @Author: jeecg-boot + * @Date: 2025-11-12 + * @Version: V1.0 + */ +@Data +public class MaterialPackageEntity implements Serializable { + + /**id*/ + private String id; + /**createBy*/ + private String createBy; + /**createTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.util.Date createTime; + /**updateBy*/ + @ApiModelProperty(value = "updateBy") + private String updateBy; + /**updateTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.util.Date updateTime; + /**护理单元*/ + private String nuId; + /**物料*/ + private String wlId; +} diff --git a/nursing-unit-common/src/main/java/com/nu/entity/QgdInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/QgdInfoEntity.java index f420d17a..ddfe836a 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/QgdInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/QgdInfoEntity.java @@ -84,5 +84,6 @@ public class QgdInfoEntity implements Serializable { private String materialImg; private String tagType; private String tagName; + private String suppliers; } diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java index aa2ebd1d..96515321 100644 --- a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java @@ -56,4 +56,6 @@ public interface IInvoicingApi { Map getCgdTreeDataWlnum(MaterialCategoryEntity configMaterialCategory); String eddShoppingCartList(QgdInfoEntity qgdInfoEntity); + + List> getGysList(MaterialInfoEntity materialInfoEntityDto, HttpServletRequest req); } diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IQinglingApi.java b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IQinglingApi.java new file mode 100644 index 00000000..4517a58a --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IQinglingApi.java @@ -0,0 +1,18 @@ +package com.nu.modules.invoicing.api; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nu.entity.MaterialInfoEntity; +import com.nu.entity.MaterialPackageEntity; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +public interface IQinglingApi { + IPage queryPackageList(Integer pageNo, Integer pageSize, MaterialInfoEntity materialInfoEntityDto, HttpServletRequest req); + + String addMaterialPackageList(List infoList); + + void deletePackageById(String id); + + IPage queryWuliaoList(Integer pageNo, Integer pageSize, MaterialInfoEntity materialInfoEntityDto, HttpServletRequest req); +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/pom.xml b/nursing-unit-invoicing/nu-invoicing-biz/pom.xml index 911b56fc..9454c98f 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/pom.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/pom.xml @@ -43,6 +43,18 @@ 2.0.0 compile + + com.nursingunit.boot + nu-admin-local-api + 2.0.0 + compile + + + com.nursingunit.boot + nu-admin-local-api + 2.0.0 + compile + diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index b0bf9b9d..fb388034 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -170,6 +170,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl page = new Page(pageNo, pageSize); List list = qgdInfoMapper.queryShoppingCartList(page, queryWrapper); //封装返回结果 @@ -401,6 +403,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl customeRuleMap = new HashMap<>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingCgdMain, req.getParameterMap(), customeRuleMap); queryWrapper.apply(StringUtils.isNotBlank(cgdMainEntityDto.getCgdParamInfo()),"(cgd_no like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or gys_name like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or qg_by like '%"+cgdMainEntityDto.getCgdParamInfo()+"%' or gys_lxr like '%"+cgdMainEntityDto.getCgdParamInfo()+"%')"); + queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getSuppliers()),"gys_id",cgdMainEntityDto.getSuppliers()); Page page = new Page<>(pageNo, pageSize); List list = cgdMainMapper.selectList(page,queryWrapper); IPage entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); @@ -552,6 +555,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl list = configMaterialInfoMapper.getTreeDataWlnum(queryWrapper); map.put("success",true); map.put("message","物料数量"); @@ -577,6 +581,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl list = configMaterialInfoMapper.getGwcTreeDataWlnum(queryWrapper); map.put("success",true); map.put("message","物料数量"); @@ -598,6 +603,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl list = configMaterialInfoMapper.getCgdTreeDataWlnum(queryWrapper); map.put("success",true); map.put("message","物料数量"); @@ -634,4 +640,17 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl> getGysList(MaterialInfoEntity materialInfoEntityDto, HttpServletRequest req) { + List gysList = gysMapper.selectList(new QueryWrapper().eq("del_flag","0")); + List> list = new ArrayList<>(); + for(ConfigSuppliersInfo gys : gysList){ + Map map = new HashMap<>(); + map.put("suppliers",gys.getId()); + map.put("suppliersName",gys.getSuppliersName()); + list.add(map); + } + return list; + } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qingling/controller/NuConfigMaterialPackageController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qingling/controller/NuConfigMaterialPackageController.java new file mode 100644 index 00000000..d47a9995 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qingling/controller/NuConfigMaterialPackageController.java @@ -0,0 +1,163 @@ +package com.nu.modules.qingling.controller; + +import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import com.nu.modules.qingling.entity.NuConfigMaterialPackage; +import com.nu.modules.qingling.service.INuConfigMaterialPackageService; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; + +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.apache.shiro.authz.annotation.RequiresPermissions; + + /** + * @Description: 护理单元请领包 + * @Author: jeecg-boot + * @Date: 2025-11-12 + * @Version: V1.0 + */ +@Api(tags="护理单元请领包") +@RestController +@RequestMapping("/qinggou/nuConfigMaterialPackage") +@Slf4j +public class NuConfigMaterialPackageController extends JeecgController { + @Autowired + private INuConfigMaterialPackageService nuConfigMaterialPackageService; + + /** + * 分页列表查询 + * + * @param nuConfigMaterialPackage + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "护理单元请领包-分页列表查询") + @ApiOperation(value="护理单元请领包-分页列表查询", notes="护理单元请领包-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(NuConfigMaterialPackage nuConfigMaterialPackage, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuConfigMaterialPackage, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuConfigMaterialPackageService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param nuConfigMaterialPackage + * @return + */ + @AutoLog(value = "护理单元请领包-添加") + @ApiOperation(value="护理单元请领包-添加", notes="护理单元请领包-添加") + @RequiresPermissions("qinggou:nu_config_material_package:add") + @PostMapping(value = "/add") + public Result add(@RequestBody NuConfigMaterialPackage nuConfigMaterialPackage) { + nuConfigMaterialPackageService.save(nuConfigMaterialPackage); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param nuConfigMaterialPackage + * @return + */ + @AutoLog(value = "护理单元请领包-编辑") + @ApiOperation(value="护理单元请领包-编辑", notes="护理单元请领包-编辑") + @RequiresPermissions("qinggou:nu_config_material_package:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody NuConfigMaterialPackage nuConfigMaterialPackage) { + nuConfigMaterialPackageService.updateById(nuConfigMaterialPackage); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "护理单元请领包-通过id删除") + @ApiOperation(value="护理单元请领包-通过id删除", notes="护理单元请领包-通过id删除") + @RequiresPermissions("qinggou:nu_config_material_package:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + nuConfigMaterialPackageService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "护理单元请领包-批量删除") + @ApiOperation(value="护理单元请领包-批量删除", notes="护理单元请领包-批量删除") + @RequiresPermissions("qinggou:nu_config_material_package:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.nuConfigMaterialPackageService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "护理单元请领包-通过id查询") + @ApiOperation(value="护理单元请领包-通过id查询", notes="护理单元请领包-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + NuConfigMaterialPackage nuConfigMaterialPackage = nuConfigMaterialPackageService.getById(id); + if(nuConfigMaterialPackage==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(nuConfigMaterialPackage); + } + + /** + * 导出excel + * + * @param request + * @param nuConfigMaterialPackage + */ + @RequiresPermissions("qinggou:nu_config_material_package:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, NuConfigMaterialPackage nuConfigMaterialPackage) { + return super.exportXls(request, nuConfigMaterialPackage, NuConfigMaterialPackage.class, "护理单元请领包"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("qinggou:nu_config_material_package:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, NuConfigMaterialPackage.class); + } + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qingling/entity/NuConfigMaterialPackage.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qingling/entity/NuConfigMaterialPackage.java new file mode 100644 index 00000000..90cb7657 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qingling/entity/NuConfigMaterialPackage.java @@ -0,0 +1,59 @@ +package com.nu.modules.qingling.entity; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 护理单元请领包 + * @Author: jeecg-boot + * @Date: 2025-11-12 + * @Version: V1.0 + */ +@Data +@TableName("nu_config_material_package") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_config_material_package对象", description="护理单元请领包") +public class NuConfigMaterialPackage implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**createBy*/ + @ApiModelProperty(value = "createBy") + private java.lang.String createBy; + /**createTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "createTime") + private java.util.Date createTime; + /**updateBy*/ + @ApiModelProperty(value = "updateBy") + private java.lang.String updateBy; + /**updateTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "updateTime") + private java.util.Date updateTime; + /**护理单元*/ + @Excel(name = "护理单元", width = 15) + @ApiModelProperty(value = "护理单元") + private java.lang.String nuId; + /**物料*/ + @Excel(name = "物料", width = 15) + @ApiModelProperty(value = "物料") + private java.lang.String wlId; +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qingling/mapper/NuConfigMaterialPackageMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qingling/mapper/NuConfigMaterialPackageMapper.java new file mode 100644 index 00000000..a6c31b86 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qingling/mapper/NuConfigMaterialPackageMapper.java @@ -0,0 +1,28 @@ +package com.nu.modules.qingling.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.nu.entity.MaterialInfoEntity; +import com.nu.entity.MaterialPackageEntity; +import com.nu.modules.qingling.entity.NuConfigMaterialPackage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.jeecg.common.constant.CommonConstant; + +import java.util.List; + +/** + * @Description: 护理单元请领包 + * @Author: jeecg-boot + * @Date: 2025-11-12 + * @Version: V1.0 + */ +public interface NuConfigMaterialPackageMapper extends BaseMapper { + + IPage queryPackageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + String addMaterialPackageList(List infoList); + + IPage queryWuliaoList(IPage page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qingling/mapper/xml/NuConfigMaterialPackageMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qingling/mapper/xml/NuConfigMaterialPackageMapper.xml new file mode 100644 index 00000000..70419929 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qingling/mapper/xml/NuConfigMaterialPackageMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qingling/service/INuConfigMaterialPackageService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qingling/service/INuConfigMaterialPackageService.java new file mode 100644 index 00000000..6cc37b3f --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qingling/service/INuConfigMaterialPackageService.java @@ -0,0 +1,14 @@ +package com.nu.modules.qingling.service; + +import com.nu.modules.qingling.entity.NuConfigMaterialPackage; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 护理单元请领包 + * @Author: jeecg-boot + * @Date: 2025-11-12 + * @Version: V1.0 + */ +public interface INuConfigMaterialPackageService extends IService { + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qingling/service/impl/NuConfigMaterialPackageServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qingling/service/impl/NuConfigMaterialPackageServiceImpl.java new file mode 100644 index 00000000..d7d61541 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qingling/service/impl/NuConfigMaterialPackageServiceImpl.java @@ -0,0 +1,114 @@ +package com.nu.modules.qingling.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSONObject; +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.entity.MaterialInfoEntity; +import com.nu.entity.MaterialPackageEntity; +import com.nu.modules.invoicing.api.IQinglingApi; +import com.nu.modules.qingling.entity.NuConfigMaterialPackage; +import com.nu.modules.qingling.mapper.NuConfigMaterialPackageMapper; +import com.nu.modules.qingling.service.INuConfigMaterialPackageService; +import com.nu.modules.sysconfig.ISysConfigApi; +import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * @Description: 护理单元请领包 + * @Author: jeecg-boot + * @Date: 2025-11-12 + * @Version: V1.0 + */ +@Service +public class NuConfigMaterialPackageServiceImpl extends ServiceImpl implements INuConfigMaterialPackageService, IQinglingApi { + + @Autowired + private ISysConfigApi sysConfigApi; + + private String serverNetUrl; + @Override + public IPage queryPackageList(Integer pageNo, Integer pageSize, MaterialInfoEntity materialInfoEntityDto, HttpServletRequest req) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("a.nu_id", materialInfoEntityDto.getNuId()); + queryWrapper.apply(StringUtils.isNotBlank(materialInfoEntityDto.getWlParamInfo()),"( b.material_name like '%"+materialInfoEntityDto.getWlParamInfo()+"%' or b.material_no like '%"+materialInfoEntityDto.getWlParamInfo()+"%' or b.pinyin like '%"+materialInfoEntityDto.getWlParamInfo()+"%' or b.specification_model like '%"+materialInfoEntityDto.getWlParamInfo()+"%' ) "); + + Page page = new Page<>(pageNo, pageSize); + IPage pageList = baseMapper.queryPackageList(page, queryWrapper); + pageList.getRecords().forEach(info -> { + if (info.getMaterialImg() != null){ + info.setMaterialImg(getImageNetUrl(info.getMaterialImg())); + } + }); + return pageList; + } + + @Override + public String addMaterialPackageList(List infoList) { + List addList = BeanUtil.copyToList(infoList, NuConfigMaterialPackage.class); + for(NuConfigMaterialPackage info:addList){ + baseMapper.insert(info); + } + return "1"; + } + + @Override + public void deletePackageById(String id) { + if (id.indexOf(",")>-1){ + for (String param : id.split(",")){ + baseMapper.deleteById(param); + } + } + } + + @Override + public IPage queryWuliaoList(Integer pageNo, Integer pageSize, MaterialInfoEntity materialInfoEntityDto, HttpServletRequest req) { + QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.ne("a.nu_id", materialInfoEntityDto.getNuId()); + queryWrapper.apply(" (a.nu_id IS NULL OR a.nu_id <> '"+materialInfoEntityDto.getNuId()+"') "); + queryWrapper.eq("b.del_flag","0"); + queryWrapper.apply(StringUtils.isNotBlank(materialInfoEntityDto.getWlParamInfo()),"( b.material_name like '%"+materialInfoEntityDto.getWlParamInfo()+"%' or b.material_no like '%"+materialInfoEntityDto.getWlParamInfo()+"%' or b.pinyin like '%"+materialInfoEntityDto.getWlParamInfo()+"%' or b.specification_model like '%"+materialInfoEntityDto.getWlParamInfo()+"%' ) "); + + Page page = new Page<>(pageNo, pageSize); + IPage pageList = baseMapper.queryWuliaoList(page, queryWrapper); + pageList.getRecords().forEach(info -> { + if (info.getMaterialImg() != null){ + info.setMaterialImg(getImageNetUrl(info.getMaterialImg())); + } + }); + return pageList; + } + + + + /** + * 获取管理平台静态资源路径 + * + * @return + */ + private void getOpeMediaAddress() { + if (serverNetUrl == null || serverNetUrl.equals("")) { + JSONObject json = sysConfigApi.getByKey("ope_media_address"); + if (json != null) { + String configValue = json.getString("configValue"); + if (!configValue.endsWith("/")) { + configValue += "/"; + } + serverNetUrl = configValue; + } + } + } + + private String getImageNetUrl(String imageUrl) { + getOpeMediaAddress(); + return serverNetUrl + imageUrl; + } +}