Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-04-26 18dcbf0a7fb4cb3d674d21225a05952a228563c4

Merge branch 'master' into master-test

 phis-feign/src/main/java/com/hz/his/dto/project/ProjectWarnRecordDto.java

New file
@@ -0,0 +1,33 @@
package com.hz.his.dto.project;

import lombok.Data;

import java.util.Date;

@Data
public class ProjectWarnRecordDto {

    // 页
    private Integer pageNum;
    // 每页数量
    private Integer pageSize;
    // 用户id
    private String userId;
    // 公共标识
    private String commonId;
    // 公共名称
    private String commonName;
    // 上级公共标识
    private String parentCommonId;
    // 上级公共名称
    private String parentCommonName;
    // 开始日期
    private Date startTime;
    // 结束日期
    private Date endTime;
    // 关键词查询 CIQ 会员名称 手机号
    private String keyWord;

    public ProjectWarnRecordDto() {
    }
}

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

@@ -2,8 +2,8 @@

import com.hx.resultTool.Result;
import com.hz.his.dto.PageDto;
import com.hz.his.dto.consumables.GoodsQueryDto;
import com.hz.his.dto.project.ProjectQueryDto;
import com.hz.his.dto.project.ProjectWarnRecordDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -33,4 +33,9 @@
    @PostMapping(value = "/project/detail")
    Result projectDetail(@RequestBody ProjectQueryDto projectQueryDto);

    /**
     * 开放平台-项目预警记录列表
     */
    @PostMapping(value = "/project/warn/record/list")
    Result projectWarnRecordList(@RequestBody ProjectWarnRecordDto projectWarnRecordDto);
}