Commit 66cc3427 authored by litengwei's avatar litengwei

巡检bug

parent 7d2513a2
......@@ -131,17 +131,17 @@ public class AppServiceImpl implements IAppService {
if (taskCount > 0) {
havetoDoList.add("planPatrol");
}
JSONObject respBody = remoteWorkFlowService.pageTask(userId,Integer.parseInt(YesOrNoEnum.YES.getCode()));
JSONArray taskJsonList = respBody.getJSONArray("data");
List<JSONObject> taskList = JSONObject.parseArray(taskJsonList.toJSONString(), JSONObject.class);
List<String> bussinessKeys = new ArrayList<>();
for (JSONObject json : taskList) {
bussinessKeys.add(json.getString("businessKey"));
}
Integer dangerCount = latentDangerMapper.countByStatus(bussinessKeys);
if(dangerCount > 0){
havetoDoList.add("waitHandle");
}
// JSONObject respBody = remoteWorkFlowService.pageTask(userId,Integer.parseInt(YesOrNoEnum.YES.getCode()));
// JSONArray taskJsonList = respBody.getJSONArray("data");
// List<JSONObject> taskList = JSONObject.parseArray(taskJsonList.toJSONString(), JSONObject.class);
// List<String> bussinessKeys = new ArrayList<>();
// for (JSONObject json : taskList) {
// bussinessKeys.add(json.getString("businessKey"));
// }
// Integer dangerCount = latentDangerMapper.countByStatus(bussinessKeys);
// if(dangerCount > 0){
// havetoDoList.add("waitHandle");
// }
return havetoDoList;
}
......
......@@ -132,7 +132,7 @@
AND amos_org_code IS NOT NULL
AND biz_org_type = 'COMPANY'
and is_delete = 0
) cou ON cou.biz_org_code = ci.org_code ]]>
) cou ON cou.bzOrgCode = ci.org_code ]]>
<where>
<if test="id != null">
ci.id = #{id}
......
......@@ -942,7 +942,7 @@
AND p.offline = 1
AND ( select COUNT(p_point_inputitem.id) FROM p_point_inputitem where p_point_inputitem.point_id =p.id) >0
<if test="orgCode != null and orgCode != ''">AND p.biz_org_code LIKE concat("%", #{orgCode}, "%")</if>
<if test="startTime !=null and startTime != ''">AND p.last_update_time <![CDATA[>= ]]> STR_TO_DATE(#{startTime}, '%Y-%m-%d')</if>
<!-- <if test="startTime !=null and startTime != ''">AND p.last_update_time <![CDATA[>= ]]> STR_TO_DATE(#{startTime}, '%Y-%m-%d')</if>-->
</select>
<select id="getPoints" resultType="Map">
SELECT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment