bug修复
This commit is contained in:
+1
@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.wisdomarbitrate;
|
|||||||
import com.ruoyi.common.annotation.Anonymous;
|
import com.ruoyi.common.annotation.Anonymous;
|
||||||
import com.ruoyi.common.core.controller.BaseController;
|
import com.ruoyi.common.core.controller.BaseController;
|
||||||
import com.ruoyi.common.core.domain.AjaxResult;
|
import com.ruoyi.common.core.domain.AjaxResult;
|
||||||
|
import com.ruoyi.wisdomarbitrate.domain.CaseLogRecord;
|
||||||
import com.ruoyi.wisdomarbitrate.service.MsSignSealService;
|
import com.ruoyi.wisdomarbitrate.service.MsSignSealService;
|
||||||
import com.ruoyi.wisdomarbitrate.utils.SignVerifyUtils;
|
import com.ruoyi.wisdomarbitrate.utils.SignVerifyUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ public class PdfUtils {
|
|||||||
document.setMarginMirroring(false);
|
document.setMarginMirroring(false);
|
||||||
document.open();
|
document.open();
|
||||||
// 解决PDF中文不显示
|
// 解决PDF中文不显示
|
||||||
String fontPath = "/D:/simsun.ttf"; //字体文件路径
|
String fontPath = "/home/ruoyi/uploadPath/songfont/simsun.ttf"; //字体文件路径
|
||||||
XMLWorkerFontProvider provider = new XMLWorkerFontProvider(XMLWorkerFontProvider.DONTLOOKFORFONTS);
|
XMLWorkerFontProvider provider = new XMLWorkerFontProvider(XMLWorkerFontProvider.DONTLOOKFORFONTS);
|
||||||
provider.register(fontPath);//注册字体
|
provider.register(fontPath);//注册字体
|
||||||
log.error("注册字体");
|
log.error("注册字体");
|
||||||
|
|||||||
+15
@@ -2283,6 +2283,21 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
|
|||||||
JsonObject signUrlData = signUrlJsonObject.getAsJsonObject("data");
|
JsonObject signUrlData = signUrlJsonObject.getAsJsonObject("data");
|
||||||
String url = signUrlData.get("url").getAsString();
|
String url = signUrlData.get("url").getAsString();
|
||||||
sealSignRecordReslt.setSealUrl(url);
|
sealSignRecordReslt.setSealUrl(url);
|
||||||
|
if(StrUtil.isEmpty(SecurityUtils.getUsername())){
|
||||||
|
throw new ServiceException("未获取到当前登录用户");
|
||||||
|
}
|
||||||
|
SysUser sysUser = sysUserMapper.selectUserByUserName(getUsername());
|
||||||
|
if(sysUser==null){
|
||||||
|
throw new ServiceException("未获取到当前登录用户");
|
||||||
|
}
|
||||||
|
CaseLogRecord operLog = new CaseLogRecord();
|
||||||
|
operLog.setCreateNickName(sysUser.getNickName());
|
||||||
|
operLog.setCaseNode(14);
|
||||||
|
operLog.setCreateBy(sysUser.getUserName());
|
||||||
|
operLog.setCaseAppliId(caseApplication.getId());
|
||||||
|
operLog.setCaseNodeName("待用印");
|
||||||
|
operLog.setCreateTime(new Date());
|
||||||
|
caseLogRecordMapper.insertCaseLogRecord(operLog);
|
||||||
}
|
}
|
||||||
return sealSignRecordReslt;
|
return sealSignRecordReslt;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-6
@@ -106,13 +106,8 @@ public class MsSignSealServiceImpl implements MsSignSealService {
|
|||||||
|
|
||||||
|
|
||||||
} else if (StringUtils.isNotEmpty(accountMobile) && accountMobile.equals(orgnNamePsnAcc)) {
|
} else if (StringUtils.isNotEmpty(accountMobile) && accountMobile.equals(orgnNamePsnAcc)) {
|
||||||
|
// 用印
|
||||||
sealSignRecordMapper.updataSealSignRecord(sealSignRecordsel);
|
sealSignRecordMapper.updataSealSignRecord(sealSignRecordsel);
|
||||||
CaseLogRecord operLog = new CaseLogRecord();
|
|
||||||
operLog.setCreateNickName(orgnNamePsnName);
|
|
||||||
operLog.setCaseNode(14);
|
|
||||||
operLog.setCaseAppliId(caseAppliId);
|
|
||||||
operLog.setCreateTime(dateOperate);
|
|
||||||
caseLogRecordMapper.insertCaseLogRecord(operLog);
|
|
||||||
CaseApplication application = new CaseApplication();
|
CaseApplication application = new CaseApplication();
|
||||||
application.setId(caseAppliId);
|
application.setId(caseAppliId);
|
||||||
// 案件状态为待送达
|
// 案件状态为待送达
|
||||||
|
|||||||
@@ -1412,7 +1412,7 @@
|
|||||||
AND t1.lock_status = #{caseApplication.lockStatus}
|
AND t1.lock_status = #{caseApplication.lockStatus}
|
||||||
</if>
|
</if>
|
||||||
<if test="caseApplication.caseNum != null and caseApplication.caseNum != ''">
|
<if test="caseApplication.caseNum != null and caseApplication.caseNum != ''">
|
||||||
AND t1.case_num = #{caseApplication.caseNum}
|
AND t1.case_num like concat('%',#{caseApplication.caseNum},'%')
|
||||||
</if>
|
</if>
|
||||||
<if test="caseApplication.batchNumber != null">
|
<if test="caseApplication.batchNumber != null">
|
||||||
AND t1.batch_number = #{caseApplication.batchNumber}
|
AND t1.batch_number = #{caseApplication.batchNumber}
|
||||||
|
|||||||
Reference in New Issue
Block a user