liukangdong
2025-03-12 f0f08cc1ff84d45de32d8bff4a40e6a7d0d7a9e6
Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
已修改4个文件
9 ■■■■■ 文件已修改
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ProblemLog.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/ProblemLogVo.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
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;
}
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;
}
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()) {