添加更新日志

bsoft-api/src/main/resources/application.properties

 spring.application.name=bsoftapi
 spring.profiles.active=test
-#server.port=8080
-#server.servlet.context-path=/api
+
 mybatis.mapper-locations=classpath:mapper/*.xml
 mybatis.type-aliases-package=com.bsoft.api.model
 

bsoft-api/src/main/resources/mapper/SerDiseaseMapper.xml

@@ -89,14 +89,14 @@
         <if test="deptCode!=null">
             join (select ZBZBM,KSBM,SUM(ZLS) as ZLS
             from val_block_values_1_2_2
-            where TIME=#{date} and ZLS>0
+            where `TIME`=#{date} and ZLS>0
             and KSBM=#{deptCode,jdbcType=VARCHAR}
             group by ZBZBM,KSBM) val on val.ZBZBM = d.MDC_CODE
         </if>
         <if test="deptCode==null">
             join (select ZBZBM,SUM(ZLS) as ZLS
             from val_block_values_1_1_2
-            where TIME=#{date} and ZLS>0
+            where `TIME`=#{date} and ZLS>0
             group by ZBZBM) val on val.ZBZBM = d.MDC_CODE
         </if>
         where 1 = 1 and STATE=1
@@ -109,7 +109,7 @@
         select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
         d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE
         from SER_DISEASE d
-        where 1 = 1 and STATE=1 and rs.MDC_CODE=d.MDC_CODE
+        where 1 = 1 and STATE=1
         <if test="level!=null">
             and d.`LEVEL` = #{level,jdbcType=DECIMAL}
         </if>
@@ -122,14 +122,14 @@
         <if test="deptCode!=null">
             join (select ZBZBM,KSBM,SUM(ZLS) as ZLS
             from val_block_values_1_2_2
-            where TIME=#{date} and ZLS>0
+            where `TIME`=#{date} and ZLS>0
             and KSBM=#{deptCode,jdbcType=VARCHAR}
             group by ZBZBM,KSBM) val on val.ZBZBM = d.MDC_CODE
         </if>
         <if test="deptCode==null">
             join (select ZBZBM,SUM(ZLS) as ZLS
             from val_block_values_1_1_2
-            where TIME=#{date} and ZLS>0
+            where `TIME`=#{date} and ZLS>0
             group by ZBZBM) val on val.ZBZBM = d.MDC_CODE
         </if>
         where 1 = 1 and STATE=1 and STATE=1
@@ -145,14 +145,14 @@
         <if test="deptCode!=null">
             join (select ZBZBM,KSBM,SUM(ZLS) as ZLS
             from val_block_values_1_5_2
-            where TIME=#{date}
+            where `TIME`=#{date}
             and KSBM=#{deptCode,jdbcType=VARCHAR}
             group by ZBZBM,KSBM) val on val.ZBZBM = d.MDC_CODE
         </if>
         <if test="deptCode==null">
             join (select ZBZBM,SUM(ZLS) as ZLS
             from val_block_values_1_3_2
-            where TIME=#{date}
+            where `TIME`=#{date}
             group by ZBZBM) val on val.ZBZBM = d.MDC_CODE
         </if>
         where 1 = 1 and STATE=1 and STATE=1
@@ -166,7 +166,7 @@
         from SER_DISEASE d
         join (select ZBZBM,SUM(ZLS) as ZLS
         from val_block_values_1_1_2
-        where TIME=#{date} and ZLS>0
+        where `TIME`=#{date} and ZLS>0
         group by ZBZBM) val on val.ZBZBM = d.MDC_CODE
         where 1 = 1 and d.STATE=1
         <if test="diseaseId!=null">
@@ -178,7 +178,7 @@
         from SER_DISEASE d
         join (select ZBZBM,SUM(ZLS) as ZLS
         from val_block_values_1_3_2
-        where TIME=#{date}
+        where `TIME`=#{date}
         group by ZBZBM) val on val.ZBZBM = d.MDC_CODE
         where 1 = 1 and d.STATE=1
         <if test="diseaseId!=null">
@@ -189,9 +189,9 @@
         select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.STATE, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
         d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE,val.ZLS
         from SER_DISEASE d
-        join (select ZBZBM,SUM(ZLS) as ZLS
+        left join (select ZBZBM,SUM(ZLS) as ZLS
         from val_block_values_1_3_2
-        where TIME=#{date}
+        where `TIME`=#{date}
         group by ZBZBM) val on val.ZBZBM = d.MDC_CODE
         where 1 = 1 and STATE=1 and STATE=1
         <if test="diseaseId!=null">

bsoft-api/src/main/resources/更新日志.txt

+时间：2020.07.13		版本号：1.02.0713001
+时间：2020.07.13		版本号：1.02.0713001
+后端更新说明：
+			1.病组目录添加总例数字段
+	
\ No newline at end of file

bsoft-common/src/main/java/com/bsoft/common/config/swaggerconfig/SwaggerConfig.java

@@ -9,6 +9,7 @@ import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spi.service.contexts.SecurityContext;
 import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
 import java.util.List;
 
 import static com.google.common.collect.Lists.newArrayList;
@@ -19,7 +20,7 @@ public class SwaggerConfig {
     //是否开启swagger，正式环境一般是需要关闭的，可根据springboot的多环境配置进行设置
     @Value(value = "${swagger.enabled:false}")
     Boolean swaggerEnabled = true;
-@Value("${swagger.basePackage:com.bsoft.api.controller}")
+    @Value("${swagger.basePackage:com.bsoft.api.controller}")
     String basePackage;
 
     @Bean
@@ -40,6 +41,7 @@ public class SwaggerConfig {
         return newArrayList(
                 new ApiKey("Authorization", "Authorization", "header"));
     }
+
     private List<SecurityContext> securityContexts() {
         return newArrayList(
                 SecurityContext.builder()
@@ -48,6 +50,7 @@ public class SwaggerConfig {
                         .build()
         );
     }
+
     List<SecurityReference> defaultAuth() {
         AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
         AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];

suvalue-boot-demo/suvalue-boot-demo-atomicinteger/src/test/java/com/suvalue/demo/atomicinteger/AtomictIntegerTest.java

@@ -3,7 +3,7 @@ package com.suvalue.demo.atomicinteger;
 public class AtomictIntegerTest {
     public static void main(String[] args) {
 
-    }
+}
 
     public void operator(){