增加字段

jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiContInfo.java

@@ -178,7 +178,6 @@ public class BsSgcJsjdBuiContInfo extends BaseEntity
     private String score;
 
 
-
     private String centerPaidinAmount;
 
     private String provincialPaidinAmount;

jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiContSubcontracts.java

@@ -27,6 +27,10 @@ public class BsSgcJsjdBuiContSubcontracts extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    @Excel(name = "分包合同名称")
+    @ApiModelProperty("分包合同名称")
+    private String subcontractingName;
+
     /** 分包约定 */
     @Excel(name = "分包约定")
     @ApiModelProperty("分包约定")

jwtech-system/src/main/java/com/kms/build/domain/vo/BsSgcJsjdBuiAttendanceInformationExcel.java

@@ -18,7 +18,7 @@ public class BsSgcJsjdBuiAttendanceInformationExcel {
     @JsonFormat(pattern = "yyyy-MM")
     @Excel(name = "考勤所属年月", width = 30, dateFormat = "yyyy-MM")
     @ApiModelProperty("考勤所属年月")
-    public Date attendanceYear;
+    public String attendanceYear;
 
     @Excel(name = "身份证")
     @ApiModelProperty("身份证")

jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectApproval.java

@@ -60,10 +60,14 @@ public class SpecialProjectApproval extends BaseEntity
     private Date replyTime;
 
     /** 批复人信息 */
-    @Excel(name = "批复人信息")
+    @Excel(name = "批复单位")
-    @ApiModelProperty("批复人信息")
+    @ApiModelProperty("批复单位")
     private String replyPerson;
 
+    @Excel(name = "批复文号")
+    @ApiModelProperty("批复人文号")
+    private String replyNo;
+
     /** 批复意见 */
     @Excel(name = "批复意见")
     @ApiModelProperty("批复意见")

jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectFeasibility.java

@@ -121,4 +121,8 @@ public class SpecialProjectFeasibility extends BaseEntity
     @TableField(exist = false)
     private String adcd;
 
+    private String approvalDepartment;
+
+    private String approvalNo;
+
 }

jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectPreDesign.java

@@ -1,6 +1,7 @@
 package com.kms.earlyStage.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,6 +14,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.jianwei.common.core.domain.BaseEntity;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * 初步设计管理对象 bs_sgc_qqjd_spe_pro_des_app
  *
@@ -102,4 +106,19 @@ public class SpecialProjectPreDesign extends BaseEntity
     @TableField(exist = false)
     private String bindStatus;
 
+
+    private String approvalDepartment;
+    private String approvalNo;
+    private String approvalDuration;
+    private BigDecimal totalInvestment;
+
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date planWorkDate;
+
+    private String totalArea;
+    private String addArea;
+
+
+
+
 }

jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectProposal.java

@@ -116,6 +116,11 @@ public class SpecialProjectProposal extends BaseEntity
 
     private String adcd;
 
+    private String approvalDepartment;
+
+    private String approvalNo;
+
+    private String isApproval;
 
     //查询字段 0：列表，1：其它
     @TableField(exist = false)