From e12d82455f93ad8387c73a2ff6a817b27fea41a9 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Mon, 1 Sep 2025 10:17:11 +0800 Subject: [PATCH] commit --- .../zc/controller/ZgfwGdzcbgController.java | 42 ++++++++++-------- .../zc/controller/ZgfwZcTzglController.java | 43 ++++++++++++------- .../zc/controller/ZgfwZcZhcxController.java | 22 +++++----- 3 files changed, 62 insertions(+), 45 deletions(-) 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 7964c77..4c966ab 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 @@ -80,11 +80,13 @@ public class ZgfwGdzcbgController { @Ok("json") @RequiresPermissions("zc.bg") public Object data(PageForm page, - Integer isPd, - String zcpdid, - String zcghlx, - String unionid, - String zcgzrq, String zclydwh, String zcrksj) { + @Param(value = "isPd", required = false) Integer isPd, + @Param(value = "zcpdid", required = false) String zcpdid, + @Param(value = "zcghlx", required = false) String zcghlx, + @Param(value = "unionid", required = false) String unionid, + @Param(value = "zcgzrq", required = false) String zcgzrq, + @Param(value = "zclydwh", required = false) String zclydwh, + @Param(value = "zcrksj", required = false) String zcrksj) { try { Sql sql = Sqls.create(""" SELECT @@ -101,29 +103,31 @@ public class ZgfwGdzcbgController { LEFT JOIN sys_user jsrur ON zc.zcjsrid = jsrur.id LEFT JOIN sys_union ut ON ut.`id` = zc.zclydwh $condition """).setParam("zcpdid", zcpdid); - CndPlus cndPlus = CndPlus.create(); + Cnd cnd = Cnd.NEW(); if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) { - cndPlus.andEx("zc.zcghlx", "=", "1"); - cndPlus.andEx("zc.zclydwhid", "=", Vi.getUnionId()); + cnd.andEX("zc.zcghlx", "=", "1"); + cnd.andEX("zc.zclydwhid", "=", Vi.getUnionId()); } else { // cndPlus.andExcludeEmpty("zc.zcghlx", "=", "2"); } - cndPlus.andEx("zc.zclydwhid", "=", unionid); - cndPlus.andEx(page.getSearchName(), "like", "%" + page.getSearchKeyword() + "%"); - cndPlus.andEx("zc.zcghlx", "=", zcghlx); - cndPlus.andEx("zc.zcgzrq", "=", zcgzrq); - cndPlus.andEx("zc.zclydwh", "=", zclydwh); - cndPlus.andEx("zc.zcrksj", "=", zcrksj); + if (Strings.isNotBlank(page.getSearchName()) && Strings.isNotBlank(page.getSearchKeyword())) { + cnd.and(Cnd.likeEX(page.getSearchName(), page.getSearchKeyword())); + } + cnd.andEX("zc.zclydwhid", "=", unionid); + cnd.andEX("zc.zcghlx", "=", zcghlx); + cnd.andEX("zc.zcgzrq", "=", zcgzrq); + cnd.andEX("zc.zclydwh", "=", zclydwh); + cnd.andEX("zc.zcrksj", "=", zcrksj); if (isPd != 0) { - cndPlus.and("( SELECT COUNT(*) FROM zgfw_zcxx_bdxx WHERE pdPlanId = '%s' AND zcid = zc.zcid )".formatted(zcpdid), isPd == 1 ? ">=" : "<", 1); + cnd.and("( SELECT COUNT(*) FROM zgfw_zcxx_bdxx WHERE pdPlanId = '%s' AND zcid = zc.zcid )".formatted(zcpdid), isPd == 1 ? ">=" : "<", 1); } if (StrUtil.isNotBlank(page.getPageOrderName()) && StrUtil.isNotBlank(page.getPageOrderBy())) { - cndPlus.orderBy(page.getPageOrderName(), page.getPageOrderBy().equals("desc") ? "desc" : "asc"); + cnd.orderBy(page.getPageOrderName(), page.getPageOrderBy().equals("desc") ? "desc" : "asc"); } else { - cndPlus.desc("zc.zcghlx").asc("zc.contentCode").asc("zc.zcgzrq"); + cnd.desc("zc.zcghlx").asc("zc.contentCode").asc("zc.zcgzrq"); } - cndPlus.groupBy("zc.zcid"); - sql.setCondition(cndPlus); + cnd.groupBy("zc.zcid"); + sql.setCondition(cnd); Pagination pagination = zgfwZcxxService.listPageMap(page.getPageNumber(), page.getPageSize(), sql); return Result.success().addData(pagination); } catch (Exception e) { diff --git a/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwZcTzglController.java b/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwZcTzglController.java index 3613cb4..47c8ac7 100644 --- a/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwZcTzglController.java +++ b/src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwZcTzglController.java @@ -24,8 +24,10 @@ import org.nutz.dao.entity.Record; import org.nutz.dao.sql.Sql; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Strings; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; import org.nutz.trans.Trans; import javax.servlet.http.HttpServletResponse; @@ -59,8 +61,17 @@ public class ZgfwZcTzglController { @At @ViReturn - public Object data(PageForm pageForm, String searchName, String searchKeyword, String zcghlx, - String zcgzrq, String zclydwh, String zcrksj, String unionid, String pageOrderName, String pageOrderBy, String contentCode) { + public Object data(PageForm pageForm, + @Param(value = "searchName", required = false) String searchName, + @Param(value = "searchKeyword", required = false) String searchKeyword, + @Param(value = "zcghlx", required = false) String zcghlx, + @Param(value = "zcgzrq", required = false) String zcgzrq, + @Param(value = "zclydwh", required = false) String zclydwh, + @Param(value = "zcrksj", required = false) String zcrksj, + @Param(value = "unionid", required = false) String unionid, + @Param(value = "pageOrderName", required = false) String pageOrderName, + @Param(value = "pageOrderBy", required = false) String pageOrderBy, + @Param(value = "contentCode", required = false) String contentCode) { Sql sql = Sqls.create(""" SELECT xx.* @@ -68,24 +79,26 @@ public class ZgfwZcTzglController { `zgfw_zcxx` xx $condition """); - CndPlus cndPlus = CndPlus.create(); + Cnd cnd = Cnd.NEW(); if (!ShiroUtil.hasAnyRoles("sysadmin")) { - cndPlus.andEx("xx.zcghlx", "=", "1"); - cndPlus.andEx("xx.zclydwhid", "=", Vi.getUnionId()); + cnd.andEX("xx.zcghlx", "=", "1"); + cnd.andEX("xx.zclydwhid", "=", Vi.getUnionId()); } - cndPlus.andEx(searchName, "like", "%" + searchKeyword + "%"); - cndPlus.andEx("xx.contentCode", "=", contentCode); - cndPlus.andEx("xx.zcghlx", "=", zcghlx); - cndPlus.andEx("xx.zcgzrq", "=", zcgzrq); - cndPlus.andEx("xx.zclydwh", "=", zclydwh); - cndPlus.andEx("xx.zcrksj", "=", zcrksj); - cndPlus.andEx("xx.zclydwhid", "=", unionid); + if (Strings.isNotBlank(searchName) && Strings.isNotBlank(searchKeyword)) { + cnd.and(Cnd.likeEX(searchName, searchKeyword)); + } + cnd.andEX("xx.contentCode", "=", contentCode); + cnd.andEX("xx.zcghlx", "=", zcghlx); + cnd.andEX("xx.zcgzrq", "=", zcgzrq); + cnd.andEX("xx.zclydwh", "=", zclydwh); + cnd.andEX("xx.zcrksj", "=", zcrksj); + cnd.andEX("xx.zclydwhid", "=", unionid); if (StrUtil.isNotBlank(pageOrderName) && StrUtil.isNotBlank(pageOrderBy)) { - cndPlus.orderBy(pageOrderName, pageOrderBy.equals("desc") ? "desc" : "asc"); + cnd.orderBy(pageOrderName, pageOrderBy.equals("desc") ? "desc" : "asc"); } else { - cndPlus.desc("xx.zcghlx"); + cnd.desc("xx.zcghlx"); } - sql.setCondition(cndPlus); + sql.setCondition(cnd); Pagination pagination = zgfwZcxxService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); return Result.success().addData(pagination); } 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 5b1f7d6..3efb94c 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 @@ -68,23 +68,23 @@ public class ZgfwZcZhcxController { LEFT JOIN `user` us ON us.loginname = xx.zclyrgh $condition """); - CndPlus cndPlus = CndPlus.create(); - cndPlus.andEx(searchName, "like", "%" + searchKeyword + "%"); - cndPlus.andEx("xx.zczt", "=", zczt); - cndPlus.andEx("xx.zcghlx", "=", zcghlx); - cndPlus.andEx("xx.zczt", "=", zczt); - cndPlus.andEx("xx.zcrksj", "=", zcrksj); - cndPlus.andEx("us.unionid", "=", ghid); + Cnd cnd = Cnd.NEW(); + cnd.andEX(searchName, "like", "%" + searchKeyword + "%"); + cnd.andEX("xx.zczt", "=", zczt); + cnd.andEX("xx.zcghlx", "=", zcghlx); + cnd.andEX("xx.zczt", "=", zczt); + cnd.andEX("xx.zcrksj", "=", zcrksj); + cnd.andEX("us.unionid", "=", ghid); if (StrUtil.isNotBlank(pageOrderName) && StrUtil.isNotBlank(pageOrderBy)) { - cndPlus.orderBy(pageOrderName, pageOrderBy.equals("desc") ? "desc" : "asc"); + cnd.orderBy(pageOrderName, pageOrderBy.equals("desc") ? "desc" : "asc"); } else { - cndPlus.desc("xx.zcghlx"); + cnd.desc("xx.zcghlx"); } if (StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) { - cndPlus.and(Cnd.cri().where().andBetween("zcgzrq", startTime, endTime)); + cnd.and(Cnd.cri().where().andBetween("zcgzrq", startTime, endTime)); } - sql.setCondition(cndPlus); + sql.setCondition(cnd); Pagination pagination = zgfwZcxxService.listPageMap(pageNumber, pageSize, sql); return Result.success().addData(pagination); }