导入修改

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiRealNameController.java

@@ -24,6 +24,7 @@ import org.springframework.beans.BeanUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.parsing.BeanEntry;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -158,6 +159,7 @@ public class BsSgcJsjdBuiRealNameController extends BaseController
                         bsSgcJsjdBuiRealName.setProNo(proNo);
                         bsSgcJsjdBuiRealName.setProCode(proCode);
                         BeanUtils.copyProperties(bsSgcJsjdBuiRealNameExcel,bsSgcJsjdBuiRealName);
+                        BaseEntityUtils.preInsert(bsSgcJsjdBuiRealName);
                         bsSgcJsjdBuiRealNameService.save(bsSgcJsjdBuiRealName);
                 }
             }

jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiSectionInfoController.java

@@ -1,11 +1,13 @@
 package com.kms.build.controller;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 import com.jianwei.common.core.controller.BaseController;
 import com.jianwei.common.core.domain.SearchParam;
 import com.jianwei.common.utils.poi.ExcelUtil;
+import com.kms.build.domain.BsSgcJsjdBuiRealNameExcel;
 import com.kms.build.domain.BsSgcJsjdBuiSectionInfo;
 import com.kms.common.utils.BaseEntityUtils;
 
@@ -110,4 +112,14 @@ public class BsSgcJsjdBuiSectionInfoController extends BaseController
     {
         return toAjax(bsSgcJsjdBuiSectionInfoService.removeByIds(Arrays.asList(ids)));
     }
+
+    @Log(title = "标段基本信息导入模板导出", businessType = BusinessType.EXPORT)
+    @GetMapping("/exportTemplate")
+    @ApiOperation("标段基本信息导入模板导出")
+    public AjaxResult  exportTemplate(){
+        ExcelUtil<BsSgcJsjdBuiRealNameExcel>util=new ExcelUtil<>(BsSgcJsjdBuiRealNameExcel.class);
+        return util.exportExcel(new ArrayList<>(),"标段基本信息入模板");
+    }
 }
+
+

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

@@ -11,7 +11,7 @@ import java.util.Date;
 @Data
 public class BsSgcJsjdBuiRealNameExcel {
     /** $column.columnComment */
-    @Excel(name = "姓名")
+    @Excel(name = "姓名(必填)")
     @ApiModelProperty("姓名")
     private String name;
 
@@ -19,11 +19,11 @@ public class BsSgcJsjdBuiRealNameExcel {
     private String native_place;
 
     /** 身份证号码 */
-    @Excel(name = "身份证",cellType = Excel.ColumnType.STRING)
+    @Excel(name = "身份证(必填)",cellType = Excel.ColumnType.STRING,width = 30)
     @ApiModelProperty("身份证号码")
     private String idNo;
 
-    @Excel(name = "手机号")
+    @Excel(name = "手机号(必填)")
     private String phone;
 
     /** 政治面貌 */
@@ -33,15 +33,11 @@ public class BsSgcJsjdBuiRealNameExcel {
     @Excel(name = "所属单位")
     private String belowUnit;
 
-    @Excel(name = "所属单位统一社会信用代码")
+    @Excel(name="进场日期",width = 20,dateFormat = "yyyy-MM-dd")
-    private String socialCreditCode;
-
-
-    @Excel(name="进场日期",width = 20)
     @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
     private Date admissionTime;
 
-    @Excel(name="离职日期",width = 20)
+    @Excel(name="退场日期",width = 20,dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
     private Date exitTime;
 }

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

@@ -0,0 +1,73 @@
+package com.kms.build.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jianwei.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class BsSgcJsjdBuiSectionExcel {
+
+    /** 标段名称 */
+    @Excel(name = "标段名称(必填)")
+    @ApiModelProperty("标段名称")
+    private String sectionName;
+
+    @Excel(name = "相关项目名称(必填)")
+    @ApiModelProperty("项目名称")
+    private String projectName;
+
+    /** 项目法人 */
+    @Excel(name = "项目法人")
+    @ApiModelProperty("项目法人")
+    private String projectLegalPerson;
+
+    /** 单位法定代表人电话 */
+    @Excel(name = "法定代表人电话")
+    @ApiModelProperty("法定代表人电话")
+    private String projectUnitLegalPhone;
+
+    /** 工程等别 */
+    @Excel(name = "工程等别")
+    @ApiModelProperty("工程等别")
+    private String engineeringGrade;
+
+    /** 工程用途 */
+    @Excel(name = "工程用途")
+    @ApiModelProperty("工程用途")
+    private String engineeringPurposes;
+
+    /** 项目建设地址 */
+    @Excel(name = "建设地址")
+    @ApiModelProperty("建设地址")
+    private String constructionAddress;
+
+    @Excel(name = "是否重大项目,填:是或否")
+    @ApiModelProperty("是否重大项目")
+    private String isMajor;
+
+    @Excel(name = "行政区划")
+    @ApiModelProperty("行政区划")
+    private String adcd;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开工日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("开工日期")
+    private Date commencementDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "计划竣工日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("计划竣工日期")
+    private Date plannedCompletionDate;
+
+    @Excel(name = "是否为安全度汛重点工程")
+    @ApiModelProperty("是否为安全度汛重点工程,填:是或否")
+    private String isKeyProject;
+
+    /** 是否穿破堤坝施工 */
+    @Excel(name = "是否穿破堤坝施工")
+    @ApiModelProperty("是否穿破堤坝施工,填:是或否")
+    private String isPierceProject;
+}