init

src/main/java/io/v/nutz/zhgh/ry/controller/Rygl_CareDataControoler.java

@@ -0,0 +1,85 @@
+package io.v.nutz.zhgh.ry.controller;
+
+import io.v.nutz.zhgh.ry.service.RyRygl_grServcie;
+import io.v.nutz.zhgh.ry.service.RyRygl_jtService;
+import io.v.nutz.sys.models.Sys_user;
+import io.v.nutz.sys.services.SysUserService;
+import cn.wizzer.framework.base.Result;
+import org.nutz.dao.Sqls;
+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.log.Log;
+import org.nutz.log.Logs;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+import java.util.List;
+
+/**
+ * hpf
+ * 荣誉时间线
+ * 14:37 2020/10/23
+ */
+@At("/platfotm/ry/ryyear")
+@IocBean
+@Ok("json:full")
+public class Rygl_CareDataControoler {
+
+    private static final Log log = Logs.get();
+
+    @Inject
+    private RyRygl_jtService ryRygl_jtService;
+
+    @Inject
+    private RyRygl_grServcie ryRygl_grServcie;
+
+    @Inject
+    private SysUserService sysUserService;
+
+    @At("")
+    @Ok("beetl:/platform/ry/ryCareData.html")
+    public void index(){
+
+    }
+
+    @At
+    public Object timeLine(String userid, String type, Boolean desc, String startTime, String endTime) {
+        try {
+            Sys_user user = sysUserService.fetch(userid);
+            Sql sql = Sqls.create("SELECT * from (\n" +
+                    "SELECT id,sqsj time,'jdhxj' type FROM ry_rygl_jt  WHERE jtlx='1' \n" +
+                    "union all \n" +
+                    "SELECT id,sqsj time,'gzxj' type FROM ry_rygl_jt  WHERE jtlx='2' \n" +
+                    "union all\n" +
+                    "SELECT id,sqsj time,'grxj' type FROM ry_rygl_gr  WHERE jtlx='1' \n" +
+                    "union all\n" +
+                    "SELECT id,sqsj time,'grjj' type FROM ry_rygl_gr  WHERE jtlx='2' \n" +
+                    ") tab WHERE 1=1 $type $year\n" +
+                    "ORDER BY tab.time  $order");
+            if (Strings.isNotBlank(type) && !type.equals("all")) {
+                sql.setVar("type", "AND tab.type = '" + type + "'");
+            }
+            if (Strings.isNotBlank(startTime) && Strings.isNotBlank(endTime)) {
+                sql.setVar("year", "AND tab.time >= '" + startTime + "' AND tab.time <= '" + endTime + "'");
+            }
+
+            if (desc == null || desc) {
+                sql.setVar("order", "desc");
+            } else {
+                sql.setVar("order", "asc");
+            }
+
+
+
+            List<Record> list = sysUserService.list(sql);
+
+            return Result.success().addData(list);
+        } catch (Exception e) {
+            log.error(e);
+            return Result.error();
+        }
+    }
+}

src/main/java/io/v/nutz/zhgh/ry/controller/Rygl_fxController.java

@@ -0,0 +1,61 @@
+package io.v.nutz.zhgh.ry.controller;
+
+import io.v.nutz.zhgh.ry.service.RyRygl_grServcie;
+import io.v.nutz.zhgh.ry.service.RyRygl_jtService;
+import io.v.nutz.base.annontation.ViReturn;
+import org.nutz.dao.Sqls;
+import org.nutz.dao.entity.Record;
+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;
+import org.nutz.mvc.annotation.Param;
+
+import java.util.List;
+
+/**
+ * @Author:zxy
+ * @Description:
+ * @Date:Created in 17:21 2020/10/23
+ */
+@At("/platfotm/ry/ryfx")
+@IocBean
+@Ok("json:full")
+public class Rygl_fxController {
+
+    @At("")
+    @Ok("beetl:/platform/ry/ryfx.html")
+    public void index(){
+
+    }
+
+    @Inject
+    private RyRygl_grServcie ryRygl_grServcie;
+
+    @Inject
+    private RyRygl_jtService ryRygl_jtService;
+
+
+
+    @At
+    @ViReturn
+    public Object data(@Param(value = "year",required = false) String year,@Param(value = "jtlx",required = false) String jtlx){
+
+        List<Record> ghxj = ryRygl_grServcie.list(Sqls.create("SELECT COUNT(*) VALUE,'工会工作先进工作者' NAME FROM ry_rygl_gr WHERE jtlx='1' and sqsj like '%"+year+"%'"));
+        List<Record> ghjj = ryRygl_grServcie.list(Sqls.create("SELECT COUNT(*) VALUE,'工会工作积极分子' NAME FROM ry_rygl_gr WHERE jtlx='2' and sqsj like '%"+year+"%'"));
+        List<Record> jdhxj = ryRygl_grServcie.list(Sqls.create("SELECT COUNT(*) VALUE,'教代会工作先进单位' NAME FROM ry_rygl_jt WHERE jtlx='1' and sqsj like '%"+year+"%'"));
+        List<Record> dwxj = ryRygl_grServcie.list(Sqls.create("SELECT COUNT(*) VALUE,'工会工作先进单位' NAME FROM ry_rygl_jt WHERE jtlx='2' and sqsj like '%"+year+"%'"));
+
+        ghxj.addAll(ghjj);
+        ghxj.addAll(jdhxj);
+        ghxj.addAll(dwxj);
+
+
+        return ghxj;
+    }
+
+
+
+
+
+}

src/main/java/io/v/nutz/zhgh/ry/controller/Rygl_jhController.java

@@ -0,0 +1,107 @@
+package io.v.nutz.zhgh.ry.controller;
+
+import io.v.nutz.zhgh.ry.model.Ry_rygl_plan;
+import io.v.nutz.base.annontation.ViReturn;
+import cn.wizzer.framework.base.Result;
+import cn.wizzer.framework.base.service.BaseService;
+import org.nutz.dao.Chain;
+import org.nutz.dao.Cnd;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.random.R;
+import org.nutz.mvc.annotation.At;
+import org.nutz.mvc.annotation.Ok;
+
+/**
+ * 评选计划管理
+ * hpf
+ * 10:27 2020/10/23
+ */
+@At("/platfotm/ry/pxjh")
+@IocBean
+@Ok("json:full")
+public class Rygl_jhController {
+
+    @At("")
+    @Ok("beetl:/platform/ry/plan.html")
+    public void index(){
+
+    }
+
+    @Inject
+    private BaseService baseService;
+
+
+
+    @At
+    @ViReturn
+    public Object data(Integer pageNumber,Integer pageSize){
+        Cnd cnd = Cnd.NEW();
+
+        return baseService.listPage(pageNumber, pageSize,"ry_rygl_plan",cnd);
+    }
+
+    @At
+    @ViReturn
+    public Object doAdd(Ry_rygl_plan ry_rygl_plan){
+        Cnd cexist = Cnd.where("planyear", "=", ry_rygl_plan.getPlanyear()).and("planlx", "=", ry_rygl_plan.getPlanlx());
+        int existCount = baseService.count("ry_rygl_plan",cexist);
+        if(existCount>0){
+            return Result.success().addCode(2).addMsg("本年度该计划已经创建！");
+        }
+        ry_rygl_plan.setId(R.UU32());
+        baseService.insert("ry_rygl_plan", Chain.from(ry_rygl_plan));
+        return Result.success();
+    }
+
+    @At
+    @Ok("json")
+    public Object planztChange(String id,boolean plankqzt){
+        try{
+            Chain chain = Chain.make("plankqzt",!plankqzt);
+            baseService.update("ry_rygl_plan",chain,Cnd.where("id","=",id));
+            return Result.success().addMsg("修改成功!");
+        }catch (Exception e){
+            return Result.error();
+        }
+    }
+
+    @At("/doEdit")
+    @Ok("json")
+    public Object doEdit(Ry_rygl_plan ry_rygl_plan){
+        try{
+            Cnd cexist = Cnd.where("planyear", "=", ry_rygl_plan.getPlanyear()).and("planlx", "=", ry_rygl_plan.getPlanlx()).andNot("id","=",ry_rygl_plan.getId());
+            int existCount = baseService.count("ry_rygl_plan",cexist);
+            if(existCount>0){
+                return Result.success().addCode(2).addMsg("本年度该计划已经创建！");
+            }
+            baseService.update("ry_rygl_plan", Chain.from(ry_rygl_plan),Cnd.where("id","=",ry_rygl_plan.getId()));
+            return Result.success().addMsg("修改成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            return Result.error();
+        }
+    }
+
+    @At("/findOne")
+    @Ok("json:full")
+    public Object findOne(String id){
+        try{
+            return Result.success().addData(baseService.dao().fetch(Ry_rygl_plan.class,Cnd.where("id","=",id)));
+        }catch (Exception e){
+            return Result.error();
+        }
+    }
+
+    @At("/doDelete")
+    @Ok("json:full")
+    public Object doDelete(String id){
+        try{
+            baseService.clear("ry_rygl_plan",Cnd.where("id","=",id));
+            return Result.success().addMsg("删除成功!");
+        }catch (Exception e){
+            return Result.error();
+        }
+    }
+
+}

src/main/java/io/v/nutz/zhgh/ry/controller/Rygl_ylController.java

@@ -0,0 +1,118 @@
+package io.v.nutz.zhgh.ry.controller;
+
+import io.v.nutz.base.utils.DateUtil;
+import io.v.nutz.zhgh.proposal.models.ProposalUndertake;
+import io.v.nutz.zhgh.ry.model.Ry_rygl_gr;
+import io.v.nutz.zhgh.ry.model.Ry_rygl_jt;
+import io.v.nutz.zhgh.ry.service.RyRygl_grServcie;
+import io.v.nutz.zhgh.ry.service.RyRygl_jtService;
+import io.v.nutz.base.service.ViService;
+import io.v.nutz.sys.models.Sys_union;
+import io.v.nutz.sys.models.Sys_unit;
+import io.v.nutz.sys.services.SysUnionService;
+import io.v.nutz.sys.services.SysUnitService;
+import io.v.nutz.base.annontation.ViReturn;
+import org.nutz.dao.Cnd;
+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;
+
+/**
+ * 阅览
+ * hpf
+ */
+@At("/platfotm/ry/ryyl")
+@IocBean
+@Ok("json:full")
+public class Rygl_ylController {
+    @At("")
+    @Ok("beetl:/platform/ry/ryyl.html")
+    public void index() {
+
+    }
+
+    @Inject
+    private RyRygl_grServcie ryRygl_grService;
+
+
+    @Inject
+    private RyRygl_jtService ryRygl_jtService;
+
+    @At
+    @ViReturn
+    public Object pageData(Integer pageNumber, Integer pageSize, String year, String jtlx) {
+        Cnd cnd = Cnd.NEW();
+        if (Strings.isNotBlank(year)) {
+            cnd.and("sqsj", "like", year + "%");
+        }
+        if ("1".equals(jtlx) || "2".equals(jtlx)) {
+            cnd.and("jtlx", "=", jtlx);
+
+            cnd.desc("sqsj");
+            return ryRygl_grService.listPage(pageNumber, pageSize, cnd);
+        }
+        if ("3".equals(jtlx)) {//教代会集体
+            cnd.and("jtlx", "=", 1);
+
+            cnd.desc("sqsj");
+            return ryRygl_jtService.listPage(pageNumber, pageSize, cnd);
+        }
+        if ("4".equals(jtlx)) {//工会集体
+            cnd.and("jtlx", "=", 2);
+
+            cnd.desc("sqsj");
+            return ryRygl_jtService.listPage(pageNumber, pageSize, cnd);
+        }
+        return null;
+    }
+
+    @At
+    @ViReturn
+    public Object doDel(String id) {
+        ryRygl_jtService.delete(id);
+        ryRygl_grService.delete(id);
+        return null;
+    }
+
+    @Inject
+    private SysUnitService sysUnitService;
+
+    @At
+    @ViReturn
+    public Object doAddGr(Ry_rygl_gr ry_rygl_gr) {
+        ry_rygl_gr.setSqsj(DateUtil.getDate());
+        ry_rygl_gr.setSqzt("7");
+        if (Strings.isNotBlank(ry_rygl_gr.getUnitid())) {
+            Sys_unit sys_unit = sysUnitService.fetch(ry_rygl_gr.getUnitid());
+            ry_rygl_gr.setUnitname(sys_unit.getName());
+        }
+        ryRygl_grService.insert(ry_rygl_gr);
+        return null;
+    }
+
+    @Inject
+    private SysUnionService sysUnionService;
+
+    @Inject("ProposalUndertake")
+    private ViService<ProposalUndertake> proposalUndertakeViService;
+
+    @At
+    @ViReturn
+    public Object doAddJt(Ry_rygl_jt ry_rygl_jt) {
+        ry_rygl_jt.setSqsj(DateUtil.getDate());
+        ry_rygl_jt.setSqzt("7");
+        if (ry_rygl_jt.getJtlx().equals("1")) {
+            ProposalUndertake undertake = proposalUndertakeViService.fetch(ry_rygl_jt.getJtbmdw());
+            ry_rygl_jt.setJtbmdwname(undertake.getUnitName());
+        }
+        if (ry_rygl_jt.getJtlx().equals("2")) {
+            Sys_union sys_union = sysUnionService.fetch(ry_rygl_jt.getJtbmgh());
+            ry_rygl_jt.setJtbmghname(sys_union.getUnionname());
+        }
+        ryRygl_jtService.insert(ry_rygl_jt);
+        return null;
+    }
+
+}

src/main/java/io/v/nutz/zhgh/ry/controller/gr/Rygl_grController.java

@@ -0,0 +1,111 @@
+package io.v.nutz.zhgh.ry.controller.gr;
+
+import io.v.nutz.zhgh.ry.model.Ry_rygl_gr;
+import io.v.nutz.zhgh.ry.service.RyRygl_grServcie;
+import io.v.nutz.sys.models.Sys_unit;
+import io.v.nutz.sys.services.SysUnionService;
+import io.v.nutz.sys.services.SysUnitService;
+import io.v.nutz.base.utils.DateUtil;
+import io.v.nutz.web.commons.utils.ShiroUtil;
+import io.v.nutz.base.annontation.ViReturn;
+import org.nutz.dao.Cnd;
+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;
+
+/**
+ * 荣誉个人
+ * hpf
+ */
+@At("/platfotm/ry/gr/grsq")
+@IocBean
+@Ok("json:full")
+public class Rygl_grController {
+    @At("")
+    @Ok("beetl:/platform/ry/gr/grsq.html")
+    public void index() {
+    }
+
+    @Inject
+    private SysUnionService sysUnionService;
+
+    @Inject
+    private SysUnitService sysunitService;
+
+    @Inject
+    private RyRygl_grServcie ryRygl_grService;
+
+    @At
+    @ViReturn
+    public Object pageData(Integer pageNumber, Integer pageSize, String jtlx, String keyword, String year) {
+        try {
+            Cnd cnd = Cnd.NEW();
+            cnd.and("jtlx", "=", jtlx);
+            if (Strings.isNotBlank(year)) {
+                cnd.and("sqsj", "like", year + "%");
+            }
+            if (Strings.isNotBlank(keyword)) {
+                cnd.and("username", "like", "%" + keyword + "%");
+            }
+            if (!ShiroUtil.hasRole("sysadmin") && !ShiroUtil.hasRole("R10")) {
+                cnd.and("userid", "=", ShiroUtil.getPrincipalProperty("id"));
+            }
+            cnd.desc("sqsj");
+            return ryRygl_grService.listPage(pageNumber, pageSize, cnd);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    @At
+    @ViReturn
+    public Object doAdd(Ry_rygl_gr ry_rygl_gr) {
+        ry_rygl_gr.setSqsj(DateUtil.getDate());
+        ry_rygl_gr.setSqzt("0");
+        if (Strings.isNotBlank(ry_rygl_gr.getUnitid())) {
+            Sys_unit sys_unit = sysunitService.fetch(ry_rygl_gr.getUnitid());
+            ry_rygl_gr.setUnitname(sys_unit.getName());
+        }
+        ryRygl_grService.insert(ry_rygl_gr);
+        return null;
+    }
+
+    @At
+    @ViReturn
+    public Object doEdit(Ry_rygl_gr ry_rygl_gr) {
+        ryRygl_grService.updateIgnoreNull(ry_rygl_gr);
+        return null;
+    }
+
+    @At
+    @ViReturn
+    public Object doDel(String id) {
+        ryRygl_grService.delete(id);
+        return null;
+    }
+
+    @At
+    @ViReturn
+    public Object getUnit() {
+        return sysunitService.query(Cnd.where("unitlevel", "=", "2"));
+    }
+
+    @At
+    @ViReturn
+    public Object getUser() {
+
+        return ShiroUtil.getPrincipal();
+    }
+
+    @At
+    @ViReturn
+    public Object tj(Ry_rygl_gr ry_rygl_gr) {
+        ry_rygl_gr.setSqzt("1");
+        ryRygl_grService.updateIgnoreNull(ry_rygl_gr);
+        return null;
+    }
+
+}

src/main/java/io/v/nutz/zhgh/ry/controller/jt/Rygl_jtController.java

@@ -0,0 +1,133 @@
+package io.v.nutz.zhgh.ry.controller.jt;
+
+import io.v.nutz.base.utils.Roles;
+import io.v.nutz.zhgh.proposal.models.ProposalUndertake;
+import io.v.nutz.zhgh.ry.model.Ry_rygl_jt;
+import io.v.nutz.zhgh.ry.service.RyRygl_jtService;
+import io.v.nutz.base.service.ViService;
+import io.v.nutz.sys.models.Sys_union;
+import io.v.nutz.sys.services.SysUnionService;
+import io.v.nutz.sys.services.SysUnitService;
+import io.v.nutz.base.utils.DateUtil;
+import io.v.nutz.web.commons.utils.ShiroUtil;
+import io.v.nutz.base.annontation.ViReturn;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.Sqls;
+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;
+
+/**
+ * 荣誉集体
+ * hpf
+ */
+@At("/platfotm/ry/jt/jtsq")
+@IocBean
+@Ok("json:full")
+public class Rygl_jtController {
+
+    @At("")
+    @Ok("beetl:/platform/ry/jt/jtsq.html")
+    public void index() {
+
+    }
+
+    @Inject
+    private SysUnionService sysUnionService;
+
+    @Inject
+    private SysUnitService sysunitService;
+
+    @Inject
+    private RyRygl_jtService ryRygl_jtService;
+
+    @At
+    @ViReturn
+    public Object pageData(Integer pageNumber, Integer pageSize, String jtlx, String searchName, String keyword, String year) {
+        try {
+            Cnd cnd = Cnd.NEW();
+            cnd.and("jtlx", "=", jtlx);
+            if (Strings.isNotBlank(year)) {
+                cnd.and("sqsj", "like", year + "%");
+            }
+            if (Strings.isNotBlank(keyword) && Strings.isNotBlank(searchName)) {
+                cnd.and(searchName, "like", "%" + keyword + "%");
+            }
+            if (!ShiroUtil.hasRole("sysadmin") && !ShiroUtil.hasRole("R10")) {
+                cnd.and("jtbmgh", "=", ShiroUtil.getPrincipalProperty("unionid"));
+            }
+            cnd.desc("sqsj");
+            return ryRygl_jtService.listPage(pageNumber, pageSize, cnd);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    @At
+    @ViReturn
+    public Object doAdd(Ry_rygl_jt ry_rygl_jt) {
+        ry_rygl_jt.setSqsj(DateUtil.getDate());
+        ry_rygl_jt.setSqzt("0");
+        if (ry_rygl_jt.getJtlx().equals("1")) {
+            ProposalUndertake undertake = proposalUndertakeViService.fetch(ry_rygl_jt.getJtbmdw());
+            ry_rygl_jt.setJtbmdwname(undertake.getUnitName());
+        }
+        if (ry_rygl_jt.getJtlx().equals("2")) {
+            Sys_union sys_union = sysUnionService.fetch(ry_rygl_jt.getJtbmgh());
+            ry_rygl_jt.setJtbmghname(sys_union.getUnionname());
+        }
+        ryRygl_jtService.insert(ry_rygl_jt);
+        return null;
+    }
+
+    @At
+    @ViReturn
+    public Object doEdit(Ry_rygl_jt ry_rygl_jt) {
+        ryRygl_jtService.updateIgnoreNull(ry_rygl_jt);
+        return null;
+    }
+
+    @At
+    @ViReturn
+    public Object doDel(String id) {
+        ryRygl_jtService.delete(id);
+        return null;
+    }
+
+    @Inject("ProposalUndertake")
+    private ViService<ProposalUndertake> proposalUndertakeViService;
+
+    @At
+    @ViReturn
+    public Object getUnit() {
+        return proposalUndertakeViService.query(Cnd.where("isEnable", "=", 1).asc("unitCode"));
+    }
+
+    @At
+    @ViReturn
+    public Object tj(Ry_rygl_jt ry_rygl_jt) {
+        ry_rygl_jt.setSqzt("3");
+        ryRygl_jtService.updateIgnoreNull(ry_rygl_jt);
+        return null;
+    }
+
+    @At
+    @ViReturn
+    public Object unitOrUnionLeaderInfo(String unitId, boolean isUnit) {
+        Sql sql = Sqls.create("""
+                SELECT
+                	u.username,
+                	u.mobile
+                FROM
+                	sys_user_role sur
+                	LEFT JOIN sys_user u ON sur.userId = u.id
+                WHERE
+                	sur.$field = @id and sur.roleId = @role
+                """).setVar("field", isUnit ? "cbdwid" : "unionid").setParam("id", unitId).setParam("role", isUnit ? Roles.CONTRACTOR_PERSON : Roles.UNION_MANGER);
+        return proposalUndertakeViService.fetch(sql);
+    }
+}

src/main/java/io/v/nutz/zhgh/ry/controller/sh/Rygl_bmghShController.java

@@ -0,0 +1,62 @@
+package io.v.nutz.zhgh.ry.controller.sh;
+
+import io.v.nutz.zhgh.ry.model.Ry_rygl_gr;
+import io.v.nutz.zhgh.ry.service.RyRygl_grServcie;
+import io.v.nutz.base.utils.DateUtil;
+import io.v.nutz.web.commons.utils.ShiroUtil;
+import io.v.nutz.base.annontation.ViReturn;
+import org.nutz.dao.Cnd;
+import org.nutz.dao.util.cri.Static;
+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;
+
+/**
+ * 部门工会审核
+ * hpf
+ */
+@At("/platfotm/ry/sh/bmghsh")
+@IocBean
+@Ok("json:full")
+public class Rygl_bmghShController {
+
+    @At("")
+    @Ok("beetl:/platform/ry/sh/bmghsh.html")
+    public void index() {
+    }
+
+    @Inject
+    private RyRygl_grServcie ryRygl_grService;
+
+    @At
+    @ViReturn
+    public Object pageData(Integer pageNumber, Integer pageSize, String keyword, String jtlx, String year) {
+        Cnd cnd = Cnd.NEW();
+        cnd.and("sqzt", ">=", "1");
+        cnd.and("jtlx", "=", jtlx);
+        if (Strings.isNotBlank(keyword)) {
+            cnd.and("username", "like", "%" + keyword + "%");
+        }
+        if (Strings.isNotBlank(year)) {
+            cnd.and("sqsj", "like", year + "%");
+        }
+        if (!ShiroUtil.hasRole("sysadmin") && !ShiroUtil.hasRole("R10")) {
+            cnd.and(new Static("unitid in (SELECT id FROM sys_unit WHERE unionid='" + ShiroUtil.getPrincipalProperty("unionid") + "')"));
+        }
+        cnd.desc("sqsj");
+        return ryRygl_grService.listPage(pageNumber, pageSize, cnd);
+    }
+
+    @At
+    @ViReturn
+    public Object doEdit(Ry_rygl_gr ry_rygl_gr) {
+        ry_rygl_gr.setBmghshr(ShiroUtil.getPrincipalProperty("username").toString());
+        ry_rygl_gr.setBmghshsj(DateUtil.getDate());
+        ryRygl_grService.updateIgnoreNull(ry_rygl_gr);
+        return null;
+    }
+
+
+}

src/main/java/io/v/nutz/zhgh/ry/controller/sh/Rygl_xghshController.java

@@ -0,0 +1,81 @@
+package io.v.nutz.zhgh.ry.controller.sh;
+
+import io.v.nutz.zhgh.ry.model.Ry_rygl_gr;
+import io.v.nutz.zhgh.ry.model.Ry_rygl_jt;
+import io.v.nutz.zhgh.ry.service.RyRygl_grServcie;
+import io.v.nutz.zhgh.ry.service.RyRygl_jtService;
+import io.v.nutz.base.utils.DateUtil;
+import io.v.nutz.web.commons.utils.ShiroUtil;
+import io.v.nutz.base.annontation.ViReturn;
+import org.nutz.dao.Cnd;
+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;
+
+/**
+ * 校工会审核
+ * hpf
+ */
+@At("/platfotm/ry/sh/xghsh")
+@IocBean
+@Ok("json:full")
+public class Rygl_xghshController {
+    @At("")
+    @Ok("beetl:/platform/ry/sh/xghsh.html")
+    public void index(){
+
+    }
+
+    @Inject
+    private RyRygl_grServcie ryRygl_grService;
+
+
+
+    @Inject
+    private RyRygl_jtService ryRygl_jtService;
+
+    @At
+    @ViReturn
+    public Object pageData(Integer pageNumber,Integer pageSize,String year,String jtlx){
+        Cnd cnd=Cnd.NEW();
+        cnd.and("sqzt",">=","5");
+        if (Strings.isNotBlank(year)){
+            cnd.and("sqsj","like",year+"%");
+        }
+        if ("1".equals(jtlx)||"2".equals(jtlx)){
+            cnd.and("jtlx","=",jtlx);
+
+
+            cnd.desc("sqsj");
+            return ryRygl_grService.listPage(pageNumber,pageSize,cnd);
+        }
+        if ("3".equals(jtlx)){//教代会集体
+            cnd.and("jtlx","=",1);
+
+            cnd.desc("sqsj");
+            return ryRygl_jtService.listPage(pageNumber,pageSize,cnd);
+        }
+        if ("4".equals(jtlx)){//工会集体
+            cnd.and("jtlx","=",2);
+
+            cnd.desc("sqsj");
+            return ryRygl_jtService.listPage(pageNumber,pageSize,cnd);
+        }
+        return null;
+    }
+
+    @At
+    @ViReturn
+    public Object doEdit(Ry_rygl_gr ry_rygl_gr,Ry_rygl_jt ry_rygl_jt){
+        ry_rygl_gr.setXghshr(ShiroUtil.getPrincipalProperty("username").toString());
+        ry_rygl_gr.setXghshsj(DateUtil.getDate());
+        ryRygl_grService.updateIgnoreNull(ry_rygl_gr);
+
+        ry_rygl_jt.setXghshr(ShiroUtil.getPrincipalProperty("username").toString());
+        ry_rygl_jt.setXghshsj(DateUtil.getDate());
+        ryRygl_jtService.updateIgnoreNull(ry_rygl_jt);
+        return null;
+    }
+}

src/main/java/io/v/nutz/zhgh/ry/controller/sh/Rygl_yjdzzShController.java

@@ -0,0 +1,83 @@
+package io.v.nutz.zhgh.ry.controller.sh;
+
+import io.v.nutz.zhgh.ry.model.Ry_rygl_gr;
+import io.v.nutz.zhgh.ry.model.Ry_rygl_jt;
+import io.v.nutz.zhgh.ry.service.RyRygl_grServcie;
+import io.v.nutz.zhgh.ry.service.RyRygl_jtService;
+import io.v.nutz.base.utils.DateUtil;
+import io.v.nutz.web.commons.utils.ShiroUtil;
+import io.v.nutz.base.annontation.ViReturn;
+import org.nutz.dao.Cnd;
+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;
+
+/**
+ * 院级党组织审核
+ * hpf
+ */
+@At("/platfotm/ry/sh/yjdzzsh")
+@IocBean
+@Ok("json:full")
+public class Rygl_yjdzzShController {
+
+    @At("")
+    @Ok("beetl:/platform/ry/sh/yjdzzsh.html")
+    public void index(){
+
+    }
+
+    @Inject
+    private RyRygl_grServcie ryRygl_grService;
+
+
+
+    @Inject
+    private RyRygl_jtService ryRygl_jtService;
+
+    @At
+    @ViReturn
+    public Object pageData(Integer pageNumber,Integer pageSize,String year,String jtlx){
+        Cnd cnd=Cnd.NEW();
+        cnd.and("sqzt",">=","3");
+        if (Strings.isNotBlank(year)){
+            cnd.and("sqsj","like",year+"%");
+        }
+        if ("1".equals(jtlx)||"2".equals(jtlx)){
+            cnd.and("jtlx","=",jtlx);
+
+
+            cnd.desc("sqsj");
+            return ryRygl_grService.listPage(pageNumber,pageSize,cnd);
+        }
+        if ("3".equals(jtlx)){//教代会集体
+            cnd.and("jtlx","=",1);
+
+            cnd.desc("sqsj");
+            return ryRygl_jtService.listPage(pageNumber,pageSize,cnd);
+        }
+        if ("4".equals(jtlx)){//工会集体
+            cnd.and("jtlx","=",2);
+
+            cnd.desc("sqsj");
+            return ryRygl_jtService.listPage(pageNumber,pageSize,cnd);
+        }
+        return null;
+    }
+
+    @At
+    @ViReturn
+    public Object doEdit(Ry_rygl_gr ry_rygl_gr,Ry_rygl_jt ry_rygl_jt){
+        ry_rygl_gr.setYjdzzshr(ShiroUtil.getPrincipalProperty("username").toString());
+        ry_rygl_gr.setYjdzzshsj(DateUtil.getDate());
+        ryRygl_grService.updateIgnoreNull(ry_rygl_gr);
+
+        ry_rygl_jt.setYjdzzshr(ShiroUtil.getPrincipalProperty("username").toString());
+        ry_rygl_jt.setYjdzzshsj(DateUtil.getDate());
+        ryRygl_jtService.updateIgnoreNull(ry_rygl_jt);
+        return null;
+    }
+
+}

src/main/java/io/v/nutz/zhgh/ry/model/Ry_rygl_gr.java

@@ -0,0 +1,144 @@
+package io.v.nutz.zhgh.ry.model;
+
+import cn.wizzer.framework.base.model.BaseModel;
+import io.v.nutz.sys.models.Sys_file;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.integration.json4excel.annotation.J4EIgnore;
+
+import java.io.Serializable;
+import java.util.List;
+
+/*
+ *hpf
+ *荣誉个人
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Table("Ry_rygl_gr")
+public class Ry_rygl_gr extends BaseModel implements Serializable {
+    @Column
+    @Name
+    @Comment("ID")
+    @J4EIgnore
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Prev(els = {@EL("uuid()")})
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("用户id")
+    private String userid;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("姓名")
+    private String username;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    @Comment("性别")
+    private String sex;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("出生日期")
+    private String csrq;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("工会职务")
+    private String ghzw;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("单位名称")
+    private String unitname;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("单位id")
+    private String unitid;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 500)
+    @Comment("主要先进事迹")
+    private String zyxjsj;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @Comment("部门工会意见")
+    private String bmghshyj;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("部门工会审核时间")
+    private String bmghshsj;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("部门工会审核人")
+    private String bmghshr;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @Comment("院级党组织意见")
+    private String yjdzzshyj;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("院级党组织审核时间")
+    private String yjdzzshsj;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("院级党组织审核人")
+    private String yjdzzshr;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @Comment("校工会审核意见")
+    private String xghshyj;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("校工会审核时间")
+    private String xghshsj;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("校工会审核人")
+    private String xghshr;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    @Comment("授予时间")
+    private String jtsysj;
+
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    @Comment("类型（1.工会工作先进工作者.工会工作积极分子）")
+    private String jtlx;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("奖项")
+    private String jtjx;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("申请时间")
+    private String sqsj;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    @Comment("申请状态")
+    private String sqzt;
+
+    @Column
+    @Comment("附件")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<Sys_file> files;
+}

src/main/java/io/v/nutz/zhgh/ry/model/Ry_rygl_jt.java

@@ -0,0 +1,144 @@
+package io.v.nutz.zhgh.ry.model;
+
+import cn.wizzer.framework.base.model.BaseModel;
+import io.v.nutz.sys.models.Sys_file;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.integration.json4excel.annotation.J4EIgnore;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * hpf
+ * 荣誉集体
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Table("Ry_rygl_jt")
+public class Ry_rygl_jt extends BaseModel implements Serializable {
+    @Column
+    @Name
+    @Comment("ID")
+    @J4EIgnore
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Prev(els = {@EL("uuid()")})
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("奖项")
+    private String jtjx;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("申请单位")
+    private String jtbmdw;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("申请单位名称")
+    private String jtbmdwname;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("申请工会")
+    private String jtbmgh;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 50)
+    @Comment("申请工会名称")
+    private String jtbmghname;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    @Comment("授予时间")
+    private String jtsysj;
+
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    @Comment("类型（1.教代会工作先进单位2.工会工作先进单位）")
+    private String jtlx;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 1000)
+    @Comment("主要先进事迹")
+    private String zyxjsj;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @Comment("院级党组织意见")
+    private String yjdzzshyj;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("院级党组织审核时间")
+    private String yjdzzshsj;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("院级党组织审核人")
+    private String yjdzzshr;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 100)
+    @Comment("校工会审核意见")
+    private String xghshyj;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("校工会审核时间")
+    private String xghshsj;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 32)
+    @Comment("校工会审核人")
+    private String xghshr;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 30)
+    @Comment("教代会")
+    private String jdhcs;
+
+    @Column
+    @ColDefine(type = ColType.INT, width = 5)
+    @Comment("召开教代会执委会的次数")
+    private Integer zwhcs;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("申请时间")
+    private String sqsj;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 10)
+    @Comment("申请状态")
+    private String sqzt;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("部门负责人姓名")
+    private String unit_leader;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("部门负责人电话")
+    private String unit_leader_mobile;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("主席名称")
+    private String zxname;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR, width = 20)
+    @Comment("主席联系电话")
+    private String zxmobile;
+
+    @Column
+    @Comment("附件")
+    @ColDefine(type = ColType.MYSQL_JSON)
+    private List<Sys_file> files;
+}

src/main/java/io/v/nutz/zhgh/ry/model/Ry_rygl_plan.java

@@ -0,0 +1,91 @@
+package io.v.nutz.zhgh.ry.model;
+
+import org.nutz.dao.entity.annotation.*;
+import org.nutz.dao.interceptor.annotation.PrevInsert;
+
+/**
+ * 评选计划
+ * 10:41 2020/10/23
+ */
+@Table("Ry_rygl_plan")
+public class Ry_rygl_plan {
+    @Name
+    @Comment("id")
+    @ColDefine(type = ColType.VARCHAR,width = 32)
+    @PrevInsert(uu32 = true)
+    private String id;
+
+    @Column
+    @ColDefine(type = ColType.INT,width = 4)
+    @Comment("年份")
+    private String planyear;
+
+    @Column
+    @ColDefine(type = ColType.INT,width = 5)
+    @Comment("类型（1.集体荣誉 2.个人荣誉）")
+    private int planlx;
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 20)
+    @Comment("开始时间")
+    private String plankssj;
+
+
+    @Column
+    @ColDefine(type = ColType.VARCHAR,width = 20)
+    @Comment("结束时间")
+    private String planjssj;
+
+    @Column
+    @ColDefine(type = ColType.INT,width = 1)
+    @Comment("开启状态（1.开启 2.关闭）")
+    private boolean plankqzt;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getPlanyear() {
+        return planyear;
+    }
+
+    public void setPlanyear(String planyear) {
+        this.planyear = planyear;
+    }
+
+    public int getPlanlx() {
+        return planlx;
+    }
+
+    public void setPlanlx(int planlx) {
+        this.planlx = planlx;
+    }
+
+    public String getPlankssj() {
+        return plankssj;
+    }
+
+    public void setPlankssj(String plankssj) {
+        this.plankssj = plankssj;
+    }
+
+    public String getPlanjssj() {
+        return planjssj;
+    }
+
+    public void setPlanjssj(String planjssj) {
+        this.planjssj = planjssj;
+    }
+
+    public boolean isPlankqzt() {
+        return plankqzt;
+    }
+
+    public void setPlankqzt(boolean plankqzt) {
+        this.plankqzt = plankqzt;
+    }
+}

src/main/java/io/v/nutz/zhgh/ry/service/RyRygl_grServcie.java

@@ -0,0 +1,8 @@
+package io.v.nutz.zhgh.ry.service;
+
+
+import io.v.nutz.zhgh.ry.model.Ry_rygl_gr;
+import cn.wizzer.framework.base.service.BaseService;
+
+public interface RyRygl_grServcie extends BaseService<Ry_rygl_gr> {
+}

src/main/java/io/v/nutz/zhgh/ry/service/RyRygl_jtService.java

@@ -0,0 +1,8 @@
+package io.v.nutz.zhgh.ry.service;
+
+
+import io.v.nutz.zhgh.ry.model.Ry_rygl_jt;
+import cn.wizzer.framework.base.service.BaseService;
+
+public interface RyRygl_jtService extends BaseService<Ry_rygl_jt> {
+}

src/main/java/io/v/nutz/zhgh/ry/service/impl/RyRygl_grServiceImpl.java

@@ -0,0 +1,16 @@
+package io.v.nutz.zhgh.ry.service.impl;
+
+
+import io.v.nutz.zhgh.ry.model.Ry_rygl_gr;
+import io.v.nutz.zhgh.ry.service.RyRygl_grServcie;
+import cn.wizzer.framework.base.service.BaseServiceImpl;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.IocBean;
+
+@IocBean(args = {"refer:dao"})
+public class RyRygl_grServiceImpl extends BaseServiceImpl<Ry_rygl_gr> implements RyRygl_grServcie {
+    public RyRygl_grServiceImpl(Dao dao) {
+        super(dao);
+    }
+
+}

src/main/java/io/v/nutz/zhgh/ry/service/impl/RyRygl_jtServiceImpl.java

@@ -0,0 +1,17 @@
+package io.v.nutz.zhgh.ry.service.impl;
+
+
+import io.v.nutz.zhgh.ry.model.Ry_rygl_jt;
+import io.v.nutz.zhgh.ry.service.RyRygl_jtService;
+import cn.wizzer.framework.base.service.BaseServiceImpl;
+import org.nutz.dao.Dao;
+import org.nutz.ioc.loader.annotation.IocBean;
+
+@IocBean(args = {"refer:dao"})
+public class RyRygl_jtServiceImpl extends BaseServiceImpl<Ry_rygl_jt> implements RyRygl_jtService {
+    public RyRygl_jtServiceImpl(Dao dao) {
+        super(dao);
+    }
+};
+
+