【NEW】增加查看生成的隔离开关检测表信息的方法。

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbGlkgController.java

@@ -86,6 +86,15 @@ public class BusJcbGlkgController extends BaseController {
         return ajax;
     }
 
+    @ApiOperation(value = "查看生成的检测表信息")
+    @GetMapping(value = {"/", "/getJcebInfo/{id}"})
+    public AjaxResult getJcebInfo(@PathVariable(value = "id") String id) {
+        BusJcbGlkg info = busJcbGlkgService.getJcebInfo(id);
+        AjaxResult ajax = AjaxResult.success();
+        ajax.put("info",info);
+        return ajax;
+    }
+
     @ApiOperation(value = "列表")
     @GetMapping(value = "list")
     public TableDataInfo getList(BusJcbGlkg busJcbGlkg) {

railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbGlkgService.java

@@ -54,6 +54,13 @@ public interface IBusJcbGlkgService{
     */
     BusJcbGlkg getInfo(String id);
 
+    /**
+     * 查看生成的检测表信息
+     * @param id
+     * @return
+     */
+    BusJcbGlkg getJcebInfo(String id);
+
     /**
     * 查询列表
     */

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbGlkgServiceImpl.java

@@ -12,6 +12,7 @@ import com.railway.business.catenary.service.IBusJcbGlkgService;
 import com.railway.common.utils.StringUtils;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import com.railway.common.utils.poi.EasyExcelUtil;
 import org.springframework.stereotype.Service;
@@ -115,6 +116,11 @@ public class BusJcbGlkgServiceImpl extends BusJcabServiceImpl implements IBusJcb
 		return busJcbGlkgMapper.getInfo(id);
 	}
 
+	@Override
+	public BusJcbGlkg getJcebInfo(String id) {
+		return formatOne(busJcbGlkgMapper.getInfo(id));
+	}
+
 	/**
 	* 查询列表
 	*/
@@ -155,19 +161,18 @@ public class BusJcbGlkgServiceImpl extends BusJcabServiceImpl implements IBusJcb
 	public String exportExcel(JcebQueryVo query) {
 		setJcebQuery(query);
 		List<BusJcbGlkg> list = busJcbGlkgMapper.getJcebList(query);
-		this.formatList(list);
+		list = list.stream().map(x -> formatOne(x)).collect(Collectors.toList());
 		String fileName = "隔离开关检测记录.xls";
 		String templateFileName = "excel/template/隔离开关检测记录.xls";
 		return new EasyExcelUtil().writeExcel(fileName, templateFileName, list);
 	}
 
-	private void formatList(List<BusJcbGlkg> list) {
-		for (BusJcbGlkg busJcbGlkg : list) {
+	private BusJcbGlkg formatOne(BusJcbGlkg busJcbGlkg) {
 			busJcbGlkg.setZcjyzztA(StringUtils.goodOrBad(busJcbGlkg.getZcjyzztA()));
 			busJcbGlkg.setYdfhsyA(StringUtils.goodOrBad(busJcbGlkg.getYdfhsyA()));
 			busJcbGlkg.setDdfhsyA(StringUtils.goodOrBad(busJcbGlkg.getDdfhsyA()));
 			busJcbGlkg.setSdfhsyA(StringUtils.goodOrBad(busJcbGlkg.getSdfhsyA()));
-
+			busJcbGlkg.setXiangbie("检测");
 			// 开关引线状态
 			if (StringUtils.YES_VALUE.equals(busJcbGlkg.getYxztA())
 				&& StringUtils.YES_VALUE.equals(busJcbGlkg.getYxztB())
@@ -191,7 +196,8 @@ public class BusJcbGlkgServiceImpl extends BusJcabServiceImpl implements IBusJcb
 
 			busJcbGlkg.setFzzt(StringUtils.goodOrBad(busJcbGlkg.getFzzt()));
 			busJcbGlkg.setHzzt(StringUtils.goodOrBad(busJcbGlkg.getHzzt()));
-		}
+
+			return busJcbGlkg;
 	}
 
 }