dcs 1 年之前
父节点
当前提交
a451f3980b

+ 6 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/controller/ProjectItemTargetController.java

@@ -16,6 +16,12 @@ public class ProjectItemTargetController {
     @Autowired
     ProjectItemTargetService projectItemTargetService;
 
+    @ApiOperation("详情")
+    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    public Response get(@PathVariable long id) {
+        return Response.ok(projectItemTargetService.get(id));
+    }
+
     @ApiOperation("新增")
     @RequestMapping(value = "", method = RequestMethod.POST)
     public Response insert(@RequestBody ProjectItemTarget projectItemTarget) {

+ 2 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/dao/ProjectItemDao.java

@@ -19,6 +19,8 @@ public interface ProjectItemDao {
 
     ProjectItem get(long id);
 
+    List<ProjectItem> getIds(List<Long> ids);
+
     int getTotalCount(ProjectItem projectItem);
 
     List<ProjectItem> getLimit(@Param("p") ProjectItem p, @Param("currIndex") int currIndex, @Param("pageSize") int pageSize);

+ 0 - 8
virgo.api/src/main/java/com/bosshand/virgo/api/dao/ProjectItemTargetDao.java

@@ -3,23 +3,15 @@ package com.bosshand.virgo.api.dao;
 import com.bosshand.virgo.api.model.ProjectItemTarget;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
-
 @Mapper
 public interface ProjectItemTargetDao {
 	
 	ProjectItemTarget get(long id);
 
-	List<ProjectItemTarget> getProjectItemId(long projectItemId);
-
-	List<ProjectItemTarget> getProjectItemIds(List<Long> itemIds);
-
 	int insert(ProjectItemTarget projectItemTarget);
 
 	int update(ProjectItemTarget projectItemTarget);
 
 	int delete(long id);
 
-	int deleteByProjectId(long projectId);
-
 }

+ 4 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/service/ProjectItemTargetService.java

@@ -11,6 +11,10 @@ public class ProjectItemTargetService {
     @Autowired
     private ProjectItemTargetDao projectItemTargetDao;
 
+    public ProjectItemTarget get(long id) {
+        return projectItemTargetDao.get(id);
+    }
+
     public int insert(ProjectItemTarget projectItemTarget) {
         return projectItemTargetDao.insert(projectItemTarget);
     }

+ 14 - 1
virgo.api/src/main/java/com/bosshand/virgo/api/service/ProjectService.java

@@ -1,10 +1,13 @@
 package com.bosshand.virgo.api.service;
 
 import com.bosshand.virgo.api.dao.ProjectDao;
+import com.bosshand.virgo.api.dao.ProjectItemDao;
 import com.bosshand.virgo.api.model.Project;
+import com.bosshand.virgo.api.model.ProjectItem;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -13,8 +16,18 @@ public class ProjectService {
 	@Autowired
 	private ProjectDao projectDao;
 
+	@Autowired
+	private ProjectItemDao projectItemDao;
+
 	public Project get(long id) {
-		return projectDao.get(id);
+		Project project = projectDao.get(id);
+		List<Long> itemIds = new ArrayList<>();
+		List<ProjectItem> projectItemList = project.getProjectItemList();
+		if (projectItemList != null) {
+			projectItemList.forEach(ls -> itemIds.add(ls.getId()));
+		}
+		project.setProjectItemList(projectItemDao.getIds(itemIds));
+		return project;
 	}
 
 	public int insert(Project project) {

+ 10 - 1
virgo.api/src/main/resources/mapper/ProjectItemMapper.xml

@@ -37,7 +37,8 @@
 			pi.id as projectItemTarget_id,
 			pi.name as projectItemTarget_name,
 			pi.projectId as projectItemTarget_projectId,
-			pi.sequence as projectItemTarget_area,
+			pi.projectItemId as projectItemTarget_projectItemId,
+			pi.sequence as projectItemTarget_sequence,
 			pi.propertyCertificateNumber as projectItemTarget_propertyCertificateNumber,
 			pi.roomNumber as projectItemTarget_roomNumber
 		FROM project_item p
@@ -49,6 +50,14 @@
 		where p.id=#{id}
 	</select>
 
+	<select id="getIds" resultMap="result">
+		<include refid="query"/>
+		where p.id in
+		<foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
+			#{id}
+		</foreach>
+	</select>
+
 	<select id="getTotalCount" parameterType="com.bosshand.virgo.api.model.ProjectItem" resultType="Integer">
 		SELECT count(*) FROM project_item
 		<where>

+ 4 - 0
virgo.api/src/main/resources/mapper/ProjectItemTargetMapper.xml

@@ -14,6 +14,10 @@
         <result column="roomNumber" property="roomNumber"/>
     </resultMap>
 
+    <select id="get" resultMap="projectItemTargetResult">
+        SELECT * FROM project_item_target WHERE id = #{id}
+    </select>
+
     <insert id="insert" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO project_item_target(name, projectId, projectItemId, sequence, propertyCertificateNumber, roomNumber)
         VALUES (#{name}, #{projectId}, #{projectItemId}, #{sequence}, #{propertyCertificateNumber}, #{roomNumber})