From 6d529f8af3d52a02f04097218d7c17fffd93d49c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 29 四月 2025 18:05:27 +0800
Subject: [PATCH] zjh20250429
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java | 2
ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 10 ++---
ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java | 27 ++++++++-----
ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml | 16 +++++++-
ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java | 5 ++
6 files changed, 41 insertions(+), 21 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 1467b3f..fa4586a 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -212,11 +212,9 @@
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
Map<String, Object> map = null;
if (type == 0) {
- map = deptService.getSysDeptHyAndYxYjWjCustomerList13("A30", name, tjNumber, 0, page, pageSize);
+ map = deptService.getSysDeptHyAndYxYjWjCustomerList13( name, tjNumber, 0, page, pageSize);
}
- if (type == 1) {
- map = deptService.getSysDeptHyAndYxYjWjCustomerList13("A30", name, tjNumber, 1, page, pageSize);
- }
+ if (type == 1) map = deptService.getSysDeptHyAndYxYjWjCustomerList13(name, tjNumber, 1, page, pageSize);
return AjaxResult.success(map);
}
@@ -235,10 +233,10 @@
Map<String, Object> map = null;
if (type == 0) {
- map = deptService.getSysDeptHyAndYxYjWjCustomerList13("A32", name, tjNumber, 0, page, pageSize);
+ map = deptService.getSysDeptHyAndYxYjWjCustomerList13( name, tjNumber, 0, page, pageSize);
}
if (type == 1) {
- map = deptService.getSysDeptHyAndYxYjWjCustomerList13("A32", name, tjNumber, 1, page, pageSize);
+ map = deptService.getSysDeptHyAndYxYjWjCustomerList13( name, tjNumber, 1, page, pageSize);
}
return AjaxResult.success(map);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java
index 2967d44..633c953 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java
@@ -17,7 +17,7 @@
* @Date: 2023/12/11 17:56
*/
@Mapper
-@DataSource(value = DataSourceType.MASTER)
+//@DataSource(value = DataSourceType.MASTER)
public interface LtkjHybgdMapper extends BaseMapper<LtkjHybgd> {
diff --git a/ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java b/ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java
index 4dac7d2..13a5a50 100644
--- a/ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java
+++ b/ltkj-system/src/main/java/com/ltkj/system/mapper/SysDeptMapper.java
@@ -144,6 +144,11 @@
List<List<?>> getSysDeptHyAndYxYjWjCustomerList13(Map<String,Object> map);
+
+// @Select("call pro_tjhzlb_list(#{tjname,mode=IN},#{tjNumber,mode=IN},#{type,mode=IN},#{page,mode=IN},#{pageSize,mode=IN})")
+// List<List<?>> getSysDeptHyAndYxYjWjCustomerList13( @Param("tjname") String tjname, @Param("tjNumber") String tjNumber,
+// @Param("type")int type, @Param("page") int page , @Param("pageSize") int pageSize);
+
List<ResultSet> getSysDeptYjWjCustomerList2(Map<String,Object> map);
diff --git a/ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java b/ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java
index 309ad65..422695e 100644
--- a/ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java
+++ b/ltkj-system/src/main/java/com/ltkj/system/service/ISysDeptService.java
@@ -150,7 +150,7 @@
Map<String,Object> getSysDeptYjWjCustomerList13(String deptid, String tjname, String tjNumber, int type, int page , int pageSize);
- Map<String,Object> getSysDeptHyAndYxYjWjCustomerList13(String deptid, String tjname, String tjNumber, int type, int page , int pageSize);
+ Map<String,Object> getSysDeptHyAndYxYjWjCustomerList13(String tjname, String tjNumber, int type, int page , int pageSize);
List<TreeSelect> selectDeptList1(SysDept dept);
diff --git a/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java b/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java
index c26004c..b192444 100644
--- a/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java
+++ b/ltkj-system/src/main/java/com/ltkj/system/service/impl/SysDeptServiceImpl.java
@@ -396,36 +396,41 @@
map.put("page",page);
map.put("pageSize",pageSize);
List<List<?>> list = deptMapper.getSysDeptYjWjCustomerList13(map);
-// ObjectMapper objectMapper=new ObjectMapper();
-// try {
-// System.out.println("缁撴灉闆嗕竴锛�"+objectMapper.writeValueAsString(list.get(0)));
-// System.out.println("缁撴灉闆嗕簩锛�"+objectMapper.writeValueAsString(list.get(1)));
-// } catch (JsonProcessingException e) {
-// e.printStackTrace();
-// }
-// System.out.println("鍑哄弬鍙傛暟鍊硷細"+map.get("totalRows"));
Map<String,Object> map1=new HashMap<>();
map1.put("date",list);
map1.put("total",map.get("totalRows"));
return map1 ;
-// return deptMapper.getSysDeptYjWjCustomerList(deptid,tjname,tjNumber,type,page,pageSize);
}
@Override
- public Map<String, Object> getSysDeptHyAndYxYjWjCustomerList13(String deptid, String tjname, String tjNumber, int type, int page, int pageSize) {
+ public Map<String, Object> getSysDeptHyAndYxYjWjCustomerList13(String tjname, String tjNumber, int type, int page, int pageSize) {
Map<String, Object> map = new HashMap<>();
- map.put("deptid",deptid);
map.put("tjname",tjname);
map.put("tjNumber",tjNumber);
map.put("type",type);
map.put("page",page);
map.put("pageSize",pageSize);
+ map.put("totalRows", null);
List<List<?>> list = deptMapper.getSysDeptHyAndYxYjWjCustomerList13(map);
+ // 鑾峰彇 OUT 鍙傛暟
Map<String,Object> map1=new HashMap<>();
map1.put("date",list);
map1.put("total",map.get("totalRows"));
+// Map<String, Object> map = new HashMap<>();
+// map.put("deptid","100");
+// map.put("tjname",tjname);
+// map.put("tjNumber",tjNumber);
+// map.put("type",type);
+// map.put("page",page);
+// map.put("pageSize",pageSize);
+// List<List<?>> list = deptMapper.getSysDeptYjWjCustomerList13(map);
+// Map<String,Object> map1=new HashMap<>();
+// map1.put("date",list);
+// map1.put("total",map.get("totalRows"));
+
+
return map1 ;
}
diff --git a/ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 022e364..6bf5d4f 100644
--- a/ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -373,16 +373,28 @@
</select>
+<!-- <select id="getSysDeptHyAndYxYjWjCustomerList13" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map">-->
+<!-- {call check_hyAndYx_list(-->
+<!-- #{tjname,mode=IN,jdbcType=VARCHAR},-->
+<!-- #{tjNumber,mode=IN,jdbcType=VARCHAR},-->
+<!-- #{type,mode=IN,jdbcType=INTEGER},-->
+<!-- #{page,mode=IN,jdbcType=INTEGER},-->
+<!-- #{pageSize,mode=IN,jdbcType=INTEGER},-->
+<!-- #{totalcount,mode=OUT,jdbcType=INTEGER}-->
+<!-- )}-->
+<!-- </select>-->
+
<select id="getSysDeptHyAndYxYjWjCustomerList13" parameterType="java.util.Map" statementType="CALLABLE" resultType="java.util.Map">
{call check_hyAndYx_list(
- #{deptid,mode=IN,jdbcType=VARCHAR},
+
#{tjname,mode=IN,jdbcType=VARCHAR},
#{tjNumber,mode=IN,jdbcType=VARCHAR},
#{type,mode=IN,jdbcType=INTEGER},
#{page,mode=IN,jdbcType=INTEGER},
#{pageSize,mode=IN,jdbcType=INTEGER},
#{totalRows,mode=OUT,jdbcType=INTEGER}
- )}
+ )}
</select>
+
</mapper>
--
Gitblit v1.8.0