From 168c5450e3493852059da54d698d08c2269b91fc Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 十月 2024 17:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 5
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 10 +
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java | 2
h5_meeting/utils/config.js | 5
h5_meeting/utils/service.js | 13 +-
server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 72 +++-----------
server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java | 9 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 12 +-
h5_meeting/pages/index/index.vue | 21 +++-
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBooksCloudController.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarsServiceImpl.java | 9 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java | 44 +++-----
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 48 +++++++--
server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 17 ++
server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java | 6 +
h5_meeting/pages/index/config.vue | 7 +
21 files changed, 157 insertions(+), 134 deletions(-)
diff --git a/h5_meeting/pages/index/config.vue b/h5_meeting/pages/index/config.vue
index 58301ed..4765cd6 100644
--- a/h5_meeting/pages/index/config.vue
+++ b/h5_meeting/pages/index/config.vue
@@ -28,17 +28,20 @@
</template>
<script>
+ import { baseUrl } from '@/utils/config.js'
export default {
data() {
return {
param: {
- baseUrl: 'http://192.168.5.13/gateway_interface/'
+ baseUrl,
+ time: 60
}
};
},
onLoad(){
const param = uni.getStorageSync('param') || {
- baseUrl: 'http://192.168.5.13/gateway_interface/'
+ baseUrl: baseUrl,
+ time: 60
}
this.param = { ...param }
},
diff --git a/h5_meeting/pages/index/index.vue b/h5_meeting/pages/index/index.vue
index 6f01181..fded8ae 100644
--- a/h5_meeting/pages/index/index.vue
+++ b/h5_meeting/pages/index/index.vue
@@ -98,20 +98,24 @@
4: '鍗冲皢寮�濮�',
5: '宸叉挙閿�',
},
- meetingInfo: {}
+ meetingInfo: {},
+ timer: null
}
},
onShow() {
this.initDatetime()
- this.param = uni.getStorageSync('param') || {}
if (!this.param.code) {
return uni.navigateTo({
url: '/pages/index/config'
})
}
- this.getData()
},
- onReady() {},
+ onReady() {},
+ onHide(){
+ if(this.timer){
+ clearInterval(this.timer)
+ }
+ },
methods: {
getData() {
this.showQrbg = false
@@ -173,8 +177,13 @@
this.timer = setInterval(() => {
this.time = dayjs().format('HH:mm')
this.date = dayjs().format('YYYY-MM-DD') + ' ' + weeks[new Date().getDay()]
- }, 1000)
- setInterval(() => {
+ }, 1000)
+ this.param = uni.getStorageSync('param') || {}
+ if(this.timer){
+ clearInterval(this.timer)
+ }
+ this.getData()
+ this.timer = setInterval(() => {
this.getData()
}, this.param.time ? this.param.time * 1000 : 60 * 1000)
}
diff --git a/h5_meeting/utils/config.js b/h5_meeting/utils/config.js
index dfeed15..dda51c1 100644
--- a/h5_meeting/utils/config.js
+++ b/h5_meeting/utils/config.js
@@ -1,6 +1,7 @@
-export const baseUrl = 'gateway_interface/'
-// export const baseUrl = 'http://192.168.5.13/gateway_interface/'
+// export const baseUrl = 'gateway_interface/'
+export const baseUrl = 'http://192.168.5.13/gateway_interface/'
+// export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
export const statusMap = {
0: '寰呯‘璁�',
diff --git a/h5_meeting/utils/service.js b/h5_meeting/utils/service.js
index 6d8ff54..2001939 100644
--- a/h5_meeting/utils/service.js
+++ b/h5_meeting/utils/service.js
@@ -8,13 +8,14 @@
// uni.showLoading({
// title:"鍔犺浇涓�..."
// })
- uni.showLoading({
- title: '鍔犺浇涓�',
- mask: true
- })
+ // uni.showLoading({
+ // title: '鍔犺浇涓�',
+ // mask: true
+ // })
const param = uni.getStorageSync('param') || {}
uni.request({
url: (param.baseUrl || baseUrl) + options.url,
+ // url: baseUrl + options.url,
data: options.data || {},
method: options.method || 'GET',
header: options.header || {
@@ -25,7 +26,7 @@
success: (res) => {
let data = res.data
// 鎺у埗鍙版樉绀烘暟鎹俊鎭�
- uni.hideLoading()
+ // uni.hideLoading()
// 鐧诲綍杩囨湡
if (data.code === 5112) {
setTimeout(() => {
@@ -63,7 +64,7 @@
console.log('msg', baseUrl + options.url)
// 杩斿洖閿欒娑堟伅
reject(err)
- uni.hideLoading()
+ // uni.hideLoading()
},
catch: (e) => {
console.log(e)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java
index 045ba54..124eb08 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java
@@ -151,7 +151,6 @@
@PostMapping("/exportUserStatistics")
@CloudRequiredPermission("business:bookings:exportExcel")
public void exportUserStatistics (@RequestBody PageWrap<UserStatisticsDTO> pageWrap,HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
-
List<UserStatisticsVo> records = bookingsService.getUserStatistics(pageWrap).getRecords();
if (!CollectionUtils.isEmpty(records)){
JSONArray o = (JSONArray) JSON.toJSON(records);
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
index 63b6a70..882d368 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
@@ -112,9 +112,6 @@
}
-
-
-
@ApiOperation("鏌ヨ鎵�鏈夌郴缁熺敤鎴�")
@PostMapping("/findAllList")
@CloudRequiredPermission("system:user:query")
@@ -122,6 +119,12 @@
return ApiResponse.success(systemUserService.findAllList(pageWrap));
}
+ @ApiOperation("鏌ヨ鎵�鏈夊唴閮ㄤ汉鍛樼敤鎴�")
+ @PostMapping("/findInternalList")
+ @CloudRequiredPermission("system:user:query")
+ public ApiResponse<List<SystemUser>> findInternalList () {
+ return ApiResponse.success(systemUserService.findInternalList());
+ }
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 47129e4..275254c 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -240,6 +240,7 @@
return null;
}
+
/**
* 鍒ゆ柇鏄惁涓烘湁鏁堣溅鐗屽彿
*/
@@ -604,8 +605,8 @@
}
public static void main(String[] args) {
- System.out.println(Constants.carCodeTuominStr("鐨朅10991"));
- System.out.println(Constants.carCodeTuominStr("鐨朅A10991"));
+ System.out.println(Constants.checkCarNo("鐨朅10991"));
+ System.out.println(Constants.checkCarNo("鐨朅A10991"));
// System.out.println(Constants.getVehiclePlateNo("婀楤140D17").getDescription());
// System.out.println(Constants.getVehiclePlateNo("瀹緼P0637").getDescription());
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java
index 37d9ee7..2fe3b3c 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemUserService.java
@@ -83,6 +83,12 @@
List<SystemUser> findAllList(SystemUser pageWrap);
/**
+ * 鏌ヨ鎵�鏈夊唴閮ㄤ汉鍛樺垪琛�
+ * @return
+ */
+ List<SystemUser> findInternalList();
+
+ /**
* 鏉′欢缁熻
* @author Eva.Caesar Liu
* @date 2023/03/21 14:49
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
index fab1e36..c71f2ca 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
@@ -168,7 +168,7 @@
queryWrapper.eq(Notices::getUserId, noticesDTO.getMemberId());
queryWrapper.eq(Notices::getSendacopy,Constants.ONE);
if(Objects.nonNull(noticesDTO.getNoRead())&&Constants.equalsInteger(noticesDTO.getNoRead(),Constants.ONE)){
- queryWrapper.eq(Notices::getReaded,Constants.ONE);
+ queryWrapper.eq(Notices::getReaded,Constants.ZERO);
}
}else{
queryWrapper.eq("1","2");
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 31d410b..347f4d2 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
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.model.Company;
import com.doumee.dao.system.SystemUserJoinMapper;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.QuerySystemUserDTO;
@@ -206,8 +207,6 @@
@Override
public List<SystemUser> findAllList(SystemUser pageWrap) {
-
-
MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap);
queryWrapper.selectAll(SystemUser.class);
@@ -217,9 +216,7 @@
.or().like(SystemUser::getRealname,pageWrap.getUsername())
);
queryWrapper.orderByDesc(SystemUser::getCreateTime);
-
List<SystemUser> result = systemUserJoinMapper.selectJoinList( SystemUser.class, queryWrapper);
-
return result;
}
@@ -227,5 +224,17 @@
+ @Override
+ public List<SystemUser> findInternalList() {
+ MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(SystemUser.class);
+ queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO);
+ queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
+ queryWrapper.eq(Company::getType,Constants.ONE);
+ queryWrapper.orderByDesc(SystemUser::getCreateTime);
+ List<SystemUser> result = systemUserJoinMapper.selectJoinList( SystemUser.class, queryWrapper);
+ return result;
+ }
+
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBooksCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBooksCloudController.java
index cea4426..f619326 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBooksCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformBooksCloudController.java
@@ -37,6 +37,7 @@
@Autowired
private PlatformBooksService platformBooksService;
+
@Autowired
private PlatformReasonService platformReasonService;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
index 35013a6..2678112 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformJobCloudController.java
@@ -72,8 +72,6 @@
return ApiResponse.success(platformJobService.findPage(pageWrap));
}
-
-
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:platformjob:exportExcel")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index 9319c44..cb286bd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
@@ -25,210 +25,171 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
- private Date editDate;
+ private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)", example = "1")
- @ExcelColumn(name="鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)")
private Integer companyId;
@ApiModelProperty(value = "浜鸿劯鐓х墖")
- @ExcelColumn(name="浜鸿劯鐓х墖")
private String faceImg;
@ApiModelProperty(value = "浜鸿劯瀛樺偍鏈嶅姟鍣ㄦ爣璇嗭紙娴峰悍锛�")
- @ExcelColumn(name="浜鸿劯瀛樺偍鏈嶅姟鍣ㄦ爣璇嗭紙娴峰悍锛�")
private String faceServerIndexCode;
@ApiModelProperty(value = "浜鸿劯缂栫爜锛堟捣搴凤級")
- @ExcelColumn(name="浜鸿劯缂栫爜锛堟捣搴凤級")
private String faceId;
@ApiModelProperty(value = "浜鸿劯鍚屾鐘舵�侊紙娴峰悍锛� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶅悎鏍�")
- @ExcelColumn(name="浜鸿劯鍚屾鐘舵�侊紙娴峰悍锛� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶅悎鏍�")
private Integer faceStatus;
@ApiModelProperty(value = "浜鸿劯鍚屾淇℃伅锛堟捣搴凤級")
- @ExcelColumn(name="浜鸿劯鍚屾淇℃伅锛堟捣搴凤級")
private String faceInfo;
@ApiModelProperty(value = "鍋ュ悍鐮�")
- @ExcelColumn(name="鍋ュ悍鐮�")
private String imgurl;
@ApiModelProperty(value = "绫诲瀷 0鍙告満浜哄憳 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
- @ExcelColumn(name="绫诲瀷 0鍙告満浜哄憳 1鏅�氳瀹� 2鍐呴儴浜哄憳")
private Integer type;
@ApiModelProperty(value = "璁垮鍚嶇О/鍐呴儴浜哄憳")
- @ExcelColumn(name="璁垮鍚嶇О")
+ @ExcelColumn(name="濮撳悕",index = 0,width = 12)
private String name;
@ApiModelProperty(value = "璁垮骞撮緞")
- @ExcelColumn(name="璁垮骞撮緞")
private Date birthday;
@ApiModelProperty(value = "鎵嬫満鍙�")
- @ExcelColumn(name="鎵嬫満鍙�")
+ @ExcelColumn(name="鎵嬫満鍙�",index = 1,width = 12)
private String phone;
@ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
- @ExcelColumn(name="韬唤璇佸彿锛圡D4鍔犲瘑锛�")
private String idcardNo;
@ApiModelProperty(value = "淇敼鐨勮韩浠借瘉鍙� ")
@TableField(exist = false)
private String idcardNoNew;
@ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
- @ExcelColumn(name="璇佷欢鏄剧ず淇℃伅")
+ @ExcelColumn(name="韬唤璇佸彿",index = 2,width = 8)
private String idcardDecode;
@ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収", example = "1")
- @ExcelColumn(name="璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収")
private Integer idcardType;
@ApiModelProperty(value = "鏄惁鏄墿娴佸徃鏈� 0涓嶆槸 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鏄墿娴佸徃鏈� 0涓嶆槸 1鏄�")
private Integer isDriver;
@ApiModelProperty(value = "宸ュ彿")
- @ExcelColumn(name="宸ュ彿")
+ @ExcelColumn(name="宸ュ彿",index = 13,width = 12)
private String code;
@ApiModelProperty(value = "鐝 0鐧界彮 1澶滅彮")
- @ExcelColumn(name="鐝 0鐧界彮 1澶滅彮")
private Integer classes;
@ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1绂佺敤 2鎷夐粦/鍐荤粨", example = "1")
- @ExcelColumn(name="鐘舵�� 0姝ｅ父 1绂佺敤 2鎷夐粦/鍐荤粨")
private Integer status;
@ApiModelProperty(value = "鎬у埆 1鐢� 2濂� ", example = "1")
- @ExcelColumn(name="鎬у埆 1鐢� 2濂�")
+ @ExcelColumn(name="鎬у埆",index = 3,width = 8,valueMapping = "1=鐢�;2=濂�;")
private Integer sex;
@ApiModelProperty(value = "娣诲姞浜虹紪鐮侊紙鑷叧鑱旓級", example = "1")
- @ExcelColumn(name="娣诲姞浜虹紪鐮侊紙鑷叧鑱旓級")
private Integer parentId;
@ApiModelProperty(value = "寰俊openid")
- @ExcelColumn(name="寰俊openid")
private String openid;
@ApiModelProperty(value = "椋炰功鏍囪瘑")
- @ExcelColumn(name="椋炰功鏍囪瘑")
private String fsId;
@ApiModelProperty(value = "椋炰功鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
- @ExcelColumn(name="椋炰功鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer fsStatus;
@ApiModelProperty(value = "椋炰功鏈�杩戝悓姝ユ椂闂�")
- @ExcelColumn(name="椋炰功鏈�杩戝悓姝ユ椂闂�")
private Date fsDate;
@ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
- @ExcelColumn(name="娴峰悍鏍囪瘑")
private String hkId;
@ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺 ", example = "1")
- @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺")
+ @ExcelColumn(name="娴峰悍鍚屾鐘舵��",index = 11,width = 12, valueMapping = "0=鏈悓姝�;1=宸插悓姝�;2=鍚屾澶辫触;3=涓嶇鍚堜笅鍙戞潯浠�;4=绛夊緟鍒犻櫎鏉冮檺")
private Integer hkStatus;
@ApiModelProperty(value = "娴峰悍鎺堟潈鐘舵�� 0鏈巿鏉� 1宸叉巿鏉� ", example = "1")
- @ExcelColumn(name="娴峰悍鎺堟潈鐘舵�� 0鏈巿鏉� 1宸叉巿鏉� ")
+ @ExcelColumn(name="娴峰悍鎺堟潈鐘舵��",index = 12,width = 12, valueMapping = "0=鏈巿鏉�;1=宸叉巿鏉�;")
private Integer authStatus;
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
private Date hkDate;
@ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 0鍦ㄨ亴 1绂昏亴", example = "1")
- @ExcelColumn(name="鍦ㄨ亴鐘舵�� 0鍦ㄨ亴 1绂昏亴")
+ @ExcelColumn(name="鍦ㄨ亴鐘舵��",index = 10,width = 12, valueMapping = "0=鍦ㄨ亴;1=绂昏亴;")
private Integer workStatus;
@ApiModelProperty(value = "鏄惁鍏氬憳 0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍏氬憳 0鍚� 1鏄�")
+ @ExcelColumn(name="鏄惁鍏氬憳",index = 6,width = 12,valueMapping = "1=鍚�;2=鏄�;")
private Integer isDangyuan;
@ApiModelProperty(value = "宀椾綅缂栫爜锛屽叧鑱攑ositionbiao", example = "1")
- @ExcelColumn(name="宀椾綅缂栫爜")
private Integer positionId;
@ApiModelProperty(value = "ERP鏍囪瘑", example = "1")
- @ExcelColumn(name="ERP鏍囪瘑")
private String erpId;
@ApiModelProperty(value = "ERP鍚屾鏃堕棿")
- @ExcelColumn(name="ERP鍚屾鏃堕棿")
private Date erpDate;
@ApiModelProperty(value = "鍏ヨ亴濡傛湡")
- @ExcelColumn(name="鍏ヨ亴濡傛湡")
@JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="鍏ヨ亴鏃ユ湡",index = 7,width = 12, dateFormat = "yyyy-MM-dd")
private Date jobDate;
@ApiModelProperty(value = "ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
- @ExcelColumn(name="ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer erpStatus;
@ApiModelProperty(value = "閽夐拤鏍囪瘑", example = "1")
- @ExcelColumn(name="閽夐拤鏍囪瘑")
private Integer ddId;
@ApiModelProperty(value = "閽夐拤鍚屾鏃堕棿")
- @ExcelColumn(name="閽夐拤鍚屾鏃堕棿")
private Date ddDate;
@ApiModelProperty(value = "閽夐拤P鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
- @ExcelColumn(name="閽夐拤P鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer ddStatus;
@ApiModelProperty(value = "鐧婚檰瀵嗙爜")
- @ExcelColumn(name="鐧婚檰瀵嗙爜")
private String passward;
@ApiModelProperty(value = "鏄惁鍙嫓璁夸汉 0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍙嫓璁夸汉 0鍚� 1鏄�")
+ @ExcelColumn(name="鏄惁鍙嫓璁夸汉",index = 8,width = 12, valueMapping = "0=鍚�;1=鏄�;")
private Integer canVisit;
@ApiModelProperty(value = "鏄惁楂樼骇瀹℃壒浜� 0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁楂樼骇瀹℃壒浜� 0鍚� 1鏄�")
private Integer highCheckor;
@ApiModelProperty(value = "闂ㄧ瑙掕壊缂栫爜锛堝叧鑱攄evice_role),澶氫釜鑻辨枃閫楀彿闅斿紑", example = "1")
- @ExcelColumn(name="闂ㄧ瑙掕壊缂栫爜 ")
private String roleId;
@ApiModelProperty(value = "闂ㄧ瑙掕壊鎺堟潈鏃堕棿")
- @ExcelColumn(name="闂ㄧ瑙掕壊鎺堟潈鏃堕棿")
private Date roleDate;
@ApiModelProperty(value = "ERP缁勭粐缂栫爜")
- @ExcelColumn(name="ERP缁勭粐缂栫爜")
private String erpOrgId;
@ApiModelProperty(value = "璁垮鍏徃鍚嶇О")
- @ExcelColumn(name="璁垮鍏徃鍚嶇О")
private String visitCompanyName;
@ApiModelProperty(value = "缁勭粐鍚嶇О")
+ @ExcelColumn(name="鎵�灞為儴闂�",index = 4,width = 12)
@TableField(exist = false)
private String companyName;
@ApiModelProperty(value = "鏈�鍚庢搷浣滀汉")
@TableField(exist = false)
private String editorName;
@ApiModelProperty(value = "缁勭粐绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐")
+ @ExcelColumn(name="閮ㄩ棬绫诲瀷",index = 9,width = 12, valueMapping = "0=鍔冲姟鍏徃;1=鍐呴儴缁勭粐;")
@TableField(exist = false)
private Integer companyType;
@@ -273,16 +234,13 @@
@TableField(exist = false)
private Integer visitTimes;
@ApiModelProperty(value = "鏈�鍚庤闂椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date lastVisitDate;
@ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熷紑濮�")
- @ExcelColumn(name="闂ㄧ鏈夋晥鏈熷紑濮�",index= 5,dateFormat = "yyyy-MM-dd")
private Date startTime;
@ApiModelProperty(value = "缂栫爜闆嗗悎")
@TableField(exist = false)
private List<Integer> idList;
@ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熺粨鏉�", example = "1")
- @ExcelColumn(name="闂ㄧ鏈夋晥鏈熺粨鏉�",index= 6,dateFormat = "yyyy-MM-dd")
private Date endTime;
@ApiModelProperty(value = "浜鸿劯鐓х墖瀹屾暣鍦板潃")
@TableField(exist = false)
@@ -294,6 +252,7 @@
@TableField(exist = false)
private Integer headStatus;
@ApiModelProperty(value = "鎸佸崱鏁伴噺")
+ @ExcelColumn(name="鎸佸崱鏁伴噺",index = 14,width = 12)
@TableField(exist = false)
private int memberCardCount;
@@ -304,6 +263,7 @@
@TableField(exist = false)
private String optRemark;
@ApiModelProperty(value = "宀椾綅鍚嶇О")
+ @ExcelColumn(name="宀椾綅鍚嶇О",index = 5,width = 12)
@TableField(exist = false)
private String positionName;
@ApiModelProperty(value = "鍩硅寮�濮嬫椂闂�")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java
index 9b41bd6..fe584b5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java
@@ -26,109 +26,91 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
-
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
-
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "鍚嶇О")
- @ExcelColumn(name="鍚嶇О")
private String name;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "鐘舵�� 0寰呭鎵� 1瀹℃壒涓� 2瀹℃壒閫氳繃 3瀹℃壒涓嶉�氳繃 4宸插彇娑�", example = "1")
- @ExcelColumn(name="鐘舵�� 0寰呭鎵� 1瀹℃壒涓� 2瀹℃壒閫氳繃 3瀹℃壒涓嶉�氳繃")
+ @ExcelColumn(name="瀹℃壒鐘舵��",index = 9,width = 12,valueMapping = "0=寰呭鎵�;1=瀹℃壒涓�;2=瀹℃壒閫氳繃;3=瀹℃壒涓嶉�氳繃;4=宸插彇娑�;")
private Integer status;
@ApiModelProperty(value = "鍚堝悓鍙�")
- @ExcelColumn(name="鍚堝悓鍙�")
+ @ExcelColumn(name="鍚堝悓鍙�",index = 0,width = 12)
private String contractNum;
@ApiModelProperty(value = "棰勮鍒板満鏃堕棿")
- @ExcelColumn(name="棰勮鍒板満鏃堕棿")
+ @ExcelColumn(name="棰勮鍒板満鏃堕棿",index = 8,width = 12,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date arriveDate;
@ApiModelProperty(value = "鍏ュ簱绫诲瀷 0鏁存墭鐩� 1浠剁儫", example = "1")
- @ExcelColumn(name="鍏ュ簱绫诲瀷 0鏁存墭鐩� 1浠剁儫")
+ @ExcelColumn(name="鍏ュ簱绫诲瀷",index = 7,width = 12,valueMapping = "0=鏁存墭鐩�;1=浠剁儫;")
private Integer inType;
@ApiModelProperty(value = "鎬昏繍杈撻噺", example = "1")
- @ExcelColumn(name="鎬昏繍杈撻噺")
+ @ExcelColumn(name="鎬昏繍杈撻噺",index = 2,width = 12)
private BigDecimal totalNum;
@ApiModelProperty(value = "鍓嶈溅鐗屽彿")
- @ExcelColumn(name="鍓嶈溅鐗屽彿")
+ @ExcelColumn(name="鍓嶈溅鐗屽彿",index = 3,width = 12)
private String carCodeFront;
@ApiModelProperty(value = "鍚庤溅鐗屽彿")
- @ExcelColumn(name="鍚庤溅鐗屽彿")
+ @ExcelColumn(name="鍚庤溅鐗屽彿",index = 4,width = 12)
private String carCodeBack;
@ApiModelProperty(value = "鍙告満缂栫爜", example = "1")
- @ExcelColumn(name="鍙告満缂栫爜")
private Integer driverId;
@ApiModelProperty(value = "鍙告満濮撳悕")
- @ExcelColumn(name="鍙告満濮撳悕")
+ @ExcelColumn(name="鍙告満濮撳悕",index = 5,width = 12)
private String driverName;
@ApiModelProperty(value = "杞︾墝鍙�")
- @ExcelColumn(name="杞︾墝鍙�")
private String plateNum;
@ApiModelProperty(value = "鍙告満鎵嬫満鍙�")
- @ExcelColumn(name="鍙告満鎵嬫満鍙�")
+ @ExcelColumn(name="鍙告満鎵嬫満鍙�",index = 6,width = 12)
private String driverPhone;
@ApiModelProperty(value = "鍑嗚繍璇佺収鐗�")
- @ExcelColumn(name="鍑嗚繍璇佺収鐗�")
private String transportImg;
@ApiModelProperty(value = "鍏ュ洯鍘熷洜")
- @ExcelColumn(name="鍏ュ洯鍘熷洜")
+ @ExcelColumn(name="鍏ュ洯鍘熷洜",index = 1,width = 12)
private String inReason;
@ApiModelProperty(value = "鍏ュ洯鍘熷洜涓婚敭")
- @ExcelColumn(name="鍏ュ洯鍘熷洜涓婚敭")
private Integer reasonId;
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
- @ExcelColumn(name="鍙栨秷鏃堕棿")
private Date cancelTime;
@ApiModelProperty(value = "鍙栨秷浜�")
- @ExcelColumn(name="鍙栨秷浜�")
private Integer cancelUser;
@ApiModelProperty(value = "鍙栨秷澶囨敞")
- @ExcelColumn(name="鍙栨秷澶囨敞")
private String cancelInfo;
@ApiModelProperty(value = "鐢熸垚浠诲姟涓婚敭 platform_job:id")
- @ExcelColumn(name="鍏ュ洯鍘熷洜涓婚敭")
private Integer jobId;
@ApiModelProperty(value = "鏌ヨ鏃ユ湡 鐢ㄦ埛寰俊绔煡璇�")
@@ -148,9 +130,15 @@
private Date arriveDateEnd;
@ApiModelProperty(value = "瀹℃壒浜哄悕绉�")
+ @ExcelColumn(name="瀹℃壒浜哄悕绉�",index = 10,width = 12)
@TableField(exist = false)
private String auditName;
+ @ApiModelProperty(value = "瀹℃壒鏃堕棿")
+ @ExcelColumn(name="瀹℃壒鎻忚堪",index = 11,width = 12,valueMapping = "yyyy-MM-dd HH:mm:ss")
+ @TableField(exist = false)
+ private String auditTime;
+
@ApiModelProperty(value = "瀹℃壒淇℃伅鏁版嵁")
@TableField(exist = false)
private ApproveDataVO approveDateVO;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
index abd060e..0b870a8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
@@ -51,7 +51,7 @@
private String remark;
@ApiModelProperty(value = "鐘舵�� 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� 12鍙栨秷锛圵MS锛�" , example = "1")
- @ExcelColumn(name="鐘舵��",index = 8, valueMapping = "0:寰呯‘璁�;1:寰呯鍒�;2:绛夊緟鍙彿;3:鍏ュ洯绛夊緟;4:宸插彨鍙�;5:浣滀笟涓�;6:浣滀笟瀹屾垚;7:杞Щ涓�;8:寮傚父鎸傝捣;9:宸叉巿鏉冪鍥�;10:宸茬鍥�;11:宸茶繃鍙�;12:鍙栨秷锛圵MS锛�;")
+ @ExcelColumn(name="鐘舵��",index = 8, valueMapping = "0=寰呯‘璁�;1=寰呯鍒�;2=绛夊緟鍙彿;3=鍏ュ洯绛夊緟;4=宸插彨鍙�;5=浣滀笟涓�;6=浣滀笟瀹屾垚;7=杞Щ涓�;8=寮傚父鎸傝捣;9=宸叉巿鏉冪鍥�;10=宸茬鍥�;11=宸茶繃鍙�;12=鍙栨秷锛圵MS锛�;")
private Integer status;
@ApiModelProperty(value = "杞﹁締杩涘叆鐘舵�� 0涓嶅湪 1杩涘叆 " , example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
index 7146dfe..94f4024 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
@@ -244,7 +244,7 @@
// @ApiModelProperty(value = "鐝")
// private String memberClasses;
- @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
+ @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
@TableField(exist = false)
private Integer memberType;
@ApiModelProperty(value = "鍔冲姟璁垮鐢宠闅忚浜哄憳")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index 7d1f53c..7f493e7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -285,14 +285,16 @@
if(CollectionUtils.isNotEmpty(noticesList)){
//寰呮垜澶勭悊鐨勬暟鎹�
internalHomeVO.setNoticeWaitNum(
- noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
+ noticesList.stream().filter(i->
+ Constants.equalsInteger(i.getUserId(),memberId)
&&Constants.equalsInteger(i.getStatus(),Constants.ZERO)
&&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
).count()
);
//宸插鐞嗘暟鎹�
internalHomeVO.setNoticeDealNum(
- noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
+ noticesList.stream().filter(i->
+ Constants.equalsInteger(i.getUserId(),memberId)
&&StringUtils.equals(i.getParam4(),i.getUserId().toString())
&&Constants.equalsInteger(i.getStatus(),Constants.ONE)
&&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
@@ -303,9 +305,10 @@
noticesJoinMapper.selectCount(new QueryWrapper<Notices>().lambda().eq(Notices::getParam3,memberId))
);
//鎶勯�佹垜鐨勬暟鎹�
- internalHomeVO.setNoticeCopyNum(
+ internalHomeVO.setNoticeCopyNum(
noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
&&Constants.equalsInteger(i.getSendacopy(),Constants.ONE)
+ &&Constants.equalsInteger(i.getReaded(),Constants.ZERO)
).count()
);
}
@@ -563,7 +566,7 @@
approve.setTemplatId(approveTempl.getId());
approve.setChekorId(memberId);
approve.setStatus(i==0?Constants.ONE:Constants.ZERO);
- approve.setStatusInfo(i==0?"瀹℃壒涓�":"澶勭悊涓�");
+ approve.setStatusInfo(i==0?"瀹℃壒涓�":"寰呭鐞�");
approve.setTitle(StringUtils.isBlank(approveParam.getRemark())?"瀹℃壒涓�":approveParam.getRemark());
approve.setIsEndCheck((i+1) == approveParamList.size()?Constants.ONE:Constants.ZERO);
approve.setObjId(businessId);
@@ -921,7 +924,6 @@
}else{
waitModel.setStatus(level.getStatus());
waitModel.setType(Constants.ZERO);
- //waitModel.setStatusInfo(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
waitModel.setTitle(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
}
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 dc2a845..1301a8c 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
@@ -64,6 +64,7 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+
if(model.getMemberId()!=null){
//妫�鏌ヨ溅涓讳俊鎭�
Member member =memberMapper.selectOne(new QueryWrapper<Member>().lambda()
@@ -76,6 +77,10 @@
}
model.setMemberHkId(member.getHkId());
}
+ if(!Constants.checkCarNo(model.getCode())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇疯緭鍏ユ纭殑杞︾墝!");
+ };
+
//妫�鏌ヨ溅鐗屽彿鏄惁閲嶅
if(carsMapper.selectCount(new QueryWrapper<Cars>().lambda()
.eq(Cars::getCode,model.getCode() )
@@ -193,8 +198,10 @@
Cars car = carJoinMapper.selectById(model.getId());
if(car ==null ||Constants.equalsInteger(car.getIsdeleted(),Constants.ONE)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝杞﹁締淇℃伅涓嶅瓨鍦紒");
-
}
+ if(!Constants.checkCarNo(model.getCode())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇疯緭鍏ユ纭殑杞︾墝!");
+ };
if(model.getMemberId()!=null){
//妫�鏌ヨ溅涓讳俊鎭�
Member member =memberMapper.selectOne(new QueryWrapper<Member>().lambda()
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 541925d..b87cef9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -62,6 +62,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.*;
import java.util.stream.Collectors;
@@ -1744,7 +1745,7 @@
.eq(Member::getStatus,Constants.ZERO)
.eq(Member::getWorkStatus,Constants.ZERO)
.eq(Member::getCanVisit,Constants.ONE)
- .eq(Member::getType,Constants.memberType.internal)
+ .eq(Company::getType,Constants.ONE)
);
List<MemberVO> memberVOList = new ArrayList<>();
if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)) {
@@ -1853,7 +1854,7 @@
ExcelImporter ie = null;
List<MemberImport> dataList =null;
try {
- ie = new ExcelImporter(file,1,0);
+ ie = new ExcelImporter(file,2,0);
dataList = ie.getDataList(MemberImport.class,null);
} catch (Exception e) {
e.printStackTrace();
@@ -1938,6 +1939,11 @@
if (!PhoneUtil.isPhone(model.getPhone())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛屾墜鏈哄彿銆�"+model.getPhone()+"銆戞牸寮忎笉姝ｇ‘锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
}
+ if(model.getPhone().indexOf(".")>=Constants.ZERO){
+ model.setPhone(
+ String.valueOf(new BigDecimal(model.getPhone()).intValue())
+ );
+ }
if(StringUtils.isNotBlank(model.getIdcardNo())){
if ( !isDebug && !IdcardUtil.isValidCard(model.getIdcardNo())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+(index+3)+"琛岃韩浠借瘉鍙枫��"+model.getIdcardNo()+"銆戞牸寮忎笉姝ｇ‘锛岃妫�鏌ヨ〃鏍煎唴瀹癸紒");
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
index f4b6d33..a5a659b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
@@ -261,6 +261,9 @@
if(!Constants.equalsInteger(platformGroup.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"缁戝畾鏈堝彴缁勬暟鎹紓甯革紝璇疯仈绯荤鐞嗗憳");
}
+ if(!Constants.checkCarNo(platformBooksApplyDTO.getCarCodeFront())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇疯緭鍏ユ纭殑杞︾墝!");
+ };
//鏌ヨ杞﹁締鏄惁涓鸿嚜鏈夎溅
if(carsMapper.selectCount(new QueryWrapper<Cars>().lambda().eq(Cars::getIsdeleted,Constants.ZERO).eq(Cars::getCode,platformBooksApplyDTO.getCarCodeFront()))>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"["+platformBooksApplyDTO.getCarCodeFront()+"]灞炰簬鍐呴儴杞﹁締锛屾棤娉曢绾�");
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 6ed3d47..63e8713 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -131,6 +131,8 @@
private NoticesJoinMapper noticesJoinMapper;
@Autowired
private InoutDayCountMapper inoutDayCountMapper;
+ @Autowired
+ private CarEventMapper carEventMapper;
@Autowired
private SmsConfigMapper smsConfigMapper;
@@ -1596,23 +1598,48 @@
List<InterestedListVO> weekVisitList = new ArrayList<>();
List<InterestedListVO> weekCarList = new ArrayList<>();
List<InterestedListVO> lwList = new ArrayList<>();
+ //鏌ヨ涓冨ぉ鍓嶇殑璁垮璁板綍鏁伴噺
+ List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda().in(Visits::getStatus,
+ Constants.VisitStatus.signin,Constants.VisitStatus.signout)
+ .apply(" STARTTIME > CURDATE() - INTERVAL 7 DAY " )
+ );
+
+ List<CarEvent> carEventList = carEventMapper.selectList(new QueryWrapper<CarEvent>().lambda()
+ .in(CarEvent::getEventType,"771760131","771760130")
+ .apply(" STR_TO_DATE(happen_time, '%Y-%m-%dT%H:%i:%s') > CURDATE() - INTERVAL 7 DAY " )
+ );
for (String days:weekDays) {
- InoutDayCount inoutDayCount = inoutDayCountMapper.selectOne(new QueryWrapper<InoutDayCount>()
- .lambda()
- .apply(" DATE(TIME_INFO) = '"+days+"' ")
- .last(" limit 1 ")
- );
InterestedListVO visitVO = new InterestedListVO();
+ visitVO.setName(days);
+ if(CollectionUtils.isNotEmpty(visitsList)){
+ //澶勭悊璁垮浜哄憳鏁伴噺
+ List<Visits> daysList = visitsList.stream().filter(i->Objects.nonNull(i.getStarttime())&&DateUtil.dateToString(i.getStarttime(),"yyyy-MM-dd").equals(days)).collect(Collectors.toList());
+ List<String> memberIds = daysList.stream().map(i->i.getMemberId().toString()).collect(Collectors.toList());
+ if(CollectionUtils.isNotEmpty(memberIds)){
+ visitVO.setNum(new HashSet<String>(memberIds).size());
+ }
+ }
+ if(Objects.isNull(visitVO.getNum())){
+ visitVO.setNum(Constants.ZERO);
+ }
+
+
visitVO.setName(days);
InterestedListVO carVO = new InterestedListVO();
carVO.setName(days);
- if(Objects.isNull(inoutDayCount)){
+
+
+ if(CollectionUtils.isNotEmpty(carEventList)){
+ //澶勭悊璁垮浜哄憳鏁伴噺
+ List<CarEvent> daysList = carEventList.stream().filter(i->StringUtils.isNotBlank(i.getHappenTime()) && i.getHappenTime().substring(0,10).equals(days)).collect(Collectors.toList());
+ List<String> carCodeList = daysList.stream().map(i->i.getPlateNos()).collect(Collectors.toList());
+ if(CollectionUtils.isNotEmpty(carCodeList)){
+ carVO.setNum(new HashSet<String>(carCodeList).size());
+ }
+ }
+ if(Objects.isNull(carVO.getNum())){
visitVO.setNum(Constants.ZERO);
- carVO.setNum(Constants.ZERO);
- }else{
- visitVO.setNum(inoutDayCount.getInVisitorNum());
- carVO.setNum(inoutDayCount.getInCarNum());
}
weekVisitList.add(visitVO);
weekCarList.add(carVO);
@@ -1667,7 +1694,6 @@
queryWrapper.selectAll(Visits.class);
queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
queryWrapper.select("TIMESTAMPDIFF( MINUTE, NOW(), t.OUT_DATE) AS timeOut");
- queryWrapper.selectAs(Member::getType,Visits::getMemberType);
queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);
queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId);
--
Gitblit v1.9.3