更新登记证样式、修复bug

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -343,7 +343,7 @@ public class CommonServiceImpl implements ICommonService {
         map.put("giveOutMonth", Optional.ofNullable(map.get("giveOutMonth")).orElse("").toString());  // 发证日期-月
         map.put("giveOutDay", Optional.ofNullable(map.get("giveOutDay")).orElse("").toString());  // 发证日期-日
         // 生成二维码
-        String qrCode = ImageUtils.generateQRCode(Optional.ofNullable(map.get("supervisoryCode")).orElse("").toString(), 70, 65);
+        String qrCode = ImageUtils.generateQRCode(Optional.ofNullable(map.get("supervisoryCode")).orElse("").toString(), 100, 100);
         map.put("supervisoryCode", qrCode);  // 监管二维码
 
         // word转pdf

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgTransferNoticeServiceImpl.java

@@ -548,7 +548,12 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         dto.setTaskId(taskId);
         dto.setComment("提交流程");
         HashMap<String, Object> map = new HashMap<>();
-        map.put("approvalStatus", op);
+        if(notice.getNoticeStatus().equals("6614") || notice.getNoticeStatus().equals("6615") ) {
+            map.put("approvalStatus", "提交");
+        } else {
+            map.put("approvalStatus", op);
+        }
+
         dto.setVariable(map);
         //执行流程
         AjaxResult ajaxResult1 = null;