From 957147ea38113868a611766ce22fcfc6dc0df13a Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Thu, 21 Aug 2025 11:47:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=9A=E4=BD=8D=E5=8D=A1?= =?UTF-8?q?=E6=9C=BA=E5=99=A8=E5=8F=B7=E5=90=8C=E6=AD=A5sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hxgk/lowcode/mapper/CustomerFormViewMapper.java | 2 ++ .../lowcode/service/impl/AppmenusSerciceImpl.java | 2 +- .../service/impl/CustomerFormServiceImpl.java | 12 +++++++++++- src/main/java/com/hxgk/lowcode/utils/QRCodeUtil.java | 2 +- src/main/resources/application.yml | 2 +- .../resources/mapper/CustomerFormvViewMapper.xml | 3 +++ src/main/resources/mapper/UserMapper.xml | 2 +- 7 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java b/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java index af26a13..e80987b 100644 --- a/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java +++ b/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java @@ -24,4 +24,6 @@ public interface CustomerFormViewMapper { CustomerFormView getCustomerFormViewByCfid(String cfid); Map getAppNameAndGroupNameByCfid(@Param("cfid")String cfid); + + CustomerFormView getCustomerFormViewByTableKey(String tablekey); } diff --git a/src/main/java/com/hxgk/lowcode/service/impl/AppmenusSerciceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/AppmenusSerciceImpl.java index c83c5a2..2738306 100644 --- a/src/main/java/com/hxgk/lowcode/service/impl/AppmenusSerciceImpl.java +++ b/src/main/java/com/hxgk/lowcode/service/impl/AppmenusSerciceImpl.java @@ -31,7 +31,7 @@ public class AppmenusSerciceImpl implements AppmenusService { ArrayList treeObjList = convertAppmenusToTreeObj(appmenusList); treeObjList.add(customerFormTreeObj); Tree tree = createTree(treeObjList,appmenusAppkey); - System.out.println(1); + //System.out.println(1); //} return tree; diff --git a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java index a0fb19c..f55d5b5 100644 --- a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java +++ b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java @@ -1959,6 +1959,9 @@ public class CustomerFormServiceImpl implements CustomerFormService { return null; } + + + private List> getDataTitles(String asfFormName,ArrayList toSelectDataTitles){ List> newDataTitles = new ArrayList<>(); /*for(String item :toSelectDataTitles){ @@ -1972,6 +1975,9 @@ public class CustomerFormServiceImpl implements CustomerFormService { //没有owner的,creater的key改为owner,有owner但owner为空的,creater的value给owner //没有org的 processDataTitles(dataTitles); + + + return dataTitles; } private List> getDataTitlesWithWhere_Asf_NotTable(String asfFormName,ArrayList toSelectDataTitles,String operator,String whereCondition,String leftValue){ @@ -1995,7 +2001,9 @@ public class CustomerFormServiceImpl implements CustomerFormService { } +/* +* */ private List> getDataTitlesWithWhere_Asf_NotTable1(String asfFormName,ArrayList toSelectDataTitles,String operator,String whereCondition,String leftValue){ List> newDataTitles = new ArrayList<>(); /*for(String item :toSelectDataTitles){ @@ -2063,7 +2071,9 @@ public class CustomerFormServiceImpl implements CustomerFormService { return dataTitles; } - + /* + + * */ public void processDataTitles(List> dataTitles) { // 本地缓存：存储 creatorValue -> adminOrg 的映射 diff --git a/src/main/java/com/hxgk/lowcode/utils/QRCodeUtil.java b/src/main/java/com/hxgk/lowcode/utils/QRCodeUtil.java index ee50c3a..5eb459c 100644 --- a/src/main/java/com/hxgk/lowcode/utils/QRCodeUtil.java +++ b/src/main/java/com/hxgk/lowcode/utils/QRCodeUtil.java @@ -178,7 +178,7 @@ public class QRCodeUtil { g2.setPaint(Color.BLACK); FontRenderContext context = g2.getFontRenderContext(); //部署linux需要注意 linux无此字体会显示方块 - Font font = new Font("宋体", Font.BOLD, 15); + Font font = new Font("Droid Sans", Font.BOLD, 15); g2.setFont(font); LineMetrics lineMetrics = font.getLineMetrics(declareText, context); FontMetrics fontMetrics = FontDesignMetrics.getMetrics(font); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 750a6e2..1760fb4 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev + active: prod server: port: 8112 \ No newline at end of file diff --git a/src/main/resources/mapper/CustomerFormvViewMapper.xml b/src/main/resources/mapper/CustomerFormvViewMapper.xml index 93c279e..f5c7922 100644 --- a/src/main/resources/mapper/CustomerFormvViewMapper.xml +++ b/src/main/resources/mapper/CustomerFormvViewMapper.xml @@ -16,6 +16,9 @@ order by id + - select number,admin_org,emp_type from man_cont where `deviceNo` = #{deviceNo} + select number,admin_org,emp_type from man_cont where `deviceNo` = #{deviceNo} and company in ('309','224') and maindeparment not in ('104','268','271','275')