Merge branch 'master-fwq组织架构优化' into master-test

fwq

2024-01-03 07e60bfa19de8bc7231b272872c5ba3fdf5fd82f

Merge branch 'master-fwq组织架构优化' into master-test

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java

@@ -21,10 +21,13 @@
    private String startTime;
    /**生日券传:结束时间,年月日时分秒,不填默认一个月*/
    private String endTime;
    /**成本部门名称 -非必填*/
    private String costDeptName;
    /**归属成本部门 -非必填 */
    private String ascrCostDeptId;
    /**归属成本部门名称 -非必填 */
    private String ascrCostDeptName;
    /**成本部门名称 -非必填*/
    private String costDeptName;


    /**发放原因 -非必填 相当于 促成交 客诉 打板 类型*/
    private String sendReason;

 phis-feign/src/main/java/com/hz/his/dto/organize/OrganizeDto.java

New file
@@ -0,0 +1,17 @@
package com.hz.his.dto.organize;

import com.hz.his.dto.PageDto;
import lombok.Data;

/**
 * 组织架构
 */
@Data
public class OrganizeDto extends PageDto {
    /**标识*/
    private String id;
    /**是否查询有负责人的,1查询*/
    private Integer selectLeader = 0;
    /**查找父级*/
    private Integer selectParent = 0;
}

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrganizationDeptService.java

@@ -2,6 +2,7 @@

import com.hx.resultTool.Result;
import com.hz.his.dto.PageDto;
import com.hz.his.dto.organize.OrganizeDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -19,4 +20,16 @@
    @PostMapping(value = "organization/dept/list")
    Result getList(@RequestBody(required = false) PageDto pageDto);

    /**
     * 获取组织结构列表
     */
    @PostMapping(value = "/organize/get/list")
    Result getOrganizeList(@RequestBody OrganizeDto organizeDto);

    /**
     * 获取组织结构详情
     */
    @PostMapping(value = "/organize/get/one")
    Result getOrganizeDetail(@RequestBody OrganizeDto organizeDto);

}