修改问题

ims-service/ims-eval/src/main/java/com/ims/eval/api/HomeController.java

@@ -0,0 +1,32 @@
+package com.ims.eval.api;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author hlf
+ * @date 2023/7/12 10:58
+ * 文件说明：
+ */
+@Slf4j
+@RestController
+@RequestMapping("//evaluation-api-home")
+public class HomeController {
+
+	/*@GetMapping(value = "list")
+	public R listAll(String binSection, String year, String season) {
+		Map<String, Object> data = portalService.getPortalData(binSection, year, season);
+		return R.ok().data(data);
+	}
+
+
+	@GetMapping(value = "listPage")
+	public R listpage(String binSection, String year, String season) {
+		Map<String, Object> data = portalService.getPortalData(binSection, year, season);
+
+		IPage<EvaluationPortal> list = portalService.listPage(binSection, year, season);
+		return R.ok().data(data);
+	}*/
+
+}

ims-service/ims-eval/src/main/java/com/ims/eval/controller/EvaluationRevisionController.java

@@ -156,14 +156,12 @@ public class EvaluationRevisionController {
 	/**
 	 * 详情-弹框数据
 	 *
-	 * @param deptResponsibilityId 考评目标主键
-	 * @param isQuantified         是否量化
+	 * @param id 考评目标主键
 	 * @return 结果
 	 */
 	@GetMapping(value = "/popUpData")
-	public R popUpData(@RequestParam(value = "deptResponsibilityId") String deptResponsibilityId,
-					   @RequestParam(value = "isQuantified") String isQuantified) {
-		List<ResponsibilityIndicatorInfoResDTO> list = responsibilityIndicatorInfoService.selectPopUpData(deptResponsibilityId, isQuantified, null);
+	public R popUpData(@RequestParam(value = "id") String id) {
+		List<ResponsibilityIndicatorInfoResDTO> list = responsibilityIndicatorInfoService.selectPopUpData(id, "", "失效");
 		return R.ok().data(list);
 	}
 

ims-service/ims-eval/src/main/resources/mappers/ResponsibilityIndicatorInfoMapper.xml

@@ -119,9 +119,6 @@
             <if test="isQuantified != null and isQuantified != ''">
                 and ri.is_quantified = #{isQuantified}
             </if>
-            <if test="dataState == null">
-                and ri.data_state is null
-            </if>
             <if test="dataState != null and dataState != ''">
                 and ri.data_state = #{dataState}
             </if>