bug修复

release-service/src/main/java/com/mmc/csf/release/entity/information/IndustryNewsDO.java

@@ -38,15 +38,6 @@ public class IndustryNewsDO implements Serializable {
                 newsContents(newsContents).createTime(createTime).updateTime(updateTime).origin(origin).build();
     }
 
-    public IndustryNewsDO(IndustryNewsDTO industryNewsDTO){
-        this.id = industryNewsDTO.getId();
-        this.newsTitle = industryNewsDTO.getNewsTitle();
-        this.newsAuthor = industryNewsDTO.getNewsAuthor();
-        this.userAccountId = industryNewsDTO.getUserAccountId();
-        this.surfaceImg = industryNewsDTO.getSurfaceImg();
-        this.newsContents = industryNewsDTO.getNewsContents();
-    }
-
     public IndustryNewsDO(Integer id, String newsTitle, String newsAuthor, Integer userAccountId, String surfaceImg, String newsContents, String origin) {
         this.id = id;
         this.newsTitle = newsTitle;

release-service/src/main/java/com/mmc/csf/release/entity/tender/TenderInfoDO.java

@@ -22,11 +22,15 @@ import java.util.Date;
 public class TenderInfoDO implements Serializable {
     private static final long serialVersionUID = 6547272373224463237L;
     private Integer id;
+    @ApiModelProperty(value = "招标快讯id")
     private Integer tenderNewsId;
+    @ApiModelProperty(value = "招标快讯内容序号")
     private String tenderInfoNo;
+    @ApiModelProperty(value = "招标快讯标题")
     private String tenderTitle;
     @ApiModelProperty(value = "招标快讯内容")
     private String tenderContent;
+    @ApiModelProperty(value = "价格")
     private BigDecimal tenderPrice;
     private Integer deleted;
     private Date createTime;

release-service/src/main/java/com/mmc/csf/release/service/impl/TenderServiceImpl.java

@@ -132,13 +132,13 @@ public class TenderServiceImpl implements TenderService {
         for (ExcelTenderInfo tenderInfo : list) {
             TenderInfoDO tenderInfoDO = new TenderInfoDO();
             tenderInfoDO.setTenderNewsId(tenderNewsDO.getId());
-            //序号不能为空
+            // 序号不能为空
             if (StringUtils.isBlank(tenderInfo.getTenderInfoNo())) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return ResultBody.error(ResultEnum.TENDER_FORMAT_ERROR);
             }
             tenderInfoDO.setTenderInfoNo(tenderInfo.getTenderInfoNo().trim());
-            //内容判断长度，不能为空，且长度在64之内
+            // 内容判断长度，不能为空，且长度在64之内
             if (StringUtils.isBlank(tenderInfo.getTenderTitle())) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return ResultBody.error(ResultEnum.TENDER_FORMAT_ERROR);

release-service/src/main/resources/mapper/tender/TenderDao.xml

@@ -120,10 +120,10 @@
             and tender_name like CONCAT('%',#{tenderName},'%')
         </if>
         <if test=" startTime != null ">
-            and create_time &gt; #{startTime}
+            and create_time &gt;= #{startTime}
         </if>
         <if test=" endTime != null ">
-            and create_time &lt; #{endTime}
+            and create_time &lt;= #{endTime}
         </if>
         <if test=" using != null ">
             and is_using = #{using}
@@ -137,10 +137,10 @@
             and tender_name like CONCAT('%',#{tenderName},'%')
         </if>
         <if test=" startTime != null ">
-            and create_time &gt; #{startTime}
+            and create_time &gt;= #{startTime}
         </if>
         <if test=" endTime != null ">
-            and create_time &lt; #{endTime}
+            and create_time &lt;= #{endTime}
         </if>
         <if test=" using != null ">
             and is_using = #{using}