修改BUG

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

@@ -18,14 +18,7 @@ import java.util.Map;
 import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author wuhonghao
@@ -68,7 +61,7 @@ public class BusJcbBlqController extends BaseController {
 
     @ApiOperation(value = "单个")
     @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(String id) {
+    public AjaxResult getInfo(@PathVariable String id) {
         BusJcbBlq info = busJcbBlqService.getInfo(id);
         AjaxResult ajax = AjaxResult.success();
         ajax.put("info",info);
@@ -130,12 +123,12 @@ public class BusJcbBlqController extends BaseController {
         params.put("${blqjyzBlqjzcjyzcszzt}", StringUtils.yesOrNo(info.getBlqjyzBlqjzcjyzcszzt()));
         params.put("${blqjyzBmqjazlg}", StringUtils.yesOrNo(info.getBlqjyzBmqjazlg()));
         params.put("${blqyxBlqyxwssdg}", StringUtils.yesOrNo(info.getBlqyxBlqyxwssdg()));
-        params.put("${blqyxGycyxdjdtdtzxjl}", info.getBlqyxGycyxdjdtdtzxjl());
+        params.put("${blqyxGycyxdjdtdtzxjl}", info.getBlqyxGycyxdjdtdtzxjl().toString());
         params.put("${tlqZtlhwpslh}", StringUtils.yesOrNo(info.getTlqZtlhwpslh()));
         params.put("${jsqDzjs}", info.getJsqDzjs());
-        params.put("${blqjdztJddz}", info.getBlqjdztJddz());
+        params.put("${blqjdztJddz}", info.getBlqjdztJddz().toString());
         params.put("${sbzt}", StringUtils.YES_VALUE.equals(info.getSbzt()) ? "合格" : "不合格");
-        params.put("${confirmUser}", info.getConfirmUser());
+        params.put("${confirmUser}", StringUtils.isEmpty(info.getConfirmUser())?"":info.getConfirmUser());
         params.put("${czwt}", info.getCzwt());
 
         //生成word文件的文件名

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

@@ -21,14 +21,7 @@ import java.util.Map;
 import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -84,7 +77,7 @@ public class BusJcbFdfxjyqController extends BaseController {
 
     @ApiOperation(value = "单个")
     @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(String id) {
+    public AjaxResult getInfo(@PathVariable String id) {
         BusJcbFdfxjyq info = busJcbFdfxjyqService.getInfo(id);
         AjaxResult ajax = AjaxResult.success();
         ajax.put("info",info);