|
|
@@ -97,8 +97,8 @@ public class BusJcbGlkgController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "导出")
|
|
|
- @GetMapping("/export/{id}")
|
|
|
- public void export(@PathVariable(value = "id") String id, HttpServletResponse response) {
|
|
|
+ @GetMapping("/export")
|
|
|
+ public void export(@RequestParam String id, HttpServletResponse response) {
|
|
|
|
|
|
try {
|
|
|
BusJcbGlkg info = busJcbGlkgService.getInfo(id);
|
|
|
@@ -111,36 +111,36 @@ public class BusJcbGlkgController extends BaseController {
|
|
|
String[] jcrqArr = info.getJcrq().split("-");
|
|
|
String jcrq = jcrqArr[0] + "年" + jcrqArr[1] + "月" +jcrqArr[2] + "日";
|
|
|
params.put("${jcrq}", jcrq);
|
|
|
- params.put("${jgxA}", info.getJgxA().equals("0") ? "√" : "×");
|
|
|
- params.put("${jgxB}", info.getJgxB().equals("0") ? "√" : "×");
|
|
|
- params.put("${jgxC}", info.getJgxC().equals("0") ? "√" : "×");
|
|
|
- params.put("${qdzzA}", info.getQdzzA().equals("0") ? "√" : "×");
|
|
|
- params.put("${cdgA}", info.getCdgA().equals("0") ? "√" : "×");
|
|
|
- params.put("${cdgB}", info.getCdgB().equals("0") ? "√" : "×");
|
|
|
- params.put("${cdgC}", info.getCdgC().equals("0") ? "√" : "×");
|
|
|
- params.put("${gbA}", info.getGbA().equals("0") ? "√" : "×");
|
|
|
- params.put("${ctztA}", info.getCtztA().equals("0") ? "√" : "×");
|
|
|
- params.put("${ctmtztA}", info.getCtmtztA().equals("0") ? "√" : "×");
|
|
|
- params.put("${hjkztA}", info.getHjkztA().equals("0") ? "√" : "×");
|
|
|
- params.put("${zcjyzztA}", info.getZcjyzztA().equals("0") ? "√" : "×");
|
|
|
- params.put("${yxztA}", info.getYxztA().equals("0") ? "√" : "×");
|
|
|
- params.put("${yxztB}", info.getYxztB().equals("0") ? "√" : "×");
|
|
|
- params.put("${yxztC}", info.getYxztC().equals("0") ? "√" : "×");
|
|
|
+ params.put("${jgxA}", info.getJgxA().equals("1") ? "√" : "×");
|
|
|
+ params.put("${jgxB}", info.getJgxB().equals("1") ? "√" : "×");
|
|
|
+ params.put("${jgxC}", info.getJgxC().equals("1") ? "√" : "×");
|
|
|
+ params.put("${qdzzA}", info.getQdzzA().equals("1") ? "√" : "×");
|
|
|
+ params.put("${cdgA}", info.getCdgA().equals("1") ? "√" : "×");
|
|
|
+ params.put("${cdgB}", info.getCdgB().equals("1") ? "√" : "×");
|
|
|
+ params.put("${cdgC}", info.getCdgC().equals("1") ? "√" : "×");
|
|
|
+ params.put("${gbA}", info.getGbA().equals("1") ? "√" : "×");
|
|
|
+ params.put("${ctztA}", info.getCtztA().equals("1") ? "√" : "×");
|
|
|
+ params.put("${ctmtztA}", info.getCtmtztA().equals("1") ? "√" : "×");
|
|
|
+ params.put("${hjkztA}", info.getHjkztA().equals("1") ? "√" : "×");
|
|
|
+ params.put("${zcjyzztA}", info.getZcjyzztA().equals("1") ? "√" : "×");
|
|
|
+ params.put("${yxztA}", info.getYxztA().equals("1") ? "√" : "×");
|
|
|
+ params.put("${yxztB}", info.getYxztB().equals("1") ? "√" : "×");
|
|
|
+ params.put("${yxztC}", info.getYxztC().equals("1") ? "√" : "×");
|
|
|
params.put("${swyx1Lcz}", StringUtils.isNoneBlank(info.getSwyx1Lcz()) ? info.getSwyx1Lcz() : "/");
|
|
|
params.put("${swyx1Dg}", StringUtils.isNoneBlank(info.getSwyx1Dg()) ? info.getSwyx1Dg() : "/");
|
|
|
params.put("${swyx2Lcz}", StringUtils.isNoneBlank(info.getSwyx2Lcz()) ? info.getSwyx2Lcz() : "/");
|
|
|
params.put("${swyx2Dg}", StringUtils.isNoneBlank(info.getSwyx2Dg()) ? info.getSwyx2Dg() : "/");
|
|
|
params.put("${zxjl}", StringUtils.isNoneBlank(info.getZxjl()) ? info.getZxjl() : "/");
|
|
|
- params.put("${xjztA}", info.getXjztA().equals("0") ? "√" : "×");
|
|
|
- params.put("${xjztB}", info.getXjztB().equals("0") ? "√" : "×");
|
|
|
- params.put("${sdfhsyA}", info.getSdfhsyA().equals("0") ? "√" : "×");
|
|
|
- params.put("${ddfhsyA}", info.getDdfhsyA().equals("0") ? "√" : "×");
|
|
|
- params.put("${ydfhsyA}", info.getYdfhsyA().equals("0") ? "√" : "×");
|
|
|
- params.put("${kgztjdztA}", info.getKgztjdztA().equals("0") ? "√" : "×");
|
|
|
+ params.put("${xjztA}", info.getXjztA().equals("1") ? "√" : "×");
|
|
|
+ params.put("${xjztB}", info.getXjztB().equals("1") ? "√" : "×");
|
|
|
+ params.put("${sdfhsyA}", info.getSdfhsyA().equals("1") ? "√" : "×");
|
|
|
+ params.put("${ddfhsyA}", info.getDdfhsyA().equals("1") ? "√" : "×");
|
|
|
+ params.put("${ydfhsyA}", info.getYdfhsyA().equals("1") ? "√" : "×");
|
|
|
+ params.put("${kgztjdztA}", info.getKgztjdztA().equals("1") ? "√" : "×");
|
|
|
params.put("${kgztjdztDzz}", StringUtils.isNoneBlank(info.getKgztjdztDzz()) ? info.getKgztjdztDzz() : "/");
|
|
|
- params.put("${kgjgxjdztA}", info.getKgjgxjdztA().equals("0") ? "√" : "×");
|
|
|
+ params.put("${kgjgxjdztA}", info.getKgjgxjdztA().equals("1") ? "√" : "×");
|
|
|
params.put("${kgjgxjdztDzz}", StringUtils.isNoneBlank(info.getKgjgxjdztDzz()) ? info.getKgjgxjdztDzz() : "/");
|
|
|
- params.put("${sbzt}", info.getSbzt().equals("0") ? "合格" : "不合格");
|
|
|
+ params.put("${sbzt}", info.getSbzt().equals("1") ? "合格" : "不合格");
|
|
|
params.put("${jcr}", info.getJcr());
|
|
|
params.put("${qrr}", info.getQrr());
|
|
|
params.put("${czwt}", info.getCzwt());
|