Merge remote-tracking branch 'origin/master'

src/main/java/com/bonus/digitalSignage/basic/controller/TbThreeSpanController.java

@@ -0,0 +1,16 @@
+package com.bonus.digitalSignage.basic.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author 马三炮
+ * @date 2025/4/25
+ */
+@RestController
+@RequestMapping("/tbThreeSpan")
+@Slf4j
+public class TbThreeSpanController {
+
+}

src/main/java/com/bonus/digitalSignage/basic/dao/TbThreeSpanMapper.java

@@ -0,0 +1,4 @@
+package com.bonus.digitalSignage.basic.dao;
+
+public interface TbThreeSpanMapper {
+}

src/main/java/com/bonus/digitalSignage/basic/service/TbThreeSpanService.java

@@ -0,0 +1,4 @@
+package com.bonus.digitalSignage.basic.service;
+
+public interface TbThreeSpanService {
+}

src/main/java/com/bonus/digitalSignage/basic/service/impl/TbThreeSpanServiceImpl.java

@@ -0,0 +1,10 @@
+package com.bonus.digitalSignage.basic.service.impl;
+
+import com.bonus.digitalSignage.basic.service.TbThreeSpanService;
+
+/**
+ * @author 马三炮
+ * @date 2025/4/25
+ */
+public class TbThreeSpanServiceImpl implements TbThreeSpanService {
+}

src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java

@@ -1,6 +1,9 @@
 package com.bonus.digitalSignage.basic.vo;
 
+import com.bonus.digitalSignage.utils.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 import java.util.List;
@@ -25,31 +28,41 @@ public class TbProjectVo {
     /**
      * 项目部名称
      */
+    @Excel(name = "项目部名称", sort = 1)
     private String departName;
 
     /**
      * 工程名称
      */
+    @Excel(name = "工程名称", sort = 2)
     private String proName;
 
     /**
      * 电压等级（电压等级）
      */
+    @Excel(name = "电压等级（电压等级）", sort = 3)
     private String voltageLevel;
 
     /**
      * 线路长度（单位km）
      */
+    @Excel(name = "线路长度（单位km）", sort = 4)
     private String lineLength;
 
     /**
      * 计划开始时间
      */
+    @Excel(name = "计划开始时间", sort = 5)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private String planStartTime;
 
     /**
      * 计划完工时间
      */
+    @Excel(name = "计划完工时间", sort = 6)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private String planEndTime;
 
     /**
@@ -65,11 +78,13 @@ public class TbProjectVo {
     /**
      * 工程地址
      */
+    @Excel(name = "工程地址", sort = 7)
     private String address;
 
     /**
      * 工程状态（字典表配置）
      */
+    @Excel(name = "工程状态（字典表配置）", sort = 8)
     private String proStatus;
 
     /**

src/main/resources/mappers/basic/TbThreeSpanMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bonus.digitalSignage.basic.dao.TbThreeSpanMapper">
+
+</mapper>