bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:c16da18514331629e02d6eb8faa36b67bb1d0aa9
Branches Tags
bonus:master
bonus:test0606
bonus:testjob
bonus:removedishbase
bonus:order
bonus:test0530
bonus:rs0527
bonus:liuxin0527
bonus:liuxin0528
..
compare: bonus:c426c1dc8d9ff57ffb41220608ffba954d5c1ec9
Branches Tags
bonus:master
bonus:test0606
bonus:testjob
bonus:removedishbase
bonus:order
bonus:test0530
bonus:rs0527
bonus:liuxin0527
bonus:liuxin0528

No commits in common. "c16da18514331629e02d6eb8faa36b67bb1d0aa9" and "c426c1dc8d9ff57ffb41220608ffba954d5c1ec9" have entirely different histories.
c16da18514 ... c426c1dc8d

2 changed files with 0 additions and 19 deletions
Show Stats Expand all files Collapse all files

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenWasteDeal.java
View File

@ -4,8 +4,6 @@ import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.bonus.common.core.annotation.Excel; import com.bonus.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -108,6 +106,4 @@ public class KitchenWasteDeal extends BaseEntity {
private LocalDateTime endDateTime; private LocalDateTime endDateTime;
private String searchValue; private String searchValue;
private List<String> scenePictureList;
} }

15
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenWasteDealServiceImpl.java
View File

@ -1,15 +1,11 @@
package com.bonus.canteen.core.kitchen.service.impl; package com.bonus.canteen.core.kitchen.service.impl;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.bonus.canteen.core.common.utils.FileUrlUtil;
import com.bonus.canteen.core.kitchen.domain.constants.WasteDealTypeEnum; import com.bonus.canteen.core.kitchen.domain.constants.WasteDealTypeEnum;
import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.bonus.canteen.core.kitchen.mapper.KitchenWasteDealMapper; import com.bonus.canteen.core.kitchen.mapper.KitchenWasteDealMapper;
@ -50,17 +46,6 @@ public class KitchenWasteDealServiceImpl implements IKitchenWasteDealService {
if(CollUtil.isNotEmpty(list)) { if(CollUtil.isNotEmpty(list)) {
for(KitchenWasteDeal wasteDeal : list) { for(KitchenWasteDeal wasteDeal : list) {
wasteDeal.setDealTypeName(WasteDealTypeEnum.getDescByKey(wasteDeal.getDealType())); wasteDeal.setDealTypeName(WasteDealTypeEnum.getDescByKey(wasteDeal.getDealType()));
if(StringUtils.isNotBlank(wasteDeal.getScenePicture())) {
List<String> scenePictureList = new ArrayList<>();
String[] contractAttachmentList = StringUtils.split(wasteDeal.getScenePicture(), ",");
if(Objects.nonNull(contractAttachmentList)) {
for(String contractAttachment : contractAttachmentList) {
String finalAttachment = FileUrlUtil.getFileUrl(contractAttachment);
scenePictureList.add(finalAttachment);
}
}
wasteDeal.setScenePictureList(scenePictureList);
}
} }
} }
return list; return list;