app保养任务日历统计bug修改

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/response/MaintenanceAppResponse.java

@@ -83,4 +83,8 @@ public class MaintenanceAppResponse {
      * 保养状态
      */
     private String status;
+    /**
+     * 是否评价
+     */
+    private String hasEvaluate;
 }

lift-business-service/src/main/resources/mapper/maintenance/MaintenancePlanMapper.xml

@@ -144,7 +144,7 @@
 		</if>
 	</select>
 
-	<!--app端 保养任务列表 (0:待保养、-1:超期) -->
+	<!--app端 保养任务统计 (0:待保养、-1:超期) -->
 	<select id="countPlanByWorkerId" resultType="cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenanceCount"
 			parameterType="cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceRecordRequest">
 		SELECT t.plan_date,

lift-business-service/src/main/resources/mapper/maintenance/MaintenanceRecordMapper.xml

@@ -117,7 +117,8 @@
 		    mr.worker_id1       AS workerId1,
 			mr.plan_date        AS planDate,
 			mr.type             AS maintenanceType,
-			mr.status           AS status
+			mr.status           AS status,
+		    mr.has_evaluate     AS hasEvaluate
 		FROM maintenance_record mr
 		LEFT JOIN project p ON mr.project_id = p.id
 		LEFT JOIN lift l ON mr.lift_id = l.id
@@ -140,7 +141,7 @@
         </if>
 	</select>
 
-    <!--app端 保养任务列表 (1:保养中、2:已完成) -->
+    <!--app端 保养任务统计 (1:保养中、2:已完成) -->
     <select id="countRecordByWorkerId" resultType="cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenanceCount"
             parameterType="cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceRecordRequest">
         SELECT  t.plan_date,
@@ -152,7 +153,6 @@
                  count(1) total
         FROM maintenance_record mr
                 LEFT JOIN project p ON mr.project_id = p.id
-                LEFT JOIN project_user pu ON p.id = pu.project_id
                 LEFT JOIN lift l ON mr.lift_id = l.id
                 LEFT JOIN user_info ui ON mr.worker_id = ui.user_id
         WHERE mr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}