修改供应商流程

nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/suppliers/ISuppliersApi.java

@@ -2,13 +2,11 @@ package com.nu.modules.suppliers;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nu.dto.SuppliersMaterialInfoDto;
-import com.nu.entity.NuBillEntity;
+import com.nu.entity.*;
-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;
+import java.util.Map;
 
 public interface ISuppliersApi {
 
@@ -37,4 +35,17 @@ public interface ISuppliersApi {
     SuppliersApplyEntity getSupInfoByApplyId(String id);
 
     SuppliersApplyEntity getShowInfoByOpenId(String openId);
+
+    List<SysDepartEntity> getSuppliersOrgInfoByOpenId(String openId);
+
+    List<SuppliersMaterialTypeEntity> getSuppliersMaterialType(String orgCode,String suppliersId);
+
+    IPage<SuppliersMaterialInfoDto> getSuppliersMaterialInfo(String orgCode, String materialTypeId,String suppliersId,Integer pageNo,Integer pageSize);
+
+    List<Map<String,Object>> getSuppliersMaterialTypeByCondition(String orgCode, String suppliersId);
+
+    List<SuppliersMaterialInfoDto> addSuppliersMaterialInfo(String orgCode,String suppliersId,List<SuppliersMaterialInfoDto> suppliersMaterialInfoDtos);
+
+    SuppliersMaterialInfoDto editSuppliersMaterialInfo(SuppliersMaterialInfoDto suppliersMaterialInfoDtos);
+
 }

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/entity/NuBizSuppliersMaterialInfo.java

@@ -79,4 +79,6 @@ public class NuBizSuppliersMaterialInfo implements Serializable {
 	@Excel(name = "销售单位", width = 15)
     @ApiModelProperty(value = "销售单位")
     private java.lang.String salesUnit;
+    private java.lang.String orgCode;
+    private java.lang.String manufacturer;
 }

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/NuBizSuppliersApplyMapper.java

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nu.entity.SuppliersApplyEntity;
+import com.nu.dto.SuppliersMaterialInfoDto;
-import com.nu.entity.SuppliersOrgAllEntity;
+import com.nu.entity.*;
 import com.nu.modules.orgapplyinfo.entity.OrgAllInfoApiEntity;
 import org.apache.ibatis.annotations.Param;
 import com.nu.modules.bizSuppliers.entity.NuBizSuppliersApply;
@@ -30,4 +30,12 @@ public interface NuBizSuppliersApplyMapper extends BaseMapper<NuBizSuppliersAppl
     IPage<NuBizSuppliersApply> listPage(Page<NuBizSuppliersApply> page, @Param(Constants.WRAPPER)  QueryWrapper<NuBizSuppliersApply> queryWrapper);
 
     SuppliersApplyEntity getShowInfoByOpenId(@Param("openId")  String openId);
+
+    List<SysDepartEntity> getSuppliersOrgInfoByOpenId(@Param("openId") String openId);
+
+    List<SuppliersMaterialTypeEntity> getSuppliersMaterialType(@Param("suppliersId") String suppliersId);
+
+    IPage<SuppliersMaterialInfoDto> getSuppliersMaterialInfo(@Param("materialTypeId")String materialTypeId,@Param("suppliersId")String suppliersId,IPage<SuppliersMaterialInfoDto> page);
+
+    List<SuppliersMaterialTypeEntity> getCategoryList(@Param("suppliersId")String suppliersId);
 }

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/NuBizSuppliersMaterialInfoMapper.java

@@ -19,4 +19,5 @@ public interface NuBizSuppliersMaterialInfoMapper extends BaseMapper<NuBizSuppli
     List<NuBizSuppliersMaterialInfo> noList(@Param("list") List<NuBizSuppliersMaterialInfo> list);
 
     IPage<SuppliersMaterialInfoDto> getSuppliersWlInfo(IPage<SuppliersMaterialInfoDto> page, @Param("title") String title, @Param("suppliersId") String suppliersId);
+
 }

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/mapper/xml/NuBizSuppliersApplyMapper.xml

@@ -166,4 +166,30 @@
         AND iz_history = 'N'
         AND opt_type = '入驻' and suppliers_id is null
     </select>
+
+    <select id="getSuppliersOrgInfoByOpenId" resultType="com.nu.entity.SysDepartEntity">
+        select b.* from nu_biz_suppliers_org a
+        LEFT JOIN sys_depart b on a.org_code = b.org_code
+        where a.open_id = #{openId}
+    </select>
+    <select id="getSuppliersMaterialType" resultType="com.nu.entity.SuppliersMaterialTypeEntity">
+        select a.*,b.type_name from nu_biz_suppliers_material_type a
+        LEFT JOIN nu_config_material_type b on a.material_type_id = b.id
+        where suppliers_id = #{suppliersId}
+    </select>
+    <select id="getSuppliersMaterialInfo" resultType="com.nu.dto.SuppliersMaterialInfoDto">
+        select a.id,a.material_name,a.specification_model,a.brand_type,a.manufacturer,b.category_name,c.type_name
+        from nu_config_material_info a
+        left join nu_config_material_category b on a.category_id = b.id
+        left join nu_config_material_type c on a.type_id = c.id
+        where a.type_id in (select material_type_id from nu_biz_suppliers_material_type where suppliers_id = #{suppliersId} )
+        <if test="materialTypeId != null and materialTypeId != ''">
+            and a.type_id = #{materialTypeId}
+        </if>
+    </select>
+    <select id="getCategoryList" resultType="com.nu.entity.SuppliersMaterialTypeEntity">
+        select * from nu_config_material_category where id in (select parent_id from nu_biz_suppliers_material_type where suppliers_id = #{suppliersId} )
+    </select>
+
+
 </mapper>

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersApplyServiceImpl.java

@@ -1,7 +1,9 @@
 package com.nu.modules.bizSuppliers.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -27,11 +29,13 @@ import com.nu.modules.suppliers.ISuppliersApi;
 import com.nu.modules.wxnotice.IWxNoticeApi;
 import com.nu.utils.DictUtils;
 import com.nu.utils.RabbitMQUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -47,6 +51,7 @@ import java.util.*;
  * @Date: 2025-12-22
  * @Version: V1.0
  */
+@Slf4j
 @Service
 public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersApplyMapper, NuBizSuppliersApply> implements INuBizSuppliersApplyService, ISuppliersApi {
 
@@ -71,6 +76,10 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
     @Autowired
     private DictUtils dictUtils;
 
+    @Lazy
+    @Autowired
+    private NuBizSuppliersApplyServiceImpl lazyService;
+
     @Override
     public SuppliersApplyEntity addSuppliers(SuppliersApplyEntity suppliersApplyEntity) {
 
@@ -321,6 +330,104 @@ public class NuBizSuppliersApplyServiceImpl extends ServiceImpl<NuBizSuppliersAp
         return nuBizSuppliersInfo;
     }
 
+    /**
+     * 获取供应商机构信息
+     * @param openId
+     * @return
+     */
+    @Override
+    public List<SysDepartEntity> getSuppliersOrgInfoByOpenId(String openId) {
+        return baseMapper.getSuppliersOrgInfoByOpenId(openId);
+    }
+
+    /**
+     * 获取供应商物料分类
+     * @param orgCode
+     * @return
+     */
+    @Override
+    @DS("#orgCode")
+    public List<SuppliersMaterialTypeEntity> getSuppliersMaterialType(String orgCode,String suppliersId) {
+        return baseMapper.getSuppliersMaterialType(suppliersId);
+    }
+
+    /**
+     * 获取供应商物料信息
+     * @param orgCode
+     * @param materialTypeId
+     * @return
+     */
+    @Override
+    @DS("#orgCode")
+    public IPage<SuppliersMaterialInfoDto> getSuppliersMaterialInfo(String orgCode, String materialTypeId,String suppliersId,Integer pageNo,Integer pageSize) {
+        IPage<SuppliersMaterialInfoDto> page = new Page<>(pageNo, pageSize);
+        return baseMapper.getSuppliersMaterialInfo(materialTypeId,suppliersId,page);
+    }
+
+    /**
+     * 获取供应商物料分类-筛选功能
+     * @param orgCode
+     * @return
+     */
+    @Override
+    @DS("#orgCode")
+    public List<Map<String,Object>> getSuppliersMaterialTypeByCondition(String orgCode,String suppliersId) {
+//        一级分类
+        List<SuppliersMaterialTypeEntity> list = baseMapper.getCategoryList(suppliersId);
+//        二级分类
+        List<SuppliersMaterialTypeEntity> list2 = baseMapper.getSuppliersMaterialType(suppliersId);
+        List<Map<String,Object>> list3 = new ArrayList<>();
+        for (SuppliersMaterialTypeEntity param1 : list){
+            Map<String ,Object> map = new HashMap<>();
+            map.put("id",param1.getId());
+            map.put("name",param1.getCategoryName());
+            List<Map<String, Object>> map2 = new ArrayList<>();
+            for (SuppliersMaterialTypeEntity param2 : list2){
+                if (param1.getId().equals(param2.getParentId())){
+                    Map<String,Object> map3 = new HashMap<>();
+                    map3.put("id",param2.getId());
+                    map3.put("name",param2.getTypeName());
+                    map2.add(map3);
+                }
+            }
+            map.put("children",map2);
+            list3.add(map);
+        }
+        return list3;
+    }
+
+    /**
+     * 添加供应商物料信息
+     * @param suppliersMaterialInfoDtos
+     * @return
+     */
+    @Override
+    public List<SuppliersMaterialInfoDto> addSuppliersMaterialInfo(String orgCode,String suppliersId,List<SuppliersMaterialInfoDto> suppliersMaterialInfoDtos) {
+        List<NuBizSuppliersMaterialInfo> addList = BeanUtil.copyToList(suppliersMaterialInfoDtos, NuBizSuppliersMaterialInfo.class);
+        for (NuBizSuppliersMaterialInfo nuBizSuppliersMaterialInfo : addList){
+            nuBizSuppliersMaterialInfo.setSuppliersId(suppliersId);
+            nuBizSuppliersMaterialInfo.setOrgCode(orgCode);
+            nuBizSuppliersMaterialInfoMapper.insert(nuBizSuppliersMaterialInfo);
+        }
+        return null;
+    }
+
+    /**
+     * 修改供应商物料信息
+     * @param suppliersMaterialInfoDtos
+     * @return
+     */
+    @Override
+    public SuppliersMaterialInfoDto editSuppliersMaterialInfo(SuppliersMaterialInfoDto suppliersMaterialInfoDtos) {
+        NuBizSuppliersMaterialInfo nuBizSuppliersMaterialInfo = new NuBizSuppliersMaterialInfo();
+        BeanUtils.copyProperties(suppliersMaterialInfoDtos, nuBizSuppliersMaterialInfo);
+        nuBizSuppliersMaterialInfoMapper.updateById(nuBizSuppliersMaterialInfo);
+        SuppliersMaterialInfoDto suppliersInfoMQDto = new SuppliersMaterialInfoDto();
+        BeanUtils.copyProperties(nuBizSuppliersMaterialInfo, suppliersInfoMQDto);
+        rabbitMQUtil.sendToExchange("nu.suppliers.applyStatus", suppliersMaterialInfoDtos.getOrgCode() + ".suppliers.updateMaterialInfo", suppliersInfoMQDto);
+        return null;
+    }
+
     @Override
     public IPage<NuBizSuppliersApply> listPage(Page<NuBizSuppliersApply> page, QueryWrapper<NuBizSuppliersApply> queryWrapper) {
         return baseMapper.listPage(page, queryWrapper);

nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/suppliers/listener/SuppliersMQListener.java

@@ -236,8 +236,11 @@ public class SuppliersMQListener {
 
         NuBizSuppliersInfo suppliersInfo = suppliersInfoService.getById(suppliersInfoMQDto.getId());
 
-        NuBizSuppliersOrg nuBizSuppliersOrgYuan = nuBizSuppliersOrgService.getById(suppliersInfo.getId());
+        QueryWrapper<NuBizSuppliersOrg> queryWrapper = new QueryWrapper<>();
-        if(nuBizSuppliersOrgYuan==null){
+        queryWrapper.eq("suppliers_id",suppliersInfoMQDto.getSuppliersId());
+        queryWrapper.eq("org_code",suppliersInfoMQDto.getSysOrgCode());
+        NuBizSuppliersOrg nuBizSuppliersOrg1 =nuBizSuppliersOrgService.getOne(queryWrapper);
+        if(nuBizSuppliersOrg1==null){
             NuBizSuppliersOrg nuBizSuppliersOrg = new NuBizSuppliersOrg();
             BeanUtils.copyProperties(suppliersInfoMQDto, nuBizSuppliersOrg);
             nuBizSuppliersOrg.setSuppliersId(suppliersInfo.getId());
@@ -245,6 +248,7 @@ public class SuppliersMQListener {
             nuBizSuppliersOrg.setStatus("2");//直接审核通过
             nuBizSuppliersOrg.setOpenId(suppliersInfo.getOpenId());
             nuBizSuppliersOrg.setOrgCode(suppliersInfoMQDto.getSysOrgCode());
+            //没有合作过才新增数据，否则不新增数据
             nuBizSuppliersOrgService.save(nuBizSuppliersOrg);
         }
 

nursing-unit-api/src/main/java/com/nu/modules/wechat/suppliers/SuppliersApi.java

@@ -3,10 +3,7 @@ package com.nu.modules.wechat.suppliers;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.collect.Maps;
 import com.nu.dto.SuppliersMaterialInfoDto;
-import com.nu.entity.EmployeesOrgApiEntity;
+import com.nu.entity.*;
-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;
@@ -15,6 +12,7 @@ import org.jeecg.common.api.vo.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -184,4 +182,64 @@ public class SuppliersApi {
         return Result.OK(result);
     }
 
+
+    //查询供应商合作的机构信息
+    @GetMapping(value = "/getSuppliersOrgInfoByOpenId")
+    public Result<List<SysDepartEntity>> getSuppliersOrgInfoByOpenId(@RequestParam(value = "openId",required = true) String openId){
+        List<SysDepartEntity> result = suppliersApi.getSuppliersOrgInfoByOpenId(openId);
+        return Result.OK(result);
+    }
+
+    //查询物料分类集合
+    @GetMapping(value = "/getSuppliersMaterialType")
+    public Result<List<SuppliersMaterialTypeEntity>> getSuppliersMaterialType(@RequestParam(value = "orgCode",required = true) String orgCode,@RequestParam(value = "openId",required = true) String openId){
+        SuppliersApplyEntity suppliersApplyEntity = suppliersApi.getShowInfoByOpenId(openId);
+        List<SuppliersMaterialTypeEntity> result = suppliersApi.getSuppliersMaterialType(orgCode,suppliersApplyEntity.getSuppliersId());
+        return Result.OK(result);
+    }
+
+    //查询机构下的物料集合
+    @GetMapping(value = "/getSuppliersMaterialInfo")
+    public Result<IPage<SuppliersMaterialInfoDto>> getSuppliersMaterialInfo(@RequestParam(value = "orgCode",required = true) String orgCode,@RequestParam(value = "materialTypeId",required = false) String materialTypeId,@RequestParam(value = "openId",required = true) String openId,
+            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,  @RequestParam(name = "pageSize", defaultValue = "8") Integer pageSize){
+        SuppliersApplyEntity suppliersApplyEntity = suppliersApi.getShowInfoByOpenId(openId);
+        IPage<SuppliersMaterialInfoDto> result = suppliersApi.getSuppliersMaterialInfo(orgCode,materialTypeId,suppliersApplyEntity.getSuppliersId(),pageNo, pageSize);
+        // todo 判断物料是否只读
+        return Result.OK(result);
+    }
+
+    //查询筛选条件的物料分类
+    @GetMapping(value = "/getSuppliersMaterialTypeByCondition")
+    public Result<List<Map<String,Object>>> getSuppliersMaterialTypeByCondition(@RequestParam(value = "orgCode",required = true) String orgCode,@RequestParam(value = "openId",required = true) String openId){
+        SuppliersApplyEntity suppliersApplyEntity = suppliersApi.getShowInfoByOpenId(openId);
+        List<Map<String,Object>> result = suppliersApi.getSuppliersMaterialTypeByCondition(orgCode,suppliersApplyEntity.getSuppliersId());
+        return Result.OK(result);
+    }
+
+    //供应商物料批量新增
+    @PostMapping(value = "/addSuppliersMaterialInfo")
+    public Result<Object> addSuppliersMaterialInfo(@RequestBody Map<String,Object> map){
+        String orgCode = map.get("orgCode").toString();
+        String openId = map.get("openId").toString();
+        if (StringUtils.isBlank(openId) || StringUtils.isBlank(orgCode)){
+            return Result.error("参数错误");
+        }
+        List<SuppliersMaterialInfoDto> suppliersMaterialInfoDtos = (List<SuppliersMaterialInfoDto>) map.get("addList");
+        SuppliersApplyEntity suppliersApplyEntity = suppliersApi.getShowInfoByOpenId(openId);
+        List<SuppliersMaterialInfoDto> result = suppliersApi.addSuppliersMaterialInfo(orgCode,suppliersApplyEntity.getSuppliersId(),suppliersMaterialInfoDtos);
+        return Result.OK("添加成功");
+    }
+
+    //供应商修改物料的单位及价格
+    @PostMapping(value = "/editSuppliersMaterialInfo")
+    public Result<Object> editSuppliersMaterialInfo(@RequestBody SuppliersMaterialInfoDto suppliersMaterialInfoDtos){
+        String openId = suppliersMaterialInfoDtos.getOpenId();
+        SuppliersApplyEntity suppliersApplyEntity = suppliersApi.getShowInfoByOpenId(openId);
+        suppliersMaterialInfoDtos.setSuppliersId(suppliersApplyEntity.getSuppliersId());
+        SuppliersMaterialInfoDto result = suppliersApi.editSuppliersMaterialInfo(suppliersMaterialInfoDtos);
+        return Result.OK("编辑成功");
+    }
+
+
+
 }

nursing-unit-common/src/main/java/com/nu/dto/SuppliersMaterialInfoDto.java

@@ -78,4 +78,10 @@ public class SuppliersMaterialInfoDto implements Serializable {
 	@Excel(name = "销售单位", width = 15)
     @ApiModelProperty(value = "销售单位")
     private String salesUnit;
+    /**销售单位*/
+    private String orgCode;
+    private String categoryName;
+    private String typeName;
+    private String isRead;
+    private String openId;
 }

nursing-unit-common/src/main/java/com/nu/entity/ConfigSuppliersInfoEntity.java

@@ -0,0 +1,100 @@
+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.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: 张明远
+ * @Date:   2025-03-12
+ * @Version: V1.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class ConfigSuppliersInfoEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**供应商名称*/
+	@Excel(name = "供应商名称", width = 15)
+    @ApiModelProperty(value = "供应商名称")
+    private String suppliersName;
+	/**供应商性质*/
+	@Excel(name = "供应商性质", width = 15, dicCode = "suppliers_nature")
+	@Dict(dicCode = "suppliers_nature")
+    @ApiModelProperty(value = "供应商性质")
+    private String suppliersNature;
+	/**供应商地址*/
+	@Excel(name = "供应商地址", width = 15)
+    @ApiModelProperty(value = "供应商地址")
+    private String suppliersAddress;
+	/**负责人*/
+	@Excel(name = "负责人", width = 15)
+    @ApiModelProperty(value = "负责人")
+    private String personInCharge;
+	/**联系电话*/
+	@Excel(name = "联系电话", width = 15)
+    @ApiModelProperty(value = "联系电话")
+    private String contactNumber;
+	/**供应状态*/
+	@Excel(name = "供应状态", width = 15, dicCode = "supply_state")
+	@Dict(dicCode = "supply_state")
+    @ApiModelProperty(value = "供应状态")
+    private String supplyState;
+	/**开户行*/
+	@Excel(name = "开户行", width = 15)
+    @ApiModelProperty(value = "开户行")
+    private String openingBank;
+	/**开户行账号*/
+	@Excel(name = "开户行账号", width = 15)
+    @ApiModelProperty(value = "开户行账号")
+    private String openingBankNo;
+	/**微信账号*/
+	@Excel(name = "微信账号", width = 15)
+    @ApiModelProperty(value = "微信账号")
+    private String wechartId;
+	/**资质照片*/
+    @ApiModelProperty(value = "资质照片")
+    private String imgPath;
+	/**是否删除 0未删除 1删除*/
+    @ApiModelProperty(value = "是否删除 0未删除 1删除")
+    @TableLogic
+    private String delFlag;
+	/**创建人*/
+    @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;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+}

nursing-unit-common/src/main/java/com/nu/entity/SuppliersMaterialTypeEntity.java

@@ -0,0 +1,73 @@
+package com.nu.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+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:   2026-03-30
+ * @Version: V1.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="nu_biz_suppliers_material_type对象", description="供应商对应物料类别")
+public class SuppliersMaterialTypeEntity 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 suppliersId;
+	/**供应商名称*/
+	@Excel(name = "供应商名称", width = 15)
+    @ApiModelProperty(value = "供应商名称")
+    private String suppliersName;
+	/**物料类别*/
+	@Excel(name = "物料类别", width = 15)
+    @ApiModelProperty(value = "物料类别")
+    private String materialTypeId;
+	/**等级*/
+	@Excel(name = "等级", width = 15)
+    @ApiModelProperty(value = "等级")
+    private String level;
+	/**上级*/
+	@Excel(name = "上级", width = 15)
+    @ApiModelProperty(value = "上级")
+    private String parentId;
+
+    private String categoryName;
+    private String typeName;
+}

nursing-unit-common/src/main/java/com/nu/entity/SysDepartEntity.java

@@ -0,0 +1,254 @@
+package com.nu.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+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;
+
+/**
+ * <p>
+ * 部门表
+ * <p>
+ *
+ * @Author Steve
+ * @Since 2019-01-22
+ */
+@Data
+public class SysDepartEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    private String id;
+    /**
+     * 父机构ID
+     */
+    private String parentId;
+    /**
+     * 机构/部门名称
+     */
+    @Excel(name = "机构/部门名称", width = 15)
+    private String departName;
+    /**
+     * 英文名
+     */
+    @Excel(name = "英文名", width = 15)
+    private String departNameEn;
+    /**
+     * 缩写
+     */
+    private String departNameAbbr;
+    /**
+     * 排序
+     */
+    @Excel(name = "排序", width = 15)
+    private Integer departOrder;
+    /**
+     * 描述
+     */
+    @Excel(name = "描述", width = 15)
+    private String description;
+    /**
+     * 机构类型
+     */
+    private String orgType;
+    /**
+     * 机构编码
+     */
+    @Excel(name = "机构编码", width = 15)
+    private String orgCode;
+    /**
+     * 省份
+     */
+    @Excel(name = "省份", width = 30)
+    private String province;
+    /**
+     * 城市
+     */
+    @Excel(name = "城市", width = 30)
+    private String city;
+    /**
+     * 区县
+     */
+    @Excel(name = "区县", width = 30)
+    private String district;
+    /**
+     * 手机号
+     */
+    @Excel(name = "手机号", width = 15)
+    private String mobile;
+    /**
+     * 地址
+     */
+    @Excel(name = "地址", width = 15)
+    private String address;
+    /**
+     * 创建人
+     */
+    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;
+
+    /**
+     * 加盟时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "加盟时间")
+    private Date franchiseTime;
+    /**
+     * 回复内容
+     */
+    private String headPath;
+    /**
+     * 回复时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date replyTime;
+    /**
+     * 回复人
+     */
+    private String handleBy;
+
+    /**
+     * 微信id
+     */
+    @Excel(name = "微信id", width = 15)
+    @ApiModelProperty(value = "微信id")
+    private String openId;
+    /**
+     * 联系电话
+     */
+    @Excel(name = "联系电话", width = 15)
+    @ApiModelProperty(value = "联系电话")
+    private String tel;
+    /**
+     * 咨询人姓名
+     */
+    @Excel(name = "咨询人姓名", width = 15)
+    @ApiModelProperty(value = "咨询人姓名")
+    private String name;
+    /**
+     * 性别
+     */
+    @Excel(name = "性别", width = 15)
+    @ApiModelProperty(value = "性别")
+    private String sex;
+    /**
+     * 签发机关
+     */
+    @Excel(name = "签发机关", width = 15)
+    @ApiModelProperty(value = "签发机关")
+    private String issuingAuthority;
+    /**
+     * 企业名称
+     */
+    @Excel(name = "企业名称", width = 15)
+    @ApiModelProperty(value = "企业名称")
+    private String comName;
+    /**
+     * 企业注册地址
+     */
+    @Excel(name = "企业注册地址", width = 15)
+    @ApiModelProperty(value = "企业注册地址")
+    private String comRegisterAddress;
+    /**
+     * 企业信用代码
+     */
+    @Excel(name = "企业信用代码", width = 15)
+    @ApiModelProperty(value = "企业信用代码")
+    private String comCreditCode;
+    /**
+     * 企业法人
+     */
+    @Excel(name = "企业法人", width = 15)
+    @ApiModelProperty(value = "企业法人")
+    private String comLegalPerson;
+    /**
+     * 机构地址
+     */
+    @Excel(name = "机构地址", width = 15)
+    @ApiModelProperty(value = "机构地址")
+    private String orgAddress;
+    /**
+     * 机构负责人
+     */
+    @Excel(name = "机构负责人", width = 15)
+    @ApiModelProperty(value = "机构负责人")
+    private String orgLeader;
+    /**
+     * 机构负责人电话
+     */
+    @Excel(name = "机构负责人电话", width = 15)
+    @ApiModelProperty(value = "机构负责人电话")
+    private String orgLeaderPhone;
+    /**
+     * 机构楼宇牌号
+     */
+    @Excel(name = "机构楼宇牌号", width = 15)
+    @ApiModelProperty(value = "机构楼宇牌号")
+    private String orgBuildingNumber;
+    /**
+     * 机构房屋性质
+     */
+    @Excel(name = "机构房屋性质", width = 15)
+    @ApiModelProperty(value = "机构房屋性质")
+    private String orgPropertyType;
+    /**
+     * 机构建筑面积
+     */
+    @Excel(name = "机构建筑面积", width = 15)
+    @ApiModelProperty(value = "机构建筑面积")
+    private Double orgBuildingArea;
+    /**
+     * 机构省份 sys_category.id
+     */
+    @Excel(name = "机构省份", width = 15)
+    @ApiModelProperty(value = "机构省份")
+    @Dict(dictTable = "sys_category", dicCode = "id", dicText = "name")
+    private String orgProvince;
+    /**
+     * 机构城市 sys_category.id
+     */
+    @Excel(name = "机构城市", width = 15)
+    @ApiModelProperty(value = "机构城市")
+    @Dict(dictTable = "sys_category", dicCode = "id", dicText = "name")
+    private String orgCity;
+    /**
+     * 机构区域 sys_category.id
+     */
+    @Excel(name = "机构区域", width = 15)
+    @ApiModelProperty(value = "机构区域")
+    @Dict(dictTable = "sys_category", dicCode = "id", dicText = "name")
+    private String orgDistrict;
+
+    //update-begin---author:wangshuai ---date:20200308  for：[JTC-119]在部门管理菜单下设置部门负责人，新增字段负责人ids和旧的负责人ids
+
+
+}