Merge branch 'develop_dl_3.7.0.8' of http://39.98.45.134:8090/moa/amos-boot-biz…

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

@@ -142,12 +142,14 @@ public class PlanController extends AbstractBaseController {
     @RequestMapping(value = "/addPlan", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse checkPlanAdd(@ApiParam(value = "巡检计划", required = true) @RequestBody Plan param) {
         try {
-
-
-            if ( param.getDayBegin().getTime()> param.getDayEnd().getTime()){
-                throw new BadRequest("开始时间不能大于结束时间");
+            if (param.getDayRate() == 1) {
+                long dayBeginTime = param.getDayBegin().getTime();
+                long dayEndTime = param.getDayEnd().getTime();
+                long diff = (dayEndTime - dayBeginTime) / 1000 / 60;
+                if (diff < param.getDuration()) {
+                    return CommonResponseUtil.failure("工作时长超出结束时间");
+                }
             }
-
             String userId = getUserId();
             ReginParams reginParams = getSelectedOrgInfo();
             String loginOrgCode = getOrgCode(reginParams);

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

@@ -1906,7 +1906,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                 qualified_task_percent = 0.0;
                 log.error("-----------------------------应巡查总数是 0，请检查！-----------------------------");
             } else {
-                qualified_task_percent = (Double.valueOf(real_count) / Double.valueOf(total_count)) * 100;
+                qualified_task_percent = (Double.valueOf(qualified_count) / Double.valueOf(total_count)) * 100;
             }
             map.put("qualified_equip_rate", qualified_task_percent);
             int missed_count = Integer.valueOf(String.valueOf(executeInfoMap.get("missed_equip_num")));