返回字段统一

purchase-system/src/main/java/com/ozs/plan/doman/PlanQuarter.java

@@ -110,7 +110,7 @@ public class PlanQuarter {
     private String projectAttr;
 
     @TableField(exist = false)
-    private String projectAttrStr;
+    private String projectAttrName;
     /**
      * 退回原因--->审核不通过就是退回
      */

purchase-system/src/main/java/com/ozs/plan/doman/PlanYears.java

@@ -103,7 +103,7 @@ public class PlanYears {
     private String projectAttr;
 
     @TableField(exist = false)
-    private String projectAttrStr;
+    private String projectAttrName;
     /**
      * 退回原因--->审核不通过就是退回
      */

purchase-system/src/main/java/com/ozs/plan/doman/ProvisionalPlan.java

@@ -109,7 +109,7 @@ public class ProvisionalPlan {
     private String projectAttr;
 
     @TableField(exist = false)
-    private String projectAttrStr;
+    private String projectAttrName;
 
     @ApiModelProperty(value = "计划调整情况及理由--->如计划需要变更，在填写申请修改时需填写调整情况及理由，审核单位审核通过后显示该信息")
     @TableField("adjust_reason")

purchase-system/src/main/java/com/ozs/plan/doman/vo/responseVo/PlanQuarterResponseVo.java

@@ -92,7 +92,7 @@ public class PlanQuarterResponseVo implements Serializable {
      */
     private String projectAttr;
     @Excel(name = "项目属性")
-    private String projectAttrStr;
+    private String projectAttrName;
     /**
      * 处理申请撤销
      * 请求根据字段 appDelete 判断，值是true就是已申请

purchase-system/src/main/java/com/ozs/plan/doman/vo/responseVo/PlanYearsResponseVo.java

@@ -92,7 +92,7 @@ public class PlanYearsResponseVo implements Serializable {
      */
     private String projectAttr;
     @Excel(name = "项目属性")
-    private String projectAttrStr;
+    private String projectAttrName;
     /**
      * 处理申请撤销
      * 请求根据字段 appDelete 判断，值是true就是已申请

purchase-system/src/main/java/com/ozs/plan/doman/vo/responseVo/ProvisionalPlanResVo.java

@@ -64,7 +64,7 @@ public class ProvisionalPlanResVo implements Serializable {
 
     private String projectAttr;
     @Excel(name = "项目属性")
-    private String projectAttrStr;
+    private String projectAttrName;
 
     @Excel(name = "计划调整情况及理由")
     private String adjustReason;

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanQuarterServiceImpl.java

@@ -757,11 +757,11 @@ public class PlanQuarterServiceImpl extends ServiceImpl<PlanQuarterMapper, PlanQ
                             }
                         }
                     }
-                    planQuarter.setProjectAttrStr(builder.toString());
+                    planQuarter.setProjectAttrName(builder.toString());
                 } else {
                     for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
                         if (planQuarter.getProjectAttr().equals(entry.getValue())) {
-                            planQuarter.setProjectAttrStr(entry.getKey());
+                            planQuarter.setProjectAttrName(entry.getKey());
                             break;
                         }
                     }

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -1184,11 +1184,11 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                             }
                         }
                     }
-                    planYear.setProjectAttrStr(builder.toString());
+                    planYear.setProjectAttrName(builder.toString());
                 } else {
                     for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
                         if (planYear.getProjectAttr().equals(entry.getValue())) {
-                            planYear.setProjectAttrStr(entry.getKey());
+                            planYear.setProjectAttrName(entry.getKey());
                             break;
                         }
                     }

purchase-system/src/main/java/com/ozs/plan/service/impl/ProvisionalPlanServiceImpl.java

@@ -567,11 +567,11 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                     }
                 }
             }
-            provisionalPlan.setProjectAttrStr(builder.toString());
+            provisionalPlan.setProjectAttrName(builder.toString());
         } else {
             for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
                 if (provisionalPlan.getProjectAttr() != null && provisionalPlan.getProjectAttr().equals(entry.getValue())) {
-                    provisionalPlan.setProjectAttrStr(entry.getKey());
+                    provisionalPlan.setProjectAttrName(entry.getKey());
                     break;
                 }
             }
@@ -651,11 +651,11 @@ public class ProvisionalPlanServiceImpl extends ServiceImpl<ProvisionalPlanMappe
                         }
                     }
                 }
-                provisionalPlan.setProjectAttrStr(builder.toString());
+                provisionalPlan.setProjectAttrName(builder.toString());
             } else {
                 for (Map.Entry<String, String> entry : projectAttributes.entrySet()) {
                     if (provisionalPlan.getProjectAttr() != null && provisionalPlan.getProjectAttr().equals(entry.getValue())) {
-                        provisionalPlan.setProjectAttrStr(entry.getKey());
+                        provisionalPlan.setProjectAttrName(entry.getKey());
                         break;
                     }
                 }