diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/domain/HealthPopularScience.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/domain/HealthPopularScience.java index 0634525..283d840 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/domain/HealthPopularScience.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/domain/HealthPopularScience.java @@ -83,6 +83,9 @@ public class HealthPopularScience extends BaseEntity { /** 是否删除 0-正常 2-删除 */ private Long delFlag; + @ApiModelProperty("慢性病id数组") + private String[] chronicIdArray; + @ApiModelProperty("慢性病id 多个用,分割") private String chronicIds; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/impl/HealthPopularScienceServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/impl/HealthPopularScienceServiceImpl.java index 2f48b7e..2dc9d00 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/impl/HealthPopularScienceServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/impl/HealthPopularScienceServiceImpl.java @@ -11,6 +11,7 @@ import com.bonus.canteen.core.nutrition.mapper.HealthArticleChronicMapper; import com.bonus.canteen.core.nutrition.mapper.HealthChronicMapper; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; +import com.bonus.common.core.utils.StringUtils; import com.bonus.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -52,6 +53,11 @@ public class HealthPopularScienceServiceImpl implements IHealthPopularScienceSer */ @Override public List selectHealthPopularScienceList(HealthPopularScience healthPopularScience) { + String chronicIds = healthPopularScience.getChronicIds(); + if (StringUtils.isNotEmpty(chronicIds)) { + String[] chronicIdArray = chronicIds.split(","); + healthPopularScience.setChronicIdArray(chronicIdArray); + } return healthPopularScienceMapper.selectHealthPopularScienceList(healthPopularScience); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthPopularScienceMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthPopularScienceMapper.xml index aef705f..7c16d90 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthPopularScienceMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthPopularScienceMapper.xml @@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" hps.del_flag = 0 and hps.article_id = #{articleId} - and hps.article_title = #{articleTitle} + and hps.article_title like concat('%', #{articleTitle}, '%') and hps.cover_photo = #{coverPhoto} and hps.article_type = #{articleType} and hps.article_content = #{articleContent} @@ -48,6 +48,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and hps.if_pushed = #{ifPushed} and hps.push_time = #{pushTime} and hps.summary = #{summary} + + and hac.chronic_id in + + #{chronicId} + + GROUP BY hps.article_id,