Skip to content

A
amos-boot-biz
Commit 53304062 authored by tangwei's avatar tangwei
Browse files
Options

增加添加合同

parent cffd14e1
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 10 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HouseholdContractDto.java
View file @ 53304062
......@@ -121,9 +121,9 @@ public class HouseholdContractDto extends BaseDto {
@ApiModelProperty(value = "电站功率")
private Double stationPower;
@ApiModelProperty(value = "合同契约锁id")
private Double contractLockId;
private Long contractLockId;
@ApiModelProperty(value = "印章id")
private Double sealId;
private Long sealId;
/**
* 发起状态
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/TemplateParamDto.java
View file @ 53304062
......@@ -12,4 +12,9 @@ public class TemplateParamDto {
private String key;
private String value;
public TemplateParamDto(String key, String value) {
this.key = key;
this.value = value;
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HouseholdContract.java
View file @ 53304062
......@@ -225,13 +225,13 @@ public class HouseholdContract extends BaseEntity {
*合同契约锁id'
* */
@TableField("contract_lock_id")
private Double contractLockId;
private Long contractLockId;
/**
* 印章id
* */
@TableField("seal_id")
private Double sealId;
private Long sealId;
/**
* 发起状态
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/QiyuesuoController.java
View file @ 53304062
......@@ -10,6 +10,10 @@ import com.qiyuesuo.sdk.v2.response.ContractListResult;
import com.qiyuesuo.sdk.v2.response.DocumentAddResult;
import com.qiyuesuo.sdk.v2.response.MiniappTicketResult;
import com.qiyuesuo.sdk.v2.response.SdkResponse;
import com.yeejoin.amos.boot.module.hygf.api.dto.ContractDataDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HouseholdContractServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.QiyuesuoServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -45,6 +49,8 @@ public class QiyuesuoController {
@Autowired
QiyuesuoServiceImpl qiyuesuoService;
@Autowired
HouseholdContractServiceImpl householdContractServiceImpl;
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "post",value = "个人token", notes = "个人token")
......@@ -68,7 +74,13 @@ public class QiyuesuoController {
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "post",value = "创建合同", notes = "创建合同")
@PostMapping (value = "/addContract")
public ResponseModel<HouseholdContract> initiateHouseholdContract(@RequestBody HouseholdContractDto model) {
HouseholdContract householdContract=householdContractServiceImpl.initiateHouseholdContract(model);
return ResponseHelper.buildResponse(householdContract);
}
......@@ -100,6 +112,20 @@ public class QiyuesuoController {
return ResponseHelper.buildResponse(qysResponse.getResult());
}
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "post",value = "创建合同", notes = "创建合同")
@PostMapping (value = "/getUnit2000")
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HouseholdContractServiceImpl.java
View file @ 53304062
......@@ -3,20 +3,25 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractPageDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationPageDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.*;
import com.yeejoin.amos.boot.module.hygf.api.entity.ContractTemplate;
import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
import com.yeejoin.amos.boot.module.hygf.api.mapper.ContractTemplateMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IHouseholdContractService;
import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractDto;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.PathVariable;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.Period;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
......@@ -32,6 +37,21 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
@Autowired
HouseholdContractMapper householdContractMapper;
@Autowired
QiyuesuoServiceImpl qiyuesuoServiceImpl;
@Value("${qiyuesuo.category}")
String category;
@Value("${qiyuesuo.category}")
String companyTenantName;
@Value("${qiyuesuo.category}")
String companyUsername;
@Value("${qiyuesuo.category}")
String companyContact;
@Autowired
ContractTemplateMapper contractTemplateMapper;
/**
* 列表查询 示例
*/
......@@ -87,4 +107,74 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
}
public HouseholdContract initiateHouseholdContract(HouseholdContractDto model){
HouseholdContract householdContract= householdContractMapper.selectById(model.getSequenceNbr());
householdContract.setPartyA(model.getPartyA());
householdContract.setPartyB(model.getPartyB());
householdContract.setContractTemplateId(model.getContractTemplateId());
householdContract.setRentFree(model.getRentFree());
householdContract.setRentCalculationDate(model.getRentCalculationDate());
householdContract.setLeaseEndDate(model.getLeaseEndDate());
householdContract.setConstructionScale(model.getConstructionScale());
householdContract.setComponentQuantityBlock(model.getComponentQuantityBlock());
householdContract.setTotalInvestment(model.getTotalInvestment());
householdContract.setComponentPower(model.getComponentPower());
householdContract.setStationPower(model.getStationPower());
householdContract.setName(model.getName());
//调用第三方
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
//签署结束时间默认一个月后
// LocalDateTime now = LocalDateTime.now();
// LocalDateTime afterOneMonth = now.plus(Period.ofMonths(1));
ContractDataDto contractDataDto =new ContractDataDto();
contractDataDto.setUsername(model.getPartyA());
contractDataDto.setContact(model.getPeasantHouseholdPhone());
contractDataDto.setIDCard(model.getPeasantHouseholdCard());
contractDataDto.setSubject(model.getName());
// contractDataDto.setEndTime(sdf.format(afterOneMonth));
//// contractDataDto.setExpireTime(sdf.format(model.getLeaseEndDate()));
contractDataDto.setCategory(category);
contractDataDto.setCompanyTenantName(companyTenantName);
contractDataDto.setCompanyUsername(companyUsername);
contractDataDto.setCompanyContact(companyContact);
contractDataDto.setEmplateId(model.getContractTemplateId());
ContractTemplate contractTemplate=contractTemplateMapper.selectById(model.getContractTemplateId());
contractDataDto.setCompanykeyword(contractTemplate.getCompanyKeyword());
contractDataDto.setCompanyPage(contractTemplate.getCompanyPage());
contractDataDto.setCompanyOffsetX(contractTemplate.getCompanyOffsetx());
contractDataDto.setCompanyOffsetY(contractTemplate.getCompanyOffsety());
contractDataDto.setPersonalkeyword(contractTemplate.getCompanyKeyword());
contractDataDto.setPersonalPage(contractTemplate.getPersonalPage());
contractDataDto.setPersonalOffsetX(contractTemplate.getPersonalOffsetx());
contractDataDto.setPersonalOffsetY(contractTemplate.getPersonalOffsety());
List<TemplateParamDto> templateParam=new ArrayList<>();
SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd");
templateParam.add(new TemplateParamDto("partyA",householdContract.getPartyA()));
templateParam.add(new TemplateParamDto("peasantHouseholdPhone",householdContract.getPeasantHouseholdPhone()));
templateParam.add(new TemplateParamDto("rentFree",householdContract.getRentFree()));
templateParam.add(new TemplateParamDto("rentCalculationDate",householdContract.getRentCalculationDate()!=null?sdfdate.format(householdContract.getRentCalculationDate()):""));
templateParam.add(new TemplateParamDto("leaseEndDate",householdContract.getLeaseEndDate()!=null?sdfdate.format(householdContract.getLeaseEndDate()):""));
templateParam.add(new TemplateParamDto("constructionScale",householdContract.getConstructionScale()!=null?String.valueOf(householdContract.getConstructionScale()):""));
templateParam.add(new TemplateParamDto("componentQuantityBlock",householdContract.getComponentQuantityBlock()!=null?String.valueOf(householdContract.getComponentQuantityBlock()):""));
templateParam.add(new TemplateParamDto("totalInvestment",householdContract.getTotalInvestment()!=null?String.valueOf(householdContract.getTotalInvestment()):""));
templateParam.add(new TemplateParamDto("peasantHouseholdCard",householdContract.getPeasantHouseholdCard()));
templateParam.add(new TemplateParamDto("permanentAddressDetail",householdContract.getPermanentAddressName()+householdContract.getPermanentAddressDetail()));
templateParam.add(new TemplateParamDto("projectAddressDetail",householdContract.getProjectAddressName()+householdContract.getProjectAddressDetail()));
templateParam.add(new TemplateParamDto("componentPower",householdContract.getComponentPower()!=null?String.valueOf(householdContract.getComponentPower()):""));
templateParam.add(new TemplateParamDto("stationPower",householdContract.getStationPower()!=null?String.valueOf(householdContract.getStationPower()):""));
Long contractLockId=qiyuesuoServiceImpl.addContract(contractDataDto , templateParam);
householdContract.setContractLockId(contractLockId);
householdContract.setInitiateStatus(HouseholdContractEnum.发起状态_已发起.getCode());
householdContractMapper.updateById(householdContract);
return householdContract;
}
}
\ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties
View file @ 53304062
......@@ -114,4 +114,15 @@ unitInfo.station.examine.planId=51776087-a9cf-4a87-9a03-24fd24a8cf45
hygf.sms.tempCodeJXS=SMS_HYGF_0002
regionalCompanies.company.seq=1693499571071619074
\ No newline at end of file
regionalCompanies.company.seq=1693499571071619074
qiyuesuo.serverUrl = https://openapi.qiyuesuo.cn
qiyuesuo.accessKey = TdBmNkjAYd
qiyuesuo.accessSecret = y8KiDFKKDdC9Ld9Cm5zuy2rpXjxP5Z
qiyuesuo.category=智信能源科技有限公司光伏合同
qiyuesuo.companyTenantName=智信能源科技有限公司
qiyuesuo.companyUsername=吴文宝
qiyuesuo.companyContact=13870935656
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment