diff --git a/src/main/java/com/budwk/app/zhgh/user/childManage/controller/ChildManageManageController.java b/src/main/java/com/budwk/app/zhgh/user/childManage/controller/ChildManageManageController.java index 831abc84..967f99ef 100644 --- a/src/main/java/com/budwk/app/zhgh/user/childManage/controller/ChildManageManageController.java +++ b/src/main/java/com/budwk/app/zhgh/user/childManage/controller/ChildManageManageController.java @@ -65,6 +65,7 @@ public class ChildManageManageController { Integer year, String searchName, String searchKeyword, + String childrenName, String childrenSex, String unionId, String unitId, @@ -100,7 +101,10 @@ public class ChildManageManageController { cnd.and(Cnd.exps("info.guardianUnitId1", "=", unitId) .or("info.guardianUnitId2", "=", unitId)); } - + // 姓名筛选 + if (childrenName != null && !childrenName.isEmpty()) { + cnd.and("info.childrenName", "like","%" + childrenName + "%" ); + } cnd.andEX("YEAR(info.applyTime)", "=", year); cnd.andEX("info.childrenSex", "=", childrenSex); cnd.andEX("info.childrenGrade", "=", childrenGrade); diff --git a/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageManageController.java b/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageManageController.java new file mode 100644 index 00000000..bdade995 --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageManageController.java @@ -0,0 +1,20 @@ +package com.budwk.app.zhgh.user.childManage.h5controller; + + +import cn.dev33.satoken.annotation.SaCheckPermission; +import lombok.extern.slf4j.Slf4j; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +@IocBean +@At("/platform/h5/childManage/manage") +@Ok("json:full") +@Slf4j +public class H5ChildManageManageController { + + @At("") + @Ok("beetl:/platform/zhghh5/staffmanage/childManage/manage/index.html") + @SaCheckPermission("h5.childManage.manage") + public void index() {} +} diff --git a/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageMineController.java b/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageMineController.java new file mode 100644 index 00000000..21e08a3a --- /dev/null +++ b/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageMineController.java @@ -0,0 +1,40 @@ +package com.budwk.app.zhgh.user.childManage.h5controller; + + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.budwk.app.base.annotation.SLog; +import com.budwk.app.base.page.Pagination; +import com.budwk.app.base.param.PageForm; +import com.budwk.app.base.result.Result; +import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.user.childManage.models.ChildManage; +import com.budwk.app.zhgh.user.childManage.service.ChildManageService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.dao.Cnd; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.aop.Aop; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; + +@IocBean +@At("/platform/h5/childManage/mine") +@Ok("json:full") +@Slf4j +public class H5ChildManageMineController { + + @Inject + private ChildManageService childManageService; + + @At("") + @Ok("beetl:/platform/zhghh5/staffmanage/childManage/mine/index.html") + @SaCheckPermission("h5.childManage.mine") + public void index() {} + + +} diff --git a/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageController.java b/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageWriteController.java similarity index 61% rename from src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageController.java rename to src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageWriteController.java index d73fd701..edda5d8f 100644 --- a/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageController.java +++ b/src/main/java/com/budwk/app/zhgh/user/childManage/h5controller/H5ChildManageWriteController.java @@ -2,6 +2,8 @@ package com.budwk.app.zhgh.user.childManage.h5controller; import cn.dev33.satoken.annotation.SaCheckPermission; import lombok.extern.slf4j.Slf4j; +import org.nutz.dao.Dao; +import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; @@ -16,12 +18,13 @@ import org.nutz.mvc.annotation.Ok; @Slf4j @IocBean @Ok("json") -@At("/platform/childManage/manage/h5") -public class H5ChildManageController { +@At("/platform/h5/childManage/write") +public class H5ChildManageWriteController { @At("") - @Ok("beetl:/platform/zhghh5/staffmanage/childmanage/") - @SaCheckPermission("h5.childManage") + @Ok("beetl:/platform/zhghh5/staffmanage/childManage/write/index.html") + @SaCheckPermission("h5.childManage.write") public void index() { } + } diff --git a/src/main/resources/views/platform/zhghh5/enrollmentRegistration/mine/index.html b/src/main/resources/views/platform/zhghh5/enrollmentRegistration/mine/index.html index b108156a..d960f51d 100644 --- a/src/main/resources/views/platform/zhghh5/enrollmentRegistration/mine/index.html +++ b/src/main/resources/views/platform/zhghh5/enrollmentRegistration/mine/index.html @@ -12,7 +12,6 @@ layout("/layouts/platform_h5.html"){ -