winter 1 år sedan
förälder
incheckning
1852752769
3 ändrade filer med 20 tillägg och 0 borttagningar
  1. +10
    -0
      yqzjAdmin/src/main/java/com/iformall/controller/yqzj/YqzjNewsController.java
  2. +3
    -0
      yqzjService/src/main/java/com/iformall/domain/po/yqzj/YqzjNews.java
  3. +7
    -0
      yqzjService/src/main/resources/mapper/YqzjNewsMapper.xml

+ 10
- 0
yqzjAdmin/src/main/java/com/iformall/controller/yqzj/YqzjNewsController.java Visa fil

@@ -37,6 +37,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -59,6 +60,15 @@ public class YqzjNewsController extends YqzjBaseController {
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData list(@ModelAttribute YqzjNews record, Integer pageNum, Integer pageSize) {
record.setSortColumns(" first desc, update_date desc, send_date desc, create_date desc");
if (null != record.getType()) {
if (EnumYqzjNewsType.YUNYUZHOU.getCode().intValue() == record.getType().intValue()) {
record.setType(null);
List<Integer> typeList = new ArrayList<Integer>();
typeList.add(EnumYqzjNewsType.YUNYUZHOU_SHENDU.getCode());
typeList.add(EnumYqzjNewsType.YUNYUZHOU_ZIXUN.getCode());
record.setTypeList(typeList);
}
}
final PageInfo<YqzjNews> page = this.yqzjService.listNewsAsPage(record, pageNum, pageSize);
return new ResultData(page);
}


+ 3
- 0
yqzjService/src/main/java/com/iformall/domain/po/yqzj/YqzjNews.java Visa fil

@@ -7,6 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.util.Date;
import java.util.List;

@TableName(value = "yqzj_news")
@Data
@@ -20,6 +21,8 @@ public class YqzjNews extends TenantEntity {

@io.swagger.annotations.ApiModelProperty(value="EnumYqzjNewsType 类型",name="type")
private Integer type;
@TableField(exist = false)
private List<Integer> typeList;
@io.swagger.annotations.ApiModelProperty(value="EnumYqzjNewsType 类型",name="subType")
private Integer subType;
@io.swagger.annotations.ApiModelProperty(value="标签",name="tag")


+ 7
- 0
yqzjService/src/main/resources/mapper/YqzjNewsMapper.xml Visa fil

@@ -71,6 +71,13 @@
and `first` = #{first}
</if>

<if test=" null != typeList ">
and type in
<foreach collection="typeList" index="index" item="tyItem" open="(" separator="," close=")">
#{tyItem}
</foreach>
</if>

<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">


Laddar…
Avbryt
Spara