ソースを参照

风机绩效表明细风能利用率修改

shilin 3 年 前
コミット
89c3ac59e7

+ 8 - 1
src/main/java/com/gyee/frame/controller/goodness/WindturbineDetailLineChartController.java

@@ -117,7 +117,14 @@ public class WindturbineDetailLineChartController {
         if(!ls.isEmpty())
         {
             Inputoroutputspeedtotal is=ls.get(0);
-            inputsmall=is.getMonthinputsmall();
+            if(StringUtils.notEmp(is) && StringUtils.notEmp(is.getMonthinputsmall()) )
+            {
+                inputsmall=is.getMonthinputsmall();
+            }else
+            {
+                inputsmall=3.0;
+            }
+
         }
         return AjaxResult.successData(AjaxStatus.success.code, inputsmall);
     }

+ 11 - 11
src/main/java/com/gyee/frame/mapper/auto/ProjectPlanMapper.java

@@ -9,7 +9,7 @@ import java.util.List;
 public interface ProjectPlanMapper {
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -17,7 +17,7 @@ public interface ProjectPlanMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -25,7 +25,7 @@ public interface ProjectPlanMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -33,7 +33,7 @@ public interface ProjectPlanMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -41,7 +41,7 @@ public interface ProjectPlanMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -49,7 +49,7 @@ public interface ProjectPlanMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -57,7 +57,7 @@ public interface ProjectPlanMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -65,7 +65,7 @@ public interface ProjectPlanMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -73,7 +73,7 @@ public interface ProjectPlanMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -81,7 +81,7 @@ public interface ProjectPlanMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -89,7 +89,7 @@ public interface ProjectPlanMapper {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */

+ 41 - 41
src/main/java/com/gyee/frame/model/auto/ProjectPlan.java

@@ -6,7 +6,7 @@ public class ProjectPlan implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column projectplan.id
+     * This field corresponds to the database column PROJECTPLAN.ID
      *
      * @mbg.generated
      */
@@ -15,7 +15,7 @@ public class ProjectPlan implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column projectplan.projectId
+     * This field corresponds to the database column PROJECTPLAN.PROJECTID
      *
      * @mbg.generated
      */
@@ -24,7 +24,7 @@ public class ProjectPlan implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column projectplan.generatingCapacity
+     * This field corresponds to the database column PROJECTPLAN.GENERATINGCAPACITY
      *
      * @mbg.generated
      */
@@ -33,7 +33,7 @@ public class ProjectPlan implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column projectplan.outageHours
+     * This field corresponds to the database column PROJECTPLAN.OUTAGEHOURS
      *
      * @mbg.generated
      */
@@ -42,7 +42,7 @@ public class ProjectPlan implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column projectplan.year
+     * This field corresponds to the database column PROJECTPLAN.YEAR
      *
      * @mbg.generated
      */
@@ -51,7 +51,7 @@ public class ProjectPlan implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column projectplan.month
+     * This field corresponds to the database column PROJECTPLAN.MONTH
      *
      * @mbg.generated
      */
@@ -60,15 +60,15 @@ public class ProjectPlan implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column projectplan.windpowerId
+     * This field corresponds to the database column PROJECTPLAN.WINDPOWER
      *
      * @mbg.generated
      */
-    private String windpowerid;
+    private String windpower;
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table projectplan
+     * This field corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -76,9 +76,9 @@ public class ProjectPlan implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column projectplan.id
+     * This method returns the value of the database column PROJECTPLAN.ID
      *
-     * @return the value of projectplan.id
+     * @return the value of PROJECTPLAN.ID
      *
      * @mbg.generated
      */
@@ -88,9 +88,9 @@ public class ProjectPlan implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column projectplan.id
+     * This method sets the value of the database column PROJECTPLAN.ID
      *
-     * @param id the value for projectplan.id
+     * @param id the value for PROJECTPLAN.ID
      *
      * @mbg.generated
      */
@@ -100,9 +100,9 @@ public class ProjectPlan implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column projectplan.projectId
+     * This method returns the value of the database column PROJECTPLAN.PROJECTID
      *
-     * @return the value of projectplan.projectId
+     * @return the value of PROJECTPLAN.PROJECTID
      *
      * @mbg.generated
      */
@@ -112,9 +112,9 @@ public class ProjectPlan implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column projectplan.projectId
+     * This method sets the value of the database column PROJECTPLAN.PROJECTID
      *
-     * @param projectid the value for projectplan.projectId
+     * @param projectid the value for PROJECTPLAN.PROJECTID
      *
      * @mbg.generated
      */
@@ -124,9 +124,9 @@ public class ProjectPlan implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column projectplan.generatingCapacity
+     * This method returns the value of the database column PROJECTPLAN.GENERATINGCAPACITY
      *
-     * @return the value of projectplan.generatingCapacity
+     * @return the value of PROJECTPLAN.GENERATINGCAPACITY
      *
      * @mbg.generated
      */
@@ -136,9 +136,9 @@ public class ProjectPlan implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column projectplan.generatingCapacity
+     * This method sets the value of the database column PROJECTPLAN.GENERATINGCAPACITY
      *
-     * @param generatingcapacity the value for projectplan.generatingCapacity
+     * @param generatingcapacity the value for PROJECTPLAN.GENERATINGCAPACITY
      *
      * @mbg.generated
      */
@@ -148,9 +148,9 @@ public class ProjectPlan implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column projectplan.outageHours
+     * This method returns the value of the database column PROJECTPLAN.OUTAGEHOURS
      *
-     * @return the value of projectplan.outageHours
+     * @return the value of PROJECTPLAN.OUTAGEHOURS
      *
      * @mbg.generated
      */
@@ -160,9 +160,9 @@ public class ProjectPlan implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column projectplan.outageHours
+     * This method sets the value of the database column PROJECTPLAN.OUTAGEHOURS
      *
-     * @param outagehours the value for projectplan.outageHours
+     * @param outagehours the value for PROJECTPLAN.OUTAGEHOURS
      *
      * @mbg.generated
      */
@@ -172,9 +172,9 @@ public class ProjectPlan implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column projectplan.year
+     * This method returns the value of the database column PROJECTPLAN.YEAR
      *
-     * @return the value of projectplan.year
+     * @return the value of PROJECTPLAN.YEAR
      *
      * @mbg.generated
      */
@@ -184,9 +184,9 @@ public class ProjectPlan implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column projectplan.year
+     * This method sets the value of the database column PROJECTPLAN.YEAR
      *
-     * @param year the value for projectplan.year
+     * @param year the value for PROJECTPLAN.YEAR
      *
      * @mbg.generated
      */
@@ -196,9 +196,9 @@ public class ProjectPlan implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column projectplan.month
+     * This method returns the value of the database column PROJECTPLAN.MONTH
      *
-     * @return the value of projectplan.month
+     * @return the value of PROJECTPLAN.MONTH
      *
      * @mbg.generated
      */
@@ -208,9 +208,9 @@ public class ProjectPlan implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column projectplan.month
+     * This method sets the value of the database column PROJECTPLAN.MONTH
      *
-     * @param month the value for projectplan.month
+     * @param month the value for PROJECTPLAN.MONTH
      *
      * @mbg.generated
      */
@@ -220,25 +220,25 @@ public class ProjectPlan implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column projectplan.windpowerId
+     * This method returns the value of the database column PROJECTPLAN.WINDPOWER
      *
-     * @return the value of projectplan.windpowerId
+     * @return the value of PROJECTPLAN.WINDPOWER
      *
      * @mbg.generated
      */
-    public String getWindpowerid() {
-        return windpowerid;
+    public String getWindpower() {
+        return windpower;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column projectplan.windpowerId
+     * This method sets the value of the database column PROJECTPLAN.WINDPOWER
      *
-     * @param windpowerid the value for projectplan.windpowerId
+     * @param windpower the value for PROJECTPLAN.WINDPOWER
      *
      * @mbg.generated
      */
-    public void setWindpowerid(String windpowerid) {
-        this.windpowerid = windpowerid == null ? null : windpowerid.trim();
+    public void setWindpower(String windpower) {
+        this.windpower = windpower == null ? null : windpower.trim();
     }
 }

+ 127 - 127
src/main/java/com/gyee/frame/model/auto/ProjectPlanExample.java

@@ -6,7 +6,7 @@ import java.util.List;
 public class ProjectPlanExample {
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table projectplan
+     * This field corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -14,7 +14,7 @@ public class ProjectPlanExample {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table projectplan
+     * This field corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -22,7 +22,7 @@ public class ProjectPlanExample {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table projectplan
+     * This field corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -30,7 +30,7 @@ public class ProjectPlanExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -40,7 +40,7 @@ public class ProjectPlanExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -50,7 +50,7 @@ public class ProjectPlanExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -60,7 +60,7 @@ public class ProjectPlanExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -70,7 +70,7 @@ public class ProjectPlanExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -80,7 +80,7 @@ public class ProjectPlanExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -90,7 +90,7 @@ public class ProjectPlanExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -100,7 +100,7 @@ public class ProjectPlanExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -112,7 +112,7 @@ public class ProjectPlanExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -126,7 +126,7 @@ public class ProjectPlanExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -137,7 +137,7 @@ public class ProjectPlanExample {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table projectplan
+     * This method corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -149,7 +149,7 @@ public class ProjectPlanExample {
 
     /**
      * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table projectplan
+     * This class corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */
@@ -195,489 +195,489 @@ public class ProjectPlanExample {
         }
 
         public Criteria andIdIsNull() {
-            addCriterion("id is null");
+            addCriterion("ID is null");
             return (Criteria) this;
         }
 
         public Criteria andIdIsNotNull() {
-            addCriterion("id is not null");
+            addCriterion("ID is not null");
             return (Criteria) this;
         }
 
         public Criteria andIdEqualTo(String value) {
-            addCriterion("id =", value, "id");
+            addCriterion("ID =", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdNotEqualTo(String value) {
-            addCriterion("id <>", value, "id");
+            addCriterion("ID <>", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdGreaterThan(String value) {
-            addCriterion("id >", value, "id");
+            addCriterion("ID >", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdGreaterThanOrEqualTo(String value) {
-            addCriterion("id >=", value, "id");
+            addCriterion("ID >=", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdLessThan(String value) {
-            addCriterion("id <", value, "id");
+            addCriterion("ID <", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdLessThanOrEqualTo(String value) {
-            addCriterion("id <=", value, "id");
+            addCriterion("ID <=", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdLike(String value) {
-            addCriterion("id like", value, "id");
+            addCriterion("ID like", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdNotLike(String value) {
-            addCriterion("id not like", value, "id");
+            addCriterion("ID not like", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdIn(List<String> values) {
-            addCriterion("id in", values, "id");
+            addCriterion("ID in", values, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdNotIn(List<String> values) {
-            addCriterion("id not in", values, "id");
+            addCriterion("ID not in", values, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdBetween(String value1, String value2) {
-            addCriterion("id between", value1, value2, "id");
+            addCriterion("ID between", value1, value2, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdNotBetween(String value1, String value2) {
-            addCriterion("id not between", value1, value2, "id");
+            addCriterion("ID not between", value1, value2, "id");
             return (Criteria) this;
         }
 
         public Criteria andProjectidIsNull() {
-            addCriterion("projectId is null");
+            addCriterion("PROJECTID is null");
             return (Criteria) this;
         }
 
         public Criteria andProjectidIsNotNull() {
-            addCriterion("projectId is not null");
+            addCriterion("PROJECTID is not null");
             return (Criteria) this;
         }
 
         public Criteria andProjectidEqualTo(String value) {
-            addCriterion("projectId =", value, "projectid");
+            addCriterion("PROJECTID =", value, "projectid");
             return (Criteria) this;
         }
 
         public Criteria andProjectidNotEqualTo(String value) {
-            addCriterion("projectId <>", value, "projectid");
+            addCriterion("PROJECTID <>", value, "projectid");
             return (Criteria) this;
         }
 
         public Criteria andProjectidGreaterThan(String value) {
-            addCriterion("projectId >", value, "projectid");
+            addCriterion("PROJECTID >", value, "projectid");
             return (Criteria) this;
         }
 
         public Criteria andProjectidGreaterThanOrEqualTo(String value) {
-            addCriterion("projectId >=", value, "projectid");
+            addCriterion("PROJECTID >=", value, "projectid");
             return (Criteria) this;
         }
 
         public Criteria andProjectidLessThan(String value) {
-            addCriterion("projectId <", value, "projectid");
+            addCriterion("PROJECTID <", value, "projectid");
             return (Criteria) this;
         }
 
         public Criteria andProjectidLessThanOrEqualTo(String value) {
-            addCriterion("projectId <=", value, "projectid");
+            addCriterion("PROJECTID <=", value, "projectid");
             return (Criteria) this;
         }
 
         public Criteria andProjectidLike(String value) {
-            addCriterion("projectId like", value, "projectid");
+            addCriterion("PROJECTID like", value, "projectid");
             return (Criteria) this;
         }
 
         public Criteria andProjectidNotLike(String value) {
-            addCriterion("projectId not like", value, "projectid");
+            addCriterion("PROJECTID not like", value, "projectid");
             return (Criteria) this;
         }
 
         public Criteria andProjectidIn(List<String> values) {
-            addCriterion("projectId in", values, "projectid");
+            addCriterion("PROJECTID in", values, "projectid");
             return (Criteria) this;
         }
 
         public Criteria andProjectidNotIn(List<String> values) {
-            addCriterion("projectId not in", values, "projectid");
+            addCriterion("PROJECTID not in", values, "projectid");
             return (Criteria) this;
         }
 
         public Criteria andProjectidBetween(String value1, String value2) {
-            addCriterion("projectId between", value1, value2, "projectid");
+            addCriterion("PROJECTID between", value1, value2, "projectid");
             return (Criteria) this;
         }
 
         public Criteria andProjectidNotBetween(String value1, String value2) {
-            addCriterion("projectId not between", value1, value2, "projectid");
+            addCriterion("PROJECTID not between", value1, value2, "projectid");
             return (Criteria) this;
         }
 
         public Criteria andGeneratingcapacityIsNull() {
-            addCriterion("generatingCapacity is null");
+            addCriterion("GENERATINGCAPACITY is null");
             return (Criteria) this;
         }
 
         public Criteria andGeneratingcapacityIsNotNull() {
-            addCriterion("generatingCapacity is not null");
+            addCriterion("GENERATINGCAPACITY is not null");
             return (Criteria) this;
         }
 
         public Criteria andGeneratingcapacityEqualTo(String value) {
-            addCriterion("generatingCapacity =", value, "generatingcapacity");
+            addCriterion("GENERATINGCAPACITY =", value, "generatingcapacity");
             return (Criteria) this;
         }
 
         public Criteria andGeneratingcapacityNotEqualTo(String value) {
-            addCriterion("generatingCapacity <>", value, "generatingcapacity");
+            addCriterion("GENERATINGCAPACITY <>", value, "generatingcapacity");
             return (Criteria) this;
         }
 
         public Criteria andGeneratingcapacityGreaterThan(String value) {
-            addCriterion("generatingCapacity >", value, "generatingcapacity");
+            addCriterion("GENERATINGCAPACITY >", value, "generatingcapacity");
             return (Criteria) this;
         }
 
         public Criteria andGeneratingcapacityGreaterThanOrEqualTo(String value) {
-            addCriterion("generatingCapacity >=", value, "generatingcapacity");
+            addCriterion("GENERATINGCAPACITY >=", value, "generatingcapacity");
             return (Criteria) this;
         }
 
         public Criteria andGeneratingcapacityLessThan(String value) {
-            addCriterion("generatingCapacity <", value, "generatingcapacity");
+            addCriterion("GENERATINGCAPACITY <", value, "generatingcapacity");
             return (Criteria) this;
         }
 
         public Criteria andGeneratingcapacityLessThanOrEqualTo(String value) {
-            addCriterion("generatingCapacity <=", value, "generatingcapacity");
+            addCriterion("GENERATINGCAPACITY <=", value, "generatingcapacity");
             return (Criteria) this;
         }
 
         public Criteria andGeneratingcapacityLike(String value) {
-            addCriterion("generatingCapacity like", value, "generatingcapacity");
+            addCriterion("GENERATINGCAPACITY like", value, "generatingcapacity");
             return (Criteria) this;
         }
 
         public Criteria andGeneratingcapacityNotLike(String value) {
-            addCriterion("generatingCapacity not like", value, "generatingcapacity");
+            addCriterion("GENERATINGCAPACITY not like", value, "generatingcapacity");
             return (Criteria) this;
         }
 
         public Criteria andGeneratingcapacityIn(List<String> values) {
-            addCriterion("generatingCapacity in", values, "generatingcapacity");
+            addCriterion("GENERATINGCAPACITY in", values, "generatingcapacity");
             return (Criteria) this;
         }
 
         public Criteria andGeneratingcapacityNotIn(List<String> values) {
-            addCriterion("generatingCapacity not in", values, "generatingcapacity");
+            addCriterion("GENERATINGCAPACITY not in", values, "generatingcapacity");
             return (Criteria) this;
         }
 
         public Criteria andGeneratingcapacityBetween(String value1, String value2) {
-            addCriterion("generatingCapacity between", value1, value2, "generatingcapacity");
+            addCriterion("GENERATINGCAPACITY between", value1, value2, "generatingcapacity");
             return (Criteria) this;
         }
 
         public Criteria andGeneratingcapacityNotBetween(String value1, String value2) {
-            addCriterion("generatingCapacity not between", value1, value2, "generatingcapacity");
+            addCriterion("GENERATINGCAPACITY not between", value1, value2, "generatingcapacity");
             return (Criteria) this;
         }
 
         public Criteria andOutagehoursIsNull() {
-            addCriterion("outageHours is null");
+            addCriterion("OUTAGEHOURS is null");
             return (Criteria) this;
         }
 
         public Criteria andOutagehoursIsNotNull() {
-            addCriterion("outageHours is not null");
+            addCriterion("OUTAGEHOURS is not null");
             return (Criteria) this;
         }
 
         public Criteria andOutagehoursEqualTo(Double value) {
-            addCriterion("outageHours =", value, "outagehours");
+            addCriterion("OUTAGEHOURS =", value, "outagehours");
             return (Criteria) this;
         }
 
         public Criteria andOutagehoursNotEqualTo(Double value) {
-            addCriterion("outageHours <>", value, "outagehours");
+            addCriterion("OUTAGEHOURS <>", value, "outagehours");
             return (Criteria) this;
         }
 
         public Criteria andOutagehoursGreaterThan(Double value) {
-            addCriterion("outageHours >", value, "outagehours");
+            addCriterion("OUTAGEHOURS >", value, "outagehours");
             return (Criteria) this;
         }
 
         public Criteria andOutagehoursGreaterThanOrEqualTo(Double value) {
-            addCriterion("outageHours >=", value, "outagehours");
+            addCriterion("OUTAGEHOURS >=", value, "outagehours");
             return (Criteria) this;
         }
 
         public Criteria andOutagehoursLessThan(Double value) {
-            addCriterion("outageHours <", value, "outagehours");
+            addCriterion("OUTAGEHOURS <", value, "outagehours");
             return (Criteria) this;
         }
 
         public Criteria andOutagehoursLessThanOrEqualTo(Double value) {
-            addCriterion("outageHours <=", value, "outagehours");
+            addCriterion("OUTAGEHOURS <=", value, "outagehours");
             return (Criteria) this;
         }
 
         public Criteria andOutagehoursIn(List<Double> values) {
-            addCriterion("outageHours in", values, "outagehours");
+            addCriterion("OUTAGEHOURS in", values, "outagehours");
             return (Criteria) this;
         }
 
         public Criteria andOutagehoursNotIn(List<Double> values) {
-            addCriterion("outageHours not in", values, "outagehours");
+            addCriterion("OUTAGEHOURS not in", values, "outagehours");
             return (Criteria) this;
         }
 
         public Criteria andOutagehoursBetween(Double value1, Double value2) {
-            addCriterion("outageHours between", value1, value2, "outagehours");
+            addCriterion("OUTAGEHOURS between", value1, value2, "outagehours");
             return (Criteria) this;
         }
 
         public Criteria andOutagehoursNotBetween(Double value1, Double value2) {
-            addCriterion("outageHours not between", value1, value2, "outagehours");
+            addCriterion("OUTAGEHOURS not between", value1, value2, "outagehours");
             return (Criteria) this;
         }
 
         public Criteria andYearIsNull() {
-            addCriterion("year is null");
+            addCriterion("YEAR is null");
             return (Criteria) this;
         }
 
         public Criteria andYearIsNotNull() {
-            addCriterion("year is not null");
+            addCriterion("YEAR is not null");
             return (Criteria) this;
         }
 
         public Criteria andYearEqualTo(String value) {
-            addCriterion("year =", value, "year");
+            addCriterion("YEAR =", value, "year");
             return (Criteria) this;
         }
 
         public Criteria andYearNotEqualTo(String value) {
-            addCriterion("year <>", value, "year");
+            addCriterion("YEAR <>", value, "year");
             return (Criteria) this;
         }
 
         public Criteria andYearGreaterThan(String value) {
-            addCriterion("year >", value, "year");
+            addCriterion("YEAR >", value, "year");
             return (Criteria) this;
         }
 
         public Criteria andYearGreaterThanOrEqualTo(String value) {
-            addCriterion("year >=", value, "year");
+            addCriterion("YEAR >=", value, "year");
             return (Criteria) this;
         }
 
         public Criteria andYearLessThan(String value) {
-            addCriterion("year <", value, "year");
+            addCriterion("YEAR <", value, "year");
             return (Criteria) this;
         }
 
         public Criteria andYearLessThanOrEqualTo(String value) {
-            addCriterion("year <=", value, "year");
+            addCriterion("YEAR <=", value, "year");
             return (Criteria) this;
         }
 
         public Criteria andYearLike(String value) {
-            addCriterion("year like", value, "year");
+            addCriterion("YEAR like", value, "year");
             return (Criteria) this;
         }
 
         public Criteria andYearNotLike(String value) {
-            addCriterion("year not like", value, "year");
+            addCriterion("YEAR not like", value, "year");
             return (Criteria) this;
         }
 
         public Criteria andYearIn(List<String> values) {
-            addCriterion("year in", values, "year");
+            addCriterion("YEAR in", values, "year");
             return (Criteria) this;
         }
 
         public Criteria andYearNotIn(List<String> values) {
-            addCriterion("year not in", values, "year");
+            addCriterion("YEAR not in", values, "year");
             return (Criteria) this;
         }
 
         public Criteria andYearBetween(String value1, String value2) {
-            addCriterion("year between", value1, value2, "year");
+            addCriterion("YEAR between", value1, value2, "year");
             return (Criteria) this;
         }
 
         public Criteria andYearNotBetween(String value1, String value2) {
-            addCriterion("year not between", value1, value2, "year");
+            addCriterion("YEAR not between", value1, value2, "year");
             return (Criteria) this;
         }
 
         public Criteria andMonthIsNull() {
-            addCriterion("month is null");
+            addCriterion("MONTH is null");
             return (Criteria) this;
         }
 
         public Criteria andMonthIsNotNull() {
-            addCriterion("month is not null");
+            addCriterion("MONTH is not null");
             return (Criteria) this;
         }
 
         public Criteria andMonthEqualTo(String value) {
-            addCriterion("month =", value, "month");
+            addCriterion("MONTH =", value, "month");
             return (Criteria) this;
         }
 
         public Criteria andMonthNotEqualTo(String value) {
-            addCriterion("month <>", value, "month");
+            addCriterion("MONTH <>", value, "month");
             return (Criteria) this;
         }
 
         public Criteria andMonthGreaterThan(String value) {
-            addCriterion("month >", value, "month");
+            addCriterion("MONTH >", value, "month");
             return (Criteria) this;
         }
 
         public Criteria andMonthGreaterThanOrEqualTo(String value) {
-            addCriterion("month >=", value, "month");
+            addCriterion("MONTH >=", value, "month");
             return (Criteria) this;
         }
 
         public Criteria andMonthLessThan(String value) {
-            addCriterion("month <", value, "month");
+            addCriterion("MONTH <", value, "month");
             return (Criteria) this;
         }
 
         public Criteria andMonthLessThanOrEqualTo(String value) {
-            addCriterion("month <=", value, "month");
+            addCriterion("MONTH <=", value, "month");
             return (Criteria) this;
         }
 
         public Criteria andMonthLike(String value) {
-            addCriterion("month like", value, "month");
+            addCriterion("MONTH like", value, "month");
             return (Criteria) this;
         }
 
         public Criteria andMonthNotLike(String value) {
-            addCriterion("month not like", value, "month");
+            addCriterion("MONTH not like", value, "month");
             return (Criteria) this;
         }
 
         public Criteria andMonthIn(List<String> values) {
-            addCriterion("month in", values, "month");
+            addCriterion("MONTH in", values, "month");
             return (Criteria) this;
         }
 
         public Criteria andMonthNotIn(List<String> values) {
-            addCriterion("month not in", values, "month");
+            addCriterion("MONTH not in", values, "month");
             return (Criteria) this;
         }
 
         public Criteria andMonthBetween(String value1, String value2) {
-            addCriterion("month between", value1, value2, "month");
+            addCriterion("MONTH between", value1, value2, "month");
             return (Criteria) this;
         }
 
         public Criteria andMonthNotBetween(String value1, String value2) {
-            addCriterion("month not between", value1, value2, "month");
+            addCriterion("MONTH not between", value1, value2, "month");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridIsNull() {
-            addCriterion("windpowerId is null");
+        public Criteria andWindpowerIsNull() {
+            addCriterion("WINDPOWER is null");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridIsNotNull() {
-            addCriterion("windpowerId is not null");
+        public Criteria andWindpowerIsNotNull() {
+            addCriterion("WINDPOWER is not null");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridEqualTo(String value) {
-            addCriterion("windpowerId =", value, "windpowerid");
+        public Criteria andWindpowerEqualTo(String value) {
+            addCriterion("WINDPOWER =", value, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridNotEqualTo(String value) {
-            addCriterion("windpowerId <>", value, "windpowerid");
+        public Criteria andWindpowerNotEqualTo(String value) {
+            addCriterion("WINDPOWER <>", value, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridGreaterThan(String value) {
-            addCriterion("windpowerId >", value, "windpowerid");
+        public Criteria andWindpowerGreaterThan(String value) {
+            addCriterion("WINDPOWER >", value, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridGreaterThanOrEqualTo(String value) {
-            addCriterion("windpowerId >=", value, "windpowerid");
+        public Criteria andWindpowerGreaterThanOrEqualTo(String value) {
+            addCriterion("WINDPOWER >=", value, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridLessThan(String value) {
-            addCriterion("windpowerId <", value, "windpowerid");
+        public Criteria andWindpowerLessThan(String value) {
+            addCriterion("WINDPOWER <", value, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridLessThanOrEqualTo(String value) {
-            addCriterion("windpowerId <=", value, "windpowerid");
+        public Criteria andWindpowerLessThanOrEqualTo(String value) {
+            addCriterion("WINDPOWER <=", value, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridLike(String value) {
-            addCriterion("windpowerId like", value, "windpowerid");
+        public Criteria andWindpowerLike(String value) {
+            addCriterion("WINDPOWER like", value, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridNotLike(String value) {
-            addCriterion("windpowerId not like", value, "windpowerid");
+        public Criteria andWindpowerNotLike(String value) {
+            addCriterion("WINDPOWER not like", value, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridIn(List<String> values) {
-            addCriterion("windpowerId in", values, "windpowerid");
+        public Criteria andWindpowerIn(List<String> values) {
+            addCriterion("WINDPOWER in", values, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridNotIn(List<String> values) {
-            addCriterion("windpowerId not in", values, "windpowerid");
+        public Criteria andWindpowerNotIn(List<String> values) {
+            addCriterion("WINDPOWER not in", values, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridBetween(String value1, String value2) {
-            addCriterion("windpowerId between", value1, value2, "windpowerid");
+        public Criteria andWindpowerBetween(String value1, String value2) {
+            addCriterion("WINDPOWER between", value1, value2, "windpower");
             return (Criteria) this;
         }
 
-        public Criteria andWindpoweridNotBetween(String value1, String value2) {
-            addCriterion("windpowerId not between", value1, value2, "windpowerid");
+        public Criteria andWindpowerNotBetween(String value1, String value2) {
+            addCriterion("WINDPOWER not between", value1, value2, "windpower");
             return (Criteria) this;
         }
     }
 
     /**
      * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table projectplan
+     * This class corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated do_not_delete_during_merge
      */
@@ -690,7 +690,7 @@ public class ProjectPlanExample {
 
     /**
      * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table projectplan
+     * This class corresponds to the database table PROJECTPLAN
      *
      * @mbg.generated
      */

+ 7 - 7
src/main/java/com/gyee/frame/service/ProjectPlanService.java

@@ -109,7 +109,7 @@ public class ProjectPlanService implements BaseService<ProjectPlan, ProjectPlanE
 
 		ProjectPlanExample.Criteria criteria = example.createCriteria();
 		if (StringUtils.notEmp(wpId)) {
-			criteria.andWindpoweridEqualTo(wpId);
+			criteria.andWindpowerEqualTo(wpId);
 		}
 		if (StringUtils.notEmp(pjId)) {
 			criteria.andProjectidEqualTo(pjId);
@@ -130,7 +130,7 @@ public class ProjectPlanService implements BaseService<ProjectPlan, ProjectPlanE
 				event.setMonth(pp.getMonth());
 				event.setOutagehours(pp.getOutagehours());
 				event.setProjectid(pp.getProjectid());
-				event.setWindpower(pp.getWindpowerid());
+				event.setWindpower(pp.getWindpower());
 				event.setYear(pp.getYear());
 				if(InitialRunner.pjmap.containsKey(pp.getProjectid()))
 				{
@@ -138,7 +138,7 @@ public class ProjectPlanService implements BaseService<ProjectPlan, ProjectPlanE
 					event.setProjectName(project.getName());
 				}
 
-				event.setWindpowerName(InitialRunner.wpmap.get(pp.getWindpowerid()).getName());
+				event.setWindpowerName(InitialRunner.wpmap.get(pp.getWindpower()).getName());
 				list.add(event);
 			}
 
@@ -321,10 +321,10 @@ public class ProjectPlanService implements BaseService<ProjectPlan, ProjectPlanE
 				event.setMonth(pp.getMonth());
 				event.setOutagehours(pp.getOutagehours());
 				event.setProjectid(pp.getProjectid());
-				event.setWindpower(pp.getWindpowerid());
+				event.setWindpower(pp.getWindpower());
 				event.setYear(pp.getYear());
 				event.setProjectName(InitialRunner.pjmap.get(pp.getProjectid()).getName());
-				event.setWindpowerName(InitialRunner.wpmap.get(pp.getWindpowerid()).getName());
+				event.setWindpowerName(InitialRunner.wpmap.get(pp.getWindpower()).getName());
 				list.add(event);
 			}
 		}
@@ -418,7 +418,7 @@ public class ProjectPlanService implements BaseService<ProjectPlan, ProjectPlanE
 			{
 				ProjectPlan po=new ProjectPlan();
 				po.setProjectid(vo.getProjectid());
-				po.setWindpowerid(vo.getWindpower());
+				po.setWindpower(vo.getWindpower());
 				po.setYear(vo.getYear());
 				po.setMonth(String.valueOf(i));
 				list.add(po);
@@ -426,7 +426,7 @@ public class ProjectPlanService implements BaseService<ProjectPlan, ProjectPlanE
 
 			ProjectPlan po=new ProjectPlan();
 			po.setProjectid(vo.getProjectid());
-			po.setWindpowerid(vo.getWindpower());
+			po.setWindpower(vo.getWindpower());
 			po.setYear(vo.getYear());
 			list.add(po);
 

+ 1 - 1
src/main/resources/mybatis-generator.xml

@@ -104,7 +104,7 @@
 
 <!--        <table tableName='Windturbine' domainObjectName='WindturbineSql'/>-->
 <!--        <table tableName='Equipment' domainObjectName='EquipmentSql'/>-->
-        <table tableName='mismap' domainObjectName='MismapSql'/>
+        <table tableName='ProjectPlan' domainObjectName='ProjectPlan'/>
 
     </context>
 </generatorConfiguration>

+ 64 - 64
src/main/resources/mybatis/auto/ProjectPlanMapper.xml

@@ -6,13 +6,13 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="projectId" jdbcType="VARCHAR" property="projectid" />
-    <result column="generatingCapacity" jdbcType="VARCHAR" property="generatingcapacity" />
-    <result column="outageHours" jdbcType="DECIMAL" property="outagehours" />
-    <result column="year" jdbcType="VARCHAR" property="year" />
-    <result column="month" jdbcType="VARCHAR" property="month" />
-    <result column="windpowerId" jdbcType="VARCHAR" property="windpowerid" />
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="PROJECTID" jdbcType="VARCHAR" property="projectid" />
+    <result column="GENERATINGCAPACITY" jdbcType="VARCHAR" property="generatingcapacity" />
+    <result column="OUTAGEHOURS" jdbcType="DECIMAL" property="outagehours" />
+    <result column="YEAR" jdbcType="VARCHAR" property="year" />
+    <result column="MONTH" jdbcType="VARCHAR" property="month" />
+    <result column="WINDPOWER" jdbcType="VARCHAR" property="windpower" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -85,7 +85,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, projectId, generatingCapacity, outageHours, year, month, windpowerId
+    ID, PROJECTID, GENERATINGCAPACITY, OUTAGEHOURS, YEAR, MONTH, WINDPOWER
   </sql>
   <select id="selectByExample" parameterType="com.gyee.frame.model.auto.ProjectPlanExample" resultMap="BaseResultMap">
     <!--
@@ -97,7 +97,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from projectplan
+    from PROJECTPLAN
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -112,23 +112,23 @@
     -->
     select 
     <include refid="Base_Column_List" />
-    from projectplan
-    where id = #{id,jdbcType=VARCHAR}
+    from PROJECTPLAN
+    where ID = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    delete from projectplan
-    where id = #{id,jdbcType=VARCHAR}
+    delete from PROJECTPLAN
+    where ID = #{id,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.ProjectPlanExample">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    delete from projectplan
+    delete from PROJECTPLAN
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -138,40 +138,40 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into projectplan (id, projectId, generatingCapacity, 
-      outageHours, year, month, 
-      windpowerId)
+    insert into PROJECTPLAN (ID, PROJECTID, GENERATINGCAPACITY, 
+      OUTAGEHOURS, YEAR, MONTH, 
+      WINDPOWER)
     values (#{id,jdbcType=VARCHAR}, #{projectid,jdbcType=VARCHAR}, #{generatingcapacity,jdbcType=VARCHAR}, 
       #{outagehours,jdbcType=DECIMAL}, #{year,jdbcType=VARCHAR}, #{month,jdbcType=VARCHAR}, 
-      #{windpowerid,jdbcType=VARCHAR})
+      #{windpower,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.ProjectPlan">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into projectplan
+    insert into PROJECTPLAN
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
-        id,
+        ID,
       </if>
       <if test="projectid != null">
-        projectId,
+        PROJECTID,
       </if>
       <if test="generatingcapacity != null">
-        generatingCapacity,
+        GENERATINGCAPACITY,
       </if>
       <if test="outagehours != null">
-        outageHours,
+        OUTAGEHOURS,
       </if>
       <if test="year != null">
-        year,
+        YEAR,
       </if>
       <if test="month != null">
-        month,
+        MONTH,
       </if>
-      <if test="windpowerid != null">
-        windpowerId,
+      <if test="windpower != null">
+        WINDPOWER,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -193,8 +193,8 @@
       <if test="month != null">
         #{month,jdbcType=VARCHAR},
       </if>
-      <if test="windpowerid != null">
-        #{windpowerid,jdbcType=VARCHAR},
+      <if test="windpower != null">
+        #{windpower,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -203,7 +203,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    select count(*) from projectplan
+    select count(*) from PROJECTPLAN
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -213,28 +213,28 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update projectplan
+    update PROJECTPLAN
     <set>
       <if test="record.id != null">
-        id = #{record.id,jdbcType=VARCHAR},
+        ID = #{record.id,jdbcType=VARCHAR},
       </if>
       <if test="record.projectid != null">
-        projectId = #{record.projectid,jdbcType=VARCHAR},
+        PROJECTID = #{record.projectid,jdbcType=VARCHAR},
       </if>
       <if test="record.generatingcapacity != null">
-        generatingCapacity = #{record.generatingcapacity,jdbcType=VARCHAR},
+        GENERATINGCAPACITY = #{record.generatingcapacity,jdbcType=VARCHAR},
       </if>
       <if test="record.outagehours != null">
-        outageHours = #{record.outagehours,jdbcType=DECIMAL},
+        OUTAGEHOURS = #{record.outagehours,jdbcType=DECIMAL},
       </if>
       <if test="record.year != null">
-        year = #{record.year,jdbcType=VARCHAR},
+        YEAR = #{record.year,jdbcType=VARCHAR},
       </if>
       <if test="record.month != null">
-        month = #{record.month,jdbcType=VARCHAR},
+        MONTH = #{record.month,jdbcType=VARCHAR},
       </if>
-      <if test="record.windpowerid != null">
-        windpowerId = #{record.windpowerid,jdbcType=VARCHAR},
+      <if test="record.windpower != null">
+        WINDPOWER = #{record.windpower,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="_parameter != null">
@@ -246,14 +246,14 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update projectplan
-    set id = #{record.id,jdbcType=VARCHAR},
-      projectId = #{record.projectid,jdbcType=VARCHAR},
-      generatingCapacity = #{record.generatingcapacity,jdbcType=VARCHAR},
-      outageHours = #{record.outagehours,jdbcType=DECIMAL},
-      year = #{record.year,jdbcType=VARCHAR},
-      month = #{record.month,jdbcType=VARCHAR},
-      windpowerId = #{record.windpowerid,jdbcType=VARCHAR}
+    update PROJECTPLAN
+    set ID = #{record.id,jdbcType=VARCHAR},
+      PROJECTID = #{record.projectid,jdbcType=VARCHAR},
+      GENERATINGCAPACITY = #{record.generatingcapacity,jdbcType=VARCHAR},
+      OUTAGEHOURS = #{record.outagehours,jdbcType=DECIMAL},
+      YEAR = #{record.year,jdbcType=VARCHAR},
+      MONTH = #{record.month,jdbcType=VARCHAR},
+      WINDPOWER = #{record.windpower,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -263,41 +263,41 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update projectplan
+    update PROJECTPLAN
     <set>
       <if test="projectid != null">
-        projectId = #{projectid,jdbcType=VARCHAR},
+        PROJECTID = #{projectid,jdbcType=VARCHAR},
       </if>
       <if test="generatingcapacity != null">
-        generatingCapacity = #{generatingcapacity,jdbcType=VARCHAR},
+        GENERATINGCAPACITY = #{generatingcapacity,jdbcType=VARCHAR},
       </if>
       <if test="outagehours != null">
-        outageHours = #{outagehours,jdbcType=DECIMAL},
+        OUTAGEHOURS = #{outagehours,jdbcType=DECIMAL},
       </if>
       <if test="year != null">
-        year = #{year,jdbcType=VARCHAR},
+        YEAR = #{year,jdbcType=VARCHAR},
       </if>
       <if test="month != null">
-        month = #{month,jdbcType=VARCHAR},
+        MONTH = #{month,jdbcType=VARCHAR},
       </if>
-      <if test="windpowerid != null">
-        windpowerId = #{windpowerid,jdbcType=VARCHAR},
+      <if test="windpower != null">
+        WINDPOWER = #{windpower,jdbcType=VARCHAR},
       </if>
     </set>
-    where id = #{id,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.ProjectPlan">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    update projectplan
-    set projectId = #{projectid,jdbcType=VARCHAR},
-      generatingCapacity = #{generatingcapacity,jdbcType=VARCHAR},
-      outageHours = #{outagehours,jdbcType=DECIMAL},
-      year = #{year,jdbcType=VARCHAR},
-      month = #{month,jdbcType=VARCHAR},
-      windpowerId = #{windpowerid,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=VARCHAR}
+    update PROJECTPLAN
+    set PROJECTID = #{projectid,jdbcType=VARCHAR},
+      GENERATINGCAPACITY = #{generatingcapacity,jdbcType=VARCHAR},
+      OUTAGEHOURS = #{outagehours,jdbcType=DECIMAL},
+      YEAR = #{year,jdbcType=VARCHAR},
+      MONTH = #{month,jdbcType=VARCHAR},
+      WINDPOWER = #{windpower,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>