1111

src/main/java/com/jeeplus/modules/sg/mapper/xml/JkxlMapper.xml

@@ -30,7 +30,7 @@
          b.fees as fees,
          b.total_fee as totalFee
          FROM sg_wbs_elements a LEFT JOIN sg_wbs_fee b on a.short_id = b.wbs_code
-         WHERE a.id = #{id}
+         WHERE b.id = #{id}
          order by a.short_id
 	</select>
 
@@ -63,41 +63,41 @@
 		 fbr_cost,
 		 jx_cost,
 		 measures_fee1,
-		 measures_fee12,
+		 measures_fee2,
 		 other_cost,
 		 fees,
 		 tex,
 		 total_fee
 		) values (
-		 id,
-		 wbsCode,
-		 originalTotalCost,
-		 originalRgCost,
-		 originalCbrCost,
-		 originalFbrCost,
-		 originalJxCost,
-		 rgCost,
-		 cbrCost,
-		 fbrCost,
-		 jxCost,
-		 measuresFee1,
-		 measuresFee2,
-		 otherCost,
-		 fees,
-		 tax,
-		 totalFee
+		 #{id},
+		 #{wbsCode},
+		 #{originalTotalCost},
+		 #{originalRgCost},
+		 #{originalCbrCost},
+		 #{originalFbrCost},
+		 #{originalJxCost},
+		 #{rgCost},
+		 #{cbrCost},
+		 #{fbrCost},
+		 #{jxCost},
+		 #{measuresFee1},
+		 #{measuresFee2},
+		 #{otherCost},
+		 #{fees},
+		 #{tax},
+		 #{totalFee}
 		)
 	</insert>
 
 	<insert id="saveProject" parameterType="com.jeeplus.modules.sg.entity.WbsProject">
 		insert into sg_wbs_project
 		(id,
-		 name,
+		 project_name,
 		 create_date
 		) values (
-		 id,
-		 name,
-		 createDate
+		 #{id},
+		 #{name},
+		 #{createDate}
 		)
 	</insert>
 

src/main/java/com/jeeplus/modules/sg/web/JkxlController.java

@@ -36,7 +36,7 @@ public class JkxlController extends BaseController {
 
   @RequestMapping("/index")
   public String toImport(){
-    return "modules/sys/free/indexProject";
+    return "modules/sg/free/indexProject";
   }
 
   @RequestMapping("/import")
@@ -68,7 +68,7 @@ public class JkxlController extends BaseController {
     String id = request.getParameter("id");
     List<JkxlData> list = jkxlService.getList(id);
     model.addAttribute("list",list);
-    return "";
+    return "modules/sg/free/wbslist";
   }
 
   @RequestMapping("/export")
@@ -169,10 +169,12 @@ public class JkxlController extends BaseController {
     }
     JkxlData jkxlData1 = new JkxlData();
     JkxlData jkxlData2 = new JkxlData();
+    jkxlData1.setId(id);
     jkxlData1.setWbsCode("34120000");
     jkxlData1.setTotalFee(qtFees[0]);
     jkxlData2.setWbsCode("34220000");
     jkxlData2.setTotalFee(qtFees[1]);
+    jkxlData2.setId(id);
     list.add(jkxlData1);
     list.add(jkxlData2);
     return list;

src/main/webapp/webpage/modules/sg/free/wbslist.jsp

@@ -58,7 +58,7 @@
                 treeDefaultClose: false,
                 treeLinkage: false,
                 elem: '#table1',
-                url: '${ctx}/webpage/modules/sys/free/selfwbs.json',
+                url: '${ctxp}/webpage/modules/sys/free/selfwbs.json',
                 page: false,
                 cols: [[
                     {type: 'numbers',align:'center',width:50, rowspan:'3'},
@@ -126,7 +126,7 @@
                 treeIdName: 'd_id',
                 treePidName: 'd_pid',
                 elem: '#table2',
-                url: '${ctx}/webpage/modules/sys/free/other.json',
+                url: '${ctxp}/webpage/modules/sys/free/other.json',
                 page: false,
                 cols: [[
                     {type: 'numbers'},