1111

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

@@ -1,7 +1,10 @@
 package com.jeeplus.modules.sg.project.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.persistence.DataEntity;
 
+import java.util.Date;
+
 public class WbsItem extends DataEntity<WbsItem> {
     private String id; //项目ID
     private String unit; //施工单位
@@ -9,7 +12,19 @@ public class WbsItem extends DataEntity<WbsItem> {
     private String projectId; //工程ID
     private String parentNode; //父节点
     private String type; //项目类型
+    private Date createDate;  //创建时间
+
 
+    @Override
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    @Override
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
 
     @Override
     public String getId() {

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

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -36,6 +37,7 @@ public class ItemService extends CrudService<ItemMapper, WbsItem> {
         WbsProject wbsProject = projectService.get(projectId);
         int num = wbsProject.getNumber()+1;
         projectService.updateNum(num,projectId);
+        wbsItem.setCreateDate(new Date());
         itemMapper.insert(wbsItem);
     }
 

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

@@ -46,6 +46,9 @@ public class ProjectController extends BaseController {
         return "modules/sg/project/management";
     }
 
+
+
+
     //项目保存
     @ResponseBody
     @RequestMapping("/save")

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

@@ -49,6 +49,7 @@
     <div class="" style="margin-left: 10px;margin-right: 10px;margin-top: 10px;">
        <c:forEach items="${map.list1}" var="data1" varStatus="index">
          <a class="layui-btn" href="${ctx}/jkxl/export?id=${data1.id}">导出</a>
+           <%--<a class="layui-btn" href="${ctx}/jkxl/import?id=${data1.id}">导入</a>--%>
        </c:forEach>
             <%--<table:importExcel url="${ctx}/propertycostreminder/propertyCostReminder/import"></table:importExcel>--%>
         <table id="table1" class="layui-table" lay-filter="table1"></table>

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

@@ -29,8 +29,6 @@
             <input type="button" class="layui-btn-primary layui-btn-sm layui-btn-radius" onclick="uploadwj()" value="选择结算文件" id="btnxz"/>
             <span id="myspan">*结算书文件为博微导出xls/xlsx格式文件</span>
             <input type="file" style="display: none;" accept=".xls,.xlsx"  name="file" id="myfile"/>
-            <%--<input type="file" style="display: none;" accept=".xls,.xlsx" id="myfile" name="file"/>--%>
-
         </div>
     </div>
     <!---------列表---------->

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

@@ -45,10 +45,6 @@
         <div class="layui-input-inline">
             <input type="text" name="beginName1" id="beginDate1" lay-verify="" readonly="readonly" placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
         </div>
-        <div class="layui-form-mid">-</div>
-        <div class="layui-input-inline">
-            <input type="text" name="endName1" id="endDate1" lay-verify="" readonly="readonly" placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
-        </div>
     </div>
 </div>
 <div style="margin: 20px;">

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

@@ -195,7 +195,6 @@
                             if(d.status==1){
                                 xml += "<a class='layui-btn layui-btn-primary layui-btn-xs' lay-event='look'>查看</a>"
                                     +"<a class='layui-btn layui-btn-xs' lay-event='update'>修改</a>"
-                                    +"<a class='layui-btn layui-btn-normal layui-btn-xs' onclick='add()'>添加项目</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=''>导出</a>";
                             }
@@ -203,7 +202,7 @@
                                 xml +="<span>操作</span>";
                             }
                             if(d.status==3){
-                                xml +="<a class='layui-btn layui-btn-xs' lay-event='update1'>编辑</a>";
+                                xml +="<a class='layui-btn layui-btn-xs'  href=\"${ctx}/jkxl/list?id="+d.id+"\">编辑</a>";
                             }
 
                             return xml;
@@ -239,7 +238,7 @@
                         "gcmc":"${items.itemName}",
                         "xmsl": "某施工单位一",
                         "cjsq": "架空线路",
-                        "djr":"<fmt:formatDate value="${items.updateDate}" pattern="yyyy/MM/dd"/>",
+                        "djr":"<fmt:formatDate value="${items.createDate}" pattern="yyyy/MM/dd"/>",
                         "status":"3",
                         "pid": "${items.projectId}"
                     },
@@ -260,20 +259,20 @@
                 layer.open({
                     type: 2,
                     title: '查看',
-                    area: ['60%', '80%'],
+                    area: ['90%', '90%'],
                     shade: 0.8,
                     shadeClose: true,
-                    content: '${ctxp}/webpage/modules/sg/project/lookItemForm.html'
+                    content: '${ctxp}/webpage/modules/sg/project/lookItemForm.jsp'
                     , btn: ['关闭']
                 })
             }else if(obj.event == 'update'){
                 layer.open({
                     type: 2,
                     title: '修改',
-                    area: ['50%', '70%'],
+                    area: ['90%', '90%'],
                     shade: 0.8,
                     shadeClose: true,
-                    content: '${ctxp}/webpage/modules/sg/project/updateItemForm.html'
+                    content: '${ctxp}/webpage/modules/sg/project/updateItemForm.jsp'
                     , btn: ['确定','关闭']
                     ,yes: function(index, layero){
                         var bodyparent = layer.getChildFrame('body', index);
@@ -288,7 +287,7 @@
                 layui.use(['table','layer'],function(){
                     layer.open({
                         type: 2,
-                        title: '添加工程',
+                        title: '添加项目',
                         area: ['60%', '80%'],
                         shade: 0.8,
                         shadeClose: true,

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

@@ -46,10 +46,6 @@
             <div class="layui-input-inline">
                 <input type="text" name="beginUpdate" id="beginUpdate" lay-verify=""  placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
             </div>
-            <div class="layui-form-mid">-</div>
-            <div class="layui-input-inline">
-                <input type="text" name="endUpdate"  id="endUpdate" lay-verify=""  placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
-            </div>
         </div>
     </div>
 </form>