Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/purchase

purchase-admin/src/main/java/com/ozs/web/controller/home/HomeNoticeController.java

@@ -103,7 +103,7 @@ public class HomeNoticeController extends BaseController {
     public AjaxResult getNoticesByType(@RequestBody HomeNoticeVo homeNoticeVo) {
         LambdaQueryWrapper<HomeNotice> lw = new LambdaQueryWrapper<>();
         if (!ObjectUtils.isEmpty(homeNoticeVo.getNoticeName())) {
-            lw.like(HomeNotice::getNoticeName, "%" + homeNoticeVo.getNoticeName() + "%");
+            lw.like(HomeNotice::getNoticeName, homeNoticeVo.getNoticeName());
         }
         if (!ObjectUtils.isEmpty(homeNoticeVo.getAnnouncementClassification())) {
             lw.eq(HomeNotice::getAnnouncementClassification, homeNoticeVo.getAnnouncementClassification());

purchase-system/src/main/java/com/ozs/home/domain/HomeNotice.java

@@ -1,7 +1,7 @@
 package com.ozs.home.domain;
 
 
-import com.ozs.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
@@ -9,7 +9,9 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -21,29 +23,41 @@ import java.util.Date;
 @NoArgsConstructor
 @Builder
 @ApiModel("首页公告")
+@Table(name = "home_notice")
 public class HomeNotice extends BaseEntity {
 
     /** 主键 */
+    @Id
     private Long homeNoticeId;
 
     /** 首页分类（0需求单位首页1采购管理部门首页2采购部首页） */
+    @Column(name = "homepage_classification")
     private Integer homepageClassification;
 
     /** 公告分类（0采购公告1中标公告2流标公告） */
+    @Column(name = "announcement_classification")
     private Integer announcementClassification;
 
-    /** 公告名称 */
+    /**
+     * 公告名称
+     */
+    @Column(name = "notice_name")
     private String noticeName;
 
-    /** 公告时间 */
+    /**
+     * 公告时间
+     */
+    @Column(name = "notice_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date noticeTime;
 
-    /** 采购项目编号 */
-    private String projectNo;
+    ///** 合同履行日期 */
+    //@Column(name = "performance_date")
+    //private String performanceDate;
 
-    /** 合同履行日期 */
-    private String performanceDate;
-
-    /** 采购项目名称 */
+    /**
+     * 采购项目名称
+     */
+    @Column(name = "project_name")
     private String projectName;
 }