From 6143480e1c0ca933475eba16295cb2530c3d5107 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Fri, 17 Jan 2025 15:50:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/QrCodeServiceImpl.java        | 18 +++++++++++-------
 .../mapper/CustomerFormvViewMapper.xml         | 13 ++++++++++++-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/hxgk/lowcode/service/impl/QrCodeServiceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/QrCodeServiceImpl.java
index 640fbdd..34e9e6f 100644
--- a/src/main/java/com/hxgk/lowcode/service/impl/QrCodeServiceImpl.java
+++ b/src/main/java/com/hxgk/lowcode/service/impl/QrCodeServiceImpl.java
@@ -28,7 +28,7 @@ public class QrCodeServiceImpl implements QrCodeService {
         QRCodeUtil qrCodeUtil = new QRCodeUtil();
         String qrCodeStr = "";
         //String qrCodeStr = "https://wab.hxgk.group/#/form_table/taskListPage? id=112&key=287135214646333440&formid=116&formKey=287145907965661184&title=t2&state=1";
-        String prefixLocal = "http://localhost:9998/form_table/taskListPage?";
+        String prefixLocal = "http://localhost:9998/#/form_table/taskListPage?";
         String prefixout = "https://wab.hxgk.group/#/form_table/taskListPage?";
         //获取参数
         /*
@@ -42,10 +42,14 @@ public class QrCodeServiceImpl implements QrCodeService {
         * */
         CustomerFormView c = customerFormViewService.getCustomerFormViewByCfid(cfid);
         //上线修改
-        qrCodeStr = prefixout+"id="+c.getCfid()+"&key="+c.getGroupid()+"&formid="+c.getId()+"&formKey="+c.getSignCode()+"&title="+c.getName()+"&state="+c.getStates();
+        qrCodeStr = prefixLocal+"id="+c.getCfid()+"&key="+c.getGroupid()+"&formid="+c.getId()+"&formKey="+c.getSignCode()+"&title="+c.getName()+"&state="+c.getStates();
+        Map<String,String> appAndGroupNameMap = customerFormViewService.getAppNameAndGroupNameByCfid(cfid);
+        String groupName = appAndGroupNameMap.get("groupName");
+        String appName = appAndGroupNameMap.get("appName");
+        String formName = appAndGroupNameMap.get("formName");
         //System.out.println(qrCodeStr);
         try {
-            BufferedImage bufferedImage = qrCodeUtil.getQRCodeImage(qrCodeStr, "生成的二维码");
+            BufferedImage bufferedImage = qrCodeUtil.getQRCodeImage(qrCodeStr, "扫码填写: "+groupName+"-"+appName+"-"+formName);
             String base64 = qrCodeUtil.bufferedImageToBase64(bufferedImage);
             return base64;
         } catch (Exception e) {
@@ -61,11 +65,11 @@ public class QrCodeServiceImpl implements QrCodeService {
         QRCodeUtil qrCodeUtil = new QRCodeUtil();
         String basicQrCodeStr = "";
         //String basicQrCodeStr = "https://wab.hxgk.group/#/form_table/taskListPage? id=112&key=287135214646333440&formid=116&formKey=287145907965661184&title=t2&state=1";
-        String prefixLocal = "http://localhost:9998/form_table/taskListPage?";
+        String prefixLocal = "http://localhost:9998/#/form_table/taskListPage?";
         String prefixout = "https://wab.hxgk.group/#/form_table/taskListPage?";
         CustomerFormView c = customerFormViewService.getCustomerFormViewByCfid(cfid);
         //上线修改
-        basicQrCodeStr = prefixout+"id="+c.getCfid()+"&key="+c.getGroupid()+"&formid="+c.getId()+"&formKey="+c.getSignCode()+"&title="+c.getName()+"&state="+c.getStates();
+        basicQrCodeStr = prefixLocal+"id="+c.getCfid()+"&key="+c.getGroupid()+"&formid="+c.getId()+"&formKey="+c.getSignCode()+"&title="+c.getName()+"&state="+c.getStates();
         //查询要展示在表格中的信息
         ArrayList<String> qrCodeShowFields = new ArrayList<>();
         Object qrCodePrintStyle = settings.get("qrCodePrintStyle");
@@ -94,7 +98,7 @@ public class QrCodeServiceImpl implements QrCodeService {
                     String currentQrCodeStr = basicQrCodeStr+"&qrDetailId="+id;
                     BufferedImage currentBufferedImage = null;
                     try {
-                        currentBufferedImage = qrCodeUtil.getQRCodeImage(currentQrCodeStr, "生成的单条信息详情二维码");
+                        currentBufferedImage = qrCodeUtil.getQRCodeImage(currentQrCodeStr);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -123,7 +127,7 @@ public class QrCodeServiceImpl implements QrCodeService {
                     String currentQrCodeStr = basicQrCodeStr+"&qrDetailId="+id;
                     BufferedImage currentBufferedImage = null;
                     try {
-                        currentBufferedImage = qrCodeUtil.getQRCodeImage(currentQrCodeStr, "生成的单条信息详情二维码");
+                        currentBufferedImage = qrCodeUtil.getQRCodeImage(currentQrCodeStr);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
diff --git a/src/main/resources/mapper/CustomerFormvViewMapper.xml b/src/main/resources/mapper/CustomerFormvViewMapper.xml
index d30f7ae..93c279e 100644
--- a/src/main/resources/mapper/CustomerFormvViewMapper.xml
+++ b/src/main/resources/mapper/CustomerFormvViewMapper.xml
@@ -71,7 +71,18 @@
                       AND cfv3.states = 1
                 )
                 AND cfv2.classify = 3
-            ) AS appName
+            ) AS appName,
+
+            (
+                select cfv5.name
+            from customer_form_view cfv5
+            where
+                cfv5.cfid = #{cfid}
+                and cfv5.status = 1
+                and cfv5.states = 1
+                )
+                AS formName
+
         FROM customer_form_group cfg
         WHERE cfg.id = (
             SELECT cfv1.groupid