Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-bean/src/main/java/com/java110/vo/api/inspectionPlan/ApiInspectionPlanDataVo.java

@@ -34,6 +34,7 @@ public class ApiInspectionPlanDataVo implements Serializable {
     private String startDate;
     private String endDate;
     private String beforeTime;
+    private String canReexamine;;
 
     public String getInspectionPlanId() {
         return inspectionPlanId;
@@ -259,4 +260,12 @@ public class ApiInspectionPlanDataVo implements Serializable {
     public void setBeforeTime(String beforeTime) {
         this.beforeTime = beforeTime;
     }
+
+    public String getCanReexamine() {
+        return canReexamine;
+    }
+
+    public void setCanReexamine(String canReexamine) {
+        this.canReexamine = canReexamine;
+    }
 }

java110-db/src/main/resources/mapper/community/InspectionPlanServiceDaoImplMapper.xml

@@ -13,6 +13,12 @@
             inspection_plan_period,
             remark,
             end_time,
+            start_date,
+            end_date,
+            inspection_month,
+            inspection_day,
+            inspection_workday,
+            can_reexamine,
             operate,
             sign_type,
             start_time,
@@ -23,7 +29,8 @@
             create_user_id,
             create_user_name)
         values (#{inspectionPlanName},#{inspectionRouteId},#{inspectionPlanPeriod},#{remark},
-                #{endTime},#{operate},#{signType},#{startTime},
+                #{endTime},#{startDate},#{endDate},#{inspectionMonth},#{inspectionDay},#{inspectionWorkday},#{canReexamine},
+                #{operate},#{signType},#{startTime},
                 #{inspectionPlanId},#{state},#{communityId},#{bId},#{createUserId},
                 #{createUserName})
        </insert>

java110-db/src/main/resources/mapper/community/InspectionPlanV1ServiceDaoImplMapper.xml

@@ -10,11 +10,11 @@
         insert into inspection_plan(
         inspection_plan_name,create_user_id,inspection_route_id,inspection_plan_period,remark,
         create_user_name,sign_type,start_time,inspection_plan_id,end_time,state,community_id,
-        start_date,end_date,inspection_month,inspection_day,inspection_workday,before_time
+        start_date,end_date,inspection_month,inspection_day,inspection_workday,before_time,can_reexamine
         ) values (
         #{inspectionPlanName},#{createUserId},#{inspectionRouteId},#{inspectionPlanPeriod},#{remark},
         #{createUserName},#{signType},#{startTime},#{inspectionPlanId},#{endTime},#{state},#{communityId},
-        #{startDate},#{endDate},#{inspectionMonth},#{inspectionDay},#{inspectionWorkday},#{beforeTime}
+        #{startDate},#{endDate},#{inspectionMonth},#{inspectionDay},#{inspectionWorkday},#{beforeTime},#{canReexamine}
         )
     </insert>
 
@@ -23,8 +23,8 @@
     <select id="getInspectionPlanInfo" parameterType="Map" resultType="Map">
 
         select t.inspection_plan_name,t.inspection_plan_name inspectionPlanName,t.create_user_id,t.create_user_id
-        createUserId,t.inspection_route_id,t.inspection_route_id
-        inspectionRouteId,t.inspection_plan_period,t.inspection_plan_period
+        createUserId,t.inspection_route_id,t.inspection_route_id inspectionRouteId
+        ,t.can_reexamine,t.can_reexamine canReexamine,t.inspection_plan_period,t.inspection_plan_period
         inspectionPlanPeriod,t.remark,t.create_user_name,t.create_user_name createUserName,t.status_cd,t.status_cd
         statusCd,t.sign_type,t.sign_type signType,t.start_time,t.start_time
         startTime,t.inspection_plan_id,t.inspection_plan_id inspectionPlanId,t.end_time,t.end_time
@@ -47,6 +47,9 @@
         <if test="createUserId !=null and createUserId != ''">
             and t.create_user_id= #{createUserId}
         </if>
+        <if test="canReexamine !=null and canReexamine != ''">
+            and t.can_reexamine= #{canReexamine}
+        </if>
         <if test="inspectionRouteId !=null and inspectionRouteId != ''">
             and t.inspection_route_id= #{inspectionRouteId}
         </if>
@@ -106,6 +109,9 @@
         <if test="inspectionPlanName !=null and inspectionPlanName != ''">
             , t.inspection_plan_name= #{inspectionPlanName}
         </if>
+        <if test="canReexamine !=null and canReexamine != ''">
+            , t.can_reexamine= #{canReexamine}
+        </if>
         <if test="createUserId !=null and createUserId != ''">
             , t.create_user_id= #{createUserId}
         </if>
@@ -175,6 +181,9 @@
         <if test="createUserId !=null and createUserId != ''">
             and t.create_user_id= #{createUserId}
         </if>
+        <if test="canReexamine !=null and canReexamine != ''">
+            and t.can_reexamine= #{canReexamine}
+        </if>
         <if test="inspectionRouteId !=null and inspectionRouteId != ''">
             and t.inspection_route_id= #{inspectionRouteId}
         </if>

java110-db/src/main/resources/mapper/community/InspectionTaskServiceDaoImplMapper.xml

@@ -148,7 +148,7 @@
             and t.act_ins_time <= #{endTime}
         </if>
         <if test="planInsTime !=null ">
-            and t.plan_ins_time= #{planInsTime}
+            and DATE_FORMAT(t.plan_ins_time,'%Y-%m-%d')= #{planInsTime}
         </if>
         <if test="planEndTime !=null ">
             and t.plan_end_time= #{planEndTime}
@@ -292,7 +292,7 @@
             and t.act_ins_time &lt;= #{endTime}
         </if>
         <if test="planInsTime !=null ">
-            and t.plan_ins_time= #{planInsTime}
+            and DATE_FORMAT(t.plan_ins_time,'%Y-%m-%d')= #{planInsTime}
         </if>
         <if test="planEndTime !=null ">
             and t.plan_end_time= #{planEndTime}