zjh 2024/03/19--1

zjh

2024-03-19 d251236f861452678eab9de0657ec46ba53930e6

zjh 2024/03/19--1

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java

@@ -85,9 +85,11 @@
    public AjaxResult getDxList() {
//        LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
//        wq0.eq(TjProject::getProParentId, 0);

        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();

        String config = configService.selectConfigByKey("tj_dxsxtj");
        if(null !=config && config.equals("N")){
            tjProjects = tjProjectService.getOpenDxTjProjectList();
        }
        //上面的换sql
//        final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);


 ltkj-admin/src/main/resources/application.yml

@@ -210,13 +210,13 @@
    #key-path: E:\mycode\apppwd\1643225121_20230427_cert\apiclient_cert.p12  #本地证书路径，在微信商户后台下载
    key-path: D:\WXCertUtil\tjcert\apiclient_cert.p12  #服务器证书路径，在微信商户后台下载
#    pay-score-notify-url: http://192.168.0.101:5011/cus/order/pay-notify   #微信支付回调地址
    pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify   #微信支付回调地址
#    pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin/cus/order/pay-notify   #微信支付回调地址
#    pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin/cus/order/pay-notify   #微信支付回调地址
    pay-score-notify-url: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin/cus/order/pay-notify   #微信支付回调地址

#积木报表访问地址
jimu:
  path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
#  path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
#  path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
  path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
#  path: http://192.168.0.5:5000/ltkj-admin
#   path: http://10.168.0.9:5011
#   path: http://192.168.0.105:5011

 ltkj-admin/src/test/java/zjhTest.java

@@ -89,6 +89,9 @@
//        System.out.println(betweenDay);
//        System.out.println(DateUtil.between(new Date(),date1, DateUnit.MS));
//        System.out.println(DateUtil.between(new Date(),date1, DateUnit.SECOND));

        System.out.println(DateUtil.date().toDateStr());
        System.out.println(DateUtil.date().toString());
    }
//
//    public static String getAdd(String log, String lat ){

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java

@@ -142,6 +142,9 @@
    @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 and LOCATE( '体检',pro_name) ")
    List<TjProject> getDxTjProjectList();

    @Select("SELECT * FROM `tj_project` where pro_parent_id=0 and pro_status=0 and pro_price>0")
    List<TjProject> getOpenDxTjProjectList();


    @Select("SELECT a.*,GROUP_CONCAT(b.pro_name ORDER BY b.pro_name) AS all_son_pro_name FROM\n" +
            "tj_project a LEFT JOIN tj_project b ON b.pro_parent_id=a.pro_id WHERE\n" +

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java

@@ -110,6 +110,8 @@
    List<TjProject> getTjProjectList();
    List<TjProject> getDxTjProjectList();

    List<TjProject> getOpenDxTjProjectList();

    List<TjProject> getPacTjProjectList();



 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java

@@ -212,6 +212,11 @@
    }

    @Override
    public List<TjProject> getOpenDxTjProjectList() {
        return  tjProjectMapper.getOpenDxTjProjectList();
    }

    @Override
    public List<TjProject> getPacTjProjectList() {
        return tjProjectMapper.getPacTjProjectList();
    }