zjh20250429

zjh

2025-04-29 6d529f8af3d52a02f04097218d7c17fffd93d49c

zjh20250429

 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);
    }

 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> {



 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);



 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);


 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 ;
    }


 ltkj-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -373,9 +373,20 @@
    </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},
@@ -385,4 +396,5 @@
            )}
    </select>


</mapper>