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

Merge remote-tracking branch 'origin/master'

zhanglei
God 2 years ago
parent
0b81c18f0c bb4e763449
commit
b011a46ef8
11 changed files with 191 additions and 37 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. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java
  3. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/flowable/CommonContractCompleteDto.java
  4. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java
  5. 45
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  6. 15
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeign.java
  7. 23
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeignFallback.java
  8. 8
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/flowable/ContractDto.java
  9. 20
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/flowable/ContractFlowListVo.java
  10. 21
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractRest.java
  11. 76
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractService.java

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

@ -163,7 +163,7 @@ public interface CommonContractFeign {
@ApiOperation("移动端-初始化合同审核")
@GetMapping("/getContractInfo")
@ResponseBody
public ResultBean<AppCommonContractInitVo> getContractInfo(@RequestParam("contractSid") String contractSid, @RequestParam("userSid") String userSid);
public ResultBean<AppCommonContractInitVo> getContractInfo(@RequestParam("contractSid") String contractSid, @RequestParam(value = "userSid",required = false) String userSid);
@ApiOperation("移动端-保存合同审核")
@PostMapping("/saveContractInfo")
@ -211,4 +211,8 @@ public interface CommonContractFeign {
@ApiOperation(value = "根据合同编号获取合同信息")
@GetMapping(value = "/selectByNo")
ResultBean<CommonContract> selectByNo(@RequestParam("contractNo") String contractNo);
@ApiOperation(value = "第二环节办理")
@PostMapping("/completeBy")
public ResultBean completeBy(@Valid @RequestBody CommonContractCompleteDto query);
}

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

@ -223,4 +223,9 @@ public class CommonContractFeignFallback implements CommonContractFeign {
public ResultBean<CommonContract> selectByNo(String contractNo) {
return null;
}
@Override
public ResultBean completeBy(CommonContractCompleteDto query) {
return null;
}
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/flowable/CommonContractCompleteDto.java
View File

@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.List;
/**
* @Author dimengzhe
@ -35,4 +36,7 @@ public class CommonContractCompleteDto implements Dto {
@ApiModelProperty(value = "业务sid")
@NotBlank(message = "参数错误：businessSid")
private String businessSid;
private List<String> contractImages;
private List<String> siteSigImages;
}

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

@ -588,4 +588,9 @@ public class CommonContractRest implements CommonContractFeign {
public ResultBean<CommonContract> selectByNo(String contractNo) {
return commonContractService.selectByNo(contractNo);
}
@Override
public ResultBean completeBy(CommonContractCompleteDto query) {
return commonContractService.completeBy(query);
}
}

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

@ -11,10 +11,7 @@ import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.api.commoncontract.*;
import com.yxt.anrui.base.api.commoncontract.flowable.AppSubmitContractInfoDto;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeQuery;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeVo;
import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractTaskQuery;
import com.yxt.anrui.base.api.commoncontract.flowable.*;
import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService;
import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
@ -60,7 +57,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
import com.yxt.anrui.portal.config.DictCommonType;
import com.yxt.common.base.config.component.DocPdfComponent;
import com.yxt.common.base.config.component.FileUploadComponent;
@ -1492,11 +1488,7 @@ 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 = fetchBySid(dto.getContractSid());
// commonContract.setStaffSid(dto.getUserSid());
// commonContract.setStaffName(data.getStaffName());
// commonContract.setOrgSid(data.getOrgSid());
String s1 = "";
String s2 = "";
String s3 = "";
@ -2351,4 +2343,39 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
PagerVo<AppCommonContractListVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean completeBy(CommonContractCompleteDto query) {
ResultBean rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.CONTRACTAPPLY.getProDefId());
ResultBean resultBean = complete(bv);
if(resultBean.getSuccess()){
//更新图片
CommonContract commonContract = fetchBySid(query.getBusinessSid());
String s1 = "";
String s2 = "";
if (query.getContractImages() != null) {
for (String contractImage : query.getContractImages()) {
if (contractImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
contractImage = contractImage.replace(fileUploadComponent.getUrlPrefix(), "");
}
s1 += contractImage + ",";
commonContract.setAppdixUrl(s1.substring(0, s1.length() - 1));
}
}
if (query.getSiteSigImages() != null) {
for (String siteSigImages : query.getSiteSigImages()) {
if (siteSigImages.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
siteSigImages = siteSigImages.replace(fileUploadComponent.getUrlPrefix(), "");
}
s2 += siteSigImages + ",";
commonContract.setSceneSignUrl(s2.substring(0, s2.length() - 1));
}
}
baseMapper.updateById(commonContract);
}
return rb.success();
}
}

15
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeign.java
View File

@ -3,10 +3,7 @@ package com.yxt.anrui.terminal.api.autoservice.contract;
import com.yxt.anrui.base.api.commoncontract.AppCommonContractPageVo;
import com.yxt.anrui.base.api.commoncontract.AppCommonContractQuery;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeignFallback;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractDto;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.SubmitContractInfoDto;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -90,4 +87,14 @@ public interface AppCommonContractFeign {
@GetMapping("/getFlowOperateTitle")
@ResponseBody
ResultBean<String> getFlowOperateTitle(@SpringQueryMap ContractQuery query);
@ApiOperation("获取下一环节")
@GetMapping("/getFlowOperateTitleBy")
@ResponseBody
ResultBean<ContractFlowListVo> getFlowOperateTitleBy(@SpringQueryMap ContractQuery query);
@ApiOperation("办理")
@PutMapping("/agreeContractInfoBy")
@ResponseBody
ResultBean agreeContractInfoBy(@RequestBody ContractDto dto);
}

23
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/AppCommonContractFeignFallback.java
View File

@ -1,19 +1,12 @@
package com.yxt.anrui.terminal.api.autoservice.contract;
import com.yxt.anrui.base.api.commoncontract.*;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractDto;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.SubmitContractInfoDto;
import com.yxt.anrui.base.api.commoncontract.AppCommonContractPageVo;
import com.yxt.anrui.base.api.commoncontract.AppCommonContractQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.text.ParseException;
import java.util.Map;
/**
* Project: anrui-base(安瑞基础) <br/>
@ -75,4 +68,14 @@ public class AppCommonContractFeignFallback implements AppCommonContractFeign {
public ResultBean<String> getFlowOperateTitle(ContractQuery query) {
return null;
}
@Override
public ResultBean<ContractFlowListVo> getFlowOperateTitleBy(ContractQuery query) {
return null;
}
@Override
public ResultBean agreeContractInfoBy(ContractDto dto) {
return null;
}
}

8
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/flowable/ContractDto.java
View File

@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.List;
/**
* @Author dimengzhe
@ -34,4 +35,11 @@ public class ContractDto implements Dto {
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误：taskDefKey")
private String taskDefKey;
private List<String> contractImages;
private List<String> siteSigImages;
private String orgPath;
}

20
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/flowable/ContractFlowListVo.java
View File

@ -0,0 +1,20 @@
package com.yxt.anrui.terminal.api.autoservice.contract.flowable;
import com.yxt.common.core.vo.Vo;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2023/2/8 16:51
* @Description
*/
@Data
public class ContractFlowListVo implements Vo {
private static final long serialVersionUID = 835198618461779653L;
private String title;
private List<String> contractImages;
private List<String> siteSigImages;
}

21
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractRest.java
View File

@ -1,22 +1,17 @@
package com.yxt.anrui.terminal.biz.autoservice.contract;
import com.yxt.anrui.base.api.commoncontract.*;
import com.yxt.anrui.base.api.commoncontract.AppCommonContractPageVo;
import com.yxt.anrui.base.api.commoncontract.AppCommonContractQuery;
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.anrui.terminal.api.autoservice.contract.flowable.ContractDto;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.SubmitContractInfoDto;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -89,4 +84,14 @@ public class AppCommonContractRest implements AppCommonContractFeign {
public ResultBean<String> getFlowOperateTitle(ContractQuery query) {
return appCommonContractService.getFlowOperateTitle(query);
}
@Override
public ResultBean<ContractFlowListVo> getFlowOperateTitleBy(ContractQuery query) {
return appCommonContractService.getFlowOperateTitleBy(query);
}
@Override
public ResultBean agreeContractInfoBy(ContractDto dto) {
return appCommonContractService.agreeContractInfoBy(dto);
}
}

76
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/contract/AppCommonContractService.java
View File

@ -10,14 +10,11 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.terminal.api.autoservice.contract.CommonContractInitVo;
import com.yxt.anrui.terminal.api.autoservice.contract.CrmCustomerFileDto;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractDto;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.ContractTaskQuery;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.SubmitContractInfoDto;
import com.yxt.anrui.terminal.api.autoservice.contract.flowable.*;
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 lombok.Data;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -182,4 +179,73 @@ public class AppCommonContractService {
}
return rb.success().setData(data);
}
public ResultBean<ContractFlowListVo> getFlowOperateTitleBy(ContractQuery query) {
ResultBean<ContractFlowListVo> rb = ResultBean.fireFail();
ContractFlowListVo contractFlowListVo = new ContractFlowListVo();
//0 上一环节 1下一环节
int next = query.getNext();
CommonContractNodeQuery getNodeQuery = new CommonContractNodeQuery();
BeanUtil.copyProperties(query, getNodeQuery);
String data = "";
if (next == 0) {
ResultBean<List<CommonContractNodeVo>> getPreviousNodesForReject = commonContractFeign.getPreviousNodesForReject(getNodeQuery);
if (getPreviousNodesForReject.getSuccess()) {
getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
data = getPreviousNodesForReject.getData().get(0).getName();
} else {
return rb.setMsg(getPreviousNodesForReject.getMsg());
}
} else if (next == 1) {
ResultBean<List<CommonContractNodeVo>> getNextNodesForSubmit = commonContractFeign.getNextNodesForSubmit(getNodeQuery);
if (getNextNodesForSubmit.getSuccess()) {
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
data = getNextNodesForSubmit.getData().get(0).getName();
} else {
return rb.setMsg(getNextNodesForSubmit.getMsg());
}
} else {
return rb.setMsg("参数错误：next");
}
contractFlowListVo.setTitle(data);
ResultBean<AppCommonContractInitVo> resultBean = commonContractFeign.getContractInfo(query.getBusinessSid(), "");
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
AppCommonContractInitVo appCommonContractInitVo = resultBean.getData();
if(appCommonContractInitVo != null){
contractFlowListVo.setContractImages(appCommonContractInitVo.getContractImages());
contractFlowListVo.setSiteSigImages(appCommonContractInitVo.getSiteSigImages());
}
return rb.success().setData(contractFlowListVo);
}
public ResultBean agreeContractInfoBy(ContractDto dto) {
ResultBean rb = ResultBean.fireFail();
String orgSidPath = "";
if(StringUtils.isNotBlank(dto.getOrgPath())){
orgSidPath = dto.getOrgPath();
}else{
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
}
CommonContractCompleteDto commonContractCompleteDto = new CommonContractCompleteDto();
BeanUtil.copyProperties(dto, commonContractCompleteDto);
commonContractCompleteDto.setOrgSidPath(orgSidPath);
ResultBean resultBean = commonContractFeign.completeBy(commonContractCompleteDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
}
Write Preview
Loading…
Cancel
Save