Merge branch 'fhx-prod-0506电子签修改' into master-test

fhx

2024-05-06 c38d8e66aa5638d163805f749a620906aa199a38

Merge branch 'fhx-prod-0506电子签修改' into master-test

 phis-feign/src/main/java/com/hz/his/dto/fdd/FddActorDto.java

New file
@@ -0,0 +1,25 @@
package com.hz.his.dto.fdd;

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

/**
 * 法大大签署人测参与人
 * @USER: fhx
 * @DATE: 2024/3/6
 **/
@Data
public class FddActorDto {

    /** 参与人类型 */
    private String actorType;

    /** 定位X轴位置 */
    private String positionX;
    /** 定位Y轴位置 */
    private String positionY;
    /** 定位页码.首页从1开始 */
    private int positionPageNo = 1;


}

 phis-feign/src/main/java/com/hz/his/dto/fdd/FddDto.java

@@ -3,6 +3,8 @@
import com.hz.his.dto.PageDto;
import lombok.Data;

import java.util.List;

/**
 * @USER: fhx
 * @DATE: 2024/3/6
@@ -45,10 +47,19 @@
    /** 签章id */
    private String sealId;

    //作废签署用到
    /** 定位X轴位置 */
    private String positionX;
    /** 定位Y轴位置 */
    private String positionY;
    /** 定位页码.首页从1开始 */
    private int positionPageNo = 1;

    //发起创建签署任务用到
    /** 参与人类型(FddActorConstants) */
    private String actorType;
    /** 参与人证件类型 */
    private String certType;
    /** 签署参与人 */
    private List<FddActorDto> actorList;
}

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

@@ -36,9 +36,21 @@
    @RequestMapping(value="/fdd/sign/task/prescription/signTask",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    Result prescriptionSignTask(@RequestPart("file") MultipartFile file, @RequestParam("dataJson") String dataJson);

    /** 作废(撤销签署任务) */
    @RequestMapping("/fdd/sign/task/cancelSignTask")
    Result cancelSignTask(@RequestBody FddDto dto);
    /** 新增文档签署任务参与人 */
    @RequestMapping("/fdd/sign/task/addDocSignTaskActor")
    Result addDocSignTaskActor(@RequestBody FddDto dto);

    /** 撤销签署任务 */
    @RequestMapping("/fdd/sign/task/cancel")
    Result cancel(@RequestBody FddDto dto);

    /** 作废签署任务 */
    @RequestMapping("/fdd/sign/task/abolish")
    Result abolish(@RequestBody FddDto dto);

    /** 完成签署任务 */
    @RequestMapping("/fdd/sign/task/finish")
    Result finish(@RequestBody FddDto dto);

    /** 获取签署任务文件下载地址 */
    @PostMapping(value = "/fdd/sign/task/getSignTaskFileUrl")