From f0f08cc1ff84d45de32d8bff4a40e6a7d0d7a9e6 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 三月 2025 10:45:59 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProblemLogVo.java | 3 ++-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java | 3 +--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java | 3 ++-
4 files changed, 6 insertions(+), 5 deletions(-)
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 fa0abc5..1ef9156 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
@@ -649,7 +649,7 @@
//鏌ヨ鏄惁鏈夋潈闄�
s.setHasRole(getHasRoleByParam(s,userInfo,adminList));
- /* //鏈嶅姟椤�
+ /* //鏈嶅姟椤�
MPJLambdaWrapper<ProjectRel> prquery = new MPJLambdaWrapper<>();
prquery.selectAll(ProjectRel.class);
prquery.eq(ProjectRel::getIsdeleted, MeetConstants.ZERO);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java
index b4f13bb..9a6babc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java
@@ -35,7 +35,7 @@
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @ExcelColumn(name="绛旈鏃堕棿",dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -99,5 +99,4 @@
@ApiModelProperty(value = "openid")
@ExcelColumn(name="openid")
private String openid;
-
}
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 a7e58cd..0a11701 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
@@ -29,11 +29,12 @@
@ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
@ExcelColumn(name="绫诲瀷")
private String typeName;
+
@ApiModelProperty(value = "绛旈鍒嗘暟")
@ExcelColumn(name="绛旈鍒嗘暟")
private BigDecimal score;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿",dateFormat="yyyy-MM-dd HH:mm")
+ @ExcelColumn(name="绛旈鏃堕棿",dateFormat="yyyy-MM-dd HH:mm")
private Date createDate;
}
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 814866a..8b212a9 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
@@ -27,6 +27,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -139,7 +140,7 @@
for (ProblemLog obj:problemLogIPage.getRecords()) {
ProblemLogVo vo = new ProblemLogVo();
vo.setName(obj.getName());
- vo.setScore(obj.getScore());
+ vo.setScore(Objects.isNull(obj.getScore())?new BigDecimal("100"):obj.getScore());
vo.setPhone(obj.getPhone());
vo.setCompanyName(obj.getCompanyName());
if(null != obj.getType()) {
--
Gitblit v1.9.3