档案电签bug

blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/oss/AliOssBuilder.java

@@ -52,7 +52,8 @@ public class AliOssBuilder {
         // 设置失败请求重试次数，默认为3次。
         conf.setMaxErrorRetry(5);
         OssProperties ossProperties = new OssProperties();
-        ossProperties.setEndpoint(oss.getEndpoint());
+        //ossProperties.setEndpoint(oss.getEndpoint());
+        ossProperties.setEndpoint("https://oss-cn-hangzhou.aliyuncs.com/");
         ossProperties.setAccessKey(oss.getAccessKey());
         ossProperties.setSecretKey(oss.getSecretKey());
         ossProperties.setBucketName(oss.getBucketName());

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileTaskController.java

@@ -69,9 +69,13 @@ public class ArchiveFileTaskController extends BladeController {
                 //固定水印图片章
                 String pngQzUrl = "https://bladex-chongqing-info.oss-cn-hangzhou.aliyuncs.com//upload/20230911/5b42583d931664b785ebf481c37d17bc.png";
                 for (ArchiveFile archiveFile : archiveFileList) {
-                    if (!archiveFile.getStatus().equals(0) && !archiveFile.getIsCertification().equals(0)) {
-                        throw new ServiceException("只有未认证且是未上报状态的业务数据才能认证！");
+                    if (!archiveFile.getStatus().equals(0)) {
+                        throw new ServiceException("只有【未上报】状态的业务数据才能认证！");
                     }
+                    if (!archiveFile.getIsCertification().equals(0)) {
+                        throw new ServiceException("只有【未认证】状态的业务数据才能认证！");
+                    }
+
                     String pdfUrl = StringUtils.isNotEmpty(archiveFile.getEVisaFile()) ? archiveFile.getEVisaFile() : archiveFile.getPdfFileUrl();
                     if (StringUtils.isEmpty(pdfUrl)) {
                         continue;

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -376,10 +376,16 @@ public class TaskController extends BladeController {
         }
 
         Map<Long, String> nameMap = jdbcTemplate.query("select id,name from blade_user where is_deleted = 0", new BeanPropertyRowMapper<>(User.class)).stream().collect(Collectors.toMap(User::getId, User::getName, (key1, key2) -> key1));
-        Map<Long, String> fileNameMaps = jdbcTemplate.query("select id,file_name from u_archive_file where file_name is not null and id in (" + archiveTaskBatchReportDTO.getDataIds() + ")", new BeanPropertyRowMapper<>(ArchiveFile.class)).stream().collect(Collectors.toMap(ArchiveFile::getId, ArchiveFile::getFileName, (obj1, obj2) -> obj1));
-        String[] archiveIds = archiveTaskBatchReportDTO.getDataIds().split(",");
-        if (archiveIds.length > 0) {
-            for (String archiveId : archiveIds) {
+        List<ArchiveFile> archiveFiles = jdbcTemplate.query("select * from u_archive_file where id in (" + archiveTaskBatchReportDTO.getDataIds() + ")", new BeanPropertyRowMapper<>(ArchiveFile.class));
+        if (archiveFiles.size() > 0) {
+            for (ArchiveFile archive : archiveFiles) {
+                if (!archive.getStatus().equals(0)) {
+                    throw new ServiceException("只有【未上报】状态的业务数据才能上报！");
+                }
+                if (!archive.getIsCertification().equals(0)) {
+                    throw new ServiceException("只有【未认证】状态的业务数据才能上报！");
+                }
+
                 //创建task审批任务
                 Long processInstanceId = SnowFlakeUtil.getId();
                 Task task = new Task();
@@ -402,8 +408,8 @@ public class TaskController extends BladeController {
 
                 task.setTaskContent(ObjectUtil.isNotEmpty(archiveTaskBatchReportDTO.getTaskContent()) ? archiveTaskBatchReportDTO.getTaskContent() : null);
                 task.setTaskUser(null);
-                task.setFormDataId(archiveId); //数据指向
-                task.setTaskName(ObjectUtil.isNotEmpty(fileNameMaps.get(Long.parseLong(archiveId))) ? fileNameMaps.get(Long.parseLong(archiveId)) : "未获取到档案文件任务名");
+                task.setFormDataId(archive.getId().toString()); //数据指向
+                task.setTaskName(ObjectUtil.isNotEmpty(archive.getFileName()) ? archive.getFileName() : "未获取到档案文件任务名");
                 task.setContractId(archiveTaskBatchReportDTO.getContractId());
                 task.setProjectId(archiveTaskBatchReportDTO.getProjectId());
                 task.setBatch(archiveTaskBatchReportDTO.getBatch());
@@ -439,7 +445,7 @@ public class TaskController extends BladeController {
                 }
 
                 //修改档案业务数据任务状态为待审批
-                jdbcTemplate.execute("update u_archive_file set status = 1 where id = " + archiveId);
+                jdbcTemplate.execute("update u_archive_file set status = 1 where id = " + archive.getId());
             }
 
             //WebSocket推送

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVisaServiceImpl.java

@@ -581,7 +581,7 @@ public class EVisaServiceImpl implements EVisaService {
                     List<TaskArchiveDTO.Sign> signList = taskArchiveDTO.getSealStrategy();
                     List<SealStrategyVO> sealStrategyVOS = new ArrayList<>();
                     for (TaskArchiveDTO.Sign index : signList) {
-                        if (ObjectUtil.isNotEmpty(index.getUrl())) { //CA签字体证书不为空才签章
+                        if (ObjectUtil.isNotEmpty(index.getUrl())) {
                             SealStrategyVO signVO = new SealStrategyVO();
                             signVO.setIsCenterCoordinate("1"); //左上角为原点
                             signVO.setSealCode(EVisaConstant.SIGN_SEAL_CODE + SecureUtil.getUserId());
@@ -589,7 +589,7 @@ public class EVisaServiceImpl implements EVisaService {
                             signVO.setSealPerson(SecureUtil.getNickName());
 
                             //位置信息
-                            signVO.setImageUrl(index.getUrl()); //CA签字体
+                            signVO.setImageUrl(index.getUrl()); //固定签章
                             signVO.setSealType("2");//坐标签章
                             signVO.setLx(index.getLx()); //x轴
                             signVO.setLy(index.getLy()); //y轴
@@ -830,12 +830,15 @@ public class EVisaServiceImpl implements EVisaService {
                     //对图片进行扣白底
                     imageData = ImageUtil.transferAlpha(imageData);
 
-                    //设置大小
-                    if (vo.isCompanySeal()) {
-                        imageData = ImageUtil.resizeImage(imageData, 540, 540);
-                    } else {
-                        imageData = ImageUtil.resizeImage(imageData, 480, 132);
-//                        imageData = ImageUtil.resizeImage(imageData,540,540);
+                    //设置大小（首先排查档案水印章，因为水印章要保持原样）
+                    if (!vo.getImageUrl().equals("https://bladex-chongqing-info.oss-cn-hangzhou.aliyuncs.com//upload/20230911/5b42583d931664b785ebf481c37d17bc.png")) {
+                        if (vo.isCompanySeal()) {
+                            //合同章
+                            imageData = ImageUtil.resizeImage(imageData, 540, 540);
+                        } else {
+                            //非合同章
+                            imageData = ImageUtil.resizeImage(imageData, 480, 132);
+                        }
                     }
 
                     //图片dpi设置