fix(jg):证打印标记功能开发

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistrationManage.java

@@ -246,5 +246,5 @@ public class JgUseRegistrationManage extends BaseEntity {
      * 证书是否打印标记
      */
     @TableField("certificate_print_tag")
-    private JSONObject certificatePrintTag;
+    private String certificatePrintTag;
 }

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/JgUseRegistrationManageServiceImpl.java

@@ -603,9 +603,11 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
     }
 
     private void handleExportSummaryTable(HttpServletResponse response, JgUseRegistrationManage manage) {
-        JSONObject tagJson = Optional.ofNullable(manage.getCertificatePrintTag()).orElse(new JSONObject());
+        JSONObject tagJson = Optional.ofNullable(manage.getCertificatePrintTag())
+                .map(JSONObject::parseObject)
+                .orElse(new JSONObject());
         tagJson.put(EXPORT_SUMMARY_TABLE, 2);
-        manage.setCertificatePrintTag(tagJson);
+        manage.setCertificatePrintTag(JSONObject.toJSONString(tagJson));
         List<JgUseRegistration> registrations = jgUseRegistrationService.getBaseMapper().selectList(
                 new LambdaQueryWrapper<JgUseRegistration>()
                         .eq(JgUseRegistration::getUseRegistrationCode, manage.getUseRegistrationCode())
@@ -625,7 +627,9 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
             throw new BadRequest("设备信息为空，导出失败！");
         }
         Map<String, Object> params = buildExportParams(manage, deviceList);
-        JSONObject tagJson = new JSONObject(manage.getCertificatePrintTag());
+        JSONObject tagJson = Optional.ofNullable(manage.getCertificatePrintTag())
+                .map(JSONObject::parseObject)
+                .orElse(new JSONObject());
         switch (printType) {
             case CERTIFICATE_NORMAL://证 普打
                 commonService.generateCertificateReport(params, response);
@@ -646,7 +650,7 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
             default:
                 throw new BadRequest("无效的打印类型！");
         }
-        manage.setCertificatePrintTag(tagJson);
+        manage.setCertificatePrintTag(JSONObject.toJSONString(tagJson));
     }
 
     private Map<String, Object> buildExportParams(JgUseRegistrationManage manage, List<JSONObject> deviceList) {