新增推送详情接口

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/service/IProjectCostHuijiService.java

@@ -49,4 +49,5 @@ public interface IProjectCostHuijiService extends IService<ProjectCostHuiji> {
     ProjectCostHuiji costHJSumIsStaff(ProjectCostHuiji finalProjectCostHuiji, String realname);
 
     int updateStatus1(ArrayList<String> tasknoList);
+
 }

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/service/impl/ProjectCostHuijiServiceImpl.java

@@ -145,4 +145,5 @@ public class ProjectCostHuijiServiceImpl extends ServiceImpl<ProjectCostHuijiMap
     public int updateStatus1(ArrayList<String> tasknoList) {
         return huijiMapper.updateStatus1(tasknoList);
     }
+
 }

module_kzks/src/main/java/org/jeecg/modules/projectImportList/controller/ProjectImportListController.java

@@ -83,8 +83,6 @@ public class ProjectImportListController extends JeecgController<ProjectImportLi
 	 public Result<?> importOtherExcel(@RequestBody ProjectImportList projectImportList,HttpServletRequest request, HttpServletResponse response) {
 
 		 Result<?> result = new Result<>();
-		 result.setCode(500);
-		 result.setMessage("请选择正确的导入类型！");
 
 		 String url = jeecgBaseConfig.getPath().getUpload() + "/"+  projectImportList.getFileAddress();
 		 //		 String url =  "D:/opt/upFiles/" +
@@ -103,7 +101,11 @@ public class ProjectImportListController extends JeecgController<ProjectImportLi
 			 return kyTaskTempService.importExcel1(url, KyTaskTemp.class);
 		 }else if(projectImportList.getFileType().equals("8")){ //8部门年指标导入表
 			 return kpiImportListService.importExcel1(url, KpiImportList.class);
+		 }else if(projectImportList.getFileType().equals("9")){ //导入数据包至服务器
+			 return result.success("");
 		 }else {
+			 result.setCode(500);
+			 result.setMessage("请选择正确的导入类型！");
 			 return result;
 		 }
 	 }

module_kzks/src/main/java/org/jeecg/modules/projectPushList/controller/ProjectPushListController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.projectPushList.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -19,6 +20,8 @@ import org.jeecg.modules.kyTaskInfo.entity.KyTaskInfo;
 import org.jeecg.modules.kyTaskInfo.service.IKyTaskInfoService;
 import org.jeecg.modules.projectCost.entity.ProjectCost;
 import org.jeecg.modules.projectCost.service.IProjectCostService;
+import org.jeecg.modules.projectCostHuiji.entity.ProjectCostHuiji;
+import org.jeecg.modules.projectCostHuiji.service.IProjectCostHuijiService;
 import org.jeecg.modules.projectPushList.convert.ProjectPushListConvert;
 import org.jeecg.modules.projectPushList.entity.ProjectPushList;
 import org.jeecg.modules.projectPushList.service.IProjectPushListService;
@@ -54,8 +57,24 @@ import java.util.stream.Collectors;
 public class ProjectPushListController extends JeecgController<ProjectPushList, IProjectPushListService> {
 	@Autowired
 	private IProjectPushListService projectPushListService;
+
 	@Autowired
-	private CommonMethod commonMethod;
+	private IProjectCostHuijiService huijiService;
+
+
+	@ApiOperation(value = "推送列表-详情", notes = "推送列表-详情")
+	@GetMapping(value = "/pushDetails/{taskNo}")
+	public Result<Object> pushDetails(@PathVariable String taskNo) {
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		String realname = sysUser.getRealname();
+		boolean isExist = projectPushListService.isExist(realname,taskNo);
+		if (isExist) {
+			LambdaQueryWrapper<ProjectCostHuiji> wrapper = new LambdaQueryWrapper<>();
+			wrapper.eq(ProjectCostHuiji::getTaskno, taskNo);
+			return Result.OK(huijiService.getOne(wrapper));
+		}
+		return Result.error("无权限访问");
+	}
 
 
 	/**

module_kzks/src/main/java/org/jeecg/modules/projectPushList/service/IProjectPushListService.java

@@ -24,4 +24,5 @@ public interface IProjectPushListService extends IService<ProjectPushList> {
     /**根据角色id找对应的用户及其部门*/
     public List<UserNameIDVO> userNamesByRoleIds(List<String> roleIds);
 
+    boolean isExist(String realname,String taskno);
 }

module_kzks/src/main/java/org/jeecg/modules/projectPushList/service/impl/ProjectPushListServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.projectPushList.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
@@ -274,4 +275,12 @@ public class ProjectPushListServiceImpl extends ServiceImpl<ProjectPushListMappe
     public boolean saveOrUpdate(ProjectPushList entity, Wrapper<ProjectPushList> updateWrapper) {
         return super.saveOrUpdate(entity, updateWrapper);
     }
+
+    @Override
+    public boolean isExist(String realname,String taskno) {
+        LambdaQueryWrapper<ProjectPushList> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ProjectPushList::getPushTo,realname);
+        wrapper.eq(ProjectPushList::getTaskno,taskno);
+        return pushListMapper.exists(wrapper);
+    }
 }