1.研判分析接口修改

tangzy

2021-08-13 df1b0194375f13c640a0fc26a4fb82a65d48727f

1.研判分析接口修改

 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml

@@ -154,8 +154,7 @@
        IFNULL(A.amount, 0) AS lastamount,
        IFNULL(B.amount, 0) AS thisamount
        FROM (
        SELECT COUNTb.
        (*) AS lastmonth,
        SELECT COUNT(*) AS lastmonth,
        amount,
        deptid
        FROM
@@ -176,8 +175,7 @@
        deptid
        ) A
        left JOIN (
        SELECT COUNT
        (*) AS thismouth,
        SELECT COUNT(*) AS thismouth,
        amount,
        deptid
        FROM

 src/main/java/org/springblade/modules/record/entity/Record.java

@@ -148,5 +148,6 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    private String deptid;
    private String examinetime;

}

 src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml

@@ -24,6 +24,7 @@
        <result column="offices" property="offices"/>
        <result column="officetime" property="officetime"/>
        <result column="deptid" property="deptid"/>
        <result column="examinetime" property="examinetime"/>
    </resultMap>



 src/main/resources/application-dev.yml

@@ -13,7 +13,7 @@
    #  commandTimeout: 5000
  datasource:
    # MySql
    url: jdbc:mysql://localhost:2083/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    url: jdbc:mysql://223.82.109.183:2083/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: root
    password: zhba0728
    # PostgreSQL