inspection 合同

contract-service/contract-service-api/src/main/java/com/ssy/lingxi/contract/api/model/constant/ContractOrderTypeEnum.java

@@ -20,8 +20,8 @@ public enum ContractOrderTypeEnum {
      */
     RETURN_GOODS(2, "退货申请单");
 
-    private Integer code;
-    private String message;
+    private final Integer code;
+    private final String message;
 
     ContractOrderTypeEnum(Integer code, String message) {
         this.code = code;
@@ -37,7 +37,7 @@ public enum ContractOrderTypeEnum {
     }
 
     public static String getMessage(Integer code) {
-        ContractOrderTypeEnum item = Arrays.stream(ContractOrderTypeEnum.values()).filter(e -> e.getCode() == code).findFirst().orElse(null);
+        ContractOrderTypeEnum item = Arrays.stream(ContractOrderTypeEnum.values()).filter(e -> e.getCode().equals(code)).findFirst().orElse(null);
 
         return null != item ? item.getMessage() : "";
     }

contract-service/src/main/java/com/ssy/lingxi/contract/model/constant/ApplyAmountOrderStatusEnum.java

@@ -73,7 +73,7 @@ public enum ApplyAmountOrderStatusEnum {
     }
 
     public static String getMessage(Integer code) {
-        ApplyAmountOrderStatusEnum item = Arrays.stream(ApplyAmountOrderStatusEnum.values()).filter(e -> e.getCode() == code).findFirst().orElse(null);
+        ApplyAmountOrderStatusEnum item = Arrays.stream(ApplyAmountOrderStatusEnum.values()).filter(e -> e.getCode().equals(code)).findFirst().orElse(null);
 
         return null != item ? item.getMessage() : "";
     }

contract-service/src/main/java/com/ssy/lingxi/contract/model/constant/CommonBooleanEnum.java

@@ -37,6 +37,6 @@ public enum CommonBooleanEnum {
     }
 
     public static String getMessage(Integer code) {
-        return Arrays.stream(CommonBooleanEnum.values()).filter(e -> e.getCode() == code).findFirst().orElse(NO).getMessage();
+        return Arrays.stream(CommonBooleanEnum.values()).filter(e -> e.getCode().equals(code)).findFirst().orElse(NO).getMessage();
     }
 }

contract-service/src/main/java/com/ssy/lingxi/contract/model/constant/ContractActionEnum.java

@@ -37,6 +37,6 @@ public enum ContractActionEnum {
     }
 
     public static String getMessage(Integer code) {
-        return Arrays.stream(ContractActionEnum.values()).filter(e -> e.getCode() == code).findFirst().orElse(ALL).getMessage();
+        return Arrays.stream(ContractActionEnum.values()).filter(e -> e.getCode().equals(code)).findFirst().orElse(ALL).getMessage();
     }
 }

contract-service/src/main/java/com/ssy/lingxi/contract/model/constant/ContractOperateTypeEnum.java

@@ -31,6 +31,6 @@ public enum ContractOperateTypeEnum {
     }
 
     public static String getMessage(Integer code) {
-        return Arrays.stream(ContractOperateTypeEnum.values()).filter(e -> e.getCode() == code).findFirst().orElse(UNKNOW).getMessage();
+        return Arrays.stream(ContractOperateTypeEnum.values()).filter(e -> e.getCode().equals(code)).findFirst().orElse(UNKNOW).getMessage();
     }
 }

contract-service/src/main/java/com/ssy/lingxi/contract/model/constant/ContractOrderChangeTypeEnum.java

@@ -31,6 +31,6 @@ public enum ContractOrderChangeTypeEnum {
     }
 
     public static String getMessage(Integer code) {
-        return Arrays.stream(ContractOrderChangeTypeEnum.values()).filter(e -> e.getCode() == code).findFirst().orElse(ADD).getMessage();
+        return Arrays.stream(ContractOrderChangeTypeEnum.values()).filter(e -> e.getCode().equals(code)).findFirst().orElse(ADD).getMessage();
     }
 }

contract-service/src/main/java/com/ssy/lingxi/contract/model/constant/ContractOuterStatusEnum.java

@@ -43,7 +43,7 @@ public enum ContractOuterStatusEnum {
     }
 
     public static String getMessage(Integer code) {
-        return Arrays.stream(ContractOuterStatusEnum.values()).filter(e -> e.getCode() == code).findFirst().orElse(ALL).getMessage();
+        return Arrays.stream(ContractOuterStatusEnum.values()).filter(e -> e.getCode().equals(code)).findFirst().orElse(ALL).getMessage();
     }
 
     /**

contract-service/src/main/java/com/ssy/lingxi/contract/model/constant/ContractPartyAInnerStatusEnum.java

@@ -47,7 +47,7 @@ public enum ContractPartyAInnerStatusEnum {
     }
 
     public static String getMessage(Integer code) {
-        return Arrays.stream(ContractPartyAInnerStatusEnum.values()).filter(e -> e.getCode() == code).findFirst().orElse(ALL).getMessage();
+        return Arrays.stream(ContractPartyAInnerStatusEnum.values()).filter(e -> e.getCode().equals(code)).findFirst().orElse(ALL).getMessage();
     }
 
     /**

contract-service/src/main/java/com/ssy/lingxi/contract/model/constant/ContractPartyBInnerStatusEnum.java

@@ -43,7 +43,7 @@ public enum  ContractPartyBInnerStatusEnum {
     }
 
     public static String getMessage(Integer code) {
-        return Arrays.stream(ContractPartyBInnerStatusEnum.values()).filter(e -> e.getCode() == code).findFirst().orElse(ALL).getMessage();
+        return Arrays.stream(ContractPartyBInnerStatusEnum.values()).filter(e -> e.getCode().equals(code)).findFirst().orElse(ALL).getMessage();
     }
 
     /**

contract-service/src/main/java/com/ssy/lingxi/contract/model/constant/ContractPayStageEnum.java

@@ -32,6 +32,6 @@ public enum ContractPayStageEnum {
     }
 
     public static String getMessage(Integer code) {
-        return Arrays.stream(ContractPayStageEnum.values()).filter(e -> e.getCode() == code).findFirst().orElse(ALL).getMessage();
+        return Arrays.stream(ContractPayStageEnum.values()).filter(e -> e.getCode().equals(code)).findFirst().orElse(ALL).getMessage();
     }
 }

contract-service/src/main/java/com/ssy/lingxi/contract/model/vo/common/response/ContractOrderPageResponse.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
  * @date 2021/4/21 18:29
  */
 @Data
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper = true)
 public class ContractOrderPageResponse extends PageVO implements Serializable {
 
     private static final long serialVersionUID = -444252438818928168L;

contract-service/src/main/java/com/ssy/lingxi/contract/service/IFeignService.java

@@ -93,7 +93,7 @@ public interface IFeignService {
      * @param isRecovery: 是否还原：false-否，true-是
      * @return 操作结果
      **/
-    Wrapper updateContractSource(ContractDO contractDO, Boolean isRecovery);
+    Wrapper<Void> updateContractSource(ContractDO contractDO, Boolean isRecovery);
 
     /**
      * 执行请款单流程

contract-service/src/main/java/com/ssy/lingxi/contract/serviceimpl/ApplyAmountOrderServiceImpl.java

@@ -1049,8 +1049,8 @@ public class ApplyAmountOrderServiceImpl implements IApplyAmountOrderService {
         }
         //3.合并单据信息，分页排序
         List<ContractOrderPageResponse> contractOrderPageResponses = CollectionPageUtil.pageList(sortList, pageVO.getCurrent(), pageVO.getPageSize());
-        Wrapper success = Wrapper.success(new PageData(new Integer(pageData.size()).longValue(), contractOrderPageResponses));
-        return success;
+        PageData page = new PageData(new Integer(pageData.size()).longValue(), contractOrderPageResponses);
+        return Wrapper.success(page);
     }
 
     /**

contract-service/src/main/java/com/ssy/lingxi/contract/serviceimpl/ContractManageServiceImpl.java

@@ -1225,7 +1225,7 @@ public class ContractManageServiceImpl implements IContractManageService {
     public Wrapper<String> getContractNo(String oldContractNo) {
 
         // 最长16字符，自动生成后可修改，自动生成规则为H-2位年份-5位从00001开始的序列号:H-13-00001
-        String result = "";
+        StringBuilder result = new StringBuilder();
 
         // 如果oldContractNo不为空，则为变更合同
         if (StringUtils.hasLength(oldContractNo)) {
@@ -1233,11 +1233,11 @@ public class ContractManageServiceImpl implements IContractManageService {
             String[] str = oldContractNo.split("_");
             if (str.length > 1) {
                 for (int i = 0; i < str.length - 1; i++) {
-                    result += str[i];
+                    result.append(str[i]);
                 }
-                result += ("_" + (Integer.parseInt(str[str.length - 1]) + 1));
+                result.append("_").append(Integer.parseInt(str[str.length - 1]) + 1);
             } else {
-                result = (oldContractNo + "_1");
+                result = new StringBuilder((oldContractNo + "_1"));
             }
         } else {
             String contractNo = redisStringUtils.get(Constants.REDIS_KEY_CONTRACT_NO, Constants.REDIS_CONTRACT_INDEX);
@@ -1258,10 +1258,10 @@ public class ContractManageServiceImpl implements IContractManageService {
             }
             // 生成当前年份合同编号
             String year = new SimpleDateFormat("yy", Locale.CHINESE).format(new Date());
-            result = String.format("H-%s-%s", year, contractNo);
+            result = new StringBuilder(String.format("H-%s-%s", year, contractNo));
         }
 
-        return Wrapper.success(result);
+        return Wrapper.success(result.toString());
     }
 
     /**
@@ -1314,7 +1314,7 @@ public class ContractManageServiceImpl implements IContractManageService {
         contractOrderAmountLogRepository.save(contractOrderAmountLogDO);
         //更新合同金额
         Double freeAmount = contractDO.getFreeAmount();
-        if(freeAmount==null||freeAmount.equals(0)){
+        if(freeAmount==null||freeAmount==0){
             freeAmount=contractDO.getTotalAmount();
         }
         Double executeAmount = contractDO.getExecuteAmount();

contract-service/src/main/java/com/ssy/lingxi/contract/serviceimpl/ContractPurchaseMaterielServiceImpl.java

@@ -261,7 +261,7 @@ public class ContractPurchaseMaterielServiceImpl implements IContractPurchaseMat
     @Override
     public Boolean checkContractAssociatedGoods(Long contractId) {
         // 检查采购物料是否存在
-        Boolean result=Boolean.TRUE;
+        boolean result=Boolean.TRUE;
         List<ContractPurchaseMaterielDO> materielDOS = repository.findByContractId(contractId);
         if(CollectionUtil.isEmpty(materielDOS)){
             return Boolean.FALSE;