Commit 784207e7 by HlQ

[chg] 代码优化

1 parent fa845a68
Showing 63 changed files with 238 additions and 122 deletions
...@@ -93,7 +93,7 @@ public class InvoiceController { ...@@ -93,7 +93,7 @@ public class InvoiceController {
*/ */
@GetMapping("/invoice/calMoney") @GetMapping("/invoice/calMoney")
@SaCheckPermission(value = "invoice:calMoney", orRole = "admin") @SaCheckPermission(value = "invoice:calMoney", orRole = "admin")
public String calMoney(String[] noList) { public String calMoney(@RequestParam(required = false) List<String> noList) {
return invoiceService.calMoney(noList); return invoiceService.calMoney(noList);
} }
......
...@@ -144,7 +144,7 @@ public class TaskController { ...@@ -144,7 +144,7 @@ public class TaskController {
public List<Map<String, Object>> peopleAnalysis(@DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, public List<Map<String, Object>> peopleAnalysis(@DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
@DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate,
Integer source, Integer source,
Long[] userIds) { @RequestParam(required = false) List<Long> userIds) {
return taskService.peopleAnalysis(startDate, endDate, source, userIds); return taskService.peopleAnalysis(startDate, endDate, source, userIds);
} }
...@@ -153,7 +153,7 @@ public class TaskController { ...@@ -153,7 +153,7 @@ public class TaskController {
public List<Map<String, Object>> proAnalysis(@DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, public List<Map<String, Object>> proAnalysis(@DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
@DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate,
Integer source, Integer source,
Long[] userIds) { @RequestParam(required = false) List<Long> userIds) {
return taskService.proAnalysis(startDate, endDate, source, userIds); return taskService.proAnalysis(startDate, endDate, source, userIds);
} }
......
...@@ -132,9 +132,8 @@ public class UserController { ...@@ -132,9 +132,8 @@ public class UserController {
@GetMapping("/wechatCallback") @GetMapping("/wechatCallback")
public Object wechatCallback(String code, Integer active, HttpServletResponse res) throws IOException { public Object wechatCallback(String code, Integer active, HttpServletResponse res) throws IOException {
Object obj = wechatMod.getOpenid(code); Object obj = wechatMod.getOpenid(code);
if (obj instanceof Map) { if (obj instanceof Map map) {
Map<String, String> map = (Map<String, String>) obj; res.sendRedirect(StrUtil.format("https://yunwei.vionyun.com/wap?openid={}&nickname={}&active={}", map.get("openid"), UrlEncoder.encodeAll((String) map.get("nickname")), active));
res.sendRedirect(StrUtil.format("https://yunwei.vionyun.com/wap?openid={}&nickname={}&active={}", map.get("openid"), UrlEncoder.encodeAll(map.get("nickname")), active));
} else { } else {
return obj; return obj;
} }
......
package vion.dto; package vion.dto;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
@Data @Getter
@Setter
public class ConstructionTeamDTO extends BaseDTO { public class ConstructionTeamDTO extends BaseDTO {
private Long id; private Long id;
......
...@@ -6,6 +6,7 @@ import lombok.Setter; ...@@ -6,6 +6,7 @@ import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
import java.util.List;
@Getter @Getter
@Setter @Setter
...@@ -31,7 +32,7 @@ public class DeliverLogDTO extends BaseDTO { ...@@ -31,7 +32,7 @@ public class DeliverLogDTO extends BaseDTO {
* 日志人 * 日志人
*/ */
private Long userId; private Long userId;
private Long[] userIds; private List<Long> userIds;
/** /**
* 日志日期 * 日志日期
......
package vion.dto; package vion.dto;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@Data @Getter
@Setter
public class StatusDTO { public class StatusDTO {
/** 门店id */ /** 门店id */
private Long storeId; private Long storeId;
......
...@@ -6,6 +6,7 @@ import lombok.Setter; ...@@ -6,6 +6,7 @@ import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* 门店信息 * 门店信息
...@@ -14,7 +15,7 @@ import java.util.Date; ...@@ -14,7 +15,7 @@ import java.util.Date;
@Setter @Setter
public class StoreDTO extends BaseDTO { public class StoreDTO extends BaseDTO {
private Long id; private Long id;
private Long[] ids; private List<Long> ids;
/** 门店名称 */ /** 门店名称 */
private String name ; private String name ;
/** 销售人 */ /** 销售人 */
......
...@@ -7,6 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat; ...@@ -7,6 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.Date; import java.util.Date;
import java.util.List;
@Getter @Getter
@Setter @Setter
...@@ -68,7 +69,7 @@ public class TaskDTO extends BaseDTO { ...@@ -68,7 +69,7 @@ public class TaskDTO extends BaseDTO {
* 当前处理人 * 当前处理人
*/ */
private Long activeUser; private Long activeUser;
private Long[] activeUsers; private List<Long> activeUsers;
/** /**
* 截止日期 * 截止日期
*/ */
......
...@@ -2,12 +2,14 @@ package vion.model; ...@@ -2,12 +2,14 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.BaseDTO; import vion.dto.BaseDTO;
import java.util.Date; import java.util.Date;
@Data @Getter
@Setter
@TableName(value = "tbl_account_info") @TableName(value = "tbl_account_info")
public class Account extends BaseDTO { public class Account extends BaseDTO {
/** /**
......
...@@ -3,7 +3,8 @@ package vion.model; ...@@ -3,7 +3,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.ConstructionTeamDTO; import vion.dto.ConstructionTeamDTO;
import vion.vo.ConstructionTeamVO; import vion.vo.ConstructionTeamVO;
...@@ -12,7 +13,8 @@ import java.util.Date; ...@@ -12,7 +13,8 @@ import java.util.Date;
/** /**
* 施工队信息表 * 施工队信息表
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_construction_team") @TableName(value = "tbl_construction_team")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = ConstructionTeamVO.class), @AutoMapper(target = ConstructionTeamVO.class),
......
package vion.model; package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.github.linpeilie.annotations.*; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import io.github.linpeilie.annotations.AutoMappers;
import io.github.linpeilie.annotations.ReverseAutoMapping;
import lombok.Getter;
import lombok.Setter;
import vion.dto.ContractDTO; import vion.dto.ContractDTO;
import vion.vo.ContractVO; import vion.vo.ContractVO;
...@@ -13,7 +16,8 @@ import java.util.Date; ...@@ -13,7 +16,8 @@ import java.util.Date;
/** /**
* 合同 * 合同
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_contract_info") @TableName(value = "tbl_contract_info")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = ContractVO.class), @AutoMapper(target = ContractVO.class),
......
...@@ -2,7 +2,8 @@ package vion.model; ...@@ -2,7 +2,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import java.util.Date; import java.util.Date;
...@@ -10,7 +11,8 @@ import java.util.Date; ...@@ -10,7 +11,8 @@ import java.util.Date;
* @author HlQ * @author HlQ
* @date 2023/12/6 * @date 2023/12/6
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_contract_log") @TableName(value = "tbl_contract_log")
public class ContractLog { public class ContractLog {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
......
...@@ -3,7 +3,8 @@ package vion.model; ...@@ -3,7 +3,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.ContractPaymentDTO; import vion.dto.ContractPaymentDTO;
import vion.vo.ContractPaymentVO; import vion.vo.ContractPaymentVO;
...@@ -13,7 +14,8 @@ import java.util.Date; ...@@ -13,7 +14,8 @@ import java.util.Date;
/** /**
* 合同收款方式 * 合同收款方式
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_contract_payment_info") @TableName(value = "tbl_contract_payment_info")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = ContractPaymentVO.class), @AutoMapper(target = ContractPaymentVO.class),
......
...@@ -3,7 +3,8 @@ package vion.model; ...@@ -3,7 +3,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.DeliverLogDTO; import vion.dto.DeliverLogDTO;
import vion.vo.DeliverLogVO; import vion.vo.DeliverLogVO;
...@@ -12,7 +13,8 @@ import java.util.Date; ...@@ -12,7 +13,8 @@ import java.util.Date;
/** /**
* 项目交付人员日志 * 项目交付人员日志
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_deliver_log") @TableName(value = "tbl_deliver_log")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = DeliverLogVO.class), @AutoMapper(target = DeliverLogVO.class),
......
...@@ -3,7 +3,8 @@ package vion.model; ...@@ -3,7 +3,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.DeliveryRecordDTO; import vion.dto.DeliveryRecordDTO;
import vion.vo.DeliveryRecordVO; import vion.vo.DeliveryRecordVO;
...@@ -12,7 +13,8 @@ import java.util.Date; ...@@ -12,7 +13,8 @@ import java.util.Date;
/** /**
* 发货记录表 * 发货记录表
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_delivery_record") @TableName(value = "tbl_delivery_record")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = DeliveryRecordVO.class), @AutoMapper(target = DeliveryRecordVO.class),
......
...@@ -2,11 +2,13 @@ package vion.model; ...@@ -2,11 +2,13 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import java.util.Date; import java.util.Date;
@Data @Getter
@Setter
@TableName(value="tbl_dept_info") @TableName(value="tbl_dept_info")
public class Dept { public class Dept {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
......
...@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.annotation.*; ...@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.DictionaryDTO; import vion.dto.DictionaryDTO;
import java.util.Date; import java.util.Date;
@Data @Getter
@Setter
@TableName(value="tbl_dictionary_info") @TableName(value="tbl_dictionary_info")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = DictionaryDTO.class), @AutoMapper(target = DictionaryDTO.class),
......
...@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.annotation.*; ...@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.DictionaryTypeDTO; import vion.dto.DictionaryTypeDTO;
import java.util.Date; import java.util.Date;
@Data @Getter
@Setter
@TableName(value="tbl_dictionary_type") @TableName(value="tbl_dictionary_type")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = DictionaryTypeDTO.class), @AutoMapper(target = DictionaryTypeDTO.class),
......
...@@ -2,14 +2,16 @@ package vion.model; ...@@ -2,14 +2,16 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import java.util.Date; import java.util.Date;
/** /**
* 工单操作记录 * 工单操作记录
*/ */
@Data @Getter
@Setter
@TableName(value="tbl_fault_log") @TableName(value="tbl_fault_log")
public class FaultLog { public class FaultLog {
/** 自增列 */ /** 自增列 */
......
...@@ -3,7 +3,8 @@ package vion.model; ...@@ -3,7 +3,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.FileInfoDTO; import vion.dto.FileInfoDTO;
import vion.vo.FileInfoVO; import vion.vo.FileInfoVO;
...@@ -12,7 +13,8 @@ import java.util.Date; ...@@ -12,7 +13,8 @@ import java.util.Date;
/** /**
* 文件信息 * 文件信息
*/ */
@Data @Getter
@Setter
@TableName(value="tbl_file_info") @TableName(value="tbl_file_info")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = FileInfoDTO.class), @AutoMapper(target = FileInfoDTO.class),
......
...@@ -3,7 +3,8 @@ package vion.model; ...@@ -3,7 +3,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.config.JsonbTypeHandler; import vion.config.JsonbTypeHandler;
import vion.dto.FormDTO; import vion.dto.FormDTO;
import vion.vo.FormVO; import vion.vo.FormVO;
...@@ -14,7 +15,8 @@ import java.util.Date; ...@@ -14,7 +15,8 @@ import java.util.Date;
/** /**
* 表单集合表 * 表单集合表
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_form", autoResultMap = true) @TableName(value = "tbl_form", autoResultMap = true)
@AutoMappers({ @AutoMappers({
@AutoMapper(target = FormVO.class), @AutoMapper(target = FormVO.class),
......
...@@ -3,7 +3,8 @@ package vion.model; ...@@ -3,7 +3,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.InspectDTO; import vion.dto.InspectDTO;
import vion.vo.InspectVO; import vion.vo.InspectVO;
...@@ -12,7 +13,8 @@ import java.util.Date; ...@@ -12,7 +13,8 @@ import java.util.Date;
/** /**
* 巡检信息 * 巡检信息
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_inspect_info") @TableName(value = "tbl_inspect_info")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = InspectVO.class), @AutoMapper(target = InspectVO.class),
......
...@@ -3,7 +3,8 @@ package vion.model; ...@@ -3,7 +3,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.InvoiceDTO; import vion.dto.InvoiceDTO;
import vion.vo.InvoiceVO; import vion.vo.InvoiceVO;
...@@ -14,7 +15,8 @@ import java.util.Date; ...@@ -14,7 +15,8 @@ import java.util.Date;
/** /**
* 发票记录表 * 发票记录表
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_invoice") @TableName(value = "tbl_invoice")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = InvoiceVO.class), @AutoMapper(target = InvoiceVO.class),
......
...@@ -3,7 +3,8 @@ package vion.model; ...@@ -3,7 +3,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.PaymentDTO; import vion.dto.PaymentDTO;
import vion.vo.PaymentVO; import vion.vo.PaymentVO;
...@@ -13,7 +14,8 @@ import java.util.Date; ...@@ -13,7 +14,8 @@ import java.util.Date;
/** /**
* 收款记录表 * 收款记录表
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_payment") @TableName(value = "tbl_payment")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = PaymentVO.class), @AutoMapper(target = PaymentVO.class),
......
...@@ -3,7 +3,8 @@ package vion.model; ...@@ -3,7 +3,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.PointInfoDTO; import vion.dto.PointInfoDTO;
import vion.vo.PointInfoVO; import vion.vo.PointInfoVO;
...@@ -13,7 +14,8 @@ import java.util.Date; ...@@ -13,7 +14,8 @@ import java.util.Date;
* @author HlQ * @author HlQ
* @date 2024/1/8 * @date 2024/1/8
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_point_info") @TableName(value = "tbl_point_info")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = PointInfoVO.class), @AutoMapper(target = PointInfoVO.class),
......
...@@ -2,7 +2,8 @@ package vion.model; ...@@ -2,7 +2,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
...@@ -11,7 +12,8 @@ import java.util.Date; ...@@ -11,7 +12,8 @@ import java.util.Date;
* @author HlQ * @author HlQ
* @date 2024/3/26 * @date 2024/3/26
*/ */
@Data @Getter
@Setter
@TableName(value = "r_contract_product") @TableName(value = "r_contract_product")
public class RContractProduct { public class RContractProduct {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
......
...@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*; ...@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.RContractStoreDTO; import vion.dto.RContractStoreDTO;
import java.util.Date; import java.util.Date;
...@@ -13,7 +14,8 @@ import java.util.Date; ...@@ -13,7 +14,8 @@ import java.util.Date;
/** /**
* 合同项目关联 * 合同项目关联
*/ */
@Data @Getter
@Setter
@TableName(value = "r_contract_store") @TableName(value = "r_contract_store")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = RContractStoreDTO.class), @AutoMapper(target = RContractStoreDTO.class),
......
...@@ -6,7 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; ...@@ -6,7 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.RContractTeamDTO; import vion.dto.RContractTeamDTO;
import vion.vo.RContractTeamVO; import vion.vo.RContractTeamVO;
...@@ -15,7 +16,8 @@ import java.util.Date; ...@@ -15,7 +16,8 @@ import java.util.Date;
/** /**
* 合同与施工队关联表 * 合同与施工队关联表
*/ */
@Data @Getter
@Setter
@TableName(value = "r_contract_team") @TableName(value = "r_contract_team")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = RContractTeamVO.class), @AutoMapper(target = RContractTeamVO.class),
......
...@@ -2,7 +2,8 @@ package vion.model; ...@@ -2,7 +2,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.BaseDTO; import vion.dto.BaseDTO;
import java.util.Date; import java.util.Date;
...@@ -11,7 +12,8 @@ import java.util.Date; ...@@ -11,7 +12,8 @@ import java.util.Date;
* @author HlQ * @author HlQ
* @date 2023/12/28 * @date 2023/12/28
*/ */
@Data @Getter
@Setter
@TableName(value = "r_contract_user") @TableName(value = "r_contract_user")
public class RContractUser extends BaseDTO { public class RContractUser extends BaseDTO {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
......
...@@ -2,7 +2,8 @@ package vion.model; ...@@ -2,7 +2,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import java.util.Date; import java.util.Date;
...@@ -10,7 +11,8 @@ import java.util.Date; ...@@ -10,7 +11,8 @@ import java.util.Date;
* @author HlQ * @author HlQ
* @date 2024/1/12 * @date 2024/1/12
*/ */
@Data @Getter
@Setter
@TableName(value = "r_point_device") @TableName(value = "r_point_device")
public class RPointDevice { public class RPointDevice {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
......
...@@ -2,7 +2,8 @@ package vion.model; ...@@ -2,7 +2,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import java.util.Date; import java.util.Date;
...@@ -10,7 +11,8 @@ import java.util.Date; ...@@ -10,7 +11,8 @@ import java.util.Date;
* @author HlQ * @author HlQ
* @date 2024/1/12 * @date 2024/1/12
*/ */
@Data @Getter
@Setter
@TableName(value = "r_point_wx") @TableName(value = "r_point_wx")
public class RPointWx { public class RPointWx {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
......
...@@ -6,7 +6,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; ...@@ -6,7 +6,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.github.liaochong.myexcel.core.annotation.ExcelColumn; import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
import com.github.liaochong.myexcel.core.annotation.ExcelModel; import com.github.liaochong.myexcel.core.annotation.ExcelModel;
import com.github.liaochong.myexcel.core.annotation.MultiColumn; import com.github.liaochong.myexcel.core.annotation.MultiColumn;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.BaseDTO; import vion.dto.BaseDTO;
import java.util.Date; import java.util.Date;
...@@ -16,7 +17,8 @@ import java.util.List; ...@@ -16,7 +17,8 @@ import java.util.List;
* @author HlQ * @author HlQ
* @date 2024/1/25 * @date 2024/1/25
*/ */
@Data @Getter
@Setter
@TableName(value = "r_repair_device") @TableName(value = "r_repair_device")
@ExcelModel(includeAllField = false) @ExcelModel(includeAllField = false)
public class RRepairDevice extends BaseDTO { public class RRepairDevice extends BaseDTO {
......
...@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*; ...@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.RRoleResourceDTO; import vion.dto.RRoleResourceDTO;
import java.util.Date; import java.util.Date;
...@@ -13,7 +14,8 @@ import java.util.Date; ...@@ -13,7 +14,8 @@ import java.util.Date;
* @author HlQ * @author HlQ
* @date 2023/11/28 * @date 2023/11/28
*/ */
@Data @Getter
@Setter
@TableName(value = "r_role_resource") @TableName(value = "r_role_resource")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = RRoleResourceDTO.class), @AutoMapper(target = RRoleResourceDTO.class),
......
...@@ -2,7 +2,8 @@ package vion.model; ...@@ -2,7 +2,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.BaseDTO; import vion.dto.BaseDTO;
import java.util.Date; import java.util.Date;
...@@ -10,7 +11,8 @@ import java.util.Date; ...@@ -10,7 +11,8 @@ import java.util.Date;
/** /**
* 项目干系人 * 项目干系人
*/ */
@Data @Getter
@Setter
@TableName(value = "r_store_confederate") @TableName(value = "r_store_confederate")
public class RStoreConfederate extends BaseDTO { public class RStoreConfederate extends BaseDTO {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
......
...@@ -2,7 +2,8 @@ package vion.model; ...@@ -2,7 +2,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import java.util.Date; import java.util.Date;
...@@ -10,7 +11,8 @@ import java.util.Date; ...@@ -10,7 +11,8 @@ import java.util.Date;
* @author HlQ * @author HlQ
* @date 2024/1/30 * @date 2024/1/30
*/ */
@Data @Getter
@Setter
@TableName(value = "r_store_tag") @TableName(value = "r_store_tag")
public class RStoreTag { public class RStoreTag {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
......
...@@ -2,7 +2,8 @@ package vion.model; ...@@ -2,7 +2,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import java.util.Date; import java.util.Date;
...@@ -13,7 +14,8 @@ import java.util.Date; ...@@ -13,7 +14,8 @@ import java.util.Date;
/** /**
* 项目与用户关联表 * 项目与用户关联表
*/ */
@Data @Getter
@Setter
@TableName(value = "r_store_user") @TableName(value = "r_store_user")
public class RStoreUser { public class RStoreUser {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
......
...@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*; ...@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.RUserRoleDTO; import vion.dto.RUserRoleDTO;
import java.util.Date; import java.util.Date;
...@@ -13,7 +14,8 @@ import java.util.Date; ...@@ -13,7 +14,8 @@ import java.util.Date;
* @author HlQ * @author HlQ
* @date 2023/11/28 * @date 2023/11/28
*/ */
@Data @Getter
@Setter
@TableName(value = "r_user_role") @TableName(value = "r_user_role")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = RUserRoleDTO.class), @AutoMapper(target = RUserRoleDTO.class),
......
...@@ -2,7 +2,8 @@ package vion.model; ...@@ -2,7 +2,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.BaseDTO; import vion.dto.BaseDTO;
import java.util.Date; import java.util.Date;
...@@ -11,7 +12,8 @@ import java.util.Date; ...@@ -11,7 +12,8 @@ import java.util.Date;
* @author HlQ * @author HlQ
* @date 2024/1/8 * @date 2024/1/8
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_reject_info") @TableName(value = "tbl_reject_info")
public class RejectInfo extends BaseDTO { public class RejectInfo extends BaseDTO {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
......
...@@ -3,7 +3,8 @@ package vion.model; ...@@ -3,7 +3,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.RepairRecDTO; import vion.dto.RepairRecDTO;
import vion.vo.RepairRecVO; import vion.vo.RepairRecVO;
...@@ -13,7 +14,8 @@ import java.util.Date; ...@@ -13,7 +14,8 @@ import java.util.Date;
* @author HlQ * @author HlQ
* @date 2024/1/24 * @date 2024/1/24
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_repair_rec") @TableName(value = "tbl_repair_rec")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = RepairRecVO.class), @AutoMapper(target = RepairRecVO.class),
......
...@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*; ...@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.ResourceDTO; import vion.dto.ResourceDTO;
import vion.vo.ResourceVO; import vion.vo.ResourceVO;
...@@ -14,7 +15,8 @@ import java.util.Date; ...@@ -14,7 +15,8 @@ import java.util.Date;
* @author HlQ * @author HlQ
* @date 2023/11/28 * @date 2023/11/28
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_resource") @TableName(value = "tbl_resource")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = ResourceVO.class), @AutoMapper(target = ResourceVO.class),
......
...@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*; ...@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.RoleDTO; import vion.dto.RoleDTO;
import vion.vo.RoleVO; import vion.vo.RoleVO;
...@@ -13,7 +14,8 @@ import java.util.Date; ...@@ -13,7 +14,8 @@ import java.util.Date;
/** /**
* 角色表 * 角色表
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_role") @TableName(value = "tbl_role")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = RoleVO.class), @AutoMapper(target = RoleVO.class),
......
...@@ -4,13 +4,15 @@ import com.baomidou.mybatisplus.annotation.*; ...@@ -4,13 +4,15 @@ import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.ServiceOrderDTO; import vion.dto.ServiceOrderDTO;
import vion.vo.ServiceOrderVO; import vion.vo.ServiceOrderVO;
import java.util.Date; import java.util.Date;
@Data @Getter
@Setter
@TableName("tbl_service_order") @TableName("tbl_service_order")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = ServiceOrderVO.class), @AutoMapper(target = ServiceOrderVO.class),
......
...@@ -3,7 +3,8 @@ package vion.model; ...@@ -3,7 +3,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.SettlementDiffDTO; import vion.dto.SettlementDiffDTO;
import vion.vo.SettlementDiffVO; import vion.vo.SettlementDiffVO;
...@@ -14,7 +15,8 @@ import java.util.Date; ...@@ -14,7 +15,8 @@ import java.util.Date;
* @author HlQ * @author HlQ
* @date 2023/12/26 * @date 2023/12/26
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_settlement_diff") @TableName(value = "tbl_settlement_diff")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = SettlementDiffVO.class), @AutoMapper(target = SettlementDiffVO.class),
......
...@@ -3,7 +3,8 @@ package vion.model; ...@@ -3,7 +3,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.SparePartDTO; import vion.dto.SparePartDTO;
import vion.vo.SparePartVO; import vion.vo.SparePartVO;
...@@ -13,7 +14,8 @@ import java.util.Date; ...@@ -13,7 +14,8 @@ import java.util.Date;
* @author HlQ * @author HlQ
* @date 2024/1/19 * @date 2024/1/19
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_spare_part") @TableName(value = "tbl_spare_part")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = SparePartVO.class), @AutoMapper(target = SparePartVO.class),
......
...@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*; ...@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.StoreDTO; import vion.dto.StoreDTO;
import vion.vo.StoreVO; import vion.vo.StoreVO;
...@@ -13,7 +14,8 @@ import java.util.Date; ...@@ -13,7 +14,8 @@ import java.util.Date;
/** /**
* 门店信息 * 门店信息
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_store_info") @TableName(value = "tbl_store_info")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = StoreVO.class), @AutoMapper(target = StoreVO.class),
......
...@@ -2,7 +2,8 @@ package vion.model; ...@@ -2,7 +2,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import vion.dto.BaseDTO; import vion.dto.BaseDTO;
...@@ -11,7 +12,8 @@ import java.util.Date; ...@@ -11,7 +12,8 @@ import java.util.Date;
/** /**
* 项目日志表 * 项目日志表
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_store_log") @TableName(value = "tbl_store_log")
public class StoreLog extends BaseDTO { public class StoreLog extends BaseDTO {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
......
...@@ -2,7 +2,8 @@ package vion.model; ...@@ -2,7 +2,8 @@ package vion.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.BaseDTO; import vion.dto.BaseDTO;
import java.util.Date; import java.util.Date;
...@@ -11,7 +12,8 @@ import java.util.Date; ...@@ -11,7 +12,8 @@ import java.util.Date;
* @author HlQ * @author HlQ
* @date 2024/1/30 * @date 2024/1/30
*/ */
@Data @Getter
@Setter
@TableName(value = "tbl_tag") @TableName(value = "tbl_tag")
public class Tag extends BaseDTO { public class Tag extends BaseDTO {
@TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.AUTO)
......
...@@ -4,14 +4,16 @@ import com.baomidou.mybatisplus.annotation.*; ...@@ -4,14 +4,16 @@ import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import vion.dto.TaskDTO; import vion.dto.TaskDTO;
import vion.vo.TaskVO; import vion.vo.TaskVO;
import java.util.Date; import java.util.Date;
@Data @Getter
@Setter
@TableName(value="tbl_task_info") @TableName(value="tbl_task_info")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = TaskVO.class), @AutoMapper(target = TaskVO.class),
......
...@@ -4,14 +4,16 @@ import com.baomidou.mybatisplus.annotation.*; ...@@ -4,14 +4,16 @@ import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import vion.dto.TaskTempDTO; import vion.dto.TaskTempDTO;
import vion.vo.TaskTempVO; import vion.vo.TaskTempVO;
import java.util.Date; import java.util.Date;
@Data @Getter
@Setter
@TableName(value="tbl_task_temp") @TableName(value="tbl_task_temp")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = TaskTempVO.class), @AutoMapper(target = TaskTempVO.class),
......
...@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*; ...@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.dto.UserDTO; import vion.dto.UserDTO;
import vion.vo.UserVO; import vion.vo.UserVO;
...@@ -13,7 +14,8 @@ import java.util.Date; ...@@ -13,7 +14,8 @@ import java.util.Date;
/** /**
* 用户信息 * 用户信息
*/ */
@Data @Getter
@Setter
@TableName(value="tbl_user_info") @TableName(value="tbl_user_info")
@AutoMappers({ @AutoMappers({
@AutoMapper(target = UserDTO.class), @AutoMapper(target = UserDTO.class),
......
...@@ -18,6 +18,6 @@ public interface IInvoiceService extends MPJBaseService<Invoice> { ...@@ -18,6 +18,6 @@ public interface IInvoiceService extends MPJBaseService<Invoice> {
String delById(Long id); String delById(Long id);
String calMoney(String[] noList); String calMoney(List<String> noList);
} }
...@@ -26,9 +26,9 @@ public interface ITaskService extends MPJBaseService<Task> { ...@@ -26,9 +26,9 @@ public interface ITaskService extends MPJBaseService<Task> {
String urgeTask(Long taskId, String remark); String urgeTask(Long taskId, String remark);
List<Map<String, Object>> peopleAnalysis(Date startDate, Date endDate, Integer source, Long[] userIds); List<Map<String, Object>> peopleAnalysis(Date startDate, Date endDate, Integer source, List<Long> userIds);
List<Map<String, Object>> proAnalysis(Date startDate, Date endDate, Integer source, Long[] userIds); List<Map<String, Object>> proAnalysis(Date startDate, Date endDate, Integer source, List<Long> userIds);
Map<String, Map<String, List<Task>>> summaryAnalysis(Date startDate, Date endDate, Integer source); Map<String, Map<String, List<Task>>> summaryAnalysis(Date startDate, Date endDate, Integer source);
} }
...@@ -293,7 +293,7 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont ...@@ -293,7 +293,7 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
Contract contract = converter.convert(dto, Contract.class); Contract contract = converter.convert(dto, Contract.class);
// 如果当前合同进度在要修改的进度前,此时不能修改合同进度。e.g 当前合同进度是项目验收,此时传参过来到货,那么不能修改 // 如果当前合同进度在要修改的进度前,此时不能修改合同进度。e.g 当前合同进度是项目验收,此时传参过来到货,那么不能修改
if (contract.getStatus() < existContract.getStatus()) { if (ObjUtil.isNotNull(contract.getStatus()) && contract.getStatus() < existContract.getStatus()) {
contract.setStatus(null); contract.setStatus(null);
} }
Long contractId = existContract.getId(); Long contractId = existContract.getId();
...@@ -915,7 +915,8 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont ...@@ -915,7 +915,8 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
// 两平台共存的合同 // 两平台共存的合同
log.info("合同编号验证:{}", JSONUtil.ofObj().set("unsynced", unsyncedList).set("extra", extraList)); log.info("合同编号验证:{}", JSONUtil.ofObj().set("unsynced", unsyncedList).set("extra", extraList));
var sameList = CollUtil.intersectionDistinct(dataIdSet, contractNoList); var sameList = CollUtil.intersectionDistinct(dataIdSet, contractNoList);
contractDiff(sameList); // 只比对合同编号SC开头的合同
contractDiff(sameList.stream().filter(no -> StrUtil.startWith(no, "SC")).collect(Collectors.toSet()));
} }
/** /**
...@@ -1088,7 +1089,7 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont ...@@ -1088,7 +1089,7 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
var bongMap = BeanUtil.beanToMap(xbongContract, new HashMap<>(), copyOptions); var bongMap = BeanUtil.beanToMap(xbongContract, new HashMap<>(), copyOptions);
if (!mapEqual(platMap, bongMap)) { if (!mapEqual(platMap, bongMap)) {
log.info("不一致的合同:{}", contractNo); log.info("不一致的合同:{}", contractNo);
// // SC 合同全部对比, CS 合同只对比金额
} }
} }
} }
......
...@@ -153,7 +153,7 @@ public class InvoiceServiceImpl extends MPJBaseServiceImpl<InvoiceMapper, Invoic ...@@ -153,7 +153,7 @@ public class InvoiceServiceImpl extends MPJBaseServiceImpl<InvoiceMapper, Invoic
} }
@Override @Override
public String calMoney(String[] noList) { public String calMoney(List<String> noList) {
Map<String, BigDecimal> no2SumMap = this.lambdaQuery() Map<String, BigDecimal> no2SumMap = this.lambdaQuery()
.in(ArrayUtil.isNotEmpty(noList), Invoice::getContractNo, noList) .in(ArrayUtil.isNotEmpty(noList), Invoice::getContractNo, noList)
.list() .list()
......
...@@ -424,7 +424,7 @@ public class TaskServiceImpl extends MPJBaseServiceImpl<TaskMapper, Task> implem ...@@ -424,7 +424,7 @@ public class TaskServiceImpl extends MPJBaseServiceImpl<TaskMapper, Task> implem
} }
@Override @Override
public List<Map<String, Object>> peopleAnalysis(Date startDate, Date endDate, Integer source, Long[] userIds) { public List<Map<String, Object>> peopleAnalysis(Date startDate, Date endDate, Integer source, List<Long> userIds) {
List<Task> taskList = this.lambdaQuery() List<Task> taskList = this.lambdaQuery()
.between(ArrayUtil.isAllNotNull(startDate, endDate), Task::getRepairTime, startDate, endDate) .between(ArrayUtil.isAllNotNull(startDate, endDate), Task::getRepairTime, startDate, endDate)
.isNotNull(ObjUtil.equals(source, 1), Task::getTaskTempId) .isNotNull(ObjUtil.equals(source, 1), Task::getTaskTempId)
...@@ -470,7 +470,7 @@ public class TaskServiceImpl extends MPJBaseServiceImpl<TaskMapper, Task> implem ...@@ -470,7 +470,7 @@ public class TaskServiceImpl extends MPJBaseServiceImpl<TaskMapper, Task> implem
} }
@Override @Override
public List<Map<String, Object>> proAnalysis(Date startDate, Date endDate, Integer source, Long[] userIds) { public List<Map<String, Object>> proAnalysis(Date startDate, Date endDate, Integer source, List<Long> userIds) {
List<Task> taskList = this.lambdaQuery() List<Task> taskList = this.lambdaQuery()
.between(ArrayUtil.isAllNotNull(startDate, endDate), Task::getRepairTime, startDate, endDate) .between(ArrayUtil.isAllNotNull(startDate, endDate), Task::getRepairTime, startDate, endDate)
.isNotNull(ObjUtil.equals(source, 1), Task::getTaskTempId) .isNotNull(ObjUtil.equals(source, 1), Task::getTaskTempId)
......
package vion.third; package vion.third;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import io.github.linpeilie.Converter; import io.github.linpeilie.Converter;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
...@@ -147,7 +146,13 @@ public class DingMod { ...@@ -147,7 +146,13 @@ public class DingMod {
user.setEmployeeStatus(tmpObj.getJSONArray("field_value_list").getByPath("[0].value", Integer.class)); user.setEmployeeStatus(tmpObj.getJSONArray("field_value_list").getByPath("[0].value", Integer.class));
} }
} }
userService.saveOrUpdate(user, Wrappers.<User>lambdaUpdate().eq(User::getUserid, userid)); userService.lambdaQuery()
.eq(User::getUserid, userid)
.oneOpt()
.ifPresentOrElse(u -> {
user.setId(u.getId());
userService.updateById(user);
}, () -> userService.save(user));
User one = userService.lambdaQuery().eq(User::getUserid, userid).one(); User one = userService.lambdaQuery().eq(User::getUserid, userid).one();
redissonClient.getBucket(RedisKeyEnum.DING_PREFIX.getVal() + RedisKeyEnum.USER_ID.getVal() + one.getId()).set(user); redissonClient.getBucket(RedisKeyEnum.DING_PREFIX.getVal() + RedisKeyEnum.USER_ID.getVal() + one.getId()).set(user);
redissonClient.getBucket(RedisKeyEnum.DING_PREFIX.getVal() + RedisKeyEnum.USER_NAME.getVal() + one.getUsername()).set(user); redissonClient.getBucket(RedisKeyEnum.DING_PREFIX.getVal() + RedisKeyEnum.USER_NAME.getVal() + one.getUsername()).set(user);
...@@ -179,7 +184,13 @@ public class DingMod { ...@@ -179,7 +184,13 @@ public class DingMod {
dept.setDeptId(deptId); dept.setDeptId(deptId);
dept.setParentId(jsonObj.getLong("parent_id")); dept.setParentId(jsonObj.getLong("parent_id"));
dept.setDeptName(jsonObj.getStr("name")); dept.setDeptName(jsonObj.getStr("name"));
deptService.saveOrUpdate(dept, Wrappers.<Dept>lambdaUpdate().eq(Dept::getDeptId, deptId)); deptService.lambdaQuery()
.eq(Dept::getDeptId, deptId)
.oneOpt()
.ifPresentOrElse(d -> {
dept.setId(d.getId());
deptService.updateById(dept);
}, () -> deptService.save(dept));
deptIdList.add(deptId); deptIdList.add(deptId);
} }
} }
......
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
...@@ -10,7 +11,8 @@ import java.util.Date; ...@@ -10,7 +11,8 @@ import java.util.Date;
* @author HlQ * @author HlQ
* @date 2023/12/20 * @date 2023/12/20
*/ */
@Data @Getter
@Setter
public class FinancialAgeVO { public class FinancialAgeVO {
private String contractNo; private String contractNo;
private String contractName; private String contractName;
......
package vion.vo; package vion.vo;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component
@Data @Getter
@Setter
public class ResultVO<T> { public class ResultVO<T> {
private Integer code; private Integer code;
private String msg; private String msg;
......
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import java.util.Date; import java.util.Date;
...@@ -9,7 +10,8 @@ import java.util.Date; ...@@ -9,7 +10,8 @@ import java.util.Date;
* @author HlQ * @author HlQ
* @date 2023/11/23 * @date 2023/11/23
*/ */
@Data @Getter
@Setter
public class ServiceOrderVO { public class ServiceOrderVO {
private String projectName; private String projectName;
......
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.model.StoreLog; import vion.model.StoreLog;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@Data @Getter
@Setter
public class StoreVO { public class StoreVO {
private Long id; private Long id;
/** /**
......
package vion.vo; package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.model.FileInfo; import vion.model.FileInfo;
import vion.model.Task; import vion.model.Task;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@Data @Getter
@Setter
public class TaskTempVO { public class TaskTempVO {
private Long id; private Long id;
/** /**
......
...@@ -3,7 +3,8 @@ package vion.vo; ...@@ -3,7 +3,8 @@ package vion.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.github.liaochong.myexcel.core.annotation.ExcelColumn; import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
import com.github.liaochong.myexcel.core.annotation.ExcelModel; import com.github.liaochong.myexcel.core.annotation.ExcelModel;
import lombok.Data; import lombok.Getter;
import lombok.Setter;
import vion.config.FaultTypeConverter; import vion.config.FaultTypeConverter;
import vion.config.UserNameConverter; import vion.config.UserNameConverter;
import vion.model.FaultLog; import vion.model.FaultLog;
...@@ -13,7 +14,8 @@ import vion.model.ServiceOrder; ...@@ -13,7 +14,8 @@ import vion.model.ServiceOrder;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@Data @Getter
@Setter
@ExcelModel(sheetName = "任务", includeAllField = false) @ExcelModel(sheetName = "任务", includeAllField = false)
public class TaskVO { public class TaskVO {
private Long id; private Long id;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!