1111

src/main/java/com/jeeplus/modules/sg/project/entity/WbsItem.java

@@ -52,4 +52,12 @@ public class WbsItem extends DataEntity<WbsItem> {
     public void setParentNode(String parentNode) {
         this.parentNode = parentNode;
     }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
 }

src/main/java/com/jeeplus/modules/sg/project/entity/WbsProject.java

@@ -2,11 +2,24 @@ package com.jeeplus.modules.sg.project.entity;
 
 import com.jeeplus.core.persistence.DataEntity;
 
+import java.util.List;
+
 public class WbsProject extends DataEntity<WbsProject> {
     private String projectName;//工程名称
     private int number;  //项目数量
     private String parentNode; //父节点
 
+    private List<WbsItem> wbsItems; //项目
+
+
+    public List<WbsItem> getWbsItems() {
+        return wbsItems;
+    }
+
+    public void setWbsItems(List<WbsItem> wbsItems) {
+        this.wbsItems = wbsItems;
+    }
+
     public String getProjectName() {
         return projectName;
     }

src/main/java/com/jeeplus/modules/sg/project/mapper/ItemMapper.java

@@ -4,10 +4,13 @@ import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.project.entity.WbsItem;
 import com.jeeplus.modules.sg.project.entity.WbsProject;
+import com.jeeplus.modules.sg.project.entity.WbsSelection;
+
+import java.util.List;
 
 
 @MyBatisMapper
 public interface ItemMapper extends BaseMapper<WbsItem> {
-
+    List<WbsItem> findList(WbsSelection wbsSelection);
 
 }

src/main/java/com/jeeplus/modules/sg/project/mapper/ProjectMapper.java

@@ -3,11 +3,12 @@ package com.jeeplus.modules.sg.project.mapper;
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.sg.project.entity.WbsProject;
+import com.jeeplus.modules.sg.project.entity.WbsSelection;
 
+import java.util.List;
 
 
 @MyBatisMapper
 public interface ProjectMapper extends BaseMapper<WbsProject> {
-
-
+    List<WbsProject> findList(WbsSelection wbsSelection);
 }

src/main/java/com/jeeplus/modules/sg/project/mapper/xml/ItemMapper.xml

@@ -31,7 +31,7 @@
 		WHERE a.id = #{id}
 	</select>
 	
-	<select id="findList" resultType="WbsItem" >
+	<select id="findList" resultType="WbsItem" parameterType="WbsSelection">
 		SELECT 
 			<include refid="infoColumns"/>
 		FROM sg_wbs_item a
@@ -42,8 +42,17 @@
 			<if test="itemName != null and itemName != ''">
 				AND a.item_name = #{itemName}
 			</if>
-			<if test="updateBy.id != null  and updateBy.id != ''">
-				AND a.update_by= #{updateBy.id}
+			<if test="type != null  and type != ''">
+				AND a.type= #{type}
+			</if>
+			<if test="unit != null  and unit != ''">
+				AND a.unit= #{unit}
+			</if>
+			<if test="itemStartDate != null and itemEndDate != ''">
+				AND a.create_date >= #{itemStartDate}
+			</if>
+			<if test="itemEndDate != null and itemEndDate != ''">
+				AND a.create_date <= #{itemEndDate}
 			</if>
 		</where>
 		<choose>

src/main/java/com/jeeplus/modules/sg/project/mapper/xml/ProjectMapper.xml

@@ -29,7 +29,7 @@
 		WHERE a.id = #{id}
 	</select>
 	
-	<select id="findList" resultType="WbsProject" >
+	<select id="findList" resultType="WbsProject" parameterType="WbsSelection" >
 		SELECT 
 			<include refid="infoColumns"/>
 		FROM sg_wbs_project a
@@ -43,6 +43,12 @@
 			<if test="updateBy.id != null  and updateBy.id != ''">
 				AND a.update_by= #{updateBy.id}
 			</if>
+			<if test="projectStartDate != null and projectEndDate != ''">
+				AND a.create_date >= #{projectStartDate}
+			</if>
+			<if test="projectEndDate != null and projectEndDate != ''">
+				AND a.create_date <= #{projectEndDate}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">

src/main/java/com/jeeplus/modules/sg/project/service/ItemService.java

@@ -3,8 +3,10 @@ package com.jeeplus.modules.sg.project.service;
 import com.jeeplus.core.service.CrudService;
 import com.jeeplus.modules.sg.project.entity.WbsItem;
 import com.jeeplus.modules.sg.project.entity.WbsProject;
+import com.jeeplus.modules.sg.project.entity.WbsSelection;
 import com.jeeplus.modules.sg.project.mapper.ItemMapper;
 import com.jeeplus.modules.sg.project.mapper.ProjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -13,6 +15,8 @@ import java.util.List;
 @Service
 @Transactional(readOnly = true)
 public class ItemService extends CrudService<ItemMapper, WbsItem> {
+    @Autowired
+    private ItemMapper itemMapper;
 
 
     public WbsItem get(String id) {
@@ -20,8 +24,8 @@ public class ItemService extends CrudService<ItemMapper, WbsItem> {
     }
 
 
-    public List<WbsItem> findList(WbsItem wbsItem) {
-        return super.findList(wbsItem);
+    public List<WbsItem> findList(WbsSelection wbsSelection) {
+        return itemMapper.findList(wbsSelection);
     }
 
     @Transactional(readOnly = false)

src/main/java/com/jeeplus/modules/sg/project/service/ProjectService.java

@@ -1,8 +1,12 @@
 package com.jeeplus.modules.sg.project.service;
 
 import com.jeeplus.core.service.CrudService;
+import com.jeeplus.modules.sg.project.entity.WbsItem;
 import com.jeeplus.modules.sg.project.entity.WbsProject;
+import com.jeeplus.modules.sg.project.entity.WbsSelection;
+import com.jeeplus.modules.sg.project.mapper.ItemMapper;
 import com.jeeplus.modules.sg.project.mapper.ProjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -11,6 +15,10 @@ import java.util.List;
 @Service
 @Transactional(readOnly = true)
 public class ProjectService extends CrudService<ProjectMapper, WbsProject> {
+    @Autowired
+    private ProjectMapper projectMapper;
+    @Autowired
+    private ItemService itemService;
 
 
     public WbsProject get(String id) {
@@ -18,8 +26,15 @@ public class ProjectService extends CrudService<ProjectMapper, WbsProject> {
     }
 
 
-    public List<WbsProject> findList(WbsProject wbsProject) {
-        return super.findList(wbsProject);
+    public List<WbsProject> findList(WbsSelection wbsSelection) {
+        List<WbsProject> list =  projectMapper.findList(wbsSelection);
+        for(WbsProject wbsProject1 : list){
+            String id = wbsProject1.getId();
+            wbsSelection.setProjectId(id);
+            List<WbsItem> items = itemService.findList(wbsSelection);
+            wbsProject1.setWbsItems(items);
+        }
+        return list;
     }
 
     @Transactional(readOnly = false)

src/main/java/com/jeeplus/modules/sg/project/web/ProjectController.java

@@ -4,6 +4,7 @@ import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.sg.project.entity.WbsProject;
+import com.jeeplus.modules.sg.project.entity.WbsSelection;
 import com.jeeplus.modules.sg.project.service.ProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -12,7 +13,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-import springfox.documentation.schema.Model;
+import org.springframework.ui.Model;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 
 @Controller
@@ -33,6 +38,14 @@ public class ProjectController extends BaseController {
         return entity;
     }
 
+
+    @RequestMapping(value = {"list", ""})
+    public String list(WbsSelection wbsSelection, HttpServletRequest request, HttpServletResponse response, Model model) {
+       List<WbsProject> list =  projectService.findList(wbsSelection);
+       model.addAttribute("list",list);
+        return "modules/sg/project/management";
+    }
+
     //项目保存
     @ResponseBody
     @RequestMapping("/save")

src/main/webapp/webpage/modules/sg/project/management.jsp

@@ -6,6 +6,7 @@
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
 <html>
 <head>
     <title>工程管理</title>