签章流程修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/controller/CwProjectReportController.java

@@ -253,21 +253,27 @@ public class CwProjectReportController {
     @ApiLog(value = "签章流程送审", type = LogTypeEnum.SAVE)
     @PostMapping("saveData")
     public ResponseEntity<String> saveData(@Valid @RequestBody CwProjectReportData cwProjectReportData) {
-        //查询报告文件信息（电子章）
-        List<WorkAttachment> fileList = attachmentMapper.selectWorkAttachmentByReportId(cwProjectReportData.getId());
-        if (CollectionUtil.isNotEmpty(fileList)) {
-            // 有电子章的附件时，走签章流程
-            Map<String, Object> signatureContractId = projectReportService.createSignatureContractId(cwProjectReportData);
-            boolean bool = (boolean)signatureContractId.get("success");
-            if (bool) {
+        if ("3".equals(cwProjectReportData.getSignatureType())) {
+            // 实体公章流程
+            String signatureId = projectReportService.getSignature(cwProjectReportData.getId());
+            return ResponseUtil.newInstance().add("businessTable", "cw_project_report_signature").add("businessId", signatureId).ok ("操作成功");
+        } else {
+            //查询报告文件信息（电子章）
+            List<WorkAttachment> fileList = attachmentMapper.selectWorkAttachmentByReportId(cwProjectReportData.getId());
+            if (CollectionUtil.isNotEmpty(fileList)) {
+                // 有电子章的附件时，走签章流程
+                Map<String, Object> signatureContractId = projectReportService.createSignatureContractId(cwProjectReportData);
+                boolean bool = (boolean)signatureContractId.get("success");
+                if (bool) {
+                    String signatureId = projectReportService.getSignature(cwProjectReportData.getId());
+                    return ResponseUtil.newInstance().add("businessTable", "cw_project_report_signature").add("businessId", signatureId).ok ("操作成功");
+                }
+                return ResponseEntity.badRequest().body((String) signatureContractId.get("message"));
+            } else {
+                // 没有电子章的附件时，走正常审核流程
                 String signatureId = projectReportService.getSignature(cwProjectReportData.getId());
                 return ResponseUtil.newInstance().add("businessTable", "cw_project_report_signature").add("businessId", signatureId).ok ("操作成功");
             }
-            return ResponseEntity.badRequest().body((String) signatureContractId.get("message"));
-        } else {
-            // 没有电子章的附件时，走正常审核流程
-            String signatureId = projectReportService.getSignature(cwProjectReportData.getId());
-            return ResponseUtil.newInstance().add("businessTable", "cw_project_report_signature").add("businessId", signatureId).ok ("操作成功");
         }
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportService.java

@@ -2010,7 +2010,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             if(null != user){
                 //获取成员印章id信息
                 long s1=System.currentTimeMillis();
-                String userSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(),"","江苏兴光项目管理有限公司公章");
+                String userSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(),"","江苏兴光会计事务所公章");
                 long s2=System.currentTimeMillis();
                 System.out.println("第二个人员印章获取时间：" + (s2 - s1));