bug更新

jwtech-admin-page/src/views/building/peasantWorkerSystem/options/realNameSystem.vue

@@ -960,13 +960,19 @@ export default {
             obj.politicalAffiliation = v["政治面貌"]; //ip是表的标题
             obj.belowUnit = v["所属单位"]; //ip是表的标题
 
-            let admissionTime = v["进场日期"];
+            let admissionTime = new Date(v["进场日期"]);
-            admissionTime = new Date(
+            if (isNaN(admissionTime.getSeconds())) {
-              admissionTime.setSeconds(admissionTime.getSeconds() + 44)
+              admissionTime=v["进场日期"];
-            );
+            } else {
+              // 增加 44 秒
+              admissionTime.setSeconds(admissionTime.getSeconds() + 44);
+            }
             obj.admissionTime = _this.parseTime(admissionTime, "{y}-{m}-{d}"); //ip是表的标题
-            let exitTime = v["退场日期"];
+            let exitTime = new Date(v["退场日期"]);
-            exitTime = new Date(
+            if (isNaN(admissionTime.getSeconds())){
+                exitTime=v["退场日期"];
+            }else
+            (
               exitTime.setSeconds(exitTime.getSeconds() + 44)
             );
             obj.exitTime = _this.parseTime(exitTime, "{y}-{m}-{d}");

jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue

@@ -941,7 +941,7 @@ export default {
             obj.idNo = v["身份证"]; //ip是表的标题
             obj.name = v["姓名"]; //ip是表的标题
             obj.phone = v["手机号"]; //ip是表的标题
-            if (obj.idNo && obj.name && obj.phone) {
+            if (obj.idNo&& obj.name && obj.phone) {
               successNo += 1;
               arr.push(obj);
             }

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

@@ -16,7 +16,7 @@ public class BsSgcJsjdBuiRealNameExcel {
     private String name;
 
     @Excel(name = "籍贯")
-    private String native_place;
+    private String nativePlace;
 
     @Excel(name = "年龄")
     private String age;

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

@@ -32,7 +32,6 @@ public class ProjectBidPrequ extends BaseEntity
     /** 招标项目名称 */
     @Excel(name = "招标项目名称")
     @ApiModelProperty("招标项目名称")
-    @TableField(exist = false)
     private String bidProjectName;
 
     /** 资格预审文件获取开始时间 */

jwtech-system/src/main/resources/mapper/earlyStage/ProjectBidPrequMapper.xml

@@ -6,7 +6,6 @@
 
     <sql id="info">
         select
-            project_name,
             bp.*
 
         from bs_slgc_qqjd_pro_bid_prequ bp
@@ -16,7 +15,7 @@
 
     <resultMap id="ProjectBidPrequ" type="ProjectBidPrequ">
         <id property="id" column="id"/>
-        <result property="bidProjectName" column="project_name"/>
+        <result property="bidProjectName" column="bid_project_name"/>
         <result property="fileGainTime" column="FILE_GAIN_TIME"/>
         <result property="reportTime" column="REPORT_TIME"/>
         <result property="projectCode" column="project_code"/>