Procházet zdrojové kódy

协议历史记录问题修改

haoyu před 2 roky
rodič
revize
bd03a5a0c7

+ 2 - 2
src/main/java/com/ydtech/modules/protocol/entity/vo/PtlAgreementProductQueryVo.java

@@ -18,9 +18,9 @@ public class PtlAgreementProductQueryVo extends PageRequest {
     private String operatorType;
 
     @ApiModelProperty("操作开始时间")
-    private LocalDate operatorStartTime;
+    private String operatorStartTime;
 
     @ApiModelProperty("操作结束时间")
-    private LocalDate operatorEndTime;
+    private String operatorEndTime;
 
 }

+ 1 - 1
src/main/java/com/ydtech/modules/protocols/entity/po/PtlAgreementProductCostsNewHistory.java

@@ -102,7 +102,7 @@ public class PtlAgreementProductCostsNewHistory {
 
     @ApiModelProperty(value = "优先级")
     @TableField(value = "priority_level")
-    private String priorityLevel;
+    private Integer priorityLevel;
 
 
     @ApiModelProperty(value = "交强出口比例一级")

+ 3 - 3
src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewHistoryServiceImpl.java

@@ -226,7 +226,7 @@ public class PtlAgreementProductCostsNewHistoryServiceImpl extends ServiceImpl<P
         String desc = "";
         for (int i = 0; i < v.size(); i++) {
             int finalI = i;
-            PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr = undwrtRulesAttrList.stream().filter(x -> x.getAttrCode().equals(v.get(finalI).getAttrCode())).findAny().get();
+            PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr = undwrtRulesAttrList.stream().filter(x -> x.getAttrCode().equals(v.get(finalI).getAttrCode())).findAny().orElse(new PtlAgreementUndwrtRulesAttr());
             //数值范围判断
             if ("inputNumber".equals(ptlAgreementUndwrtRulesAttr.getAttrType())) {
                 desc += inputNumberIdentifying(ptlAgreementUndwrtRulesAttr, v.get(i)) + "\n";
@@ -243,8 +243,8 @@ public class PtlAgreementProductCostsNewHistoryServiceImpl extends ServiceImpl<P
 
     private String radioIdentifying(PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr, PtlAgreementProductCostsAttrLinkHistory ptlAgreementProductCostsAttrLinkHistory) {
         PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal = ptlAgreementUndwrtRulesAttr.getDictLabal().stream().filter(x ->
-                x.getCode().equals(ptlAgreementProductCostsAttrLinkHistory.getMin())).findAny().get();
-        return ptlAgreementUndwrtRulesAttr.getAttrName() + "为" + ptlAgreementUndwrtRulesDictLabal.getName();
+                x.getCode().equals(ptlAgreementProductCostsAttrLinkHistory.getMin())).findAny().orElse(new PtlAgreementUndwrtRulesDictLabal());
+        return ptlAgreementUndwrtRulesAttr.getAttrName() + "为" + Objects.requireNonNull(ptlAgreementUndwrtRulesDictLabal).getName();
     }
 
     private String inputNumberIdentifying(PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr, PtlAgreementProductCostsAttrLinkHistory ptlAgreementProductCostsAttrLink) {