1.客户服务类型逻辑加一层空判断

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java

@@ -16,41 +16,38 @@
  */
 package com.logpm.distribution.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.distribution.dto.DistributionStockArticleDTO;
+import com.logpm.distribution.entity.DistributionStockArticleEntity;
+import com.logpm.distribution.excel.DistributionStockArticleExcel;
+import com.logpm.distribution.service.IDistributionStockArticleService;
+import com.logpm.distribution.vo.DistributionStockArticleVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.BladeConstant;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.system.entity.Dict;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.feign.IDictBizClient;
-import org.springblade.system.feign.IDictClient;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.logpm.distribution.entity.DistributionStockArticleEntity;
-import com.logpm.distribution.vo.DistributionStockArticleVO;
-import com.logpm.distribution.excel.DistributionStockArticleExcel;
-import com.logpm.distribution.service.IDistributionStockArticleService;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.tool.constant.BladeConstant;
 import springfox.documentation.annotations.ApiIgnore;
 
-import java.text.SimpleDateFormat;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.util.Date;
-import java.util.Map;
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * 配送在库订单 控制器
@@ -87,6 +84,7 @@ public class DistributionStockArticleController extends BladeController {
 	public R<IPage<DistributionStockArticleEntity>> list(@ApiIgnore @RequestParam Map<String, Object> distributionStockArticle, Query query) {
 		IPage<DistributionStockArticleEntity> pages = distributionStockArticleService.page(Condition.getPage(query), Condition.getQueryWrapper(distributionStockArticle, DistributionStockArticleEntity.class));
 		pages.getRecords().forEach( i ->{
+			Integer typeService = i.getTypeService();
 			//计算在库天数
 //			SimpleDateFormat simpleFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
 			long time1 = i.getWarehouseEntryTime().getTime(); //入库
@@ -108,31 +106,32 @@ public class DistributionStockArticleController extends BladeController {
 					break;
 			}
 			R<List<DictBiz>> distribution_type = dictBizClient.getList("distribution_type");
-			if(Func.isNotEmpty(distribution_type.getData())){
-			DictBiz dictBiz = distribution_type.getData().get(i.getTypeService()-1);
-				i.setTypeName(dictBiz.getDictValue());
-				switch (i.getState()){
-					case 1:
-						i.setStateName("待预约");
-						break;
-					case 2:
-						i.setStateName("已预约");
-						break;
-					case 3:
-						i.setStateName("待配送");
-						break;
-					case 4:
-						i.setStateName("配送中");
-						break;
-					case 5:
-						i.setStateName("已配送");
-						break;
-					case 6:
-						i.setStateName("已完成");
-						break;
+			if(!Objects.isNull(typeService)){
+				if(Func.isNotEmpty(distribution_type.getData())){
+					DictBiz dictBiz = distribution_type.getData().get(typeService-1);
+					i.setTypeName(dictBiz.getDictValue());
+					switch (i.getState()){
+						case 1:
+							i.setStateName("待预约");
+							break;
+						case 2:
+							i.setStateName("已预约");
+							break;
+						case 3:
+							i.setStateName("待配送");
+							break;
+						case 4:
+							i.setStateName("配送中");
+							break;
+						case 5:
+							i.setStateName("已配送");
+							break;
+						case 6:
+							i.setStateName("已完成");
+							break;
+					}
 				}
 			}
-
 		});
 		return R.data(pages);
 	}