修改巡检报告bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanTaskController.java

@@ -1048,6 +1048,9 @@ public class PlanTaskController extends AbstractBaseController {
                                                   @RequestBody(required = false) PlanTaskPageParam queryRequests) {
         ReginParams reginParams = getSelectedOrgInfo();
         queryRequests.setBizOrgCode(reginParams.getPersonIdentity().getBizOrgCode());
+        if (queryRequests.getPageNumber() >= 1){
+            queryRequests.setPageNumber((queryRequests.getPageNumber() - 1)* queryRequests.getPageSize());
+        }
         Page<HashMap<String, Object>> list = planTaskService.getPlanTaskPageList(queryRequests);
         Object ob = list.getContent().size() > 0 ? ToJson.tojson(list) : null;
         return CommonResponseUtil.success(ob);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Joiner;
 import com.yeejoin.amos.boot.biz.common.constants.RuleConstant;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.rule.RuleTrigger;
@@ -82,6 +83,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -1875,7 +1877,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             map.put("task_name", infoMap.get("taskName"));
             map.put("begin_time", begin);
             map.put("end_time", end);
-            map.put("task_total_time", infoMap.get("difSecond"));
+            String timestr = DateUtils.secondsToTimeStr(Integer.parseInt( infoMap.get("difSecond").toString()));
+            map.put("task_total_time",timestr);
             map.put("task_status", infoMap.get("taskStatus"));
             Map<String, Object> executeInfoMap = planTaskMapper.getPlanTaskExecuteInfo(taskDetailId);
             // 执行情况参数