diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/ProucteSafeDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/ProucteSafeDTO.java index 85d4aa7..5f12cc9 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/ProucteSafeDTO.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/ProucteSafeDTO.java @@ -16,7 +16,7 @@ /** * 签署开始日期 */ - private String startTime; + private String beginTime; /** * 签署结束日期 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/ProucteSafeDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/ProucteSafeDTO.java index 85d4aa7..5f12cc9 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/ProucteSafeDTO.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/ProucteSafeDTO.java @@ -16,7 +16,7 @@ /** * 签署开始日期 */ - private String startTime; + private String beginTime; /** * 签署结束日期 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java index 1f03dfe..acbba59 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java @@ -135,7 +135,7 @@ query.like(StringUtils.isNotEmpty(proucteSafeDTO.getSignName()), "signName", proucteSafeDTO.getSignName()); query.eq(StringUtils.isNotEmpty(proucteSafeDTO.getProjectId()), "projectId", proucteSafeDTO.getProjectId()); //时间处理 - query.ge(StringUtils.isNotEmpty(proucteSafeDTO.getStartTime()), "signTime", proucteSafeDTO.getStartTime()); + query.ge(StringUtils.isNotEmpty(proucteSafeDTO.getBeginTime()), "signTime", proucteSafeDTO.getBeginTime()); query.le(StringUtils.isNotEmpty(proucteSafeDTO.getEndTime()), "signTime", proucteSafeDTO.getEndTime()); query.orderBy("createTime", false); return query; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/ProucteSafeDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/ProucteSafeDTO.java index 85d4aa7..5f12cc9 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/ProucteSafeDTO.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/ProucteSafeDTO.java @@ -16,7 +16,7 @@ /** * 签署开始日期 */ - private String startTime; + private String beginTime; /** * 签署结束日期 */ diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java index 1f03dfe..acbba59 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppProductSafeServiceImpl.java @@ -135,7 +135,7 @@ query.like(StringUtils.isNotEmpty(proucteSafeDTO.getSignName()), "signName", proucteSafeDTO.getSignName()); query.eq(StringUtils.isNotEmpty(proucteSafeDTO.getProjectId()), "projectId", proucteSafeDTO.getProjectId()); //时间处理 - query.ge(StringUtils.isNotEmpty(proucteSafeDTO.getStartTime()), "signTime", proucteSafeDTO.getStartTime()); + query.ge(StringUtils.isNotEmpty(proucteSafeDTO.getBeginTime()), "signTime", proucteSafeDTO.getBeginTime()); query.le(StringUtils.isNotEmpty(proucteSafeDTO.getEndTime()), "signTime", proucteSafeDTO.getEndTime()); query.orderBy("createTime", false); return query; diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index c8b5ad9..4968887 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -5,7 +5,7 @@ ################### spring配置 ################### spring: datasource: - url: jdbc:mysql://139.198.18.188:3306/product_device_cs?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://139.198.18.188:3306/product_device?autoReconnect=true&useUnicode=true&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&characterEncoding=GB2312 username: brroot password: brroot#203 initial-size: 2