From 880c8f54cddc8533f00f674da3f14c2cf0d34340 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期二, 25 六月 2024 17:58:17 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectController.java | 52 +++++++++++++---------------------------------------
1 files changed, 13 insertions(+), 39 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectController.java
index 31a54a2..d03eeb5 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectController.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectController.java
@@ -4,7 +4,6 @@
import com.javaweb.geo.domain.CompanyUser;
import com.javaweb.geo.mapper.HoleMapper;
-import com.javaweb.geo.vo.ExceptionProjectVo;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -20,8 +19,6 @@
import com.javaweb.common.enums.BusinessType;
import com.javaweb.geo.domain.Company;
import com.javaweb.geo.domain.Project;
-import com.javaweb.geo.mapper.CompanyMapper;
-import com.javaweb.geo.mapper.CompanyUserMapper;
import com.javaweb.geo.service.IProjectService;
import com.javaweb.common.core.controller.BaseController;
import com.javaweb.common.core.domain.AjaxResult;
@@ -42,12 +39,6 @@
@Autowired
private IProjectService projectService;
-
- @Autowired
- private CompanyMapper companyMapper;
-
- @Autowired
- private CompanyUserMapper companyUserMapper;
@Autowired
private HoleMapper holeMapper;
@@ -98,6 +89,18 @@
}
/**
+ * 鏌ヨ
+ */
+ @ResponseBody
+ @GetMapping("/search")
+ public AjaxResult search(@RequestParam("ids") String ids)
+ {
+ Project project = projectService.selectProjectById(ids);
+ return AjaxResult.success(project);
+ }
+
+
+ /**
* 璺宠浆
* @return
*/
@@ -114,31 +117,14 @@
public String info(@RequestParam("id") String id, ModelMap mmap){
Project project = projectService.selectProjectById(id);
-
- String cname = "";
- String lname = "";
-
- CompanyUser companyUser = companyUserMapper.selectCompanyUserById(project.getLeader());
- Company company = companyMapper.selectCompanyById(project.getCompanyId());
-
- if (!ObjectUtils.isEmpty(company)){
- cname = company.getFullName();
- }
- if (!ObjectUtils.isEmpty(companyUser)){
- lname = companyUser.getRealName();
- }
-
- project.setCompanyName(cname);
- project.setLeaderName(lname);
-
int count = holeMapper.selectHoleNumByProjectId(id);
//璁剧疆閽诲瓟鏁伴噺
project.setHoleNum(count);
mmap.put("project", project);
+ mmap.put("projectId", id);
return prefix + "/info";
}
-
/**
@@ -187,18 +173,6 @@
{
return toAjax(projectService.deleteProjectByIds(ids));
}
-
- /**
- * 鏌ヨ寮傚父椤圭洰鍒楄〃
- */
- @GetMapping("/proExceptionList")
- @ResponseBody
- public TableDataInfo proExceptionList(){
- startPage();
- List<ExceptionProjectVo> list = projectService.proExceptionList();
- return getDataTable(list);
- }
-
}
--
Gitblit v1.9.1