Skip to content

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

增加模板字段

parent 4a509e7c
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 18 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/ContractFillData.java
View file @ a5135ae7
......@@ -40,6 +40,11 @@ public class ContractFillData extends BaseEntity {
//模板id
@TableField("template_id")
private Long templateId;
//模板id
@TableField("contract_id")
private Long contractId;
//合同填充字段值
@TableField(exist = false)
List<ContractFillData> contractFillData;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/ContractTemplate.java
View file @ a5135ae7
......@@ -23,6 +23,18 @@ public class ContractTemplate extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 平台公司id
*/
@TableField("amos_company_seq")
private Long amosCompanySeq;
/**
* 平台公名称
*/
@TableField("amos_company_name")
private String amosCompanyName;
/**
* 模板名称
*/
@TableField("template_name")
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/ContractTemplateController.java
View file @ a5135ae7
package com.yeejoin.amos.boot.module.hygf.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.mapper.ContractTemplateMapper;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HouseholdContractServiceImpl;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
......@@ -30,7 +35,10 @@ public class ContractTemplateController extends BaseController {
@Autowired
ContractTemplateServiceImpl contractTemplateServiceImpl;
@Autowired
HouseholdContractServiceImpl householdContractServiceImpl;
@Autowired
ContractTemplateMapper contractTemplateMapper;
/**
* 新增
*
......@@ -105,12 +113,16 @@ public class ContractTemplateController extends BaseController {
/**
* 列表全部数据查询
*
* @return
* @returnhousehold-contract
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<ContractTemplateDto>> selectForList() {
return ResponseHelper.buildResponse(contractTemplateServiceImpl.queryForContractTemplateList());
@GetMapping(value = "/list/{id}")
public ResponseModel<List<ContractTemplate>> selectForList(@PathVariable String id) {
HouseholdContract householdContract = householdContractServiceImpl.getById(id);
LambdaQueryWrapper<ContractTemplate> up=new LambdaQueryWrapper();
up.eq(ContractTemplate::getAmosCompanySeq,householdContract.getRegionalCompaniesSeq());
List<ContractTemplate> dat= contractTemplateMapper.selectList(up);
return ResponseHelper.buildResponse(dat);
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HouseholdContractController.java
View file @ a5135ae7
......@@ -7,14 +7,8 @@ import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractPageDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
import com.yeejoin.amos.boot.module.hygf.api.entity.ToDoTasks;
import com.yeejoin.amos.boot.module.hygf.api.entity.UserMessage;
import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.ToDoTasksMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.UserMessageMapper;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PeasantHouseholdServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.QiyuesuoServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.ToDoTasksServiceImpl;
......@@ -81,6 +75,9 @@ public class HouseholdContractController extends BaseController {
ToDoTasksMapper toDoTasksMapper;
@Autowired
UserMessageMapper userMessageMapper;
@Autowired
ContractFillDataMapper contractFillDataMapper;
/**
* 新增
*
......@@ -133,9 +130,14 @@ public class HouseholdContractController extends BaseController {
public ResponseModel<HouseholdContract> selectOne(@PathVariable Long sequenceNbr) {
HouseholdContract householdContract = householdContractServiceImpl.getById(sequenceNbr);
//合同填充字段
LambdaQueryWrapper<ContractFillData> up=new LambdaQueryWrapper<>();
up.eq(ContractFillData::getContractId,sequenceNbr);
List<ContractFillData> da=contractFillDataMapper.selectList(up);
if(householdContract.getContractLockId()!=null&&householdContract.getContractUrl()==null){
householdContract.setContractFillData(da);
if(householdContract.getContractLockId()!=null&&householdContract.getContractUrl()==null){
String url= qiyuesuoServiceImpl.getdownloadUrl(householdContract.getContractLockId());
householdContract.setContractUrl(url);
householdContractServiceImpl.updateById(householdContract);
......
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 @ a5135ae7
......@@ -199,6 +199,8 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
for (ContractFillData contractFillDatum : contractFillData) {
templateParam.add(new TemplateParamDto(contractFillDatum.getField(),contractFillDatum.getValue()));
//保存动态值
contractFillDatum.setSequenceNbr(null);
contractFillDatum.setContractId(householdContract.getSequenceNbr());
contractFillDataMapper.insert(contractFillDatum);
}
}
......@@ -321,6 +323,8 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
for (ContractFillData contractFillDatum : contractFillData) {
templateParam.add(new TemplateParamDto(contractFillDatum.getField(),contractFillDatum.getValue()));
//保存动态值
contractFillDatum.setSequenceNbr(null);
contractFillDatum.setContractId(householdContract.getSequenceNbr());
contractFillDataMapper.insert(contractFillDatum);
}
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java
View file @ a5135ae7
......@@ -309,9 +309,10 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
surveyInfoAllDto.getSurveyInformation().setDeveloperCode(userUnitInformationDto.getAmosDealerOrgCode());
surveyInfoAllDto.getSurveyInformation().setDeveloperId(userUnitInformationDto.getAmosDealerId());
surveyInfoAllDto.getSurveyInformation().setSalesmanId(userInfo.getUserId());
surveyInfoAllDto.getSurveyInformation().setSalesman(userInfo.getRealName());
surveyInfoAllDto.getSurveyInformation().setCreator(userInfo.getRealName());
// surveyInfoAllDto.getSurveyInformation().setSalesmanId(userInfo.getUserId());
// surveyInfoAllDto.getSurveyInformation().setSalesman(userInfo.getRealName());
// surveyInfoAllDto.getSurveyInformation().setCreator(userInfo.getRealName());
if (!StringUtils.isEmpty(peasantHousehold.getProjectAddressName())) {
surveyInfoAllDto.getSurveyInformation().setProjectAddressText(Arrays.asList(peasantHousehold.getProjectAddressName().split("/")));
}
......
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