1111

src/main/java/com/jeeplus/modules/sg/overheadline/mapper/xml/OverheadLineMapper.xml

@@ -103,11 +103,11 @@
          b.total_fee as totalFee
          FROM sg_wbs_elements a LEFT JOIN sg_fee_detail_jkxl b on a.short_id = b.wbs_code
          and b.id = #{id}
-         <where>
-			 <if test="type != ''">
-			 project_type = #{type}
-			 </if>
-		 </where>
+         <!--<where>-->
+			 <!--<if test="type != ''">-->
+			 <!--project_type = #{type}-->
+			 <!--</if>-->
+		 <!--</where>-->
          order by a.id
 	</select>
 

src/main/java/com/jeeplus/modules/sg/overheadline/service/OverheadLineService.java

@@ -68,10 +68,26 @@ public class OverheadLineService {
            double fbrFee = jkxlDetailFee.getFbrCost()!=null? jkxlDetailFee.getFbrCost():0.00;
            double jxFee = jkxlDetailFee.getJxCost()!=null? jkxlDetailFee.getJxCost():0.00;
            double azFee = rgFee + cbrFee + jxFee;
-           jkxlDetailFee.setQtFee(qtFee);
-           jkxlDetailFee.setAzFee(azFee);
+
+           if(jkxlDetailFee.getWbsCode().substring(0,2).equals("21") || jkxlDetailFee.getWbsCode().substring(0,3).equals("491")){
+               jkxlDetailFee.setJzFee(azFee);
+               jkxlDetailFee.setSbgzFee(qtFee);
+           } else {
+               jkxlDetailFee.setQtFee(qtFee);
+               jkxlDetailFee.setAzFee(azFee);
+           }
        }
        if(type.equals("3")) {
+//           List<JkxlDetailFee> jzlist = new ArrayList<>();
+//           List<JkxlDetailFee> azlist = new ArrayList<>();
+//           for(JkxlDetailFee jkxlDetailFee : list){
+//               if(jkxlDetailFee.getWbsCode().substring(0,2).equals("21")){
+//                  jzlist.add(jkxlDetailFee);
+//               }
+//               if(jkxlDetailFee.getWbsCode().substring(0,2).equals("23")){
+//                   azlist.add(jkxlDetailFee);
+//               }
+//           }
            double jz1 = 0.00;
            double az1 = 0.00;
            double jz2 = 0.00;
@@ -79,19 +95,19 @@ public class OverheadLineService {
            double jz3 = 0.00;
            double az3 = 0.00;
            for (JkxlDetailFee jkxlDetailFee : list) {
-               if (jkxlDetailFee.getWbsCode().equals("21000000")) {
-                   jz1 = jkxlDetailFee.getTotalFee();
-                   jz2 = jkxlDetailFee.getAzFee();
-                   jz3 = jkxlDetailFee.getQtFee();
-               }
-               if (jkxlDetailFee.getWbsCode().equals("23000000")) {
-                   az1 = jkxlDetailFee.getTotalFee();
-                   az2 = jkxlDetailFee.getAzFee();
-                   az3 = jkxlDetailFee.getQtFee();
-               }
-               if (jkxlDetailFee.getOriginalTotalCost() == null && jkxlDetailFee.getTotalFee() != null) {
-                   qtTotal += jkxlDetailFee.getTotalFee();
-               }
+//               if (jkxlDetailFee.getWbsCode().equals("21000000")) {
+//                   jz1 = jkxlDetailFee.getTotalFee();
+//                   jz2 = jkxlDetailFee.getAzFee();
+//                   jz3 = jkxlDetailFee.getQtFee();
+//               }
+//               if (jkxlDetailFee.getWbsCode().equals("23000000")) {
+//                   az1 = jkxlDetailFee.getTotalFee();
+//                   az2 = jkxlDetailFee.getAzFee();
+//                   az3 = jkxlDetailFee.getQtFee();
+//               }
+//               if (jkxlDetailFee.getOriginalTotalCost() == null && jkxlDetailFee.getTotalFee() != null) {
+//                   qtTotal += jkxlDetailFee.getTotalFee();
+//               }
            }
            btTotal = jz1 + az1;
            azTotal = jz2 + az2;

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

@@ -2,6 +2,7 @@ package com.jeeplus.modules.sg.project.entity;
 
 import com.jeeplus.core.persistence.DataEntity;
 
+import java.util.Date;
 import java.util.List;
 
 public class WbsProject extends DataEntity<WbsProject> {
@@ -14,6 +15,20 @@ public class WbsProject extends DataEntity<WbsProject> {
     private List<WbsItem> wbsItems; //项目
 
 
+    private String projectId;      //工程ID
+    private String creator;       //创建人
+    private Date projectStartDate;   //工程登记开始时间
+    private Date projectEndDate;     //工程登记结束时间
+    private String itemId;        //项目ID
+    private String itemName;     //项目名称
+    private String type;        //项目类型
+    private String unit;        //施工单位
+    private Date itemStartDate;   //项目登记开始时间
+    private Date itemEndDate;     //项目登记结束时间
+    private String userId;   //用户ID
+
+
+
     public List<WbsItem> getWbsItems() {
         return wbsItems;
     }
@@ -59,4 +74,94 @@ public class WbsProject extends DataEntity<WbsProject> {
 
     @Override
     public void setDelFlag(String delFlag) {this.delFlag = delFlag;}
+
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+
+    public Date getProjectStartDate() {
+        return projectStartDate;
+    }
+
+    public void setProjectStartDate(Date projectStartDate) {
+        this.projectStartDate = projectStartDate;
+    }
+
+    public Date getProjectEndDate() {
+        return projectEndDate;
+    }
+
+    public void setProjectEndDate(Date projectEndDate) {
+        this.projectEndDate = projectEndDate;
+    }
+
+    public String getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(String itemId) {
+        this.itemId = itemId;
+    }
+
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public Date getItemStartDate() {
+        return itemStartDate;
+    }
+
+    public void setItemStartDate(Date itemStartDate) {
+        this.itemStartDate = itemStartDate;
+    }
+
+    public Date getItemEndDate() {
+        return itemEndDate;
+    }
+
+    public void setItemEndDate(Date itemEndDate) {
+        this.itemEndDate = itemEndDate;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
 }

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

@@ -3,6 +3,7 @@ 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.WbsItem;
+import com.jeeplus.modules.sg.project.entity.WbsProject;
 import com.jeeplus.modules.sg.project.entity.WbsSelection;
 import org.apache.ibatis.annotations.Param;
 
@@ -11,7 +12,7 @@ import java.util.List;
 
 @MyBatisMapper
 public interface ItemMapper extends BaseMapper<WbsItem> {
-    List<WbsItem> findList(WbsSelection wbsSelection);
+    List<WbsItem> getList(WbsProject wbsProject);
     int insert(WbsItem wbsItem);
 
     //根据名称获取项目

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

@@ -26,7 +26,7 @@
 		WHERE a.id = #{id}
 	</select>
 	
-	<select id="findList" resultType="WbsItem" parameterType="com.jeeplus.modules.sg.project.entity.WbsSelection">
+	<select id="getList" resultType="WbsItem" parameterType="com.jeeplus.modules.sg.project.entity.WbsProject">
 		SELECT 
 			<include refid="infoColumns"/>
 		FROM sg_wbs_item a

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

@@ -4,48 +4,22 @@
     
 	<sql id="infoColumns">
 		a.id AS "id",
-		a.create_by,
-		a.create_date ,
-		a.update_by ,
-		a.update_date ,
-		a.remarks ,
-		a.del_flag,
-		a.project_name,
-		a.number ,
-		b.name ,
-		d.item_name ,
-		d.unit,
-		d.type,
-		d.project_id,
-		d.create_date AS "d.create_date"
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.remarks AS "remarks",
+		a.del_flag AS "delFlag",
+		a.project_name AS "projectName",
+		a.number,
+		b.name AS "userName"
 	</sql>
 
-	<resultMap id="projectResult" type="WbsProject">
-		<id property="id" column="id"/>
-		<result property="createBy.id" column="create_by"/>
-		<result property="createDate" column="create_date"/>
-		<result property="updateBy.id" column="update_by"/>
-		<result property="updateDate" column="update_date"/>
-		<result property="remarks" column="remarks"/>
-		<result property="delFlag" column="del_flag"/>
-		<result property="projectName" column="project_name"/>
-		<result property="number" column="number"/>
-		<result property="userName" column="name"/>
-		<collection property="wbsItems" ofType="com.jeeplus.modules.sg.project.entity.WbsItem">
-			<result property="itemName" column="item_name"/>
-			<result property="unit" column="unit"/>
-			<result property="type" column="type"/>
-			<result property="projectId" column="project_id"/>
-			<result property="createDate" column="d.create_date"/>
-		</collection>
-	</resultMap>
-
-	<select id="get" resultMap="projectResult" >
+	<select id="get" resultType="WbsProject" >
 		SELECT 
 			<include refid="infoColumns"/>
 		FROM sg_wbs_project a
 		left join sys_user b on a.create_by = b.id
-		left join sg_wbs_item d on a.id = d.project_id
 		WHERE a.id = #{id}
 	</select>
 
@@ -67,12 +41,11 @@
 		order by a.create_date DESC
 	</select>
 	
-	<select id="getList" resultMap="projectResult" parameterType="com.jeeplus.modules.sg.project.entity.WbsSelection" >
-		SELECT 
+	<select id="findList" resultType="WbsProject">
+		SELECT
 			<include refid="infoColumns"/>
 		FROM sg_wbs_project a
 		left join sys_user b on a.create_by = b.id
-		left join sg_wbs_item d on a.id = d.project_id
 		<where>
 		    <if test="projectId !=null and projectId != ''">
 				a.id = #{projectId} AND
@@ -80,8 +53,8 @@
 			<if test="projectName != null and projectName != ''">
 				a.project_name LIKE CONCAT(CONCAT('%',#{projectName},'%')) AND
 			</if>
-			<if test="createBy != null  and createBy != ''">
-				 b.name LIKE CONCAT(CONCAT('%',#{createBy},'%')) AND
+			<if test="creator != null  and creator != ''">
+				 b.name LIKE CONCAT(CONCAT('%',#{creator},'%')) AND
 			</if>
 			<if test="projectStartDate != null and projectEndDate != ''">
 				 a.create_date &gt;= #{projectStartDate} AND
@@ -89,21 +62,6 @@
 			<if test="projectEndDate != null and projectEndDate != ''">
 				 a.create_date &lt;= #{projectEndDate} AND
 			</if>
-			<if test="itemName != null and itemName != ''">
-				 d.item_name LIKE CONCAT(CONCAT('%',#{itemName},'%')) AND
-			</if>
-			<if test="type != null  and type != ''">
-				 d.type LIKE CONCAT(CONCAT('%',#{type},'%')) AND
-			</if>
-			<if test="unit != null  and unit != ''">
-				 d.unit LIKE CONCAT(CONCAT('%',#{unit},'%')) AND
-			</if>
-			<if test="itemStartDate != null and itemEndDate != ''">
-				 d.create_date &gt;= #{itemStartDate} AND
-			</if>
-			<if test="itemEndDate != null and itemEndDate != ''">
-				 d.create_date &lt;= #{itemEndDate} AND
-			</if>
 			1 = 1
 		</where>
 		 ORDER BY a.update_date DESC
@@ -173,10 +131,10 @@
 	
 	
 	<!--物理删除-->
-	<update id="delete">
+	<delete id="delete">
 		DELETE FROM sg_wbs_project
 		WHERE id = #{id}
-	</update>
+	</delete>
 	
 	<!--逻辑删除-->
 	<update id="deleteByLogic">
@@ -192,7 +150,7 @@
 	</select>
 
 	<!-- 根据工程id查找项目 -->
-	<select id="findItem" parameterType="String" resultMap="WbsProject">
+	<select id="findItem" parameterType="String" resultType="WbsProject">
 		select * From sg_wbs_item where project_id = #{id}
 	</select>
 

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

@@ -27,8 +27,8 @@ public class ItemService extends CrudService<ItemMapper, WbsItem> {
     }
 
 
-    public List<WbsItem> findList(WbsSelection wbsSelection) {
-        return itemMapper.findList(wbsSelection);
+    public List<WbsItem> findList(WbsProject wbsProject) {
+        return itemMapper.getList(wbsProject);
     }
 
     @Transactional(readOnly = false)

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

@@ -27,38 +27,52 @@ public class ProjectService extends CrudService<ProjectMapper, WbsProject> {
 
     public WbsProject get(String id) {
         WbsProject wbsProject =  super.get(id);
-        WbsSelection wbsSelection = new WbsSelection();
-        wbsSelection.setProjectId(id);
-        List<WbsItem> items = itemService.findList(wbsSelection);
+        WbsProject wbsProject1 = new WbsProject();
+        wbsProject1.setProjectId(id);
+        List<WbsItem> items = itemService.findList(wbsProject1);
         wbsProject.setWbsItems(items);
         return wbsProject;
     }
 
 
-    public List<WbsProject> findList(WbsSelection wbsSelection) {
-        List<WbsProject> list =  projectMapper.getList(wbsSelection);
-//            for(WbsProject wbsProject1 : list){
-//                String id = wbsProject1.getId();
-//                wbsSelection.setProjectId(id);
-//                List<WbsItem> items = itemService.findList(wbsSelection);
-//                wbsProject1.setWbsItems(items);
-//            }
-//         if(StringUtils.isNoneBlank(wbsSelection.getItemName()) || wbsSelection.getItemStartDate() != null || wbsSelection.getItemEndDate() != null || StringUtils.isNoneBlank(wbsSelection.getUnit()) || StringUtils.isNoneBlank(wbsSelection.getType())){
-//             List<WbsProject> wbsProjects = new ArrayList<>();
-//             for(WbsProject wbsProject : list){
-//                 if(wbsProject.getWbsItems().size()>0){
-//                     wbsProjects.add(wbsProject);
-//                 }
-//             }
-//             return wbsProjects;
-//         }
+    public List<WbsProject> findList(WbsProject wbsProject) {
+        List<WbsProject> list =  projectMapper.findList(wbsProject);
+            for(WbsProject wbsProject1 : list){
+                String id = wbsProject1.getId();
+                wbsProject.setProjectId(id);
+                List<WbsItem> items = itemService.findList(wbsProject);
+                wbsProject1.setWbsItems(items);
+            }
         return list;
     }
 
     public Page<WbsProject> findPage(Page<WbsProject> page, WbsProject wbsProject) {
-        return super.findPage(page, wbsProject);
+        wbsProject.setPage(page);
+        List<WbsProject> list =  projectMapper.findList(wbsProject);
+        long count = page.getCount();
+        for(WbsProject wbsProject1 : list){
+            String id = wbsProject1.getId();
+            wbsProject.setProjectId(id);
+            List<WbsItem> items = itemService.findList(wbsProject);
+            wbsProject1.setWbsItems(items);
+        }
+        if(StringUtils.isNoneBlank(wbsProject.getItemName()) || wbsProject.getItemStartDate() != null || wbsProject.getItemEndDate() != null || StringUtils.isNoneBlank(wbsProject.getUnit()) || StringUtils.isNoneBlank(wbsProject.getType())){
+            List<WbsProject> wbsProjects = new ArrayList<>();
+            for(WbsProject wbsProject1 : list){
+                if(wbsProject1.getWbsItems().size()>0){
+                    wbsProjects.add(wbsProject1);
+                }
+            }
+            page.setCount(wbsProjects.size());
+            page.setList(wbsProjects);
+            return page;
+        }
+        page.setCount(count);
+        page.setList(list);
+        return page;
     }
 
+
     public List<WbsProject> findByName(String projectName) {
         return projectMapper.findByName(projectName);
     }

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

@@ -3,6 +3,7 @@ package com.jeeplus.modules.sg.project.web;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
 import com.jeeplus.modules.sg.overheadline.entity.JkxlDetailFee;
 import com.jeeplus.modules.sg.overheadline.entity.Settlement;
@@ -46,9 +47,10 @@ public class ProjectController extends BaseController {
 
 
     @RequestMapping(value = {"list", ""})
-    public String list(WbsSelection wbsSelection, HttpServletRequest request, HttpServletResponse response, Model model) {
-       List<WbsProject> list =  projectService.findList(wbsSelection);
-       model.addAttribute("list",list);
+    public String list(WbsProject wbsProject, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<WbsProject> page = projectService.findPage(new Page<WbsProject>(request, response), wbsProject);
+//       List<WbsProject> list =  projectService.findList(wbsProject);
+       model.addAttribute("page",page);
         return "modules/sg/project/management";
     }
 

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

@@ -51,8 +51,8 @@ public class ProjectTemController extends BaseController {
 
 
     @RequestMapping(value = {"list", ""})
-    public String list(WbsSelection wbsSelection, HttpServletRequest request, HttpServletResponse response, Model model) {
-       List<WbsProject> list =  projectService.findList(wbsSelection);
+    public String list(WbsProject wbsProject, HttpServletRequest request, HttpServletResponse response, Model model) {
+       List<WbsProject> list =  projectService.findList(wbsProject);
        model.addAttribute("list",list);
         return "modules/sg/projecttem/manageList";
     }
@@ -70,8 +70,10 @@ public class ProjectTemController extends BaseController {
         wbsProject.setProjectName(projectName);
         projectService.save(wbsProject);
         String projectId = wbsProject.getId();
+        String fileName = "";
         try {
             for(int i = 0;i<itemTypes.length;i++) {
+                fileName = file[i].getOriginalFilename();
 //            保存数据到数据库
                 if (itemTypes[i].equals("1")) {
                     String id = getId();
@@ -88,11 +90,13 @@ public class ProjectTemController extends BaseController {
             }
         } catch (RuntimeException e) {
             map.put("code",0);
-            map.put("msg","导入失败"+e.getMessage());
+            map.put("msg","导入失败，"+fileName+e.getMessage());
+            projectService.delete(wbsProject);
             return map;
-        }   catch (Exception e){
+        }  catch (Exception e){
             map.put("code",0);
             map.put("msg","导入失败");
+            projectService.delete(wbsProject);
             return map;
         }
         map.put("code",1);

src/main/java/com/jeeplus/modules/sg/substation/service/SubstationService.java

@@ -46,71 +46,6 @@ public class SubstationService {
    }
 
 
-//   public List<JkxlDetailFee> findList(String id,String type){
-//       List<JkxlDetailFee> list = overheadLineMapper.findList(id,type);
-//       JkxlAdjustFee jkxlAdjustFee = new JkxlAdjustFee();
-//       jkxlAdjustFee.setId(id);
-//       jkxlAdjustFee.setType(SubstationInfo.CE);
-//       List<JkxlAdjustFee> jkxlAdjustFees = feeAdjustService.getTzFee(jkxlAdjustFee);
-//       JkxlAdjustFee jkxlAdjustFee1 = jkxlAdjustFees.get(0);
-//       double cFee = jkxlAdjustFee1.getFee();
-//       double btTotal = 0.00;
-//       double qtTotal = 0.00;
-//       double azTotal = 0.00;
-//       double otherTotal = 0.00;
-//       for(JkxlDetailFee jkxlDetailFee : list){
-//           double measuresFee1 = jkxlDetailFee.getMeasuresFee1()!=null? jkxlDetailFee.getMeasuresFee1():0.00;
-//           double measuresFee2 = jkxlDetailFee.getMeasuresFee2()!=null? jkxlDetailFee.getMeasuresFee2():0.00;
-//           double measuresFee3 = jkxlDetailFee.getMeasuresFee3()!=null? jkxlDetailFee.getMeasuresFee3():0.00;
-//           double Tex = jkxlDetailFee.getTex()!=null? jkxlDetailFee.getTex():0.00;
-//           double otherCost = jkxlDetailFee.getOtherCost()!=null? jkxlDetailFee.getOtherCost():0.00;
-//           double Fees = jkxlDetailFee.getFees()!=null? jkxlDetailFee.getFees():0.00;
-//           double qtFee = measuresFee1 + measuresFee2 + measuresFee3 + otherCost + Fees + Tex;
-//           double rgFee = jkxlDetailFee.getRgCost()!=null? jkxlDetailFee.getRgCost():0.00;
-//           double cbrFee = jkxlDetailFee.getCbrCost()!=null? jkxlDetailFee.getCbrCost():0.00;
-//           double fbrFee = jkxlDetailFee.getFbrCost()!=null? jkxlDetailFee.getFbrCost():0.00;
-//           double jxFee = jkxlDetailFee.getJxCost()!=null? jkxlDetailFee.getJxCost():0.00;
-//           double azFee = rgFee + cbrFee + jxFee;
-//           jkxlDetailFee.setQtFee(qtFee);
-//           jkxlDetailFee.setAzFee(azFee);
-//       }
-//       for(JkxlDetailFee jkxlDetailFee : list){
-//           //本体费用求和
-//           if(jkxlDetailFee.getOriginalTotalCost() != null){
-//               btTotal += jkxlDetailFee.getTotalFee();
-//               azTotal += jkxlDetailFee.getAzFee();
-//               otherTotal += jkxlDetailFee.getQtFee();
-//           }
-//           //其他费用求和
-//           if(jkxlDetailFee.getOriginalTotalCost() == null && jkxlDetailFee.getTotalFee() != null){
-//               qtTotal += jkxlDetailFee.getTotalFee();
-//           }
-//       }
-//       for(JkxlDetailFee jkxlDetailFee : list){
-//           if(jkxlDetailFee.getWbsCode().equals("30000000") || jkxlDetailFee.getWbsCode().equals("40000000")){
-//               jkxlDetailFee.setTotalFee(btTotal+qtTotal);
-//               jkxlDetailFee.setAzFee(azTotal);
-//               jkxlDetailFee.setQtFee(otherTotal);
-//               jkxlDetailFee.setcFee(cFee);
-//               jkxlDetailFee.setJsFee(btTotal+qtTotal+cFee);
-//           }
-//           if(jkxlDetailFee.getWbsCode().equals("39000000") || jkxlDetailFee.getWbsCode().equals("49000000")){
-//               jkxlDetailFee.setTotalFee(btTotal);
-//               jkxlDetailFee.setAzFee(azTotal);
-//               jkxlDetailFee.setQtFee(otherTotal);
-//           }
-//           if(jkxlDetailFee.getWbsCode().equals("44000000") ||jkxlDetailFee.getWbsCode().equals("34000000")){
-//               jkxlDetailFee.setTotalFee(qtTotal);
-//
-//           }
-//       }
-//       for (int i=0;i<list.size();i++){
-//           list.get(i).setIndex(i+1);
-//       }
-//       return list;
-//
-//   }
-
    public JkxlDetailFee getDate(String id, String wbsCode){
        return overheadLineMapper.getData(id,wbsCode);
    }

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

@@ -53,22 +53,22 @@ layui.config({
                                 +"<a class='layui-btn layui-btn-xs'  onclick=\"update( '${ctx}/project/form?id=" + d.id + "&tabId=2')\">修改</a>"
                                 +"<a class='layui-btn layui-btn-normal layui-btn-xs' lay-event='add'>添加项目</a>"
                                 +"<a class='layui-btn layui-btn-warm layui-btn-xs' lay-event=''href=\"${ctx}/project/export?id=" + d.id+"\">导出</a>"
-                                +"<a class='layui-btn layui-btn-xs layui-btn-danger' onclick='deleteProject("+d.id+")'>删除</a>";
+                                +"<a class='layui-btn layui-btn-xs layui-btn-danger' onclick=\"deleteProject('"+d.id+"')\">删除</a>";
                         }
                         if(d.status==2){
                             xml +="<span class='myspan'>操作</span>";
                         }
                         if(d.status==3){
                             xml +="<a class='layui-btn layui-btn-xs' href=\"${ctx}/jkxl/list?id="+d.id+"&type="+d.type+"\">编辑</a>"
-                                +"<button class='layui-btn layui-btn-xs layui-btn-danger' onclick='deleteItem("+d.id+")'>删除</button>";
+                                +"<button class='layui-btn layui-btn-xs layui-btn-danger' onclick=\"deleteItem('"+d.id+"')\">删除</button>";
                         }
 
                         return xml;
                     }}
             ]],
             data: [
-                <c:if test="${ not empty list}">
-                    <c:forEach items="${list}" var="data" varStatus="index">
+                <c:if test="${ not empty page.list}">
+                    <c:forEach items="${page.list}" var="data" varStatus="index">
                         {
                             "id": "${data.id}",
                             "gcmc":"${data.projectName}",
@@ -89,7 +89,7 @@ layui.config({
                         },
                     </c:forEach>
                 </c:if>
-                <c:forEach items="${list}" var="item" varStatus="index">
+                <c:forEach items="${page.list}" var="item" varStatus="index">
             <c:forEach items="${item.wbsItems}" var="items" varStatus="index">
             {
                 "id": "${items.id}",
@@ -249,4 +249,5 @@ $(document).ready(function(e) {
         $("#noneDiv").toggle();
     })
 });
+
 </script>

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

@@ -1,5 +1,6 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ include file="/webpage/include/taglib.jsp"%>
+<%@ include file="/webpage/include/bootstraptable.jsp"%>
 <!DOCTYPE html>
 <html>
 <head>
@@ -10,6 +11,7 @@
     <script type="text/javascript" src="${ctxp}/static/plugin/assets/jquery-3.2.1.min.js"></script>
     <script src="${ctxp}/static/plugin/assets/layui/layui.js"></script>
 
+
 </head>
 <style>
     .layui-input{height: 28px;margin-top: 5px;width: 260px;}
@@ -42,7 +44,7 @@
                                <div class="layui-inline">
                                    <div class="col-xs-12 col-sm-6 col-md-4" style="margin-left: 20px">
                                    <label class="layui-font-style">登记人:</label>
-                                       <input type="text" name="createBy"  autocomplete="off" class="layui-input">
+                                       <input type="text" name="creator"  autocomplete="off" class="layui-input">
                                    </div>
                                </div>
                                <div class="layui-inline">
@@ -121,6 +123,8 @@
                             <%--<button type="button" class="layui-btn layui-btn-primary layui-btn-sm"><i class="layui-icon"></i></button>--%>
                         </div>
                         <table id="table1" class="layui-table" lay-filter="table1"></table>
+                        <%--<table:page page="${page}"></table:page>--%>
+                        <div style="clear: both;"></div>
                     </div>
                 </div>
             </div>