From 0ffd4876dbd797eec552f1b76192d4201f3062c6 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 05 三月 2025 16:07:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java | 6 +++++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 5 ++---
admin/src/views/platform/LogisticsRecord/subscribe.vue | 2 +-
h5/pages/login/login.vue | 3 ++-
h5/pages/staff/vehicle/sendACarDetail.vue | 4 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 12 ++++++++++--
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/RetentionVo.java | 3 ++-
8 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/platform/LogisticsRecord/subscribe.vue b/admin/src/views/platform/LogisticsRecord/subscribe.vue
index 746db7f..e4de31b 100644
--- a/admin/src/views/platform/LogisticsRecord/subscribe.vue
+++ b/admin/src/views/platform/LogisticsRecord/subscribe.vue
@@ -16,7 +16,7 @@
<el-button :loading="exLoading" @click="handleEx"
v-permissions="['business:platformbooks:exportExcel']">瀵煎嚭</el-button>
</div>
- <el-table class="mb20" v-loading="loading" :data="list" stripe>
+ <el-table class="mb40" v-loading="loading" :data="list" stripe>
<el-table-column prop="contractNum" label="鍚堝悓鍗曞彿" min-width="100" show-overflow-tooltip />
<el-table-column prop="inReason" label="鍏ュ洯鍘熷洜" min-width="100" show-overflow-tooltip />
<el-table-column prop="totalNum" label="鎬讳綔涓氶噺(涓囨敮)" min-width="100" show-overflow-tooltip />
diff --git a/h5/pages/login/login.vue b/h5/pages/login/login.vue
index cac61df..d198595 100644
--- a/h5/pages/login/login.vue
+++ b/h5/pages/login/login.vue
@@ -52,7 +52,8 @@
yw: option.yw,
ywid: option.ywid
})
- }
+ }
+ // https://atwl.ahzyssl.com/zhyq_h5/#/pages/login/login?type=2&yw=5&ywid=b3db2072-a453-470d-8c0d-ba3b8b256530
},
onShow() {
var that = this
diff --git a/h5/pages/staff/vehicle/sendACarDetail.vue b/h5/pages/staff/vehicle/sendACarDetail.vue
index 27ba6b9..10bc94a 100644
--- a/h5/pages/staff/vehicle/sendACarDetail.vue
+++ b/h5/pages/staff/vehicle/sendACarDetail.vue
@@ -91,7 +91,7 @@
</view>
<view class="emyty"></view>
<view class="main_footer" v-if="
- info.approveDateVO != null &&
+ info.approveDateVO &&
info.approveDateVO.canBeApproved != null &&
info.approveDateVO.canBeApproved == 1
">
@@ -101,7 +101,7 @@
</template>
</view>
<template v-else>
- <view v-if="(info.approveDateVO.canBeApproved == 1 || userInfo.memberId == info.memberId) && info.status == 0"
+ <view v-if="info.approveDateVO && (info.approveDateVO.canBeApproved == 1 || userInfo.memberId == info.memberId) && info.status == 0"
class="main_footer" @click="isShowBack = true">
<view class="agree btn">鎾ゅ洖鐢ㄨ溅</view>
</view>
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
index 6ef1553..ee40a24 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
@@ -54,8 +54,12 @@
private String imgurl;
@ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐 3杞﹁締淇℃伅")
- @ExcelColumn(name="浜哄憳绫诲瀷" ,index = 5, valueMapping="0=鍔冲姟璁垮;1=鏅�氳瀹�;2=鍐呴儴鍛樺伐;3=杞﹁締淇℃伅;",width = 8)
+// @ExcelColumn(name="浜哄憳绫诲瀷" ,index = 5, valueMapping="0=鍔冲姟璁垮;1=鏅�氳瀹�;2=鍐呴儴鍛樺伐;3=杞﹁締淇℃伅;",width = 8)
private Integer type;
+ @ApiModelProperty(value = " 绫诲瀷 0鐩稿叧鏂圭粍缁� 1鍐呴儴浜哄憳 2璁垮")
+ @TableField(exist = false)
+ @ExcelColumn(name="浜哄憳绫诲瀷" ,index = 5, valueMapping="0=鍔冲姟璁垮;1=鏅�氳瀹�;2=鍐呴儴鍛樺伐;3=杞﹁締淇℃伅;",width = 8)
+ private String typeName;
@ApiModelProperty(value = "璁垮鍚嶇О")
@ExcelColumn(name="濮撳悕" ,index = 1,width = 6)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/RetentionVo.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/RetentionVo.java
index f2823e1..c77bfc2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/RetentionVo.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/RetentionVo.java
@@ -18,7 +18,8 @@
@TableField(exist = false)
public String companyName;
- @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴鍛樺伐")
+
+ @ApiModelProperty(value = "绫诲瀷 0鐩稿叧鏂圭粍缁� 1鍐呴儴浜哄憳 2璁垮")
@ExcelColumn(name="绫诲瀷")
private String typeName;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 6cafaea..5f7d60e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -438,7 +438,7 @@
//鍙兘鐪嬭嚜宸�
queryWrapper.and(w->{
w.eq(HiddenDanger::getCreator,userInfo.getId()).or().
- eq(HiddenDanger::getCheckUserId,userInfo.getId());
+ eq(HiddenDanger::getCheckUserId,userInfo.getMemberId());
});
}else{
queryWrapper.in("t1.company_id" ,userInfo.getCompanyIdList());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
index a7b6d61..855db4f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -202,6 +202,14 @@
List<SystemDictData> list = systemDictDataMapper.list(codes);
Map<String,SystemDictData> dataMap = list.stream().collect(Collectors.toMap(SystemDictData::getLabel, Function.identity()));
retentionIPage.getRecords().stream().forEach(obj->{
+ obj.setTypeName(Constants.Status.COMPANY_TYPE_FK.getDes());
+ if(null != obj.getCompanyType()) {
+ if(Constants.ZERO == obj.getCompanyType()){
+ obj.setTypeName(Constants.Status.COMPANY_TYPE_REL.getDes());
+ }else if(Constants.ONE == obj.getCompanyType()) {
+ obj.setTypeName(Constants.Status.COMPANY_TYPE_INTERNAL.getDes());
+ }
+ }
if(StringUtils.isNotBlank(obj.getFaceImg())){
obj.setFaceImgFull(dataMap.get(Constants.FTP_RESOURCE_PATH).getCode()
+dataMap.get(Constants.MEMBER_IMG).getCode()
@@ -267,7 +275,7 @@
RetentionVo vo = new RetentionVo();
vo.setCompanyName(obj.getCompanyName());
vo.setTypeName(Constants.Status.COMPANY_TYPE_FK.getDes());
- if(null != obj.getType()) {
+ if(null != obj.getCompanyType()) {
if(Constants.ZERO == obj.getCompanyType()){
vo.setTypeName(Constants.Status.COMPANY_TYPE_REL.getDes());
}else if(Constants.ONE == obj.getCompanyType()) {
@@ -285,7 +293,7 @@
return retentionVoList;
}
- private IPage<Retention> getDataInfo(PageWrap<Retention> pageWrap) {
+ private IPage<Retention> getDataInfo(PageWrap<Retention> pageWrap) {
//鏄惁鏄暟瀛�
// boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
// //鏄惁鍖呭惈涓枃
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
index b04182f..42d7399 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
@@ -279,7 +279,7 @@
platformWmsJobMapper.insert(job);
jobList.add(model);
}
- jobIdList.add(job.getId());
+ jobIdList.add(job.getJobId());
if(param.getDetails()!=null && param.getDetails().size()>0){
for(WmsInboundDetailRequest d :param.getDetails()){
PlatformWmsDetail entity = new PlatformWmsDetail();
@@ -497,7 +497,7 @@
job.setDriverName(param.getDriverName());
platformWmsJobMapper.insert(job);
}
- jobIdList.add(job.getId());
+ jobIdList.add(job.getJobId());
if(param.getDetails()!=null && param.getDetails().size()>0){
for(WmsOutboundDetailRequest d :param.getDetails()){
PlatformWmsDetail entity = new PlatformWmsDetail();
@@ -724,7 +724,6 @@
for(PlatformWmsDetail d :details){
num = num.add(Constants.formatBigdecimal(d.getIoQty()));
}
-
}
platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda()
.set(PlatformJob::getTotalNum,num)
--
Gitblit v1.9.3