yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

配置价格维护页面详情查询接口、配置价格维护页面保存接口

master
God 3 years ago
parent
e4830deb07
commit
c27fd90abd
10 changed files with 89 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java
  2. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java
  3. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractDto.java
  4. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java
  5. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java
  6. 26
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java
  7. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java
  8. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java
  9. 62
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java
  10. 27
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commonappendix/CommonAttachTypeEnum.java
View File

@ -41,7 +41,8 @@ public enum CommonAttachTypeEnum {
WITNESS("0004", "跟进记录的材料"),
ADVANCE_GIN("0005", "提前开票附件"),
CUSTOMER_FILE("0006", "客户资料附件"),
ARREARS("0007", "欠款提车附件");
ARREARS("0007", "欠款提车附件"),
SCENESIGN("0008", "现场签署附件");
/**
* 附件类型
*/

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java
View File

@ -80,4 +80,7 @@ public class CommonContract extends BaseEntity {
@ApiModelProperty("合同附件")
private String appdixUrl;
@ApiModelProperty("现场签署图片附件")
private String sceneSignUrl;
}

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractDto.java
View File

@ -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<PcCommonAppendixDto> pcCommonAppendixDtoList;
@ApiModelProperty("现场签署图片附件文件")
private List<PcCommonAppendixDto> sceneSignUrlList;
@ApiModelProperty("业务员sid")
private String staffSid;

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java
View File

@ -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<CommonContractVo> fetchBySid(@PathVariable("sid") String sid);

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java
View File

@ -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<CommonContractVo> fetchBySid(String sid) {
ResultBean rb = ResultBean.fireFail();

26
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java
View File

@ -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<CommonAppendixVo> pcCommonAppendixDtoList = new ArrayList<>();*/
@ApiModelProperty("附件文件")
private List<String> commonAppendixVos;
@ApiModelProperty("现场签署文件")
private List<String> sceneSignUrlList;
}

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixRest.java
View File

@ -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("保存失败");
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commonappendix/CommonAppendixService.java
View File

@ -374,7 +374,7 @@ public class CommonAppendixService extends MybatisBaseService<CommonAppendixMapp
}
}
public int saveOrUpdatePcAppendix(PcCommonAppendixDto dto, String sid, String staffSid) {
public int saveOrUpdatePcAppendix(PcCommonAppendixDto dto, String sid, String staffSid,String attachType) {
int z = 0;
if (dto != null) {
CommonAppendix commonAppendix = new CommonAppendix();
@ -389,7 +389,7 @@ public class CommonAppendixService extends MybatisBaseService<CommonAppendixMapp
commonAppendix.setLinkSid(sid);
commonAppendix.setCreateBySid(staffSid);
commonAppendix.setCreateTime(new Date());
commonAppendix.setAttachType(CommonAttachTypeEnum.WITNESS.getAttachType());
commonAppendix.setAttachType(attachType);
save(commonAppendix);
z++;
}

62
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java
View File

@ -2,6 +2,7 @@ package com.yxt.anrui.base.biz.commoncontract;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.api.commonappendix.PcCommonAppendixDto;
import com.yxt.anrui.base.api.commoncontract.*;
import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
@ -81,11 +82,17 @@ public class CommonContractRest implements CommonContractFeign {
public ResultBean save(CommonContractDto dto) {
ResultBean rb = ResultBean.fireFail();
dto.setSid(UUID.randomUUID().toString());
CommonContract commonContract = new CommonContract();
String sid = commonContract.getSid();
BeanUtil.copyProperties(dto,commonContract);
commonContract.setSid(sid);
String s = "";
String attachType = "";
List<PcCommonAppendixDto> 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<PcCommonAppendixDto> 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(), "");
}
String sid = dto.getSid();
commonContractService.saveOrUpdateDto(dto);
return rb.success().setData(sid);
s += filePath + ",";
}
commonContract.setSceneSignUrl(s.substring(0, s.length() - 1));
}
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<PcCommonAppendixDto> 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));
}
commonContractService.updateBySid(dto.toMap(), sid);
return rb.success();
List<PcCommonAppendixDto> 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(), "");
}
@Override
public ResultBean del(String ids) {
ResultBean rb = ResultBean.fireFail();
commonContractService.delByIds(ids);
s += filePath + ",";
}
dto.setSceneSignUrl(s.substring(0, s.length() - 1));
}
commonContractService.updateBySid(dto.toMap(), sid);
return rb.success();
}
@Override
public ResultBean<CommonContractVo> 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

27
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
View File

@ -606,4 +606,31 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
return flowableService.businessStart(procDefEnum.CARSALECONTRACTAPPROVE.getProDefId(), dto.getUserSid(), variables);
}
public ResultBean<CommonContractVo> 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<String> commonContractVos = new ArrayList<>();
List<String> 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);
}
}
Write Preview
Loading…
Cancel
Save