|
@@ -109,6 +109,10 @@ import java.util.*;
|
|
|
@Transactional(readOnly = true)
|
|
|
public class RuralProjectMessageService extends CrudService<RuralProjectMessageDao, RuralProjectRecords> {
|
|
|
private static final String HTTPTOP = Global.getConfig("signature_http_top");
|
|
|
+ private static final String COMPANYROUNDSEALID = Global.getConfig("company_round_seal_id");
|
|
|
+ private static final String COMPANYPARTIESSEALID = Global.getConfig("company_parties_seal_id");
|
|
|
+ private static final String APPROVALCATEGORYID = Global.getConfig("approval_category_id");
|
|
|
+ private static final String REPORTCATEGORYID = Global.getConfig("report_category_id");
|
|
|
//AES 对称加密公钥
|
|
|
private static final String AES_KEY = "63304b5db43265c103ebe576d38bd9f8";
|
|
|
//RSA 非对称加密密钥
|
|
@@ -3869,7 +3873,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
|
|
|
companyAction.setType("CORPORATE");
|
|
|
companyAction.setName("公司印章");
|
|
|
companyAction.setSerialNo("1");
|
|
|
- companyAction.setSealId("2894161942659543252");
|
|
|
+ //公司圆章
|
|
|
+ companyAction.setSealId(COMPANYROUNDSEALID);
|
|
|
//添加盖章位置
|
|
|
List<Location> locations = Lists.newArrayList();
|
|
|
Location location = new Location();
|
|
@@ -3890,7 +3895,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
|
|
|
User user = UserUtils.get(principalUserId);
|
|
|
if(null != user){
|
|
|
//获取成员印章id信息
|
|
|
- String userSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(),"","");
|
|
|
+ String userSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(),"",user.getName() + "一级注册造价工程师章");
|
|
|
if(StringUtils.isNotBlank(userSealId)){
|
|
|
Action actionUser = new Action();
|
|
|
actionUser.setType("CORPORATE");
|
|
@@ -3953,7 +3958,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
|
|
|
signatories.add(signatorieInfo1);
|
|
|
SignatureContract signatureContract = new SignatureContract();
|
|
|
signatureContract.setDocuments(documentList);
|
|
|
- signatureContract.setCategoryId("2895618951099527314");
|
|
|
+ //审定单用印流程id
|
|
|
+ signatureContract.setCategoryId(APPROVALCATEGORYID);
|
|
|
signatureContract.setSend(false);
|
|
|
signatureContract.setSignatories(signatories);
|
|
|
signatureContract.setSn("");
|
|
@@ -4140,7 +4146,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
|
|
|
companyAction.setName("公司执业印章");
|
|
|
companyAction.setSerialNo("1");
|
|
|
//公司方章编号
|
|
|
- companyAction.setSealId("2894163220106129636");
|
|
|
+ companyAction.setSealId(COMPANYPARTIESSEALID);
|
|
|
//添加盖章位置
|
|
|
List<Location> locations = Lists.newArrayList();
|
|
|
Location location = new Location();
|
|
@@ -4160,7 +4166,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
|
|
|
companyActionCircle.setName("公司印章");
|
|
|
companyActionCircle.setSerialNo("1");
|
|
|
//公司圆章编号
|
|
|
- companyActionCircle.setSealId("2894161942659543252");
|
|
|
+ companyActionCircle.setSealId(COMPANYROUNDSEALID);
|
|
|
//添加盖章位置
|
|
|
List<Location> locationCircles = Lists.newArrayList();
|
|
|
Location locationCircle = new Location();
|
|
@@ -4181,7 +4187,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
|
|
|
User user = UserUtils.get(principalUserId);
|
|
|
if(null != user){
|
|
|
//获取成员印章id信息
|
|
|
- String userSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(),"","");
|
|
|
+ String userSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(),"",user.getName() + "一级注册造价工程师章");
|
|
|
if(StringUtils.isNotBlank(userSealId)){
|
|
|
Action actionUser = new Action();
|
|
|
actionUser.setType("CORPORATE");
|
|
@@ -4230,7 +4236,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
|
|
|
User technologyPrincipalUser = UserUtils.getByLoginName("陈红星");
|
|
|
if(null != technologyPrincipalUser){
|
|
|
//获取成员印章id信息
|
|
|
- String userSealId = SignaturePostUtil.getUserSealByMobile(technologyPrincipalUser.getMobile(),"","陈星造价工程师印章");
|
|
|
+ String userSealId = SignaturePostUtil.getUserSealByMobile(technologyPrincipalUser.getMobile(),"","陈红星一级注册造价工程师章");
|
|
|
if(StringUtils.isNotBlank(userSealId)){
|
|
|
Action actionUser = new Action();
|
|
|
actionUser.setType("CORPORATE");
|
|
@@ -4265,7 +4271,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
|
|
|
signatories.add(signatorieInfo1);
|
|
|
SignatureContract signatureContract = new SignatureContract();
|
|
|
signatureContract.setDocuments(documentList);
|
|
|
- signatureContract.setCategoryId("2895618951099527314");
|
|
|
+ //报告用印流程id
|
|
|
+ signatureContract.setCategoryId(REPORTCATEGORYID);
|
|
|
signatureContract.setSend(false);
|
|
|
signatureContract.setSignatories(signatories);
|
|
|
signatureContract.setSn("");
|