fix 新增疫苗导出日志

boman-api/boman-domain/src/main/java/com.boman.domain/YmjzImportErrorLog.java

@@ -1,7 +1,10 @@
 package com.boman.domain;
 
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 import java.util.Date;
 
@@ -9,10 +12,13 @@ import java.util.Date;
  * 疫苗接种导入错误日志
  */
 @Builder
-public class YmjzImportErrorLog {
+@AllArgsConstructor
+@NoArgsConstructor
+public class YmjzImportErrorLog extends BaseEntity{
 
     private Long id;
     private String username;
+    private String town;
     private String place;
     private String vaccineName;
     private String jici;
@@ -24,6 +30,14 @@ public class YmjzImportErrorLog {
     private String updateBy;
     private Date updateTime;
 
+    public String getTown() {
+        return town;
+    }
+
+    public void setTown(String town) {
+        this.town = town;
+    }
+
     public Long getId() {
         return id;
     }
@@ -87,36 +101,4 @@ public class YmjzImportErrorLog {
     public void setIsDel(String isDel) {
         this.isDel = isDel;
     }
-
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
 }

boman-web-core/src/main/java/com/boman/web/core/controller/YmjzImportErrorController.java

@@ -7,6 +7,7 @@ import com.boman.domain.YmjzImportErrorLog;
 import com.boman.web.core.service.ymjz.YmjzImportErrorLogService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -27,7 +28,8 @@ public class YmjzImportErrorController extends BaseController {
      * 查询疫苗信息导出失败列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(YmjzImportErrorLog ymjzImportErrorLog) {
+    public TableDataInfo list(@RequestParam(required = false) YmjzImportErrorLog ymjzImportErrorLog) {
+        startPage();
         List<YmjzImportErrorLog> list = ymjzImportErrorLogService.selectYmjzImportErrorLogList(ymjzImportErrorLog);
         return getDataTable(list);
     }

boman-web-core/src/main/resources/mapper/YmjzImportErrorLogMapper.xml

@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from ymjz_import_error_log
 
     </sql>
+
     <select id="selectYmjzImportErrorLogList" resultMap="YmjzImportErrorLogResult">
         <include refid="selectYmjzImportErrorLogVo"/>
         <where>
@@ -35,6 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time DESC
     </select>
+
+
     <insert id="insertErrorLog" parameterType="com.boman.domain.YmjzImportErrorLog">
         insert into ymjz_import_error_log (
             <if test="username != null and username != ''">username,</if>