基础数据

src/main/java/com/dk/mdm/controller/mst/SupplierController.java

@@ -8,6 +8,7 @@ import com.dk.common.controller.BaseController;
 import com.dk.common.service.BaseService;
 import com.dk.mdm.model.query.mst.OrgQuery;
 import com.dk.mdm.model.query.mst.SupplierQuery;
+import com.dk.mdm.model.vo.mst.StaffVO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -39,4 +40,16 @@ public class SupplierController{
         return supplierService.selectByCond(supplierQuery);
     }
 
+    /**
+     * @desc : 新建供应商
+     * @author : 王英杰
+     * @date : 2023/1/9 10:48
+     */
+//    @ApiOperation(value = "新建供应商", notes = "新建供应商")
+//    @PostMapping({"insert"})
+//    public ResponseResultVO<?> insert(@RequestBody SupplierQuery staffVO) {
+//        return supplierService.insert(staffVO);
+//    }
+
+
 }

src/main/java/com/dk/mdm/mapper/mst/SupplierMapper.java

@@ -2,7 +2,6 @@ package com.dk.mdm.mapper.mst;
 
 import com.dk.mdm.model.pojo.mst.Supplier;
 import com.dk.common.mapper.BaseMapper;
-import com.dk.mdm.model.query.core.StaffQuery;
 import com.dk.mdm.model.query.mst.SupplierQuery;
 import com.dk.mdm.model.response.mst.StaffResponse;
 import org.springframework.stereotype.Repository;

src/main/java/com/dk/mdm/mapper/wxapi/basic/WxCommonMapper.java

@@ -31,7 +31,10 @@ public interface WxCommonMapper extends BaseMapper<WxCommonResponse> {
 
     //接待状态
     List<WxCommonResponse> getReceptionStatus(WxCommonQuery wxCommonQuery);
-
+    //获取供应商类别
+    List<WxCommonResponse> getSupplierType(WxCommonQuery wxCommonQuery);
+    //获取服务类别-
+    List<WxCommonResponse> getServiceCategories(WxCommonQuery wxCommonQuery);
     //商品规格分类 - 其他
     List<WxCommonResponse> getGoodsSpecsOrther(WxCommonQuery wxCommonQuery);
 

src/main/java/com/dk/mdm/mapper/wxapi/basic/WxCommonMapper.xml

@@ -325,6 +325,23 @@
           and tsb.type_code = '跟进方式'
         order by tsb.display_no
     </select>
+<!--获取供应商类别-->
+    <select id="getSupplierType" resultType="com.dk.common.model.wxapi.wxResponse.WxCommonResponse">
+        select sys.f_get_name_i18n(tdk.kind_name_i18n,'zh_CN' )AS name, tdk.kind_code as code
+        from sys.t_data_kind tdk
+        where tdk.flg_valid
+          and tdk.kind_type = '供应商类别'
+        order by tdk.display_no
+    </select>
+
+    <!--获取服务类别-->
+    <select id="getServiceCategories" resultType="com.dk.common.model.wxapi.wxResponse.WxCommonResponse">
+        select sys.f_get_name_i18n(tdk.kind_name_i18n,'zh_CN' ) AS name, tdk.kind_code as code
+        from sys.t_data_kind tdk
+        where tdk.flg_valid
+          and tdk.kind_type = '服务类别'
+        order by tdk.display_no
+    </select>
 
     <select id="getCustomerClassified" resultType="com.dk.common.model.wxapi.wxResponse.WxCommonResponse">
         select data_id    as "id",

src/main/java/com/dk/mdm/model/vo/mst/SupplierVo.java

@@ -0,0 +1,224 @@
+package com.dk.mdm.model.vo.mst;
+
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+
+import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.*;
+import com.dk.common.model.pojo.PageInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.List;
+import java.time.LocalDateTime;
+
+/**
+ * 供应商
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ExportTitle("供应商")
+@TableName(value = "t_mst_supplier", autoResultMap = true, schema = "dkic_b")
+@ApiModel(value = "实体类：供应商", description = "表名：t_mst_supplier")
+public class SupplierVo extends PageInfo<SupplierVo> implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 供应商ID
+     */
+    @TableId(value = "sup_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "供应商ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String supId;
+
+
+    /**
+     * 供应商编号
+     */
+    @Excel(name = "供应商编号")
+    @ApiModelProperty(value = "供应商编号")
+    private String supCode;
+
+
+    /**
+     * 供应商名称
+     */
+    @Excel(name = "供应商名称")
+    @ApiModelProperty(value = "供应商名称")
+    private String supName;
+
+
+    /**
+     * 供应商类别 (【系统字典】)
+     */
+    @Excel(name = "供应商类别 (【系统字典】)")
+    @ApiModelProperty(value = "供应商类别 (【系统字典】)")
+    private String supType;
+
+
+    /**
+     * 联系人
+     */
+    @Excel(name = "联系人")
+    @ApiModelProperty(value = "联系人")
+    private String contactName;
+
+
+    /**
+     * 联系电话
+     */
+    @Excel(name = "联系电话")
+    @ApiModelProperty(value = "联系电话")
+    private String contactPhone;
+
+
+    /**
+     * 组织部门
+     */
+    @Excel(name = "组织部门")
+    @ApiModelProperty(value = "组织部门")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String orgId;
+
+
+    /**
+     * 业务员
+     */
+    @Excel(name = "业务员")
+    @ApiModelProperty(value = "业务员")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String staffId;
+
+
+    /**
+     * 服务类别 (【系统字典】)
+     */
+    @Excel(name = "服务类别 (【系统字典】)")
+    @ApiModelProperty(value = "服务类别 (【系统字典】)")
+    private String serviceCategories;
+
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+    /**
+     * 有效标识 (1：正常 0：停用)
+     */
+    @Excel(name = "有效标识 (1：正常 0：停用)")
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private Boolean flgValid;
+
+
+    /**
+     * 企业ID
+     */
+    @Excel(name = "企业ID")
+    @ApiModelProperty(value = "企业ID")
+    private Integer cpId;
+
+
+    /**
+     * 创建时间 (触发器自动处理)
+     */
+    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
+    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opCreateTime;
+
+
+    /**
+     * 创建用户 (触发器自动处理)
+     */
+    @Excel(name = "创建用户 (触发器自动处理)")
+    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opCreateUserId;
+
+
+    /**
+     * 修改时间 (触发器自动处理)
+     */
+    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
+    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opUpdateTime;
+
+
+    /**
+     * 修改用户 (触发器自动处理)
+     */
+    @Excel(name = "修改用户 (触发器自动处理)")
+    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opUpdateUserId;
+
+
+    /**
+     * 数据操作应用 (触发器自动处理)
+     */
+    @Excel(name = "数据操作应用 (触发器自动处理)")
+    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
+    private String opAppCode;
+
+
+    /**
+     * 数据时间戳 (触发器自动处理)
+     */
+    @Excel(name = "数据时间戳 (触发器自动处理)")
+    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opTimestamp;
+
+
+    /**
+     * 数据操作数据库用户 (触发器自动处理)
+     */
+    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
+    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
+    private String opDbUser;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "商品品牌")
+    private String brandName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "剩余应收付")
+    private String sumResidue;
+    /*
+     * 相关属性
+     * @TableField(exist = false)
+     */
+
+    /*
+     * 关联属性 + 查询条件
+     * @TableField(exist = false)
+     */
+
+
+    private static final long serialVersionUID = 1L;
+
+}

src/main/java/com/dk/mdm/service/wxapi/basic/WxCommonService.java

@@ -114,7 +114,7 @@ public class WxCommonService extends BaseService<WxCommonResponse> {
         }
         //范围权限类型
         else if (dataSourceCode.equals("purviewType")) {
-            list = wxCommonMapper.getPurviewType(wxCommonQuery);
+           // list = wxCommonMapper.getPurviewType(wxCommonQuery);
         }
         //渠道
         else if (dataSourceCode.equals("salesChannel")) {
@@ -195,6 +195,14 @@ public class WxCommonService extends BaseService<WxCommonResponse> {
         else if (dataSourceCode.equals("brand")) {
             list = wxCommonMapper.getBrand(wxCommonQuery);
         }
+        //获取供应商类别
+        else if (dataSourceCode.equals("supplierType")) {
+            list = wxCommonMapper.getSupplierType(wxCommonQuery);
+        }
+        //获取服务类别
+        else if (dataSourceCode.equals("serviceCategories")) {
+            list = wxCommonMapper.getServiceCategories(wxCommonQuery);
+        }
         return ResponseResultUtil.success(list);
     }