|
@@ -74,12 +74,13 @@ public class ModelSynthesizerDomain {
|
|
|
*/
|
|
*/
|
|
|
public void recreateCommonDoc(String businessNo) {
|
|
public void recreateCommonDoc(String businessNo) {
|
|
|
ContractOrderEntity contractOrderEntity = contractOrderRepository.getContractOrderWithBizNo(businessNo);
|
|
ContractOrderEntity contractOrderEntity = contractOrderRepository.getContractOrderWithBizNo(businessNo);
|
|
|
|
|
+ SysUserEntity notaryUser = sysUserMapper.selectById(contractOrderEntity.getNotaryUserId());
|
|
|
List<ModelEntity> models = modelRepository.getCommonModel(contractOrderEntity.getProdId(), contractOrderEntity.getContractType(), contractOrderEntity.getNotaryOfficeId());
|
|
List<ModelEntity> models = modelRepository.getCommonModel(contractOrderEntity.getProdId(), contractOrderEntity.getContractType(), contractOrderEntity.getNotaryOfficeId());
|
|
|
for (ModelEntity m : models) {
|
|
for (ModelEntity m : models) {
|
|
|
OrderFileEntity fileEntity = orderFileRepository.getOrderFileWithCode(businessNo, m.getCode());
|
|
OrderFileEntity fileEntity = orderFileRepository.getOrderFileWithCode(businessNo, m.getCode());
|
|
|
OrderFileEntity saveFile = new OrderFileEntity();
|
|
OrderFileEntity saveFile = new OrderFileEntity();
|
|
|
saveFile.setId(fileEntity.getId());
|
|
saveFile.setId(fileEntity.getId());
|
|
|
- String html = composeCommonTemplateWithData(businessNo, m.getContent(), contextUtil.getCurrentUser().getNickName(), true);
|
|
|
|
|
|
|
+ String html = composeCommonTemplateWithData(businessNo, m.getContent(), notaryUser.getNickName(), true);
|
|
|
String htmlPath = FileUploadUtil.saveHtml(html, businessNo);
|
|
String htmlPath = FileUploadUtil.saveHtml(html, businessNo);
|
|
|
String pdfPath = FileUploadUtil.savePdf(html, businessNo);
|
|
String pdfPath = FileUploadUtil.savePdf(html, businessNo);
|
|
|
saveFile.setHtmlUrl(htmlPath);
|
|
saveFile.setHtmlUrl(htmlPath);
|