feat(吉林演示): 松原

1.开发间开优化结果统计功能,创建间开优化效果统计表,生成对应代码;
2.修改15天,10天,3天,1天间开优化功能,修改代码结构;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeEffectEnt.java

@@ -34,7 +34,7 @@ public class SpaceOptimizeEffectEnt extends BaseModel implements Serializable {
 
     @XText("优化日期")
     @TableField
-    private DATE optimizeDate;
+    private Date optimizeDate;
 
     @XText("优化后制度描述")
     @TableField

C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeEffectView.java

@@ -32,7 +32,7 @@ public class SpaceOptimizeEffectView extends BaseModel implements Serializable {
 
     @XText("优化日期")
     @TableField
-    private DATE optimizeDate;
+    private Date optimizeDate;
 
     @XText("优化后制度描述")
     @TableField

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_effect/CreateSpaceOptimizeEffectInput.java

 package pps.core.space.service.data.space_optimize_effect;
 
-import oracle.sql.DATE;
 import xstartup.annotation.XText;
 
 import java.math.BigDecimal;
@@ -41,7 +40,7 @@ public class CreateSpaceOptimizeEffectInput {
     private String wellNumber;
 
     @XText("优化日期")
-    private DATE optimizeDate;
+    private Date optimizeDate;
 
     @XText("优化后制度描述")
     private String optimalResult;
@@ -188,11 +187,11 @@ public class CreateSpaceOptimizeEffectInput {
         this.wellNumber = value;
     }
 
-    public DATE getOptimizeDate() {
+    public Date getOptimizeDate() {
         return this.optimizeDate;
     }
 
-    public void setOptimizeDate(DATE value) {
+    public void setOptimizeDate(Date value) {
         this.optimizeDate = value;
     }
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_effect/CreateSpaceOptimizeEffectOutput.java

 package pps.core.space.service.data.space_optimize_effect;
 
 import xstartup.annotation.XText;
-import java.util.Date;
+
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class CreateSpaceOptimizeEffectOutput {
     @XText("ID")
@@ -39,7 +40,7 @@ public class CreateSpaceOptimizeEffectOutput {
     private String wellNumber;
 
     @XText("优化日期")
-    private DATE optimizeDate;
+    private Date optimizeDate;
 
     @XText("优化后制度描述")
     private String optimalResult;
@@ -186,11 +187,11 @@ public class CreateSpaceOptimizeEffectOutput {
         this.wellNumber = value;
     }
 
-    public DATE getOptimizeDate() {
+    public Date getOptimizeDate() {
         return this.optimizeDate;
     }
 
-    public void setOptimizeDate(DATE value) {
+    public void setOptimizeDate(Date value) {
         this.optimizeDate = value;
     }
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_effect/DeleteSpaceOptimizeEffectInput.java

 package pps.core.space.service.data.space_optimize_effect;
 
 import xstartup.annotation.XText;
-import java.util.Date;
+
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class DeleteSpaceOptimizeEffectInput {
     @XText("ID")
@@ -39,7 +40,7 @@ public class DeleteSpaceOptimizeEffectInput {
     private String wellNumber;
 
     @XText("优化日期")
-    private DATE optimizeDate;
+    private Date optimizeDate;
 
     @XText("优化后制度描述")
     private String optimalResult;
@@ -186,11 +187,11 @@ public class DeleteSpaceOptimizeEffectInput {
         this.wellNumber = value;
     }
 
-    public DATE getOptimizeDate() {
+    public Date getOptimizeDate() {
         return this.optimizeDate;
     }
 
-    public void setOptimizeDate(DATE value) {
+    public void setOptimizeDate(Date value) {
         this.optimizeDate = value;
     }
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_effect/DeleteSpaceOptimizeEffectOutput.java

 package pps.core.space.service.data.space_optimize_effect;
 
 import xstartup.annotation.XText;
-import java.util.Date;
+
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class DeleteSpaceOptimizeEffectOutput {
     @XText("ID")
@@ -39,7 +40,7 @@ public class DeleteSpaceOptimizeEffectOutput {
     private String wellNumber;
 
     @XText("优化日期")
-    private DATE optimizeDate;
+    private Date optimizeDate;
 
     @XText("优化后制度描述")
     private String optimalResult;
@@ -186,11 +187,11 @@ public class DeleteSpaceOptimizeEffectOutput {
         this.wellNumber = value;
     }
 
-    public DATE getOptimizeDate() {
+    public Date getOptimizeDate() {
         return this.optimizeDate;
     }
 
-    public void setOptimizeDate(DATE value) {
+    public void setOptimizeDate(Date value) {
         this.optimizeDate = value;
     }
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_effect/DynamicQuerySpaceOptimizeEffectInput.java

 package pps.core.space.service.data.space_optimize_effect;
 
 import xstartup.annotation.XText;
-import java.util.Date;
+
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class DynamicQuerySpaceOptimizeEffectInput {
     @XText("ID")
@@ -39,7 +40,7 @@ public class DynamicQuerySpaceOptimizeEffectInput {
     private String wellNumber;
 
     @XText("优化日期")
-    private DATE optimizeDate;
+    private Date optimizeDate;
 
     @XText("优化后制度描述")
     private String optimalResult;
@@ -186,11 +187,11 @@ public class DynamicQuerySpaceOptimizeEffectInput {
         this.wellNumber = value;
     }
 
-    public DATE getOptimizeDate() {
+    public Date getOptimizeDate() {
         return this.optimizeDate;
     }
 
-    public void setOptimizeDate(DATE value) {
+    public void setOptimizeDate(Date value) {
         this.optimizeDate = value;
     }
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_effect/DynamicQuerySpaceOptimizeEffectOutput.java

 package pps.core.space.service.data.space_optimize_effect;
 
 import xstartup.annotation.XText;
-import java.util.Date;
+
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class DynamicQuerySpaceOptimizeEffectOutput {
     @XText("ID")
@@ -39,7 +40,7 @@ public class DynamicQuerySpaceOptimizeEffectOutput {
     private String wellNumber;
 
     @XText("优化日期")
-    private DATE optimizeDate;
+    private Date optimizeDate;
 
     @XText("优化后制度描述")
     private String optimalResult;
@@ -186,11 +187,11 @@ public class DynamicQuerySpaceOptimizeEffectOutput {
         this.wellNumber = value;
     }
 
-    public DATE getOptimizeDate() {
+    public Date getOptimizeDate() {
         return this.optimizeDate;
     }
 
-    public void setOptimizeDate(DATE value) {
+    public void setOptimizeDate(Date value) {
         this.optimizeDate = value;
     }
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_effect/DynamicQuerySpaceOptimizeEffectViewOutput.java

 package pps.core.space.service.data.space_optimize_effect;
 
 import xstartup.annotation.XText;
-import java.util.Date;
+
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class DynamicQuerySpaceOptimizeEffectViewOutput {
     @XText("ID")
@@ -39,7 +40,7 @@ public class DynamicQuerySpaceOptimizeEffectViewOutput {
     private String wellNumber;
 
     @XText("优化日期")
-    private DATE optimizeDate;
+    private Date optimizeDate;
 
     @XText("优化后制度描述")
     private String optimalResult;
@@ -186,11 +187,11 @@ public class DynamicQuerySpaceOptimizeEffectViewOutput {
         this.wellNumber = value;
     }
 
-    public DATE getOptimizeDate() {
+    public Date getOptimizeDate() {
         return this.optimizeDate;
     }
 
-    public void setOptimizeDate(DATE value) {
+    public void setOptimizeDate(Date value) {
         this.optimizeDate = value;
     }
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_effect/GetSpaceOptimizeEffectInput.java

 package pps.core.space.service.data.space_optimize_effect;
 
 import xstartup.annotation.XText;
-import java.util.Date;
+
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class GetSpaceOptimizeEffectInput {
     @XText("ID")
@@ -39,7 +40,7 @@ public class GetSpaceOptimizeEffectInput {
     private String wellNumber;
 
     @XText("优化日期")
-    private DATE optimizeDate;
+    private Date optimizeDate;
 
     @XText("优化后制度描述")
     private String optimalResult;
@@ -186,11 +187,11 @@ public class GetSpaceOptimizeEffectInput {
         this.wellNumber = value;
     }
 
-    public DATE getOptimizeDate() {
+    public Date getOptimizeDate() {
         return this.optimizeDate;
     }
 
-    public void setOptimizeDate(DATE value) {
+    public void setOptimizeDate(Date value) {
         this.optimizeDate = value;
     }
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_effect/GetSpaceOptimizeEffectOutput.java

 package pps.core.space.service.data.space_optimize_effect;
 
 import xstartup.annotation.XText;
-import java.util.Date;
+
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class GetSpaceOptimizeEffectOutput {
     @XText("ID")
@@ -39,7 +40,7 @@ public class GetSpaceOptimizeEffectOutput {
     private String wellNumber;
 
     @XText("优化日期")
-    private DATE optimizeDate;
+    private Date optimizeDate;
 
     @XText("优化后制度描述")
     private String optimalResult;
@@ -186,11 +187,11 @@ public class GetSpaceOptimizeEffectOutput {
         this.wellNumber = value;
     }
 
-    public DATE getOptimizeDate() {
+    public Date getOptimizeDate() {
         return this.optimizeDate;
     }
 
-    public void setOptimizeDate(DATE value) {
+    public void setOptimizeDate(Date value) {
         this.optimizeDate = value;
     }
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_effect/GetSpaceOptimizeEffectViewInput.java

 package pps.core.space.service.data.space_optimize_effect;
 
 import xstartup.annotation.XText;
-import java.util.Date;
+
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class GetSpaceOptimizeEffectViewInput {
     @XText("ID")
@@ -39,7 +40,7 @@ public class GetSpaceOptimizeEffectViewInput {
     private String wellNumber;
 
     @XText("优化日期")
-    private DATE optimizeDate;
+    private Date optimizeDate;
 
     @XText("优化后制度描述")
     private String optimalResult;
@@ -186,11 +187,11 @@ public class GetSpaceOptimizeEffectViewInput {
         this.wellNumber = value;
     }
 
-    public DATE getOptimizeDate() {
+    public Date getOptimizeDate() {
         return this.optimizeDate;
     }
 
-    public void setOptimizeDate(DATE value) {
+    public void setOptimizeDate(Date value) {
         this.optimizeDate = value;
     }
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_effect/GetSpaceOptimizeEffectViewOutput.java

 package pps.core.space.service.data.space_optimize_effect;
 
 import xstartup.annotation.XText;
-import java.util.Date;
+
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class GetSpaceOptimizeEffectViewOutput {
     @XText("ID")
@@ -39,7 +40,7 @@ public class GetSpaceOptimizeEffectViewOutput {
     private String wellNumber;
 
     @XText("优化日期")
-    private DATE optimizeDate;
+    private Date optimizeDate;
 
     @XText("优化后制度描述")
     private String optimalResult;
@@ -186,11 +187,11 @@ public class GetSpaceOptimizeEffectViewOutput {
         this.wellNumber = value;
     }
 
-    public DATE getOptimizeDate() {
+    public Date getOptimizeDate() {
         return this.optimizeDate;
     }
 
-    public void setOptimizeDate(DATE value) {
+    public void setOptimizeDate(Date value) {
         this.optimizeDate = value;
     }
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_effect/QuerySpaceOptimizeEffectInput.java

 package pps.core.space.service.data.space_optimize_effect;
 
 import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
 import xstartup.base.data.XPageInput;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 public class QuerySpaceOptimizeEffectInput extends XPageInput {
     @XText("ID")
     private String id;
@@ -40,7 +41,7 @@ public class QuerySpaceOptimizeEffectInput extends XPageInput {
     private String wellNumber;
 
     @XText("优化日期")
-    private DATE optimizeDate;
+    private Date optimizeDate;
 
     @XText("优化后制度描述")
     private String optimalResult;
@@ -187,11 +188,11 @@ public class QuerySpaceOptimizeEffectInput extends XPageInput {
         this.wellNumber = value;
     }
 
-    public DATE getOptimizeDate() {
+    public Date getOptimizeDate() {
         return this.optimizeDate;
     }
 
-    public void setOptimizeDate(DATE value) {
+    public void setOptimizeDate(Date value) {
         this.optimizeDate = value;
     }
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_effect/QuerySpaceOptimizeEffectOutput.java

 package pps.core.space.service.data.space_optimize_effect;
 
 import xstartup.annotation.XText;
-import java.util.Date;
+import xstartup.base.data.XPageInput;
+
 import java.math.BigDecimal;
+import java.util.Date;
 
-import xstartup.base.data.XPageInput;
 public class QuerySpaceOptimizeEffectOutput extends XPageInput {
     @XText("ID")
     private String id;
@@ -40,7 +41,7 @@ public class QuerySpaceOptimizeEffectOutput extends XPageInput {
     private String wellNumber;
 
     @XText("优化日期")
-    private DATE optimizeDate;
+    private Date optimizeDate;
 
     @XText("优化后制度描述")
     private String optimalResult;
@@ -187,11 +188,11 @@ public class QuerySpaceOptimizeEffectOutput extends XPageInput {
         this.wellNumber = value;
     }
 
-    public DATE getOptimizeDate() {
+    public Date getOptimizeDate() {
         return this.optimizeDate;
     }
 
-    public void setOptimizeDate(DATE value) {
+    public void setOptimizeDate(Date value) {
         this.optimizeDate = value;
     }
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_effect/QuerySpaceOptimizeEffectViewInput.java

 package pps.core.space.service.data.space_optimize_effect;
 
 import xstartup.annotation.XText;
-import java.util.Date;
-import java.math.BigDecimal;
 import xstartup.base.data.XPageInput;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 public class QuerySpaceOptimizeEffectViewInput extends XPageInput {
     @XText("ID")
     private String id;
@@ -40,7 +41,7 @@ public class QuerySpaceOptimizeEffectViewInput extends XPageInput {
     private String wellNumber;
 
     @XText("优化日期")
-    private DATE optimizeDate;
+    private Date optimizeDate;
 
     @XText("优化后制度描述")
     private String optimalResult;
@@ -187,11 +188,11 @@ public class QuerySpaceOptimizeEffectViewInput extends XPageInput {
         this.wellNumber = value;
     }
 
-    public DATE getOptimizeDate() {
+    public Date getOptimizeDate() {
         return this.optimizeDate;
     }
 
-    public void setOptimizeDate(DATE value) {
+    public void setOptimizeDate(Date value) {
         this.optimizeDate = value;
     }
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_effect/QuerySpaceOptimizeEffectViewOutput.java

 package pps.core.space.service.data.space_optimize_effect;
 
 import xstartup.annotation.XText;
-import java.util.Date;
+import xstartup.base.data.XPageInput;
+
 import java.math.BigDecimal;
+import java.util.Date;
 
-import xstartup.base.data.XPageInput;
 public class QuerySpaceOptimizeEffectViewOutput extends XPageInput {
     @XText("ID")
     private String id;
@@ -40,7 +41,7 @@ public class QuerySpaceOptimizeEffectViewOutput extends XPageInput {
     private String wellNumber;
 
     @XText("优化日期")
-    private DATE optimizeDate;
+    private Date optimizeDate;
 
     @XText("优化后制度描述")
     private String optimalResult;
@@ -187,11 +188,11 @@ public class QuerySpaceOptimizeEffectViewOutput extends XPageInput {
         this.wellNumber = value;
     }
 
-    public DATE getOptimizeDate() {
+    public Date getOptimizeDate() {
         return this.optimizeDate;
     }
 
-    public void setOptimizeDate(DATE value) {
+    public void setOptimizeDate(Date value) {
         this.optimizeDate = value;
     }
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_effect/UpdateSpaceOptimizeEffectInput.java

 package pps.core.space.service.data.space_optimize_effect;
 
 import xstartup.annotation.XText;
-import java.util.Date;
+
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class UpdateSpaceOptimizeEffectInput {
     @XText("ID")
@@ -39,7 +40,7 @@ public class UpdateSpaceOptimizeEffectInput {
     private String wellNumber;
 
     @XText("优化日期")
-    private DATE optimizeDate;
+    private Date optimizeDate;
 
     @XText("优化后制度描述")
     private String optimalResult;
@@ -186,11 +187,11 @@ public class UpdateSpaceOptimizeEffectInput {
         this.wellNumber = value;
     }
 
-    public DATE getOptimizeDate() {
+    public Date getOptimizeDate() {
         return this.optimizeDate;
     }
 
-    public void setOptimizeDate(DATE value) {
+    public void setOptimizeDate(Date value) {
         this.optimizeDate = value;
     }
 

C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_effect/UpdateSpaceOptimizeEffectOutput.java

 package pps.core.space.service.data.space_optimize_effect;
 
 import xstartup.annotation.XText;
-import java.util.Date;
+
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class UpdateSpaceOptimizeEffectOutput {
     @XText("ID")
@@ -39,7 +40,7 @@ public class UpdateSpaceOptimizeEffectOutput {
     private String wellNumber;
 
     @XText("优化日期")
-    private DATE optimizeDate;
+    private Date optimizeDate;
 
     @XText("优化后制度描述")
     private String optimalResult;
@@ -186,11 +187,11 @@ public class UpdateSpaceOptimizeEffectOutput {
         this.wellNumber = value;
     }
 
-    public DATE getOptimizeDate() {
+    public Date getOptimizeDate() {
         return this.optimizeDate;
     }
 
-    public void setOptimizeDate(DATE value) {
+    public void setOptimizeDate(Date value) {
         this.optimizeDate = value;
     }