修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferMapper.xml

@@ -146,50 +146,7 @@
 
 
     <select id="getCarUserNum" resultType="Map">
---        select * from (
--- 		SELECT
--- 			MAX(
--- 		CASE
--- 		WHEN cd.FIELD_CODE ='carId' THEN
--- 			cd.FIELD_VALUE
--- 		END
--- 	) AS 'carId',
---
--- 		MAX(
--- 		CASE
--- 		WHEN cd.FIELD_CODE = 'userName' THEN
--- 		cd.FIELD_VALUE
--- 		END
--- 		) AS 'userName'
---
--- 		FROM
--- 		cb_dynamic_form_instance cd
--- 		LEFT JOIN (
--- 		SELECT
--- 		dp.instance_id,
--- 		ds.`name`
--- 		FROM
--- 		cb_duty_person_shift dp
--- 		LEFT JOIN cb_duty_shift ds ON dp.shift_id = ds.sequence_nbr
--- 		WHERE
--- 		dp.duty_date = #{dutyDate} and dp.is_delete=0
--- 		) cds ON cd.instance_id = cds.instance_id
--- 		where cd.group_code ='dutyCar' and cds.instance_id is not null and
--- 		cd.is_delete=0
--- 		group by cd.instance_id
---         ) result
---         where carId is not null and userName is not null and carId in (
---         SELECT
---          c.resources_id
---         FROM
---         jc_power_transfer a
---         LEFT JOIN jc_power_transfer_company b ON a.sequence_nbr = b.power_transfer_id
---         LEFT JOIN jc_power_transfer_company_resources c ON c.power_transfer_company_id = b.sequence_nbr
---         WHERE
---         a.alert_called_id = ${id}
---         )
-
-        SELECT
+   SELECT
         SUM(c.car_user) num
         FROM
         jc_power_transfer a

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import org.apache.commons.lang3.ObjectUtils;
 import org.opengis.metadata.acquisition.Plan;
@@ -2491,7 +2492,11 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
 		List<String> userIds = workflowExecuteService.getUserIdsByWorkflow(latentDanger.getInstanceId(),
 				executeSubmitDto.getCheckLeaderId());
 		// 修改待办任务状态
-		updateTaskStatus(latentDanger);
+		try {
+			updateTaskStatus(latentDanger);
+		}catch (InnerInvokException e) {
+			log.error(e.getMessage(), e);
+		}
 		ruleDangerService.addDangerSubmitRule(latentDanger, userIds, RuleTypeEnum.隐患审核.getCode(),
 				ExecuteTypeEnum.getNameByCode(executeType));
 	}

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -1097,7 +1097,7 @@
 			where
 				begin_time <= #{date,jdbcType=TIMESTAMP}
 			  and end_time > #{date,jdbcType=TIMESTAMP}
-			  and finish_status in (1)
+			  and finish_status in (0,1)
 			  and status = 0
 			group by plan_id
 		)
@@ -1109,7 +1109,7 @@
 		where
 			begin_time <= #{date,jdbcType=TIMESTAMP}
 		  and end_time > #{date,jdbcType=TIMESTAMP}
-		  and finish_status in (1)
+		  and finish_status in (0,1)
 		  and status = 0
 	</select>
 </mapper>
\ No newline at end of file