Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/InspectionItemPlan.java

@@ -87,10 +87,17 @@ public class InspectionItemPlan {
     @ApiModelProperty(value = "处理方式")
     private String memo;
 
+
+    /**
+     * 巡查结果是否异常 0-正常 1-异常
+     */
+    @ApiModelProperty(value = "巡查结果是否异常 0-正常 1-异常")
+    private Integer conclusionStatus;
+
     /**
      * 0 -未提交 1-正常 2-异常
      */
-    @ApiModelProperty(value = "0 -未提交 1-正常 2-异常")
+    @ApiModelProperty(value = "提交状态 0 -未提交 1-正常 2-异常")
     private Integer status;
 
     /**
@@ -276,4 +283,12 @@ public class InspectionItemPlan {
     public void setOrganName(String organName) {
         this.organName = organName;
     }
+
+    public Integer getConclusionStatus() {
+        return conclusionStatus;
+    }
+
+    public void setConclusionStatus(Integer conclusionStatus) {
+        this.conclusionStatus = conclusionStatus;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/InspectionItemPlanQueryInfo.java

@@ -22,6 +22,12 @@ public class InspectionItemPlanQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "乐团主管id",required = false)
     private Integer userId;
 
+    @ApiModelProperty(value = "巡查结果是否异常 0-正常 1-异常",required = false)
+    private Integer conclusionStatus;
+
+    @ApiModelProperty(value = "提交状态 0 -未提交 1-正常 2-异常",required = false)
+    private Integer status;
+
     @ApiModelProperty(value = "是否已提交 0-未提交 1-已提交 ",required = false)
     private Integer hasSubmit;
 
@@ -103,4 +109,20 @@ public class InspectionItemPlanQueryInfo extends QueryInfo {
     public void setMusicGroupId(String musicGroupId) {
         this.musicGroupId = musicGroupId;
     }
+
+    public Integer getConclusionStatus() {
+        return conclusionStatus;
+    }
+
+    public void setConclusionStatus(Integer conclusionStatus) {
+        this.conclusionStatus = conclusionStatus;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
 }

mec-biz/src/main/resources/config/mybatis/InspectionItemPlanMapper.xml

@@ -17,6 +17,7 @@
         <result column="submited_gps_" property="submitedGps"/>
         <result column="submited_time_" property="submitedTime"/>
         <result column="memo_" property="memo"/>
+        <result column="conclusion_status_" property="conclusionStatus"/>
         <result column="status_" property="status"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
@@ -27,7 +28,7 @@
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         id_, inspection_id_, item_id_, user_id_, plan_start_, plan_end_,organ_id_, cooperation_organ_id_,
-        music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, status_, create_time_,
+        music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, conclusion_status_, status_, create_time_,
         update_time_
     </sql>
     <select id="get" parameterType="java.lang.Integer" resultMap="InspectionItemPlan">
@@ -47,7 +48,7 @@
         <!--@mbg.generated-->
         insert into inspection_item_plan (inspection_id_, item_id_, user_id_, plan_start_, plan_end_,
         organ_id_,cooperation_organ_id_,
-        music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, status_,
+        music_group_id_, school_gps_, submited_gps_, submited_time_, memo_, conclusion_status_, status_,
         create_time_, update_time_)
         values (#{inspectionId}, #{itemId}, #{userId}, #{planStart}, #{planEnd}, #{organId},#{cooperationOrganId},
         #{musicGroupId}, #{schoolGps}, #{submitedGps}, #{submitedTime}, #{memo}, #{status},
@@ -93,6 +94,9 @@
             <if test="memo != null">
                 memo_ = #{memo},
             </if>
+            <if test="conclusionStatus != null">
+                conclusion_status = #{conclusionStatus},
+            </if>
             <if test="status != null">
                 status_ = #{status},
             </if>
@@ -139,7 +143,13 @@
                 AND iip.cooperation_organ_id_ = #{cooperationOrganId}
             </if>
             <if test="musicGroupId != null">
-               AND iip.music_group_id_ = #{musicGroupId}
+                AND iip.music_group_id_ = #{musicGroupId}
+            </if>
+            <if test="conclusionStatus != null">
+                AND conclusion_status = #{conclusionStatus}
+            </if>
+            <if test="status !=null">
+                AND iip.status_ = #{status}
             </if>
             <if test='hasSubmit != null and hasSubmit.toString()=="1".toString()'>
                 AND iip.status_ > 0