加入员工巡检情况统计功能

java110-bean/src/main/java/com/java110/dto/inspectionPlan/InspectionTaskDetailDto.java

@@ -68,6 +68,7 @@ public class InspectionTaskDetailDto extends PageDto implements Serializable {
     private String nowTime;
     //二维码巡检时 的时间
     private String qrCodeTime;
+    private String queryTime;
 
     private String statusCd = "0";
     private String itemId;
@@ -401,4 +402,12 @@ public class InspectionTaskDetailDto extends PageDto implements Serializable {
     public void setPointObjId(String pointObjId) {
         this.pointObjId = pointObjId;
     }
+
+    public String getQueryTime() {
+        return queryTime;
+    }
+
+    public void setQueryTime(String queryTime) {
+        this.queryTime = queryTime;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/inspectionTaskDetail/ApiInspectionTaskDetailVo.java

@@ -7,6 +7,8 @@ import java.util.List;
 
 public class ApiInspectionTaskDetailVo extends MorePageVo implements Serializable {
     List<ApiInspectionTaskDetailDataVo> inspectionTaskDetails;
+    private int code = 0;
+    private String msg ="成功";
 
 
     public List<ApiInspectionTaskDetailDataVo> getInspectionTaskDetails() {
@@ -16,4 +18,20 @@ public class ApiInspectionTaskDetailVo extends MorePageVo implements Serializabl
     public void setInspectionTaskDetails(List<ApiInspectionTaskDetailDataVo> inspectionTaskDetails) {
         this.inspectionTaskDetails = inspectionTaskDetails;
     }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
 }

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

@@ -221,6 +221,9 @@
             and it.plan_ins_time < #{qrCodeTime}
             and it.plan_end_time > #{qrCodeTime}
         </if>
+        <if test="queryTime != null">
+            and DATE_FORMAT(it.plan_ins_time, '%Y-%m-%d') = #{queryTime}
+        </if>
         <if test="inspectionStartTime !=null and inspectionStartTime != ''">
             and t.inspection_time &gt;= #{inspectionStartTime}
         </if>

service-community/src/main/java/com/java110/community/cmd/inspection/QueryReportStaffInspectionCmd.java

@@ -42,8 +42,9 @@ import java.util.List;
                 @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
                 @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
                 @Java110ParamDoc(name = "data", type = "Object", remark = "有效数据"),
-                @Java110ParamDoc(parentNodeName = "data",name = "userId", type = "String", remark = "用户ID"),
-                @Java110ParamDoc(parentNodeName = "data",name = "token", type = "String", remark = "临时票据"),
+                @Java110ParamDoc(parentNodeName = "data",name = "staffName", type = "String", remark = "员工名称"),
+                @Java110ParamDoc(parentNodeName = "data",name = "finishCount", type = "String", remark = "已巡检"),
+                @Java110ParamDoc(parentNodeName = "data",name = "waitCount", type = "String", remark = "未巡检"),
         }
 )