From 8a6a74351435910995c752e7bcfc011dae1e8b17 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 23 Dec 2025 10:40:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=85=A5=E9=A9=BB=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/modules/suppliers/ISuppliersApi.java | 25 +++ .../advisoryinfo/entity/AdvisoryInfo.java | 1 + .../NuBizSuppliersApplyController.java | 180 ++++++++++++++++++ .../NuBizSuppliersOrgController.java | 180 ++++++++++++++++++ .../entity/NuBizSuppliersApply.java | 113 +++++++++++ .../entity/NuBizSuppliersOrg.java | 85 +++++++++ .../mapper/NuBizSuppliersApplyMapper.java | 23 +++ .../mapper/NuBizSuppliersOrgMapper.java | 17 ++ .../mapper/xml/NuBizSuppliersApplyMapper.xml | 52 +++++ .../mapper/xml/NuBizSuppliersOrgMapper.xml | 5 + .../service/INuBizSuppliersApplyService.java | 14 ++ .../service/INuBizSuppliersOrgService.java | 14 ++ .../impl/NuBizSuppliersApplyServiceImpl.java | 133 +++++++++++++ .../impl/NuBizSuppliersOrgServiceImpl.java | 19 ++ .../wechat/suppliers/SuppliersApi.java | 122 ++++++++++++ .../org/jeecg/config/shiro/ShiroConfig.java | 1 + .../nu/entity/NuBizAdvisoryInfoEntity.java | 2 + .../com/nu/entity/SuppliersApplyEntity.java | 68 +++++++ .../com/nu/entity/SuppliersOrgAllEntity.java | 38 ++++ .../com/nu/entity/SuppliersOrgEntity.java | 80 ++++++++ 20 files changed, 1172 insertions(+) create mode 100644 nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/suppliers/ISuppliersApi.java create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/controller/NuBizSuppliersApplyController.java create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/controller/NuBizSuppliersOrgController.java create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersApply.java create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersOrg.java create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/NuBizSuppliersApplyMapper.java create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/NuBizSuppliersOrgMapper.java create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersOrgMapper.xml create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/INuBizSuppliersApplyService.java create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/INuBizSuppliersOrgService.java create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java create mode 100644 nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersOrgServiceImpl.java create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/wechat/suppliers/SuppliersApi.java create mode 100644 nursing-unit-common/src/main/java/com/nu/entity/SuppliersApplyEntity.java create mode 100644 nursing-unit-common/src/main/java/com/nu/entity/SuppliersOrgAllEntity.java create mode 100644 nursing-unit-common/src/main/java/com/nu/entity/SuppliersOrgEntity.java diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/suppliers/ISuppliersApi.java b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/suppliers/ISuppliersApi.java new file mode 100644 index 0000000..f49ab8f --- /dev/null +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/suppliers/ISuppliersApi.java @@ -0,0 +1,25 @@ +package com.nu.modules.suppliers; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nu.entity.NuBillEntity; +import com.nu.entity.SuppliersApplyEntity; +import com.nu.entity.SuppliersOrgAllEntity; +import com.nu.entity.SuppliersOrgEntity; +import com.nu.modules.orgapplyinfo.entity.OrgAllInfoApiEntity; + +import java.util.List; + +public interface ISuppliersApi { + + SuppliersApplyEntity addSuppliers(SuppliersApplyEntity suppliersApplyEntity); + + IPage getSuppliersOrgInfo(Integer pageNo, Integer pageSize, String orgCode, String title, String openId); + + SuppliersOrgEntity applySupOrg(SuppliersOrgEntity suppliersOrgEntity); + + IPage getApplySuppliersOrgInfo(Integer pageNo, Integer pageSize, String orgCode, String title, String openId); + + SuppliersApplyEntity editSuppliers(SuppliersApplyEntity suppliersApplyEntity); + + SuppliersApplyEntity getSupInfoByOpenId(String openId); +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/advisoryinfo/entity/AdvisoryInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/advisoryinfo/entity/AdvisoryInfo.java index 160f973..bdf1680 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/advisoryinfo/entity/AdvisoryInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/advisoryinfo/entity/AdvisoryInfo.java @@ -104,6 +104,7 @@ public class AdvisoryInfo implements Serializable { private String izYg;//是否是员工 0否 1是 private String izJs;//是否是家属 0否 1是 private String izJg;//是否是机构 0否 1是 + private String izGys;//是否是机构 0否 1是 /**身份证号*/ @ApiModelProperty(value = "身份证号") diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/controller/NuBizSuppliersApplyController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/controller/NuBizSuppliersApplyController.java new file mode 100644 index 0000000..b4ec138 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/controller/NuBizSuppliersApplyController.java @@ -0,0 +1,180 @@ +package com.nu.modules.bizSuppliers.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.bizSuppliers.entity.NuBizSuppliersApply; +import com.nu.modules.bizSuppliers.service.INuBizSuppliersApplyService; + +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: 供应商信息 + * @Author: jeecg-boot + * @Date: 2025-12-22 + * @Version: V1.0 + */ +@Api(tags="供应商信息") +@RestController +@RequestMapping("/bizSuppliers/nuBizSuppliersApply") +@Slf4j +public class NuBizSuppliersApplyController extends JeecgController { + @Autowired + private INuBizSuppliersApplyService nuBizSuppliersApplyService; + + /** + * 分页列表查询 + * + * @param nuBizSuppliersApply + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "供应商信息-分页列表查询") + @ApiOperation(value="供应商信息-分页列表查询", notes="供应商信息-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(NuBizSuppliersApply nuBizSuppliersApply, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuBizSuppliersApply, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuBizSuppliersApplyService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param nuBizSuppliersApply + * @return + */ + @AutoLog(value = "供应商信息-添加") + @ApiOperation(value="供应商信息-添加", notes="供应商信息-添加") + @RequiresPermissions("bizSuppliers:nu_biz_suppliers_apply:add") + @PostMapping(value = "/add") + public Result add(@RequestBody NuBizSuppliersApply nuBizSuppliersApply) { + nuBizSuppliersApplyService.save(nuBizSuppliersApply); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param nuBizSuppliersApply + * @return + */ + @AutoLog(value = "供应商信息-编辑") + @ApiOperation(value="供应商信息-编辑", notes="供应商信息-编辑") + @RequiresPermissions("bizSuppliers:nu_biz_suppliers_apply:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody NuBizSuppliersApply nuBizSuppliersApply) { + nuBizSuppliersApplyService.updateById(nuBizSuppliersApply); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "供应商信息-通过id删除") + @ApiOperation(value="供应商信息-通过id删除", notes="供应商信息-通过id删除") + @RequiresPermissions("bizSuppliers:nu_biz_suppliers_apply:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + nuBizSuppliersApplyService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "供应商信息-批量删除") + @ApiOperation(value="供应商信息-批量删除", notes="供应商信息-批量删除") + @RequiresPermissions("bizSuppliers:nu_biz_suppliers_apply:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.nuBizSuppliersApplyService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "供应商信息-通过id查询") + @ApiOperation(value="供应商信息-通过id查询", notes="供应商信息-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + NuBizSuppliersApply nuBizSuppliersApply = nuBizSuppliersApplyService.getById(id); + if(nuBizSuppliersApply==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(nuBizSuppliersApply); + } + + /** + * 导出excel + * + * @param request + * @param nuBizSuppliersApply + */ + @RequiresPermissions("bizSuppliers:nu_biz_suppliers_apply:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, NuBizSuppliersApply nuBizSuppliersApply) { + return super.exportXls(request, nuBizSuppliersApply, NuBizSuppliersApply.class, "供应商信息"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizSuppliers:nu_biz_suppliers_apply:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, NuBizSuppliersApply.class); + } + +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/controller/NuBizSuppliersOrgController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/controller/NuBizSuppliersOrgController.java new file mode 100644 index 0000000..9328547 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/controller/NuBizSuppliersOrgController.java @@ -0,0 +1,180 @@ +package com.nu.modules.bizSuppliers.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.bizSuppliers.entity.NuBizSuppliersOrg; +import com.nu.modules.bizSuppliers.service.INuBizSuppliersOrgService; + +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: 供应商-机构中间表 + * @Author: jeecg-boot + * @Date: 2025-12-22 + * @Version: V1.0 + */ +@Api(tags="供应商-机构中间表") +@RestController +@RequestMapping("/bizSuppliers/nuBizSuppliersOrg") +@Slf4j +public class NuBizSuppliersOrgController extends JeecgController { + @Autowired + private INuBizSuppliersOrgService nuBizSuppliersOrgService; + + /** + * 分页列表查询 + * + * @param nuBizSuppliersOrg + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "供应商-机构中间表-分页列表查询") + @ApiOperation(value="供应商-机构中间表-分页列表查询", notes="供应商-机构中间表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(NuBizSuppliersOrg nuBizSuppliersOrg, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuBizSuppliersOrg, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = nuBizSuppliersOrgService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param nuBizSuppliersOrg + * @return + */ + @AutoLog(value = "供应商-机构中间表-添加") + @ApiOperation(value="供应商-机构中间表-添加", notes="供应商-机构中间表-添加") + @RequiresPermissions("bizSuppliers:nu_biz_suppliers_org:add") + @PostMapping(value = "/add") + public Result add(@RequestBody NuBizSuppliersOrg nuBizSuppliersOrg) { + nuBizSuppliersOrgService.save(nuBizSuppliersOrg); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param nuBizSuppliersOrg + * @return + */ + @AutoLog(value = "供应商-机构中间表-编辑") + @ApiOperation(value="供应商-机构中间表-编辑", notes="供应商-机构中间表-编辑") + @RequiresPermissions("bizSuppliers:nu_biz_suppliers_org:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody NuBizSuppliersOrg nuBizSuppliersOrg) { + nuBizSuppliersOrgService.updateById(nuBizSuppliersOrg); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "供应商-机构中间表-通过id删除") + @ApiOperation(value="供应商-机构中间表-通过id删除", notes="供应商-机构中间表-通过id删除") + @RequiresPermissions("bizSuppliers:nu_biz_suppliers_org:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + nuBizSuppliersOrgService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "供应商-机构中间表-批量删除") + @ApiOperation(value="供应商-机构中间表-批量删除", notes="供应商-机构中间表-批量删除") + @RequiresPermissions("bizSuppliers:nu_biz_suppliers_org:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.nuBizSuppliersOrgService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "供应商-机构中间表-通过id查询") + @ApiOperation(value="供应商-机构中间表-通过id查询", notes="供应商-机构中间表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + NuBizSuppliersOrg nuBizSuppliersOrg = nuBizSuppliersOrgService.getById(id); + if(nuBizSuppliersOrg==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(nuBizSuppliersOrg); + } + + /** + * 导出excel + * + * @param request + * @param nuBizSuppliersOrg + */ + @RequiresPermissions("bizSuppliers:nu_biz_suppliers_org:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, NuBizSuppliersOrg nuBizSuppliersOrg) { + return super.exportXls(request, nuBizSuppliersOrg, NuBizSuppliersOrg.class, "供应商-机构中间表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("bizSuppliers:nu_biz_suppliers_org:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, NuBizSuppliersOrg.class); + } + +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersApply.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersApply.java new file mode 100644 index 0000000..3bfb8d0 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersApply.java @@ -0,0 +1,113 @@ +package com.nu.modules.bizSuppliers.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: 供应商信息 + * @Author: jeecg-boot + * @Date: 2025-12-22 + * @Version: V1.0 + */ +@Data +@TableName("nu_biz_suppliers_apply") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_biz_suppliers_apply对象", description="供应商信息") +public class NuBizSuppliersApply implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**供应商名称*/ + @Excel(name = "供应商名称", width = 15) + @ApiModelProperty(value = "供应商名称") + private java.lang.String suppliersName; + /**供应商性质 1代理商 2批发商 3制造商*/ + @Excel(name = "供应商性质 1代理商 2批发商 3制造商", width = 15) + @ApiModelProperty(value = "供应商性质 1代理商 2批发商 3制造商") + private java.lang.String suppliersNature; + /**供应商地址*/ + @Excel(name = "供应商地址", width = 15) + @ApiModelProperty(value = "供应商地址") + private java.lang.String suppliersAddress; + /**负责人*/ + @Excel(name = "负责人", width = 15) + @ApiModelProperty(value = "负责人") + private java.lang.String personInCharge; + /**联系电话*/ + @Excel(name = "联系电话", width = 15) + @ApiModelProperty(value = "联系电话") + private java.lang.String contactNumber; + /**供应状态 1正常供应 2暂停供应*/ + @Excel(name = "供应状态 1正常供应 2暂停供应", width = 15) + @ApiModelProperty(value = "供应状态 1正常供应 2暂停供应") + private java.lang.String supplyState; + /**开户行*/ + @Excel(name = "开户行", width = 15) + @ApiModelProperty(value = "开户行") + private java.lang.String openingBank; + /**开户行账号*/ + @Excel(name = "开户行账号", width = 15) + @ApiModelProperty(value = "开户行账号") + private java.lang.String openingBankNo; + /**微信账号*/ + @Excel(name = "微信账号", width = 15) + @ApiModelProperty(value = "微信账号") + private java.lang.String wechartId; + /**资质照片*/ + @Excel(name = "资质照片", width = 15) + @ApiModelProperty(value = "资质照片") + private java.lang.String imgPath; + /**是否删除 0未删除 1删除*/ + @Excel(name = "是否删除 0未删除 1删除", width = 15) + @ApiModelProperty(value = "是否删除 0未删除 1删除") + @TableLogic + private java.lang.String delFlag; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + /**是否启用 0启用 1未启用*/ + @Excel(name = "是否启用 0启用 1未启用", width = 15) + @ApiModelProperty(value = "是否启用 0启用 1未启用") + private java.lang.String izEnabled; + /**openId*/ + @Excel(name = "openId", width = 15) + @ApiModelProperty(value = "openId") + private java.lang.String openId; +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersOrg.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersOrg.java new file mode 100644 index 0000000..c53fdb1 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersOrg.java @@ -0,0 +1,85 @@ +package com.nu.modules.bizSuppliers.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: 供应商-机构中间表 + * @Author: jeecg-boot + * @Date: 2025-12-22 + * @Version: V1.0 + */ +@Data +@TableName("nu_biz_suppliers_org") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_biz_suppliers_org对象", description="供应商-机构中间表") +public class NuBizSuppliersOrg implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.String id; + /**微信id*/ + @Excel(name = "微信id", width = 15) + @ApiModelProperty(value = "微信id") + private java.lang.String openId; + /**供应商nu_biz_suppliers_apply.id*/ + @Excel(name = "供应商nu_biz_suppliers_apply.id", width = 15) + @ApiModelProperty(value = "供应商nu_biz_suppliers_apply.id") + private java.lang.String suppliersId; + /**机构编码*/ + @Excel(name = "机构编码", width = 15) + @ApiModelProperty(value = "机构编码") + private java.lang.String orgCode; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + /**是否在线 Y在线 N不在线*/ + @Excel(name = "是否在线 Y在线 N不在线", width = 15) + @ApiModelProperty(value = "是否在线 Y在线 N不在线") + private java.lang.String izOnline; + /**申请状态 1申请中 2通过 3驳回*/ + @Excel(name = "申请状态 1申请中 2通过 3驳回", width = 15) + @ApiModelProperty(value = "申请状态 1申请中 2通过 3驳回") + private java.lang.String status; + /**审核备注*/ + @Excel(name = "审核备注", width = 15) + @ApiModelProperty(value = "审核备注") + private java.lang.String auditContent; + /**是否历史数据 Y历史 N当前数据*/ + @Excel(name = "是否历史数据 Y历史 N当前数据", width = 15) + @ApiModelProperty(value = "是否历史数据 Y历史 N当前数据") + private java.lang.String izHistory; +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/NuBizSuppliersApplyMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/NuBizSuppliersApplyMapper.java new file mode 100644 index 0000000..f07bf57 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/NuBizSuppliersApplyMapper.java @@ -0,0 +1,23 @@ +package com.nu.modules.bizSuppliers.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nu.entity.SuppliersOrgAllEntity; +import com.nu.modules.orgapplyinfo.entity.OrgAllInfoApiEntity; +import org.apache.ibatis.annotations.Param; +import com.nu.modules.bizSuppliers.entity.NuBizSuppliersApply; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 供应商信息 + * @Author: jeecg-boot + * @Date: 2025-12-22 + * @Version: V1.0 + */ +public interface NuBizSuppliersApplyMapper extends BaseMapper { + + IPage getSuppliersOrgInfo(IPage page,@Param("orgCode") String orgCode,@Param("title") String title,@Param("openId") String openId); + + IPage getApplySuppliersOrgInfo(IPage page,@Param("orgCode") String orgCode,@Param("title") String title,@Param("openId") String openId); +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/NuBizSuppliersOrgMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/NuBizSuppliersOrgMapper.java new file mode 100644 index 0000000..d84bfbe --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/NuBizSuppliersOrgMapper.java @@ -0,0 +1,17 @@ +package com.nu.modules.bizSuppliers.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.nu.modules.bizSuppliers.entity.NuBizSuppliersOrg; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 供应商-机构中间表 + * @Author: jeecg-boot + * @Date: 2025-12-22 + * @Version: V1.0 + */ +public interface NuBizSuppliersOrgMapper extends BaseMapper { + +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml new file mode 100644 index 0000000..1dc6bcb --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml @@ -0,0 +1,52 @@ + + + + + + + \ No newline at end of file diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersOrgMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersOrgMapper.xml new file mode 100644 index 0000000..1ed59b8 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersOrgMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/INuBizSuppliersApplyService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/INuBizSuppliersApplyService.java new file mode 100644 index 0000000..7a6e79e --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/INuBizSuppliersApplyService.java @@ -0,0 +1,14 @@ +package com.nu.modules.bizSuppliers.service; + +import com.nu.modules.bizSuppliers.entity.NuBizSuppliersApply; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 供应商信息 + * @Author: jeecg-boot + * @Date: 2025-12-22 + * @Version: V1.0 + */ +public interface INuBizSuppliersApplyService extends IService { + +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/INuBizSuppliersOrgService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/INuBizSuppliersOrgService.java new file mode 100644 index 0000000..6a88b06 --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/INuBizSuppliersOrgService.java @@ -0,0 +1,14 @@ +package com.nu.modules.bizSuppliers.service; + +import com.nu.modules.bizSuppliers.entity.NuBizSuppliersOrg; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 供应商-机构中间表 + * @Author: jeecg-boot + * @Date: 2025-12-22 + * @Version: V1.0 + */ +public interface INuBizSuppliersOrgService extends IService { + +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java new file mode 100644 index 0000000..ba5794c --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java @@ -0,0 +1,133 @@ +package com.nu.modules.bizSuppliers.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nu.entity.SuppliersApplyEntity; +import com.nu.entity.SuppliersOrgAllEntity; +import com.nu.entity.SuppliersOrgEntity; +import com.nu.modules.bizSuppliers.entity.NuBizSuppliersApply; +import com.nu.modules.bizSuppliers.entity.NuBizSuppliersOrg; +import com.nu.modules.bizSuppliers.mapper.NuBizSuppliersApplyMapper; +import com.nu.modules.bizSuppliers.mapper.NuBizSuppliersOrgMapper; +import com.nu.modules.bizSuppliers.service.INuBizSuppliersApplyService; +import com.nu.modules.orgapplyinfo.entity.OrgAllInfo; +import com.nu.modules.orgapplyinfo.entity.OrgAllInfoApiEntity; +import com.nu.modules.suppliers.ISuppliersApi; +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 java.util.List; + +/** + * @Description: 供应商信息 + * @Author: jeecg-boot + * @Date: 2025-12-22 + * @Version: V1.0 + */ +@Service +public class NuBizSuppliersApplyServiceImpl extends ServiceImpl implements INuBizSuppliersApplyService, ISuppliersApi { + + @Autowired + private NuBizSuppliersOrgMapper nuBizSuppliersOrgMapper; + + @Override + public SuppliersApplyEntity addSuppliers(SuppliersApplyEntity suppliersApplyEntity) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("open_id", suppliersApplyEntity.getOpenId()); + List list = baseMapper.selectList(queryWrapper); + if (list.size() > 0) { + BeanUtils.copyProperties(list.get(0), suppliersApplyEntity); + return suppliersApplyEntity; + } + NuBizSuppliersApply nuBizSuppliersApply = new NuBizSuppliersApply(); + BeanUtils.copyProperties(suppliersApplyEntity, nuBizSuppliersApply); + baseMapper.insert(nuBizSuppliersApply); + BeanUtils.copyProperties(nuBizSuppliersApply, suppliersApplyEntity); + return suppliersApplyEntity; + } + + @Override + public IPage getSuppliersOrgInfo(Integer pageNo, Integer pageSize, String orgCode, String title, String openId) { + IPage page = new Page<>(pageNo, pageSize); + IPage list = baseMapper.getSuppliersOrgInfo(page, orgCode, title, openId); + return list; + } + + @Override + public SuppliersOrgEntity applySupOrg(SuppliersOrgEntity suppliersOrgEntity) { + NuBizSuppliersOrg nuBizSuppliersOrg = new NuBizSuppliersOrg(); + BeanUtils.copyProperties(suppliersOrgEntity, nuBizSuppliersOrg); + + QueryWrapper orgqueryWrapper = new QueryWrapper<>(); + orgqueryWrapper.eq("open_id", suppliersOrgEntity.getOpenId()); + orgqueryWrapper.eq("org_code", suppliersOrgEntity.getOrgCode()); + orgqueryWrapper.eq("status", "1"); + //查询是否又申请中的数据，如果又直接返回申请数据 + List listOrg = nuBizSuppliersOrgMapper.selectList(orgqueryWrapper); + if (listOrg.size() > 0) { + BeanUtils.copyProperties(listOrg.get(0), suppliersOrgEntity); + return suppliersOrgEntity; + }else{ + //修改原来的数据都改为历史数据 + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("open_id", suppliersOrgEntity.getOpenId()); + updateWrapper.eq("org_code", suppliersOrgEntity.getOrgCode()); + NuBizSuppliersOrg nuBizSuppliersOrgUp = new NuBizSuppliersOrg(); + nuBizSuppliersOrgUp.setIzHistory("Y"); + nuBizSuppliersOrgMapper.update(nuBizSuppliersOrgUp, updateWrapper); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("open_id", suppliersOrgEntity.getOpenId()); + List list = baseMapper.selectList(queryWrapper); + //查询供应商信息，赋值对应字段 + if (list.size() > 0) { + nuBizSuppliersOrg.setSuppliersId(list.get(0).getId()); + } + nuBizSuppliersOrg.setStatus("1"); + nuBizSuppliersOrg.setIzHistory("N"); + nuBizSuppliersOrgMapper.insert(nuBizSuppliersOrg); + + //todo 向对应业务机构添加供应商审核数据 + + BeanUtils.copyProperties(nuBizSuppliersOrg, suppliersOrgEntity); + return suppliersOrgEntity; + } + + @Override + public IPage getApplySuppliersOrgInfo(Integer pageNo, Integer pageSize, String orgCode, String title, String openId) { + IPage page = new Page<>(pageNo, pageSize); + IPage list = baseMapper.getApplySuppliersOrgInfo(page, orgCode, title, openId); + return list; + } + + @Override + public SuppliersApplyEntity editSuppliers(SuppliersApplyEntity suppliersApplyEntity) { + NuBizSuppliersApply nuBizSuppliersApply = new NuBizSuppliersApply(); + BeanUtils.copyProperties(suppliersApplyEntity, nuBizSuppliersApply); + baseMapper.updateById(nuBizSuppliersApply); + + //todo 修改对应机构的供应商数据 + + BeanUtils.copyProperties(nuBizSuppliersApply, suppliersApplyEntity); + return suppliersApplyEntity; + } + + @Override + public SuppliersApplyEntity getSupInfoByOpenId(String openId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("open_id", openId); + List list = baseMapper.selectList(queryWrapper); + if (list.size() > 0) { + SuppliersApplyEntity suppliersApplyEntity = new SuppliersApplyEntity(); + BeanUtils.copyProperties(list.get(0), suppliersApplyEntity); + return suppliersApplyEntity; + } + return null; + } + +} diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersOrgServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersOrgServiceImpl.java new file mode 100644 index 0000000..ef3a2af --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersOrgServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.bizSuppliers.service.impl; + +import com.nu.modules.bizSuppliers.entity.NuBizSuppliersOrg; +import com.nu.modules.bizSuppliers.mapper.NuBizSuppliersOrgMapper; +import com.nu.modules.bizSuppliers.service.INuBizSuppliersOrgService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 供应商-机构中间表 + * @Author: jeecg-boot + * @Date: 2025-12-22 + * @Version: V1.0 + */ +@Service +public class NuBizSuppliersOrgServiceImpl extends ServiceImpl implements INuBizSuppliersOrgService { + +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/suppliers/SuppliersApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/suppliers/SuppliersApi.java new file mode 100644 index 0000000..71eeb79 --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/suppliers/SuppliersApi.java @@ -0,0 +1,122 @@ +package com.nu.modules.wechat.suppliers; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.google.common.collect.Maps; +import com.nu.entity.EmployeesOrgApiEntity; +import com.nu.entity.SuppliersApplyEntity; +import com.nu.entity.SuppliersOrgAllEntity; +import com.nu.entity.SuppliersOrgEntity; +import com.nu.modules.orgapplyinfo.entity.EmployeesApiEntity; +import com.nu.modules.orgapplyinfo.entity.OrgAllInfoApiEntity; +import com.nu.modules.suppliers.ISuppliersApi; +import org.jeecg.common.api.vo.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + + +@RestController +@RequestMapping("/api/suppliers") +public class SuppliersApi { + @Autowired + private ISuppliersApi suppliersApi; + + + /** + * 入驻供应商 + * @param suppliersApplyEntity + * @return + */ + @PostMapping(value = "/addSuppliers") + public Result addSuppliers(@RequestBody SuppliersApplyEntity suppliersApplyEntity) { + SuppliersApplyEntity suppliersApplyEntity1 = suppliersApi.addSuppliers(suppliersApplyEntity); + return Result.OK(suppliersApplyEntity); + } + + + /** + * 修改供应商信息 + * @param suppliersApplyEntity + * @return + */ + @PostMapping(value = "/editSuppliers") + public Result editSuppliers(@RequestBody SuppliersApplyEntity suppliersApplyEntity) { + SuppliersApplyEntity suppliersApplyEntity1 = suppliersApi.editSuppliers(suppliersApplyEntity); + return Result.OK(suppliersApplyEntity); + } + + /** + * 获取供应商已经入驻机构的信息 + * @param pageNo + * @param pageSize + * @param orgCode + * @param title + * @param openId + * @return + */ + @GetMapping(value = "/getSuppliersOrgInfo") + public Result> getSuppliersOrgInfo( + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "8") Integer pageSize, + @RequestParam(value = "orgCode", defaultValue = "", required = false) String orgCode, + @RequestParam(value = "title", defaultValue = "", required = false) String title, + @RequestParam(value = "openId") String openId) { + IPage result = suppliersApi.getSuppliersOrgInfo(pageNo, pageSize, orgCode, title,openId); + List sourceRecords = result.getRecords(); + if (sourceRecords == null || sourceRecords.size() <= 0) { + return Result.OK(result); + } + return Result.OK(result); + } + + /** + * 供应商入驻机构 + * @param suppliersOrgEntity + * @return + */ + @PostMapping(value = "/applySupOrg") + public Result applySupOrg(@RequestBody SuppliersOrgEntity suppliersOrgEntity) { + suppliersApi.applySupOrg(suppliersOrgEntity); + return Result.OK(suppliersOrgEntity); + } + + + /** + * 获取供应商可入驻机构信息 + * @param pageNo + * @param pageSize + * @param orgCode + * @param title + * @param openId + * @return + */ + @GetMapping(value = "/getApplySuppliersOrgInfo") + public Result> getApplySuppliersOrgInfo( + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "8") Integer pageSize, + @RequestParam(value = "orgCode", defaultValue = "", required = false) String orgCode, + @RequestParam(value = "title", defaultValue = "", required = false) String title, + @RequestParam(value = "openId") String openId) { + IPage result = suppliersApi.getApplySuppliersOrgInfo(pageNo, pageSize, orgCode, title,openId); + List sourceRecords = result.getRecords(); + if (sourceRecords == null || sourceRecords.size() <= 0) { + return Result.OK(result); + } + return Result.OK(result); + } + + /** + * 根据openId获取供应商信息 + * @param openId + * @return + */ + @GetMapping(value = "/getSupInfoByOpenId") + public Result getSupInfoByOpenId( + @RequestParam(value = "openId") String openId) { + SuppliersApplyEntity result = suppliersApi.getSupInfoByOpenId(openId); + return Result.OK(result); + } + +} 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 5877806..de7931e 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 @@ -118,6 +118,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/sys/sysDepart/queryInstitutionsList", "anon");//授权接口排除 filterChainDefinitionMap.put("/api/elderInfo/**", "anon"); //授权接口排除 filterChainDefinitionMap.put("/weixin/**", "anon"); //授权接口排除 + filterChainDefinitionMap.put("/api/suppliers/**", "anon"); //供应商入驻 filterChainDefinitionMap.put("/api/pad/loginApi/**", "anon"); //pad登录-信息获取接口 filterChainDefinitionMap.put("/sys/common/open/static/**", "anon");//获取本地文件资源 filterChainDefinitionMap.put("/api/sysUtils/refreshDS", "anon");//刷新数据源 diff --git a/nursing-unit-common/src/main/java/com/nu/entity/NuBizAdvisoryInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/NuBizAdvisoryInfoEntity.java index 676c521..3c9fd59 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/NuBizAdvisoryInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/NuBizAdvisoryInfoEntity.java @@ -67,6 +67,8 @@ public class NuBizAdvisoryInfoEntity implements Serializable { private String izJs; //是否是机构 0否 1是 private String izJg; + //是否是机构 0否 1是 + private String izGys; diff --git a/nursing-unit-common/src/main/java/com/nu/entity/SuppliersApplyEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/SuppliersApplyEntity.java new file mode 100644 index 0000000..bb4736c --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/SuppliersApplyEntity.java @@ -0,0 +1,68 @@ +package com.nu.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +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: 供应商信息 + * @Author: jeecg-boot + * @Date: 2025-12-22 + * @Version: V1.0 + */ +@Data +public class SuppliersApplyEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @ApiModelProperty(value = "id") + private String id; + /**供应商名称*/ + private String suppliersName; + /**供应商性质 1代理商 2批发商 3制造商*/ + private String suppliersNature; + /**供应商地址*/ + private String suppliersAddress; + /**负责人*/ + private String personInCharge; + /**联系电话*/ + private String contactNumber; + /**供应状态 1正常供应 2暂停供应*/ + private String supplyState; + /**开户行*/ + private String openingBank; + /**开户行账号*/ + private String openingBankNo; + /**微信账号*/ + private String wechartId; + /**资质照片*/ + private String imgPath; + /**是否删除 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; + /**openId*/ + private String openId; +} diff --git a/nursing-unit-common/src/main/java/com/nu/entity/SuppliersOrgAllEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/SuppliersOrgAllEntity.java new file mode 100644 index 0000000..9d8e82a --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/SuppliersOrgAllEntity.java @@ -0,0 +1,38 @@ +package com.nu.entity; + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Description: 机构全部信息 + * @Author: zmy + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Data +public class SuppliersOrgAllEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 机构id + */ + private String orgId; + + private String departName; + + private String orgCode; + + private String orgLeader; + + private String orgLeaderPhone; + + private String orgAddress; + + private String suppliersStatus; + + private String serverUrl; + +} diff --git a/nursing-unit-common/src/main/java/com/nu/entity/SuppliersOrgEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/SuppliersOrgEntity.java new file mode 100644 index 0000000..18bca87 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/SuppliersOrgEntity.java @@ -0,0 +1,80 @@ +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: 供应商-机构中间表 + * @Author: jeecg-boot + * @Date: 2025-12-22 + * @Version: V1.0 + */ +@Data +@TableName("nu_biz_suppliers_org") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_biz_suppliers_org对象", description="供应商-机构中间表") +public class SuppliersOrgEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + /**微信id*/ + @Excel(name = "微信id", width = 15) + @ApiModelProperty(value = "微信id") + private String openId; + /**供应商nu_biz_suppliers_apply.id*/ + @Excel(name = "供应商nu_biz_suppliers_apply.id", width = 15) + @ApiModelProperty(value = "供应商nu_biz_suppliers_apply.id") + private String suppliersId; + /**机构编码*/ + @Excel(name = "机构编码", width = 15) + @ApiModelProperty(value = "机构编码") + private String orgCode; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + /**是否在线 Y在线 N不在线*/ + @Excel(name = "是否在线 Y在线 N不在线", width = 15) + @ApiModelProperty(value = "是否在线 Y在线 N不在线") + private String izOnline; + /**申请状态 1申请中 2通过 3驳回*/ + @Excel(name = "申请状态 1申请中 2通过 3驳回", width = 15) + @ApiModelProperty(value = "申请状态 1申请中 2通过 3驳回") + private String status; + /**审核备注*/ + @Excel(name = "审核备注", width = 15) + @ApiModelProperty(value = "审核备注") + private String auditContent; + /**是否历史数据 Y历史 N当前数据*/ + @Excel(name = "是否历史数据 Y历史 N当前数据", width = 15) + @ApiModelProperty(value = "是否历史数据 Y历史 N当前数据") + private String izHistory; +}