From e13352d3329406a9b2e8e12b2077ee275aa4c280 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 07 三月 2024 09:55:37 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 2 -
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 57 ++++++++++++++++------------
admin/src/views/business/empower.vue | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 18 +++++++-
4 files changed, 48 insertions(+), 31 deletions(-)
diff --git a/admin/src/views/business/empower.vue b/admin/src/views/business/empower.vue
index f1c9acd..bf8eb75 100644
--- a/admin/src/views/business/empower.vue
+++ b/admin/src/views/business/empower.vue
@@ -86,7 +86,7 @@
</template>
</el-table-column>
<el-table-column prop="sendDate" label="涓嬪彂鏃堕棿" min-width="150px"></el-table-column>
- <el-table-column prop="sendInfo" label="涓嬪彂澶辫触鍘熷洜" min-width="150px"></el-table-column>
+ <el-table-column prop="sendInfo" label="涓嬪彂澶囨敞" min-width="150px"></el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index fc17cc3..10f24d9 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -79,8 +79,6 @@
String visitingRecords= "/api/visitor/v2/visiting/records";//鏌ヨ璁垮鏉ヨ璁板綍v2
String vehicleList= "/api/resource/v2/vehicle/advance/vehicleList";//鏌ヨ杞﹁締鍒楄〃v2
String vehicleTimeRangeList= "/api/resource/v1/vehicle/timeRange";//澧為噺鑾峰彇杞﹁締鏁版嵁
-
-
}
/**
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index 5bc3112..8f9722f 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -1012,13 +1012,18 @@
||StringUtils.isBlank(param.getUserId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ if(Objects.nonNull(param.getValidStartTime())&&Objects.nonNull(param.getValidEndTime())){
+ if(param.getValidStartTime().getTime()> param.getValidEndTime().getTime()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈夋晥鏈熸椂闂翠笉鍚堟硶锛�");
+ }
+ }
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1"));
if(Objects.isNull(member)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛淇℃伅涓嶅瓨鍦紒");
}
List<Integer> doorIds = getRoleIdByParam(param.getRoleIds(),member);
- if(StringUtils.isBlank(member.getRoleId())){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌闂ㄧ缁勬暟鎹�");
+ if(param.getRoleIds()!=null && param.getRoleIds().length>0 && StringUtils.isBlank(member.getRoleId())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鏈煡璇㈠埌鏈夋晥闂ㄧ缁勬暟鎹�");
}
//鏇存柊鎺堟潈鏈夋晥鏈�
Member update = new Member();
@@ -1029,7 +1034,14 @@
update.setRoleId(StringUtils.isNotBlank(member.getRoleId())?member.getRoleId():null);
update.setHkStatus(Constants.ZERO);//鍋氫竴閬嶆洿鏂伴�昏緫
update.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
- memberMapper.updateById(update);
+ memberMapper.update(null,new UpdateWrapper<Member>().lambda()
+ .eq(Member::getId,member.getId())
+ .set(Member::getRoleId,member.getRoleId())
+ .set(Member::getRemark,"寰呭悓姝ュ畨闃插钩鍙�")
+ .set(Member::getStartTime,param.getValidStartTime())
+ .set(Member::getEndTime,param.getValidEndTime())
+ .set(Member::getEditDate,new Date())
+ .set(Member::getHkStatus,Constants.ZERO ));
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
index 55c23bb..f889b33 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
@@ -75,36 +75,43 @@
//鏌ヨ涓嬪彂鐘舵��
BaseResponse<TaskPersonDetailListResponse> response = HKService.taskPersoDetail(param);
if(response!=null
- && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)
- && response.getData()!=null
- && response.getData().getList() != null
+ && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE) && response.getData()!=null
+ ){
+ if( response.getData().getList() != null
&& response.getData().getList().size()>0 ){
TaskPersonDetailResponse model = response.getData().getList().get(0);
if(model != null && StringUtils.equals(model.getPersondownloadResult(),"0")){
//鏇存柊宸插畬鎴愪笅杞戒换鍔�
- String remark = "";
- String cardInfo = "鍗＄墖涓嬪彂澶辫触";
- TaskPersonDetailCardFaceResponse d = model.getPersonDownloadDetail();
- if(d.getCards() !=null && d.getCards().size()>0){
- cardInfo = "鍗＄墖锛氥��" ;
- for(TaskPersonDetailCardInfoResponse card : d.getCards()){
- cardInfo +=card.getId()+" ";
+ String remark = "";
+ String cardInfo = "鍗＄墖涓嬪彂澶辫触";
+ TaskPersonDetailCardFaceResponse d = model.getPersonDownloadDetail();
+ if(d.getCards() !=null && d.getCards().size()>0){
+ cardInfo = "鍗＄墖锛氥��" ;
+ for(TaskPersonDetailCardInfoResponse card : d.getCards()){
+ cardInfo +=card.getId()+" ";
+ }
+ cardInfo += "銆戜笅鍙戞垚鍔�";
}
- cardInfo += "銆戜笅鍙戞垚鍔�";
- }
- if(d.getFaces() == null || d.getFaces().size() ==0){
- remark = cardInfo+"锛� 涓嶆敮鎸佷汉鑴歌澶囷紒";
- }else{
- remark = ""+cardInfo+"锛屼汉鑴镐笅鍙戞垚鍔燂紒";
+ if(d.getFaces() == null || d.getFaces().size() ==0){
+ remark = cardInfo+"锛� 涓嶆敮鎸佷汉鑴歌澶囷紒";
+ }else{
+ remark = ""+cardInfo+"锛屼汉鑴镐笅鍙戞垚鍔燂紒";
+ }
+ empowerMapper.update(null,new UpdateWrapper<Empower>()
+ .lambda()
+ .eq(Empower::getId,c.getId() )
+ .set(Empower::getRemark,remark )
+ .set(Empower::getSendInfo,remark )
+ .set(Empower::getSendStatus,Constants.EmpowerStatus.pass) );
}
- empowerMapper.update(null,new UpdateWrapper<Empower>()
- .lambda()
- .eq(Empower::getId,c.getId() )
- .set(Empower::getRemark,remark )
- .set(Empower::getSendInfo,remark )
- .set(Empower::getSendStatus,Constants.EmpowerStatus.pass) );
- }
-
+ }else{
+ empowerMapper.update(null,new UpdateWrapper<Empower>()
+ .lambda()
+ .eq(Empower::getId,c.getId() )
+ .set(Empower::getRemark,"涓嬪彂澶辫触" )
+ .set(Empower::getSendInfo,"涓嬪彂澶辫触" )
+ .set(Empower::getSendStatus,Constants.EmpowerStatus.fail) );
+ }
}
}
checkDelMemberTask();
@@ -249,8 +256,8 @@
empowerMapper.update(null,new UpdateWrapper<Empower>()
.lambda()
.eq(Empower::getHkId,c.getHkId() )
+ .set(Empower::getSendInfo,"浠诲姟宸蹭笅杞藉畬鎴�" )
.set(Empower::getSendStatus,Constants.EmpowerStatus.downloaded) );
-
}
}
}catch (Exception e){
--
Gitblit v1.9.3