From 4b427634d3daa65f2a79549f11587d40ea1ec1cb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 05 三月 2025 16:11:31 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/business/carEvent.vue | 4 ++--
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 3 ++-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProblemLogVo.java | 5 ++++-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/FinishAnswerDTO.java | 2 ++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java | 6 +++---
admin/src/views/business/problemLog.vue | 1 +
server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java | 3 ++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 8 ++++----
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java | 4 +++-
admin/src/views/operation/serviceCar/apprRecord.vue | 2 +-
10 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/admin/src/views/business/carEvent.vue b/admin/src/views/business/carEvent.vue
index 0b5cd5d..6e1515d 100644
--- a/admin/src/views/business/carEvent.vue
+++ b/admin/src/views/business/carEvent.vue
@@ -81,7 +81,7 @@
<span v-if="row.inoutType === 1">绂诲洯</span>
</template>
</el-table-column>
- <el-table-column label="杞︾墝鎶撴媿鍥�" min-width="100px">
+<!-- <el-table-column label="杞︾墝鎶撴媿鍥�" min-width="100px">
<template slot-scope="{ row }">
<div v-if="row.platePicUrl != null">
<el-image style="width: 80px; height: 80px" :src="row.platePicUrl" :preview-src-list="[row.platePicUrl]">
@@ -97,7 +97,7 @@
</el-image>
</div>
</template>
- </el-table-column>
+ </el-table-column>-->
<el-table-column prop="happenTime" label="浜嬩欢鏃堕棿" min-width="140px"></el-table-column>
</el-table>
<pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
diff --git a/admin/src/views/business/problemLog.vue b/admin/src/views/business/problemLog.vue
index 8466393..8517c93 100644
--- a/admin/src/views/business/problemLog.vue
+++ b/admin/src/views/business/problemLog.vue
@@ -40,6 +40,7 @@
<span v-if="row.type === 2">鍐呴儴浜哄憳</span>
</template>
</el-table-column>
+ <el-table-column prop="score" label="寰楀垎" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="绛旈鏃堕棿" min-width="100px"></el-table-column>
</el-table>
<pagination
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index 571b12b..bba2919 100644
--- a/admin/src/views/operation/serviceCar/apprRecord.vue
+++ b/admin/src/views/operation/serviceCar/apprRecord.vue
@@ -29,7 +29,7 @@
<el-option label="甯傚鐢ㄨ溅" value="1"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍑哄彂鏃堕棿" prop="startTime">
+ <el-form-item label="鐢宠鏃堕棿" prop="startTime">
<!-- <el-date-picker @change="seleTime" v-model="time" @keypress.enter.native="search" type="datetimerange"
format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']"
range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java
index 111510c..e8b044b 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java
@@ -39,7 +39,8 @@
@ApiModelProperty(value = "鍏宠仈浼氳瀹や富閿�", example = "1")
private Integer roomId;
-
+ @ApiModelProperty(value = "鏄惁鍙戦�佸弬浼氫汉閫氱煡锛�0=閫氱煡锛�1=涓嶉�氱煡")
+ private Integer joinNotice;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index c861c15..f353d3f 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -1578,7 +1578,8 @@
.replace("{鍙備細浜哄憳濮撳悕}",StringUtils.defaultString(i.getRealName(),""))
.replace("{浼氳涓婚}",StringUtils.defaultString(bookings.getName(),""))
.replace("{浼氳瀹ゅ悕绉皚",StringUtils.defaultString(bookings.getRoomName(),""))
- .replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,"")));
+ .replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,""))
+ .replace("{浼氳澶囨敞}",StringUtils.defaultString(smsEmail.getRemark(),"")));
smsEmailList.add(smsEmail);
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProblemLogVo.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProblemLogVo.java
index 43c66a0..eb19d8d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProblemLogVo.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProblemLogVo.java
@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.Date;
@Data
@@ -27,8 +28,10 @@
@ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
@ExcelColumn(name="绫诲瀷")
- @TableField(exist = false)
private String typeName;
+ @ApiModelProperty(value = "绛旈鍒嗘暟")
+ @ExcelColumn(name="绛旈鍒嗘暟")
+ private BigDecimal score;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/FinishAnswerDTO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/FinishAnswerDTO.java
index a63e42d..5917f69 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/FinishAnswerDTO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/reqeust/FinishAnswerDTO.java
@@ -30,5 +30,7 @@
@ApiModelProperty(value = "鐢ㄦ埛openId")
private String openId;
+ @ApiModelProperty(value = "绛旈鍒嗘暟")
+ private BigDecimal score;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index 056e600..4d521f8 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -336,14 +336,14 @@
.isNull(pageWrap.getModel().getJobType() != null && Constants.equalsInteger(Constants.ZERO,pageWrap.getModel().getJobType()), PlatformJob::getContractNum)
.exists(StringUtils.isNotBlank(pageWrap.getModel().getWmsContractNum()),
"select tt.id from platform_wms_detail tt where tt.isdeleted=0 and tt.contract_num='"+pageWrap.getModel().getWmsContractNum()+"' and tt.job_id=t.id");
-
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ queryWrapper.orderByDesc(PlatformJob::getCreateDate);
+ /*for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
} else {
queryWrapper.orderByAsc(sortData.getProperty());
}
- }
+ }*/
IPage<PlatformJob> platformJobIPage = platformJobJoinMapper.selectJoinPage(page,PlatformJob.class,queryWrapper);
platformJobIPage.getRecords().forEach(i->{
i.dealTime();
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
index 72a3998..1d2617e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
@@ -124,7 +124,8 @@
.selectAs(Member::getType,ProblemLog::getType)
.like(StringUtils.isNotBlank(pageWrap.getModel().getName()), ProblemLog::getName, pageWrap.getModel().getName())
.like(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), ProblemLog::getCompanyName, pageWrap.getModel().getCompanyName())
- .eq(Objects.nonNull(pageWrap.getModel().getType()), Member::getType, pageWrap.getModel().getType());
+ .eq(Objects.nonNull(pageWrap.getModel().getType()), Member::getType, pageWrap.getModel().getType())
+ .isNotNull(ProblemLog::getUserId);
queryWrapper.orderByDesc(ProblemLog::getCreateDate);
IPage<ProblemLog> problemLogIPage = problemLogJoinMapper.selectJoinPage(page, ProblemLog.class, queryWrapper);
return problemLogIPage;
@@ -178,6 +179,7 @@
problemLog.setIsdeleted(Constants.ZERO);
problemLog.setStatus(Constants.ZERO);
problemLog.setOpenid(finishAnswerDTO.getOpenId());
+ problemLog.setScore(finishAnswerDTO.getScore());
if(finishAnswerDTO.getUseType().equals(Constants.ZERO)&&StringUtils.isNotBlank(finishAnswerDTO.getUserId())){
Member member = memberMapper.selectById(finishAnswerDTO.getUserId());
if(Objects.isNull(member)){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 4f503c5..04e8f33 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -2634,7 +2634,7 @@
return infoList;
}
/**
- * 杩戜竷鏃ュ埌璐ф儏鍐�
+ * 杩戜竷鏃ュ埌璐ф儏鍐�-鏀规垚杩�15鏃�
* @return
*/
@Override
@@ -2646,17 +2646,17 @@
param.getFacrotyCodeList().add(code);//鏌ヨ鎸囧畾鍘傚尯
}
Date date = new Date();
- Date startDate = DateUtil.addDaysToDate(date,-7);
+ Date startDate = DateUtil.addDaysToDate(date,-15);
//鐪嬫澘澶у睆杩�7鏃ュ埌璐ф儏鍐垫棩鏈� 0琛ㄧず褰撳ぉ褰撳墠鎺�7澶╋紝-1琛ㄧず鏈湀鍒�1鍙�-7鍙�
String flag = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.SCREEN_SEVENT_ARRIVAL_STARTDATE).getCode();
if(StringUtils.equals(flag,"-1")){
startDate =DateUtil.getBeginDayOfMonth(0);
- date = DateUtil.addDaysToDate(startDate,7);
+ date = DateUtil.addDaysToDate(startDate,15);
}
param.setNcCreateDateFrom(DateUtil.getShortTime(startDate));
param.setNcCreateDateThrough(DateUtil.getShortTime(date));
List<TmsSevenArrivalStatusAndDetailsResponse> infoList = tmsService.getSevenArrivalStatusAndDetails(param);//鏌ヨ鍑哄簱閲�
- for (int i = 0; i < 7; i++) {
+ for (int i = 0; i < 15; i++) {
LastSevenDaysOrderVo model = new LastSevenDaysOrderVo();
Date td = DateUtil.addDaysToDate(date,-i);
model.setDateStr(DateUtil.getShortTime(td));
--
Gitblit v1.9.3