From c720084480f9359a3fda16d80682bb3a30bca13b Mon Sep 17 00:00:00 2001 From: Paidax Date: Thu, 12 Jun 2025 14:31:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=96=97=E4=BC=91=E5=85=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v/nutz/zhgh/lxy/controller/LxyCommon.java | 1 + .../lxy/controller/LxyGhbmController.java | 19 +- .../lxy/controller/LxyHdTjController.java | 8 +- .../lxy/controller/LxyXghshController.java | 1 + .../java/io/v/nutz/zhgh/lxy/model/Lxy_bm.java | 5 + .../nutz/zhgh/lxy/template/LxyImportTemp.java | 3 + .../views/platform/zgfw/lxy/HdGhbm.html | 31 ++- .../views/platform/zgfw/lxy/HdTj.html | 181 ++++++++---------- .../views/platform/zgfw/lxy/HdXghsh.html | 6 +- .../views/platform/zgfw/lxy/dialogViewBm.html | 4 +- 10 files changed, 138 insertions(+), 121 deletions(-) diff --git a/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyCommon.java b/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyCommon.java index f5d7a2c..578c2ee 100644 --- a/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyCommon.java +++ b/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyCommon.java @@ -51,6 +51,7 @@ public class LxyCommon { bm.zyhj, bm.idcard, bm.talent, + bm.point, TIMESTAMPDIFF(YEAR, u.birthday, CURDATE()) age, bm.bmzt FROM diff --git a/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyGhbmController.java b/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyGhbmController.java index dcb1ff6..b637525 100644 --- a/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyGhbmController.java +++ b/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyGhbmController.java @@ -181,7 +181,7 @@ public class LxyGhbmController { Cnd cnd = Cnd.NEW(); cnd.and("member", "=", 1); cnd.and("unit.unionid", "=", unionid); - cnd.and(new Static("u.id NOT IN ( SELECT bm.userid FROM lxy_bm bm WHERE bm.hdid = '" + hdid + "' ) ")); + cnd.and(new Static("u.id NOT IN ( SELECT bm.userid FROM lxy_bm bm WHERE bm.hdid = '" + hdid + "' OR hdid = '1' ) ")); if (checks != null && checks.length > 0) { for (String check : checks) { if (check.equals("honer")) { @@ -219,7 +219,8 @@ public class LxyGhbmController { bm.unitname, bm.unionname, bm.nation, - bm.talent + bm.talent, + bm.point FROM lxy_bm bm LEFT JOIN `user` u ON u.id = bm.userid @@ -310,6 +311,7 @@ public class LxyGhbmController { bm.zyhj, bm.nation, bm.talent, + bm.point, bm.bz, bm.ghid FROM @@ -377,6 +379,12 @@ public class LxyGhbmController { return Result.error("文件数据超过名额限制，请检查是否存在已报名人员"); } + // 获取以往的报名数据。以往报名过，不允许再次报名 + Sql sql = Sqls.create("SELECT userid FROM lxy_bm WHERE hdid = 1"); + sql.setCallback(Sqls.callback.strList()); + dao.execute(sql); + List lastJoinUserIds = sql.getList(String.class); + // 获取本 基层工会的会员，判断是不是报名了其他工会的教工和校验有没有用户数据 List list = dao.query(User.class, Cnd.where("unionid", "=", unionId).and("member", "=", 1)); Map userMap = list.stream().collect(Collectors.toMap(User::getLoginname, v -> v)); @@ -409,6 +417,12 @@ public class LxyGhbmController { continue; } + if (lastJoinUserIds.contains(user.getId())) { + temp.setRemark("此教师参加过以往疗休养，请更换人员上报"); + errorInfos.add(temp); + continue; + } + Lxy_bm bm = new Lxy_bm(); bm.setId(R.UU32()); bm.setHdid(projectId); @@ -426,6 +440,7 @@ public class LxyGhbmController { bm.setIdcard(temp.getIdcard()); bm.setMobile(temp.getMobile()); bm.setTalent(temp.getTalent()); + bm.setPoint(temp.getPoint()); bmList.add(bm); diff --git a/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyHdTjController.java b/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyHdTjController.java index 19ac646..f50ffc1 100644 --- a/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyHdTjController.java +++ b/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyHdTjController.java @@ -1,7 +1,5 @@ package io.v.nutz.zhgh.lxy.controller; -import cn.afterturn.easypoi.excel.ExcelExportUtil; -import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.deepoove.poi.XWPFTemplate; import com.deepoove.poi.config.Configure; import com.deepoove.poi.policy.HackLoopTableRenderPolicy; @@ -10,10 +8,8 @@ import io.v.nutz.base.utils.MsgApi; import io.v.nutz.base.utils.OfficeTemplateUtil; import io.v.nutz.base.utils.Vi; import io.v.nutz.zhgh.lxy.model.Lxy_bm; -import io.v.nutz.zhgh.lxy.model.Lxy_hd; import io.v.nutz.zhgh.lxy.service.LxyGrxxService; import io.v.nutz.zhgh.lxy.service.LxyHdService; -import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; @@ -24,18 +20,15 @@ import org.nutz.dao.sql.Sql; import org.nutz.dao.util.cri.Static; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.json.Json; import org.nutz.lang.Strings; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.nio.charset.StandardCharsets; -import java.util.HashMap; import java.util.List; /** @@ -87,6 +80,7 @@ public class LxyHdTjController { bm.bz, bm.talent, bm.nation, + bm.point, bm.bmzt FROM lxy_grxx gr diff --git a/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyXghshController.java b/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyXghshController.java index 5ccba87..9bc1932 100644 --- a/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyXghshController.java +++ b/src/main/java/io/v/nutz/zhgh/lxy/controller/LxyXghshController.java @@ -172,6 +172,7 @@ public class LxyXghshController { bm.zyhj, bm.nation, bm.talent, + bm.point, bm.bz, bm.ghid FROM diff --git a/src/main/java/io/v/nutz/zhgh/lxy/model/Lxy_bm.java b/src/main/java/io/v/nutz/zhgh/lxy/model/Lxy_bm.java index 9f283f0..fc861d7 100644 --- a/src/main/java/io/v/nutz/zhgh/lxy/model/Lxy_bm.java +++ b/src/main/java/io/v/nutz/zhgh/lxy/model/Lxy_bm.java @@ -101,6 +101,11 @@ public class Lxy_bm { @ColDefine(type = ColType.VARCHAR, width = 20) private String talent; + @Column + @Comment("出发乘车地点") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String point; + @Column @Comment("备注") @ColDefine(type = ColType.VARCHAR, width = 1000) diff --git a/src/main/java/io/v/nutz/zhgh/lxy/template/LxyImportTemp.java b/src/main/java/io/v/nutz/zhgh/lxy/template/LxyImportTemp.java index 6721077..f7fef16 100644 --- a/src/main/java/io/v/nutz/zhgh/lxy/template/LxyImportTemp.java +++ b/src/main/java/io/v/nutz/zhgh/lxy/template/LxyImportTemp.java @@ -34,6 +34,9 @@ public class LxyImportTemp { @Excel(name = "是否为ABCDE类高层次人才", width = 30) String talent; + @Excel(name = "出发乘车地点", width = 30) + String point; + String remark; } diff --git a/src/main/resources/views/platform/zgfw/lxy/HdGhbm.html b/src/main/resources/views/platform/zgfw/lxy/HdGhbm.html index 7a4d92f..35b4b1b 100644 --- a/src/main/resources/views/platform/zgfw/lxy/HdGhbm.html +++ b/src/main/resources/views/platform/zgfw/lxy/HdGhbm.html @@ -191,11 +191,10 @@ layout("/layouts/platform.html"){ - - - - - + + + + - + + + + - +