[chg] 代码优化

src/main/java/vion/controller/InvoiceController.java

@@ -93,7 +93,7 @@ public class InvoiceController {
      */
     @GetMapping("/invoice/calMoney")
     @SaCheckPermission(value = "invoice:calMoney", orRole = "admin")
-    public String calMoney(String[] noList) {
+    public String calMoney(@RequestParam(required = false) List<String> noList) {
         return invoiceService.calMoney(noList);
     }
 

src/main/java/vion/controller/TaskController.java

@@ -144,7 +144,7 @@ public class TaskController {
     public List<Map<String, Object>> peopleAnalysis(@DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
                                                     @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate,
                                                     Integer source,
-                                                    Long[] userIds) {
+                                                    @RequestParam(required = false) List<Long> userIds) {
         return taskService.peopleAnalysis(startDate, endDate, source, userIds);
     }
 
@@ -153,7 +153,7 @@ public class TaskController {
     public List<Map<String, Object>> proAnalysis(@DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
                                                  @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate,
                                                  Integer source,
-                                                 Long[] userIds) {
+                                                 @RequestParam(required = false) List<Long> userIds) {
         return taskService.proAnalysis(startDate, endDate, source, userIds);
     }
 

src/main/java/vion/controller/UserController.java

@@ -132,9 +132,8 @@ public class UserController {
     @GetMapping("/wechatCallback")
     public Object wechatCallback(String code, Integer active, HttpServletResponse res) throws IOException {
         Object obj = wechatMod.getOpenid(code);
-        if (obj instanceof 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(map.get("nickname")), active));
+        if (obj instanceof Map map) {
+            res.sendRedirect(StrUtil.format("https://yunwei.vionyun.com/wap?openid={}&nickname={}&active={}", map.get("openid"), UrlEncoder.encodeAll((String) map.get("nickname")), active));
         } else {
             return obj;
         }

src/main/java/vion/dto/ConstructionTeamDTO.java

 package vion.dto;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
-@Data
+@Getter
+@Setter
 public class ConstructionTeamDTO extends BaseDTO {
     private Long id;
 

src/main/java/vion/dto/DeliverLogDTO.java

@@ -6,6 +6,7 @@ import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
+import java.util.List;
 
 @Getter
 @Setter
@@ -31,7 +32,7 @@ public class DeliverLogDTO extends BaseDTO {
      * 日志人
      */
     private Long userId;
-    private Long[] userIds;
+    private List<Long> userIds;
 
     /**
      * 日志日期

src/main/java/vion/dto/StatusDTO.java

 package vion.dto;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.web.multipart.MultipartFile;
 
-@Data
+@Getter
+@Setter
 public class StatusDTO {
     /** 门店id */
     private Long storeId;

src/main/java/vion/dto/StoreDTO.java

@@ -6,6 +6,7 @@ import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 门店信息
@@ -14,7 +15,7 @@ import java.util.Date;
 @Setter
 public class StoreDTO extends BaseDTO {
     private Long id;
-    private Long[] ids;
+    private List<Long> ids;
     /** 门店名称 */
     private String name ;
     /** 销售人 */

src/main/java/vion/dto/TaskDTO.java

@@ -7,6 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Date;
+import java.util.List;
 
 @Getter
 @Setter
@@ -68,7 +69,7 @@ public class TaskDTO extends BaseDTO {
      * 当前处理人
      */
     private Long activeUser;
-    private Long[] activeUsers;
+    private List<Long> activeUsers;
     /**
      * 截止日期
      */

src/main/java/vion/model/Account.java

@@ -2,12 +2,14 @@ package vion.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.BaseDTO;
 
 import java.util.Date;
 
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_account_info")
 public class Account extends BaseDTO {
     /**

src/main/java/vion/model/ConstructionTeam.java

@@ -3,7 +3,8 @@ package vion.model;
 import com.baomidou.mybatisplus.annotation.*;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.ConstructionTeamDTO;
 import vion.vo.ConstructionTeamVO;
 
@@ -12,7 +13,8 @@ import java.util.Date;
 /**
  * 施工队信息表
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_construction_team")
 @AutoMappers({
         @AutoMapper(target = ConstructionTeamVO.class),

src/main/java/vion/model/Contract.java

 package vion.model;
 
 import com.baomidou.mybatisplus.annotation.*;
-import io.github.linpeilie.annotations.*;
-import lombok.Data;
+import io.github.linpeilie.annotations.AutoMapper;
+import io.github.linpeilie.annotations.AutoMappers;
+import io.github.linpeilie.annotations.ReverseAutoMapping;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.ContractDTO;
 import vion.vo.ContractVO;
 
@@ -13,7 +16,8 @@ import java.util.Date;
 /**
  * 合同
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_contract_info")
 @AutoMappers({
         @AutoMapper(target = ContractVO.class),

src/main/java/vion/model/ContractLog.java

@@ -2,7 +2,8 @@ package vion.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Date;
 
@@ -10,7 +11,8 @@ import java.util.Date;
  * @author HlQ
  * @date 2023/12/6
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_contract_log")
 public class ContractLog {
     @TableId(value = "id", type = IdType.AUTO)

src/main/java/vion/model/ContractPayment.java

@@ -3,7 +3,8 @@ package vion.model;
 import com.baomidou.mybatisplus.annotation.*;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.ContractPaymentDTO;
 import vion.vo.ContractPaymentVO;
 
@@ -13,7 +14,8 @@ import java.util.Date;
 /**
  * 合同收款方式
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_contract_payment_info")
 @AutoMappers({
         @AutoMapper(target = ContractPaymentVO.class),

src/main/java/vion/model/DeliverLog.java

@@ -3,7 +3,8 @@ package vion.model;
 import com.baomidou.mybatisplus.annotation.*;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.DeliverLogDTO;
 import vion.vo.DeliverLogVO;
 
@@ -12,7 +13,8 @@ import java.util.Date;
 /**
  * 项目交付人员日志
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_deliver_log")
 @AutoMappers({
         @AutoMapper(target = DeliverLogVO.class),

src/main/java/vion/model/DeliveryRecord.java

@@ -3,7 +3,8 @@ package vion.model;
 import com.baomidou.mybatisplus.annotation.*;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.DeliveryRecordDTO;
 import vion.vo.DeliveryRecordVO;
 
@@ -12,7 +13,8 @@ import java.util.Date;
 /**
  * 发货记录表
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_delivery_record")
 @AutoMappers({
         @AutoMapper(target = DeliveryRecordVO.class),

src/main/java/vion/model/Dept.java

@@ -2,11 +2,13 @@ package vion.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Date;
 
-@Data
+@Getter
+@Setter
 @TableName(value="tbl_dept_info")
 public class Dept {
     @TableId(value = "id", type = IdType.AUTO)

src/main/java/vion/model/Dictionary.java

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.DictionaryDTO;
 
 import java.util.Date;
 
-@Data
+@Getter
+@Setter
 @TableName(value="tbl_dictionary_info")
 @AutoMappers({
         @AutoMapper(target = DictionaryDTO.class),

src/main/java/vion/model/DictionaryType.java

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.DictionaryTypeDTO;
 
 import java.util.Date;
 
-@Data
+@Getter
+@Setter
 @TableName(value="tbl_dictionary_type")
 @AutoMappers({
         @AutoMapper(target = DictionaryTypeDTO.class),

src/main/java/vion/model/FaultLog.java

@@ -2,14 +2,16 @@ package vion.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Date;
 
 /**
  * 工单操作记录
  */
-@Data
+@Getter
+@Setter
 @TableName(value="tbl_fault_log")
 public class FaultLog {
     /** 自增列 */

src/main/java/vion/model/FileInfo.java

@@ -3,7 +3,8 @@ package vion.model;
 import com.baomidou.mybatisplus.annotation.*;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.FileInfoDTO;
 import vion.vo.FileInfoVO;
 
@@ -12,7 +13,8 @@ import java.util.Date;
 /**
  * 文件信息
  */
-@Data
+@Getter
+@Setter
 @TableName(value="tbl_file_info")
 @AutoMappers({
         @AutoMapper(target = FileInfoDTO.class),

src/main/java/vion/model/Form.java

@@ -3,7 +3,8 @@ package vion.model;
 import com.baomidou.mybatisplus.annotation.*;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.config.JsonbTypeHandler;
 import vion.dto.FormDTO;
 import vion.vo.FormVO;
@@ -14,7 +15,8 @@ import java.util.Date;
 /**
  * 表单集合表
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_form", autoResultMap = true)
 @AutoMappers({
         @AutoMapper(target = FormVO.class),

src/main/java/vion/model/Inspect.java

@@ -3,7 +3,8 @@ package vion.model;
 import com.baomidou.mybatisplus.annotation.*;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.InspectDTO;
 import vion.vo.InspectVO;
 
@@ -12,7 +13,8 @@ import java.util.Date;
 /**
  * 巡检信息
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_inspect_info")
 @AutoMappers({
         @AutoMapper(target = InspectVO.class),

src/main/java/vion/model/Invoice.java

@@ -3,7 +3,8 @@ package vion.model;
 import com.baomidou.mybatisplus.annotation.*;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.InvoiceDTO;
 import vion.vo.InvoiceVO;
 
@@ -14,7 +15,8 @@ import java.util.Date;
 /**
  * 发票记录表
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_invoice")
 @AutoMappers({
         @AutoMapper(target = InvoiceVO.class),

src/main/java/vion/model/Payment.java

@@ -3,7 +3,8 @@ package vion.model;
 import com.baomidou.mybatisplus.annotation.*;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.PaymentDTO;
 import vion.vo.PaymentVO;
 
@@ -13,7 +14,8 @@ import java.util.Date;
 /**
  * 收款记录表
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_payment")
 @AutoMappers({
         @AutoMapper(target = PaymentVO.class),

src/main/java/vion/model/PointInfo.java

@@ -3,7 +3,8 @@ package vion.model;
 import com.baomidou.mybatisplus.annotation.*;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.PointInfoDTO;
 import vion.vo.PointInfoVO;
 
@@ -13,7 +14,8 @@ import java.util.Date;
  * @author HlQ
  * @date 2024/1/8
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_point_info")
 @AutoMappers({
         @AutoMapper(target = PointInfoVO.class),

src/main/java/vion/model/RContractProduct.java

@@ -2,7 +2,8 @@ package vion.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -11,7 +12,8 @@ import java.util.Date;
  * @author HlQ
  * @date 2024/3/26
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "r_contract_product")
 public class RContractProduct {
     @TableId(value = "id", type = IdType.AUTO)

src/main/java/vion/model/RContractStore.java

@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.RContractStoreDTO;
 
 import java.util.Date;
@@ -13,7 +14,8 @@ import java.util.Date;
 /**
  * 合同项目关联
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "r_contract_store")
 @AutoMappers({
         @AutoMapper(target = RContractStoreDTO.class),

src/main/java/vion/model/RContractTeam.java

@@ -6,7 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.RContractTeamDTO;
 import vion.vo.RContractTeamVO;
 
@@ -15,7 +16,8 @@ import java.util.Date;
 /**
 * 合同与施工队关联表
 */
-@Data
+@Getter
+@Setter
 @TableName(value = "r_contract_team")
 @AutoMappers({
         @AutoMapper(target = RContractTeamVO.class),

src/main/java/vion/model/RContractUser.java

@@ -2,7 +2,8 @@ package vion.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.BaseDTO;
 
 import java.util.Date;
@@ -11,7 +12,8 @@ import java.util.Date;
  * @author HlQ
  * @date 2023/12/28
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "r_contract_user")
 public class RContractUser extends BaseDTO {
     @TableId(value = "id", type = IdType.AUTO)

src/main/java/vion/model/RPointDevice.java

@@ -2,7 +2,8 @@ package vion.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Date;
 
@@ -10,7 +11,8 @@ import java.util.Date;
  * @author HlQ
  * @date 2024/1/12
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "r_point_device")
 public class RPointDevice {
     @TableId(value = "id", type = IdType.AUTO)

src/main/java/vion/model/RPointWx.java

@@ -2,7 +2,8 @@ package vion.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Date;
 
@@ -10,7 +11,8 @@ import java.util.Date;
  * @author HlQ
  * @date 2024/1/12
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "r_point_wx")
 public class RPointWx {
     @TableId(value = "id", type = IdType.AUTO)

src/main/java/vion/model/RRepairDevice.java

@@ -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.ExcelModel;
 import com.github.liaochong.myexcel.core.annotation.MultiColumn;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.BaseDTO;
 
 import java.util.Date;
@@ -16,7 +17,8 @@ import java.util.List;
  * @author HlQ
  * @date 2024/1/25
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "r_repair_device")
 @ExcelModel(includeAllField = false)
 public class RRepairDevice extends BaseDTO {

src/main/java/vion/model/RRoleResource.java

@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.RRoleResourceDTO;
 
 import java.util.Date;
@@ -13,7 +14,8 @@ import java.util.Date;
  * @author HlQ
  * @date 2023/11/28
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "r_role_resource")
 @AutoMappers({
         @AutoMapper(target = RRoleResourceDTO.class),

src/main/java/vion/model/RStoreConfederate.java

@@ -2,7 +2,8 @@ package vion.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.BaseDTO;
 
 import java.util.Date;
@@ -10,7 +11,8 @@ import java.util.Date;
 /**
  * 项目干系人
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "r_store_confederate")
 public class RStoreConfederate extends BaseDTO {
     @TableId(value = "id", type = IdType.AUTO)

src/main/java/vion/model/RStoreTag.java

@@ -2,7 +2,8 @@ package vion.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Date;
 
@@ -10,7 +11,8 @@ import java.util.Date;
  * @author HlQ
  * @date 2024/1/30
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "r_store_tag")
 public class RStoreTag {
     @TableId(value = "id", type = IdType.AUTO)

src/main/java/vion/model/RStoreUser.java

@@ -2,7 +2,8 @@ package vion.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Date;
 
@@ -13,7 +14,8 @@ import java.util.Date;
 /**
     * 项目与用户关联表
     */
-@Data
+@Getter
+@Setter
 @TableName(value = "r_store_user")
 public class RStoreUser {
     @TableId(value = "id", type = IdType.AUTO)

src/main/java/vion/model/RUserRole.java

@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.RUserRoleDTO;
 
 import java.util.Date;
@@ -13,7 +14,8 @@ import java.util.Date;
  * @author HlQ
  * @date 2023/11/28
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "r_user_role")
 @AutoMappers({
         @AutoMapper(target = RUserRoleDTO.class),

src/main/java/vion/model/RejectInfo.java

@@ -2,7 +2,8 @@ package vion.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.BaseDTO;
 
 import java.util.Date;
@@ -11,7 +12,8 @@ import java.util.Date;
  * @author HlQ
  * @date 2024/1/8
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_reject_info")
 public class RejectInfo extends BaseDTO {
     @TableId(value = "id", type = IdType.AUTO)

src/main/java/vion/model/RepairRec.java

@@ -3,7 +3,8 @@ package vion.model;
 import com.baomidou.mybatisplus.annotation.*;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.RepairRecDTO;
 import vion.vo.RepairRecVO;
 
@@ -13,7 +14,8 @@ import java.util.Date;
  * @author HlQ
  * @date 2024/1/24
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_repair_rec")
 @AutoMappers({
         @AutoMapper(target = RepairRecVO.class),

src/main/java/vion/model/Resource.java

@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.ResourceDTO;
 import vion.vo.ResourceVO;
 
@@ -14,7 +15,8 @@ import java.util.Date;
  * @author HlQ
  * @date 2023/11/28
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_resource")
 @AutoMappers({
         @AutoMapper(target = ResourceVO.class),

src/main/java/vion/model/Role.java

@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.RoleDTO;
 import vion.vo.RoleVO;
 
@@ -13,7 +14,8 @@ import java.util.Date;
 /**
  * 角色表
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_role")
 @AutoMappers({
         @AutoMapper(target = RoleVO.class),

src/main/java/vion/model/ServiceOrder.java

@@ -4,13 +4,15 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.ServiceOrderDTO;
 import vion.vo.ServiceOrderVO;
 
 import java.util.Date;
 
-@Data
+@Getter
+@Setter
 @TableName("tbl_service_order")
 @AutoMappers({
         @AutoMapper(target = ServiceOrderVO.class),

src/main/java/vion/model/SettlementDiff.java

@@ -3,7 +3,8 @@ package vion.model;
 import com.baomidou.mybatisplus.annotation.*;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.SettlementDiffDTO;
 import vion.vo.SettlementDiffVO;
 
@@ -14,7 +15,8 @@ import java.util.Date;
  * @author HlQ
  * @date 2023/12/26
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_settlement_diff")
 @AutoMappers({
         @AutoMapper(target = SettlementDiffVO.class),

src/main/java/vion/model/SparePart.java

@@ -3,7 +3,8 @@ package vion.model;
 import com.baomidou.mybatisplus.annotation.*;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.SparePartDTO;
 import vion.vo.SparePartVO;
 
@@ -13,7 +14,8 @@ import java.util.Date;
  * @author HlQ
  * @date 2024/1/19
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_spare_part")
 @AutoMappers({
         @AutoMapper(target = SparePartVO.class),

src/main/java/vion/model/Store.java

@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.StoreDTO;
 import vion.vo.StoreVO;
 
@@ -13,7 +14,8 @@ import java.util.Date;
 /**
  * 门店信息
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_store_info")
 @AutoMappers({
         @AutoMapper(target = StoreVO.class),

src/main/java/vion/model/StoreLog.java

@@ -2,7 +2,8 @@ package vion.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 import vion.dto.BaseDTO;
 
@@ -11,7 +12,8 @@ import java.util.Date;
 /**
 * 项目日志表
 */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_store_log")
 public class StoreLog extends BaseDTO {
     @TableId(value = "id", type = IdType.AUTO)

src/main/java/vion/model/Tag.java

@@ -2,7 +2,8 @@ package vion.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.BaseDTO;
 
 import java.util.Date;
@@ -11,7 +12,8 @@ import java.util.Date;
  * @author HlQ
  * @date 2024/1/30
  */
-@Data
+@Getter
+@Setter
 @TableName(value = "tbl_tag")
 public class Tag extends BaseDTO {
     @TableId(value = "id", type = IdType.AUTO)

src/main/java/vion/model/Task.java

@@ -4,14 +4,16 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 import vion.dto.TaskDTO;
 import vion.vo.TaskVO;
 
 import java.util.Date;
 
-@Data
+@Getter
+@Setter
 @TableName(value="tbl_task_info")
 @AutoMappers({
         @AutoMapper(target = TaskVO.class),

src/main/java/vion/model/TaskTemp.java

@@ -4,14 +4,16 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
 import vion.dto.TaskTempDTO;
 import vion.vo.TaskTempVO;
 
 import java.util.Date;
 
-@Data
+@Getter
+@Setter
 @TableName(value="tbl_task_temp")
 @AutoMappers({
         @AutoMapper(target = TaskTempVO.class),

src/main/java/vion/model/User.java

@@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.dto.UserDTO;
 import vion.vo.UserVO;
 
@@ -13,7 +14,8 @@ import java.util.Date;
 /**
  * 用户信息
  */
-@Data
+@Getter
+@Setter
 @TableName(value="tbl_user_info")
 @AutoMappers({
         @AutoMapper(target = UserDTO.class),

src/main/java/vion/service/IInvoiceService.java

@@ -18,6 +18,6 @@ public interface IInvoiceService extends MPJBaseService<Invoice> {
 
     String delById(Long id);
 
-    String calMoney(String[] noList);
+    String calMoney(List<String> noList);
 
 }

src/main/java/vion/service/ITaskService.java

@@ -26,9 +26,9 @@ public interface ITaskService extends MPJBaseService<Task> {
 
     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);
 }

src/main/java/vion/service/impl/ContractServiceImpl.java

@@ -293,7 +293,7 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
 
         Contract contract = converter.convert(dto, Contract.class);
         // 如果当前合同进度在要修改的进度前，此时不能修改合同进度。e.g 当前合同进度是项目验收，此时传参过来到货，那么不能修改
-        if (contract.getStatus() < existContract.getStatus()) {
+        if (ObjUtil.isNotNull(contract.getStatus()) && contract.getStatus() < existContract.getStatus()) {
             contract.setStatus(null);
         }
         Long contractId = existContract.getId();
@@ -915,7 +915,8 @@ public class ContractServiceImpl extends MPJBaseServiceImpl<ContractMapper, Cont
         // 两平台共存的合同
         log.info("合同编号验证：{}", JSONUtil.ofObj().set("unsynced", unsyncedList).set("extra", extraList));
         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
             var bongMap = BeanUtil.beanToMap(xbongContract, new HashMap<>(), copyOptions);
             if (!mapEqual(platMap, bongMap)) {
                 log.info("不一致的合同：{}", contractNo);
-                //
+                // SC 合同全部对比， CS 合同只对比金额
             }
         }
     }

src/main/java/vion/service/impl/InvoiceServiceImpl.java

@@ -153,7 +153,7 @@ public class InvoiceServiceImpl extends MPJBaseServiceImpl<InvoiceMapper, Invoic
     }
 
     @Override
-    public String calMoney(String[] noList) {
+    public String calMoney(List<String> noList) {
         Map<String, BigDecimal> no2SumMap = this.lambdaQuery()
                 .in(ArrayUtil.isNotEmpty(noList), Invoice::getContractNo, noList)
                 .list()

src/main/java/vion/service/impl/TaskServiceImpl.java

@@ -424,7 +424,7 @@ public class TaskServiceImpl extends MPJBaseServiceImpl<TaskMapper, Task> implem
     }
 
     @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()
                 .between(ArrayUtil.isAllNotNull(startDate, endDate), Task::getRepairTime, startDate, endDate)
                 .isNotNull(ObjUtil.equals(source, 1), Task::getTaskTempId)
@@ -470,7 +470,7 @@ public class TaskServiceImpl extends MPJBaseServiceImpl<TaskMapper, Task> implem
     }
 
     @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()
                 .between(ArrayUtil.isAllNotNull(startDate, endDate), Task::getRepairTime, startDate, endDate)
                 .isNotNull(ObjUtil.equals(source, 1), Task::getTaskTempId)

src/main/java/vion/third/DingMod.java

 package vion.third;
 
 import cn.dev33.satoken.stp.StpUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.github.linpeilie.Converter;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -147,7 +146,13 @@ public class DingMod {
                             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();
                     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);
@@ -179,7 +184,13 @@ public class DingMod {
                         dept.setDeptId(deptId);
                         dept.setParentId(jsonObj.getLong("parent_id"));
                         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);
                     }
                 }

src/main/java/vion/vo/FinancialAgeVO.java

 package vion.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -10,7 +11,8 @@ import java.util.Date;
  * @author HlQ
  * @date 2023/12/20
  */
-@Data
+@Getter
+@Setter
 public class FinancialAgeVO {
     private String contractNo;
     private String contractName;

src/main/java/vion/vo/ResultVO.java

 package vion.vo;
 
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.stereotype.Component;
 
 @Component
-@Data
+@Getter
+@Setter
 public class ResultVO<T> {
     private Integer code;
     private String msg;

src/main/java/vion/vo/ServiceOrderVO.java

 package vion.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Date;
 
@@ -9,7 +10,8 @@ import java.util.Date;
  * @author HlQ
  * @date 2023/11/23
  */
-@Data
+@Getter
+@Setter
 public class ServiceOrderVO {
     private String projectName;
 

src/main/java/vion/vo/StoreVO.java

 package vion.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.model.StoreLog;
 
 import java.util.Date;
 import java.util.List;
 
-@Data
+@Getter
+@Setter
 public class StoreVO {
     private Long id;
     /**

src/main/java/vion/vo/TaskTempVO.java

 package vion.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.model.FileInfo;
 import vion.model.Task;
 
 import java.util.Date;
 import java.util.List;
 
-@Data
+@Getter
+@Setter
 public class TaskTempVO {
     private Long id;
     /**

src/main/java/vion/vo/TaskVO.java

@@ -3,7 +3,8 @@ package vion.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
 import com.github.liaochong.myexcel.core.annotation.ExcelModel;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import vion.config.FaultTypeConverter;
 import vion.config.UserNameConverter;
 import vion.model.FaultLog;
@@ -13,7 +14,8 @@ import vion.model.ServiceOrder;
 import java.util.Date;
 import java.util.List;
 
-@Data
+@Getter
+@Setter
 @ExcelModel(sheetName = "任务", includeAllField = false)
 public class TaskVO {
     private Long id;