Browse Source

合同档案问题修改

zhanglei
hp 3 years ago
parent
commit
2d6126f21d
  1. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractPageVo.java
  2. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java
  3. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java
  4. 44
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml
  5. 89
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  6. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
  7. 6
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
  8. 8
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeign.java
  9. 10
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeignFallback.java
  10. 69
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/CommonContractInitVo.java
  11. 73
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/CrmCustomerFileDto.java
  12. 14
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractRest.java
  13. 28
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractService.java

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractPageVo.java

@ -1,5 +1,6 @@
package com.yxt.anrui.base.api.commoncontract;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -22,10 +23,14 @@ public class AppCommonContractPageVo implements Vo {
@ApiModelProperty("经办人")
private String handler;
@ApiModelProperty("车型")
private String model;
@ApiModelProperty("合同金额")
private String contractPrice;
@ApiModelProperty("是否显示办理按钮")
@JsonProperty("isShowUpdate")
private boolean isShowUpdate;
@ApiModelProperty("节点状态")

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java

@ -150,7 +150,7 @@ public interface CommonContractFeign {
public ResultBean<PagerVo<AppCommonContractPageVo>> getContractList(@RequestBody PagerQuery<AppCommonContractQuery> pagerQuery);
@ApiOperation("移动端-初始化合同审核")
@PostMapping("/getContractInfo/{contractSid}/{userSid}")
@GetMapping("/getContractInfo/{contractSid}/{userSid}")
@ResponseBody
public ResultBean<AppCommonContractInitVo> getContractInfo(@PathVariable("contractSid") String contractSid, @PathVariable("userSid") String userSid);

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@ -240,7 +240,6 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
messageFlowableQuery.setMsgContent(baseModelModprice.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("供应链");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(ufVo, appMap, baseModelModprice);
return voResultBean;
}
if (r == 2) {
@ -338,8 +337,6 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
messageFlowableQuery.setMsgContent(baseModelModprice.getApplyPeoName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("供应链");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(ufVo, appMap, baseModelModprice);
}
return rb.success().setData(resultBean.getData());
} else {
@ -418,7 +415,6 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
}
messageFlowableQuery.setMsgTitle("供应链");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(ufVo, appMap, baseModelModprice);
return rb.success();
}
}

44
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml

@ -3,7 +3,7 @@
<mapper namespace="com.yxt.anrui.base.biz.commoncontract.CommonContractMapper">
<insert id="saveList">
INSERT INTO common_contract(sid, contractNo, contractType, partyA, partyB, partyC, createBySid,
createDate, address, deposit, contractAmount, remarks)
createDate, address, deposit, contractAmount, remarks)
VALUES
<foreach collection="list" item="item" index="index" separator=",">
(UUID(),<!--sid-->
@ -39,19 +39,19 @@
</select>
<select id="listExcel" resultType="com.yxt.anrui.base.api.commoncontract.CommonContractExportVo">
SELECT cc.`contractNo`,
cc.`contractType`,
cc.`partyA`,
cc.`partyB`,
cc.`partyC`,
suser.`userName` creatName,
cc.`createDate`,
cc.`address`,
cc.`deposit`,
cc.`contractAmount`,
cc.`remarks`
cc.`contractType`,
cc.`partyA`,
cc.`partyB`,
cc.`partyC`,
suser.`userName` creatName,
cc.`createDate`,
cc.`address`,
cc.`deposit`,
cc.`contractAmount`,
cc.`remarks`
FROM common_contract cc
LEFT JOIN anrui_portal.`sys_user` suser
ON cc.createBySid = suser.`sid`
LEFT JOIN anrui_portal.`sys_user` suser
ON cc.createBySid = suser.`sid`
<where>
${ew.sqlSegment}
</where>
@ -68,13 +68,15 @@
</select>
<select id="getContractList" resultType="com.yxt.anrui.base.api.commoncontract.AppCommonContractPageVo">
SELECT sid AS contractSid,
contractNo AS contractId,
contractTypeKey AS contractType,
partyB,
handler,
contractAmount AS contractPrice,
nodeState
SELECT sid AS contractSid,
contractNo AS contractId,
contractType,
partyB,
modelName as model,
staffName as handler,
contractAmount AS contractPrice,
if(length(nodeState) > 0, nodeState, '待提交') as nodeState,
if(length(nodeState) > 0, false , true ) as isShowUpdate
FROM common_contract
<where>
${ew.sqlSegment}
@ -108,7 +110,7 @@
</delete>
<select id="selectNum" resultType="int">
select IFNULL(CAST(REPLACE(MAX(contractNo), #{bill}, '') AS SIGNED),0) as code
select IFNULL(CAST(REPLACE(MAX(contractNo), #{bill}, '') AS SIGNED), 0) as code
from common_contract
where contractNo LIKE concat(#{bill}, '%')
</select>

89
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@ -990,7 +990,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
qw.like("partyC", query.getNames());
}
if (StringUtils.isNotBlank(query.getStaffSid())) { // 业务员sid
qw.like("staffSid", query.getStaffSid());
qw.eq("staffSid", query.getStaffSid());
}
return qw;
}
@ -1006,43 +1006,47 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
String staffSid = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData().getStaffSid();
AppCommonContractInitVo vo = baseMapper.getContractInfo(contractSid, staffSid);
String urlPrefix = fileUploadComponent.getUrlPrefix();
String[] split1 = vo.getAppdixUrl().split(",");
List<String> contract = new ArrayList<>();
List<String> contractImages = Arrays.asList(split1);
for (String contractImage : contractImages) {
String contractImageUrl = urlPrefix + contractImage;
contract.add(contractImageUrl);
vo.setUserSid(userSid);
if (StringUtils.isNotBlank(vo.getAppdixUrl())) {
String[] split1 = vo.getAppdixUrl().split(",");
List<String> contract = new ArrayList<>();
List<String> contractImages = Arrays.asList(split1);
for (String contractImage : contractImages) {
String contractImageUrl = urlPrefix + contractImage;
contract.add(contractImageUrl);
}
vo.setContractImages(contract);
}
vo.setContractImages(contract);
String[] split2 = vo.getSceneSignUrl().split(",");
List<String> siteSig = new ArrayList<>();
List<String> siteSigImages = Arrays.asList(split2);
for (String siteSigImage : siteSigImages) {
String siteSigImagesUrl = urlPrefix + siteSigImage;
siteSig.add(siteSigImagesUrl);
if (StringUtils.isNotBlank(vo.getSceneSignUrl())) {
String[] split2 = vo.getSceneSignUrl().split(",");
List<String> siteSig = new ArrayList<>();
List<String> siteSigImages = Arrays.asList(split2);
for (String siteSigImage : siteSigImages) {
String siteSigImagesUrl = urlPrefix + siteSigImage;
siteSig.add(siteSigImagesUrl);
}
vo.setSiteSigImages(siteSig);
}
vo.setSiteSigImages(siteSig);
if (vo.getCustomerKey().equals("1")) {
vo.setIdCardArchives(false);
if (StringUtils.isNotBlank(vo.getSceneSignUrl())) {
String[] split3 = vo.getSceneSignUrl().split(",");
List<String> idCard = new ArrayList<>();
List<String> idCardImages = Arrays.asList(split3);
for (String idCardImage : idCardImages) {
String idCardImagesUrl = urlPrefix + idCardImage;
idCard.add(idCardImagesUrl);
if (StringUtils.isNotBlank(vo.getCustomerKey())) {
if (vo.getCustomerKey().equals("1")) {
vo.setIdCardArchives(false);
if (StringUtils.isNotBlank(vo.getSceneSignUrl())) {
String[] split3 = vo.getSceneSignUrl().split(",");
List<String> idCard = new ArrayList<>();
List<String> idCardImages = Arrays.asList(split3);
for (String idCardImage : idCardImages) {
String idCardImagesUrl = urlPrefix + idCardImage;
idCard.add(idCardImagesUrl);
}
vo.setIdCardImages(idCard);
} else {
vo.setIdCardImages(new ArrayList<>());
}
vo.setIdCardImages(idCard);
} else {
vo.setIdCardImages(new ArrayList<>());
}
} else if (vo.getCustomerKey().equals("2")) {
vo.setIdCardArchives(true);
} else if (vo.getCustomerKey().equals("2")) {
vo.setIdCardArchives(true);
// 往里添加客户档案里的身份证信息
}
}
return vo;
}
@ -1056,9 +1060,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
@Transactional(rollbackFor = Exception.class)
public ResultBean saveContractInfo(AppCrmCustomerFileDto dto) {
ResultBean rb = ResultBean.fireFail();
AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData();
CommonContract commonContract = new CommonContract();
CommonContract commonContract = fetchBySid(dto.getContractSid());
commonContract.setContractNo(dto.getContractId());
commonContract.setPrice(dto.getPrice());
commonContract.setNum(Integer.valueOf(dto.getNumber()));
@ -1072,36 +1075,36 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
String s1 = "";
String s2 = "";
String s3 = "";
if (dto.getContractImages().size() > 0) {
if (dto.getContractImages() != null) {
for (String contractImage : dto.getContractImages()) {
if (contractImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
contractImage = contractImage.replace(fileUploadComponent.getUrlPrefix(), "");
}
s1 += contractImage + ",";
commonContract.setAppdixUrl(s1.substring(0, s1.length() - 1));
}
commonContract.setAppdixUrl(s1.substring(0, s1.length() - 1));
}
if (dto.getContractImages().size() > 0) {
if (dto.getContractImages() != null) {
for (String siteSigImages : dto.getSiteSigImages()) {
if (siteSigImages.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
siteSigImages = siteSigImages.replace(fileUploadComponent.getUrlPrefix(), "");
}
s2 += siteSigImages + ",";
commonContract.setSceneSignUrl(s2.substring(0, s2.length() - 1));
}
commonContract.setSceneSignUrl(s2.substring(0, s2.length() - 1));
}
if (dto.getContractImages().size() > 0) {
if (dto.getContractImages() != null) {
for (String idCardImage : dto.getIdCardImages()) {
if (idCardImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
idCardImage = idCardImage.replace(fileUploadComponent.getUrlPrefix(), "");
}
s3 += idCardImage + ",";
commonContract.setIdImagesUrl(s3.substring(0, s3.length() - 1));
}
commonContract.setIdImagesUrl(s3.substring(0, s3.length() - 1));
}
save(commonContract);
updateById(commonContract);
return rb.success();
}

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@ -665,7 +665,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
messageFlowableQuery.setMsgContent(scmVehicleGression.getApplicantName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("供应链");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(ufVo, appMap, scmVehicleGression);
return voResultBean;
}
if (r == 2) {
@ -769,7 +768,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
messageFlowableQuery.setMsgContent(scmVehicleGression.getApplicantName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("供应链");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(ufVo, appMap, scmVehicleGression);
}
return rb.success().setData(resultBean.getData());
@ -874,7 +872,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
}
messageFlowableQuery.setMsgTitle("供应链");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(ufVo, appMap, scmVehicleGression);
return rb.success();
}
}

6
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

@ -268,7 +268,6 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
messageFlowableQuery.setMsgContent(scmVehicleReturn.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("供应链");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(uff, appMap, scmVehicleReturn);
return resultBean1;
}
return submitBusinessData(scmVehicleReturnDto, busSid, orgSidPath, variables);
@ -426,8 +425,6 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
messageFlowableQuery.setMsgContent(scmVehicleReturn.getApplicationName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("供应链");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
// String msgSid = getMessage(uff, appMap, scmVehicleReturn);
}
return rb1;
} else {
@ -749,8 +746,6 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
}
messageFlowableQuery.setMsgTitle("供应链");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
String msgSid = getMessage(uff, appMap, scmVehicleReturn);
return resultBean;
} else {
return ResultBean.fireFail().setMsg("操作失败,提交的数据不一致!");
@ -779,7 +774,6 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
messageFlowableDto.setModuleAction(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(0));
List<Integer> codesInteger = Arrays.asList(Arrays.asList(sysProUrlVo.getUrl().split("#")).get(1).split(",")).stream().map(Integer::parseInt).collect(Collectors.toList());
int[] ints = codesInteger.stream().mapToInt(Integer::valueOf).toArray();
;
messageJsonDto.setButtons(ints);
} else {
messageFlowableDto.setModuleAction(sysProUrlVo.getUrl());

8
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeign.java

@ -42,5 +42,13 @@ public interface AppCommonContractFeign {
@ResponseBody
public ResultBean<PagerVo<AppCommonContractPageVo>> getContractList(@RequestBody PagerQuery<AppCommonContractQuery> pagerQuery);
@ApiOperation("移动端-初始化合同审核")
@GetMapping("/getContractInfo/{contractSid}/{userSid}")
@ResponseBody
public ResultBean<CommonContractInitVo> getContractInfo(@PathVariable("contractSid") String contractSid, @PathVariable("userSid") String userSid);
@ApiOperation("移动端-保存合同审核")
@PostMapping("/saveContractInfo")
@ResponseBody
public ResultBean saveContractInfo(@RequestBody CrmCustomerFileDto dto);
}

10
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeignFallback.java

@ -31,4 +31,14 @@ public class AppCommonContractFeignFallback implements AppCommonContractFeign {
public ResultBean<PagerVo<AppCommonContractPageVo>> getContractList(PagerQuery<AppCommonContractQuery> pagerQuery) {
return null;
}
@Override
public ResultBean<CommonContractInitVo> getContractInfo(String contractSid, String userSid) {
return null;
}
@Override
public ResultBean saveContractInfo(CrmCustomerFileDto dto) {
return null;
}
}

69
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/CommonContractInitVo.java

@ -0,0 +1,69 @@
package com.yxt.anrui.terminal.api.autoservice.contract;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
public class CommonContractInitVo implements Vo {
private static final long serialVersionUID = 8205950296578299984L;
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("单台价格")
private String price;
@ApiModelProperty("数量")
private String number;
@ApiModelProperty("车型")
private String model;
@ApiModelProperty("乙方名称")
private String partyB;
@ApiModelProperty("合同编号")
private String contractId;
@ApiModelProperty("合同价格")
private String contractPrice;
@ApiModelProperty("新车买卖合同")
private List<String> contractImages;
@ApiModelProperty("现场签署图片")
private List<String> siteSigImages;
@ApiModelProperty("身份证图片")
private List<String> idCardImages;
@ApiModelProperty("客户类型")
private String customerKey;
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("流程实例id")
private String procInsId;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("是否是档案库里的身份证")
private boolean idCardArchives;
@ApiModelProperty("客户sid")
private String customerSid;
@ApiModelProperty("合同附件")
private String appdixUrl;
@ApiModelProperty("现场签署图片附件")
private String sceneSignUrl;
@ApiModelProperty("身份证图片")
private String idImagesUrl;
}

73
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/CrmCustomerFileDto.java

@ -0,0 +1,73 @@
package com.yxt.anrui.terminal.api.autoservice.contract;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
public class CrmCustomerFileDto implements Dto {
private static final long serialVersionUID = 3534355480622793601L;
@ApiModelProperty("合同sid")
private String contractSid;
@ApiModelProperty("单台价格")
private BigDecimal price;
@ApiModelProperty("数量")
private String number;
@ApiModelProperty("车型")
private String model;
@ApiModelProperty("乙方名称")
private String partyB;
@ApiModelProperty("合同编号")
private String contractId;
@ApiModelProperty("合同价格")
private String contractPrice;
@ApiModelProperty("新车买卖合同")
private List<String> contractImages;
@ApiModelProperty("现场签署图片")
private List<String> siteSigImages;
@ApiModelProperty("身份证图片")
private List<String> idCardImages;
@ApiModelProperty("客户类型")
private String customerKey;
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("流程实例id")
private String procInsId;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("是否是档案库里的身份证")
private boolean idCardArchives;
@ApiModelProperty("客户sid")
private String customerSid;
@ApiModelProperty("合同附件")
private String appdixUrl;
@ApiModelProperty("现场签署图片附件")
private String sceneSignUrl;
@ApiModelProperty("身份证图片")
private String idImagesUrl;
}

14
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractRest.java

@ -5,6 +5,8 @@ import com.yxt.anrui.base.api.commoncontract.*;
import com.yxt.anrui.terminal.api.autoservice.contract.AppCommonContractFeign;
import com.yxt.anrui.terminal.api.autoservice.contract.CommonContractInitVo;
import com.yxt.anrui.terminal.api.autoservice.contract.CrmCustomerFileDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -41,6 +43,16 @@ public class AppCommonContractRest implements AppCommonContractFeign {
@Override
@ApiOperation("移动端-合同审核列表")
public ResultBean<PagerVo<AppCommonContractPageVo>> getContractList(PagerQuery<AppCommonContractQuery> pagerQuery) {
return appCommonContractService.getContractList(pagerQuery);
return appCommonContractService.getContractList(pagerQuery);
}
@Override
public ResultBean<CommonContractInitVo> getContractInfo(String contractSid, String userSid) {
return appCommonContractService.getContractInfo(contractSid,userSid);
}
@Override
public ResultBean saveContractInfo(CrmCustomerFileDto dto) {
return appCommonContractService.saveContractInfo(dto);
}
}

28
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractService.java

@ -1,18 +1,22 @@
package com.yxt.anrui.terminal.biz.autoservice.contract;
import com.sun.org.apache.regexp.internal.RE;
import com.yxt.anrui.base.api.commoncontract.*;
import com.yxt.anrui.terminal.api.autoservice.contract.CommonContractInitVo;
import com.yxt.anrui.terminal.api.autoservice.contract.CrmCustomerFileDto;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* Project: anrui-base(安瑞基础) <br/>
* File: CommonContractService.java <br/>
@ -45,4 +49,26 @@ public class AppCommonContractService {
}
public ResultBean<CommonContractInitVo> getContractInfo(String contractSid, String userSid) {
ResultBean<CommonContractInitVo> rb = ResultBean.fireFail();
CommonContractInitVo vo = new CommonContractInitVo();
ResultBean<AppCommonContractInitVo> resultBean = commonContractFeign.getContractInfo(contractSid, userSid);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
AppCommonContractInitVo data = resultBean.getData();
BeanUtils.copyProperties(data, vo);
return rb.success().setData(vo);
}
public ResultBean saveContractInfo(CrmCustomerFileDto dto) {
ResultBean rb = ResultBean.fireFail();
AppCrmCustomerFileDto appCrmCustomerFileDto = new AppCrmCustomerFileDto();
BeanUtils.copyProperties(dto, appCrmCustomerFileDto);
ResultBean resultBean = commonContractFeign.saveContractInfo(appCrmCustomerFileDto);
if (!resultBean.getSuccess()) {
rb.setMsg(resultBean.getMsg());
}
return rb.success();
}
}
Loading…
Cancel
Save