1111

src/main/java/com/jeeplus/common/utils/excel/ExportExcel.java

@@ -294,6 +294,14 @@ public class ExportExcel {
 		return styles;
 	}
 
+
+//	private Map<String, CellStyle> createStyles(Workbook wb) {
+//
+//
+//
+//
+//	}
+
 	/**
 	 * 添加一行
 	 * @return 行对象

src/main/java/com/jeeplus/modules/sg/overheadline/web/OverheadLineController.java

@@ -62,11 +62,11 @@ public class OverheadLineController extends BaseController {
       //保存数据到数据库
       overheadLineService.save(file,projectName,id,projectId);
     } catch (RuntimeException e) {
-      addMessage(redirectAttributes, "导入失败"+e.getMessage());
-//      return "redirect:/a/project/list?id="+id;
+      addMessage(redirectAttributes, "导入失败,"+e.getMessage());
+      return "redirect:/a/project/list";
     }   catch (Exception e){
       addMessage(redirectAttributes, "导入失败");
-//      return "redirect:/a/project/list?id="+id;
+      return "redirect:/a/project/list";
     }
     addMessage(redirectAttributes, "导入成功");
     return "redirect:/a/jkxl/list?id="+id;

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

@@ -13,4 +13,5 @@ import java.util.List;
 public interface ProjectMapper extends BaseMapper<WbsProject> {
     List<WbsProject> getList(WbsSelection wbsSelection);
     void updateNum(@Param("number") int number,@Param("id") String id);
+//    int update(WbsProject wbsProject);
 }

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

@@ -64,6 +64,8 @@ public class ProjectService extends CrudService<ProjectMapper, WbsProject> {
     }
 
 
+
+
     @Transactional(readOnly = false)
     public void updateNum(int number,String id){
         projectMapper.updateNum(number,id);

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

@@ -79,10 +79,17 @@ public class ProjectController extends BaseController {
         //新增或编辑表单保存
         projectService.save(wbsProject);//保存
         j.setSuccess(true);
-        j.setMsg("保存工程成功");
+        addMessage(redirectAttributes, "保存成功");
         return j;
     }
 
+    //项目编辑
+    @RequestMapping("/toList")
+    public String toList(HttpServletRequest request,Model model){
+        String id = request.getParameter("id");
+        return "redirect:/a/jkxl/list?id="+id;
+    }
+
     //项目删除
     @ResponseBody
     @RequestMapping(value = "delete")

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

@@ -69,7 +69,7 @@
                 ,{field:'xmlx',width:100,title:'项目类型'}
                 ,{field:'op',align:'center',title:"操作",width:100,templet:function(d){
                         ////对操作进行初始化
-                        var xml = "<a class='layui-btn layui-btn-xs' href=\"${ctx}/jkxl/list?id="+d.id+"\">编辑</a>";
+                        var xml = "<a class='layui-btn layui-btn-xs' onclick=\"view( '" + d.id + "')\">编辑</a>";
                         return xml;
                     }}
             ]]
@@ -98,5 +98,11 @@
 </script>
     </c:forEach>
 </c:if>
+<script>
+    function view(id) {
+        var url = '${ctx}/jkxl/list?id='+id;
+        parent.location.href=url;
+    }
+</script>
 </body>
 </html>

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

@@ -337,7 +337,7 @@
     function update(url) {
         layer.open({
             type: 2,
-            title: '添加工程',
+            title: '修改工程',
             area: ['80%', '80%'],
             shade: 0.8,
             shadeClose: true,

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

@@ -37,6 +37,7 @@
     <c:forEach items="${list}" var="data" varStatus="index">
 <form id="updateForm">
     <div class="layui-form-item" style="margin-top: 10px;">
+        <input name="id" value="${data.id}" hidden>
         <div class="layui-inline">
             <label class="layui-form-label">工程名称</label>
             <div class="layui-input-inline">
@@ -46,7 +47,7 @@
         <div class="layui-inline">
             <label class="layui-form-label">创建时间</label>
             <div class="layui-input-inline">
-                <input type="text" name="beginUpdate" id="beginUpdate" readonly="readonly"  placeholder="yyyy-MM-dd" autocomplete="off"
+                <input type="text" name="beginUpdate"  readonly="readonly"  placeholder="yyyy-MM-dd" autocomplete="off"
                        class="layui-input" value="<fmt:formatDate value="${data.createDate}" pattern="yyyy/MM/dd "/>">
             </div>
         </div>
@@ -80,7 +81,7 @@
                 ,{field:'xmlx',width:100,title:'项目类型'}
                 ,{field:'op',align:'center',title:"操作",width:100,templet:function(d){
                         ////对操作进行初始化
-                        var xml = "<a href='' class='layui-btn layui-btn-xs' lay-event='update'>编辑</a>";
+                        var xml = "<a  class='layui-btn layui-btn-xs'  onclick=\"view( '" + d.id + "')\">编辑</a>";
                         return xml;
                     }}
             ]]
@@ -111,7 +112,7 @@
     function updateProject(){
         $.ajax({
             type:"post",
-            url:"${ctx}/jkxl/ddtz",
+            url:"${ctx}/project/save",
             // data:JSON.stringify({id:newid2,type:xmmc2,fee:fyje2}),
             data:$('#updateForm').serialize(),
             success:function(result){
@@ -119,6 +120,10 @@
             }
         });
     }
+    function view(id) {
+        var url = '${ctx}/jkxl/list?id='+id;
+        parent.location.href=url;
+    }
 </script>
     </c:forEach>
 </c:if>