Skip to content

李苗 / Vion-DevOps

Go to a project
Commit 60d82bad by HlQ
Options

[chg] 使用 LocalDateTime 替换 Date

1 parent 6b3ca06f
Expand all
Inline Side-by-side
Showing 181 changed files with 871 additions and 505 deletions
README.md
......@@ -20,6 +20,7 @@
</resource>
</resources>
```
## 更新合同金额
需要在 ``Contract.class`` 把 金额上面的四个注解 ``@ReverseAutoMapping(targetClass = ContractDTO.class, ignore = true)``
注释掉，然后调用更新接口。
\ No newline at end of file
src/main/java/vion/config/MyBatisPlusConfig.java
......@@ -8,7 +8,7 @@ import org.apache.ibatis.reflection.MetaObject;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.Date;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -19,15 +19,15 @@ public class MyBatisPlusConfig implements MetaObjectHandler {
@Override
public void insertFill(MetaObject metaObject) {
this.fillHasGetter(metaObject, "createTime", new Date());
this.fillHasGetter(metaObject, "modifyTime", new Date());
this.fillHasGetter(metaObject, "updateTime", new Date());
this.fillHasGetter(metaObject, "createTime", LocalDateTime.now());
this.fillHasGetter(metaObject, "modifyTime", LocalDateTime.now());
this.fillHasGetter(metaObject, "updateTime", LocalDateTime.now());
}
@Override
public void updateFill(MetaObject metaObject) {
this.fillHasGetter(metaObject, "modifyTime", new Date());
this.fillHasGetter(metaObject, "updateTime", new Date());
this.fillHasGetter(metaObject, "modifyTime", LocalDateTime.now());
this.fillHasGetter(metaObject, "updateTime", LocalDateTime.now());
}
protected void fillHasGetter(MetaObject metaObject, String fieldName, Object fieldVal) {
......
src/main/java/vion/config/RedisConfig.java
package vion.config;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.redisson.Redisson;
import org.redisson.api.RedissonClient;
import org.redisson.codec.JsonJacksonCodec;
......@@ -28,7 +30,9 @@ public class RedisConfig {
@Bean(destroyMethod = "shutdown")
public RedissonClient redissonClient() {
Config config = new Config();
config.setCodec(JsonJacksonCodec.INSTANCE);
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.registerModule(new JavaTimeModule());
config.setCodec(new JsonJacksonCodec(objectMapper));
SingleServerConfig singleServerConfig = config.useSingleServer();
singleServerConfig.setAddress("redis://" + host + ":" + port)
.setPassword(password)
......
src/main/java/vion/config/RequestWrapper.java
package vion.config;
import jakarta.servlet.http.HttpServletRequestWrapper;
import org.dromara.hutool.core.io.IoUtil;
import jakarta.servlet.ReadListener;
import jakarta.servlet.ServletInputStream;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper;
import org.dromara.hutool.core.io.IoUtil;
import java.io.*;
......
src/main/java/vion/constant/RedisKeyEnum.java
package vion.constant;
import org.dromara.hutool.core.text.StrUtil;
import lombok.Getter;
import org.dromara.hutool.core.text.StrUtil;
import java.util.Arrays;
......
src/main/java/vion/controller/ConstructionTeamController.java
......@@ -11,8 +11,8 @@ import vion.vo.ConstructionTeamVO;
import vion.vo.RContractTeamVO;
/**
* 施工队管理
*/
* 施工队管理
*/
@RestController
@RequestMapping("/api")
@RequiredArgsConstructor
......
src/main/java/vion/controller/ContractController.java
......@@ -10,7 +10,7 @@ import com.github.liaochong.myexcel.utils.WatermarkUtil;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.apache.poi.ss.usermodel.Workbook;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.date.TimeUtil;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.text.CharSequenceUtil;
import org.dromara.hutool.core.text.StrUtil;
......@@ -31,7 +31,7 @@ import vion.vo.UserVO;
import java.awt.*;
import java.io.IOException;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
......@@ -192,7 +192,7 @@ public class ContractController {
watermark.setText(user.getUsername() + "-" + user.getPhone());
watermark.setFont(new Font("SimSun", Font.PLAIN, 16));
WatermarkUtil.addWatermark(workbook, watermark);
AttachmentExportUtil.export(workbook, StrUtil.format("合同列表_{}", DateUtil.formatDateTime(new Date())), response);
AttachmentExportUtil.export(workbook, StrUtil.format("合同列表_{}", TimeUtil.formatNormal(LocalDateTime.now())), response);
} catch (IOException e) {
throw new RuntimeException(e);
}
......
src/main/java/vion/controller/FileController.java
......@@ -7,7 +7,7 @@ import io.github.linpeilie.Converter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.hutool.core.collection.CollUtil;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.date.TimeUtil;
import org.dromara.hutool.core.io.file.FileNameUtil;
import org.dromara.hutool.core.io.file.FileUtil;
import org.dromara.hutool.core.lang.Assert;
......@@ -31,7 +31,7 @@ import vion.vo.FileInfoVO;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.time.LocalDateTime;
@RestController
@RequestMapping("/api")
......@@ -110,7 +110,7 @@ public class FileController {
@SaCheckPermission(value = "file:form:upload", orRole = "admin")
public String uploadFile(FileInfoDTO dto, @RequestParam(name = "file") MultipartFile infile) throws IOException {
String filename = FileNameUtil.mainName(infile.getOriginalFilename()) + "_" +
DateUtil.format(new Date(), "yyyyMMdd_HHmmssSSS") + "." +
TimeUtil.format(LocalDateTime.now(), "yyyyMMdd_HHmmssSSS") + "." +
FileNameUtil.extName(infile.getOriginalFilename());
String path = getPath(dto, filename);
File file = FileUtil.touch(path);
......@@ -142,7 +142,7 @@ public class FileController {
public String uploadFile1(FileInfo fileInfo, @RequestParam(name = "files") MultipartFile[] files) throws IOException {
for (MultipartFile infile : files) {
String filename = FileNameUtil.mainName(infile.getOriginalFilename()) + "_" +
DateUtil.format(new Date(), "yyyyMMdd_HHmmssSSS") + "." +
TimeUtil.format(LocalDateTime.now(), "yyyyMMdd_HHmmssSSS") + "." +
FileNameUtil.extName(infile.getOriginalFilename());
String path = fileUrl + FileUtil.FILE_SEPARATOR + fileInfo.getStoreId() + FileUtil.FILE_SEPARATOR + fileInfo.getSourceId() + FileUtil.FILE_SEPARATOR + filename;
File file = FileUtil.touch(path);
......
src/main/java/vion/controller/InspectController.java
......@@ -11,7 +11,7 @@ import vion.model.Inspect;
import vion.service.IInspectService;
import vion.vo.InspectVO;
import java.util.Date;
import java.time.LocalDate;
@RestController
@RequestMapping("/api")
......@@ -47,10 +47,10 @@ public class InspectController {
boolean result = inspectService.lambdaUpdate()
.eq(Inspect::getId, data.getId())
.set(Inspect::getStatus, data.getStatus())
.set(Inspect::getAuditDate, new Date())
.set(Inspect::getAuditDate, LocalDate.now())
.set(Inspect::getReviewer, data.getReviewer())
//审核状态为已完成的时候更新完成时间（0进行中、1待审核、2已完成、3、驳回）
.set(data.getStatus() == 2, Inspect::getFinishDate, new Date())
.set(data.getStatus() == 2, Inspect::getFinishDate, LocalDate.now())
.update();
return result ? "更新巡检状态成功" : "更新巡检状态失败";
}
......
src/main/java/vion/controller/InvoiceController.java
......@@ -10,7 +10,7 @@ import io.github.linpeilie.Converter;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.apache.poi.ss.usermodel.Workbook;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.date.TimeUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.springframework.web.bind.annotation.*;
import vion.dto.InvoiceDTO;
......@@ -21,7 +21,7 @@ import vion.vo.UserVO;
import java.awt.*;
import java.io.IOException;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.List;
/**
......@@ -79,7 +79,7 @@ public class InvoiceController {
watermark.setText(user.getUsername() + "-" + user.getPhone());
watermark.setFont(new Font("SimSun", Font.PLAIN, 16));
WatermarkUtil.addWatermark(workbook, watermark);
AttachmentExportUtil.export(workbook, StrUtil.format("发票列表_{}", DateUtil.formatDateTime(new Date())), response);
AttachmentExportUtil.export(workbook, StrUtil.format("发票列表_{}", TimeUtil.formatNormal(LocalDateTime.now())), response);
} catch (IOException e) {
throw new RuntimeException(e);
}
......
src/main/java/vion/controller/PaymentController.java
......@@ -2,31 +2,31 @@ package vion.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.stp.StpUtil;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.text.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.liaochong.myexcel.core.DefaultExcelBuilder;
import com.github.liaochong.myexcel.core.watermark.Watermark;
import vion.utils.excel.AttachmentExportUtil;
import com.github.liaochong.myexcel.utils.WatermarkUtil;
import io.github.linpeilie.Converter;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.apache.poi.ss.usermodel.Workbook;
import org.dromara.hutool.core.date.TimeUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.springframework.web.bind.annotation.*;
import vion.dto.PaymentDTO;
import vion.service.IPaymentService;
import vion.utils.excel.AttachmentExportUtil;
import vion.vo.PaymentVO;
import vion.vo.UserVO;
import jakarta.servlet.http.HttpServletResponse;
import java.awt.*;
import java.io.IOException;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.List;
/**
* 收款记录管理
*/
* 收款记录管理
*/
@RestController
@RequestMapping("/api")
@RequiredArgsConstructor
......@@ -79,7 +79,7 @@ public class PaymentController {
watermark.setText(user.getUsername() + "-" + user.getPhone());
watermark.setFont(new Font("SimSun", Font.PLAIN, 16));
WatermarkUtil.addWatermark(workbook, watermark);
AttachmentExportUtil.export(workbook, StrUtil.format("收款列表_{}", DateUtil.formatDateTime(new Date())), response);
AttachmentExportUtil.export(workbook, StrUtil.format("收款列表_{}", TimeUtil.formatNormal(LocalDateTime.now())), response);
} catch (IOException e) {
throw new RuntimeException(e);
}
......
src/main/java/vion/controller/PointDesignController.java
......@@ -2,28 +2,28 @@ package vion.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.stp.StpUtil;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.text.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.liaochong.myexcel.core.DefaultExcelBuilder;
import com.github.liaochong.myexcel.core.watermark.Watermark;
import vion.utils.excel.AttachmentExportUtil;
import com.github.liaochong.myexcel.utils.WatermarkUtil;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Workbook;
import org.dromara.hutool.core.date.TimeUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.springframework.web.bind.annotation.*;
import vion.dto.PointInfoDTO;
import vion.model.RejectInfo;
import vion.service.IPointInfoService;
import vion.third.WechatMod;
import vion.utils.excel.AttachmentExportUtil;
import vion.vo.PointInfoVO;
import vion.vo.UserVO;
import jakarta.servlet.http.HttpServletResponse;
import java.awt.*;
import java.io.IOException;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.List;
/**
......@@ -128,7 +128,7 @@ public class PointDesignController {
watermark.setText(user.getUsername() + "-" + user.getPhone());
watermark.setFont(new Font("SimSun", Font.PLAIN, 16));
WatermarkUtil.addWatermark(workbook, watermark);
AttachmentExportUtil.export(workbook, StrUtil.format("点位设计列表_{}", DateUtil.formatDateTime(new Date())), response);
AttachmentExportUtil.export(workbook, StrUtil.format("点位设计列表_{}", TimeUtil.formatNormal(LocalDateTime.now())), response);
} catch (IOException e) {
throw new RuntimeException(e);
}
......
src/main/java/vion/controller/RRoleResourceController.java
package vion.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.hutool.core.lang.Opt;
import lombok.RequiredArgsConstructor;
import org.dromara.hutool.core.lang.Opt;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
......
src/main/java/vion/controller/RepairRecController.java
package vion.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.array.ArrayUtil;
import lombok.RequiredArgsConstructor;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.lang.Assert;
import org.springframework.web.bind.annotation.*;
import vion.dto.RepairRecDTO;
import vion.service.IRepairRecService;
......
src/main/java/vion/controller/RoleController.java
package vion.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.github.linpeilie.Converter;
import lombok.RequiredArgsConstructor;
import org.dromara.hutool.core.collection.CollUtil;
import org.dromara.hutool.core.collection.ListUtil;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.lang.Opt;
import org.dromara.hutool.core.text.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.github.linpeilie.Converter;
import lombok.RequiredArgsConstructor;
import org.dromara.hutool.core.util.ObjUtil;
import org.springframework.web.bind.annotation.*;
import vion.dto.RoleDTO;
......
src/main/java/vion/controller/SparePartController.java
......@@ -9,7 +9,7 @@ import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.apache.poi.ss.usermodel.Workbook;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.date.TimeUtil;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.text.StrUtil;
import org.springframework.web.bind.annotation.*;
......@@ -22,7 +22,7 @@ import vion.vo.UserVO;
import java.awt.*;
import java.io.IOException;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.List;
/**
......@@ -92,7 +92,7 @@ public class SparePartController {
watermark.setText(user.getUsername() + "-" + user.getPhone());
watermark.setFont(new Font("SimSun", Font.PLAIN, 16));
WatermarkUtil.addWatermark(workbook, watermark);
AttachmentExportUtil.export(workbook, StrUtil.format("备件申请列表_{}", DateUtil.formatDateTime(new Date())), response);
AttachmentExportUtil.export(workbook, StrUtil.format("备件申请列表_{}", TimeUtil.formatNormal(LocalDateTime.now())), response);
} catch (IOException e) {
throw new RuntimeException(e);
}
......
src/main/java/vion/controller/TaskController.java
......@@ -10,7 +10,7 @@ import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Workbook;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.date.TimeUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
......@@ -27,7 +27,8 @@ import vion.vo.UserVO;
import java.awt.*;
import java.io.IOException;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
......@@ -81,7 +82,7 @@ public class TaskController {
FaultLog faultLog = new FaultLog();
faultLog.setOperator(taskVO.getActiveUser());
faultLog.setContent("工单正在处理中");
faultLog.setCreateTime(new Date());
faultLog.setCreateTime(LocalDateTime.now());
faultLogList.add(faultLog);
}
return faultLogList;
......@@ -108,7 +109,7 @@ public class TaskController {
watermark.setText(user.getUsername() + "-" + user.getPhone());
watermark.setFont(new Font("SimSun", Font.PLAIN, 16));
WatermarkUtil.addWatermark(workbook, watermark);
AttachmentExportUtil.export(workbook, StrUtil.format("任务列表_{}", DateUtil.formatDateTime(new Date())), response);
AttachmentExportUtil.export(workbook, StrUtil.format("任务列表_{}", TimeUtil.formatNormal(LocalDateTime.now())), response);
} catch (IOException e) {
throw new RuntimeException(e);
}
......@@ -147,8 +148,8 @@ public class TaskController {
@GetMapping("/task/peopleAnal")
@SaCheckPermission(value = "task:peopleAnal", orRole = "admin")
public List<Map<String, Object>> peopleAnalysis(@DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
@DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate,
public List<Map<String, Object>> peopleAnalysis(@DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate startDate,
@DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate endDate,
Integer source,
@RequestParam(required = false) List<Long> userIds) {
return taskService.peopleAnalysis(startDate, endDate, source, userIds);
......@@ -156,8 +157,8 @@ public class TaskController {
@GetMapping("/task/proAnal")
@SaCheckPermission(value = "task:proAnal", orRole = "admin")
public List<Map<String, Object>> proAnalysis(@DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
@DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate,
public List<Map<String, Object>> proAnalysis(@DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate startDate,
@DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate endDate,
Integer source,
@RequestParam(required = false) List<Long> userIds) {
return taskService.proAnalysis(startDate, endDate, source, userIds);
......@@ -165,8 +166,8 @@ public class TaskController {
@GetMapping("/task/summaryAnal")
@SaCheckPermission(value = "task:summaryAnal", orRole = "admin")
public Map<String, Map<String, List<Task>>> summaryAnalysis(@DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
@DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate,
public Map<String, Map<String, List<Task>>> summaryAnalysis(@DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate startDate,
@DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate endDate,
Integer source) {
return taskService.summaryAnalysis(startDate, endDate, source);
}
......
src/main/java/vion/cron/ContractRunner.java
......@@ -5,7 +5,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.hutool.core.collection.CollUtil;
import org.dromara.hutool.core.collection.ListUtil;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.date.TimeUtil;
import org.dromara.hutool.core.lang.Opt;
import org.dromara.hutool.core.math.NumberUtil;
import org.dromara.hutool.core.text.StrUtil;
......@@ -165,9 +165,9 @@ public class ContractRunner {
contract.setName(jsonObj1.path("text_14").asText());
contract.setContractNo(jsonObj1.path("serialNo").asText());
contract.setType(contractTypeMap.getOrDefault(jsonObj1.path("text_17").path("text").asText(), 0));
contract.setSignDate(DateUtil.date(jsonObj1.path("date_1").asLong() * 1000));
contract.setMaintainSdate(Opt.ofNullable(jsonObj1.path("date_4")).filter(JsonNode::isNumber).map(sec -> DateUtil.date(sec.asLong() * 1000)).orElse(null));
contract.setMaintainEdate(Opt.ofNullable(jsonObj1.path("date_5")).filter(JsonNode::isNumber).map(sec -> DateUtil.date(sec.asLong() * 1000)).orElse(null));
contract.setSignDate(TimeUtil.of(jsonObj1.path("date_1").asLong() * 1000).toLocalDate());
contract.setMaintainSdate(Opt.ofNullable(jsonObj1.path("date_4")).filter(JsonNode::isNumber).map(sec -> TimeUtil.of(sec.asLong() * 1000).toLocalDate()).orElse(null));
contract.setMaintainEdate(Opt.ofNullable(jsonObj1.path("date_5")).filter(JsonNode::isNumber).map(sec -> TimeUtil.of(sec.asLong() * 1000).toLocalDate()).orElse(null));
String warrantyPeriod = jsonObj1.path("text_23").path("text").asText("");
// 23 质保 没有维保开始时间和结束时间 25 维保
if (StrUtil.isNotBlank(warrantyPeriod) && warrantyPeriod.contains("个月")) {
......@@ -183,7 +183,7 @@ public class ContractRunner {
if (!paymentForm.isEmpty()) {
paymentForm.forEach(pf -> {
var ratio = NumberUtil.div(BigDecimal.valueOf(Double.parseDouble(pf.path("text_1").asText())), 100);
var date = DateUtil.date(pf.path("date_1").asLong() * 1000);
var date = TimeUtil.of(pf.path("date_1").asLong() * 1000).toLocalDate();
var stage = pf.path("text_2").path("text").asText();
if (StrUtil.equals(stage, "预付款")) {
contract.setSignRatio(ratio);
......@@ -224,8 +224,8 @@ public class ContractRunner {
contract.setBackInfo(jsonObj1.path("text_29").asText());
contract.setCreateUser(-1L);
contract.setModifyUser(-1L);
contract.setEntryTime(DateUtil.date(result.path("addTime").asLong() * 1000));
contract.setOriginalModTime(DateUtil.date(result.path("updateTime").asLong() * 1000));
contract.setEntryTime(TimeUtil.of(result.path("addTime").asLong() * 1000));
contract.setOriginalModTime(TimeUtil.of(result.path("updateTime").asLong() * 1000));
insOrUpdContractList.add(contract);
var productArr = jsonObj1.withArray("array_4");
......@@ -320,8 +320,7 @@ public class ContractRunner {
contractPaymentService.calMoney(exist, updDto);
contractService.updateById(updDto);
});
redissonClient.getBucket(RedisKeyEnum.CONTRACT_SYNC_NEW_TIME.getVal()).set(insOrUpdContractList.getFirst().getOriginalModTime().getTime());
redissonClient.getBucket(RedisKeyEnum.CONTRACT_SYNC_NEW_TIME.getVal()).set(TimeUtil.toEpochMilli(insOrUpdContractList.getFirst().getOriginalModTime()));
log.info("【结束】从crm系统同步合同信息");
}
......
src/main/java/vion/cron/LogPushRunner.java
......@@ -2,7 +2,7 @@ package vion.cron;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.date.TimeUtil;
import org.dromara.hutool.core.lang.Opt;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.util.ObjUtil;
......@@ -20,6 +20,7 @@ import vion.service.IStoreService;
import vion.third.DingMod;
import vion.utils.JsonUtil;
import java.time.LocalDateTime;
import java.util.Map;
import java.util.stream.Collectors;
......@@ -83,7 +84,7 @@ public class LogPushRunner {
.put("text", StrUtil.format("""
### 项目日志待提交提醒
#### 项目：[{}]请及时提交日志
#### 发送时间：{}""", storeName, DateUtil.now()));
#### 发送时间：{}""", storeName, TimeUtil.formatNormal(LocalDateTime.now())));
var msg = JsonUtil.createObj()
.put("msgtype", "markdown")
......
src/main/java/vion/cron/TaskRunner.java
......@@ -3,7 +3,7 @@ package vion.cron;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.date.TimeUtil;
import org.dromara.hutool.core.lang.Opt;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
......@@ -14,6 +14,7 @@ import vion.service.IUserService;
import vion.third.DingMod;
import vion.utils.JsonUtil;
import java.time.LocalDateTime;
import java.util.stream.Collectors;
/**
......@@ -52,7 +53,7 @@ public class TaskRunner {
.put("markdown", """
### 未完成工单提醒
#### 请查看您未完成的工单
#### 发送时间：""" + DateUtil.now())
#### 发送时间：""" + TimeUtil.formatNormal(LocalDateTime.now()))
.put("btn_orientation", "1");
var jsonArray = JsonUtil.createArr()
......
src/main/java/vion/dto/ContractDTO.java
......@@ -7,7 +7,8 @@ import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.multipart.MultipartFile;
import java.math.BigDecimal;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@Getter
......@@ -56,24 +57,26 @@ public class ContractDTO extends BaseDTO {
/**
* 终验日期
*/
private Date finalDate;
private LocalDateTime finalDate;
/**
* 项目id
*/
private Long storeId;
/** 文件来源 */
/**
* 文件来源
*/
private Integer sourceType;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date nodeDate;
private LocalDate nodeDate;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date signDateStart;
private LocalDate signDateStart;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date signDateEnd;
private LocalDate signDateEnd;
/**
* 1：查询未关联的合同
......@@ -81,7 +84,9 @@ public class ContractDTO extends BaseDTO {
*/
private int switchFlag;
/** 产品线属性 */
/**
* 产品线属性
*/
private List<Integer> productLines;
/**
......@@ -107,7 +112,9 @@ public class ContractDTO extends BaseDTO {
private BigDecimal amount;
/** 操作符 > < = */
/**
* 操作符 > < =
*/
private String operator;
private OrderItem orderItem;
......
src/main/java/vion/dto/ContractPaymentDTO.java
......@@ -5,7 +5,7 @@ import lombok.Getter;
import lombok.Setter;
import java.math.BigDecimal;
import java.util.Date;
import java.time.LocalDate;
@Getter
@Setter
......@@ -31,6 +31,6 @@ public class ContractPaymentDTO {
* 节点日期，指合同到这一阶段时的时间
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date nodeDate;
private LocalDate nodeDate;
}
\ No newline at end of file
src/main/java/vion/dto/DeliverLogDTO.java
......@@ -5,7 +5,7 @@ import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.time.LocalDate;
import java.util.List;
@Getter
......@@ -39,13 +39,13 @@ public class DeliverLogDTO extends BaseDTO {
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date logDate;
private LocalDate logDate;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date logDateStart;
private LocalDate logDateStart;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date logDateEnd;
private LocalDate logDateEnd;
/**
* 干系人
......
src/main/java/vion/dto/DeliveryRecordDTO.java
......@@ -6,7 +6,7 @@ import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
import java.time.LocalDate;
@Getter
@Setter
......@@ -53,14 +53,14 @@ public class DeliveryRecordDTO extends BaseDTO {
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date shipDate;
private LocalDate shipDate;
/**
* 到货签收日期
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date signDate;
private LocalDate signDate;
/**
* 快递公司
......
src/main/java/vion/dto/DeviceDTO.java
......@@ -4,7 +4,7 @@ import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.time.LocalDate;
@Getter
@Setter
......@@ -55,7 +55,7 @@ public class DeviceDTO extends BaseDTO {
* 入库日期
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date recDate;
private LocalDate recDate;
/**
* 备注
......
src/main/java/vion/dto/FileInfoDTO.java
......@@ -9,31 +9,57 @@ import java.util.List;
@Setter
public class FileInfoDTO extends BaseDTO {
private Long id;
/** 门店id */
/**
* 门店id
*/
private Long storeId;
/** 文件扩展名 */
/**
* 文件扩展名
*/
private String type;
/** 文件来源 */
/**
* 文件来源
*/
private Integer sourceType;
private List<Integer> sourceTypeList;
/** 文件来源id */
/**
* 文件来源id
*/
private Long sourceId;
/** 合同id */
/**
* 合同id
*/
private Long contractId;
/** 合同编号 */
/**
* 合同编号
*/
private String contractNo;
/** 文件名称 */
/**
* 文件名称
*/
private String name;
/** 文件地址 */
/**
* 文件地址
*/
private String url;
/** 备注 */
/**
* 备注
*/
private String remark;
/** sha256 */
/**
* sha256
*/
private String sha256;
/** 上传人 */
/**
* 上传人
*/
private String uploader;
/** 标识：storeLog，用于区分项目日志的表单文件的提交存储和其他通用表单的文件存储 */
/**
* 标识：storeLog，用于区分项目日志的表单文件的提交存储和其他通用表单的文件存储
*/
private String flag;
/** 更新标识，更新接口不传该字段，不允许更新文件：1.项目资料 */
/**
* 更新标识，更新接口不传该字段，不允许更新文件：1.项目资料
*/
private Integer updFlag;
}
src/main/java/vion/dto/FormDTO.java
......@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import java.time.LocalDateTime;
@Getter
......@@ -41,7 +41,7 @@ public class FormDTO extends BaseDTO {
* 签字时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date signTime;
private LocalDateTime signTime;
/**
* 来源，1：任务管理，2：巡检管理
......
src/main/java/vion/dto/InspectDTO.java
......@@ -5,45 +5,68 @@ import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
@Getter
@Setter
public class InspectDTO extends BaseDTO {
/** 自增列 */
/**
* 自增列
*/
private Long id;
/** 门店id */
/**
* 门店id
*/
private Long storeId;
/** 巡检时间 */
/**
* 巡检时间
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date inspectDate;
private LocalDate inspectDate;
/** 巡检方式（0远程、1现场） */
/**
* 巡检方式（0远程、1现场）
*/
private Integer type;
/** 状态（0进行中、1待审核、2已完成、3、驳回） */
/**
* 状态（0进行中、1待审核、2已完成、3、驳回）
*/
private Integer status;
/** 巡检人 */
/**
* 巡检人
*/
private Integer inspectUser;
/** 审核人 */
/**
* 审核人
*/
private Integer reviewer;
/** 完成时间 */
/**
* 完成时间
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date finishDate;
private LocalDate finishDate;
/** 审核时间 */
/**
* 审核时间
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date auditDate;
private LocalDate auditDate;
/** 备注 */
/**
* 备注
*/
private String remark;
/** 集团id */
/**
* 集团id
*/
private Long accountId;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startdate;
private LocalDateTime startdate;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date enddate;
private LocalDateTime enddate;
}
src/main/java/vion/dto/InvoiceDTO.java
......@@ -7,7 +7,7 @@ import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
import java.time.LocalDate;
@Getter
......@@ -24,7 +24,7 @@ public class InvoiceDTO extends BaseDTO {
* 开票时间
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date invoicingTime;
private LocalDate invoicingTime;
/**
* 发票金额
......@@ -47,9 +47,9 @@ public class InvoiceDTO extends BaseDTO {
private String serialNo;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date invoicingTimeStart;
private LocalDate invoicingTimeStart;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date invoicingTimeEnd;
private LocalDate invoicingTimeEnd;
private OrderItem orderItem;
......
src/main/java/vion/dto/PaymentDTO.java
......@@ -7,7 +7,7 @@ import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
import java.time.LocalDate;
/**
* 收款记录表
......@@ -31,7 +31,7 @@ public class PaymentDTO extends BaseDTO {
* 收款时间
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date collectionTime;
private LocalDate collectionTime;
/**
* 收款金额
......@@ -47,10 +47,10 @@ public class PaymentDTO extends BaseDTO {
* 收款开始时间、结束时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date collectionTimeStart;
private LocalDate collectionTimeStart;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date collectionTimeEnd;
private LocalDate collectionTimeEnd;
private OrderItem orderItem;
......
src/main/java/vion/dto/PointInfoDTO.java
......@@ -200,14 +200,20 @@ public class PointInfoDTO extends BaseDTO {
private MultipartFile[] files;
/** 客户上传合同文件 */
/**
* 客户上传合同文件
*/
private MultipartFile contractFile;
/** 上传的合同范本 */
/**
* 上传的合同范本
*/
private MultipartFile contractTemplateFile;
/* 终版合同 */
private MultipartFile finalContractFile;
/** 微信 openid 和昵称 */
/**
* 微信 openid 和昵称
*/
private String openid;
private String nickname;
......
src/main/java/vion/dto/RContractTeamDTO.java
......@@ -3,7 +3,7 @@ package vion.dto;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import java.time.LocalDateTime;
@Getter
@Setter
......@@ -36,12 +36,12 @@ public class RContractTeamDTO extends BaseDTO {
/**
* 分配日期
*/
private Date assignDate;
private LocalDateTime assignDate;
/**
* 完成日期
*/
private Date finishDate;
private LocalDateTime finishDate;
/**
* 施工状态
......
src/main/java/vion/dto/RepairRecDTO.java
......@@ -6,7 +6,8 @@ import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -87,7 +88,7 @@ public class RepairRecDTO extends BaseDTO {
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date shipDate;
private LocalDate shipDate;
/**
* 快递公司
......@@ -119,14 +120,14 @@ public class RepairRecDTO extends BaseDTO {
private MultipartFile[] files;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTimeStart;
private LocalDateTime createTimeStart;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTimeEnd;
private LocalDateTime createTimeEnd;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date shipDateStart;
private LocalDate shipDateStart;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date shipDateEnd;
private LocalDate shipDateEnd;
private String deviceName;
private String deviceNo;
......
src/main/java/vion/dto/RoleDTO.java
......@@ -4,7 +4,7 @@ import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -36,8 +36,8 @@ public class RoleDTO extends BaseDTO {
private String remark;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startDate;
private LocalDateTime startDate;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endDate;
private LocalDateTime endDate;
}
src/main/java/vion/dto/ServiceOrderDTO.java
......@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -14,62 +14,100 @@ import java.util.Date;
@Setter
public class ServiceOrderDTO extends BaseDTO {
/** 项目名称 */
/**
* 项目名称
*/
private String projectName;
/** 报修人 */
/**
* 报修人
*/
private String submitter;
/** 报修人手机号码 */
/**
* 报修人手机号码
*/
private String submitPhone;
/** 报修时间 */
/**
* 报修时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date submitTime;
private LocalDateTime submitTime;
/** 维修人 */
/**
* 维修人
*/
private String repairPeople;
/** 维修人手机号码*/
/**
* 维修人手机号码
*/
private String repairPhone;
/** 部门 */
/**
* 部门
*/
private String dept;
/** 服务方式(1.电话支持 2.远程服务 3.现场服务) */
/**
* 服务方式(1.电话支持 2.远程服务 3.现场服务)
*/
private Integer serviceType;
/** 耗时 */
/**
* 耗时
*/
private Double time;
/** 故障内容 */
/**
* 故障内容
*/
private String faultContent;
/** 维修结果 */
/**
* 维修结果
*/
private String repairRes;
/** 客户评价 */
/**
* 客户评价
*/
private String review;
/** 工单id */
/**
* 工单id
*/
private Long taskId;
/** 服务单状态 */
/**
* 服务单状态
*/
private Integer state;
/** 五星好评 */
/**
* 五星好评
*/
private Integer stars;
/** 签字图片base64 */
/**
* 签字图片base64
*/
private String signPic;
/** 签字时间 */
/**
* 签字时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date signTime;
private LocalDateTime signTime;
/** 完成时间 */
/**
* 完成时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date finishTime;
/** 项目id */
private LocalDateTime finishTime;
/**
* 项目id
*/
private Long storeId;
}
src/main/java/vion/dto/SparePartDTO.java
......@@ -6,7 +6,8 @@ import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -82,7 +83,7 @@ public class SparePartDTO extends BaseDTO {
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date shipDate;
private LocalDate shipDate;
/**
* 快递公司
......@@ -114,18 +115,20 @@ public class SparePartDTO extends BaseDTO {
*/
private String uuid;
/** 微信用户id */
/**
* 微信用户id
*/
private String openid;
private MultipartFile[] files;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTimeStart;
private LocalDateTime createTimeStart;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTimeEnd;
private LocalDateTime createTimeEnd;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date shipDateStart;
private LocalDate shipDateStart;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date shipDateEnd;
private LocalDate shipDateEnd;
}
\ No newline at end of file
src/main/java/vion/dto/StatusDTO.java
......@@ -7,13 +7,21 @@ import org.springframework.web.multipart.MultipartFile;
@Getter
@Setter
public class StatusDTO {
/** 门店id */
/**
* 门店id
*/
private Long storeId;
/** 阶段 */
/**
* 阶段
*/
private Integer projectStage;
/** 文件来源 */
/**
* 文件来源
*/
private Integer sourceType;
/** 来源id */
/**
* 来源id
*/
private Long sourceId;
private MultipartFile[] files;
}
src/main/java/vion/dto/StoreDTO.java
......@@ -5,7 +5,8 @@ import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
/**
......@@ -16,69 +17,121 @@ import java.util.List;
public class StoreDTO extends BaseDTO {
private Long id;
private List<Long> ids;
/** 门店名称 */
private String name ;
/** 销售人 */
/**
* 门店名称
*/
private String name;
/**
* 销售人
*/
private Integer salesperson;
/** 客户姓名 */
/**
* 客户姓名
*/
private String customerName;
/** 实施类型：0纯供货、1供货+安装、3续保、4维修 */
/**
* 实施类型：0纯供货、1供货+安装、3续保、4维修
*/
private Integer implementType;
/** 项目状态：0待确认、1进行中、2已完成、3挂起 */
/**
* 项目状态：0待确认、1进行中、2已完成、3挂起
*/
private Integer projectState;
/** 联系人（多个联系人逗号隔开） */
/**
* 联系人（多个联系人逗号隔开）
*/
private String contacts;
/** 创建者 */
/**
* 创建者
*/
private Long createUser;
/** 修改者 */
/**
* 修改者
*/
private Long modifyUser;
/** 备注 */
/**
* 备注
*/
private String remark;
/** 项目阶段 */
/**
* 项目阶段
*/
private Integer projectStage;
/** 集团id */
/**
* 集团id
*/
private Long accountId;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startdate;
private LocalDateTime startdate;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date enddate;
/** 立项日期 */
private LocalDateTime enddate;
/**
* 立项日期
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date estDate;
private LocalDate estDate;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date estDateStart;
private LocalDate estDateStart;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date estDateEnd;
/** 主合同id */
private LocalDate estDateEnd;
/**
* 主合同id
*/
private Long masterContract;
/** 维保状态 */
/**
* 维保状态
*/
private String maintainStatus;
/** 产品线属性 */
/**
* 产品线属性
*/
private Integer productLine;
/** 是否重点项目 0:不是 1:是 */
/**
* 是否重点项目 0:不是 1:是
*/
private Integer isImportant;
/** 任务详情 */
/**
* 任务详情
*/
private String taskDetail;
/** 预计完成日期 */
/**
* 预计完成日期
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date finishDate;
/** 完成百分比 */
private LocalDate finishDate;
/**
* 完成百分比
*/
private Double percentage;
/** 当前卡点 */
/**
* 当前卡点
*/
private String stuckPoint;
/** 标签id */
/**
* 标签id
*/
private Long tagId;
/** 项目负责人 or 项目经理 */
/**
* 项目负责人 or 项目经理
*/
private Long mainUser;
/** 主要产品 */
/**
* 主要产品
*/
private Integer mainProduct;
/** 点位数量 */
/**
* 点位数量
*/
private Integer pointNum;
/** 计划完成日期 */
/**
* 计划完成日期
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date planFinishDate;
/** 项目规模 */
private LocalDate planFinishDate;
/**
* 项目规模
*/
private Integer projectSize;
/**
* 巡检次数
......
src/main/java/vion/dto/TaskDTO.java
......@@ -6,7 +6,8 @@ import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@Getter
......@@ -22,7 +23,7 @@ public class TaskDTO extends BaseDTO {
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date repairTime;
private LocalDateTime repairTime;
/**
* 故障类型
*/
......@@ -48,7 +49,7 @@ public class TaskDTO extends BaseDTO {
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date solveDate;
private LocalDate solveDate;
/**
* 故障原因
*/
......@@ -75,7 +76,7 @@ public class TaskDTO extends BaseDTO {
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date expDate;
private LocalDate expDate;
/**
* 备注
......@@ -93,11 +94,11 @@ public class TaskDTO extends BaseDTO {
private MultipartFile[] files;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startdate;
private LocalDateTime startdate;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date enddate;
private LocalDateTime enddate;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date curDate;
private LocalDate curDate;
/**
* 工时
*/
......
src/main/java/vion/dto/TaskTempDTO.java
......@@ -6,7 +6,7 @@ import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
import java.time.LocalDateTime;
@Getter
@Setter
......@@ -22,7 +22,7 @@ public class TaskTempDTO extends BaseDTO {
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date repairTime;
private LocalDateTime repairTime;
/**
* 故障说明
*/
......@@ -53,7 +53,7 @@ public class TaskTempDTO extends BaseDTO {
private MultipartFile[] files;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startdate;
private LocalDateTime startdate;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date enddate;
private LocalDateTime enddate;
}
src/main/java/vion/dto/UserDTO.java
......@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 用户信息
......@@ -18,15 +18,19 @@ public class UserDTO extends BaseDTO {
private String phone;
private Long deptId;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date modifyTime;
private LocalDateTime modifyTime;
private String remark;
/** 是否是预工单处理人 0：不是 1：是 */
/**
* 是否是预工单处理人 0：不是 1：是
*/
private Integer preWorkOrder;
/** 员工状态 2：试用期 3：正式 5：待离职 -1：无状态 */
/**
* 员工状态 2：试用期 3：正式 5：待离职 -1：无状态
*/
private Integer employeeStatus;
/* 状态 0：正常 1：禁用 */
......
src/main/java/vion/mapper/DictionaryMapper.java
......@@ -2,5 +2,6 @@ package vion.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import vion.model.Dictionary;
public interface DictionaryMapper extends MPJBaseMapper<Dictionary> {
}
src/main/java/vion/mapper/DictionaryTypeMapper.java
......@@ -2,5 +2,6 @@ package vion.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import vion.model.DictionaryType;
public interface DictionaryTypeMapper extends MPJBaseMapper<DictionaryType> {
}
src/main/java/vion/mapper/FaultLogMapper.java
......@@ -2,5 +2,6 @@ package vion.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import vion.model.FaultLog;
public interface FaultLogMapper extends MPJBaseMapper<FaultLog> {
}
src/main/java/vion/mapper/FileMapper.java
......@@ -2,5 +2,6 @@ package vion.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import vion.model.FileInfo;
public interface FileMapper extends MPJBaseMapper<FileInfo> {
}
src/main/java/vion/mapper/InspectMapper.java
......@@ -2,5 +2,6 @@ package vion.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import vion.model.Inspect;
public interface InspectMapper extends MPJBaseMapper<Inspect> {
}
src/main/java/vion/mapper/SparePartMapper.java
package vion.mapper;
package vion.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import vion.model.SparePart;
import com.github.yulichang.base.MPJBaseMapper;
import vion.model.SparePart;
/**
* @author HlQ
......
src/main/java/vion/mapper/StoreMapper.java
......@@ -2,5 +2,6 @@ package vion.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import vion.model.Store;
public interface StoreMapper extends MPJBaseMapper<Store> {
}
src/main/java/vion/mapper/TaskMapper.java
......@@ -2,5 +2,6 @@ package vion.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import vion.model.Task;
public interface TaskMapper extends MPJBaseMapper<Task> {
}
src/main/java/vion/mapper/TaskTempMapper.java
......@@ -2,5 +2,6 @@ package vion.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import vion.model.TaskTemp;
public interface TaskTempMapper extends MPJBaseMapper<TaskTemp> {
}
src/main/java/vion/mapper/UserMapper.java
......@@ -2,5 +2,6 @@ package vion.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import vion.model.User;
public interface UserMapper extends MPJBaseMapper<User> {
}
src/main/java/vion/model/Account.java
......@@ -6,7 +6,7 @@ import lombok.Getter;
import lombok.Setter;
import vion.dto.BaseDTO;
import java.util.Date;
import java.time.LocalDateTime;
@Getter
@Setter
......@@ -29,14 +29,14 @@ public class Account extends BaseDTO {
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
/**
* 修改时间
*/
@TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date modifyTime;
private LocalDateTime modifyTime;
/**
* 备注
......
src/main/java/vion/model/ConstructionTeam.java
......@@ -8,7 +8,7 @@ import lombok.Setter;
import vion.dto.ConstructionTeamDTO;
import vion.vo.ConstructionTeamVO;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 施工队信息表
......@@ -37,8 +37,8 @@ public class ConstructionTeam {
private String city;
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/Contract.java
......@@ -10,7 +10,8 @@ import vion.dto.ContractDTO;
import vion.vo.ContractVO;
import java.math.BigDecimal;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
......@@ -49,19 +50,19 @@ public class Contract {
* 合同签订日期
*/
@TableField(value = "sign_date")
private Date signDate;
private LocalDate signDate;
/**
* 合同维保开始日期
*/
@TableField(value = "maintain_sdate")
private Date maintainSdate;
private LocalDate maintainSdate;
/**
* 合同维保结束日期
*/
@TableField(value = "maintain_edate")
private Date maintainEdate;
private LocalDate maintainEdate;
/**
* 合同进度：1-签订 2-到货 3-系统验收（初验） 4-项目验收（终验） 5-质保 6-第一笔维保款 7-第二笔维保款 8-第三笔维保款 9-维保进度款 10-维保验收款
......@@ -140,13 +141,13 @@ public class Contract {
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
private LocalDateTime createTime;
/**
* 修改时间
*/
@TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE)
private Date modifyTime;
private LocalDateTime modifyTime;
/**
* 合同质保周期（月）
......@@ -158,7 +159,7 @@ public class Contract {
* 终验日期，目前取值为合同阶段为系统初验或者终验的 nodeDate
*/
@TableField(value = "final_date")
private Date finalDate;
private LocalDate finalDate;
/**
* 开票金额
......@@ -170,7 +171,7 @@ public class Contract {
* 录入时间
*/
@TableField(value = "entry_time")
private Date entryTime;
private LocalDateTime entryTime;
/**
* 财务状态
......@@ -185,7 +186,7 @@ public class Contract {
private String backInfo;
@TableField(exist = false)
private Date originalModTime;
private LocalDateTime originalModTime;
/**
* 合同签订付款比例
......@@ -197,7 +198,7 @@ public class Contract {
* 合同签订付款日期
*/
@TableField(exist = false)
private Date signDate1;
private LocalDate signDate1;
/**
* 合同到货付款比例
......@@ -209,7 +210,7 @@ public class Contract {
* 合同到货付款日期
*/
@TableField(exist = false)
private Date arriveDate;
private LocalDate arriveDate;
/**
* 合同系统验收付款比例
......@@ -221,7 +222,7 @@ public class Contract {
* 合同系统验收付款日期
*/
@TableField(exist = false)
private Date systemCheckDate;
private LocalDate systemCheckDate;
/**
* 合同项目验收付款比例
......@@ -233,7 +234,7 @@ public class Contract {
* 合同项目验收付款日期
*/
@TableField(exist = false)
private Date projectCheckDate;
private LocalDate projectCheckDate;
/**
* 合同质保付款比例
......@@ -245,7 +246,7 @@ public class Contract {
* 合同质保付款日期
*/
@TableField(exist = false)
private Date warrantyDate;
private LocalDate warrantyDate;
/**
* 合同维保付款比例1
......@@ -257,7 +258,7 @@ public class Contract {
* 合同维保付款日期1
*/
@TableField(exist = false)
private Date maintainDate1;
private LocalDate maintainDate1;
/**
* 合同维保付款比例2
......@@ -269,7 +270,7 @@ public class Contract {
* 合同维保付款日期2
*/
@TableField(exist = false)
private Date maintainDate2;
private LocalDate maintainDate2;
/**
* 合同维保付款比例3
......@@ -281,7 +282,7 @@ public class Contract {
* 合同维保付款日期3
*/
@TableField(exist = false)
private Date maintainDate3;
private LocalDate maintainDate3;
/**
* 维保进度款
......@@ -293,7 +294,7 @@ public class Contract {
* 维保进度款付款日期
*/
@TableField(exist = false)
private Date maintainProgressDate;
private LocalDate maintainProgressDate;
/**
* 维保验收款
......@@ -305,5 +306,5 @@ public class Contract {
* 维保验收款付款日期
*/
@TableField(exist = false)
private Date maintainAcceptanceDate;
private LocalDate maintainAcceptanceDate;
}
\ No newline at end of file
src/main/java/vion/model/ContractLog.java
......@@ -5,7 +5,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -47,9 +48,9 @@ public class ContractLog {
*/
@TableField(value = "rec_time")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date recTime;
private LocalDate recTime;
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
}
\ No newline at end of file
src/main/java/vion/model/ContractPayment.java
......@@ -9,7 +9,8 @@ import vion.dto.ContractPaymentDTO;
import vion.vo.ContractPaymentVO;
import java.math.BigDecimal;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* 合同收款方式
......@@ -47,13 +48,13 @@ public class ContractPayment {
* 收款日期
*/
@TableField(value = "payment_date")
private Date paymentDate;
private LocalDate paymentDate;
/**
* 节点日期，指合同到这一阶段时的时间
*/
@TableField(value = "node_date")
private Date nodeDate;
private LocalDate nodeDate;
/**
* 创建者
......@@ -71,11 +72,11 @@ public class ContractPayment {
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
private LocalDateTime createTime;
/**
* 修改时间
*/
@TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE)
private Date modifyTime;
private LocalDateTime modifyTime;
}
\ No newline at end of file
src/main/java/vion/model/DeliverLog.java
......@@ -8,7 +8,8 @@ import lombok.Setter;
import vion.dto.DeliverLogDTO;
import vion.vo.DeliverLogVO;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* 项目交付人员日志
......@@ -52,7 +53,7 @@ public class DeliverLog {
* 日志日期
*/
@TableField(value = "log_date")
private Date logDate;
private LocalDate logDate;
/**
* 干系人
......@@ -82,11 +83,11 @@ public class DeliverLog {
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
private LocalDateTime createTime;
/**
* 修改时间
*/
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/DeliveryRecord.java
......@@ -8,7 +8,8 @@ import lombok.Setter;
import vion.dto.DeliveryRecordDTO;
import vion.vo.DeliveryRecordVO;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* 发货记录表
......@@ -36,15 +37,21 @@ public class DeliveryRecord {
@TableField(value = "contract_id")
private Long contractId;
/** 收货人 */
/**
* 收货人
*/
@TableField(value = "consignee")
private String consignee;
/** 收货地址 */
/**
* 收货地址
*/
@TableField(value = "address")
private String address;
/** 收货电话 */
/**
* 收货电话
*/
@TableField(value = "phone")
private String phone;
......@@ -52,13 +59,13 @@ public class DeliveryRecord {
* 发货日期
*/
@TableField(value = "ship_date")
private Date shipDate;
private LocalDate shipDate;
/**
* 到货签收日期
*/
@TableField(value = "sign_date")
private Date signDate;
private LocalDate signDate;
/**
* 快递公司
......@@ -87,11 +94,11 @@ public class DeliveryRecord {
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
private LocalDateTime createTime;
/**
* 修改时间
*/
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/Dept.java
......@@ -5,11 +5,11 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import java.time.LocalDateTime;
@Getter
@Setter
@TableName(value="tbl_dept_info")
@TableName(value = "tbl_dept_info")
public class Dept {
@TableId(value = "id", type = IdType.AUTO)
private Long id;
......@@ -18,9 +18,9 @@ public class Dept {
private Long parentId;
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date modifyTime;
private LocalDateTime modifyTime;
}
\ No newline at end of file
src/main/java/vion/model/Device.java
......@@ -7,7 +7,8 @@ import lombok.Data;
import vion.dto.DeviceDTO;
import vion.vo.DeviceVO;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* 设备表
......@@ -68,7 +69,7 @@ public class Device {
* 入库日期
*/
@TableField(value = "rec_date")
private Date recDate;
private LocalDate recDate;
/**
* 备注
......@@ -77,8 +78,8 @@ public class Device {
private String remark;
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/DeviceLog.java
......@@ -4,12 +4,13 @@ import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
import java.time.LocalDateTime;
/**
* @author HlQ
* @date 2024/8/12
*/
/**
* 设备变更日志表
*/
......@@ -39,5 +40,5 @@ public class DeviceLog {
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
}
\ No newline at end of file
src/main/java/vion/model/Dictionary.java
......@@ -8,11 +8,11 @@ import lombok.Getter;
import lombok.Setter;
import vion.dto.DictionaryDTO;
import java.util.Date;
import java.time.LocalDateTime;
@Getter
@Setter
@TableName(value="tbl_dictionary_info")
@TableName(value = "tbl_dictionary_info")
@AutoMappers({
@AutoMapper(target = DictionaryDTO.class),
})
......@@ -24,13 +24,17 @@ public class Dictionary {
private Integer key;
private String value;
private String remark;
/** 创建时间 */
/**
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
/** 更新时间 */
/**
* 更新时间
*/
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
private LocalDateTime updateTime;
}
src/main/java/vion/model/DictionaryType.java
......@@ -8,11 +8,11 @@ import lombok.Getter;
import lombok.Setter;
import vion.dto.DictionaryTypeDTO;
import java.util.Date;
import java.time.LocalDateTime;
@Getter
@Setter
@TableName(value="tbl_dictionary_type")
@TableName(value = "tbl_dictionary_type")
@AutoMappers({
@AutoMapper(target = DictionaryTypeDTO.class),
})
......@@ -24,13 +24,17 @@ public class DictionaryType {
private String type;
private String remark;
/** 创建时间 */
/**
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
/** 更新时间 */
/**
* 更新时间
*/
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
private LocalDateTime updateTime;
}
src/main/java/vion/model/FaultLog.java
......@@ -5,33 +5,49 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 工单操作记录
*/
@Getter
@Setter
@TableName(value="tbl_fault_log")
@TableName(value = "tbl_fault_log")
public class FaultLog {
/** 自增列 */
/**
* 自增列
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 门店id */
/**
* 门店id
*/
private Long storeId;
/** 工单id */
/**
* 工单id
*/
private Long taskId;
/** 操作者 */
/**
* 操作者
*/
private Long operator;
/** 操作内容 */
/**
* 操作内容
*/
private String content;
/** 创建时间 */
/**
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
/** 备注 */
private LocalDateTime createTime;
/**
* 备注
*/
private String remark;
/** 工时 */
/**
* 工时
*/
private Double manHour;
}
src/main/java/vion/model/FileInfo.java
......@@ -8,14 +8,14 @@ import lombok.Setter;
import vion.dto.FileInfoDTO;
import vion.vo.FileInfoVO;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 文件信息
*/
@Getter
@Setter
@TableName(value="tbl_file_info")
@TableName(value = "tbl_file_info")
@AutoMappers({
@AutoMapper(target = FileInfoDTO.class),
@AutoMapper(target = FileInfoVO.class),
......@@ -23,9 +23,13 @@ import java.util.Date;
public class FileInfo {
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 项目id */
/**
* 项目id
*/
private Long storeId;
/** 文件扩展名 */
/**
* 文件扩展名
*/
private String type;
/**
* 文件来源
......@@ -38,22 +42,38 @@ public class FileInfo {
* <br>24验收报告，25竣工图纸，26点位表，27项目总结，28前期勘察，29巡检报告，30结算资料，31启动会</br>
*/
private Integer sourceType;
/** 文件来源id */
/**
* 文件来源id
*/
private Long sourceId;
/** 合同id */
/**
* 合同id
*/
private Long contractId;
/** 文件名称 */
/**
* 文件名称
*/
@TableField(condition = SqlCondition.LIKE)
private String name;
/** 文件地址 */
/**
* 文件地址
*/
private String url;
/** 创建时间 */
/**
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
/** 备注 */
private LocalDateTime createTime;
/**
* 备注
*/
private String remark;
/** sha256 */
/**
* sha256
*/
private String sha256;
/** 上传人 */
/**
* 上传人
*/
private String uploader;
}
src/main/java/vion/model/Form.java
......@@ -9,7 +9,7 @@ import vion.config.JsonbTypeHandler;
import vion.dto.FormDTO;
import vion.vo.FormVO;
import java.util.Date;
import java.time.LocalDateTime;
/**
......@@ -60,7 +60,7 @@ public class Form {
* 签字时间
*/
@TableField(value = "sign_time")
private Date signTime;
private LocalDateTime signTime;
/**
* 唯一uuid
......@@ -87,8 +87,8 @@ public class Form {
private Long updateUser;
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/Inspect.java
......@@ -8,7 +8,8 @@ import lombok.Setter;
import vion.dto.InspectDTO;
import vion.vo.InspectVO;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* 巡检信息
......@@ -21,40 +22,66 @@ import java.util.Date;
@AutoMapper(target = InspectDTO.class),
})
public class Inspect {
/** 自增列 */
/**
* 自增列
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 门店id */
/**
* 门店id
*/
private Long storeId;
/** 巡检时间 */
/**
* 巡检时间
*/
@OrderBy
private Date inspectDate;
private LocalDate inspectDate;
/** 巡检方式（0远程、1现场） */
/**
* 巡检方式（0远程、1现场）
*/
private Integer type;
/** 状态（0进行中、1待审核、2已完成、3、驳回） */
/**
* 状态（0进行中、1待审核、2已完成、3、驳回）
*/
private Integer status;
/** 巡检人 */
/**
* 巡检人
*/
private Integer inspectUser;
/** 审核人 */
/**
* 审核人
*/
private Integer reviewer;
/** 巡检时间 */
private Date finishDate;
/**
* 巡检时间
*/
private LocalDate finishDate;
/** 审核时间 */
private Date auditDate;
/**
* 审核时间
*/
private LocalDate auditDate;
/** 创建时间 */
/**
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
private LocalDateTime createTime;
/** 修改时间 */
/**
* 修改时间
*/
@TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE)
private Date modifyTime;
/** 备注 */
private LocalDateTime modifyTime;
/**
* 备注
*/
private String remark;
/** 集团id */
/**
* 集团id
*/
private Long accountId;
}
src/main/java/vion/model/Invoice.java
......@@ -9,7 +9,8 @@ import vion.dto.InvoiceDTO;
import vion.vo.InvoiceVO;
import java.math.BigDecimal;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
......@@ -36,7 +37,7 @@ public class Invoice {
* 开票时间
*/
@TableField(value = "invoicing_time")
private Date invoicingTime;
private LocalDate invoicingTime;
/**
* 发票金额
......@@ -63,8 +64,8 @@ public class Invoice {
private String serialNo;
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/Payment.java
......@@ -9,7 +9,8 @@ import vion.dto.PaymentDTO;
import vion.vo.PaymentVO;
import java.math.BigDecimal;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* 收款记录表
......@@ -41,7 +42,7 @@ public class Payment {
* 收款时间
*/
@TableField(value = "collection_time")
private Date collectionTime;
private LocalDate collectionTime;
/**
* 收款金额
......@@ -56,8 +57,8 @@ public class Payment {
private String remark;
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/PointInfo.java
......@@ -8,7 +8,7 @@ import lombok.Setter;
import vion.dto.PointInfoDTO;
import vion.vo.PointInfoVO;
import java.util.Date;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -236,8 +236,8 @@ public class PointInfo {
private String uuid;
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/RContractProduct.java
......@@ -6,7 +6,7 @@ import lombok.Getter;
import lombok.Setter;
import java.math.BigDecimal;
import java.util.Date;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -93,9 +93,9 @@ public class RContractProduct {
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/RContractStore.java
......@@ -8,7 +8,7 @@ import lombok.Getter;
import lombok.Setter;
import vion.dto.RContractStoreDTO;
import java.util.Date;
import java.time.LocalDateTime;
/**
......@@ -53,12 +53,12 @@ public class RContractStore {
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
/**
* 修改时间
*/
@TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date modifyTime;
private LocalDateTime modifyTime;
}
\ No newline at end of file
src/main/java/vion/model/RContractTeam.java
......@@ -11,11 +11,12 @@ import lombok.Setter;
import vion.dto.RContractTeamDTO;
import vion.vo.RContractTeamVO;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* 合同与施工队关联表
*/
* 合同与施工队关联表
*/
@Getter
@Setter
@TableName(value = "r_contract_team")
......@@ -55,13 +56,13 @@ public class RContractTeam {
* 分配日期
*/
@TableField(value = "assign_date")
private Date assignDate;
private LocalDate assignDate;
/**
* 完成日期
*/
@TableField(value = "finish_date")
private Date finishDate;
private LocalDate finishDate;
/**
* 施工状态
......@@ -88,8 +89,8 @@ public class RContractTeam {
private String remark;
@TableField(value = "create_time")
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "update_time")
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/RContractUser.java
......@@ -6,7 +6,8 @@ import lombok.Getter;
import lombok.Setter;
import vion.dto.BaseDTO;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -54,9 +55,9 @@ public class RContractUser extends BaseDTO {
*/
@TableField(value = "enter_date")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date enterDate;
private LocalDate enterDate;
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
}
\ No newline at end of file
src/main/java/vion/model/RPointDevice.java
......@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -32,9 +32,9 @@ public class RPointDevice {
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/RPointWx.java
......@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -38,9 +38,9 @@ public class RPointWx {
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/RRepairDevice.java
......@@ -10,7 +10,7 @@ import lombok.Getter;
import lombok.Setter;
import vion.dto.BaseDTO;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.List;
/**
......@@ -136,9 +136,9 @@ public class RRepairDevice extends BaseDTO {
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/RRoleResource.java
......@@ -8,7 +8,7 @@ import lombok.Getter;
import lombok.Setter;
import vion.dto.RRoleResourceDTO;
import java.util.Date;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -36,13 +36,17 @@ public class RRoleResource {
@TableField(value = "resource_id")
private Long resourceId;
/** 创建时间 */
/**
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
/** 更新时间 */
/**
* 更新时间
*/
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/RStoreConfederate.java
......@@ -6,7 +6,7 @@ import lombok.Getter;
import lombok.Setter;
import vion.dto.BaseDTO;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 项目干系人
......@@ -47,12 +47,12 @@ public class RStoreConfederate extends BaseDTO {
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
/**
* 修改时间
*/
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/RStoreTag.java
......@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -32,9 +32,9 @@ public class RStoreTag {
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/RStoreUser.java
......@@ -5,12 +5,13 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import java.time.LocalDateTime;
/**
* @author HlQ
* @date 2023/12/27
*/
/**
* 项目与用户关联表
*/
......@@ -43,11 +44,11 @@ public class RStoreUser {
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@OrderBy
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
private LocalDateTime updateTime;
@TableField(exist = false)
private RStoreUser[] storeUsers;
......
src/main/java/vion/model/RUserRole.java
......@@ -8,7 +8,7 @@ import lombok.Getter;
import lombok.Setter;
import vion.dto.RUserRoleDTO;
import java.util.Date;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -41,12 +41,12 @@ public class RUserRole {
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
/**
* 更新时间
*/
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/RejectInfo.java
......@@ -6,7 +6,7 @@ import lombok.Getter;
import lombok.Setter;
import vion.dto.BaseDTO;
import java.util.Date;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -39,9 +39,9 @@ public class RejectInfo extends BaseDTO {
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/RepairRec.java
......@@ -8,7 +8,8 @@ import lombok.Setter;
import vion.dto.RepairRecDTO;
import vion.vo.RepairRecVO;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -108,7 +109,7 @@ public class RepairRec {
* 发货日期
*/
@TableField(value = "ship_date")
private Date shipDate;
private LocalDate shipDate;
/**
* 快递公司
......@@ -144,8 +145,8 @@ public class RepairRec {
private String remark;
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/Resource.java
......@@ -9,7 +9,7 @@ import lombok.Setter;
import vion.dto.ResourceDTO;
import vion.vo.ResourceVO;
import java.util.Date;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -74,14 +74,18 @@ public class Resource {
@TableField(value = "remark")
private String remark;
/** 创建时间 */
/**
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
/** 更新时间 */
/**
* 更新时间
*/
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/Role.java
......@@ -9,7 +9,7 @@ import lombok.Setter;
import vion.dto.RoleDTO;
import vion.vo.RoleVO;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 角色表
......@@ -49,14 +49,18 @@ public class Role {
@TableField(value = "remark")
private String remark;
/** 创建时间 */
/**
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
/** 更新时间 */
/**
* 更新时间
*/
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/ServiceOrder.java
......@@ -9,7 +9,7 @@ import lombok.Setter;
import vion.dto.ServiceOrderDTO;
import vion.vo.ServiceOrderVO;
import java.util.Date;
import java.time.LocalDateTime;
@Getter
@Setter
......@@ -22,74 +22,116 @@ public class ServiceOrder {
@TableId(type = IdType.AUTO)
private Long id;
/** 项目名称 */
/**
* 项目名称
*/
private String projectName;
/** 报修人 */
/**
* 报修人
*/
private String submitter;
/** 报修人手机号码 */
/**
* 报修人手机号码
*/
private String submitPhone;
/** 报修时间 */
/**
* 报修时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date submitTime;
private LocalDateTime submitTime;
/** 维修人 */
/**
* 维修人
*/
private String repairPeople;
/** 维修人手机号码*/
/**
* 维修人手机号码
*/
private String repairPhone;
/** 部门 */
/**
* 部门
*/
private String dept;
/** 服务方式(1.电话支持 2.远程服务 3.现场服务) */
/**
* 服务方式(1.电话支持 2.远程服务 3.现场服务)
*/
private Integer serviceType;
/** 耗时 */
/**
* 耗时
*/
private Double time;
/** 故障内容 */
/**
* 故障内容
*/
private String faultContent;
/** 维修结果 */
/**
* 维修结果
*/
private String repairRes;
/** 客户评价 */
/**
* 客户评价
*/
private String review;
/** 工单id */
/**
* 工单id
*/
private Long taskId;
/** 服务单状态 */
/**
* 服务单状态
*/
private Integer state;
/** 创建时间 */
/**
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
/** 更新时间 */
/**
* 更新时间
*/
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
private LocalDateTime updateTime;
/** 五星好评 */
/**
* 五星好评
*/
private Integer stars;
/** 签字图片base64 */
/**
* 签字图片base64
*/
private String signPic;
/** 签字时间 */
/**
* 签字时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date signTime;
private LocalDateTime signTime;
/** 完成时间 */
/**
* 完成时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date finishTime;
private LocalDateTime finishTime;
/** 唯一id */
/**
* 唯一id
*/
private String unid;
}
src/main/java/vion/model/SettlementDiff.java
......@@ -9,7 +9,7 @@ import vion.dto.SettlementDiffDTO;
import vion.vo.SettlementDiffVO;
import java.math.BigDecimal;
import java.util.Date;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -72,5 +72,5 @@ public class SettlementDiff {
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
private LocalDateTime createTime;
}
\ No newline at end of file
src/main/java/vion/model/SparePart.java
......@@ -8,7 +8,8 @@ import lombok.Setter;
import vion.dto.SparePartDTO;
import vion.vo.SparePartVO;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -101,7 +102,7 @@ public class SparePart {
* 发货日期
*/
@TableField(value = "ship_date")
private Date shipDate;
private LocalDate shipDate;
/**
* 快递公司
......@@ -139,13 +140,15 @@ public class SparePart {
@TableField(value = "uuid")
private String uuid;
/** 微信用户id */
/**
* 微信用户id
*/
@TableField(value = "openid")
private String openid;
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/Store.java
......@@ -9,7 +9,8 @@ import lombok.Setter;
import vion.dto.StoreDTO;
import vion.vo.StoreVO;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* 门店信息
......@@ -59,14 +60,14 @@ public class Store {
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
/**
* 修改时间
*/
@TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date modifyTime;
private LocalDateTime modifyTime;
/**
* 备注
......@@ -87,7 +88,7 @@ public class Store {
* 立项日期
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date estDate;
private LocalDate estDate;
/**
* 主合同id
......@@ -117,7 +118,7 @@ public class Store {
/**
* 实际完成日期
*/
private Date finishDate;
private LocalDate finishDate;
/**
* 完成百分比
......@@ -142,7 +143,7 @@ public class Store {
/**
* 计划完成日期
*/
private Date planFinishDate;
private LocalDate planFinishDate;
/**
* 项目规模
......
src/main/java/vion/model/StoreLog.java
......@@ -7,11 +7,12 @@ import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
import vion.dto.BaseDTO;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* 项目日志表
*/
* 项目日志表
*/
@Getter
@Setter
@TableName(value = "tbl_store_log")
......@@ -31,7 +32,7 @@ public class StoreLog extends BaseDTO {
@TableField(value = "log_date")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date logDate;
private LocalDate logDate;
/**
* 记录人
......@@ -48,9 +49,9 @@ public class StoreLog extends BaseDTO {
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@OrderBy
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/Tag.java
......@@ -6,7 +6,7 @@ import lombok.Getter;
import lombok.Setter;
import vion.dto.BaseDTO;
import java.util.Date;
import java.time.LocalDateTime;
/**
* @author HlQ
......@@ -33,9 +33,9 @@ public class Tag extends BaseDTO {
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
private LocalDateTime updateTime;
}
\ No newline at end of file
src/main/java/vion/model/Task.java
......@@ -10,7 +10,8 @@ import org.springframework.format.annotation.DateTimeFormat;
import vion.dto.TaskDTO;
import vion.vo.TaskVO;
import java.util.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
@Getter
@Setter
......@@ -35,7 +36,7 @@ public class Task {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@OrderBy(sort = 2)
private Date repairTime;
private LocalDateTime repairTime;
/**
* 故障类型
*/
......@@ -64,7 +65,7 @@ public class Task {
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date solveDate;
private LocalDate solveDate;
/**
* 故障原因
*/
......@@ -90,21 +91,21 @@ public class Task {
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date expDate;
private LocalDate expDate;
/**
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
/**
* 修改时间
*/
@TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date modifyTime;
private LocalDateTime modifyTime;
/**
* 备注
......
src/main/java/vion/model/TaskTemp.java
......@@ -10,54 +10,76 @@ import org.springframework.format.annotation.DateTimeFormat;
import vion.dto.TaskTempDTO;
import vion.vo.TaskTempVO;
import java.util.Date;
import java.time.LocalDateTime;
@Getter
@Setter
@TableName(value="tbl_task_temp")
@TableName(value = "tbl_task_temp")
@AutoMappers({
@AutoMapper(target = TaskTempVO.class),
@AutoMapper(target = TaskTempDTO.class),
})
public class TaskTemp {
@TableId(type= IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
/** 项目id */
/**
* 项目id
*/
private Long storeId;
/** 项目名称(用户提交的名称) */
/**
* 项目名称(用户提交的名称)
*/
@TableField(condition = SqlCondition.LIKE)
private String storeName;
/** 报修时间 */
/**
* 报修时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@OrderBy(sort = 2)
private Date repairTime;
private LocalDateTime repairTime;
/** 故障说明 */
/**
* 故障说明
*/
private String faultDescription;
/** 报修人 */
/**
* 报修人
*/
@TableField(condition = SqlCondition.LIKE)
private String repairPeople;
/** 联系方式 */
/**
* 联系方式
*/
@TableField(condition = SqlCondition.LIKE)
private String repairPhone;
/** 状态（1待确认、2进行中、3已确认） */
/**
* 状态（1待确认、2进行中、3已确认）
*/
@OrderBy(asc = true, sort = 1)
private Integer status;
/** 操作人 */
/**
* 操作人
*/
private Long operator;
/** 创建时间 */
/**
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
/** 修改时间 */
/**
* 修改时间
*/
@TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date modifyTime;
private LocalDateTime modifyTime;
/** 备注 */
/**
* 备注
*/
private String remark;
/**
......@@ -70,7 +92,9 @@ public class TaskTemp {
*/
private String email;
/** 微信用户id */
/**
* 微信用户id
*/
private String openid;
}
src/main/java/vion/model/User.java
......@@ -9,14 +9,14 @@ import lombok.Setter;
import vion.dto.UserDTO;
import vion.vo.UserVO;
import java.util.Date;
import java.time.LocalDateTime;
/**
* 用户信息
*/
@Getter
@Setter
@TableName(value="tbl_user_info")
@TableName(value = "tbl_user_info")
@AutoMappers({
@AutoMapper(target = UserDTO.class),
@AutoMapper(target = UserVO.class),
......@@ -31,16 +31,20 @@ public class User {
private Long deptId;
@TableField(value = "create_time", fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private LocalDateTime createTime;
@TableField(value = "modify_time", fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date modifyTime;
private LocalDateTime modifyTime;
private String remark;
/** 是否是预工单处理人 0：不是 1：是 */
/**
* 是否是预工单处理人 0：不是 1：是
*/
private Integer preWorkOrder;
/** 员工状态 2：试用期 3：正式 5：待离职 -1：无状态 */
/**
* 员工状态 2：试用期 3：正式 5：待离职 -1：无状态
*/
private Integer employeeStatus;
/* 状态 0：正常 1：禁用 */
......
src/main/java/vion/service/IDeviceLogService.java
......@@ -2,11 +2,12 @@ package vion.service;
import com.baomidou.mybatisplus.extension.service.IService;
import vion.model.DeviceLog;
/**
/**
* @author HlQ
* @date 2024/8/12
*/
public interface IDeviceLogService extends IService<DeviceLog>{
public interface IDeviceLogService extends IService<DeviceLog> {
}
src/main/java/vion/service/IRContractProductService.java
package vion.service;
import vion.model.RContractProduct;
import com.baomidou.mybatisplus.extension.service.IService;
/**
import vion.model.RContractProduct;
/**
* @author HlQ
* @date 2024/3/26
*/
public interface IRContractProductService extends IService<RContractProduct>{
public interface IRContractProductService extends IService<RContractProduct> {
}
src/main/java/vion/service/IRContractStoreService.java
package vion.service;
import vion.model.RContractStore;
import com.github.yulichang.base.MPJBaseService;
/**
import vion.model.RContractStore;
/**
* @author HlQ
* @date 2023/11/29
*/
public interface IRContractStoreService extends MPJBaseService<RContractStore>{
public interface IRContractStoreService extends MPJBaseService<RContractStore> {
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!