From b45d6f1a8822005f06d019df051cdfc8d0d4735e Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Wed, 3 Sep 2025 09:51:38 +0800 Subject: [PATCH] commit --- .../zc/controller/ZgfwGdzcbgController.java | 15 ++++++--------- .../zc/controller/ZgfwZcZhcxController.java | 4 +++- src/main/resources/templates/zc/pdHz.xlsx | Bin 0 -> 11554 bytes 3 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/templates/zc/pdHz.xlsx diff --git a/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwGdzcbgController.java b/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwGdzcbgController.java index 4c966ab..9358aae 100644 --- a/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwGdzcbgController.java +++ b/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwGdzcbgController.java @@ -292,16 +292,17 @@ public class ZgfwGdzcbgController { bd.pdzt, bd.wpdzt, bd.zczt, - it.name unitname, + it.NAME unitname, bd.zcFile FROM - zgfw_zcxx zc - LEFT JOIN zgfw_zcxx_bdxx bd ON bd.zcid=zc.zcid AND bd.pdPlanId=@zcpdid - left join sys_unit it on it.id=zc.zclydwhid - LEFT JOIN `user` u ON u.id=bd.zcbdshrid + zgfw_zcxx_bdxx bd + LEFT JOIN zgfw_zcxx zc ON bd.zcid = zc.zcid + LEFT JOIN sys_unit it ON it.id = zc.zclydwhid + LEFT JOIN `user` u ON u.id = bd.zcbdshrid $condition """).setParam("zcpdid", zcpdid); Cnd cnd = Cnd.NEW(); + cnd.andEX("bd.pdPlanId", "=", zcpdid); if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { /*if (ShiroUtil.hasRole("H04")) { cnd.andEX("zc.zcghlx", "=", "1"); @@ -337,15 +338,12 @@ public class ZgfwGdzcbgController { } else { maps.get(i).put("img", null); } - - } map.put("maplist", maps); map.put("applyDate", DateUtil.format(new Date(), "yyyy年MM月dd日")); if (Lang.isNotEmpty(maps)) { map.put("unitname", unitname); } - String templateUrl = "templates/zc/pdHz.xlsx"; response.setContentType("application/octet-stream"); ViTool.excelResponse(response, "杭州医学院固定资产盘点汇总表.xlsx"); @@ -356,7 +354,6 @@ public class ZgfwGdzcbgController { } catch (Exception e) { e.printStackTrace(); } - } diff --git a/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwZcZhcxController.java b/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwZcZhcxController.java index 3efb94c..734b804 100644 --- a/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwZcZhcxController.java +++ b/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwZcZhcxController.java @@ -69,7 +69,9 @@ public class ZgfwZcZhcxController { $condition """); Cnd cnd = Cnd.NEW(); - cnd.andEX(searchName, "like", "%" + searchKeyword + "%"); + if (Strings.isNotBlank(searchName) && Strings.isNotBlank(searchKeyword)) { + cnd.and(searchName, "like", "%" + searchKeyword + "%"); + } cnd.andEX("xx.zczt", "=", zczt); cnd.andEX("xx.zcghlx", "=", zcghlx); cnd.andEX("xx.zczt", "=", zczt); diff --git a/src/main/resources/templates/zc/pdHz.xlsx b/src/main/resources/templates/zc/pdHz.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..c5404e48ba4672bcbd138ef88f348606afbefc0a GIT binary patch literal 11554 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 literal 0 HcmV?d00001