diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java index 8a4c1bb594..d544b52f76 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java @@ -41,7 +41,8 @@ public enum CommonAttachTypeEnum { WITNESS("0004", "跟进记录的材料"), ADVANCE_GIN("0005", "提前开票附件"), CUSTOMER_FILE("0006", "客户资料附件"), - ARREARS("0007", "欠款提车附件"); + ARREARS("0007", "欠款提车附件"), + SCENESIGN("0008", "现场签署附件"); /** * 附件类型 */ diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java index 9eed8ce9b9..60012391fb 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java @@ -80,4 +80,7 @@ public class CommonContract extends BaseEntity { @ApiModelProperty("合同附件") private String appdixUrl; + + @ApiModelProperty("现场签署图片附件") + private String sceneSignUrl; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractDto.java index 710b6e2617..1a64a7c9bf 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractDto.java @@ -68,12 +68,18 @@ public class CommonContractDto implements Dto { @ApiModelProperty("合同附件") private String appdixUrl; + @ApiModelProperty("现场签署图片附件") + private String sceneSignUrl; + @ApiModelProperty("业务表sid") private String busSid; @ApiModelProperty("附件文件") private List pcCommonAppendixDtoList; + @ApiModelProperty("现场签署图片附件文件") + private List sceneSignUrlList; + @ApiModelProperty("业务员sid") private String staffSid; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java index eaf960c6d2..3ff6f8e31e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java @@ -51,11 +51,6 @@ public interface CommonContractFeign { @PostMapping("/update/{sid}") public ResultBean update(@RequestBody CommonContractDto dto, @PathVariable("sid") String sid); - @ApiOperation("删除记录") - @GetMapping("/del/{ids}") - public ResultBean del(@PathVariable("ids") String ids); - - @ApiOperation("获取一条记录") @GetMapping("/fetchSid/{sid}") public ResultBean fetchBySid(@PathVariable("sid") String sid); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java index ecab283158..1a153ad72b 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java @@ -48,11 +48,6 @@ public class CommonContractFeignFallback implements CommonContractFeign { return ResultBean.fireFail().setMsg("接口anrui-base/commoncontract/update无法访问"); } - @Override - public ResultBean del(String ids) { - return ResultBean.fireFail().setMsg("接口anrui-base/commoncontract/del无法访问"); - } - @Override public ResultBean fetchBySid(String sid) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java index 9ebc54f9c1..b3d626061c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java @@ -32,63 +32,45 @@ public class CommonContractVo implements Vo { @ApiModelProperty("合同sid") private String sid; - @ApiModelProperty("合同编号") private String contractNo; - @ApiModelProperty("合同类型key") private String contractTypeKey; - @ApiModelProperty("合同类型") private String contractType; - @ApiModelProperty("客户sid") private String customerSid; - @ApiModelProperty("业务员sid") private String staffSid; - @ApiModelProperty("业务员") private String staffName; - @ApiModelProperty("部门sid") private String orgSid; - @ApiModelProperty("业务表sid") private String busSid; - @ApiModelProperty("甲方名称") private String partyA; - @ApiModelProperty("乙方名称") private String partyB; - @ApiModelProperty("其他方名称") private String partyC; - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("签订日期") private Date createDate; - @ApiModelProperty("签订地点") private String address; - @ApiModelProperty("订金") private BigDecimal deposit; - @ApiModelProperty("合同金额") private String contractAmount; - @ApiModelProperty("合同附件") private String appdixUrl; - @ApiModelProperty("备注") private String remarks; - @ApiModelProperty("节点状态") private String nodeState; - -/* @ApiModelProperty("附件文件") - private List pcCommonAppendixDtoList = new ArrayList<>();*/ - + @ApiModelProperty("附件文件") + private List commonAppendixVos; + @ApiModelProperty("现场签署文件") + private List sceneSignUrlList; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java index 7fb836fe42..6e551c5f0b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java @@ -98,7 +98,8 @@ public class CommonAppendixRest implements CommonAppendixFeign { @Override public ResultBean saveOrUpdatePcAppendix(PcCommonAppendixDto dto, String sid,String staffSid) { - int i = commonAppendixService.saveOrUpdatePcAppendix(dto,sid,staffSid); + String attachType = CommonAttachTypeEnum.CONTRACT.getAttachType(); + int i = commonAppendixService.saveOrUpdatePcAppendix(dto,sid,staffSid,attachType); if (i == 0) { return new ResultBean().fail().setMsg("保存失败"); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java index 14766fbbe2..cfe4b46249 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java @@ -374,7 +374,7 @@ public class CommonAppendixService extends MybatisBaseService pcCommonAppendixDtoList = dto.getPcCommonAppendixDtoList(); + attachType = CommonAttachTypeEnum.CONTRACT.getAttachType(); if (pcCommonAppendixDtoList.size() != 0) { for (PcCommonAppendixDto pcCommonAppendixDto : pcCommonAppendixDtoList) { - commonAppendixService.saveOrUpdatePcAppendix(pcCommonAppendixDto, dto.getSid(), dto.getStaffSid()); + commonAppendixService.saveOrUpdatePcAppendix(pcCommonAppendixDto, commonContract.getSid(), dto.getStaffSid(),attachType); fileUploadComponent.getUrlPrefix(); String filePath = pcCommonAppendixDto.getFilePath(); if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { @@ -93,22 +100,37 @@ public class CommonContractRest implements CommonContractFeign { } s += filePath + ","; } - dto.setAppdixUrl(s.substring(0, s.length() - 1)); + commonContract.setAppdixUrl(s.substring(0, s.length() - 1)); + } + List sceneSignUrlList = dto.getSceneSignUrlList(); + attachType = CommonAttachTypeEnum.SCENESIGN.getAttachType(); + if (sceneSignUrlList.size() != 0) { + for (PcCommonAppendixDto pcCommonAppendixDto : sceneSignUrlList) { + commonAppendixService.saveOrUpdatePcAppendix(pcCommonAppendixDto, commonContract.getSid(), dto.getStaffSid(),attachType); + fileUploadComponent.getUrlPrefix(); + String filePath = pcCommonAppendixDto.getFilePath(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + s += filePath + ","; + } + commonContract.setSceneSignUrl(s.substring(0, s.length() - 1)); } - String sid = dto.getSid(); - commonContractService.saveOrUpdateDto(dto); - return rb.success().setData(sid); + commonContractService.save(commonContract); + return rb.success().setData(commonContract.getSid()); } @Override public ResultBean update(CommonContractDto dto, String sid) { ResultBean rb = ResultBean.fireFail(); String s = ""; + String attachType = ""; commonAppendixService.deleteFiles(sid); List pcCommonAppendixDtoList = dto.getPcCommonAppendixDtoList(); + attachType = CommonAttachTypeEnum.CONTRACT.getAttachType(); if (pcCommonAppendixDtoList != null) { for (PcCommonAppendixDto pcCommonAppendixDto : pcCommonAppendixDtoList) { - commonAppendixService.saveOrUpdatePcAppendix(pcCommonAppendixDto, sid, dto.getStaffSid()); + commonAppendixService.saveOrUpdatePcAppendix(pcCommonAppendixDto, sid, dto.getStaffSid(),attachType); fileUploadComponent.getUrlPrefix(); String filePath = pcCommonAppendixDto.getFilePath(); if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { @@ -118,25 +140,27 @@ public class CommonContractRest implements CommonContractFeign { } dto.setAppdixUrl(s.substring(0, s.length() - 1)); } + List sceneSignUrlList = dto.getSceneSignUrlList(); + attachType = CommonAttachTypeEnum.SCENESIGN.getAttachType(); + if (sceneSignUrlList.size() != 0) { + for (PcCommonAppendixDto pcCommonAppendixDto : sceneSignUrlList) { + commonAppendixService.saveOrUpdatePcAppendix(pcCommonAppendixDto, dto.getSid(), dto.getStaffSid(),attachType); + fileUploadComponent.getUrlPrefix(); + String filePath = pcCommonAppendixDto.getFilePath(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + s += filePath + ","; + } + dto.setSceneSignUrl(s.substring(0, s.length() - 1)); + } commonContractService.updateBySid(dto.toMap(), sid); return rb.success(); } - @Override - public ResultBean del(String ids) { - ResultBean rb = ResultBean.fireFail(); - commonContractService.delByIds(ids); - return rb.success(); - } - - @Override public ResultBean fetchBySid(String sid) { - ResultBean rb = ResultBean.fireFail(); - CommonContract commonContract = commonContractService.fetchBySid(sid); - CommonContractVo commonContractVo = new CommonContractVo(); - BeanUtil.copyProperties(commonContract, commonContractVo); - return rb.success().setData(commonContractVo); + return commonContractService.fetchAllBySid(sid); } @Override diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index a8073b5abd..83e130c2d3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -606,4 +606,31 @@ public class CommonContractService extends MybatisBaseService fetchAllBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + CommonContract commonContract = fetchBySid(sid); + CommonContractVo commonContractVo = new CommonContractVo(); + BeanUtil.copyProperties(commonContract, commonContractVo); + String sceneSignUrl = commonContract.getSceneSignUrl(); + String appdixUrl = commonContract.getAppdixUrl(); + String path = ""; + List commonContractVos = new ArrayList<>(); + List sceneSignUrlList = new ArrayList<>(); + String[] appdixUrls = appdixUrl.split(","); + String[] sceneSignUrls = sceneSignUrl.split(","); + for (String url : appdixUrls) { + String urlPrefix = fileUploadComponent.getUrlPrefix(); + path = urlPrefix + url; + commonContractVos.add(path); + } + for (String signUrl : sceneSignUrls) { + String urlPrefix = fileUploadComponent.getUrlPrefix(); + path = urlPrefix + signUrl; + sceneSignUrlList.add(path); + } + commonContractVo.setCommonAppendixVos(commonContractVos); + commonContractVo.setSceneSignUrlList(sceneSignUrlList); + return rb.success().setData(commonContractVo); + } } \ No newline at end of file