指标管理增加报警状态

module_kzks/src/main/java/org/jeecg/modules/kpiImportList/controller/KpiImportListController.java

@@ -59,7 +59,7 @@ public class KpiImportListController extends JeecgController<KpiImportList, IKpi
 	private KpiImportListMapper kpiImportListMapper;
 	
 	/**
-	 * 分页列表查询
+	 * 分页列表查询   加入报警状态isalarm，为1报警不能导入新数据，需要处理重复数据之后才能导入新数据
 	 *
 	 * @param kpiImportList
 	 * @param pageNo
@@ -70,15 +70,24 @@ public class KpiImportListController extends JeecgController<KpiImportList, IKpi
 	//@AutoLog(value = "年指标导入-分页列表查询")
 	@ApiOperation(value="年指标导入-分页列表查询", notes="年指标导入-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<KpiImportList>> queryPageList(KpiImportList kpiImportList,
+	public Result<HashMap<String, Object>> queryPageList(KpiImportList kpiImportList,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<KpiImportList> queryWrapper = QueryGenerator.initQueryWrapper(kpiImportList, req.getParameterMap());
 		Page<KpiImportList> page = new Page<KpiImportList>(pageNo, pageSize);
 		IPage<KpiImportList> pageList = kpiImportListService.page(page, queryWrapper);
-		return Result.OK(pageList);
+		return kpiImportListService.queryPageListIsAlarm(pageList);
 	}
+//	 public Result<IPage<KpiImportList>> queryPageList(KpiImportList kpiImportList,
+//													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+//													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+//													   HttpServletRequest req) {
+//		 QueryWrapper<KpiImportList> queryWrapper = QueryGenerator.initQueryWrapper(kpiImportList, req.getParameterMap());
+//		 Page<KpiImportList> page = new Page<KpiImportList>(pageNo, pageSize);
+//		 IPage<KpiImportList> pageList = kpiImportListService.page(page, queryWrapper);
+//		 return Result.OK(pageList);
+//	 }
 	
 	/**
 	 *   添加

module_kzks/src/main/java/org/jeecg/modules/kpiImportList/mapper/KpiImportListMapper.java

@@ -23,4 +23,8 @@ public interface KpiImportListMapper extends BaseMapper<KpiImportList> {
     @Select("select department, year, kpi from kzks_kpi_import_list_repeat")
     List<KpiImportListRepeat> getKpiRepeatAll();
 
+    /**年指标导入重复数据存储库-查看表是否为空*/
+    @Select("select count(*) from kzks_kpi_import_list_repeat")
+    public Integer getKpiRepeatRow();
+
 }

module_kzks/src/main/java/org/jeecg/modules/kpiImportList/service/IKpiImportListService.java

@@ -1,11 +1,14 @@
 package org.jeecg.modules.kpiImportList.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.kpiImportList.entity.KpiImportList;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 
 /**
  * @Description: 年指标导入
@@ -27,4 +30,10 @@ public interface IKpiImportListService extends IService<KpiImportList> {
 
     /**用于文件管理——导入日志——导入部门年指标导入表*/
     public Result<?> importExcel1(String strUrl, Class<KpiImportList> clazz);
+
+    /**
+     * 分页列表查询:加入报警状态，如果有重复数据需要处理isalarm=1，显示处理按钮，不可以导入新数据，处理完之后才能导入新数据
+     * @return
+     */
+    public Result<HashMap<String, Object>> queryPageListIsAlarm(IPage<KpiImportList> pageList);
 }

module_kzks/src/main/java/org/jeecg/modules/kpiImportList/service/impl/KpiImportListServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.kpiImportList.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.Index.entity.kpi.IndexKpiCompletByDate;
@@ -333,4 +334,25 @@ public class KpiImportListServiceImpl extends ServiceImpl<KpiImportListMapper, K
         }
     }
 
+    /**年指标导入重复数据存储库-查看表是否为空*/
+    public Integer getKpiRepeatRow(){
+        return kpiImportListMapper.getKpiRepeatRow();
+    }
+
+    /**
+     * 分页列表查询:加入报警状态，如果有重复数据需要处理isalarm=1，显示处理按钮，不可以导入新数据，处理完之后才能导入新数据
+     * @return
+     */
+    public Result<HashMap<String, Object>> queryPageListIsAlarm(IPage<KpiImportList> pageList){
+        HashMap<String, Object> map = new HashMap<>();
+        if(getKpiRepeatRow() == 0){
+            map.put("isalarm", 0); //不报警，可以导入新数据
+        }else{
+            map.put("isalarm", 1); //报警，不可以导入新数据
+        }
+        map.put("content", pageList);
+
+        return Result.OK(map);
+    }
+
 }