From 0b1d72c0ddbffd353d601767214a7c0051fee876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Sat, 11 Oct 2025 17:43:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4:1?= =?UTF-8?q?=E3=80=81=E5=88=86=E7=B1=BB=E6=A0=87=E7=AD=BE=E5=8A=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=EF=BC=8C2=E3=80=81=E7=B1=BB=E5=88=AB=E3=80=81=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E3=80=81=E5=8A=A8=E6=80=81=E5=9B=BE=E7=89=87=E7=BB=84=EF=BC=8C?= =?UTF-8?q?3=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E6=A0=91?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E5=9C=B0=E5=9D=80=E3=80=81=E7=BD=91=E7=BB=9C=E6=A0=87?= =?UTF-8?q?=E8=AF=86=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NuConfigServiceCategoryController.java | 2 +- .../entity/NuConfigServiceCategory.java | 13 +++ .../entity/NuConfigServiceDirective.java | 11 +- .../entity/NuConfigServiceType.java | 9 ++ .../entity/NuInstructionTag.java | 83 +++++++++++++ .../mapper/NuInstructionTagMapper.java | 15 +++ .../xml/NuConfigServiceDirectiveMapper.xml | 2 + .../mapper/xml/NuInstructionTagMapper.xml | 5 + .../service/INuInstructionTagService.java | 14 +++ .../NuConfigServiceCategoryServiceImpl.java | 110 ++++++++++++++++-- .../impl/NuInstructionTagServiceImpl.java | 18 +++ .../main/java/com/nu/dto/CategoryMQDto.java | 5 + .../java/com/nu/dto/InstructionTagMQDto.java | 4 + .../instructiontag/entity/InstructionTag.java | 4 + .../ConfigServiceCategoryController.java | 16 +++ .../entity/ConfigServiceCategory.java | 9 ++ .../IConfigServiceCategoryService.java | 1 + .../ConfigServiceCategoryServiceImpl.java | 10 ++ .../ConfigServiceTypeController.java | 16 +++ .../servicetype/entity/ConfigServiceType.java | 9 ++ .../listener/DirectiveMQListener.java | 6 + 21 files changed, 350 insertions(+), 12 deletions(-) create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuInstructionTag.java create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuInstructionTagMapper.java create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuInstructionTagMapper.xml create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuInstructionTagService.java create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuInstructionTagServiceImpl.java diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/controller/NuConfigServiceCategoryController.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/controller/NuConfigServiceCategoryController.java index b9bb40e6..bb0de0bc 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/controller/NuConfigServiceCategoryController.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/controller/NuConfigServiceCategoryController.java @@ -27,7 +27,7 @@ public class NuConfigServiceCategoryController extends JeecgController { + +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml index e982fd77..28e40ce4 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml @@ -26,6 +26,8 @@ csd.sys_org_code, csd.mp3_file, csd.mp4_file, + csd.immediate_file as immediateFile, + csd.immediate_file_focus as immediateFileFocus, cdt.tag_name as bodyTagName, cet.tag_name AS emotionTagName FROM nu_config_service_directive csd diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuInstructionTagMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuInstructionTagMapper.xml new file mode 100644 index 00000000..0ee76143 --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuInstructionTagMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuInstructionTagService.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuInstructionTagService.java new file mode 100644 index 00000000..e58c5287 --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuInstructionTagService.java @@ -0,0 +1,14 @@ +package com.nu.modules.nuApiServiceCategory.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.nuApiServiceCategory.entity.NuInstructionTag; + +/** + * @Description: 分类标签 + * @Author: caolei + * @Date: 2025-10-11 + * @Version: V1.0 + */ +public interface INuInstructionTagService extends IService { + +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java index cbccb059..e766f827 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java @@ -1,14 +1,18 @@ package com.nu.modules.nuApiServiceCategory.service.impl; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceCategory; import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceDirective; import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceType; +import com.nu.modules.nuApiServiceCategory.entity.NuInstructionTag; import com.nu.modules.nuApiServiceCategory.mapper.NuConfigServiceCategoryMapper; import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceCategoryService; import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceDirectiveService; import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceTypeService; +import com.nu.modules.nuApiServiceCategory.service.INuInstructionTagService; +import com.nu.modules.sysconfig.ISysConfigApi; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,12 +31,27 @@ import java.util.Map; @Service public class NuConfigServiceCategoryServiceImpl extends ServiceImpl implements INuConfigServiceCategoryService { + @Autowired + private INuInstructionTagService nuInstructionTagService; @Autowired private INuConfigServiceTypeService nuConfigServiceTypeService; @Autowired private INuConfigServiceDirectiveService nuConfigServiceDirectiveService; + @Autowired + private ISysConfigApi sysConfigApi; + @Override public List> getServiceTree(NuConfigServiceCategory nuConfigServiceCategory) { + //查询护理类服务 + QueryWrapper instructionTagQueryWrapper = new QueryWrapper<>(); + instructionTagQueryWrapper.eq("iz_enabled","0"); + instructionTagQueryWrapper.eq("del_flag","0"); + instructionTagQueryWrapper.eq("instruction_type","1"); + List instructionTagList = nuInstructionTagService.list(instructionTagQueryWrapper); + Map tagMap = new HashMap(); + for(NuInstructionTag par : instructionTagList){ + tagMap.put(par.getId(),par.getInstructionName()); + } //查询服务类别数据 QueryWrapper categoryQueryWrapper = new QueryWrapper<>(); @@ -59,19 +78,39 @@ public class NuConfigServiceCategoryServiceImpl extends ServiceImpl directiceMap = new HashMap(); directiceMap.put("id",directicePar.getId()); - directiceMap.put("levle","3"); directiceMap.put("title",directicePar.getDirectiveName()); directiceMap.put("serviceDuration",directicePar.getServiceDuration()); directiceMap.put("tagName",directicePar.getBodyTagName()); - directiceMap.put("bodyTagName",directicePar.getBodyTagName()); - directiceMap.put("emotionTagName",directicePar.getEmotionTagName()); directiceMap.put("cycleType",directicePar.getCycleType()); + if(directicePar.getImmediateFile()!=null){ + String immediateFile = getImageNetUrl(directicePar.getImmediateFile()); + directiceMap.put("immediateFile",immediateFile); + }else{ + directiceMap.put("immediateFile",""); + } + if(directicePar.getImmediateFileFocus()!=null){ + String immediateFileFocus = getImageNetUrl(directicePar.getImmediateFileFocus()); + directiceMap.put("immediateFileFocus",immediateFileFocus); + }else{ + directiceMap.put("immediateFileFocus",""); + } + directiceMap.put("levle","3"); directiceMapList.add(directiceMap); } } wllxMap.put("key",par.getId()); wllxMap.put("parentId",par.getCategoryId()); wllxMap.put("title",par.getTypeName()); + wllxMap.put("netFlag",par.getNetFlag()); + List imagePaths = new ArrayList<>(); + if(par.getStaticPath()!=null){ + String staticPath = getImageNetUrl(par.getStaticPath()); + imagePaths.add(staticPath); + } + if(par.getAnimationPath()!=null){ + getImageNetUrls(imagePaths,par.getAnimationPath()); + } + wllxMap.put("animationPath",imagePaths); wllxMap.put("levle","2"); wllxMap.put("children",directiceMapList); typeMapList.add(wllxMap); @@ -89,14 +128,65 @@ public class NuConfigServiceCategoryServiceImpl extends ServiceImpl imagePaths = new ArrayList<>(); + if(par.getStaticPath()!=null){ + String staticPath = getImageNetUrl(par.getStaticPath()); + imagePaths.add(staticPath); + } + if(par.getAnimationPath()!=null){ + getImageNetUrls(imagePaths,par.getAnimationPath()); + } + infoMap.put("animationPath",imagePaths); + infoMap.put("levle","1"); + infoMap.put("children",wllxMap2List); + treeList.add(infoMap); + } } - - return treeList; } + + /** + * 获取管理平台静态资源路径 + * @return + */ + private String getOpeMediaAddress(){ + JSONObject json = sysConfigApi.getByKey("ope_media_address"); + if(json!=null){ + String configValue = json.getString("configValue"); + if(!configValue.endsWith("/")){ + configValue += "/"; + } + return configValue; + } + return ""; + } + + private String getImageNetUrl(String imageUrl){ + String netUrl = ""; + String configValue = getOpeMediaAddress(); + if(!configValue.equals("")){ + netUrl = configValue + imageUrl; + } + return netUrl; + } + + private List getImageNetUrls(List imagePaths,String imageUrl){ + String configValue = getOpeMediaAddress(); + if(!configValue.equals("")){ + String[] urls = imageUrl.split(","); + for (String url : urls) { + if (!url.isEmpty()) { + String netUrl = configValue + url; + imagePaths.add(netUrl); + } + } + } + return imagePaths; + } + } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuInstructionTagServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuInstructionTagServiceImpl.java new file mode 100644 index 00000000..75d1f604 --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuInstructionTagServiceImpl.java @@ -0,0 +1,18 @@ +package com.nu.modules.nuApiServiceCategory.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nu.modules.nuApiServiceCategory.entity.NuInstructionTag; +import com.nu.modules.nuApiServiceCategory.mapper.NuInstructionTagMapper; +import com.nu.modules.nuApiServiceCategory.service.INuInstructionTagService; +import org.springframework.stereotype.Service; + +/** + * @Description: 分类标签 + * @Author: caolei + * @Date: 2025-10-11 + * @Version: V1.0 + */ +@Service +public class NuInstructionTagServiceImpl extends ServiceImpl implements INuInstructionTagService { + +} diff --git a/nursing-unit-common/src/main/java/com/nu/dto/CategoryMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/CategoryMQDto.java index fcccb717..b2bdc2ec 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/CategoryMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/CategoryMQDto.java @@ -42,4 +42,9 @@ public class CategoryMQDto implements Serializable { * 是否删除 0未删除 1删除 */ private String delFlag; + + /** + * 动画图片 + */ + private String animationPath; } diff --git a/nursing-unit-common/src/main/java/com/nu/dto/InstructionTagMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/InstructionTagMQDto.java index d3426b85..6444ab12 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/InstructionTagMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/InstructionTagMQDto.java @@ -21,6 +21,10 @@ public class InstructionTagMQDto implements Serializable { * 分类标签名称 */ private String instructionName; + /** + * 分类标签类型 + */ + private String instructionType; /** * 排序 */ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java index f061ea92..9e0e60e1 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java @@ -42,6 +42,10 @@ public class InstructionTag implements Serializable { @Excel(name = "分类标签名称", width = 15) @ApiModelProperty(value = "分类标签名称") private java.lang.String instructionName; + @Excel(name = "分类标签类型", width = 15) + @ApiModelProperty(value = "分类标签类型") + @Dict(dicCode = "service_instruction_tag") + private java.lang.String instructionType; /**排序*/ @Excel(name = "排序", width = 15) @ApiModelProperty(value = "排序") diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java index 14e61444..a66e98cb 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java @@ -68,6 +68,22 @@ public class ConfigServiceCategoryController extends JeecgController getInfo(@RequestParam(name="id",required=true) String id) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("id",id); + ConfigServiceCategory entity = configServiceCategoryService.getOne(queryWrapper); + return Result.OK(entity); + } + /** * 添加 * diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java index d5dcd80c..423f0f73 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java @@ -81,4 +81,13 @@ public class ConfigServiceCategory implements Serializable { /**所属部门*/ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; + /**网络标记，0为用pad本地静态图片，1为用网络图*/ + @ApiModelProperty(value = "网络标记") + private java.lang.String netFlag; + /**默认图片*/ + @ApiModelProperty(value = "默认图片") + private java.lang.String staticPath; + /**动画图片*/ + @ApiModelProperty(value = "动画图片") + private java.lang.String animationPath; } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java index dca38ddd..ece99187 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java @@ -26,4 +26,5 @@ public interface IConfigServiceCategoryService extends IService selectAll(String dataSourceCode, List ids, List excludeSubIds); void insertAll(List categoryList); + void updateAll(List categoryList); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java index 0370866b..114dee0f 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java @@ -76,4 +76,14 @@ public class ConfigServiceCategoryServiceImpl extends ServiceImpl categoryList) { + categoryList.forEach(c -> { + ConfigServiceCategory entity = new ConfigServiceCategory(); + entity.setId(c.getId()); + entity.setAnimationPath(c.getAnimationPath()); + baseMapper.updateById(entity); + }); + } } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java index 3a1bac71..4d17a7be 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java @@ -70,6 +70,22 @@ public class ConfigServiceTypeController extends JeecgController getInfo(@RequestParam(name="id",required=true) String id) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("id",id); + ConfigServiceType entity = configServiceTypeService.getOne(queryWrapper); + return Result.OK(entity); + } + /** * 添加 * diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java index da18353e..0128870e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java @@ -86,4 +86,13 @@ public class ConfigServiceType implements Serializable { /**所属部门*/ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; + /**网络标记，0为用pad本地静态图片，1为用网络图*/ + @ApiModelProperty(value = "网络标记") + private java.lang.String netFlag; + /**默认图片*/ + @ApiModelProperty(value = "默认图片") + private java.lang.String staticPath; + /**动画图片*/ + @ApiModelProperty(value = "动画图片") + private java.lang.String animationPath; } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java index 8fa77cd4..f75babdf 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java @@ -734,14 +734,20 @@ public class DirectiveMQListener { //需要新增的数据 List needAddData = Lists.newArrayList(); + List needUpdateData = Lists.newArrayList(); for (ConfigServiceCategory category : allData) { if (!existedIds.contains(category.getId())) { needAddData.add(category); + }else{ + needUpdateData.add(category); } } if (needAddData != null && !needAddData.isEmpty()) { serviceCategoryService.insertAll(needAddData); } + if (needUpdateData != null && !needUpdateData.isEmpty()) { + serviceCategoryService.updateAll(needUpdateData); + } } //服务类型 if (dto.getTypeList() != null) { From 2680cdc7894ec2cbb99c237ba344aa956b497237 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 13 Oct 2025 09:20:37 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=8D=95=E5=AE=A1=E6=A0=B8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nursing-unit-api/pom.xml | 6 + .../pad/invoicing/api/InvoicingApi.java | 83 ++++++ .../org/jeecg/config/shiro/ShiroConfig.java | 1 + .../java/com/nu/entity/CgdInfoEntity.java | 79 +++++ .../java/com/nu/entity/CgdMainEntity.java | 77 +++++ .../com/nu/entity/MaterialCategoryEntity.java | 63 ++++ .../com/nu/entity/MaterialInfoEntity.java | 106 +++++++ .../nu/entity/MaterialMedicationEntity.java | 64 +++++ .../com/nu/entity/MaterialTypeEntity.java | 57 ++++ .../java/com/nu/entity/QgdInfoEntity.java | 78 +++++ .../java/com/nu/entity/QgdMainEntity.java | 47 +++ .../nu-invoicing-local-api/pom.xml | 6 + .../modules/invoicing/api/IInvoicingApi.java | 25 ++ .../NuInvoicingCgdMainController.java | 2 +- .../service/INuInvoicingCgdMainService.java | 2 + .../impl/NuInvoicingCgdMainServiceImpl.java | 269 +++++++++++++++++- .../qgd/controller/QgdInfoController.java | 5 +- .../qgd/service/impl/QgdInfoServiceImpl.java | 8 +- .../qgd/service/impl/QgdMainServiceImpl.java | 2 +- .../mapper/BlWarehouseMaterialInfoMapper.java | 3 + 20 files changed, 970 insertions(+), 13 deletions(-) create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java create mode 100644 nursing-unit-common/src/main/java/com/nu/entity/CgdInfoEntity.java create mode 100644 nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java create mode 100644 nursing-unit-common/src/main/java/com/nu/entity/MaterialCategoryEntity.java create mode 100644 nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java create mode 100644 nursing-unit-common/src/main/java/com/nu/entity/MaterialMedicationEntity.java create mode 100644 nursing-unit-common/src/main/java/com/nu/entity/MaterialTypeEntity.java create mode 100644 nursing-unit-common/src/main/java/com/nu/entity/QgdInfoEntity.java create mode 100644 nursing-unit-common/src/main/java/com/nu/entity/QgdMainEntity.java create mode 100644 nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java diff --git a/nursing-unit-api/pom.xml b/nursing-unit-api/pom.xml index d473cb07..b7944179 100644 --- a/nursing-unit-api/pom.xml +++ b/nursing-unit-api/pom.xml @@ -57,5 +57,11 @@ 2.0.0 compile + + com.nursingunit.boot + nu-invoicing-local-api + 2.0.0 + compile + 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 new file mode 100644 index 00000000..59a8f288 --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java @@ -0,0 +1,83 @@ +package com.nu.modules.pad.invoicing.api; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nu.entity.*; +import com.nu.modules.invoicing.api.IInvoicingApi; +import io.swagger.annotations.ApiOperation; +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; + +@RestController +@RequestMapping("/api/pad/invoicing") +public class InvoicingApi { + + + @Autowired + private IInvoicingApi invoicingApi; + + @ApiOperation(value = "查询物料信息-分页列表查询", notes = "查询物料信息-分页列表查询") + @AutoLog(value = "查询物料信息-分页列表查询") + @GetMapping(value = "/queryInvoicingList") + public Result> queryInvoicingList(MaterialInfoEntity materialInfoEntityDto, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = invoicingApi.queryInvoicingList(pageNo, pageSize, materialInfoEntityDto,req); + return Result.OK(pageList); + } + + + @ApiOperation(value = "查询购物车信息-分页列表查询", notes = "查询购物车信息-分页列表查询") + @AutoLog(value = "查询购物车信息-分页列表查询") + @GetMapping(value = "/queryShoppingCartList") + public Result> queryShoppingCartList(QgdInfoEntity qgdInfoEntityDto, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = invoicingApi.queryShoppingCartList(pageNo, pageSize, qgdInfoEntityDto,req); + return Result.OK(pageList); + } + + + @ApiOperation(value="请购单-请购信息-添加", notes="请购单-请购信息-添加") + @AutoLog(value = "请购单-请购信息-添加") + @PostMapping(value = "/addShoppingCartList") + public Result addShoppingCartList(@RequestBody List infoList) { + invoicingApi.addShoppingCartList(infoList); + return Result.OK("添加成功！"); + } + + @ApiOperation(value="生成采购单信息", notes="生成采购单信息") + @AutoLog(value = "生成采购单信息") + @PostMapping(value = "/generatedPurchaseOrder") + public Result generatedPurchaseOrder(QgdInfoEntity qgdInfoEntity, HttpServletRequest req) { + invoicingApi.generatedPurchaseOrder(qgdInfoEntity); + return Result.OK("已提交采购信息"); + } + + @ApiOperation(value = "查询采购单详细信息", notes = "查询采购单详细信息") + @AutoLog(value = "查询采购单详细信息") + @GetMapping(value = "/queryCgdInfoList") + public Result> queryCgdInfoList(CgdInfoEntity cgdInfoEntityDto, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + IPage pageList = invoicingApi.queryCgdInfoList(pageNo, pageSize, cgdInfoEntityDto,req); + return Result.OK(pageList); + } + + + @ApiOperation(value="审核采购单信息", notes="审核采购单信息") + @AutoLog(value = "审核采购单信息") + @PostMapping(value = "/reviewPurchaseOrder") + public Result reviewPurchaseOrder(CgdMainEntity cgdMainEntity, HttpServletRequest req) { + invoicingApi.reviewPurchaseOrder(cgdMainEntity); + 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 b8c9e848..b03422be 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 @@ -90,6 +90,7 @@ public class ShiroConfig { } filterChainDefinitionMap.put("/api/tplink/videoStorage/**", "anon"); //视频缓存存储接口 + filterChainDefinitionMap.put("/api/pad/invoicing/**", "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/CgdInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CgdInfoEntity.java new file mode 100644 index 00000000..88d773f8 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/CgdInfoEntity.java @@ -0,0 +1,79 @@ +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; +import java.util.Date; + +/** + * @Description: nu_invoicing_cgd_info + * @Author: jeecg-boot + * @Date: 2025-09-26 + * @Version: V1.0 + */ +@Data +public class CgdInfoEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**createBy*/ + /**createTime*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**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 Date updateTime; + /**sysOrgCode*/ + private String sysOrgCode; + /**请购单id*/ + private String mainId; + /**采购单id*/ + private String cgdId; + /**物料id*/ + private String wlId; + /**物料编码*/ + private String wlMaterialNo; + /**物料名称*/ + private String wlName; + /**采购单位*/ + private String wlUnits; + /**规格型号*/ + private String wlSpecificationModel; + /**上限*/ + private String wlUpperLimit; + /**下限*/ + private String wlLowerLimit; + /**供应商id*/ + private String suppliersId; + /**供应商名称*/ + private String suppliersName; + /**请购数量*/ + private Integer purchaseQuantity; + /**银行*/ + private String brand; + /**库房*/ + private String nuId; + /**入库数量*/ + private String rksl; + /**未入库数量*/ + private String wrksl; + /**采购单价*/ + private String procurementPrice; + /**到货单间*/ + private String arrivalPrice; +} 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 new file mode 100644 index 00000000..f3747011 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/CgdMainEntity.java @@ -0,0 +1,77 @@ +package com.nu.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.jeecg.common.aspect.annotation.Dict; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * @Description: nu_invoicing_cgd_main + * @Author: jeecg-boot + * @Date: 2025-09-26 + * @Version: V1.0 + */ +@Data +public class CgdMainEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**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 Date createTime; + /**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 Date updateTime; + /**请购单id*/ + private String qgdId; + /**采购单单号*/ + private String cgdNo; + /**供应商id*/ + private String gysId; + /**请购时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date qgDate; + /**请购人*/ + private String qgBy; + /**供应商联系人*/ + private String gysLxr; + /**供应商联系电话*/ + private String gysLxrdh; + /**供应商openId*/ + private String gysOpenId; + /**付款方式*/ + private String gysFkfs; + /**状态 0:待采购 1：采购中 2采购完成 3作废*/ + private String status; + /**采购单类型 0采购单 1挂帐单 2结账单 9作废*/ + @Dict(dicCode = "cgd_type") + private String cgdType; + /**随行单*/ + private String sxdPath; + /**销账单*/ + private String xzdPath; + /**结账单*/ + private String jzdPath; + /**审核人*/ + private String reviewedBy; + /**审核时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date reviewedTime; + /**审核备注*/ + private String content; + + private List cgdInfoList; +} 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 new file mode 100644 index 00000000..95dab29e --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/MaterialCategoryEntity.java @@ -0,0 +1,63 @@ +package com.nu.entity; + +import com.baomidou.mybatisplus.annotation.*; +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.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 物料类别 + * @Author: jeecg-boot + * @Date: 2025-03-17 + * @Version: V1.0 + */ +@Data +public class MaterialCategoryEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**物料类别名称*/ + private String categoryName; + /**是否启用 0启用 1未启用*/ + @Dict(dicCode = "iz_enabled") + private String izEnabled; + /**是否删除 0未删除 1删除*/ + private String delFlag; + /**创建人*/ + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**更新人*/ + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + /**所属部门*/ + private String sysOrgCode; + private String icon; + private Integer sort; + + private String typeName; + private String medicationName; + private String categoryId; + private String typeId; + private String medicationId; + + private Integer categoryRowSpan; + private Integer typeRowSpan; + + private Integer num; +} 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 new file mode 100644 index 00000000..93da59ff --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java @@ -0,0 +1,106 @@ +package com.nu.entity; + +import com.baomidou.mybatisplus.annotation.*; +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.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Description: 物料信息 + * @Author: jeecg-boot + * @Date: 2025-03-13 + * @Version: V1.0 + */ +@Data +public class MaterialInfoEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**物料类别*/ + @Dict(dictTable = "nu_config_material_category", dicText = "category_name", dicCode = "id") + private String categoryId; + /**物料类型*/ + @Dict(dictTable = "nu_config_material_type", dicText = "type_name", dicCode = "id") + private String typeId; + /**用药类型*/ + @Dict(dictTable = "nu_config_material_medication", dicText = "medication_name", dicCode = "id") + private String medicationId; + /**货品名称*/ + private String materialName; + /**货品编码*/ + private String materialNo; + /**规格型号*/ + private String specificationModel; + /**销售单价*/ + private BigDecimal salesUnitPrice; + /**参考单价*/ + private BigDecimal referenceUnitPrice; + /**货品单位*/ + private String materialUnits; + /**多单位开关 0关 1开*/ + private String multiUnitSwitch; + /**父级单位*/ + private String oneUnit; + /**父级单位兑换比例*/ + private Integer oneUnitProportion; + /**父级单位价格*/ + private BigDecimal oneUnitPrice; + /**爷级单位*/ + private String twoUnit; + /**爷级单位兑换比例*/ + private Integer twoUnitProportion; + /**爷级单位价格*/ + private BigDecimal twoUnitPrice; + /**多单位采购默认使用 0子集 1父级 2爷级*/ + private String multiUnitType; + /**供应商*/ + @Dict(dictTable = "nu_config_suppliers_info" , dicCode = "id" , dicText = "suppliers_name") + private String suppliers; + /**物料图片*/ + private String materialImg; + /**物料标识*/ + private String materialIdent; + /**是否启用 0启用 1未启用*/ + @Dict(dicCode = "iz_enabled") + private String izEnabled; + /**是否删除 0未删除 1删除*/ + private String delFlag; + /**创建人*/ + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**更新人*/ + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + /**所属部门*/ + private String sysOrgCode; + /**拼音*/ + private String pinyin; + /**物料上限*/ + private String upperLimit; + /**物料下县*/ + private String lowerLimit; + + private String treeId;//树id，用于查询 + + private String kcsl;//库存数量 + @Dict(dictTable = "nu_base_info", dicText = "nu_name", dicCode = "nu_id") + private String nuId;//库房id + +} diff --git a/nursing-unit-common/src/main/java/com/nu/entity/MaterialMedicationEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/MaterialMedicationEntity.java new file mode 100644 index 00000000..a84cab34 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/MaterialMedicationEntity.java @@ -0,0 +1,64 @@ +package com.nu.entity; + +import com.baomidou.mybatisplus.annotation.*; +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.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 物料用药类型 + * @Author: jeecg-boot + * @Date: 2025-03-17 + * @Version: V1.0 + */ +@Data +public class MaterialMedicationEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**物料类别*/ + @Dict(dictTable = "nu_config_material_category", dicText = "category_name", dicCode = "id") + private String categoryId; + /**物料类型*/ + @Dict(dictTable = "nu_config_material_type", dicText = "type_name", dicCode = "id") + private String typeId; + /**名称*/ + private String medicationName; + /**是否启用 0启用 1未启用*/ + @Dict(dicCode = "iz_enabled") + private String izEnabled; + /**是否删除 0未删除 1删除*/ + @TableLogic + private String delFlag; + /**创建人*/ + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**更新人*/ + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + /**所属部门*/ + private String sysOrgCode; + private String icon; + + private String levle;//当前所在层级 1一级 2二级 3三级 + + private String qycj;//迁移至第几层 0三级 1二级 2一级 + + +} diff --git a/nursing-unit-common/src/main/java/com/nu/entity/MaterialTypeEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/MaterialTypeEntity.java new file mode 100644 index 00000000..f32f973d --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/MaterialTypeEntity.java @@ -0,0 +1,57 @@ +package com.nu.entity; + +import com.baomidou.mybatisplus.annotation.*; +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.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 物料类型 + * @Author: jeecg-boot + * @Date: 2025-03-17 + * @Version: V1.0 + */ +@Data +public class MaterialTypeEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**物料类别*/ + @Dict(dictTable = "nu_config_material_category" , dicText = "category_name" , dicCode = "id") + private String categoryId; + /**物料类型*/ + private String typeName; + /**是否启用 0启用 1未启用*/ + @Dict(dicCode = "iz_enabled") + private String izEnabled; + /**是否删除 0未删除 1删除*/ + @TableLogic + private String delFlag; + /**创建人*/ + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**更新人*/ + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + /**所属部门*/ + private String sysOrgCode; + private String icon; + + private Integer num; +} 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 new file mode 100644 index 00000000..3137deb8 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/QgdInfoEntity.java @@ -0,0 +1,78 @@ +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.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description: 请购单-请购信息 + * @Author: jeecg-boot + * @Date: 2025-06-26 + * @Version: V1.0 + */ +@Data +public class QgdInfoEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**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*/ + 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; + /**sysOrgCode*/ + private String sysOrgCode; + /**请购单id*/ + private String mainId; + /**请购单编号*/ + private String mainNo; + /**物料id*/ + private String wlId; + /**物料编码*/ + private String wlMaterialNo; + /**物料名称*/ + private String wlName; + /**采购单位*/ + private String wlUnits; + /**规格型号*/ + private String wlSpecificationModel; + /**上限*/ + private String wlUpperLimit; + /**下限*/ + private String wlLowerLimit; + /**供应商id*/ + private String suppliersId; + /**供应商名称*/ + private String suppliersName; + /**请购数量*/ + private Integer purchaseQuantity; + /**brand*/ + private String brand; + /**库房*/ + @Dict(dictTable = "nu_base_info", dicText = "nu_name", dicCode = "nu_id") + private String nuId; + + /**参考单价*/ + private String referenceUnitPrice; + +} diff --git a/nursing-unit-common/src/main/java/com/nu/entity/QgdMainEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/QgdMainEntity.java new file mode 100644 index 00000000..7f2af98b --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/QgdMainEntity.java @@ -0,0 +1,47 @@ +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-06-26 + * @Version: V1.0 + */ +@Data +public class QgdMainEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**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*/ + 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; + /**sysOrgCode*/ + private String sysOrgCode; + /**请购单号*/ + private String qgdNo; + /**请购状态 0未下单 1已下单*/ + private Integer status; +} diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/pom.xml b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/pom.xml index 7c44f9b7..fbf93a1e 100644 --- a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/pom.xml +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/pom.xml @@ -7,6 +7,12 @@ nu-invoicing-api 2.0.0 + + + com.nursingunit.boot + nursing-unit-common + + 4.0.0 nu-invoicing-local-api 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 new file mode 100644 index 00000000..15ade09a --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java @@ -0,0 +1,25 @@ +package com.nu.modules.invoicing.api; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nu.entity.CgdInfoEntity; +import com.nu.entity.CgdMainEntity; +import com.nu.entity.MaterialInfoEntity; +import com.nu.entity.QgdInfoEntity; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; + +public interface IInvoicingApi { + + IPage queryInvoicingList(Integer pageNo, Integer pageSize, MaterialInfoEntity materialInfoEntityDto, HttpServletRequest req); + + IPage queryShoppingCartList(Integer pageNo, Integer pageSize, QgdInfoEntity qgdInfoEntityDto, HttpServletRequest req); + + void addShoppingCartList(List infoList); + + String generatedPurchaseOrder(QgdInfoEntity qgdInfoEntity); + + IPage queryCgdInfoList(Integer pageNo, Integer pageSize, CgdInfoEntity cgdInfoEntityDto, HttpServletRequest req); + + void reviewPurchaseOrder(CgdMainEntity cgdMainEntity); +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdMainController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdMainController.java index e2ea545b..be45c65a 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdMainController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdMainController.java @@ -183,7 +183,7 @@ public class NuInvoicingCgdMainController extends JeecgController auditInfo(@RequestBody NuInvoicingCgdMain nuInvoicingCgdMain) { - nuInvoicingCgdMainService.updateById(nuInvoicingCgdMain); + nuInvoicingCgdMainService.auditInfo(nuInvoicingCgdMain); return Result.OK("添加成功！"); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdMainService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdMainService.java index 533c59af..9ed128a2 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdMainService.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdMainService.java @@ -12,4 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService; public interface INuInvoicingCgdMainService extends IService { void rukuInfo(NuInvoicingCgdMain nuInvoicingCgdMain); + + void auditInfo(NuInvoicingCgdMain nuInvoicingCgdMain); } 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 667d6aff..744cc1b5 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 @@ -1,21 +1,42 @@ package com.nu.modules.cgd.service.impl; +import cn.hutool.core.bean.BeanUtil; +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.*; +import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo; +import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialInfoMapper; import com.nu.modules.cgd.entity.NuInvoicingCgdInfo; import com.nu.modules.cgd.entity.NuInvoicingCgdMain; import com.nu.modules.cgd.mapper.NuInvoicingCgdInfoMapper; import com.nu.modules.cgd.mapper.NuInvoicingCgdMainMapper; import com.nu.modules.cgd.service.INuInvoicingCgdMainService; +import com.nu.modules.configSuppliersInfo.entity.ConfigSuppliersInfo; +import com.nu.modules.configSuppliersInfo.mapper.ConfigSuppliersInfoMapper; +import com.nu.modules.invoicing.api.IInvoicingApi; +import com.nu.modules.qgd.entity.QgdInfo; +import com.nu.modules.qgd.entity.QgdMain; +import com.nu.modules.qgd.mapper.QgdInfoMapper; +import com.nu.modules.qgd.mapper.QgdMainMapper; +import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo; +import com.nu.modules.warehouseMaterialInfo.mapper.BlWarehouseMaterialInfoMapper; import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.common.util.DateUtils; +import org.springframework.beans.BeanUtils; 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.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Random; +import java.util.*; /** * @Description: nu_invoicing_cgd_main @@ -24,11 +45,29 @@ import java.util.Random; * @Version: V1.0 */ @Service -public class NuInvoicingCgdMainServiceImpl extends ServiceImpl implements INuInvoicingCgdMainService { +public class NuInvoicingCgdMainServiceImpl extends ServiceImpl implements INuInvoicingCgdMainService, IInvoicingApi { @Autowired private NuInvoicingCgdInfoMapper cgdInfoMapper; + @Autowired + private NuInvoicingCgdMainMapper cgdMainMapper; + + @Autowired + private BlWarehouseMaterialInfoMapper warehouseMaterialInfoMapper; + + @Autowired + private ConfigMaterialInfoMapper configMaterialInfoMapper; + + @Autowired + private QgdMainMapper qgdMainMapper; + + @Autowired + private QgdInfoMapper qgdInfoMapper; + + @Autowired + private ConfigSuppliersInfoMapper gysMapper; + @Override public void rukuInfo(NuInvoicingCgdMain nuInvoicingCgdMain) { @@ -67,4 +106,224 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl().eq("cgd_id",nuInvoicingCgdMain.getId())); + for(NuInvoicingCgdInfo nuInvoicingCgdInfo : nuInvoicingCgdMain.getCgdInfoList()){ + cgdInfoMapper.insert(nuInvoicingCgdInfo); + } + baseMapper.updateById(nuInvoicingCgdMain); + } + + + //--------------------------------------------------pad 接口------------------------------------------------- + @Override + public IPage queryInvoicingList(Integer pageNo, Integer pageSize, MaterialInfoEntity materialInfoEntityDto, HttpServletRequest req) { + BlWarehouseMaterialInfo warehouseMaterialInfo = new BlWarehouseMaterialInfo(); + BeanUtils.copyProperties(materialInfoEntityDto,warehouseMaterialInfo); + Map customeRuleMap = new HashMap<>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(warehouseMaterialInfo, req.getParameterMap(), customeRuleMap); + Page page = new Page<>(pageNo, pageSize); + List list = warehouseMaterialInfoMapper.selectList(page,queryWrapper); + IPage entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); + entityPage.setRecords(BeanUtil.copyToList(list, MaterialInfoEntity.class)); + return entityPage; + } + + @Override + public IPage queryShoppingCartList(Integer pageNo, Integer pageSize, QgdInfoEntity qgdInfoEntityDto, HttpServletRequest req) { +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //查询当前人是否有请购数据 + QueryWrapper mainQueryWrapper = new QueryWrapper<>(); +// mainQueryWrapper.eq("create_by",sysUser.getUsername()); + mainQueryWrapper.eq("status",0); + QgdMain qgdMain = qgdMainMapper.selectOne(mainQueryWrapper); + //如果请购单为空，给一个默认的值，使最后的结果为空 + if(qgdMain == null){ + qgdMain = new QgdMain(); + qgdMain.setId("-1");//默认没有请购单 + } + //查询请购详细信息 + QgdInfo nuInvoicingQgdInfo = new QgdInfo(); + BeanUtils.copyProperties(qgdInfoEntityDto,nuInvoicingQgdInfo); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingQgdInfo, req.getParameterMap()); + queryWrapper.eq("main_id",qgdMain.getId()); + Page page = new Page(pageNo, pageSize); + List list = qgdInfoMapper.selectList(page, queryWrapper); + //封装返回结果 + IPage entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); + entityPage.setRecords(BeanUtil.copyToList(list, QgdInfoEntity.class)); + return entityPage; + } + + @Override + public void addShoppingCartList(List infoList) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.eq("create_by",sysUser.getUsername()); + queryWrapper.eq("status",0); + QgdMain qgdMain = qgdMainMapper.selectOne(queryWrapper); + if(qgdMain == null){ + // 生成请购单号 + Date date = new Date(); +// String nowDate = DateUtils.formatDate(date,"yyyy-MM-dd"); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); +// queryWrapper2.eq("create_by",sysUser.getUsername()); +// queryWrapper2.like("create_time",nowDate); + //查询当天是否有请购单 + List listSize = qgdMainMapper.selectList(queryWrapper2); + int size = listSize.size()+1; + String ddwh = String.format("%03d", size); + String qgdNo = sysUser.getOrgCode() + DateUtils.formatDate(date,"yyyyMMdd")+ddwh; + qgdMain = new QgdMain(); + qgdMain.setCreateBy(sysUser.getUsername()); + qgdMain.setCreateTime(new Date()); + qgdMain.setStatus(0); + qgdMain.setQgdNo(qgdNo); + qgdMainMapper.insert(qgdMain); + } + for (QgdInfoEntity info : infoList) { + if(info.getPurchaseQuantity()!=null && info.getPurchaseQuantity()>0){ + //获取物料基础信息 + ConfigMaterialInfo ConfigMaterialInfo = configMaterialInfoMapper.selectById(info.getWlId()); + //获取物料上限下限 + BlWarehouseMaterialInfo warehouseMaterialInfo = warehouseMaterialInfoMapper.selectOne(new QueryWrapper().eq("wl_id",info.getWlId()).eq("nu_id",info.getNuId())); + info.setMainId(qgdMain.getId()); + info.setMainNo(qgdMain.getQgdNo()); + info.setWlName(ConfigMaterialInfo.getMaterialName()); + info.setWlMaterialNo(ConfigMaterialInfo.getMaterialNo()); + info.setWlSpecificationModel(ConfigMaterialInfo.getSpecificationModel()); + info.setWlUnits(ConfigMaterialInfo.getMaterialUnits()); + info.setWlUpperLimit(warehouseMaterialInfo.getUpperLimit()); + info.setWlLowerLimit(warehouseMaterialInfo.getLowerLimit()); + if(StringUtils.equals("1",ConfigMaterialInfo.getMultiUnitType())){ + info.setReferenceUnitPrice(ConfigMaterialInfo.getOneUnitPrice()+""); + }else if(StringUtils.equals("2",ConfigMaterialInfo.getMultiUnitType())){ + info.setReferenceUnitPrice(ConfigMaterialInfo.getTwoUnitPrice()+""); + } else if(StringUtils.equals("3",ConfigMaterialInfo.getMultiUnitType())){ + info.setReferenceUnitPrice(ConfigMaterialInfo.getReferenceUnitPrice()+""); + } + QgdInfo qgdInfo = new QgdInfo(); + BeanUtils.copyProperties(info,qgdInfo); + qgdInfoMapper.insert(qgdInfo); + } + } + } + + @Override + public String generatedPurchaseOrder(QgdInfoEntity qgdInfoEntity) { + + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //查询当前人是否有请购数据 + QueryWrapper mainQueryWrapper = new QueryWrapper<>(); +// mainQueryWrapper.eq("create_by",sysUser.getUsername()); + mainQueryWrapper.eq("status",0); + QgdMain qgdMain = qgdMainMapper.selectOne(mainQueryWrapper); + if(qgdMain == null){ + qgdMain = new QgdMain(); + qgdMain.setId("-1"); + } + //查询请购详细信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("main_id",qgdMain.getId()); + List qgdInfoList = qgdInfoMapper.selectList(queryWrapper); + + List> mapList = new ArrayList<>(); + // 创建一个临时Map来按suppliersId分组 + Map> tempMap = new HashMap<>(); + + for (QgdInfo qgdInfo : qgdInfoList) { + String suppliersId = qgdInfo.getSuppliersId(); + if (!tempMap.containsKey(suppliersId)) { + tempMap.put(suppliersId, new ArrayList<>()); + } + tempMap.get(suppliersId).add(qgdInfo); + } + + // 将临时Map转换为需要的mapList结构 + for (Map.Entry> entry : tempMap.entrySet()) { + Map map = new HashMap<>(); + String suppliersId = entry.getKey();//供应商id + List infoList = entry.getValue();//请购的物料列表 + + ConfigSuppliersInfo ConfigSuppliersInfo = gysMapper.selectById(suppliersId); + String cgdNo = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + String.format("%06d", new Random().nextInt(1000000)); + + //生产采购单主表 + NuInvoicingCgdMain cgdMain = new NuInvoicingCgdMain(); + cgdMain.setQgdId(qgdMain.getId()); + cgdMain.setCgdNo(cgdNo); + cgdMain.setGysId(suppliersId); + cgdMain.setQgDate(new Date()); + cgdMain.setQgBy(sysUser.getUsername()); + cgdMain.setGysLxr(ConfigSuppliersInfo.getPersonInCharge()); + cgdMain.setGysLxrdh(ConfigSuppliersInfo.getContactNumber()); + cgdMain.setGysOpenId(ConfigSuppliersInfo.getWechartId()); + cgdMain.setStatus("0"); + cgdMain.setCgdType("0"); + cgdMainMapper.insert(cgdMain); + //生产采购单详细 + for(QgdInfo params:infoList){ + NuInvoicingCgdInfo cgdInfo = new NuInvoicingCgdInfo(); + cgdInfo.setMainId(qgdMain.getId()); + cgdInfo.setCgdId(cgdMain.getId()); + cgdInfo.setWlId(params.getWlId()); + cgdInfo.setWlMaterialNo(params.getWlMaterialNo()); + cgdInfo.setWlName(params.getWlName()); + cgdInfo.setWlUnits(params.getWlUnits()); + cgdInfo.setWlSpecificationModel(params.getWlSpecificationModel()); + cgdInfo.setWlUpperLimit(params.getWlUpperLimit()); + cgdInfo.setWlLowerLimit(params.getWlLowerLimit()); + cgdInfo.setSuppliersId(params.getSuppliersId()); + cgdInfo.setSuppliersName(params.getSuppliersName()); + cgdInfo.setPurchaseQuantity(params.getPurchaseQuantity()); + cgdInfo.setBrand(params.getBrand()); + cgdInfo.setNuId(params.getNuId()); + cgdInfo.setProcurementPrice(params.getReferenceUnitPrice()); + cgdInfoMapper.insert(cgdInfo); + } + + + map.put("suppliersId", entry.getKey()); + map.put("qgdInfoList", entry.getValue()); + mapList.add(map); + } + System.out.println(mapList); + + //修改请购单状态-变成已经下单 + QgdMain qgdMain1 = new QgdMain(); + qgdMain1.setId(qgdMain.getId()); + qgdMain1.setStatus(1); + qgdMainMapper.updateById(qgdMain1); + + return "1"; + } + + @Override + public IPage queryCgdInfoList(Integer pageNo, Integer pageSize, CgdInfoEntity cgdInfoEntityDto, HttpServletRequest req) { + NuInvoicingCgdInfo nuInvoicingCgdInfo = new NuInvoicingCgdInfo(); + BeanUtils.copyProperties(cgdInfoEntityDto,nuInvoicingCgdInfo); + Map customeRuleMap = new HashMap<>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingCgdInfo, req.getParameterMap(), customeRuleMap); + Page page = new Page<>(pageNo, pageSize); + List list = cgdInfoMapper.selectList(page,queryWrapper); + IPage entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal()); + entityPage.setRecords(BeanUtil.copyToList(list, CgdInfoEntity.class)); + return entityPage; + } + + @Override + public void reviewPurchaseOrder(CgdMainEntity cgdMainEntity) { + NuInvoicingCgdMain cgdMain = new NuInvoicingCgdMain(); + BeanUtils.copyProperties(cgdMainEntity,cgdMain); + cgdInfoMapper.delete(new QueryWrapper().eq("cgd_id",cgdMainEntity.getId())); + for(CgdInfoEntity cgdInfoEntity : cgdMainEntity.getCgdInfoList()){ + NuInvoicingCgdInfo nuInvoicingCgdInfo = new NuInvoicingCgdInfo(); + BeanUtils.copyProperties(cgdInfoEntity,nuInvoicingCgdInfo); + cgdInfoMapper.insert(nuInvoicingCgdInfo); + } + baseMapper.updateById(cgdMain); + } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/controller/QgdInfoController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/controller/QgdInfoController.java index 1d50d1eb..71e402a2 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/controller/QgdInfoController.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/controller/QgdInfoController.java @@ -141,10 +141,10 @@ public class QgdInfoController extends JeecgController @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //查询当前人是否有请购数据 QueryWrapper mainQueryWrapper = new QueryWrapper<>(); - mainQueryWrapper.eq("create_by",sysUser.getUsername()); +// mainQueryWrapper.eq("create_by",sysUser.getUsername());//目前请购是一次性全部将请购车的请购信息全部提交给采购，如果只查询本人的请购信息则解除注释 mainQueryWrapper.eq("status",0); QgdMain qgdMain = nuInvoicingQgdMainService.getOne(mainQueryWrapper); if(qgdMain == null){ @@ -159,6 +159,7 @@ public class QgdInfoController extends JeecgController } + @ApiOperation(value="生成采购单信息", notes="生成采购单信息") @PostMapping(value = "/addCgdByUser") public Result addCgd(QgdInfo nuInvoicingQgdInfo, HttpServletRequest req) { nuInvoicingQgdMainService.addCgdByUser(nuInvoicingQgdInfo); diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java index 2e6a76e0..dcaafeae 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java @@ -43,16 +43,16 @@ public class QgdInfoServiceImpl extends ServiceImpl impl LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("create_by",sysUser.getUsername()); +// queryWrapper.eq("create_by",sysUser.getUsername()); queryWrapper.eq("status",0); QgdMain qgdMain = nuInvoicingQgdMainService.getOne(queryWrapper); if(qgdMain == null){ // 生成请购单号 Date date = new Date(); - String nowDate = DateUtils.formatDate(date,"yyyy-MM-dd"); +// String nowDate = DateUtils.formatDate(date,"yyyy-MM-dd"); QueryWrapper queryWrapper2 = new QueryWrapper<>(); - queryWrapper2.eq("create_by",sysUser.getUsername()); - queryWrapper2.like("create_time",nowDate); +// queryWrapper2.eq("create_by",sysUser.getUsername()); +// queryWrapper2.like("create_time",nowDate); //查询当天是否有请购单 List listSize = nuInvoicingQgdMainService.list(queryWrapper2); int size = listSize.size()+1; diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdMainServiceImpl.java index 68a0d11a..6288fed5 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdMainServiceImpl.java @@ -52,7 +52,7 @@ public class QgdMainServiceImpl extends ServiceImpl impl LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //查询当前人是否有请购数据 QueryWrapper mainQueryWrapper = new QueryWrapper<>(); - mainQueryWrapper.eq("create_by",sysUser.getUsername()); +// mainQueryWrapper.eq("create_by",sysUser.getUsername()); mainQueryWrapper.eq("status",0); QgdMain qgdMain = baseMapper.selectOne(mainQueryWrapper); if(qgdMain == null){ diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/BlWarehouseMaterialInfoMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/BlWarehouseMaterialInfoMapper.java index d88ca7cf..21a02a81 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/BlWarehouseMaterialInfoMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/BlWarehouseMaterialInfoMapper.java @@ -2,6 +2,8 @@ package com.nu.modules.warehouseMaterialInfo.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface BlWarehouseMaterialInfoMapper extends BaseMapper { + List queryInvoicingList(Page page, QueryWrapper queryWrapper); } From b58270f2bfa2ad07ed6110509abb21b8b250a6be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Mon, 13 Oct 2025 10:03:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4:?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E3=80=81=E7=B1=BB=E5=9E=8B=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/NuConfigServiceCategory.java | 3 --- .../entity/NuConfigServiceType.java | 3 --- .../impl/NuConfigServiceCategoryServiceImpl.java | 15 ++++----------- .../entity/ConfigServiceCategory.java | 3 --- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceCategory.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceCategory.java index b7ebfc9c..5305b9b4 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceCategory.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceCategory.java @@ -79,9 +79,6 @@ public class NuConfigServiceCategory implements Serializable { /**网络标记，0为用pad本地静态图片，1为用网络图*/ @ApiModelProperty(value = "网络标记") private java.lang.String netFlag; - /**默认图片*/ - @ApiModelProperty(value = "默认图片") - private java.lang.String staticPath; /**动画图片*/ @ApiModelProperty(value = "动画图片") private java.lang.String animationPath; diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceType.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceType.java index fc689604..ff06053d 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceType.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceType.java @@ -80,9 +80,6 @@ public class NuConfigServiceType implements Serializable { /**网络标记，0为用pad本地静态图片，1为用网络图*/ @ApiModelProperty(value = "网络标记") private java.lang.String netFlag; - /**默认图片*/ - @ApiModelProperty(value = "默认图片") - private java.lang.String staticPath; /**动画图片*/ @ApiModelProperty(value = "动画图片") private java.lang.String animationPath; diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java index e766f827..239aa9be 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java @@ -103,12 +103,8 @@ public class NuConfigServiceCategoryServiceImpl extends ServiceImpl imagePaths = new ArrayList<>(); - if(par.getStaticPath()!=null){ - String staticPath = getImageNetUrl(par.getStaticPath()); - imagePaths.add(staticPath); - } if(par.getAnimationPath()!=null){ - getImageNetUrls(imagePaths,par.getAnimationPath()); + imagePaths = getImageNetUrls(par.getAnimationPath()); } wllxMap.put("animationPath",imagePaths); wllxMap.put("levle","2"); @@ -134,12 +130,8 @@ public class NuConfigServiceCategoryServiceImpl extends ServiceImpl imagePaths = new ArrayList<>(); - if(par.getStaticPath()!=null){ - String staticPath = getImageNetUrl(par.getStaticPath()); - imagePaths.add(staticPath); - } if(par.getAnimationPath()!=null){ - getImageNetUrls(imagePaths,par.getAnimationPath()); + imagePaths = getImageNetUrls(par.getAnimationPath()); } infoMap.put("animationPath",imagePaths); infoMap.put("levle","1"); @@ -175,7 +167,8 @@ public class NuConfigServiceCategoryServiceImpl extends ServiceImpl getImageNetUrls(List imagePaths,String imageUrl){ + private List getImageNetUrls(String imageUrl){ + List imagePaths = new ArrayList<>(); String configValue = getOpeMediaAddress(); if(!configValue.equals("")){ String[] urls = imageUrl.split(","); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java index 423f0f73..1a49725c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java @@ -84,9 +84,6 @@ public class ConfigServiceCategory implements Serializable { /**网络标记，0为用pad本地静态图片，1为用网络图*/ @ApiModelProperty(value = "网络标记") private java.lang.String netFlag; - /**默认图片*/ - @ApiModelProperty(value = "默认图片") - private java.lang.String staticPath; /**动画图片*/ @ApiModelProperty(value = "动画图片") private java.lang.String animationPath; From 1f70456c63f275c8318240c22dca1e69f8bbbefa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Mon, 13 Oct 2025 10:04:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4:?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E3=80=81=E7=B1=BB=E5=9E=8B=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nu/modules/servicetype/entity/ConfigServiceType.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java index 0128870e..1fe22535 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java @@ -89,9 +89,6 @@ public class ConfigServiceType implements Serializable { /**网络标记，0为用pad本地静态图片，1为用网络图*/ @ApiModelProperty(value = "网络标记") private java.lang.String netFlag; - /**默认图片*/ - @ApiModelProperty(value = "默认图片") - private java.lang.String staticPath; /**动画图片*/ @ApiModelProperty(value = "动画图片") private java.lang.String animationPath;