供应商 部门

src/main/java/com/dk/mdm/controller/common/CommonController.java

@@ -106,6 +106,20 @@ public class CommonController extends BaseController<Map<String, Object>> {
     }
 
     /**
+     * @desc : 只获取二级部门 按照level_code 排序
+     * @author : 王英杰
+     * @date : 2023/1/9 13:49
+     */
+    @ApiOperation(
+            value = "获取组织部门",
+            notes = "获取组织部门"
+    )
+    @PostMapping("get_procur_org")
+    public ResponseResultVO<List<Map<String, Object>>> getProcureOrg(@RequestBody Map<String, Object> param) {
+        return commonService.getProcureOrg(param);
+    }
+
+    /**
      * @desc : 获取组织部门（分页）
      * @author : 姜宁
      * @date : 2023/1/29 16:52

src/main/java/com/dk/mdm/mapper/common/CommonMapper.java

@@ -64,6 +64,13 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
     List<Map<String, Object>> getOrg(Map param);
 
     /**
+     * @desc : 只获取二级部门 按照level_code 排序
+     * @author : 王英杰
+     * @date : 2023/1/9 13:49
+     */
+    List<Map<String, Object>> getProcureOrg(Map param);
+
+    /**
      * @desc : 获取部门（数量）
      * @author : 姜宁
      * @date : 2023/1/29 17:04

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -178,6 +178,34 @@
         </if>
         order by display_no
     </select>
+    <!-- 只获取二级部门 按照level_code 排序 -->
+    <select id="getProcureOrg" resultType="java.util.Map">
+        select org_Id     AS "orgId",
+        org_code   AS "orgCode",
+        org_name   AS "orgName",
+        org_Id     AS "id",
+        parent_id  AS "parentId",
+        top_Id     AS "topId",
+        display_no AS "displayNo",
+        remarks
+        from dkic_b.t_mst_org
+        where flg_valid
+        and cp_id = #{cpId}
+        and parent_id is NOT null
+        <if test="topId != null">
+            AND top_id = #{topId}
+        </if>
+        <if test="orgId != null">
+            AND org_id != #{orgId}
+        </if>
+        <if test="orgCode != null">
+            AND org_code LIKE concat('%',my_ex.likequery(#{orgCode}),'%')
+        </if>
+        <if test="orgName != null">
+            AND org_name LIKE concat('%',my_ex.likequery(#{orgName}),'%')
+        </if>
+        order by level_code
+    </select>
 
     <!-- t_mst_org，（条件查询）个数 -->
     <select id="getOrgCountByPage" resultType="Long">
@@ -219,7 +247,11 @@
         staff.staff_name                                    AS "staffName",
         sys.f_code_name(staff.staff_code, staff.staff_name) AS "staffCodeName",
         staff.remarks
+        ,tmg.org_id as "orgId"
+        ,tmg.org_code as "orgCode"
+        ,tmg.org_name as "orgName"
         from dkic_b.t_mst_staff AS staff
+        left join  dkic_b.t_mst_org tmg on tmg.org_id = staff.org_id
         where staff.flg_valid
         and staff.cp_id =#{cpId}
         <if test="staffCode != null and staffCode != ''">

src/main/java/com/dk/mdm/mapper/ivt/InboundMapper.xml

@@ -235,6 +235,9 @@
                 AND tpi.into_status =
                 any(#{intoStatusList, typeHandler= StringListTypeHandler})
             </if>
+            <if test="intoStatus != null and intoStatus != ''">
+                AND tpi.into_status = #{intoStatus}
+            </if>
         </where>
     </sql>
 
@@ -246,7 +249,7 @@
         </foreach>
     </sql>
 
-    <!-- 查询表t_psi_inbound，（条件查询+分页）列表 -->
+    <!-- 查询表t_psi_inbound，（条件查询+分页）列表   tpi.sum_quantity, tpi.sum_amount,-->
     <select id="selectByCond" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_Response"/>
@@ -255,7 +258,6 @@
         tms.staff_name AS "staffName",
         tms.staff_name AS "makeStaffName",
         tmw.wh_name as "whName",
-        tpi.sum_quantity, tpi.sum_amount,
         tmc.cus_name                                      as "cusName",
         tmc.cus_phone                                     as "cusPhone",
         tmc.cus_from                                      as "cusFrom",

src/main/java/com/dk/mdm/mapper/mst/OrgMapper.xml

@@ -13,7 +13,7 @@
         , parent.org_name, parent.parent_id, parent.display_no, parent.top_id    </sql>
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.dk.mdm.model.response.mst.OrgResponse">
+    <resultMap id="BaseResultMap" type="com.dk.common.model.response.mst.OrgResponse">
         <id column="org_id" property="orgId"/>
         <result column="org_name" property="orgName"/>
         <result column="parent_id" property="parentId" typeHandler="UuidTypeHandler"/>

src/main/java/com/dk/mdm/model/response/mst/OrgResponse.java

@@ -1,241 +0,0 @@
-package com.dk.mdm.model.response.mst;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dk.common.infrastructure.annotaiton.ExportTitle;
-import com.dk.common.infrastructure.handler.TimestampTypeHandler;
-import com.dk.common.infrastructure.handler.UuidListTypeHandler;
-import com.dk.common.infrastructure.handler.UuidTypeHandler;
-import com.dk.common.model.pojo.PageInfo;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- *  组织机构
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@ExportTitle("组织机构")
-@TableName(value = "t_mst_org", autoResultMap = true, schema =  "dkic_b")
-@ApiModel(value="实体类：组织机构", description="表名：t_mst_org")
-public class OrgResponse extends PageInfo<OrgResponse> implements Serializable {
-
-    /*
-     * 数据库字段
-     */
-
-    /**
-     * 组织ID
-     */
-//    @TableId(value = "org_id", type = IdType.AUTO)
-    @ApiModelProperty(value = "组织ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String orgId;
-
-
-    /**
-     * 组织名称
-     */
-    @Excel(name = "组织名称")
-    @ApiModelProperty(value = "组织名称")
-    private String orgName;
-
-
-    /**
-     * 父级ID
-     */
-    @Excel(name = "父级ID")
-    @ApiModelProperty(value = "父级ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String parentId;
-
-
-    /**
-     * 显示顺序 (【1 ～ 46655】)
-     */
-    @Excel(name = "显示顺序 (【1 ～ 46655】)")
-    @ApiModelProperty(value = "显示顺序 (【1 ～ 46655】)")
-    private Integer displayNo;
-
-
-    /**
-     * 顶层ID
-     */
-    @Excel(name = "顶层ID")
-    @ApiModelProperty(value = "顶层ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String topId;
-
-
-    /**
-     * 上层ID
-     */
-    @Excel(name = "上层ID")
-    @ApiModelProperty(value = "上层ID")
-    @TableField(typeHandler = UuidListTypeHandler.class)
-    private String levelUpper;
-
-
-    /**
-     * 下层ID
-     */
-    @Excel(name = "下层ID")
-    @ApiModelProperty(value = "下层ID")
-    @TableField(typeHandler = UuidListTypeHandler.class)
-    private String levelLower;
-
-
-    /**
-     * 末级标识
-     */
-    @Excel(name = "末级标识")
-    @ApiModelProperty(value = "末级标识")
-    private Boolean levelLeaf;
-
-
-    /**
-     * 层级序号
-     */
-    @Excel(name = "层级序号")
-    @ApiModelProperty(value = "层级序号")
-    private Integer levelNo;
-
-
-    /**
-     * 层级代码
-     */
-    @Excel(name = "层级代码")
-    @ApiModelProperty(value = "层级代码")
-    private String levelCode;
-
-
-    /**
-     * 层级全称 (【 / 】)
-     */
-    @Excel(name = "层级全称 (【 / 】)")
-    @ApiModelProperty(value = "层级全称 (【 / 】)")
-    private String levelName;
-
-
-    /**
-     * 备注
-     */
-    @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;
-
-
-    @ApiModelProperty(value = "")
-    private String orgCode;
-
-    @TableField(exist = false)
-    private List<OrgResponse> itemData;
-
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
-
-    private static final long serialVersionUID = 1L;
-
-}

src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -176,7 +176,16 @@ public class CommonService extends BaseService<Map<String, Object>> {
         List<Map<String, Object>> list = commonMapper.getOrg(param);
         return ResponseResultUtil.success(list);
     }
-
+    /**
+     * @desc : 只获取二级部门 按照level_code 排序
+     * @author : 王英杰
+     * @date : 2023/1/9 13:49
+     */
+    public ResponseResultVO<List<Map<String, Object>>> getProcureOrg(Map<String, Object> param) {
+        // 获取系统基础数据
+        List<Map<String, Object>> list = commonMapper.getProcureOrg(param);
+        return ResponseResultUtil.success(list);
+    }
     /**
      * @desc : 获取部门
      * @author : 姜宁

src/main/java/com/dk/mdm/service/mst/OrgService.java

@@ -81,6 +81,10 @@ public class OrgService extends BaseService<Org> {
         String parentId = organization.getParentId();
         int maxDisplayNo = orgMapper.maxDisplayNo(parentId) != null ? orgMapper.maxDisplayNo(parentId) + 1 : 0;
 
+        if (organization.getParentId() != null) {
+            //插入TOPid
+            organization.setTopId(organization.getParentId());
+        }
 
         organization.setDisplayNo(maxDisplayNo);
         // 插入组织部门数据