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

Merge remote-tracking branch 'origin/master'

master
yxt_djz 2 years ago
parent
a75801c475 8b87085e65
commit
73b699593e
7 changed files with 39 additions and 23 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/AppCrmCustomerFileDto.java
  2. 10
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CarSaleContractApproveDto.java
  3. 1
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractsDto.java
  4. 37
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  5. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java
  6. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java
  7. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderModelInfoVo.java

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

@ -66,5 +66,11 @@ public class AppCrmCustomerFileDto implements Dto {
@ApiModelProperty("身份证图片")
private String idImagesUrl;
@ApiModelProperty("其他方名称")
private String partyC;
@ApiModelProperty("备注")
private String remarks;
}

10
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CarSaleContractApproveDto.java
View File

@ -15,15 +15,9 @@ import javax.validation.constraints.NotBlank;
*/
@ApiModel("新车买卖合同")
@Data
public class CarSaleContractApproveDto implements Dto {
public class CarSaleContractApproveDto extends CommonContractsDto {
@ApiModelProperty("合同sid")
@NotBlank(message = "合同sid不能为空")
private String businessSid;
@ApiModelProperty("用户sid")
@NotBlank(message = "用户sid不能为空")
private String userSid;
private static final long serialVersionUID = -2105885422646534680L;
@ApiModelProperty("环节id")
private String taskId;

1
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractsDto.java
View File

@ -38,4 +38,5 @@ public class CommonContractsDto implements Dto {
@ApiModelProperty("备注")
private String remarks;
}

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

@ -82,6 +82,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.io.File;
import java.io.InputStream;
import java.math.BigDecimal;
import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.*;
@ -1264,16 +1265,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
* @return
*/
public ResultBean submitCarSaleContractApprove(CarSaleContractApproveDto dto) {
String staffSid = sysUserFeign.selectBySid(dto.getUserSid()).getData().getStaffSid();
ResultBean<String> resultBean = sysStaffOrgFeign.getSysStaffOrgSidListByStaffSid(staffSid);
if (!resultBean.getSuccess()) {
return new ResultBean().fail().setMsg("用户组织机构不能为空");
}
Map<String, Object> variables = new HashMap<>();
variables.put("businessSid", dto.getBusinessSid());
variables.put("orgSid", resultBean.getData());
AppSubmitContractInfoDto submitContractInfoDto = new AppSubmitContractInfoDto();
BeanUtil.copyProperties(dto,submitContractInfoDto);
ResultBean resultBean = submitContractInfo(submitContractInfoDto);
return resultBean;
return null;//flowableService.businessStart(ProcDefEnum.CARSALECONTRACTAPPROVE.getProDefId(), dto.getUserSid(), variables);
}
public ResultBean<CommonContractVo> fetchAllBySid(String sid) {
@ -1873,7 +1870,14 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
}
}
//生成合同编号
String contractNo = getApplyCode(dto.getUserSid(), appOrderModelInfoVo.getModelSid());
String contractNo = "";
CommonContractBuscenterVo commonContractBuscenterVo = baseMapper.selectByBusSid(dto.getBusSid());
if (commonContractBuscenterVo == null) {
contractNo = getApplyCode(dto.getUserSid(), appOrderModelInfoVo.getModelSid());
}else{
contractNo = commonContractBuscenterVo.getContractNo();
}
// String contractNo = getApplyCode(dto.getUserSid(), appOrderModelInfoVo.getModelSid());
map.put("contractNo", contractNo);
String url = "";
PrintConfirmVo printConfirmVo = null;
@ -1991,16 +1995,17 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
}
//生成合同数据
//根据销售订单sid查询合同表中是否存在
CommonContractBuscenterVo commonContractBuscenterVo = baseMapper.selectByBusSid(dto.getBusSid());
commonContractBuscenterVo = baseMapper.selectByBusSid(dto.getBusSid());
if (commonContractBuscenterVo == null) {
String finalUrl = url;
String finalUrlAll = urlAll;
String finalAddress = address;
String finalContractNo = contractNo;
Future<String> future3 = pool.submit(() -> {
//新增合同信息
CommonContract commonContract = new CommonContract();
//合同编号
commonContract.setContractNo(contractNo);
commonContract.setContractNo(finalContractNo);
//合同类型
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
commonContract.setContractTypeKey(CommonContractEnum.contractType.XC_CONTRACT.getCode());
@ -2047,6 +2052,10 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
commonContract.setCustomerTypeKey(appOrderDetailsVo.getCustomerKey());
commonContract.setContractUrlAll(finalUrlAll);
save(commonContract);
AppOrderContractNoDto appOrderContractNoDto = new AppOrderContractNoDto();
appOrderContractNoDto.setContractNo(commonContract.getContractNo());
appOrderContractNoDto.setSaleOrderSid(commonContract.getBusSid());
busSalesOrderFeign.updateContractNoBySid(appOrderContractNoDto);
if (list.size() > 0) {
//添加合同下载路径
for (PrintConfirmVo vo : list) {
@ -2227,10 +2236,10 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
} else {
//更新销售订单合同编号字段
AppOrderContractNoDto appOrderContractNoDto = new AppOrderContractNoDto();
/* AppOrderContractNoDto appOrderContractNoDto = new AppOrderContractNoDto();
appOrderContractNoDto.setContractNo(commonContract.getContractNo());
appOrderContractNoDto.setSaleOrderSid(commonContract.getBusSid());
busSalesOrderFeign.updateContractNoBySid(appOrderContractNoDto);
busSalesOrderFeign.updateContractNoBySid(appOrderContractNoDto);*/
//更新客户中的证件
ResultBean<List<String>> listResultBean = crmCustomerTempFeign.selectCustomerFile(commonContract.getCustomerSid());
List<String> stringList = listResultBean.getData();

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java
View File

@ -136,4 +136,6 @@ public class BusSalesOrder extends BaseEntity {
@ApiModelProperty("申请人的组织机构全路径sid")
private String orgSidPath;
private String contractNo;
}

4
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java
View File

@ -10,7 +10,6 @@ import com.yxt.anrui.portal.biz.syssourcefunction.SysSourceFunctionService;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -268,6 +267,9 @@ public class SysFunctionService extends MybatisBaseService<SysFunctionMapper, Sy
if( ff.get("pageUrl")!=null&& com.yxt.common.base.utils.StringUtils.isNotBlank(ff.get("pageUrl").toString())){
String pageUrl =ff.get("pageUrl").toString();
List<Map<String, Object>> lfuncs=baseMapper.getFunctionAuthorization(pageUrl);
lfuncs.forEach(fun->{
fun.put("children",new ArrayList<>());
});
map.put("children",lfuncs);
}
list2.add(map);

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderModelInfoVo.java
View File

@ -37,4 +37,6 @@ public class OrderModelInfoVo implements Vo {
@ApiModelProperty("公告型号")
private String publicModel;
@ApiModelProperty("公告型号配置")
public String publicModelSon;
}

Write Preview
Loading…
Cancel
Save