c-zhangr1/zhgh_hrbnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
Paidax
2024-07-26 15:46:08 +08:00
parent eefb76c781
commit ddf52e5e86
109 changed files with 1384 additions and 1473 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/activity/controller/applets/ActivityListController.java
+4 -4
View File
@@ -1,14 +1,14 @@
package io.v.nutz.zhgh.activity.controller.applets;
import io.v.nutz.zhgh.activity.models.ActivitySchoolApply;
import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.ViService;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.sys.models.Sys_user;
import io.v.nutz.zhgh.activity.models.ActivitySchoolApply;
import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicScopeController.java
+6 -6
View File
@@ -5,16 +5,16 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.hutool.core.util.StrUtil;
import cn.wizzer.framework.base.Result;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.SimpleService;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.utils.ViTool;
import io.v.nutz.sys.models.Sys_role;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.models.ActivityUserCnd;
import io.v.nutz.zhgh.activity.models.ActivityUserScope;
import io.v.nutz.zhgh.activity.services.ActivityBasicScopeService;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.service.SimpleService;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.sys.models.Sys_role;
import io.v.nutz.web.commons.utils.ShiroUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.ArrayUtils;
import org.apache.poi.ss.usermodel.Workbook;
src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicSettingsController.java
+3 -3
View File
@@ -1,12 +1,12 @@
package io.v.nutz.zhgh.activity.controller.basic;
import cn.wizzer.framework.base.Result;
import io.v.nutz.zhgh.activity.models.ActivityBasicSettings;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.AsyncService;
import io.v.nutz.base.service.ViService;
import io.v.nutz.zhgh.activity.models.ActivityBasicSettings;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.dao.Chain;
@@ -47,8 +47,8 @@ public class ActivityBasicSettingsController {
@RequiresPermissions("activity.basic.settings")
public Object pageData(String parentId, PageForm pageForm) {
CndPlus cnd = CndPlus.create();
pageForm.setPageSize(50);
pageForm.setPageNumber(1);
/* pageForm.setPageSize(50);
pageForm.setPageNumber(1);*/
cnd.andEx("parentId", "=", parentId);
cnd.asc("code");
src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityBasicUserController.java
+3 -3
View File
@@ -4,13 +4,13 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.hutool.core.util.StrUtil;
import io.v.nutz.zhgh.activity.models.ActivityUserScope;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.service.SimpleService;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.SimpleService;
import io.v.nutz.base.utils.ViTool;
import io.v.nutz.sys.models.User;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.base.utils.ViTool;
import io.v.nutz.zhgh.activity.models.ActivityUserScope;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.shiro.authz.annotation.RequiresPermissions;
src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityEventController.java
+2 -2
View File
@@ -1,12 +1,12 @@
package io.v.nutz.zhgh.activity.controller.basic;
import cn.hutool.core.util.StrUtil;
import io.v.nutz.zhgh.activity.models.ActivityBasicSettings;
import io.v.nutz.zhgh.activity.models.ActivityEvent;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.ViService;
import io.v.nutz.zhgh.activity.models.ActivityBasicSettings;
import io.v.nutz.zhgh.activity.models.ActivityEvent;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.dao.Chain;
import org.nutz.dao.Cnd;
src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityUnionController.java
+6 -6
View File
@@ -1,22 +1,22 @@
package io.v.nutz.zhgh.activity.controller.basic;
import cn.wizzer.framework.base.Result;
import io.v.nutz.sys.models.*;
import io.v.nutz.zhgh.activity.models.ActivityBasicUnion;
import io.v.nutz.zhgh.activity.models.ActivityBasicUnit;
import io.v.nutz.zhgh.activity.models.ActivitySchoolApply;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.lang.Lang;
import io.v.nutz.base.service.ViService;
import io.v.nutz.base.utils.PageUtil;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.lang.Lang;
import io.v.nutz.base.service.ViService;
import io.v.nutz.sys.models.*;
import io.v.nutz.sys.services.SysDictService;
import io.v.nutz.sys.services.SysRoleService;
import io.v.nutz.sys.services.SysUserRoleService;
import io.v.nutz.sys.services.SysUserService;
import io.v.nutz.web.commons.controller.ViCommonCon;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.models.ActivityBasicUnion;
import io.v.nutz.zhgh.activity.models.ActivityBasicUnit;
import io.v.nutz.zhgh.activity.models.ActivitySchoolApply;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions;
src/main/java/io/v/nutz/zhgh/activity/controller/basic/ActivityUnitController.java
+2 -2
View File
@@ -1,16 +1,16 @@
package io.v.nutz.zhgh.activity.controller.basic;
import cn.wizzer.framework.base.Result;
import io.v.nutz.zhgh.activity.models.ActivityBasicUnit;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.AsyncService;
import io.v.nutz.base.service.ViService;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.sys.models.Sys_unit;
import io.v.nutz.sys.services.SysUnitClassService;
import io.v.nutz.sys.services.SysUserService;
import io.v.nutz.zhgh.activity.models.ActivityBasicUnit;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.dao.Chain;
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java
+7 -7
View File
@@ -1,21 +1,21 @@
package io.v.nutz.zhgh.activity.controller.school;
import cn.wizzer.framework.base.Result;
import io.v.nutz.zhgh.activity.models.*;
import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolTeamService;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.service.SimpleService;
import io.v.nutz.base.utils.DateUtil;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.SimpleService;
import io.v.nutz.base.service.ViService;
import io.v.nutz.base.utils.DateUtil;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.sys.models.Sys_unit;
import io.v.nutz.sys.models.Sys_user;
import io.v.nutz.sys.services.SysUserService;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.models.*;
import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolTeamService;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.aop.interceptor.async.Async;
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCalendarController.java
+1 -1
View File
@@ -1,8 +1,8 @@
package io.v.nutz.zhgh.activity.controller.school;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.dao.Sqls;
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityCommonController.java
+64 -184
View File
@@ -2,23 +2,23 @@ package io.v.nutz.zhgh.activity.controller.school;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.hutool.core.util.StrUtil;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.policy.HackLoopTableRenderPolicy;
import io.v.nutz.zhgh.activity.models.*;
import io.v.nutz.zhgh.activity.services.ActivityPlanService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.OfficeTemplateUtil;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.service.ViService;
import io.v.nutz.base.utils.DateUtil;
import io.v.nutz.base.utils.OfficeTemplateUtil;
import io.v.nutz.sys.models.Sys_union;
import io.v.nutz.sys.models.Sys_unit;
import io.v.nutz.sys.models.Sys_user;
import io.v.nutz.sys.services.SysUnionService;
import io.v.nutz.web.commons.base.Globals;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.models.*;
import io.v.nutz.zhgh.activity.services.ActivityPlanService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.nutz.dao.Cnd;
@@ -29,6 +29,7 @@ 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.Lang;
import org.nutz.lang.Strings;
import org.nutz.lang.util.NutMap;
import org.nutz.mvc.annotation.At;
@@ -36,10 +37,14 @@ import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
/**
* @author: Aaron
@@ -163,7 +168,7 @@ public class ActivityCommonController {
*/
@At
@ViReturn
public Object getSchoolActivityPlan(@Param(value = "type",required = false) Integer type) {
public Object getSchoolActivityPlan(@Param(value = "type", required = false) Integer type) {
return activityPlanService.listMap(Sqls.create("select * from activity_plan where type = @type").setParam("type", type));
}
@@ -350,191 +355,66 @@ public class ActivityCommonController {
@At
@Ok("void")
public void export(String id, String unionId, HttpServletResponse response) throws IOException {
ActivitySchool activity = activitySchoolService.fetch(id);
public void export(String id, String unionId, HttpServletResponse response) {
try {
ActivitySchool activity = activitySchoolService.fetch(id);
String fileName = Globals.MyConfig.getString("GxName") + activity.getName() + "报名表";
response.addHeader("Content-Type", "application/octet-stream");
response.addHeader("Content-Disposition", "attachment; filename=\"" + new String(fileName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1) + "\".zip");
Map map = new HashMap();
List list = new ArrayList();
List<ActivityBasicUnion> basicUnions = activitySchoolService.dao().query(ActivityBasicUnion.class, Cnd.NEW().asc("unioncode"));
ZipOutputStream zipOutputStream = new ZipOutputStream(new BufferedOutputStream(response.getOutputStream()));
for (ActivityBasicUnion union : basicUnions) {
NutMap map = new NutMap();
map.setv("unionName", union.getUnionname());
CndPlus unionCnd = CndPlus.create();
Sql sql = Sqls.create("""
SELECT * FROM sys_union un $condition
""");
List<ActivitySchoolApply> schoolApplies = activitySchoolApplyService.query(Cnd.where("activityId", "=", id));
if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) {
if (ShiroUtil.hasRole("H04")) {
Sys_user user = (Sys_user) ShiroUtil.getPrincipal();
Sys_unit unit = user.getUnit();
unionCnd.and("un.id", "=", unit.getUnionid());
}
} else {
unionCnd.andEx("un.id", "=", unionId);
}
unionCnd.and(new Static("(SELECT count(1) from activity_school_apply app WHERE app.unionId = un.id and app.status = 2 and app.activityId='%s') > 0".formatted(id)));
sql.setCondition(unionCnd);
List<Sys_union> unions = sysUnionService.listEntity(sql);
CndPlus cnd = CndPlus.create();
Sql sql1 = Sqls.create("""
SELECT
ae.allName,
app.*,
team.`name` teamName,
unit.`name` unitName,
gh.unionname AS unionName
FROM
activity_school_apply app
LEFT JOIN activity_event ae ON ae.id = app.eventId
LEFT JOIN activity_school_team team ON app.teamId = team.id
LEFT JOIN sys_unit unit ON app.unitId = unit.id
LEFT JOIN sys_union gh ON gh.id = unit.unionid
$condition
""");
cnd.andEx("app.activityId", "=", id);
cnd.andEx("app.unionId", "=", unionId);
cnd.desc("app.divisionLevelLeadership").asc("team.location").asc("app.sex");
sql1.setCondition(cnd);
List<ActivitySchoolApply> applies = activitySchoolApplyService.listEntity(sql1, ActivitySchoolApply.class);
List<NutMap> mapList = activitySchoolApplyService.listMap(sql1);
for (NutMap apply : mapList) {
String oldUsername = apply.getString("username");
String username = apply.getString("username");
String sex = apply.getString("sex");
boolean unionHead = apply.getBoolean("unionHead");
boolean coach = Json.fromJsonAsList(String.class, apply.getString("identity")).stream().anyMatch(v -> v.equals("2"));
boolean leader = Json.fromJsonAsList(String.class, apply.getString("identity")).stream().anyMatch(v -> v.equals("3"));
boolean substitute = Json.fromJsonAsList(String.class, apply.getString("identity")).stream().anyMatch(v -> v.equals("5"));
boolean divisionLevelLeadership = Json.fromJsonAsList(String.class, apply.getString("identity")).stream().anyMatch(v -> v.equals("4"));
boolean women = "女".equals(sex);
if (women || divisionLevelLeadership || coach || leader) {
username += "（";
if (women) {
username += "女 ";
}
if (coach && username.equals(oldUsername)) {
username += "教练 ";
}
if (leader && username.equals(oldUsername)) {
username += "领队 ";
List<ActivitySchoolApply> ydhUserList = schoolApplies.stream().filter(v -> v.getIdentity().contains("1")).collect(Collectors.toList());
ActivitySchoolApply jlUser = schoolApplies.stream().filter(v -> v.getIdentity().contains("2")).findFirst().orElse(null);
ActivitySchoolApply ldUser = schoolApplies.stream().filter(v -> v.getIdentity().contains("3")).findFirst().orElse(null);
ydhUserList.stream().forEach(y -> y.setSf("队员"));
for (int i = 0; i < ydhUserList.size(); i++) {
ydhUserList.get(i).setSf("队员");
ydhUserList.get(i).setIndex(i + 1);
}
if (unionHead && username.equals(oldUsername)) {
username += "团长 ";
map.setv("headName", fileName);
if (Lang.isNotEmpty(ldUser)) {
map.setv("ldUserName", ldUser.getUsername());
map.setv("ldMobile", ldUser.getMobile());
}
if (substitute && username.equals(oldUsername)) {
username += "替补 ";
if (Lang.isNotEmpty(jlUser)) {
map.setv("jlUserName", jlUser.getUsername());
}
if (divisionLevelLeadership && username.equals(oldUsername)) {
username += "处级领导 ";
}
username += "）";
String subUserName = username.substring(0, username.length() - 2);
if (!women && subUserName.equals(oldUsername)) {
apply.setv("username", oldUsername);
} else {
apply.setv("username", username);
}
// apply.setv("username", (!women && username.equals(oldUsername)) ? oldUsername : username);
map.setv("ydhUser", ydhUserList);
map.setv("applyDate", DateUtil.getDate());
String twoFileName = union.getUnionname() + "比赛报名表.docx";
zipOutputStream.putNextEntry(new ZipEntry(twoFileName));
HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy();
Configure config = Configure.newBuilder().bind("ydhUser", policy).build();
/* if (activity.getApplyType() == 1) {
templateUrl = officeTemplateUtil.getPath("activity_list1");
} else if (activity.getApplyType() == 2) {
templateUrl = officeTemplateUtil.getPath("activity_list");
}officeTemplateUtil.getPath("activity_user");
*/
String officeTemplateUtilPath = officeTemplateUtil.getPath("activity_user");
assert officeTemplateUtilPath != null;
XWPFTemplate.compile(officeTemplateUtilPath, config).render(map).write(zipOutputStream);
zipOutputStream.closeEntry();
}
zipOutputStream.flush();
zipOutputStream.close();
} catch (Exception e) {
e.printStackTrace();
}
for (Sys_union union : unions) {
String union_id = union.getId();
Map m = new HashMap<>();
m.put("id", union_id);
m.put("name", union.getUnionname());
List<NutMap> users = mapList.stream().filter(v -> {
return v.getString("unionId").equals("2b113edb7e7d4494a9cdfd7672a0ed90");
}).collect(Collectors.toList());
/* List<NutMap> users = mapList.stream().filter(v -> {
return v.getString("unionId").equals(union_id);
}).collect(Collectors.toList());*/
List<NutMap> collect1 = users.stream().filter(v -> v.getString("team") != null).collect(Collectors.toList());
Map<String, List<NutMap>> allName = collect1.stream().collect(Collectors.groupingBy(all -> all.getString("allName"), Collectors.toList()));
LinkedHashMap<String, List<NutMap>> collect = collect1.stream().filter(v -> {
return Json.fromJsonAsList(String.class, v.getString("identity")).stream().anyMatch(x -> x.equals("1") || x.equals("2") || x.equals("3") || x.equals("4") || x.equals("5"));
}).collect(Collectors.groupingBy(record -> record.getString("team"), LinkedHashMap::new, Collectors.toList()));
List<Map> teams = new ArrayList();
List<NutMap> leaderList = new ArrayList<>();
collect.forEach((key, val) -> {
List<NutMap> ydy = val.stream().filter(v -> Json.fromJsonAsList(String.class, v.getString("identity")).stream().anyMatch(x -> x.equals("1") || x.equals("5"))).collect(Collectors.toList());
List<NutMap> coach = val.stream().filter(v -> Json.fromJsonAsList(String.class, v.getString("identity")).stream().anyMatch(x -> x.equals("2"))).collect(Collectors.toList());
List<NutMap> leader = val.stream().filter(v -> Json.fromJsonAsList(String.class, v.getString("identity")).stream().anyMatch(x -> x.equals("3"))).collect(Collectors.toList());
List<NutMap> divisionLevelLeadership = val.stream().filter(v -> Json.fromJsonAsList(String.class, v.getString("identity")).stream().anyMatch(x -> x.equals("4"))).collect(Collectors.toList());
Map mm = new HashMap<>();
mm.put("name", key);
mm.put("coach", coach);
mm.put("leader", leader);
mm.put("divisionLevelLeadership", divisionLevelLeadership);
mm.put("users", ydy);
if (key.equals("第1队") && leader.size() > 0) {
leaderList.add(leader.get(0));
}
teams.add(mm);
});
m.put("id1", teams);
if (activity.getApplyType() == 1) {
m.put("id3", leaderList);
} else {
//教练
List<NutMap> id2 = users.stream().filter(v -> StrUtil.isNotBlank(v.getString("unionCoach")) && v.getBoolean("unionCoach")).collect(Collectors.toList());
m.put("id2", id2);
if (id2.size() > 0) m.put("coachName", "基层工会教练：");
//领队
List<NutMap> id3 = users.stream().filter(v -> StrUtil.isNotBlank(v.getString("unionLeader")) && v.getBoolean("unionLeader")).collect(Collectors.toList());
m.put("id3", id3);
if (id3.size() > 0) m.put("leaderName", "基层工会领队：");
//领队
List<NutMap> id4 = users.stream().filter(v -> StrUtil.isNotBlank(v.getString("unionHead")) && v.getBoolean("unionHead")).collect(Collectors.toList());
m.put("id4", id4);
if (id4.size() > 0) m.put("unionHead", "基层工会团长：");
}
list.add(m);
}
map.put("list", list);
String fileName = activity.getName() + "人员名单";
response.addHeader("Content-Type", "application/octet-stream");
response.addHeader("Content-Disposition", "attachment; filename=\"" + new String(fileName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1) + "\".docx");
HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy();
Configure config = Configure.newBuilder().bind("users", policy).build();
String templateUrl = "";
if (activity.getApplyType() == 1) {
templateUrl = officeTemplateUtil.getPath("activity_list1");
} else if (activity.getApplyType() == 2) {
templateUrl = officeTemplateUtil.getPath("activity_list");
}
XWPFTemplate.compile(templateUrl, config).render(map).writeAndClose(response.getOutputStream());;
}
@@ -548,7 +428,7 @@ public class ActivityCommonController {
Cnd unionCnd = Cnd.NEW();
Sql sql = Sqls.create("""
SELECT * FROM sys_union un $condition
SELECT * FROM sys_union un $condition
""");
if (!ShiroUtil.hasAnyRoles("sysadmin,A06") && ShiroUtil.hasRole("H04")) {
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityGradesController.java
+5 -5
View File
@@ -3,14 +3,14 @@ package io.v.nutz.zhgh.activity.controller.school;
import cn.wizzer.framework.base.Result;
import cn.wizzer.framework.page.Pagination;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.service.ViService;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.sys.services.SysUnitService;
import io.v.nutz.zhgh.activity.models.ActivitySchoolApply;
import io.v.nutz.zhgh.activity.models.SchoolAssignGrades;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.service.ViService;
import io.v.nutz.sys.services.SysUnitService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls;
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityPlanController.java
+3 -3
View File
@@ -1,11 +1,11 @@
package io.v.nutz.zhgh.activity.controller.school;
import io.v.nutz.zhgh.activity.models.ActivityPlan;
import io.v.nutz.zhgh.activity.services.ActivityPlanService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.zhgh.activity.models.ActivityPlan;
import io.v.nutz.zhgh.activity.services.ActivityPlanService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.ioc.loader.annotation.Inject;
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityPrizeListController.java
+2 -2
View File
@@ -1,13 +1,13 @@
package io.v.nutz.zhgh.activity.controller.school;
import cn.wizzer.framework.base.Result;
import io.v.nutz.zhgh.activity.models.ActivityResults;
import io.v.nutz.zhgh.activity.models.ActivitySchoolEvent;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.dao.CndPlus;
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.zhgh.activity.models.ActivityResults;
import io.v.nutz.zhgh.activity.models.ActivitySchoolEvent;
import lombok.Data;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.apache.shiro.authz.annotation.RequiresPermissions;
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReadingController.java
+6 -6
View File
@@ -6,19 +6,19 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import cn.wizzer.framework.base.Result;
import io.v.nutz.sys.models.*;
import io.v.nutz.zhgh.activity.controller.school.constant.SchoolActivityApplyExportEntity;
import io.v.nutz.zhgh.activity.models.*;
import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.service.BaseService;
import io.v.nutz.base.utils.DateUtil;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.utils.ViTool;
import io.v.nutz.sys.models.*;
import io.v.nutz.sys.services.SysClubService;
import io.v.nutz.sys.services.SysUnionService;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.base.utils.ViTool;
import io.v.nutz.zhgh.activity.controller.school.constant.SchoolActivityApplyExportEntity;
import io.v.nutz.zhgh.activity.models.*;
import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.apache.shiro.authz.annotation.RequiresPermissions;
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityRemindController.java
+12 -12
View File
@@ -1,17 +1,17 @@
package io.v.nutz.zhgh.activity.controller.school;
import io.v.nutz.zhgh.activity.models.ActivitySchoolEvent;
import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.RCSCloudAPI;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.ViService;
import io.v.nutz.base.utils.RCSCloudAPI;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.sys.services.SysUnionService;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.models.ActivitySchoolEvent;
import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.dao.Cnd;
@@ -165,9 +165,9 @@ public class ActivityRemindController {
public Object sendRemind(@Param(value = "phone", required = false) String phone,
@Param(value = "unionname", required = false) String unionname) {
String[] pe = phone.split(",");
/*for (String p : pe) {
RCSCloudAPI.sendTplSms("399ac7a7901c49df9f5939d0f10d566b", p, "@1@=" + unionname + "", "");
}*/
for (String p : pe) {
// RCSCloudAPI.sendTplSms("399ac7a7901c49df9f5939d0f10d566b", p, "@1@=" + unionname + "", "");
}
return null;
}
@@ -203,9 +203,9 @@ public class ActivityRemindController {
return v.getInt("num") <= 0 && v.getString("telephone") != null;
}).collect(Collectors.toList());
/*collect.forEach(v -> {
RCSCloudAPI.sendTplSms("399ac7a7901c49df9f5939d0f10d566b", v.getString("telephone"), "@1@=" + v.getString("unionname") + "", "");
});*/
collect.forEach(v -> {
// RCSCloudAPI.sendTplSms("399ac7a7901c49df9f5939d0f10d566b", v.getString("telephone"), "@1@=" + v.getString("unionname") + "", "");
});
return null;
}
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityResultsController.java
+7 -7
View File
@@ -1,17 +1,17 @@
package io.v.nutz.zhgh.activity.controller.school;
import cn.wizzer.framework.base.Result;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.ViService;
import io.v.nutz.base.utils.DateUtil;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.sys.models.Sys_user;
import io.v.nutz.zhgh.activity.models.ActivityBasicUnion;
import io.v.nutz.zhgh.activity.models.ActivityBasicUnit;
import io.v.nutz.zhgh.activity.models.ActivityResults;
import io.v.nutz.zhgh.activity.models.ActivitySchoolApply;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.DateUtil;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.ViService;
import io.v.nutz.sys.models.Sys_user;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.crypto.hash.Sha256Hash;
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityReviewController.java
+2 -2
View File
@@ -1,10 +1,10 @@
package io.v.nutz.zhgh.activity.controller.school;
import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.dao.Chain;
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityScoreStatisticsController.java
+7 -7
View File
@@ -7,16 +7,16 @@ import cn.wizzer.framework.base.Result;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.policy.HackLoopTableRenderPolicy;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.service.ViService;
import io.v.nutz.base.utils.OfficeTemplateUtil;
import io.v.nutz.base.utils.ViTool;
import io.v.nutz.sys.models.Sys_union;
import io.v.nutz.sys.services.SysUnionService;
import io.v.nutz.zhgh.activity.models.ActivityResults;
import io.v.nutz.zhgh.activity.models.ActivitySchool;
import io.v.nutz.zhgh.activity.models.ActivitySchoolEvent;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.OfficeTemplateUtil;
import io.v.nutz.base.dao.CndPlus;
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.base.utils.ViTool;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.apache.shiro.authz.annotation.RequiresPermissions;
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityStatisticsTypeExportController.java
+4 -4
View File
@@ -4,13 +4,13 @@ package io.v.nutz.zhgh.activity.controller.school;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import io.v.nutz.zhgh.activity.models.ActivitySchool;
import io.v.nutz.zhgh.activity.models.ActivitySchoolEvent;
import io.v.nutz.base.service.BaseService;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.service.BaseService;
import io.v.nutz.base.utils.ViTool;
import io.v.nutz.sys.models.Sys_union;
import io.v.nutz.sys.services.SysUnionService;
import io.v.nutz.base.utils.ViTool;
import io.v.nutz.zhgh.activity.models.ActivitySchool;
import io.v.nutz.zhgh.activity.models.ActivitySchoolEvent;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.nutz.dao.Cnd;
src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteEquipmentController.java
+1 -1
View File
@@ -2,9 +2,9 @@ package io.v.nutz.zhgh.activity.controller.site;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.result.Result;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.result.Result;
import io.v.nutz.web.commons.slog.annotation.SLog;
import io.v.nutz.zhgh.activity.models.ActivitySiteEquipment;
import io.v.nutz.zhgh.activity.services.ActivitySiteEquipmentService;
src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveApplyController.java
+7 -10
View File
@@ -3,19 +3,16 @@ package io.v.nutz.zhgh.activity.controller.site;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.model.AuditState;
import io.v.nutz.base.result.Result;
import io.v.nutz.base.utils.MsgApi;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.model.AuditState;
import io.v.nutz.sys.models.Sys_user;
import io.v.nutz.sys.models.Sys_user_role;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.web.commons.slog.annotation.SLog;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.models.ActivitySiteEquipment;
import io.v.nutz.zhgh.activity.models.ActivitySiteInfo;
import io.v.nutz.zhgh.activity.models.ActivitySiteReserve;
@@ -39,9 +36,9 @@ import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@IocBean
@@ -133,7 +130,7 @@ public class SiteReserveApplyController {
// String content = siteInfo.getName() + ",您有一条场地预约待审核，请您通过门户网站或点击详情登录智慧工会平台进行审核。,"
// + activitySiteReserve.getReserve_person_username();
// //msgApi.sendWxMsg("智慧工会【场地预约】",auditUrl,"textcard",content,auditLoginNameList,"");
msgApi.sendWxMsg("智慧工会【场地预约】",auditUrl,"textcard",content,auditLoginNameList,"");
} else {
//离退休 祝鸿 审核
List<String> auditLoginNameList = Lang.list("1019981325");
@@ -142,7 +139,7 @@ public class SiteReserveApplyController {
String content = "离退休工作处的%s老师申请了一条%s的场地预约，请您通过门户网站或点击详情登录智慧工会平台进行审核"
.formatted(ShiroUtil.getPrincipalProperty("username"),
siteInfo.getName());
// //msgApi.sendWxMsg("智慧工会【场地预约（离退休）】",auditUrl,"textcard",content,auditLoginNameList,"");
msgApi.sendWxMsg("智慧工会【场地预约（离退休）】",auditUrl,"textcard",content,auditLoginNameList,"");
}
return null;
src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveController.java
+1 -1
View File
@@ -8,8 +8,8 @@ import cn.wizzer.framework.base.Result;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.model.Audit;
import io.v.nutz.base.page.Pagination;
import io.v.nutz.base.utils.MsgApi;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.utils.MsgApi;
import io.v.nutz.sys.services.SysUnitService;
import io.v.nutz.sys.services.SysUserService;
import io.v.nutz.web.commons.utils.ShiroUtil;
src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteRetireProcessController.java
+2 -3
View File
@@ -9,7 +9,6 @@ import io.v.nutz.base.page.Pagination;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.BaseService;
import io.v.nutz.base.utils.MsgApi;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.web.commons.slog.annotation.SLog;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.models.ActivitySiteInfo;
@@ -159,14 +158,14 @@ public class SiteRetireProcessController {
.formatted(reserve_person,
siteInfo.getName());
// //msgApi.sendWxMsg("智慧工会【场地预约（离退休）】",auditUrl,"textcard",content,List.of("1019911404"),"");
msgApi.sendWxMsg("智慧工会【场地预约（离退休）】",auditUrl,"textcard",content,List.of("1019911404"),"");
} else {
//审核拒绝，发送短信给本人
String content = "%s老师您好！您预约的%s申请被离退休工作处处长拒绝，您可重新提交其他场地或时间段的申请"
.formatted(reserve_person,
siteInfo.getName());
System.out.println(content);
// //msgApi.sendWxMsg("智慧工会【场地预约（离退休）】","","text",content,List.of(reserve_person_login_name),"");
msgApi.sendWxMsg("智慧工会【场地预约（离退休）】","","text",content,List.of(reserve_person_login_name),"");
}
return null;
}
src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReviewController.java
+5 -5
View File
@@ -4,13 +4,13 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.page.Pagination;
import io.v.nutz.base.utils.MsgApi;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.model.Audit;
import io.v.nutz.base.page.Pagination;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.base.utils.MsgApi;
import io.v.nutz.web.commons.slog.annotation.SLog;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.models.ActivitySiteInfo;
import io.v.nutz.zhgh.activity.models.ActivitySiteReserve;
import io.v.nutz.zhgh.activity.services.SiteReserveService;
@@ -157,13 +157,13 @@ public class SiteReviewController {
String content = "%s老师您好！您预约的%s申请已通过审批，祝您使用愉快！"
.formatted(reserve_person,
siteInfo.getName());
////msgApi.sendWxMsg(siteReserve.getIsRetire() ? "智慧工会【场地预约(离退休)】" : "智慧工会【场地预约】","","text",content,List.of(reserve_person_login_name),"");
msgApi.sendWxMsg(siteReserve.getIsRetire() ? "智慧工会【场地预约(离退休)】" : "智慧工会【场地预约】","","text",content,List.of(reserve_person_login_name),"");
} else {
//审核拒绝，发送短信给本人
String content = "%s老师您好！您预约的%s申请被校工会拒绝，您可重新提交其他场地或时间段的申请"
.formatted(reserve_person,
siteInfo.getName());
////msgApi.sendWxMsg(siteReserve.getIsRetire() ? "智慧工会【场地预约(离退休)】" : "智慧工会【场地预约】","","text",content,List.of(reserve_person_login_name),"");
msgApi.sendWxMsg(siteReserve.getIsRetire() ? "智慧工会【场地预约(离退休)】" : "智慧工会【场地预约】","","text",content,List.of(reserve_person_login_name),"");
}
return null;
src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteUnionProcessController.java
+6 -6
View File
@@ -3,15 +3,15 @@ package io.v.nutz.zhgh.activity.controller.site;
import cn.hutool.core.date.DateUtil;
import cn.hutool.json.JSONUtil;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.model.Audit;
import io.v.nutz.base.page.Pagination;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.BaseService;
import io.v.nutz.base.utils.MsgApi;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.model.Audit;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.web.commons.slog.annotation.SLog;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.models.ActivitySiteInfo;
import io.v.nutz.zhgh.activity.models.ActivitySiteReserve;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -151,14 +151,14 @@ public class SiteUnionProcessController {
reserve_person,
siteInfo.getName());
////msgApi.sendWxMsg("智慧工会【场地预约】",auditUrl,"textcard",content,List.of("1019911404"),"");
msgApi.sendWxMsg("智慧工会【场地预约】",auditUrl,"textcard",content,List.of("1019911404"),"");
} else {
//审核拒绝，发送短信给本人
String content = "%s老师您好！您预约的%s申请被分工会拒绝，您可重新提交其他场地或时间段的申请"
.formatted(reserve_person,
siteInfo.getName());
System.out.println(content);
////msgApi.sendWxMsg("智慧工会【场地预约】","","text",content,List.of(reserve_person_login_name),"");
msgApi.sendWxMsg("智慧工会【场地预约】","","text",content,List.of(reserve_person_login_name),"");
}
return null;
}
src/main/java/io/v/nutz/zhgh/activity/controller/test.java
-76
View File
@@ -1,76 +0,0 @@
package io.v.nutz.zhgh.activity.controller;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
import com.google.zxing.MultiFormatWriter;
import com.google.zxing.WriterException;
import com.google.zxing.client.j2se.MatrixToImageWriter;
import com.google.zxing.common.BitMatrix;
import javax.imageio.ImageIO;
import javax.swing.*;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
/**
* @version 1.0
* @Author zzr
* @name：test
* @Date 2024/7/3 10:53
* @注释
*/
public class test extends JFrame {
public test() {
setTitle("QR Code Example");
setSize(400, 400);
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
setLocationRelativeTo(null);
}
@Override
public void paint(Graphics g) {
super.paint(g);
Graphics2D g2d = (Graphics2D) g;
// 设置抗锯齿
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
// 绘制文本
g2d.drawString("添加企业微信与我联系", 50, 50);
// 绘制图像
try {
BufferedImage image = ImageIO.read(new File("C:/temp/01.jpg"));
g2d.drawImage(image, 50, 100, this);
} catch (IOException e) {
e.printStackTrace();
}
// 生成二维码
String qrCodeText = "https://www.baidu.com";
Map<EncodeHintType, Object> hints = new HashMap<>();
hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
BitMatrix bitMatrix = null;
try {
bitMatrix = new MultiFormatWriter().encode(qrCodeText, BarcodeFormat.QR_CODE, 200, 200, hints);
} catch (WriterException e) {
e.printStackTrace();
}
// 将二维码转换为BufferedImage
BufferedImage qrCodeImage = MatrixToImageWriter.toBufferedImage(bitMatrix);
// 绘制二维码
g2d.drawImage(qrCodeImage, 50, 200, this);
}
public static void main(String[] args) {
test frame = new test();
frame.setVisible(true);
}
}
src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityAuditController.java
+2 -2
View File
@@ -1,13 +1,13 @@
package io.v.nutz.zhgh.activity.controller.union;
import cn.hutool.core.util.StrUtil;
import io.v.nutz.zhgh.activity.models.ActivityTissue;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.service.BaseService;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.model.Audit;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.BaseService;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.models.ActivityTissue;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.dao.Chain;
src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionApplyController.java
+1 -1
View File
@@ -2,9 +2,9 @@ package io.v.nutz.zhgh.activity.controller.union;
import cn.hutool.core.util.StrUtil;
import cn.wizzer.framework.base.service.BaseService;
import io.v.nutz.zhgh.activity.models.ActivityTissue;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.service.SimpleService;
import io.v.nutz.zhgh.activity.models.ActivityTissue;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls;
src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java
+9 -44
View File
@@ -7,20 +7,21 @@ import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.policy.HackLoopTableRenderPolicy;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.result.Result;
import io.v.nutz.base.utils.*;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.ViService;
import io.v.nutz.base.utils.DateUtil;
import io.v.nutz.base.utils.OfficeTemplateUtil;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.utils.ViTool;
import io.v.nutz.sys.models.Sys_user;
import io.v.nutz.sys.services.SysMsgService;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.models.ActivityTissue;
import io.v.nutz.zhgh.activity.models.ActivityTissuePerson;
import io.v.nutz.zhgh.activity.models.ActivityUserScope;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import io.v.nutz.zhgh.activity.services.ActivityTissueService;
import io.v.nutz.zhgh.mobileHome.service.MobileHomeService;
import io.v.nutz.sys.models.Sys_user;
import io.v.nutz.sys.services.SysMsgService;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
@@ -47,7 +48,6 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author: Aaron
@@ -77,9 +77,6 @@ public class ActivityUnionManageController {
@Inject
private SysMsgService sysMsgService;
@Inject
private MsgApi msgApi;
@Inject("ActivityTissuePerson")
private ViService<ActivityTissuePerson> tissuePersonService;
@@ -178,9 +175,9 @@ public class ActivityUnionManageController {
});
tissue.getCover();
// if (tissue.getIsPushHome()!=0) {
// mobileHomeService.handle(tissue, "ActivityTissue", "/mobile/activity/unionActivity", tissue.getIsPushHome());
// }
if (tissue.getIsPushHome()!=0) {
mobileHomeService.handle(tissue, "ActivityTissue", "/mobile/activity/unionActivity", tissue.getIsPushHome());
}
activityTissueService.insertWith(tissue, "tissuePersonList");
activitySchoolService.dao().insert(tissue.getGoods());
@@ -323,36 +320,4 @@ public class ActivityUnionManageController {
activityTissueService.update(Chain.make("isDisabled", "1".equals(isDisabled)), Cnd.where("id", "=", id));
return null;
}
/**
* 活动发送短信
* @param activityId
* @param groupId
* @param msgUrl
* @return
*/
@At
@RequiresPermissions(value = {"activity.union.info", "activity.club.info", "activity.school.info2"}, logical = Logical.OR)
public Object doSendMsg(String activityId,String groupId,String msgUrl){
ActivityTissue activityTissue = sysUserService.dao().fetch(ActivityTissue.class, Cnd.where("id", "=", activityId));
List<ActivityUserScope> userScopeList = sysUserService.dao().query(ActivityUserScope.class, Cnd.where("groupId", "=", groupId));
List<String> userIds = userScopeList.stream().map(ActivityUserScope::getUserId).collect(Collectors.toList());
List<Sys_user> users = sysUserService.query(Cnd.where("id", "in", userIds));
List<String> userLoginNameList = users.stream().map(Sys_user::getLoginname).collect(Collectors.toList());
// //msgApi.sendWxMsg("会议通知", "", "text", "常熟理工学院五届二次教代会会议通知\\<a href=https://zhgh.cslg.edu.cn/1711354503398.jpg\\>查看更多</a>", List.of("17386049197"));
String msgText = ShiroUtil.getPrincipalProperty("username") + "邀请您参加【" + activityTissue.getName() + "】活动，请您点击卡片跳转至活动报名页";
try {
////msgApi.sendWxMsg("智慧工会【活动管理】", msgUrl, "textcard", msgText, userLoginNameList, "");
return Result.success();
} catch (Exception e){
e.printStackTrace();
return Result.error();
}
}
}
src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionPlanController.java
+3 -3
View File
@@ -1,11 +1,11 @@
package io.v.nutz.zhgh.activity.controller.union;
import io.v.nutz.zhgh.activity.models.ActivityPlan;
import io.v.nutz.zhgh.activity.services.ActivityPlanService;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.zhgh.activity.models.ActivityPlan;
import io.v.nutz.zhgh.activity.services.ActivityPlanService;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.ioc.loader.annotation.Inject;
src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionUserStatisticsController.java
+14 -5
View File
@@ -64,6 +64,7 @@ public class ActivityUnionUserStatisticsController {
@Param(value = "type", required = false) Integer type,
@Param(value = "activityId", required = false) String activityId,
@Param(value = "unionId", required = false) String unionId) {
ActivityTissue tissue = baseService.dao().fetch(ActivityTissue.class, activityId);
Sql sql = Sqls.create("""
SELECT
@@ -74,6 +75,8 @@ public class ActivityUnionUserStatisticsController {
u.unionname,
u.sex,
u.mobile,
atp.applyUserId,
atp.id atpId ,
atp.applyDateTime
FROM
`activity_tissue_person` atp
@@ -84,10 +87,12 @@ public class ActivityUnionUserStatisticsController {
cnd.and("atp.tissueId", "=", activityId);
cnd.andEX("u.unionId", "=", unionId);
if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) {
if (type == 40002) {
cnd.and("unionId", "=", Vi.getUnionId());
} else if (type == 40003) {
cnd.and("atp.id", "in", " SELECT userid FROM sys_club_user WHERE clubid = '%s' ".formatted(vi.getClubId()));
if (!tissue.getUserId().equals(ShiroUtil.getUserId())) {
if (type == 40002) {
cnd.and("unionId", "=", Vi.getUnionId());
} else if (type == 40003) {
cnd.and("u.id", "in", " SELECT userid FROM sys_club_user WHERE clubid = '%s' ".formatted(vi.getClubId()));
}
}
}
if (Strings.isNotBlank(page.getSearchName()) && Strings.isNotBlank(page.getSearchKeyword())) {
@@ -108,7 +113,11 @@ public class ActivityUnionUserStatisticsController {
@RequiresPermissions(value = {"activity.school.user.statistics", "activity.club.user.statistics", "activity.union.user.statistics"}, logical = Logical.OR)
public Object getActivityByYearOrType(@Param(value = "year", required = false) Integer year,
@Param(value = "type", required = false) Integer type) {
return baseService.dao().query(ActivityTissue.class, Cnd.where("type", "=", type).andEX("YEAR(startTime)", "=", year).desc("startTime"));
Cnd cnd = Cnd.NEW();
cnd.and("type", "=", type);
cnd.andEX("YEAR(startTime)", "=", year);
cnd.desc("startTime");
return baseService.dao().query(ActivityTissue.class, cnd);
}
src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionYearSummaryController.java
+2 -2
View File
@@ -3,12 +3,12 @@ package io.v.nutz.zhgh.activity.controller.union;
import cn.hutool.core.util.StrUtil;
import cn.wizzer.framework.base.Result;
import cn.wizzer.framework.base.service.BaseService;
import io.v.nutz.zhgh.activity.models.ActivityYearSummary;
import io.v.nutz.zhgh.activity.services.ActivityYearSummaryService;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.models.ActivityYearSummary;
import io.v.nutz.zhgh.activity.services.ActivityYearSummaryService;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.boot.starter.ftp.FtpService;
src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java
+1
View File
@@ -184,6 +184,7 @@ public class ActivitySchoolApply implements Serializable {
@Excel(name = "身份", width = 40)
private String sf;
private int age;
private int index;
}
src/main/java/io/v/nutz/zhgh/activity/services/ActivityBasicScopeService.java
+1 -1
View File
@@ -1,7 +1,7 @@
package io.v.nutz.zhgh.activity.services;
import io.v.nutz.zhgh.activity.models.ActivityUserScope;
import io.v.nutz.base.service.ViService;
import io.v.nutz.zhgh.activity.models.ActivityUserScope;
import org.nutz.dao.Cnd;
import org.nutz.dao.sql.Sql;
src/main/java/io/v/nutz/zhgh/activity/services/ActivityPlanService.java
+1 -1
View File
@@ -1,9 +1,9 @@
package io.v.nutz.zhgh.activity.services;
import io.v.nutz.zhgh.activity.models.ActivityPlan;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.ViService;
import io.v.nutz.zhgh.activity.models.ActivityPlan;
/**
* @author: Aaron
src/main/java/io/v/nutz/zhgh/activity/services/ActivitySchoolApplyService.java
+1 -1
View File
@@ -1,7 +1,7 @@
package io.v.nutz.zhgh.activity.services;
import io.v.nutz.zhgh.activity.models.ActivitySchoolApply;
import io.v.nutz.base.service.ViService;
import io.v.nutz.zhgh.activity.models.ActivitySchoolApply;
import java.util.List;
src/main/java/io/v/nutz/zhgh/activity/services/ActivitySchoolService.java
+1 -1
View File
@@ -1,9 +1,9 @@
package io.v.nutz.zhgh.activity.services;
import io.v.nutz.base.service.ViService;
import io.v.nutz.zhgh.activity.models.ActivitySchool;
import io.v.nutz.zhgh.activity.models.ActivitySchoolEvent;
import io.v.nutz.base.service.ViService;
/**
* @author Aaron
src/main/java/io/v/nutz/zhgh/activity/services/ActivityTissueService.java
+1 -1
View File
@@ -1,8 +1,8 @@
package io.v.nutz.zhgh.activity.services;
import io.v.nutz.zhgh.activity.models.ActivityTissue;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.ViService;
import io.v.nutz.zhgh.activity.models.ActivityTissue;
/**
* @author: Aaron
src/main/java/io/v/nutz/zhgh/activity/services/ActivityTypeService.java
+1 -1
View File
@@ -1,7 +1,7 @@
package io.v.nutz.zhgh.activity.services;
import io.v.nutz.zhgh.activity.models.ActivityType;
import io.v.nutz.base.service.ViService;
import io.v.nutz.zhgh.activity.models.ActivityType;
/**
* 会议类型 流程 service
src/main/java/io/v/nutz/zhgh/activity/services/ActivityYearSummaryService.java
+1 -1
View File
@@ -1,7 +1,7 @@
package io.v.nutz.zhgh.activity.services;
import io.v.nutz.zhgh.activity.models.ActivityYearSummary;
import io.v.nutz.base.service.ViService;
import io.v.nutz.zhgh.activity.models.ActivityYearSummary;
/**
* @Author JyuHsin
src/main/java/io/v/nutz/zhgh/activity/services/SiteReserveService.java
+1 -4
View File
@@ -1,11 +1,8 @@
package io.v.nutz.zhgh.activity.services;
import io.v.nutz.zhgh.activity.models.ActivitySiteReserve;
import io.v.nutz.base.service.BaseService;
import io.v.nutz.zhgh.activity.models.ActivitySiteReserve;
public interface SiteReserveService extends BaseService<ActivitySiteReserve> {
String getTimeStr(String time);
}
src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityBasicScopeServiceImpl.java
+2 -2
View File
@@ -1,10 +1,10 @@
package io.v.nutz.zhgh.activity.services.impl;
import cn.hutool.core.collection.CollectionUtil;
import io.v.nutz.base.service.impl.ViServiceImpl;
import io.v.nutz.base.utils.DateUtil;
import io.v.nutz.zhgh.activity.models.ActivityUserScope;
import io.v.nutz.zhgh.activity.services.ActivityBasicScopeService;
import io.v.nutz.base.utils.DateUtil;
import io.v.nutz.base.service.impl.ViServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityCommonServiceImpl.java
+4 -4
View File
@@ -1,13 +1,13 @@
package io.v.nutz.zhgh.activity.services.impl;
import io.v.nutz.zhgh.activity.models.ActivitySiteInfo;
import io.v.nutz.zhgh.activity.models.ActivityType;
import io.v.nutz.zhgh.activity.services.ActivityCommonService;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.enums.AuditTypeEnum;
import io.v.nutz.base.model.AuditState;
import io.v.nutz.base.service.impl.ViServiceImpl;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.models.ActivitySiteInfo;
import io.v.nutz.zhgh.activity.models.ActivityType;
import io.v.nutz.zhgh.activity.services.ActivityCommonService;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
import org.nutz.dao.Sqls;
src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityPlanServiceImpl.java
+3 -3
View File
@@ -1,12 +1,12 @@
package io.v.nutz.zhgh.activity.services.impl;
import io.v.nutz.zhgh.activity.models.ActivityPlan;
import io.v.nutz.zhgh.activity.services.ActivityPlanService;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.impl.ViServiceImpl;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.models.ActivityPlan;
import io.v.nutz.zhgh.activity.services.ActivityPlanService;
import org.nutz.dao.Dao;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivitySchoolApplyServiceImpl.java
+1 -1
View File
@@ -1,9 +1,9 @@
package io.v.nutz.zhgh.activity.services.impl;
import io.v.nutz.base.service.impl.ViServiceImpl;
import io.v.nutz.zhgh.activity.models.ActivitySchoolApply;
import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService;
import io.v.nutz.base.service.impl.ViServiceImpl;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivitySchoolServiceImpl.java
+3 -3
View File
@@ -1,13 +1,13 @@
package io.v.nutz.zhgh.activity.services.impl;
import io.v.nutz.base.service.ViService;
import io.v.nutz.base.service.impl.ViServiceImpl;
import io.v.nutz.base.utils.DateUtil;
import io.v.nutz.zhgh.activity.models.*;
import io.v.nutz.zhgh.activity.services.ActivitySchoolApplyService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import io.v.nutz.zhgh.activity.services.ActivitySchoolTeamService;
import io.v.nutz.base.utils.DateUtil;
import io.v.nutz.base.service.ViService;
import io.v.nutz.base.service.impl.ViServiceImpl;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityTissueServiceImpl.java
+9 -8
View File
@@ -1,18 +1,18 @@
package io.v.nutz.zhgh.activity.services.impl;
import cn.hutool.core.util.StrUtil;
import io.v.nutz.base.model.Goods;
import io.v.nutz.zhgh.activity.models.ActivityTissue;
import io.v.nutz.zhgh.activity.models.ActivityTissuePerson;
import io.v.nutz.zhgh.activity.services.ActivityTissueService;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.zhgh.jf.model.ActivityBx;
import io.v.nutz.base.model.Audit;
import io.v.nutz.base.model.Goods;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.ViService;
import io.v.nutz.base.service.impl.ViServiceImpl;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.models.ActivityTissue;
import io.v.nutz.zhgh.activity.models.ActivityTissuePerson;
import io.v.nutz.zhgh.activity.services.ActivityTissueService;
import io.v.nutz.zhgh.jf.model.ActivityBx;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Chain;
import org.nutz.dao.Cnd;
@@ -76,11 +76,12 @@ public class ActivityTissueServiceImpl extends ViServiceImpl<ActivityTissue> imp
}
if (!ShiroUtil.hasAnyRoles("sysadmin,H10,A06")) {
if (ShiroUtil.hasRole("H04")) {
cnd.and("tissue.userId", "=", ShiroUtil.getUserId());
/* if (ShiroUtil.hasRole("H04")) {
cnd.and("tissue.unionId", "in", vi.getMangeUnionStr());
} else if (ShiroUtil.hasRole("club01")) {
cnd.and("tissue.clubId", "in", vi.getMangeClubStr());
}
}*/
}
if (StrUtil.isNotBlank(page.getPageOrderName()) && StrUtil.isNotBlank(page.getPageOrderBy())) {
src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityTypeServiceImpl.java
+3 -3
View File
@@ -1,11 +1,11 @@
package io.v.nutz.zhgh.activity.services.impl;
import io.v.nutz.zhgh.activity.models.ActivityType;
import io.v.nutz.zhgh.activity.services.ActivityCommonService;
import io.v.nutz.zhgh.activity.services.ActivityTypeService;
import io.v.nutz.base.model.AuditState;
import io.v.nutz.base.model.AuditStateUser;
import io.v.nutz.base.service.impl.ViServiceImpl;
import io.v.nutz.zhgh.activity.models.ActivityType;
import io.v.nutz.zhgh.activity.services.ActivityCommonService;
import io.v.nutz.zhgh.activity.services.ActivityTypeService;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
src/main/java/io/v/nutz/zhgh/activity/services/impl/ActivityYearSummaryServiceImpl.java
+1 -1
View File
@@ -1,8 +1,8 @@
package io.v.nutz.zhgh.activity.services.impl;
import io.v.nutz.base.service.impl.ViServiceImpl;
import io.v.nutz.zhgh.activity.models.ActivityYearSummary;
import io.v.nutz.zhgh.activity.services.ActivityYearSummaryService;
import io.v.nutz.base.service.impl.ViServiceImpl;
import org.nutz.dao.Dao;
import org.nutz.ioc.loader.annotation.IocBean;
src/main/java/io/v/nutz/zhgh/activity/services/impl/SiteReserveServiceImpl.java
+1 -15
View File
@@ -1,15 +1,12 @@
package io.v.nutz.zhgh.activity.services.impl;
import io.v.nutz.base.service.impl.BaseServiceImpl;
import io.v.nutz.zhgh.activity.models.ActivitySiteReserve;
import io.v.nutz.zhgh.activity.services.SiteReserveService;
import io.v.nutz.base.service.impl.BaseServiceImpl;
import org.nutz.dao.Dao;
import org.nutz.ioc.loader.annotation.IocBean;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
/**
* @author: Aaron
* @create: 2020-12-13 14:32
@@ -20,15 +17,4 @@ public class SiteReserveServiceImpl extends BaseServiceImpl<ActivitySiteReserve>
public SiteReserveServiceImpl(Dao dao) {
super(dao);
}
@Override
public String getTimeStr(String time) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
// 解析字符串为LocalDateTime对象
LocalDateTime dateTime = LocalDateTime.parse(time, formatter);
// 只包含时分的格式化器
DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm");
return dateTime.toLocalTime().format(timeFormatter);
}
}
src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateApplyController.java
+28 -12
View File
@@ -1,23 +1,19 @@
package io.v.nutz.zhgh.evaluate.controller;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.util.StrUtil;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.result.Result;
import io.v.nutz.base.utils.DateUtil;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.sys.models.Sys_union;
import io.v.nutz.sys.services.SysUnionService;
import io.v.nutz.web.commons.slog.annotation.SLog;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.evaluate.handler.EvaluateToDoHandler;
import io.v.nutz.zhgh.evaluate.models.Evaluate;
import io.v.nutz.zhgh.evaluate.models.EvaluateApply;
import io.v.nutz.zhgh.evaluate.service.EvaluateApplyService;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.sys.models.Sys_union;
import io.v.nutz.sys.models.Sys_unit;
import io.v.nutz.sys.models.Sys_user;
import io.v.nutz.sys.services.SysUnionService;
import io.v.nutz.web.commons.slog.annotation.SLog;
import io.v.nutz.web.commons.utils.ShiroUtil;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.aop.interceptor.ioc.TransAop;
@@ -25,15 +21,14 @@ import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
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 org.nutz.trans.Trans;
import java.util.List;
import java.util.Map;
@@ -98,6 +93,12 @@ public class EvaluateApplyController {
if (Strings.isNotBlank(evaluateApply.getId())) {
evaluateApplyService.updateIgnoreNull(evaluateApply);
} else {
//判断有没有申请过
SqlExpressionGroup group = Cnd.exps("userId", "=", ShiroUtil.getPlatformUid()).or("userId", "=", ShiroUtil.getPlatformUsername());
int count = evaluateApplyService.count(Cnd.NEW().and("evaluateId", "=", evaluateApply.getEvaluateId()).and(group));
if(count > 0) {
return cn.wizzer.framework.base.Result.error("抱歉，您已申请过此评优评先，无法提交");
}
evaluateApply.setApplyTime(DateUtil.getDate());
evaluateApply.setStateId(1400);
evaluateApplyService.insert(evaluateApply);
@@ -112,6 +113,7 @@ public class EvaluateApplyController {
@RequiresPermissions("evaluate.apply")
@SLog(tag = "申请评优评先新增、修改", param = true, result = true)
public Object doSubmit(EvaluateApply evaluateApply) {
evaluateApply.setUserId(ShiroUtil.getPrincipalProperty("id").toString());
if (!"8a8b455b964a41f2bbf18a4896cbd83e".equals(evaluateApply.getHonorTypeId())) {
@@ -129,6 +131,20 @@ public class EvaluateApplyController {
evaluateApply.setSchoolAuditId(null);
evaluateApplyService.update(evaluateApply);
} else {
//判断时间有没有过
Evaluate eva = evaluateApplyService.dao().fetch(Evaluate.class, evaluateApply.getEvaluateId());
DateTime currentTime = cn.hutool.core.date.DateUtil.date();
DateTime targetTimeStr = cn.hutool.core.date.DateUtil.parse(eva.getEndTime());
if(cn.hutool.core.date.DateUtil.compare(currentTime, targetTimeStr) > 0) {
return cn.wizzer.framework.base.Result.error("抱歉，申请时间已过，无法提交");
}
//判断有没有申请过
SqlExpressionGroup group = Cnd.exps("userId", "=", ShiroUtil.getPlatformUid()).or("userId", "=", ShiroUtil.getPlatformUsername());
int count = evaluateApplyService.count(Cnd.NEW().and("evaluateId", "=", evaluateApply.getEvaluateId()).and(group));
if(count > 0) {
return cn.wizzer.framework.base.Result.error("抱歉，您已申请过此评优评先，无法提交");
}
evaluateApply.setApplyTime(DateUtil.getDate());
evaluateApply.setStateId("8a8b455b964a41f2bbf18a4896cbd83e".equals(evaluateApply.getHonorTypeId()) ? 1600 : 1800);
evaluateApplyService.insert(evaluateApply);
src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateController.java
+4 -4
View File
@@ -3,14 +3,14 @@ package io.v.nutz.zhgh.evaluate.controller;
import cn.hutool.core.util.StrUtil;
import cn.wizzer.framework.base.Result;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.sys.services.SysMsgService;
import io.v.nutz.web.commons.slog.annotation.SLog;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.evaluate.models.Evaluate;
import io.v.nutz.zhgh.evaluate.models.EvaluateApply;
import io.v.nutz.zhgh.evaluate.service.EvaluateService;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.sys.services.SysMsgService;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.web.commons.slog.annotation.SLog;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.apache.shiro.authz.annotation.RequiresPermissions;
src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluatePartyAuditController.java
+6 -7
View File
@@ -2,18 +2,17 @@ package io.v.nutz.zhgh.evaluate.controller;
import cn.hutool.core.util.StrUtil;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.zhgh.evaluate.models.Evaluate;
import io.v.nutz.zhgh.evaluate.models.EvaluateApply;
import io.v.nutz.base.model.Audit;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.ViService;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.sys.models.Sys_user;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.web.commons.slog.annotation.SLog;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.evaluate.models.Evaluate;
import io.v.nutz.zhgh.evaluate.models.EvaluateApply;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.dao.Chain;
import org.nutz.dao.Cnd;
@@ -45,7 +44,7 @@ public class EvaluatePartyAuditController {
@Inject
private Dao dao;
@At("")
@RequiresPermissions("evaluate.audit.party")
src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateSchoolAuditController.java
+7 -7
View File
@@ -5,24 +5,23 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.hutool.core.util.StrUtil;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.zhgh.evaluate.handler.EvaluateToDoHandler;
import io.v.nutz.zhgh.evaluate.models.Evaluate;
import io.v.nutz.zhgh.evaluate.models.EvaluateApply;
import io.v.nutz.base.model.Audit;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.ViService;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.utils.ViTool;
import io.v.nutz.sys.models.Sys_file;
import io.v.nutz.sys.models.Sys_union;
import io.v.nutz.sys.models.Sys_user;
import io.v.nutz.sys.services.SysUnionService;
import io.v.nutz.sys.services.SysUserService;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.base.utils.ViTool;
import io.v.nutz.web.commons.slog.annotation.SLog;
import io.v.nutz.web.commons.utils.FileUtil;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.evaluate.handler.EvaluateToDoHandler;
import io.v.nutz.zhgh.evaluate.models.Evaluate;
import io.v.nutz.zhgh.evaluate.models.EvaluateApply;
import org.apache.commons.io.IOUtils;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -208,6 +207,7 @@ public class EvaluateSchoolAuditController {
}
@At
@Ok("void")
@RequiresPermissions("evaluate.audit.school")
public void exportTableData(String data, HttpServletResponse response) {
NutMap map = Json.fromJson(NutMap.class, data);
src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateSummaryController.java
+9 -11
View File
@@ -5,14 +5,13 @@ import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.policy.HackLoopTableRenderPolicy;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.OfficeTemplateUtil;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.ViService;
import io.v.nutz.base.utils.OfficeTemplateUtil;
import io.v.nutz.web.commons.slog.annotation.SLog;
import io.v.nutz.web.commons.utils.ShiroUtil;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.ioc.loader.annotation.Inject;
@@ -26,7 +25,6 @@ import org.nutz.mvc.annotation.Param;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -64,14 +62,14 @@ public class EvaluateSummaryController {
@Param(value = "unitId", required = false) String unitId,
@Param(value = "honorType", required = false) String honorType,
@Param(value = "evaluateId", required = false) String evaluateId) {
CndPlus cnd = CndPlus.create();
Cnd cnd = Cnd.NEW();
Sql sql = Sqls.create("""
SELECT
ea.*,
e.NAME AS evaluateName,
unit.NAME AS unitName,
us.userName
us.userName as userName
FROM
evaluate_apply ea
LEFT JOIN evaluate e ON e.id = ea.evaluateId
@@ -81,11 +79,11 @@ public class EvaluateSummaryController {
$condition
""");
cnd.andEx("ea.evaluateId", "=", evaluateId);
cnd.andEx("YEAR(ea.applyTime)", "=", year);
cnd.andEx("ea.unionid", "=", unionId);
cnd.andEx("us.unitid", "=", unitId);
cnd.andEx("ea.honorTypeId", "=", honorType);
cnd.andEX("ea.evaluateId", "=", evaluateId);
cnd.andEX("YEAR(ea.applyTime)", "=", year);
cnd.andEX("ea.unionid", "=", unionId);
cnd.andEX("us.unitid", "=", unitId);
cnd.andEX("ea.honorTypeId", "=", honorType);
if(!ShiroUtil.hasAnyRoles("sysadmin") || ShiroUtil.hasAnyRoles("H10")) {
cnd.and("e.userid", "=", ShiroUtil.getPrincipalProperty("id"));
src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateUnionAuditController.java
+7 -13
View File
@@ -2,20 +2,17 @@ package io.v.nutz.zhgh.evaluate.controller;
import cn.hutool.core.util.StrUtil;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.zhgh.evaluate.handler.EvaluateToDoHandler;
import io.v.nutz.zhgh.evaluate.models.Evaluate;
import io.v.nutz.zhgh.evaluate.models.EvaluateApply;
import io.v.nutz.base.model.Audit;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.ViService;
import io.v.nutz.sys.models.Sys_union;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.sys.models.Sys_user;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.web.commons.slog.annotation.SLog;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.evaluate.handler.EvaluateToDoHandler;
import io.v.nutz.zhgh.evaluate.models.Evaluate;
import io.v.nutz.zhgh.evaluate.models.EvaluateApply;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Chain;
@@ -26,13 +23,10 @@ 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.lang.util.NutMap;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import java.util.List;
/**
* @author zhf
* @date 2021/11/19 14:36
@@ -156,7 +150,7 @@ public class EvaluateUnionAuditController {
// //sendMsg.pushWeChatMsg("评优评先", msg, map.getString("loginname"));
// }
// } else {
// String msg = "%s老师您好，您于%s申请的【%s】评优评先，在分工会审核时被驳回！"
// String msg = "%s老师您好，您于%s申请的【%s】评优评先，在院级工会审核时被驳回！"
// .formatted(applyUser.getUsername(), evaluateApply.getApplyTime(), evaluate.getName());
// //sendMsg.pushWeChatMsg("评优评先", msg, applyUser.getLoginname());
// }
@@ -181,7 +175,7 @@ public class EvaluateUnionAuditController {
//回到初始状态，审核记录可以不用清除，让申请人能看到是因为什么原因退回
evaluateApplyViService.update(Chain.make("stateId", 1400).add("unionAuditId", audit.getId()), Cnd.where("id", "=", id));
//退回发短信
String msg = "%s老师您好，您于%s申请的【%s】评优评先，在分工会审核时被退回！"
String msg = "%s老师您好，您于%s申请的【%s】评优评先，在院级工会审核时被退回！"
.formatted(applyUser.getUsername(), evaluateApply.getApplyTime(), evaluate.getName());
//sendMsg.pushWeChatMsg("评优评先", msg, applyUser.getLoginname());
src/main/java/io/v/nutz/zhgh/evaluate/controller/EvaluateUnitAuditController.java
+7 -8
View File
@@ -2,20 +2,19 @@ package io.v.nutz.zhgh.evaluate.controller;
import cn.hutool.core.util.StrUtil;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.zhgh.evaluate.models.Evaluate;
import io.v.nutz.zhgh.evaluate.models.EvaluateApply;
import io.v.nutz.base.model.Audit;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.ViService;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.sys.models.Sys_union;
import io.v.nutz.sys.models.Sys_unit;
import io.v.nutz.sys.models.Sys_user;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.web.commons.slog.annotation.SLog;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.evaluate.models.Evaluate;
import io.v.nutz.zhgh.evaluate.models.EvaluateApply;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.dao.Chain;
import org.nutz.dao.Cnd;
@@ -47,7 +46,7 @@ public class EvaluateUnitAuditController {
@Inject
private Dao dao;
@At("")
@RequiresPermissions("evaluate.audit.unit")
@@ -131,7 +130,7 @@ public class EvaluateUnitAuditController {
$condition
""");
cndPlus.andEx("ur.roleId", "=", Roles.UNION_MANGER);
cndPlus.andEx("ur.unionId", "=", ((Sys_union) io.v.nutz.web.commons.utils.ShiroUtil.getPrincipalProperty("union")).getId());
cndPlus.andEx("ur.unionId", "=", ((Sys_union) ShiroUtil.getPrincipalProperty("union")).getId());
sql.setCondition(cndPlus);
List<NutMap> userList = evaluateApplyViService.listMap(sql);
for (NutMap map : userList) {
src/main/java/io/v/nutz/zhgh/evaluate/handler/EvaluateToDoHandler.java
+4 -6
View File
@@ -7,8 +7,6 @@ import io.v.nutz.sys.services.impl.SysLocalProcessServiceImpl;
import io.v.nutz.web.commons.base.Globals;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.evaluate.models.EvaluateApply;
import io.v.nutz.zhgh.medicalMutualAidFund.constant.MedicalMutualAidFundAuditStateConstant;
import io.v.nutz.zhgh.medicalMutualAidFund.model.MedicalMutualAidFund;
import lombok.Getter;
import org.nutz.dao.Dao;
import org.nutz.dao.Sqls;
@@ -25,7 +23,7 @@ public enum EvaluateToDoHandler {
START_PROCESS() {
@Override
public void exec(EvaluateApply e) {
Sql sql = Sqls.fetchString(Sqls.create("select username from sys_user where id = @id").setParam("userId", e.getUserId()).toString());
Sql sql = Sqls.fetchString(Sqls.create("select username from sys_user where id = @id").setParam("id", e.getUserId()).toString());
dao.execute(sql);
String username = sql.getString();
@@ -34,8 +32,8 @@ public enum EvaluateToDoHandler {
"evaluate_apply@" + e.getId(),
"",
e.getUserId(),
Globals.AppDomain + "/platform/fw/difficulty/applylist",
Globals.AppDomain + "/platform/fw/difficulty/applylist"
Globals.AppDomain + "/platform/evaluate/apply",
Globals.AppDomain + "/platform/evaluate/apply"
);
}
@@ -120,7 +118,7 @@ public enum EvaluateToDoHandler {
"/platform/evaluate/audit/union"
);
localProcessService.updateProcessNodeName("medical_mutual_aid_fund@" + e.getId(), "分工会审核");
localProcessService.updateProcessNodeName("evaluate_apply@" + e.getId(), "分工会审核");
}
},
src/main/java/io/v/nutz/zhgh/evaluate/service/EvaluateApplyService.java
+1 -1
View File
@@ -1,9 +1,9 @@
package io.v.nutz.zhgh.evaluate.service;
import io.v.nutz.base.page.Pagination;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.BaseService;
import io.v.nutz.zhgh.evaluate.models.EvaluateApply;
import io.v.nutz.base.query.PageForm;
import org.nutz.dao.Cnd;
/**
src/main/java/io/v/nutz/zhgh/evaluate/service/EvaluateService.java
+1 -1
View File
@@ -1,9 +1,9 @@
package io.v.nutz.zhgh.evaluate.service;
import io.v.nutz.base.page.Pagination;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.BaseService;
import io.v.nutz.zhgh.evaluate.models.Evaluate;
import io.v.nutz.base.query.PageForm;
import org.nutz.dao.Cnd;
import org.nutz.lang.util.NutMap;
src/main/java/io/v/nutz/zhgh/evaluate/service/impl/EvaluateServiceApplyImpl.java
+2 -2
View File
@@ -1,6 +1,8 @@
package io.v.nutz.zhgh.evaluate.service.impl;
import io.v.nutz.base.model.Audit;
import io.v.nutz.base.page.Pagination;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.result.Result;
import io.v.nutz.base.service.impl.BaseServiceImpl;
import io.v.nutz.base.utils.FileService;
@@ -8,8 +10,6 @@ import io.v.nutz.base.utils.Vi;
import io.v.nutz.zhgh.evaluate.models.Evaluate;
import io.v.nutz.zhgh.evaluate.models.EvaluateApply;
import io.v.nutz.zhgh.evaluate.service.EvaluateApplyService;
import io.v.nutz.base.model.Audit;
import io.v.nutz.base.query.PageForm;
import lombok.extern.slf4j.Slf4j;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
src/main/java/io/v/nutz/zhgh/evaluate/service/impl/EvaluateServiceImpl.java
+2 -2
View File
@@ -1,12 +1,12 @@
package io.v.nutz.zhgh.evaluate.service.impl;
import io.v.nutz.zhgh.activity.models.ActivityUserScope;
import io.v.nutz.base.page.Pagination;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.impl.BaseServiceImpl;
import io.v.nutz.zhgh.activity.models.ActivityUserScope;
import io.v.nutz.zhgh.evaluate.models.Evaluate;
import io.v.nutz.zhgh.evaluate.models.EvaluateQuotaAllocation;
import io.v.nutz.zhgh.evaluate.service.EvaluateService;
import io.v.nutz.base.query.PageForm;
import lombok.extern.slf4j.Slf4j;
import org.nutz.dao.Chain;
import org.nutz.dao.Cnd;
src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupListController.java
+1
View File
@@ -84,6 +84,7 @@ public class HealthCheckupListController {
cnd.andEX("hcu.unitId", "=", unitId);
cnd.andEX("hcu.unionGroupId", "=", unionGroupId);
cnd.andEX("hcu.threeUnitId", "=", threeUnitId);
cnd.andEX("hcu.projectId","=",projectId);
if (!ShiroUtil.hasAnyRoles("sysadmin,A06")) {
cnd.andEX("hcu.unionId", "=", Vi.getUnionId());
src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupProjectMangeController.java
+1 -1
View File
@@ -184,9 +184,9 @@ public class HealthCheckupProjectMangeController {
List<String> userSelectionIds = list.stream().map(v->v.getString("id")).collect(Collectors.toList());
List<String> userIds = list.stream().map(v -> v.getString("selectUserId")).collect(Collectors.toList());
healthCheckupProjectService.dao().clear(HealthCheckupUser.class,Cnd.where("projectId","=",healthCheckupProject.getId()));
healthCheckupProjectService.dao().clear(HealthCheckupUserSelection.class,Cnd.where("selectUserId","in",userIds));
healthCheckupProjectService.dao().clear(HealthCheckupUserCompanion.class,Cnd.where("userSelectionId","in",userSelectionIds));
healthCheckupProjectService.dao().clear(HealthCheckupUser.class,Cnd.where("projectId","=",healthCheckupProject.getId()));
healthCheckupProjectService.addHealthCheckupUser(healthCheckupProject);
return null;
}
src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java
+7 -7
View File
@@ -36,11 +36,11 @@ public class HealthCheckupSingleServiceImpl extends ViServiceImpl<HealthCheckupP
Sql sql = Sqls.create("""
SELECT
su.*,
(SELECT count( 1 ) FROM `health_checkup_user` hcu WHERE hcu.unionId = su.id $unionGroupIdCnd ) sumCount
(SELECT count( 1 ) FROM `health_checkup_user` hcu WHERE hcu.unionId = su.id and hcu.projectId = @projectId $unionGroupIdCnd ) sumCount
FROM
sys_union su
$condition
""");
""").setParam("projectId",projectId);
CndPlus cnd = CndPlus.create();
cnd.andEX("su.id","=",unionId);
cnd.asc("su.unioncode");
@@ -175,7 +175,7 @@ public class HealthCheckupSingleServiceImpl extends ViServiceImpl<HealthCheckupP
SELECT
GROUP_CONCAT( hcps.optionName )
FROM
welfare_project_user_selection hcus
health_checkup_user_selection hcus
LEFT JOIN `health_checkup_project_subject` hcps ON hcps.id = hcus.subjectId
WHERE
hcus.projectId = @projectId
@@ -203,11 +203,11 @@ public class HealthCheckupSingleServiceImpl extends ViServiceImpl<HealthCheckupP
u.idcard idCard,
u.mobile
FROM
`activity_user_scope` aus
`health_checkup_user` aus
LEFT JOIN `user` u ON u.id = aus.userId
$projectCnd $condition
""");
cnd.and("aus.groupId","=",project.getActivityGroupId());
// cnd.and("aus.groupId","=",project.getActivityGroupId());
sql.setVar("projectCnd", "AND u.id NOT IN ( SELECT selectUserId FROM `health_checkup_user_selection` WHERE projectId = '" + projectId + "' AND selectUserId IS NOT NULL )");
}
}
@@ -279,11 +279,11 @@ public class HealthCheckupSingleServiceImpl extends ViServiceImpl<HealthCheckupP
u.idcard idCard,
u.mobile
FROM
`activity_user_scope` aus
`health_checkup_user` aus
LEFT JOIN `user` u ON u.id = aus.userId
$projectCnd $condition
""");
cnd.and("aus.groupId","=",project.getActivityGroupId());
// cnd.and("aus.groupId","=",project.getActivityGroupId());
sql.setVar("projectCnd", "AND u.id NOT IN ( SELECT selectUserId FROM `health_checkup_user_selection` WHERE projectId = '" + projectId + "' AND selectUserId IS NOT NULL )");
}
}
src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ApplyController.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class ApplyController {
}
activityBxService.doAdd(activityBx);
if (Lang.isNotEmpty(loginNames)) {
////msgApi.sendWxMsg("活动申报", "", "text", activityBx.getUser_name() + "申请了一条活动申报【" + activityBx.getActivity_name() + "】,请前往智慧工会进行审核。", loginNames, null);
// msgApi.sendWxMsg("活动申报", "", "text", activityBx.getUser_name() + "申请了一条活动申报【" + activityBx.getActivity_name() + "】,请前往智慧工会进行审核。", loginNames, null);
NutMap map = new NutMap();
map.setv("userId",activityBx.getUser_id());
src/main/java/io/v/nutz/zhgh/jf/service/impl/ActivityBxServiceImpl.java
+1 -1
View File
@@ -130,7 +130,7 @@ public class ActivityBxServiceImpl extends ViServiceImpl<ActivityBx> implements
sql.setCallback(Sqls.callback.map());
dao().execute(sql);
NutMap record = (NutMap) sql.getResult();
record.setv("Goods", dao().query("Goods", Cnd.where("reid", "=", record.getString("id"))));
record.setv("Goods", dao().query(Goods.class, Cnd.where("reid", "=", record.getString("id"))));
if (record.size() == 0) {
return null;
src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteAuditMobileController.java
+3 -3
View File
@@ -3,12 +3,12 @@ package io.v.nutz.zhgh.mobile.activity.site;
import cn.hutool.core.util.StrUtil;
import cn.wizzer.framework.page.Pagination;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.enums.AuditTypeEnum;
import io.v.nutz.base.utils.MsgApi;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.enums.AuditTypeEnum;
import io.v.nutz.base.model.Audit;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.utils.MsgApi;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.sys.services.SysUserService;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.services.ActivityCommonService;
src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteInfoMobileApplyController.java
+1 -1
View File
@@ -1,8 +1,8 @@
package io.v.nutz.zhgh.mobile.activity.site;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.web.commons.slog.annotation.SLog;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.models.ActivitySiteReserve;
import io.v.nutz.zhgh.activity.services.ActivitySchoolService;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
src/main/java/io/v/nutz/zhgh/mobile/activity/site/SiteInfoMobileController.java
+1 -1
View File
@@ -3,8 +3,8 @@ package io.v.nutz.zhgh.mobile.activity.site;
import cn.hutool.core.util.StrUtil;
import cn.wizzer.framework.page.Pagination;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.MsgApi;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.utils.MsgApi;
import io.v.nutz.sys.services.SysUserService;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.models.ActivitySiteInfo;
src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityMineController.java
+2 -2
View File
@@ -1,11 +1,11 @@
package io.v.nutz.zhgh.mobile.activity.unionActivity;
import io.v.nutz.zhgh.activity.models.ActivityTissue;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.SimpleService;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.models.ActivityTissue;
import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
src/main/java/io/v/nutz/zhgh/mobile/activity/unionActivity/UnionActivityRegisterController.java
+22 -14
View File
@@ -2,17 +2,17 @@ package io.v.nutz.zhgh.mobile.activity.unionActivity;
import cn.hutool.core.util.StrUtil;
import cn.wizzer.framework.base.Result;
import io.v.nutz.zhgh.activity.models.ActivityTissue;
import io.v.nutz.zhgh.activity.models.ActivityTissuePerson;
import io.v.nutz.zhgh.activity.models.ActivityUserScope;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.SimpleService;
import io.v.nutz.base.utils.DateUtil;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.sys.models.Sys_user;
import io.v.nutz.sys.models.User;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.activity.models.ActivityTissue;
import io.v.nutz.zhgh.activity.models.ActivityTissuePerson;
import io.v.nutz.zhgh.activity.models.ActivityUserScope;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.nutz.dao.Chain;
import org.nutz.dao.Cnd;
@@ -31,7 +31,6 @@ import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import org.nutz.trans.Trans;
import java.util.Date;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.locks.Lock;
@@ -121,9 +120,9 @@ public class UnionActivityRegisterController {
@ViReturn
@RequiresAuthentication
public Object pageData(PageForm pageForm,
@Param(value = "year",required = false) Integer year,
@Param(value = "activityStatus",required = false)int activityStatus,
@Param(value = "activityLevel",required = false)String activityLevel) {
@Param(value = "year", required = false) Integer year,
@Param(value = "activityStatus", required = false) int activityStatus,
@Param(value = "activityLevel", required = false) String activityLevel) {
Sql sql = Sqls.create("""
SELECT
id,
@@ -164,7 +163,7 @@ public class UnionActivityRegisterController {
allCnd.andEX("projectTypeCode", "!=", "50004");
allCnd.andEX("signUpMethod", "is not", null);
allCnd.andEX("state", "=", 3);
allCnd.and(new Static("(SELECT COUNT(1) FROM activity_user_scope WHERE groupId= ti.groupId AND userId='%s') >0".formatted(io.v.nutz.web.commons.utils.ShiroUtil.getUserId())));
allCnd.and(new Static("(SELECT COUNT(1) FROM activity_user_scope WHERE groupId= ti.groupId AND userId='%s') >0".formatted(ShiroUtil.getUserId())));
if (!ShiroUtil.hasAnyRoles(Lang.list("sysadmin", "A06"))) {
if (ShiroUtil.hasRole("H04")) {
allCnd.andEX("signUpMethod", "in", Lang.array(1, 2, 3));
@@ -177,7 +176,7 @@ public class UnionActivityRegisterController {
YEAR ( startTime )= %s
AND ( SELECT COUNT( 1 ) FROM activity_user_scope WHERE groupId = activityGroupId AND userId = '%s' ) > 0
AND JSON_CONTAINS(applyWay -> '$[*]','1','$' )
""".formatted(year, io.v.nutz.web.commons.utils.ShiroUtil.getUserId()));
""".formatted(year, ShiroUtil.getUserId()));
switch (activityStatus) {
case 2 -> {
allCnd.and(new Static("applyStartTime < now()"));
@@ -195,12 +194,12 @@ public class UnionActivityRegisterController {
sql.setVar("schoolTime", "AND endTime < now()");
}
case 5->{
case 5 -> {
allCnd.and(new Static("applyStartTime > now()"));
sql.setVar("schoolTime", "AND applyStartTime > now()");
}
}
allCnd.and("isDisabled","=",1);
allCnd.and("isDisabled", "=", 1);
// allCnd.desc("endTime");
if (Strings.isNotBlank(activityLevel)) {
sql.setVar("schoolLevel", "AND activityLevel='%s'".formatted(activityLevel));
@@ -496,9 +495,18 @@ public class UnionActivityRegisterController {
@At
@ViReturn
@RequiresAuthentication
public Object doSingleCancelRegister(String activityId) {
public Object doSingleCancelRegister(String activityId, String applyUserId, String id) {
ActivityTissue tissue = simpleService.dao().fetch(ActivityTissue.class, activityId);
if (!tissue.isEnrollSystem()) {
simpleService.dao().delete(ActivityTissuePerson.class, id);
return Result.success().addMsg("取消成功！");
}
if (StrUtil.isBlank(applyUserId)) {
applyUserId = ShiroUtil.getPrincipalProperty("id").toString();
}
simpleService.dao().clear(ActivityTissuePerson.class, Cnd.where("tissueId", "=", activityId)
.and("userId", "=", ShiroUtil.getPrincipalProperty("id")));
.and("applyUserId", "=", applyUserId));
return Result.success().addMsg("取消成功！");
}
src/main/java/io/v/nutz/zhgh/mobile/healthCheckup/MHealthCheckupListController.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class MHealthCheckupListController {
public Object pageData(PageForm pageForm, @Param(value = "tabName", required = false) String tabName) {
Sql sql = Sqls.create("""
select
*,
p.*,
(select count(*) from health_checkup_user_selection s where s.projectId=p.id and s.selectUserId=@userId) as selectCount
from
health_checkup_project p
src/main/java/io/v/nutz/zhgh/zc/controller/ZgfwZcZhcxController.java
+7 -7
View File
@@ -80,13 +80,13 @@ public class ZgfwZcZhcxController {
LEFT JOIN sys_union us ON us.id = xx.zclydwhid
$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.id", "=", ghid);
Cnd cndPlus = Cnd.NEW();
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.id", "=", ghid);
if (StrUtil.isNotBlank(pageOrderName) && StrUtil.isNotBlank(pageOrderBy)) {
cndPlus.orderBy(pageOrderName, pageOrderBy.equals("desc") ? "desc" : "asc");
} else {