大屏：两个规定中执行情况查询问题修复

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/PlanTaskMapper.java

@@ -18,7 +18,7 @@ public interface PlanTaskMapper extends BaseMapper {
 
 	List<Map<String, String>> getUserInfo(@Param("useUnitCode") String useUnitCode, @Param("flag") boolean flag);
 
-	List<Map<String, Object>> getPlanCheckByPlanTaskId(@Param("planTaskId") String planTaskId);
+	List<Map<String, Object>> getPlanCheckByPlanTaskDetailId(@Param("planTaskDetailId") String planTaskDetailId);
 
 	Page<Map<String, Object>> getPersonPage(@Param("page") Page page, @Param("map") JSONObject map);
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/PlanTask.xml

@@ -78,7 +78,7 @@
 			)
 		</if>
 	</select>
-	<select id="getPlanCheckByPlanTaskId" resultType="java.util.Map">
+	<select id="getPlanCheckByPlanTaskDetailId" resultType="java.util.Map">
 		SELECT
 			date_format ( ppt.begin_time, '%Y-%m-%d %H:%i:%s' ) beginTime,
 			date_format ( ppt.end_time, '%Y-%m-%d %H:%i:%s' ) endTime,
@@ -95,7 +95,7 @@
 			LEFT JOIN p_input_item pii ON pci.input_id = pii.id
 			LEFT JOIN p_check_shot pcs ON pc.id = pcs.check_id
 		WHERE
-			pc.plan_task_id = #{planTaskId}
+			pc.plan_task_detail_id = #{planTaskDetailId}
 	</select>
 	<select id="getPersonPage" resultType="java.util.Map">
 		SELECT

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/EnterpriseBizController.java

@@ -3,8 +3,6 @@ package com.yeejoin.amos.boot.module.statistcs.biz.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
-import com.yeejoin.amos.boot.module.jg.api.dto.SafetyProblemTracingDto;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.EnterpriseBizByTCMServiceImpl;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.EnterpriseBizServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
@@ -67,9 +65,9 @@ public class EnterpriseBizController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @RequestMapping(value = "/getPlanCheck", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "获取规定计划信息详情", notes = "获取规定计划信息详情")
-    public ResponseModel<List<Map<String, Object>>> getPlanCheck(@RequestParam String planTaskId) {
-        return ResponseHelper.buildResponse(enterpriseBizByTCMService.getPlanCheck(planTaskId));
+    @ApiOperation(httpMethod = "GET", value = "获取规定计划信息执行详情", notes = "获取规定计划信息执行详情")
+    public ResponseModel<List<Map<String, Object>>> getPlanCheck(@RequestParam String planTaskDetailId) {
+        return ResponseHelper.buildResponse(enterpriseBizByTCMService.getPlanCheck(planTaskDetailId));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/EnterpriseBizByTCMServiceImpl.java

@@ -469,9 +469,8 @@ public class EnterpriseBizByTCMServiceImpl {
         return result;
     }
 
-    public List<Map<String, Object>> getPlanCheck(String planTaskId) {
-        List<Map<String,Object>> result = planTaskMapper.getPlanCheckByPlanTaskId(planTaskId);
-        return result;
+    public List<Map<String, Object>> getPlanCheck(String planTaskDetailId) {
+        return planTaskMapper.getPlanCheckByPlanTaskDetailId(planTaskDetailId);
     }
 
     public Page<Map<String,Object>> getPersonPage(JSONObject map, Page page) {