|
@@ -272,9 +272,9 @@ public class ContractServiceImpl implements ContractService {
|
|
throw new BizException("生成pdf协议失败", e);
|
|
throw new BizException("生成pdf协议失败", e);
|
|
}
|
|
}
|
|
|
|
|
|
- if (sysUserTsign != null) {
|
|
|
|
|
|
+ /*if (sysUserTsign != null) {
|
|
eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
|
|
eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
|
|
|
|
Date date = new Date();
|
|
Date date = new Date();
|
|
// 上传到oss
|
|
// 上传到oss
|
|
@@ -412,7 +412,7 @@ public class ContractServiceImpl implements ContractService {
|
|
} catch (IOException e) {
|
|
} catch (IOException e) {
|
|
throw new BizException("生成pdf协议失败", e);
|
|
throw new BizException("生成pdf协议失败", e);
|
|
}
|
|
}
|
|
- String organCode = "";
|
|
|
|
|
|
+ /*String organCode = "";
|
|
if (musicGroup.getOwnershipType() == OwnershipType.OWN) {
|
|
if (musicGroup.getOwnershipType() == OwnershipType.OWN) {
|
|
organCode = "91440300326364429H";
|
|
organCode = "91440300326364429H";
|
|
} else {
|
|
} else {
|
|
@@ -426,7 +426,7 @@ public class ContractServiceImpl implements ContractService {
|
|
eSealPlugin.organSign(organTsign.getSealData(), srcPdfPath, srcPdfPath);
|
|
eSealPlugin.organSign(organTsign.getSealData(), srcPdfPath, srcPdfPath);
|
|
if (sysUserTsign != null) {
|
|
if (sysUserTsign != null) {
|
|
eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
|
|
eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
|
|
|
|
// 上传到oss
|
|
// 上传到oss
|
|
String dateStrOss = dateFormatOss.format(date);
|
|
String dateStrOss = dateFormatOss.format(date);
|
|
@@ -593,7 +593,7 @@ public class ContractServiceImpl implements ContractService {
|
|
} catch (IOException e) {
|
|
} catch (IOException e) {
|
|
throw new BizException("生成pdf协议失败", e);
|
|
throw new BizException("生成pdf协议失败", e);
|
|
}
|
|
}
|
|
- String organCode = "91440300326364429H";
|
|
|
|
|
|
+ /*String organCode = "91440300326364429H";
|
|
SysUserTsign organTsign = sysUserTsignService.queryByCardNo(organCode);
|
|
SysUserTsign organTsign = sysUserTsignService.queryByCardNo(organCode);
|
|
if (organTsign == null) {
|
|
if (organTsign == null) {
|
|
throw new BizException("甲方未创建签章");
|
|
throw new BizException("甲方未创建签章");
|
|
@@ -603,7 +603,7 @@ public class ContractServiceImpl implements ContractService {
|
|
|
|
|
|
if (sysUserTsign != null) {
|
|
if (sysUserTsign != null) {
|
|
eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
|
|
eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
|
|
|
|
// 上传到oss
|
|
// 上传到oss
|
|
String dateStrOss = dateFormatOss.format(date);
|
|
String dateStrOss = dateFormatOss.format(date);
|
|
@@ -837,7 +837,7 @@ public class ContractServiceImpl implements ContractService {
|
|
} catch (IOException e) {
|
|
} catch (IOException e) {
|
|
throw new BizException("生成pdf协议失败", e);
|
|
throw new BizException("生成pdf协议失败", e);
|
|
}
|
|
}
|
|
- String organCode = "91440300326364429H";
|
|
|
|
|
|
+ /*String organCode = "91440300326364429H";
|
|
SysUserTsign organTsign = sysUserTsignService.queryByCardNo(organCode);
|
|
SysUserTsign organTsign = sysUserTsignService.queryByCardNo(organCode);
|
|
if (organTsign == null) {
|
|
if (organTsign == null) {
|
|
throw new BizException("甲方未创建签章");
|
|
throw new BizException("甲方未创建签章");
|
|
@@ -847,7 +847,7 @@ public class ContractServiceImpl implements ContractService {
|
|
|
|
|
|
if (sysUserTsign != null) {
|
|
if (sysUserTsign != null) {
|
|
eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
|
|
eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
|
|
|
|
// 上传到oss
|
|
// 上传到oss
|
|
String dateStrOss = dateFormatOss.format(date);
|
|
String dateStrOss = dateFormatOss.format(date);
|
|
@@ -988,7 +988,7 @@ public class ContractServiceImpl implements ContractService {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- String organCode = StringUtils.equals(companyName, tenantInfo.getTsignName()) ? tenantInfo.getTsignCode() : organizationDto.getCorporateCode();
|
|
|
|
|
|
+ /*String organCode = StringUtils.equals(companyName, tenantInfo.getTsignName()) ? tenantInfo.getTsignCode() : organizationDto.getCorporateCode();
|
|
|
|
|
|
if (user.getTenantId() == 1) {
|
|
if (user.getTenantId() == 1) {
|
|
if (!OwnershipType.OWN.name().equals(params.get("ownershipType"))) {
|
|
if (!OwnershipType.OWN.name().equals(params.get("ownershipType"))) {
|
|
@@ -1004,7 +1004,7 @@ public class ContractServiceImpl implements ContractService {
|
|
eSealPlugin.organSign(organTsign.getSealData(), srcPdfPath, srcPdfPath);
|
|
eSealPlugin.organSign(organTsign.getSealData(), srcPdfPath, srcPdfPath);
|
|
if (sysUserTsign != null && CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType())) {
|
|
if (sysUserTsign != null && CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType())) {
|
|
eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
|
|
eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
|
|
|
|
// 上传到oss
|
|
// 上传到oss
|
|
String dateStrOss = dateFormatOss.format(date);
|
|
String dateStrOss = dateFormatOss.format(date);
|