Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-zx-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
项目统一框架
一体化_户用光伏项目代码
amos-boot-zx-biz
Commits
6c3494b7
Commit
6c3494b7
authored
Jul 04, 2024
by
hezhuozhi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
27523 【户用光伏】发起合同允许两个人管理员盖章
parent
eb084e2e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
110 additions
and
105 deletions
+110
-105
HouseholdContractServiceImpl.java
...e/hygf/biz/service/impl/HouseholdContractServiceImpl.java
+110
-105
No files found.
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 @
6c3494b7
...
...
@@ -2,6 +2,7 @@ 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.baomidou.mybatisplus.core.toolkit.CollectionUtils
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum
;
import
com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum
;
...
...
@@ -14,7 +15,6 @@ 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.api.service.IHouseholdContractService
;
import
com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil
;
import
org.apache.commons.lang.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
@@ -33,7 +33,7 @@ import java.util.List;
* @date 2023-08-21
*/
@Service
public
class
HouseholdContractServiceImpl
extends
BaseService
<
HouseholdContractDto
,
HouseholdContract
,
HouseholdContractMapper
>
implements
IHouseholdContractService
{
public
class
HouseholdContractServiceImpl
extends
BaseService
<
HouseholdContractDto
,
HouseholdContract
,
HouseholdContractMapper
>
implements
IHouseholdContractService
{
@Autowired
...
...
@@ -57,18 +57,19 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
@Autowired
RegionalCompaniesMapper
regionalCompaniesMapper
;
/**
* 列表查询 示例
*/
public
List
<
HouseholdContractDto
>
queryForHouseholdContractList
()
{
return
this
.
queryForList
(
""
,
false
);
public
List
<
HouseholdContractDto
>
queryForHouseholdContractList
()
{
return
this
.
queryForList
(
""
,
false
);
}
/**
* 分页查询
*/
public
IPage
<
HouseholdContract
>
queryForPreparationMoneyPage
(
HouseholdContractPageDto
dto
)
{
public
IPage
<
HouseholdContract
>
queryForPreparationMoneyPage
(
HouseholdContractPageDto
dto
)
{
// //列表数据组装
// QueryWrapper<HouseholdContract> qw = new QueryWrapper<>();
...
...
@@ -96,7 +97,7 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
//农户注册成功后生成合同
public
void
addHouseholdContract
(
HouseholdContract
householdContract
){
public
void
addHouseholdContract
(
HouseholdContract
householdContract
)
{
householdContract
.
setContractNumber
(
this
.
getnum
(
householdContract
.
getRegionalCompaniesSeq
()));
//合同编号
householdContract
.
setSurveyStatus
(
HouseholdContractEnum
.
勘察状态
_
未勘察
.
getCode
());
...
...
@@ -106,7 +107,8 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
householdContract
.
setInitiateStatus
(
HouseholdContractEnum
.
发起状态
_
未发起
.
getCode
());
householdContractMapper
.
insert
(
householdContract
);
}
public
void
reissueHouseholdContract
(
HouseholdContract
householdContract
){
public
void
reissueHouseholdContract
(
HouseholdContract
householdContract
)
{
householdContract
.
setContractNumber
(
this
.
getnum
(
householdContract
.
getRegionalCompaniesSeq
()));
//合同编号
householdContract
.
setStatus
(
HouseholdContractEnum
.
合同状态
_
未签署
.
getCode
());
...
...
@@ -117,21 +119,21 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
}
public
String
getnum
(
Long
sequenceNbr
)
{
RegionalCompanies
da
=
regionalCompaniesMapper
.
selectRegionName
(
sequenceNbr
);
if
(
da
.
getCompanyCode
()==
null
||
da
.
getCompanyCode
().
isEmpty
())
{
RegionalCompanies
da
=
regionalCompaniesMapper
.
selectRegionName
(
sequenceNbr
);
if
(
da
.
getCompanyCode
()
==
null
||
da
.
getCompanyCode
().
isEmpty
())
{
throw
new
BadRequest
(
"区域公司编号为空, 请设置编号"
);
}
if
(
da
.
getRegionalAddress
()==
null
||
da
.
getRegionalAddress
().
isEmpty
())
{
if
(
da
.
getRegionalAddress
()
==
null
||
da
.
getRegionalAddress
().
isEmpty
())
{
throw
new
BadRequest
(
"区域公司省市区为空, 请设置省市区"
);
}
String
code
=
NumberUtil
.
getCode
(
CodeEnum
.
勘察
.
getCode
(),
da
.
getCompanyCode
(),
da
.
getRegionalAddress
());
String
code
=
NumberUtil
.
getCode
(
CodeEnum
.
勘察
.
getCode
(),
da
.
getCompanyCode
(),
da
.
getRegionalAddress
());
return
code
;
}
@Transactional
public
HouseholdContract
initiateHouseholdContract
(
HouseholdContractDto
model
){
HouseholdContract
householdContract
=
householdContractMapper
.
selectById
(
model
.
getSequenceNbr
());
public
HouseholdContract
initiateHouseholdContract
(
HouseholdContractDto
model
)
{
HouseholdContract
householdContract
=
householdContractMapper
.
selectById
(
model
.
getSequenceNbr
());
householdContract
.
setPartyA
(
model
.
getPartyA
());
householdContract
.
setPartyB
(
model
.
getPartyB
());
householdContract
.
setContractTemplateId
(
model
.
getContractTemplateId
());
...
...
@@ -145,28 +147,30 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
householdContract
.
setStationPower
(
model
.
getStationPower
());
householdContract
.
setName
(
model
.
getName
());
//调用第三方
ContractDataDto
contractDataDto
=
new
ContractDataDto
();
ContractDataDto
contractDataDto
=
new
ContractDataDto
();
contractDataDto
.
setUsername
(
model
.
getPartyA
());
contractDataDto
.
setContact
(
model
.
getPeasantHouseholdPhone
());
contractDataDto
.
setIDCard
(
model
.
getPeasantHouseholdCard
());
contractDataDto
.
setSubject
(
model
.
getName
());
QueryWrapper
<
SealDictionary
>
queryWrapper
=
new
QueryWrapper
();
queryWrapper
.
eq
(
"amos_company_seq"
,
householdContract
.
getRegionalCompaniesSeq
());
SealDictionary
sealDictionary
=
sealDictionaryMapper
.
selectOne
(
queryWrapper
);
contractDataDto
.
setCategory
(
sealDictionary
.
getCategory
());
contractDataDto
.
setCompanyTenantName
(
sealDictionary
.
getCompanyTenantName
());
contractDataDto
.
setCompanyUsername
(
sealDictionary
.
getSealedUser
());
contractDataDto
.
setCompanyContact
(
sealDictionary
.
getSealedPhone
());
List
<
Long
>
listSealId
=
new
ArrayList
<>();
listSealId
.
add
(
sealDictionary
.
getSealId
());
QueryWrapper
<
SealDictionary
>
queryWrapper
=
new
QueryWrapper
();
queryWrapper
.
eq
(
"amos_company_seq"
,
householdContract
.
getRegionalCompaniesSeq
());
List
<
SealDictionary
>
sealDictionaryList
=
sealDictionaryMapper
.
selectList
(
queryWrapper
);
List
<
Long
>
listSealId
=
new
ArrayList
<>();
if
(
CollectionUtils
.
isNotEmpty
(
sealDictionaryList
))
{
for
(
SealDictionary
sealDictionary
:
sealDictionaryList
)
{
contractDataDto
.
setCategory
(
sealDictionary
.
getCategory
());
contractDataDto
.
setCompanyTenantName
(
sealDictionary
.
getCompanyTenantName
());
contractDataDto
.
setCompanyUsername
(
sealDictionary
.
getSealedUser
());
contractDataDto
.
setCompanyContact
(
sealDictionary
.
getSealedPhone
());
listSealId
.
add
(
sealDictionary
.
getSealId
());
}
}
contractDataDto
.
setSealId
(
listSealId
);
QueryWrapper
<
ContractTemplate
>
qu
=
new
QueryWrapper
();
qu
.
eq
(
"template_id"
,
model
.
getContractTemplateId
());
ContractTemplate
contractTemplate
=
contractTemplateMapper
.
selectOne
(
qu
);
QueryWrapper
<
ContractTemplate
>
qu
=
new
QueryWrapper
();
qu
.
eq
(
"template_id"
,
model
.
getContractTemplateId
());
ContractTemplate
contractTemplate
=
contractTemplateMapper
.
selectOne
(
qu
);
contractDataDto
.
setEmplateId
(
model
.
getContractTemplateId
());
contractDataDto
.
setCompanykeyword
(
contractTemplate
.
getCompanyKeyword
());
contractDataDto
.
setCompanyPage
(
contractTemplate
.
getCompanyPage
());
...
...
@@ -178,33 +182,33 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
contractDataDto
.
setPersonalOffsetX
(
contractTemplate
.
getPersonalOffsetx
());
contractDataDto
.
setPersonalOffsetY
(
contractTemplate
.
getPersonalOffsety
());
contractDataDto
.
setPersonalKeywordIndex
(
contractTemplate
.
getPersonalKeywordIndex
());
SimpleDateFormat
myFmt2
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
Date
now
=
new
Date
();
String
daty
=
myFmt2
.
format
(
now
);
List
<
TemplateParamDto
>
templateParam
=
new
ArrayList
<>();
SimpleDateFormat
myFmt2
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
Date
now
=
new
Date
();
String
daty
=
myFmt2
.
format
(
now
);
List
<
TemplateParamDto
>
templateParam
=
new
ArrayList
<>();
//公共字段填充
SimpleDateFormat
sdfdate
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
templateParam
.
add
(
new
TemplateParamDto
(
"partyA"
,
householdContract
.
getPartyA
()!=
null
?
householdContract
.
getPartyA
():
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"peasantHouseholdPhone"
,
householdContract
.
getPeasantHouseholdPhone
()!=
null
?
householdContract
.
getPeasantHouseholdPhone
():
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"peasantHouseholdCard"
,
householdContract
.
getPeasantHouseholdCard
()!=
null
?
householdContract
.
getPeasantHouseholdCard
():
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"permanentAddressDetail"
,
householdContract
.
getPermanentAddressName
()!=
null
?
householdContract
.
getPermanentAddressName
()+
householdContract
.
getPermanentAddressDetail
():
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"projectAddressDetail"
,
householdContract
.
getProjectAddressName
()!=
null
?
householdContract
.
getProjectAddressName
()+
householdContract
.
getProjectAddressDetail
():
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"signingTime"
,
daty
));
templateParam
.
add
(
new
TemplateParamDto
(
"partyA"
,
householdContract
.
getPartyA
()
!=
null
?
householdContract
.
getPartyA
()
:
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"peasantHouseholdPhone"
,
householdContract
.
getPeasantHouseholdPhone
()
!=
null
?
householdContract
.
getPeasantHouseholdPhone
()
:
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"peasantHouseholdCard"
,
householdContract
.
getPeasantHouseholdCard
()
!=
null
?
householdContract
.
getPeasantHouseholdCard
()
:
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"permanentAddressDetail"
,
householdContract
.
getPermanentAddressName
()
!=
null
?
householdContract
.
getPermanentAddressName
()
+
householdContract
.
getPermanentAddressDetail
()
:
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"projectAddressDetail"
,
householdContract
.
getProjectAddressName
()
!=
null
?
householdContract
.
getProjectAddressName
()
+
householdContract
.
getProjectAddressDetail
()
:
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"signingTime"
,
daty
));
//合同动态填充字段
// templateParam.add(new TemplateParamDto("rentFree",householdContract.getRentFree()!=null?sdfdate.format(householdContract.getRentFree()):null));
// templateParam.add(new TemplateParamDto("rentCalculationDate",householdContract.getRentCalculationDate()!=null?sdfdate.format(householdContract.getRentCalculationDate()):null));
// templateParam.add(new TemplateParamDto("leaseEndDate",householdContract.getLeaseEndDate()!=null?sdfdate.format(householdContract.getLeaseEndDate()):null));
// templateParam.add(new TemplateParamDto("constructionScale",householdContract.getConstructionScale()!=null?String.valueOf(householdContract.getConstructionScale()):null));
// templateParam.add(new TemplateParamDto("constructionScale",householdContract.getConstructionScale()!=null?String.valueOf(householdContract.getConstructionScale()):null));
// templateParam.add(new TemplateParamDto("componentQuantityBlock",householdContract.getComponentQuantityBlock()!=null?String.valueOf(householdContract.getComponentQuantityBlock()):null));
// templateParam.add(new TemplateParamDto("totalInvestment",householdContract.getTotalInvestment()!=null?String.valueOf(householdContract.getTotalInvestment()):null));
// templateParam.add(new TemplateParamDto("componentPower",householdContract.getComponentPower()!=null?String.valueOf(householdContract.getComponentPower()):null));
// templateParam.add(new TemplateParamDto("stationPower",householdContract.getStationPower()!=null?String.valueOf(householdContract.getStationPower()):null));
List
<
ContractFillData
>
contractFillData
=
model
.
getContractFillData
();
if
(
contractFillData
!=
null
&&!
contractFillData
.
isEmpty
())
{
List
<
ContractFillData
>
contractFillData
=
model
.
getContractFillData
();
if
(
contractFillData
!=
null
&&
!
contractFillData
.
isEmpty
())
{
for
(
ContractFillData
contractFillDatum
:
contractFillData
)
{
templateParam
.
add
(
new
TemplateParamDto
(
contractFillDatum
.
getField
(),
contractFillDatum
.
getValue
()));
templateParam
.
add
(
new
TemplateParamDto
(
contractFillDatum
.
getField
(),
contractFillDatum
.
getValue
()));
//保存动态值
contractFillDatum
.
setSequenceNbr
(
null
);
contractFillDatum
.
setContractId
(
householdContract
.
getSequenceNbr
());
...
...
@@ -212,37 +216,37 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
}
}
Long
contractLockId
=
qiyuesuoServiceImpl
.
addContract
(
contractDataDto
,
templateParam
);
Long
contractLockId
=
qiyuesuoServiceImpl
.
addContract
(
contractDataDto
,
templateParam
);
householdContract
.
setContractLockId
(
contractLockId
);
householdContract
.
setInitiateStatus
(
HouseholdContractEnum
.
发起状态
_
已发起
.
getCode
());
householdContractMapper
.
updateById
(
householdContract
);
//创建农户待办
ToDoTasks
toDoTasks1
=
new
ToDoTasks
(
TaskTypeStationEnum
.
合同填报
.
getCode
(),
householdContract
.
getSequenceNbr
(),
"用户"
+
householdContract
.
getPartyA
()+
"的合同填写"
,
householdContract
.
getDealerCode
());
PeasantHousehold
peasantHousehold
=
peasantHouseholdServiceImpl
.
getById
(
householdContract
.
getPeasantHouseholdId
());
toDoTasksServiceImpl
.
addToDoTasksByUserId
(
peasantHousehold
.
getAmosUserId
(),
toDoTasks1
,
"任务明细:合同发起成功"
);
ToDoTasks
toDoTasks1
=
new
ToDoTasks
(
TaskTypeStationEnum
.
合同填报
.
getCode
(),
householdContract
.
getSequenceNbr
(),
"用户"
+
householdContract
.
getPartyA
()
+
"的合同填写"
,
householdContract
.
getDealerCode
());
PeasantHousehold
peasantHousehold
=
peasantHouseholdServiceImpl
.
getById
(
householdContract
.
getPeasantHouseholdId
());
toDoTasksServiceImpl
.
addToDoTasksByUserId
(
peasantHousehold
.
getAmosUserId
(),
toDoTasks1
,
"任务明细:合同发起成功"
);
return
householdContract
;
}
@Transactional
public
HouseholdContract
reissueinitiateHouseholdContract
(
HouseholdContract
model
){
// 查询已存在的合同,如果存在有效(非作废)的合同,则无法重新发起
Long
peasantHouseholdId
=
model
.
getPeasantHouseholdId
();
Integer
count
=
householdContractMapper
.
selectCount
(
Wrappers
.<
HouseholdContract
>
lambdaQuery
()
.
eq
(
HouseholdContract:
:
getPeasantHouseholdId
,
peasantHouseholdId
)
.
ne
(
HouseholdContract:
:
getStatus
,
HouseholdContractEnum
.
合同状态
_
已作废
.
getCode
())
.
eq
(
HouseholdContract:
:
getIsDelete
,
false
)
);
if
(
count
>
0
)
{
throw
new
BadRequest
(
"已存在有效的合同,无法重新发起"
);
}
HouseholdContract
peasantHousehold
=
this
.
getById
(
model
.
getSequenceNbr
());
@Transactional
public
HouseholdContract
reissueinitiateHouseholdContract
(
HouseholdContract
model
)
{
// 查询已存在的合同,如果存在有效(非作废)的合同,则无法重新发起
Long
peasantHouseholdId
=
model
.
getPeasantHouseholdId
();
Integer
count
=
householdContractMapper
.
selectCount
(
Wrappers
.<
HouseholdContract
>
lambdaQuery
()
.
eq
(
HouseholdContract:
:
getPeasantHouseholdId
,
peasantHouseholdId
)
.
ne
(
HouseholdContract:
:
getStatus
,
HouseholdContractEnum
.
合同状态
_
已作废
.
getCode
())
.
eq
(
HouseholdContract:
:
getIsDelete
,
false
)
);
if
(
count
>
0
)
{
throw
new
BadRequest
(
"已存在有效的合同,无法重新发起"
);
}
HouseholdContract
peasantHousehold
=
this
.
getById
(
model
.
getSequenceNbr
());
//生成合同
HouseholdContract
householdContract
=
new
HouseholdContract
();
HouseholdContract
householdContract
=
new
HouseholdContract
();
householdContract
.
setPartyA
(
model
.
getPartyA
());
householdContract
.
setPartyB
(
model
.
getPartyB
());
householdContract
.
setContractTemplateId
(
model
.
getContractTemplateId
());
...
...
@@ -276,29 +280,31 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
this
.
reissueHouseholdContract
(
householdContract
);
ContractDataDto
contractDataDto
=
new
ContractDataDto
();
ContractDataDto
contractDataDto
=
new
ContractDataDto
();
contractDataDto
.
setUsername
(
householdContract
.
getPartyA
());
contractDataDto
.
setContact
(
householdContract
.
getPeasantHouseholdPhone
());
contractDataDto
.
setIDCard
(
householdContract
.
getPeasantHouseholdCard
());
contractDataDto
.
setSubject
(
householdContract
.
getName
());
QueryWrapper
<
SealDictionary
>
queryWrapper
=
new
QueryWrapper
();
queryWrapper
.
eq
(
"amos_company_seq"
,
householdContract
.
getRegionalCompaniesSeq
());
SealDictionary
sealDictionary
=
sealDictionaryMapper
.
selectOne
(
queryWrapper
);
contractDataDto
.
setCategory
(
sealDictionary
.
getCategory
());
contractDataDto
.
setCompanyTenantName
(
sealDictionary
.
getCompanyTenantName
());
contractDataDto
.
setCompanyUsername
(
sealDictionary
.
getSealedUser
());
contractDataDto
.
setCompanyContact
(
sealDictionary
.
getSealedPhone
());
List
<
Long
>
listSealId
=
new
ArrayList
<>();
listSealId
.
add
(
sealDictionary
.
getSealId
());
QueryWrapper
<
SealDictionary
>
queryWrapper
=
new
QueryWrapper
();
queryWrapper
.
eq
(
"amos_company_seq"
,
householdContract
.
getRegionalCompaniesSeq
());
List
<
SealDictionary
>
sealDictionaryList
=
sealDictionaryMapper
.
selectList
(
queryWrapper
);
List
<
Long
>
listSealId
=
new
ArrayList
<>();
if
(
CollectionUtils
.
isNotEmpty
(
sealDictionaryList
)){
for
(
SealDictionary
sealDictionary
:
sealDictionaryList
)
{
contractDataDto
.
setCategory
(
sealDictionary
.
getCategory
());
contractDataDto
.
setCompanyTenantName
(
sealDictionary
.
getCompanyTenantName
());
contractDataDto
.
setCompanyUsername
(
sealDictionary
.
getSealedUser
());
contractDataDto
.
setCompanyContact
(
sealDictionary
.
getSealedPhone
());
listSealId
.
add
(
sealDictionary
.
getSealId
());
}
}
contractDataDto
.
setSealId
(
listSealId
);
QueryWrapper
<
ContractTemplate
>
qu
=
new
QueryWrapper
();
qu
.
eq
(
"template_id"
,
householdContract
.
getContractTemplateId
());
ContractTemplate
contractTemplate
=
contractTemplateMapper
.
selectOne
(
qu
);
QueryWrapper
<
ContractTemplate
>
qu
=
new
QueryWrapper
();
qu
.
eq
(
"template_id"
,
householdContract
.
getContractTemplateId
());
ContractTemplate
contractTemplate
=
contractTemplateMapper
.
selectOne
(
qu
);
contractDataDto
.
setEmplateId
(
householdContract
.
getContractTemplateId
());
contractDataDto
.
setCompanykeyword
(
contractTemplate
.
getCompanyKeyword
());
contractDataDto
.
setCompanyPage
(
contractTemplate
.
getCompanyPage
());
...
...
@@ -311,21 +317,21 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
contractDataDto
.
setPersonalOffsetY
(
contractTemplate
.
getPersonalOffsety
());
contractDataDto
.
setPersonalKeywordIndex
(
contractTemplate
.
getPersonalKeywordIndex
());
SimpleDateFormat
myFmt2
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
Date
now
=
new
Date
();
String
daty
=
myFmt2
.
format
(
now
);
SimpleDateFormat
myFmt2
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
Date
now
=
new
Date
();
String
daty
=
myFmt2
.
format
(
now
);
List
<
TemplateParamDto
>
templateParam
=
new
ArrayList
<>();
List
<
TemplateParamDto
>
templateParam
=
new
ArrayList
<>();
SimpleDateFormat
sdfdate
=
new
SimpleDateFormat
(
"yyyy-MM-dd"
);
templateParam
.
add
(
new
TemplateParamDto
(
"partyA"
,
householdContract
.
getPartyA
()!=
null
?
householdContract
.
getPartyA
():
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"peasantHouseholdPhone"
,
householdContract
.
getPeasantHouseholdPhone
()!=
null
?
householdContract
.
getPeasantHouseholdPhone
():
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"peasantHouseholdCard"
,
householdContract
.
getPeasantHouseholdCard
()!=
null
?
householdContract
.
getPeasantHouseholdCard
():
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"permanentAddressDetail"
,
householdContract
.
getPermanentAddressName
()!=
null
?
householdContract
.
getPermanentAddressName
()+
householdContract
.
getPermanentAddressDetail
():
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"projectAddressDetail"
,
householdContract
.
getProjectAddressName
()!=
null
?
householdContract
.
getProjectAddressName
()+
householdContract
.
getProjectAddressDetail
():
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"signingTime"
,
daty
));
templateParam
.
add
(
new
TemplateParamDto
(
"partyA"
,
householdContract
.
getPartyA
()
!=
null
?
householdContract
.
getPartyA
()
:
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"peasantHouseholdPhone"
,
householdContract
.
getPeasantHouseholdPhone
()
!=
null
?
householdContract
.
getPeasantHouseholdPhone
()
:
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"peasantHouseholdCard"
,
householdContract
.
getPeasantHouseholdCard
()
!=
null
?
householdContract
.
getPeasantHouseholdCard
()
:
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"permanentAddressDetail"
,
householdContract
.
getPermanentAddressName
()
!=
null
?
householdContract
.
getPermanentAddressName
()
+
householdContract
.
getPermanentAddressDetail
()
:
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"projectAddressDetail"
,
householdContract
.
getProjectAddressName
()
!=
null
?
householdContract
.
getProjectAddressName
()
+
householdContract
.
getProjectAddressDetail
()
:
null
));
templateParam
.
add
(
new
TemplateParamDto
(
"signingTime"
,
daty
));
//合同动态填充字段
//合同动态填充字段
// templateParam.add(new TemplateParamDto("rentFree",householdContract.getRentFree()!=null?sdfdate.format(householdContract.getRentFree()):null));
// templateParam.add(new TemplateParamDto("rentCalculationDate",householdContract.getRentCalculationDate()!=null?sdfdate.format(householdContract.getRentCalculationDate()):null));
// templateParam.add(new TemplateParamDto("leaseEndDate",householdContract.getLeaseEndDate()!=null?sdfdate.format(householdContract.getLeaseEndDate()):null));
...
...
@@ -335,31 +341,30 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
// templateParam.add(new TemplateParamDto("componentPower",householdContract.getComponentPower()!=null?String.valueOf(householdContract.getComponentPower()):null));
// templateParam.add(new TemplateParamDto("stationPower",householdContract.getStationPower()!=null?String.valueOf(householdContract.getStationPower()):null));
List
<
ContractFillData
>
contractFillData
=
model
.
getContractFillData
();
if
(
contractFillData
!=
null
&&!
contractFillData
.
isEmpty
())
{
for
(
ContractFillData
contractFillDatum
:
contractFillData
)
{
templateParam
.
add
(
new
TemplateParamDto
(
contractFillDatum
.
getField
(),
contractFillDatum
.
getValue
()));
//保存动态值
contractFillDatum
.
setSequenceNbr
(
null
);
contractFillDatum
.
setContractId
(
householdContract
.
getSequenceNbr
());
contractFillDataMapper
.
insert
(
contractFillDatum
);
}
}
List
<
ContractFillData
>
contractFillData
=
model
.
getContractFillData
();
if
(
contractFillData
!=
null
&&
!
contractFillData
.
isEmpty
())
{
for
(
ContractFillData
contractFillDatum
:
contractFillData
)
{
templateParam
.
add
(
new
TemplateParamDto
(
contractFillDatum
.
getField
(),
contractFillDatum
.
getValue
()));
//保存动态值
contractFillDatum
.
setSequenceNbr
(
null
);
contractFillDatum
.
setContractId
(
householdContract
.
getSequenceNbr
());
contractFillDataMapper
.
insert
(
contractFillDatum
);
}
}
Long
contractLockId
=
qiyuesuoServiceImpl
.
addContract
(
contractDataDto
,
templateParam
);
Long
contractLockId
=
qiyuesuoServiceImpl
.
addContract
(
contractDataDto
,
templateParam
);
householdContract
.
setContractLockId
(
contractLockId
);
householdContract
.
setInitiateStatus
(
HouseholdContractEnum
.
发起状态
_
已发起
.
getCode
());
householdContractMapper
.
updateById
(
householdContract
);
//生成填报任务
ToDoTasks
toDoTasks1
=
new
ToDoTasks
(
TaskTypeStationEnum
.
合同填报
.
getCode
(),
householdContract
.
getSequenceNbr
(),
"用户"
+
householdContract
.
getPartyA
()+
"的合同填写"
,
householdContract
.
getDealerCode
());
PeasantHousehold
peasan
=
peasantHouseholdServiceImpl
.
getById
(
householdContract
.
getPeasantHouseholdId
());
toDoTasksServiceImpl
.
addToDoTasksByUserId
(
peasan
.
getAmosUserId
(),
toDoTasks1
,
"任务明细:合同发起成功"
);
//生成填报任务
ToDoTasks
toDoTasks1
=
new
ToDoTasks
(
TaskTypeStationEnum
.
合同填报
.
getCode
(),
householdContract
.
getSequenceNbr
(),
"用户"
+
householdContract
.
getPartyA
()
+
"的合同填写"
,
householdContract
.
getDealerCode
());
PeasantHousehold
peasan
=
peasantHouseholdServiceImpl
.
getById
(
householdContract
.
getPeasantHouseholdId
());
toDoTasksServiceImpl
.
addToDoTasksByUserId
(
peasan
.
getAmosUserId
(),
toDoTasks1
,
"任务明细:合同发起成功"
);
return
householdContract
;
return
householdContract
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment