储备项目库

projects-service/src/main/java/com/rtrh/projects/modules/projects/po/SubInfoGxj.java

@@ -1,11 +1,13 @@
 package com.rtrh.projects.modules.projects.po;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.rtrh.projects.modules.system.po.TableBaseColomn;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.ToString;
 
 import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * <p>
@@ -17,7 +19,8 @@ import java.time.LocalDateTime;
  */
 @Getter
 @Setter
-public class SubInfoGxj implements Serializable {
+@ToString(callSuper = true)
+public class SubInfoGxj extends TableBaseColomn implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -54,13 +57,16 @@ public class SubInfoGxj implements Serializable {
     private String subjectName;
 
     // 开始计划日期
-    private LocalDate beginDate;
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    private Date beginDate;
 
     // 计划投产日期
-    private LocalDate endDate;
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    private Date endDate;
 
     // 计划申规入统时间
-    private LocalDate rtDate;
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    private Date rtDate;
 
     // 项目内容
     private String content;
@@ -72,16 +78,20 @@ public class SubInfoGxj implements Serializable {
     private String cbStatus;
 
     // 签约日期
-    private LocalDate qyDate;
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    private Date qyDate;
 
     // 转入新建库的日期
-    private LocalDate xjDate;
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    private Date xjDate;
 
     // 转入在建库的日期
-    private LocalDate zjDate;
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    private Date zjDate;
 
     // 转入投产库的日期
-    private LocalDate tcDate;
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    private Date tcDate;
 
     // 储备转新建周期
     private Integer cbNum;
@@ -115,28 +125,29 @@ public class SubInfoGxj implements Serializable {
     private Boolean isRg;
 
     // 实际入轨日期
-    private LocalDate rgDate;
-
-    // 创建人登录id
-    private String createUserId;
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    private Date rgDate;
 
+    // // 创建人登录id
+    // private String createUserId;
+    //
     // 创建人登录名称
     private String createUserName;
 
-    // 创建时间
-    private LocalDateTime createTime;
-
-    // 更新人id
-    private String lastUpdateUserId;
+    // // 创建时间
+    // private Date createTime;
+    //
+    // // 更新人id
+    // private String lastUpdateUserId;
 
     // 更新人名称
     private String lastUpdateUserName;
 
-    // 最后一次更新时间
-    private LocalDateTime lastUpdateTime;
+    // // 最后一次更新时间
+    // private Date lastUpdateTime;
 
-    // 删除标记 0正常 1删除
-    private Boolean logicDeleteFlag;
+    // // 删除标记 0正常 1删除
+    // private Boolean logicDeleteFlag;
 
     // 1-绿灯 2-红灯
     private String statusLamp;

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubInfoQueryServiceImpl.java

@@ -20,6 +20,7 @@ import com.rtrh.projects.modules.projects.po.RptCont;
 import com.rtrh.projects.modules.projects.po.SubAmtPlan;
 import com.rtrh.projects.modules.projects.po.SubInfo;
 import com.rtrh.projects.modules.projects.po.SubInfoGxj;
+import com.rtrh.projects.modules.projects.service.SubPreNewService;
 import com.rtrh.projects.modules.projects.service.SubRptContService;
 import com.rtrh.projects.modules.projects.vo.*;
 import com.rtrh.projects.modules.projects.vo.export.SubInfoFixVO;
@@ -87,7 +88,8 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
     private SubLabelDao subLabelDao;
     @Autowired
     private RptContDao rptContDao;
-
+    @Autowired
+    private SubPreNewService subPreNewService;
     @Override
     public Map<String, Integer> getWarningBySubId(String subId) {
 
@@ -195,6 +197,10 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
                         .filter(k -> e.getSubjectId().equals(k.getCode()))
                         .findFirst()
                         .ifPresent(k -> e.setSubjectName(k.getTitle()));
+                if ("2".equals(e.getStatus())){
+                    // 新建库查询前期手续
+
+                }
             }
         }
         page.setTotalCount(pageInfo.getTotal());

projects/src/main/webapp/vmodules/subject/subInfo/tz/new.jsp

@@ -694,7 +694,7 @@
 <script type="text/html" id="date">
 
     <div title="">
-        <div class="line"><span class="qianse">计划开工：</span> <span class="shense">{{d.beginDate}}</span>
+        <div class="line"><span class="qianse">计划开工：</span> <span class="shense">{{ d.beginDate ? d.beginDate : '未指定' }}</span>
 
         </div>
 <%--        <div class="line"><span class="qianse">计划竣工：</span> <span class="shense">{{d.endDate}}</span>--%>
@@ -1182,7 +1182,7 @@
                                 return (d.amtTotal / 10000).toFixed(2) + "亿元";
                             }
                         },
-                        {field: 'xmbaStatus', title: '预计开工时间', width: 160, templet: '#date'},
+                        {field: 'preProceNum', title: '预计开工时间', width: 160, templet: '#date'},
                           {field: 'xmbaStatus', title: '前期手续办理情况', width: 160, templet: '#preInfo'},
                         {field: 'remark', title: '备注', width: 245, templet: '#remark'},
                         // {field: 'indusKindName', title: '所属行业', width: 115},