From 15794ec534b23747b812f6e479ab53420be46fdf Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 21 十月 2024 18:00:30 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java | 4 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 3 ++-
admin/src/views/system/user.vue | 5 +++++
server/system_service/src/main/resources/mappers/SystemUserMapper.xml | 8 +++++++-
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 2 +-
5 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/system/user.vue b/admin/src/views/system/user.vue
index 9d0513e..73d74f4 100644
--- a/admin/src/views/system/user.vue
+++ b/admin/src/views/system/user.vue
@@ -11,6 +11,9 @@
<el-form-item label="鎵嬫満鍙风爜" prop="mobile">
<el-input v-model="searchForm.mobile" v-trim placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" @keypress.enter.native="search"/>
</el-form-item>
+ <el-form-item label="缁勭粐" prop="companyName">
+ <el-input v-model="searchForm.companyName" v-trim placeholder="璇疯緭鍏ョ粍缁�" @keypress.enter.native="search"/>
+ </el-form-item>
<!-- <el-form-item label="鎵�灞為儴闂�" prop="rootDeptId">-->
<!-- <DepartmentSelect v-model="searchForm.rootDeptId" placeholder="璇烽�夋嫨鎵�灞為儴闂�" clearable/>-->
<!-- </el-form-item>-->
@@ -45,6 +48,7 @@
<el-table-column prop="realname" label="濮撳悕" min-width="100px" fixed="left"></el-table-column>
<el-table-column prop="username" label="鐢ㄦ埛鍚�" min-width="120px"></el-table-column>
<el-table-column prop="empNo" label="宸ュ彿" sortable="custom" sort-by="EMP_NO" min-width="80px"></el-table-column>
+ <el-table-column prop="companyName" label="鎵�灞炵粍缁�" min-width="250px"></el-table-column>
<!-- <el-table-column prop="department" label="閮ㄩ棬" min-width="120px">-->
<!-- <template slot-scope="{row}">{{row.department == null ? '' : row.department.name}}</template>-->
<!-- </el-table-column>-->
@@ -129,6 +133,7 @@
realname: '', // 濮撳悕
rootDeptId: null, // 閮ㄩ棬ID
positionId: null, // 宀椾綅ID
+ companyName: null, // 浼佷笟鍚嶇О
mobile: '' // 鎵嬫満鍙风爜
}
}
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
index 1af5c61..5ca5eba 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -86,7 +86,7 @@
date = date.substring(0,i);
}
}
- //TimeZone tz = TimeZone.getTimeZone("GMT-01");
+ //TimeZone tz = TimeZone.getTimeZone("GMT-01");2024-10-21T10:40:04+08:00
DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
// DateFormat df = new SimpleDateFormat("2023-12-08 T 09:25:54.698+08:00");
df.setTimeZone(tz);
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java b/server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
index 1b6daf9..c3333cc 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/dto/QuerySystemUserDTO.java
@@ -35,9 +35,13 @@
@ApiModelProperty(value = "鎵嬫満鍙风爜")
private String mobile;
+ @ApiModelProperty(value = "浼佷笟鍚嶇О")
+ private String companyName;
@ApiModelProperty(value = "瑙掕壊ID")
private Integer roleId;
+ @ApiModelProperty(value = "浼佷笟缂栫爜")
+ private Integer companyId;
@ApiModelProperty(value = "鐢ㄦ埛鐘舵��")
private Integer status;
diff --git a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
index 62eb9c4..16a7154 100644
--- a/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/system_service/src/main/resources/mappers/SystemUserMapper.xml
@@ -27,7 +27,7 @@
sd.ID AS DEPARTMENT_ID, sd.`NAME` AS DEPARTMENT_NAME,usr.wechat_name,usr.status,usr.OPENID,usr.type,
create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME, create_user.`REALNAME` CREATE_REAL_NAME,
update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME, create_user.`REALNAME` UPDATE_REAL_NAME,
- sd.name as companyName
+ sd.company_name_path as companyName
FROM `SYSTEM_USER` usr
LEFT JOIN `SYSTEM_USER` create_user ON create_user.ID = usr.CREATE_USER
LEFT JOIN `SYSTEM_USER` update_user ON update_user.ID = usr.UPDATE_USER
@@ -60,12 +60,18 @@
<if test="dto.mobile != null and dto.mobile != ''">
AND usr.`MOBILE` LIKE CONCAT('%', #{dto.mobile}, '%')
</if>
+ <if test="dto.companyName != null and dto.companyName != ''">
+ AND sd.`company_name_path` LIKE CONCAT('%', #{dto.companyName}, '%')
+ </if>
<if test="dto.status != null ">
AND usr.`status` = #{dto.status}
</if>
<if test="dto.memberType != null ">
AND m.`type` = #{dto.memberType}
</if>
+ <if test="dto.companyId != null ">
+ AND usr.COMPANY_ID = #{dto.companyId}
+ </if>
<if test="dto.companyType != null ">
AND sd.`type` = #{dto.companyType}
</if>
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index ebad326..791cf51 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -519,7 +519,8 @@
private Retention getRetentionModelByVisitRequest(Visits visits, String happentTime,String srcType) {
Retention retention = new Retention();
retention.setIsdeleted(Constants.ZERO);
- retention.setCreateDate(DateUtil.getISO8601DateByStr(happentTime));
+ retention.setCreateDate(DateUtil.getISO8601DateByStr2(happentTime));
+ retention.setCreateDate(retention.getCreateDate() == null?new Date():retention.getCreateDate());
retention.setClasses(visits.getClasses());
retention.setCode(visits.getCode());
retention.setIdcardNo(visits.getIdcardNo());
--
Gitblit v1.9.3