From d48a5c3348964b1771bd735f794ae2e2aef43094 Mon Sep 17 00:00:00 2001
From: gognqingkai <1825346742@qq.com>
Date: Thu, 18 Apr 2024 11:10:15 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=8D=95=E4=B8=AAinfo=E8=B5=84=E8=AE=AF?=
=?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/info/MobileInfoController.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/info/MobileInfoController.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/info/MobileInfoController.java
index c0b309a8..cf070649 100644
--- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/info/MobileInfoController.java
+++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/info/MobileInfoController.java
@@ -1,19 +1,16 @@
package com.xinelu.mobile.controller.info;
import com.xinelu.common.core.controller.BaseController;
+import com.xinelu.common.core.domain.AjaxResult;
import com.xinelu.common.core.page.TableDataInfo;
import com.xinelu.manage.domain.info.Info;
import com.xinelu.manage.service.info.IInfoService;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
import javax.annotation.Resource;
import java.util.List;
-import static com.xinelu.common.utils.PageUtils.startPage;
-
/**
* 微信端获取资讯信息
* 资讯信息Controller
@@ -36,4 +33,9 @@ public class MobileInfoController extends BaseController {
return getDataTable(list);
}
+ @GetMapping("/getInfoById")
+ public AjaxResult getInfoById(Long id) {
+ return AjaxResult.success(infoService.selectInfoById(id));
+ }
+
}
From 1a41b740974be1a6e1ef08120a2ed17f39eb6b70 Mon Sep 17 00:00:00 2001
From: gognqingkai <1825346742@qq.com>
Date: Thu, 18 Apr 2024 14:52:39 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E8=AE=AF?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A8=A1=E7=B3=8A=E6=90=9C=E7=B4=A2=EF=BC=8C?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF=E7=AE=A1=E7=90=86=E6=8E=92?=
=?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/manage/info/InfoMapper.xml | 4 +-
.../infocategory/InfoCategoryMapper.xml | 154 +++++++++---------
.../LabelFieldContentMapper.xml | 26 +--
.../labelfieldinfo/LabelFieldInfoMapper.xml | 2 +-
4 files changed, 97 insertions(+), 89 deletions(-)
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/info/InfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/info/InfoMapper.xml
index 02a0a808..b6d414ca 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/info/InfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/info/InfoMapper.xml
@@ -50,10 +50,10 @@
and info_category_name = #{infoCategoryName}
- and info_title = #{infoTitle}
+ and info_title like concat('%', #{infoTitle}, '%')
- and info_code = #{infoCode}
+ and info_code like concat('%', #{infoCode}, '%')
and info_content = #{infoContent}
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/infocategory/InfoCategoryMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/infocategory/InfoCategoryMapper.xml
index 47380baf..3b43533c 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/infocategory/InfoCategoryMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/infocategory/InfoCategoryMapper.xml
@@ -5,114 +5,123 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
- select id, info_category_code, info_category_name, info_category_type, info_category_sort, info_category_creator, info_category_create_time from info_category
+ select id,
+ info_category_code,
+ info_category_name,
+ info_category_type,
+ info_category_sort,
+ info_category_creator,
+ info_category_create_time
+ from info_category
-
-
insert into info_category(
info_category_code,
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml
index d70a18b7..3409eadb 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml
@@ -77,7 +77,7 @@
#{fieldMark}
- order by create_time DESC
+ order by content_sort, create_time DESC
From f7697d4d2cc461f6242623c27714dedfb9745a0e Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Fri, 19 Apr 2024 11:01:33 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=B8=93=E7=97=85=E8=B7=AF=E5=BE=84?=
=?UTF-8?q?=E9=9A=8F=E8=AE=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml
index 41de00d0..18678f76 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml
@@ -199,6 +199,7 @@
and sdrp.service_package_id = #{servicePackageId}
+ GROUP BY sdr.id order by create_time DESC,route_sort ASC