From c9ef2687d3460da668d08d58dee6af468ed6693e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 十一月 2024 11:48:34 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_timer/src/main/resources/bootstrap-dev.yml | 2
server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java | 9 +-
server/visits/admin_timer/src/main/java/com/doumee/api/DatabaseController.java | 130 ++++++++++++++++++++++++++++++++
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml | 2
server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java | 3
server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 4
admin/src/components/business/OperaMemberWindow.vue | 4
server/system_gateway/src/main/resources/bootstrap-dev.yml | 2
admin/src/views/vehicle/cars.vue | 16 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 1
admin/public/template/cars.xlsx | 0
admin/src/views/business/relativeMember.vue | 4
server/system_gateway/src/main/resources/application-dev.yml | 12 +-
server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 4
admin/.env.development | 2
admin/src/views/business/internalMember.vue | 4
admin/src/components/business/OperaCarsWindow.vue | 4
19 files changed, 170 insertions(+), 37 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 445ce04..6a875ee 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -4,5 +4,5 @@
VUE_APP_API_URL = 'http://localhost:10010'
# VUE_APP_API_URL = 'http://192.168.0.103:10010'
# VUE_APP_API_URL = 'http://192.168.0.173/gateway_interface'
-VUE_APP_API_URL = 'http://10.50.250.253:8088/gateway_interface'
+# VUE_APP_API_URL = 'http://10.50.250.253:8088/gateway_interface'
diff --git a/admin/public/template/cars.xlsx b/admin/public/template/cars.xlsx
new file mode 100644
index 0000000..e82a64b
--- /dev/null
+++ b/admin/public/template/cars.xlsx
Binary files differ
diff --git a/admin/src/components/business/OperaCarsWindow.vue b/admin/src/components/business/OperaCarsWindow.vue
index c9fab94..439e693 100644
--- a/admin/src/components/business/OperaCarsWindow.vue
+++ b/admin/src/components/business/OperaCarsWindow.vue
@@ -5,7 +5,7 @@
<el-form-item label="杞︾墝鍙�" prop="code">
<el-input v-model="form.code" placeholder="璇疯緭鍏ヨ溅鐗屽彿" v-trim />
</el-form-item>
- <el-form-item label="涓氬姟绫诲瀷" prop="type">
+ <el-form-item label="澶囨敞" prop="type">
<el-radio-group v-model="form.type">
<el-radio :label="0">瀹夋嘲鍏姟杞�</el-radio>
<el-radio :label="1">瀹夋嘲鐗╂祦杞�</el-radio>
@@ -67,7 +67,7 @@
code: [{ required: true, message: '璇疯緭鍏ヨ溅鐗屽彿' }],
groupId: [{ required: true, message: '璇烽�夋嫨缁勭粐' }],
type: [
- { required: true, message: '璇烽�夋嫨涓氬姟绫诲瀷' }
+ { required: true, message: '璇烽�夋嫨澶囨敞' }
]
}
}
diff --git a/admin/src/components/business/OperaMemberWindow.vue b/admin/src/components/business/OperaMemberWindow.vue
index e371f39..ff2e2f6 100644
--- a/admin/src/components/business/OperaMemberWindow.vue
+++ b/admin/src/components/business/OperaMemberWindow.vue
@@ -37,12 +37,12 @@
<el-date-picker v-model="form.jobDate" value-format="yyyy-MM-dd" type="date">
</el-date-picker>
</el-form-item>
- <el-form-item label="鏄惁鍏氬憳" prop="isDangyuan">
+<!-- <el-form-item label="鏄惁鍏氬憳" prop="isDangyuan">
<el-radio-group v-model="form.isDangyuan">
<el-radio :label="0">闈炲厷鍛�</el-radio>
<el-radio :label="1">鍏氬憳</el-radio>
</el-radio-group>
- </el-form-item>
+ </el-form-item>-->
<el-form-item label="浜鸿劯鐓х墖" prop="faceImgFull">
<div class="upload_wrap">
<UploadFaceImg :file="{ 'imgurlfull': form.faceImgFull, 'imgurl': form.faceImg }" :uploadData="uploadData"
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index 3360015..a5fd7e7 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -94,12 +94,12 @@
</el-table-column>
<el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
<el-table-column prop="positionName" label="宀椾綅" min-width="100px"></el-table-column>
- <el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
+<!-- <el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.isDangyuan ==1" style="color: green">鍏氬憳</span>
<span v-if="row.isDangyuan ==0">闈炲厷鍛�</span>
</template>
- </el-table-column>
+ </el-table-column>-->
<el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px"></el-table-column>
<!-- <el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index 676283c..92ed414 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.vue
@@ -105,12 +105,12 @@
</el-table-column>
<el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
<el-table-column prop="positionName" label="宀椾綅" min-width="100px"></el-table-column>
- <el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
+<!-- <el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.isDangyuan ==1 " style="color: green">鍏氬憳</span>
<span v-if="row.isDangyuan ==0">闈炲厷鍛�</span>
</template>
- </el-table-column>
+ </el-table-column>-->
<el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px"> </el-table-column>
<!-- <el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
diff --git a/admin/src/views/vehicle/cars.vue b/admin/src/views/vehicle/cars.vue
index 2a640c5..058289a 100644
--- a/admin/src/views/vehicle/cars.vue
+++ b/admin/src/views/vehicle/cars.vue
@@ -24,7 +24,7 @@
</el-select>
</el-form-item>
<el-form-item label="" prop="type" title="涓氬姟绫诲瀷">
- <el-select v-model="searchForm.type" @change="search" clearable placeholder="涓氬姟绫诲瀷">
+ <el-select v-model="searchForm.type" @change="search" clearable placeholder="澶囨敞">
<el-option label="瀹夋嘲鍏姟杞�" value="0"></el-option>
<el-option label="瀹夋嘲鑷湁鐗╂祦杞�" value="1"></el-option>
<el-option label="鍏朵粬" value="2"></el-option>
@@ -46,13 +46,6 @@
<el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="code" label="杞︾墝鍙�" min-width="100px"></el-table-column>
- <el-table-column label="涓氬姟绫诲瀷" min-width="120px">
- <template slot-scope="{row}">
- <span v-if="row.type == 0">瀹夋嘲鍏姟杞�</span>
- <span v-if="row.type == 1">瀹夋嘲鑷湁鐗╂祦杞�</span>
- <span v-if="row.type == 2">鍏朵粬</span>
- </template>
- </el-table-column>
<el-table-column prop="memberName" label="杞︿富濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="memberPhone" label="杞︿富鎵嬫満鍙�" min-width="100px"></el-table-column>
<el-table-column prop="cateName" label="杞﹁締鍒嗙被" min-width="160px"></el-table-column>
@@ -90,6 +83,13 @@
<div v-else>-</div>
</template>
</el-table-column>
+ <el-table-column label="澶囨敞" min-width="120px">
+ <template slot-scope="{row}">
+ <span v-if="row.type == 0">瀹夋嘲鍏姟杞�</span>
+ <span v-if="row.type == 1">瀹夋嘲鑷湁鐗╂祦杞�</span>
+ <span v-if="row.type == 2">鍏朵粬</span>
+ </template>
+ </el-table-column>
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="140px"></el-table-column>
<el-table-column
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
index b93e438..17a7177 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
@@ -15,7 +15,7 @@
password: nacos
config:
server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
- namespace: dmvisit
+ namespace: dmvisit_dev
# namespace: dev_renkang
username: nacos
password: nacos
diff --git a/server/system_gateway/src/main/resources/application-dev.yml b/server/system_gateway/src/main/resources/application-dev.yml
index 413edec..e702b3b 100644
--- a/server/system_gateway/src/main/resources/application-dev.yml
+++ b/server/system_gateway/src/main/resources/application-dev.yml
@@ -1,12 +1,12 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
-# url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
-# username: doumee
-# password: rtjgfEr@&0c0m
- url: jdbc:mysql://10.50.250.253:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
- username: root
- password: Atwl@2024
+ url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ username: doumee
+ password: rtjgfEr@&0c0m
+# url: jdbc:mysql://10.50.250.253:3306/antaiwuliu?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+# username: root
+# password: Atwl@2024
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
diff --git a/server/system_gateway/src/main/resources/bootstrap-dev.yml b/server/system_gateway/src/main/resources/bootstrap-dev.yml
index 5f046f3..cdd2340 100644
--- a/server/system_gateway/src/main/resources/bootstrap-dev.yml
+++ b/server/system_gateway/src/main/resources/bootstrap-dev.yml
@@ -7,7 +7,7 @@
discovery:
server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
- namespace: dmvisit
+ namespace: dmvisit_dev
username: nacos
password: nacos
gateway:
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index acd5a2b..bf8ef74 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -114,8 +114,8 @@
@Override
public SystemUser findOne(SystemUser systemUser) {
- Wrapper<SystemUser> wrapper = new QueryWrapper<>(systemUser);
- return systemUserMapper.selectOne(wrapper);
+ QueryWrapper<SystemUser> wrapper = new QueryWrapper<SystemUser>(systemUser);
+ return systemUserMapper.selectOne(wrapper.lambda().last("limit 1"));
}
@Override
diff --git a/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java b/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
index 090e834..33c91a4 100644
--- a/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
+++ b/server/system_timer/src/main/java/com/doumee/jobs/fegin/VisitServiceFegin.java
@@ -28,6 +28,9 @@
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵煡璇㈣澶囩姸鎬�")
@GetMapping("/timer/device/getAscDeviceStatus")
ApiResponse getAscDeviceStatus() ;
+ @ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃跺浠芥暟鎹簱")
+ @GetMapping("/timer/db/backupDatabase")
+ ApiResponse backupDatabase() ;
@ApiOperation("銆愯瀹㈢郴缁熴�戝畾鏃舵煡璇㈡湀鍙扮姸鎬�")
@GetMapping("/timer/platform/getPlatformStatus")
ApiResponse getPlatformStatus() ;
diff --git a/server/system_timer/src/main/resources/bootstrap-dev.yml b/server/system_timer/src/main/resources/bootstrap-dev.yml
index 289c4ea..93754ac 100644
--- a/server/system_timer/src/main/resources/bootstrap-dev.yml
+++ b/server/system_timer/src/main/resources/bootstrap-dev.yml
@@ -23,6 +23,6 @@
# data-id: com.doumee.meeting.admin
discovery:
server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
- namespace: dmvisit
+ namespace: dmvisit_dev
username: nacos
password: nacos
\ No newline at end of file
diff --git a/server/visits/admin_timer/src/main/java/com/doumee/api/DatabaseController.java b/server/visits/admin_timer/src/main/java/com/doumee/api/DatabaseController.java
new file mode 100644
index 0000000..8ee19de
--- /dev/null
+++ b/server/visits/admin_timer/src/main/java/com/doumee/api/DatabaseController.java
@@ -0,0 +1,130 @@
+package com.doumee.api;
+
+import com.doumee.core.model.ApiResponse;
+import com.doumee.core.utils.Date;
+import com.doumee.core.utils.DateUtil;
+import com.doumee.service.business.PlatformJobService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/30 15:33
+ */
+@Api(tags = "鏈堝彴浣滀笟瀹氭椂")
+@RestController
+@Slf4j
+@RequestMapping("/timer/db")
+public class DatabaseController extends BaseController {
+
+ @Autowired
+ private PlatformJobService platformJobService;
+
+
+ @ApiOperation("鏁版嵁搴撳浠斤紝淇濈暀鏈�杩�7涓浠絪ql")
+ @GetMapping("/backupDatabase")
+ public ApiResponse backupDatabase() {
+ try {
+ String timestamp = DateUtil.getNowLongTime();
+ String path = "/usr/local/jars/db/";
+ String backupPath = path + timestamp + ".sql";
+ // 浣跨敤mysqldump鍛戒护杩涜鏁版嵁搴撳浠�
+ Process process = Runtime.getRuntime().exec(new String[]{"mysqldump ", "-u", "root", "-p","Atwl@2024", "antaiwuliu", "-r", backupPath});
+ process.waitFor();
+
+ // 妫�鏌ュ浠芥槸鍚︽垚鍔�
+ if (new File(backupPath).exists()) {
+ log.info("鏁版嵁搴撳浠芥垚鍔�: " + backupPath);
+ return ApiResponse.success("鏁版嵁搴撳浠芥垚鍔�: " + backupPath);
+ } else {
+ log.error("鏁版嵁搴撳浠藉け璐�.");
+ }
+ deleteOldFiles(path,7);//淇濈暀鏈�杩�7涓枃浠�
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("鏁版嵁搴撳浠藉け璐�."+e.getMessage());
+ }
+ return ApiResponse.failed("鏁版嵁搴撳浠藉け璐�" );
+ }
+
+ /**
+ * @param path
+ */
+ public void deleteOldFiles(String path,int num) {
+ //鏂囦欢璺緞
+ List<File> list = getFileSort(path);
+ if(list==null || list.size() <= num){
+ return;
+ }
+ for (int i = 0; i <list.size(); i++) {
+ if(i>=7){
+ list.get(i).delete();
+ }
+ }
+ }
+
+ /**
+ * 鑾峰彇鐩綍涓嬫墍鏈夋枃浠�(鎸夋椂闂存帓搴�)
+ *
+ * @param path
+ * @return
+ */
+ public static List<File> getFileSort(String path) {
+
+ List<File> list = getFiles(path, new ArrayList<>());
+
+ if (list != null && list.size() > 0) {
+
+ Collections.sort(list, new Comparator<File>() {
+ public int compare(File file, File newFile) {
+ if (file.lastModified() < newFile.lastModified()) {
+ return 1;
+ } else if (file.lastModified() == newFile.lastModified()) {
+ return 0;
+ } else {
+ return -1;
+ }
+
+ }
+ });
+
+ }
+
+ return list;
+ }
+
+ /**
+ *
+ * 鑾峰彇鐩綍涓嬫墍鏈夋枃浠�
+ *
+ * @param realpath
+ * @param files
+ * @return
+ */
+ public static List<File> getFiles(String realpath, List<File> files) {
+ File realFile = new File(realpath);
+ if (realFile.isDirectory()) {
+ File[] subfiles = realFile.listFiles();
+ for (File file : subfiles) {
+ if (file.isDirectory()) {
+ getFiles(file.getAbsolutePath(), files);
+ } else {
+ files.add(file);
+ }
+ }
+ }
+ return files;
+ }
+
+}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
index 98722b9..22227be 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
@@ -161,16 +161,12 @@
Map<String, Object> context = new HashMap<>();
try {
if(ftp == null){
- log.error("鍒濆鍖朏tp涓婁紶鏂囦欢鎴愬姛=============寮�濮�========="+DateUtil.getPlusTime2(new Date()));
ftp = new FtpUtil(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_HOST).getCode(),
Integer.parseInt(systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PORT).getCode()),
systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_USERNAME).getCode(),
systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_PWD).getCode());
- log.error("鍒濆鍖朏tp涓婁紶鏂囦欢鎴愬姛=============缁撴潫========="+DateUtil.getPlusTime2(new Date()));
}else{
- log.error("閲嶈繛ftp涓婁紶鏂囦欢鎴愬姛=============寮�濮�========="+DateUtil.getPlusTime2(new Date()));
ftp.connect();
- log.error("閲嶈繛ftp涓婁紶鏂囦欢鎴愬姛=============缁撴潫========="+DateUtil.getPlusTime2(new Date()));
}
CommonsMultipartResolver multipartResovler = new CommonsMultipartResolver();
@@ -181,7 +177,10 @@
MultipartFile file = multipartRequest.getFile(it.next());
String originname = file.getOriginalFilename();
is = file.getInputStream();
- String endType = originname.substring(originname.lastIndexOf("."),originname.length());
+ String endType = ".jpg";
+ if(originname.indexOf(".")>0){
+ endType=originname.substring(originname.lastIndexOf("."),originname.length());
+ }
String date = DateUtil.getNowShortDate();
String fName = date+"/"+ UUID.randomUUID()+endType;
String fileName = folder+"/"+fName;
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
index 3e1b380..b12e766 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
@@ -24,7 +24,7 @@
discovery:
server-addr: http://175.27.187.84:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
- namespace: dmvisit
+ namespace: dmvisit_dev
username: nacos
password: nacos
# swagger閰嶇疆
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
index 2df12af..9dc10e9 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: pro
+ active: dev
application:
name: visitsAdmin
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
index 3751492..4730fa1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
@@ -99,7 +99,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鐧诲綍鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�!");
}
if(carUseBook.getEndTime().getTime()<=System.currentTimeMillis()){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"閫夋嫨鏃ユ湡寮傚父[缁撴潫鏃堕棿灏忎簬褰撳墠鏃堕棿],璇峰埛鏂伴噸璇�");
+// throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"閫夋嫨鏃ユ湡寮傚父[缁撴潫鏃堕棿灏忎簬褰撳墠鏃堕棿],璇峰埛鏂伴噸璇�");
}
if(!(DateUtil.getDateFromString(carUseBook.getPlanUseDate()+":00").getTime()>=carUseBook.getStartTime().getTime()
&& DateUtil.getDateFromString(carUseBook.getPlanUseDate() +":00").getTime()<= carUseBook.getEndTime().getTime())
@@ -412,7 +412,7 @@
}
//鍒ゆ柇鏃堕棿鏄惁澶т簬褰撳墠
if(Constants.equalsInteger(dateIntervalVO.getIsUse(),Constants.ZERO) && DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime()<=System.currentTimeMillis()){
- dateIntervalVO.setIsUse(Constants.ONE);
+// dateIntervalVO.setIsUse(Constants.ONE);
continue;
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
index fb49ccf..b7f1b1a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java
@@ -310,6 +310,7 @@
.or().like(Member::getPhone,pageWrap.getModel().getMemberName()));
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()),Company::getCompanyNamePath,pageWrap.getModel().getCompanyName());
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getMemberType()),Member::getType,pageWrap.getModel().getMemberType());
+ queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getCatePId()),Category::getParentId,pageWrap.getModel().getCatePId());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCode()),Cars::getCode,pageWrap.getModel().getCode());
queryWrapper.eq(Cars::getIsdeleted,Constants.ZERO);
queryWrapper.eq(pageWrap.getModel().getType()!=null,Cars::getType,pageWrap.getModel().getType());
--
Gitblit v1.9.3