From ac0e8094d31ad89314f38ccfa7e2042307cc9b0c Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Sun, 28 Sep 2025 09:27:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pad=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nursing-unit-common/pom.xml | 1 + .../java/com/nu/entity/NuBaseInfoEntity.java | 2 + .../NuInvoicingCgdInfoController.java | 174 +++++++++++++++++ .../NuInvoicingCgdMainController.java | 180 ++++++++++++++++++ .../cgd/entity/NuInvoicingCgdInfo.java | 132 +++++++++++++ .../cgd/entity/NuInvoicingCgdMain.java | 130 +++++++++++++ .../cgd/mapper/NuInvoicingCgdInfoMapper.java | 17 ++ .../cgd/mapper/NuInvoicingCgdMainMapper.java | 17 ++ .../mapper/xml/NuInvoicingCgdInfoMapper.xml | 5 + .../mapper/xml/NuInvoicingCgdMainMapper.xml | 5 + .../service/INuInvoicingCgdInfoService.java | 14 ++ .../service/INuInvoicingCgdMainService.java | 14 ++ .../impl/NuInvoicingCgdInfoServiceImpl.java | 19 ++ .../impl/NuInvoicingCgdMainServiceImpl.java | 19 ++ .../qgd/controller/QgdInfoController.java | 12 ++ .../modules/qgd/service/IQgdMainService.java | 2 + .../qgd/service/impl/QgdMainServiceImpl.java | 59 ++++++ .../modules/nubaseinfo/entity/NuBaseInfo.java | 5 +- .../service/impl/NuBaseInfoServiceImpl.java | 5 +- 19 files changed, 809 insertions(+), 3 deletions(-) create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdInfoController.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdMainController.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdInfo.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdInfoMapper.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdMainMapper.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdInfoService.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdMainService.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdInfoServiceImpl.java create mode 100644 nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java diff --git a/nursing-unit-common/pom.xml b/nursing-unit-common/pom.xml index f3fb7c6e..6376793a 100644 --- a/nursing-unit-common/pom.xml +++ b/nursing-unit-common/pom.xml @@ -39,6 +39,7 @@ com.github.wxpay wxpay-sdk 0.0.3 + compile diff --git a/nursing-unit-common/src/main/java/com/nu/entity/NuBaseInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/NuBaseInfoEntity.java index c49c2c60..033b8e66 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/NuBaseInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/NuBaseInfoEntity.java @@ -82,7 +82,9 @@ public class NuBaseInfoEntity implements Serializable { private BigDecimal balance; //摄像头信息 private List cameraInfo; + //客户信息 private CustomerInfoEntity customerInfo; + //指令信息 private List customerDirectiveDtoList; //温湿度信息 正常一个nuid对应一条数据 private List humidDeviceList; diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdInfoController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdInfoController.java new file mode 100644 index 00000000..74dc1aad --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdInfoController.java @@ -0,0 +1,174 @@ +package com.nu.modules.cgd.controller; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +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 org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.common.util.oConvertUtils; +import com.nu.modules.cgd.entity.NuInvoicingCgdInfo; +import com.nu.modules.cgd.service.INuInvoicingCgdInfoService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +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: nu_invoicing_cgd_info + * @Author: jeecg-boot + * @Date: 2025-09-26 + * @Version: V1.0 + */ +@Api(tags="nu_invoicing_cgd_info") +@RestController +@RequestMapping("/cgd/nuInvoicingCgdInfo") +@Slf4j +public class NuInvoicingCgdInfoController extends JeecgController { + @Autowired + private INuInvoicingCgdInfoService nuInvoicingCgdInfoService; + + /** + * 分页列表查询 + * + * @param nuInvoicingCgdInfo + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "nu_invoicing_cgd_info-分页列表查询") + @ApiOperation(value="nu_invoicing_cgd_info-分页列表查询", notes="nu_invoicing_cgd_info-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(NuInvoicingCgdInfo nuInvoicingCgdInfo, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingCgdInfo, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuInvoicingCgdInfoService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param nuInvoicingCgdInfo + * @return + */ + @AutoLog(value = "nu_invoicing_cgd_info-添加") + @ApiOperation(value="nu_invoicing_cgd_info-添加", notes="nu_invoicing_cgd_info-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody NuInvoicingCgdInfo nuInvoicingCgdInfo) { + nuInvoicingCgdInfoService.save(nuInvoicingCgdInfo); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param nuInvoicingCgdInfo + * @return + */ + @AutoLog(value = "nu_invoicing_cgd_info-编辑") + @ApiOperation(value="nu_invoicing_cgd_info-编辑", notes="nu_invoicing_cgd_info-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody NuInvoicingCgdInfo nuInvoicingCgdInfo) { + nuInvoicingCgdInfoService.updateById(nuInvoicingCgdInfo); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "nu_invoicing_cgd_info-通过id删除") + @ApiOperation(value="nu_invoicing_cgd_info-通过id删除", notes="nu_invoicing_cgd_info-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + nuInvoicingCgdInfoService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "nu_invoicing_cgd_info-批量删除") + @ApiOperation(value="nu_invoicing_cgd_info-批量删除", notes="nu_invoicing_cgd_info-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.nuInvoicingCgdInfoService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "nu_invoicing_cgd_info-通过id查询") + @ApiOperation(value="nu_invoicing_cgd_info-通过id查询", notes="nu_invoicing_cgd_info-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + NuInvoicingCgdInfo nuInvoicingCgdInfo = nuInvoicingCgdInfoService.getById(id); + if(nuInvoicingCgdInfo==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(nuInvoicingCgdInfo); + } + + /** + * 导出excel + * + * @param request + * @param nuInvoicingCgdInfo + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, NuInvoicingCgdInfo nuInvoicingCgdInfo) { + return super.exportXls(request, nuInvoicingCgdInfo, NuInvoicingCgdInfo.class, "nu_invoicing_cgd_info"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, NuInvoicingCgdInfo.class); + } + +} 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 new file mode 100644 index 00000000..26cef3b3 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdMainController.java @@ -0,0 +1,180 @@ +package com.nu.modules.cgd.controller; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +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 org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.common.util.oConvertUtils; +import com.nu.modules.cgd.entity.NuInvoicingCgdMain; +import com.nu.modules.cgd.service.INuInvoicingCgdMainService; + +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.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.def.NormalExcelConstants; +import org.jeecgframework.poi.excel.entity.ExportParams; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +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.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import org.springframework.web.servlet.ModelAndView; +import com.alibaba.fastjson.JSON; +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: nu_invoicing_cgd_main + * @Author: jeecg-boot + * @Date: 2025-09-26 + * @Version: V1.0 + */ +@Api(tags="nu_invoicing_cgd_main") +@RestController +@RequestMapping("/cgd/nuInvoicingCgdMain") +@Slf4j +public class NuInvoicingCgdMainController extends JeecgController { + @Autowired + private INuInvoicingCgdMainService nuInvoicingCgdMainService; + + /** + * 分页列表查询 + * + * @param nuInvoicingCgdMain + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "nu_invoicing_cgd_main-分页列表查询") + @ApiOperation(value="nu_invoicing_cgd_main-分页列表查询", notes="nu_invoicing_cgd_main-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(NuInvoicingCgdMain nuInvoicingCgdMain, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingCgdMain, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuInvoicingCgdMainService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param nuInvoicingCgdMain + * @return + */ + @AutoLog(value = "nu_invoicing_cgd_main-添加") + @ApiOperation(value="nu_invoicing_cgd_main-添加", notes="nu_invoicing_cgd_main-添加") + @RequiresPermissions("cgd:nu_invoicing_cgd_main:add") + @PostMapping(value = "/add") + public Result add(@RequestBody NuInvoicingCgdMain nuInvoicingCgdMain) { + nuInvoicingCgdMainService.save(nuInvoicingCgdMain); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param nuInvoicingCgdMain + * @return + */ + @AutoLog(value = "nu_invoicing_cgd_main-编辑") + @ApiOperation(value="nu_invoicing_cgd_main-编辑", notes="nu_invoicing_cgd_main-编辑") + @RequiresPermissions("cgd:nu_invoicing_cgd_main:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody NuInvoicingCgdMain nuInvoicingCgdMain) { + nuInvoicingCgdMainService.updateById(nuInvoicingCgdMain); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "nu_invoicing_cgd_main-通过id删除") + @ApiOperation(value="nu_invoicing_cgd_main-通过id删除", notes="nu_invoicing_cgd_main-通过id删除") + @RequiresPermissions("cgd:nu_invoicing_cgd_main:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + nuInvoicingCgdMainService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "nu_invoicing_cgd_main-批量删除") + @ApiOperation(value="nu_invoicing_cgd_main-批量删除", notes="nu_invoicing_cgd_main-批量删除") + @RequiresPermissions("cgd:nu_invoicing_cgd_main:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.nuInvoicingCgdMainService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "nu_invoicing_cgd_main-通过id查询") + @ApiOperation(value="nu_invoicing_cgd_main-通过id查询", notes="nu_invoicing_cgd_main-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + NuInvoicingCgdMain nuInvoicingCgdMain = nuInvoicingCgdMainService.getById(id); + if(nuInvoicingCgdMain==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(nuInvoicingCgdMain); + } + + /** + * 导出excel + * + * @param request + * @param nuInvoicingCgdMain + */ + @RequiresPermissions("cgd:nu_invoicing_cgd_main:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, NuInvoicingCgdMain nuInvoicingCgdMain) { + return super.exportXls(request, nuInvoicingCgdMain, NuInvoicingCgdMain.class, "nu_invoicing_cgd_main"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("cgd:nu_invoicing_cgd_main:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, NuInvoicingCgdMain.class); + } + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdInfo.java new file mode 100644 index 00000000..3e8f22d8 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdInfo.java @@ -0,0 +1,132 @@ +package com.nu.modules.cgd.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: nu_invoicing_cgd_info + * @Author: jeecg-boot + * @Date: 2025-09-26 + * @Version: V1.0 + */ +@Data +@TableName("nu_invoicing_cgd_info") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_invoicing_cgd_info对象", description="nu_invoicing_cgd_info") +public class NuInvoicingCgdInfo implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + /**createBy*/ + @ApiModelProperty(value = "createBy") + private 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 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") + @ApiModelProperty(value = "updateTime") + private Date updateTime; + /**sysOrgCode*/ + @ApiModelProperty(value = "sysOrgCode") + private String sysOrgCode; + /**请购单id*/ + @Excel(name = "请购单id", width = 15) + @ApiModelProperty(value = "请购单id") + private String mainId; + /**采购单id*/ + @Excel(name = "采购单id", width = 15) + @ApiModelProperty(value = "采购单id") + private String cgdId; + /**物料id*/ + @Excel(name = "物料id", width = 15) + @ApiModelProperty(value = "物料id") + private String wlId; + /**物料编码*/ + @Excel(name = "物料编码", width = 15) + @ApiModelProperty(value = "物料编码") + private String wlMaterialNo; + /**物料名称*/ + @Excel(name = "物料名称", width = 15) + @ApiModelProperty(value = "物料名称") + private String wlName; + /**采购单位*/ + @Excel(name = "采购单位", width = 15) + @ApiModelProperty(value = "采购单位") + private String wlUnits; + /**规格型号*/ + @Excel(name = "规格型号", width = 15) + @ApiModelProperty(value = "规格型号") + private String wlSpecificationModel; + /**上限*/ + @Excel(name = "上限", width = 15) + @ApiModelProperty(value = "上限") + private String wlUpperLimit; + /**下限*/ + @Excel(name = "下限", width = 15) + @ApiModelProperty(value = "下限") + private String wlLowerLimit; + /**供应商id*/ + @Excel(name = "供应商id", width = 15) + @ApiModelProperty(value = "供应商id") + private String suppliersId; + /**供应商名称*/ + @Excel(name = "供应商名称", width = 15) + @ApiModelProperty(value = "供应商名称") + private String suppliersName; + /**请购数量*/ + @Excel(name = "请购数量", width = 15) + @ApiModelProperty(value = "请购数量") + private Integer purchaseQuantity; + /**银行*/ + @Excel(name = "银行", width = 15) + @ApiModelProperty(value = "银行") + private String brand; + /**库房*/ + @Excel(name = "库房", width = 15) + @ApiModelProperty(value = "库房") + private String nuId; + /**入库数量*/ + @Excel(name = "入库数量", width = 15) + @ApiModelProperty(value = "入库数量") + private String rksl; + /**未入库数量*/ + @Excel(name = "未入库数量", width = 15) + @ApiModelProperty(value = "未入库数量") + private String wrksl; + /**采购单价*/ + @Excel(name = "采购单价", width = 15) + @ApiModelProperty(value = "采购单价") + private String procurementPrice; + /**到货单间*/ + @Excel(name = "到货单间", width = 15) + @ApiModelProperty(value = "到货单间") + private String arrivalPrice; +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java new file mode 100644 index 00000000..7c5b3077 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuInvoicingCgdMain.java @@ -0,0 +1,130 @@ +package com.nu.modules.cgd.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; +import org.jeecg.common.constant.ProvinceCityArea; +import org.jeecg.common.util.SpringContextUtils; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: nu_invoicing_cgd_main + * @Author: jeecg-boot + * @Date: 2025-09-26 + * @Version: V1.0 + */ +@Data +@TableName("nu_invoicing_cgd_main") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_invoicing_cgd_main对象", description="nu_invoicing_cgd_main") +public class NuInvoicingCgdMain implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + /**createBy*/ + @ApiModelProperty(value = "createBy") + private 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 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") + @ApiModelProperty(value = "updateTime") + private Date updateTime; + /**请购单id*/ + @Excel(name = "请购单id", width = 15) + @ApiModelProperty(value = "请购单id") + private String qgdId; + /**采购单单号*/ + @Excel(name = "采购单单号", width = 15) + @ApiModelProperty(value = "采购单单号") + private String cgdNo; + /**供应商id*/ + @Excel(name = "供应商id", width = 15) + @ApiModelProperty(value = "供应商id") + @Dict(dicCode = "id", dictTable = "nu_config_suppliers_info",dicText = "suppliers_name") + private String gysId; + /**请购时间*/ + @Excel(name = "请购时间", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "请购时间") + private Date qgDate; + /**请购人*/ + @Excel(name = "请购人", width = 15) + @ApiModelProperty(value = "请购人") + private String qgBy; + /**供应商联系人*/ + @Excel(name = "供应商联系人", width = 15) + @ApiModelProperty(value = "供应商联系人") + private String gysLxr; + /**供应商联系电话*/ + @Excel(name = "供应商联系电话", width = 15) + @ApiModelProperty(value = "供应商联系电话") + private String gysLxrdh; + /**供应商openId*/ + @Excel(name = "供应商openId", width = 15) + @ApiModelProperty(value = "供应商openId") + private String gysOpenId; + /**付款方式*/ + @Excel(name = "付款方式", width = 15) + @ApiModelProperty(value = "付款方式") + private String gysFkfs; + /**状态 0:待采购 1：采购中 2采购完成 3作废*/ + @Excel(name = "状态 0:待采购 1：采购中 2采购完成 3作废", width = 15) + @ApiModelProperty(value = "状态 0:待采购 1：采购中 2采购完成 3作废") + private String status; + /**采购单类型 0采购单 1挂帐单 2作废*/ + @Excel(name = "采购单类型 0采购单 1挂帐单 2作废", width = 15) + @ApiModelProperty(value = "采购单类型 0采购单 1挂帐单 2作废") + private String cgdType; + /**随行单*/ + @Excel(name = "随行单", width = 15) + @ApiModelProperty(value = "随行单") + private String sxdPath; + /**销账单*/ + @Excel(name = "销账单", width = 15) + @ApiModelProperty(value = "销账单") + private String xzdPath; + /**结账单*/ + @Excel(name = "结账单", width = 15) + @ApiModelProperty(value = "结账单") + private String jzdPath; + /**审核人*/ + @Excel(name = "审核人", width = 15) + @ApiModelProperty(value = "审核人") + private String reviewedBy; + /**审核时间*/ + @Excel(name = "审核时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "审核时间") + private Date reviewedTime; + /**审核备注*/ + @Excel(name = "审核备注", width = 15) + @ApiModelProperty(value = "审核备注") + private String content; +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdInfoMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdInfoMapper.java new file mode 100644 index 00000000..89337dc5 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdInfoMapper.java @@ -0,0 +1,17 @@ +package com.nu.modules.cgd.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.nu.modules.cgd.entity.NuInvoicingCgdInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: nu_invoicing_cgd_info + * @Author: jeecg-boot + * @Date: 2025-09-26 + * @Version: V1.0 + */ +public interface NuInvoicingCgdInfoMapper extends BaseMapper { + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdMainMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdMainMapper.java new file mode 100644 index 00000000..1efbfa4b --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/NuInvoicingCgdMainMapper.java @@ -0,0 +1,17 @@ +package com.nu.modules.cgd.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.nu.modules.cgd.entity.NuInvoicingCgdMain; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: nu_invoicing_cgd_main + * @Author: jeecg-boot + * @Date: 2025-09-26 + * @Version: V1.0 + */ +public interface NuInvoicingCgdMainMapper extends BaseMapper { + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml new file mode 100644 index 00000000..cc3166e7 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdInfoMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml new file mode 100644 index 00000000..70c8e90e --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/mapper/xml/NuInvoicingCgdMainMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdInfoService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdInfoService.java new file mode 100644 index 00000000..43180bdb --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdInfoService.java @@ -0,0 +1,14 @@ +package com.nu.modules.cgd.service; + +import com.nu.modules.cgd.entity.NuInvoicingCgdInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: nu_invoicing_cgd_info + * @Author: jeecg-boot + * @Date: 2025-09-26 + * @Version: V1.0 + */ +public interface INuInvoicingCgdInfoService extends IService { + +} 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 new file mode 100644 index 00000000..99f18db8 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/INuInvoicingCgdMainService.java @@ -0,0 +1,14 @@ +package com.nu.modules.cgd.service; + +import com.nu.modules.cgd.entity.NuInvoicingCgdMain; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: nu_invoicing_cgd_main + * @Author: jeecg-boot + * @Date: 2025-09-26 + * @Version: V1.0 + */ +public interface INuInvoicingCgdMainService extends IService { + +} diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdInfoServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdInfoServiceImpl.java new file mode 100644 index 00000000..1f51d7eb --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdInfoServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.cgd.service.impl; + +import com.nu.modules.cgd.entity.NuInvoicingCgdInfo; +import com.nu.modules.cgd.mapper.NuInvoicingCgdInfoMapper; +import com.nu.modules.cgd.service.INuInvoicingCgdInfoService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: nu_invoicing_cgd_info + * @Author: jeecg-boot + * @Date: 2025-09-26 + * @Version: V1.0 + */ +@Service +public class NuInvoicingCgdInfoServiceImpl extends ServiceImpl implements INuInvoicingCgdInfoService { + +} 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 new file mode 100644 index 00000000..351b1502 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.cgd.service.impl; + +import com.nu.modules.cgd.entity.NuInvoicingCgdMain; +import com.nu.modules.cgd.mapper.NuInvoicingCgdMainMapper; +import com.nu.modules.cgd.service.INuInvoicingCgdMainService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: nu_invoicing_cgd_main + * @Author: jeecg-boot + * @Date: 2025-09-26 + * @Version: V1.0 + */ +@Service +public class NuInvoicingCgdMainServiceImpl extends ServiceImpl implements INuInvoicingCgdMainService { + +} 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 a0c1b913..1d50d1eb 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 @@ -5,6 +5,8 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.nu.modules.cgd.service.INuInvoicingCgdInfoService; +import com.nu.modules.cgd.service.INuInvoicingCgdMainService; import com.nu.modules.qgd.entity.QgdMain; import com.nu.modules.qgd.service.IQgdMainService; import org.apache.shiro.SecurityUtils; @@ -45,6 +47,10 @@ public class QgdInfoController extends JeecgController @Autowired private IQgdMainService nuInvoicingQgdMainService; + @Autowired + private INuInvoicingCgdMainService nuInvoicingCgdMainService; + @Autowired + private INuInvoicingCgdInfoService nuInvoicingCgdInfoService; /** * 分页列表查询 * @@ -152,4 +158,10 @@ public class QgdInfoController extends JeecgController return Result.OK(pageList); } + + @PostMapping(value = "/addCgdByUser") + public Result addCgd(QgdInfo nuInvoicingQgdInfo, HttpServletRequest req) { + nuInvoicingQgdMainService.addCgdByUser(nuInvoicingQgdInfo); + return Result.OK("已提交采购信息"); + } } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/IQgdMainService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/IQgdMainService.java index 8e5e5fd4..fa28f55b 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/IQgdMainService.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/IQgdMainService.java @@ -1,5 +1,6 @@ package com.nu.modules.qgd.service; +import com.nu.modules.qgd.entity.QgdInfo; import com.nu.modules.qgd.entity.QgdMain; import com.baomidou.mybatisplus.extension.service.IService; @@ -11,4 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IQgdMainService extends IService { + String addCgdByUser(QgdInfo nuInvoicingQgdInfo); } 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 e27671f7..cd5a73c4 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 @@ -1,12 +1,26 @@ package com.nu.modules.qgd.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.qgd.service.IQgdMainService; +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.vo.LoginUser; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * @Description: 请购单 * @Author: jeecg-boot @@ -16,4 +30,49 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class QgdMainServiceImpl extends ServiceImpl implements IQgdMainService { + @Autowired + private QgdInfoMapper qgdInfoMapper; + + @Override + public String addCgdByUser(QgdInfo nuInvoicingQgdInfo) { + + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //查询当前人是否有请购数据 + QueryWrapper mainQueryWrapper = new QueryWrapper<>(); + mainQueryWrapper.eq("create_by",sysUser.getUsername()); + mainQueryWrapper.eq("status",0); + QgdMain qgdMain = baseMapper.selectOne(mainQueryWrapper); + if(qgdMain == null){ + return "0"; + } + //查询请购详细信息 + 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();//请购的物料列表 + map.put("suppliersId", entry.getKey()); + map.put("qgdInfoList", entry.getValue()); + mapList.add(map); + } + System.out.println(mapList); + + return "1"; + } } diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java index e948bb0a..f2c0eefc 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.nu.entity.CameraInfoEntity; import com.nu.entity.CustomerDirectiveEntity; import com.nu.entity.CustomerInfoEntity; +import com.nu.entity.ElderInfoEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -155,8 +156,10 @@ public class NuBaseInfo implements Serializable { //摄像头信息 @TableField(exist = false) private List cameraInfo; + //客户信息 @TableField(exist = false) - private CustomerInfoEntity customerInfo; + private ElderInfoEntity elderInfo; + //客户指令信息 @TableField(exist = false) private List customerDirectiveDtoList; diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java index 604aaa15..cf2c3432 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/service/impl/NuBaseInfoServiceImpl.java @@ -134,6 +134,7 @@ public class NuBaseInfoServiceImpl extends ServiceImpl list = baseMapper.queryPadPageList(page, queryWrapper); //查询相应的摄像头信息 List cameraList = cameraInfoApiService.getCameraInfoList(); + //查询未退住的老人 List customerList = elderInfoApi.selectCurrentState3(); @@ -153,9 +154,9 @@ public class NuBaseInfoServiceImpl extends ServiceImpl { if (StringUtils.equals(ni.getNuId(), nuBizCustomerInfo.getNuId())) { - CustomerInfoEntity customerInfo = new CustomerInfoEntity(); + ElderInfoEntity customerInfo = new ElderInfoEntity(); BeanUtils.copyProperties(nuBizCustomerInfo, customerInfo); - ni.setCustomerInfo(customerInfo); + ni.setElderInfo(customerInfo); //根据客户id查询服务指令 // List customerDirectiveList = nuCustomerDirectiveService.list(new QueryWrapper().lambda().eq(NuCustomerDirective::getCustomerId,customerInfo.getId())); // if(customerDirectiveList != null && customerDirectiveList.size() > 0){