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

活动申报+基层工会

Browse Source
This commit is contained in:
Paidax
2025-02-28 17:01:09 +08:00
parent f7d05c43a0
commit f539184fca
456 changed files with 32939 additions and 35577 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/base/utils/Vi.java
+1 -1
View File
@@ -363,7 +363,7 @@ public class Vi {
return list.stream().map(v-> v.getString("loginname")).collect(Collectors.toList());
}
//查询当前登录用户的分工会管理员
//查询当前登录用户的基层工会管理员
public List<User> getUnionManageByCurrentUser() {
List<Sys_user_role> userRoles = baseService.dao().query(Sys_user_role.class, Cnd.where("roleid", "=", Roles.UNION_MANGER).and("unionid", "=", getUnionId()));
List<String> list = userRoles.stream().map(Sys_user_role::getUserId).distinct().collect(Collectors.toList());
src/main/java/io/v/nutz/sys/controllers/platform/caredata/UnionCareDataCon.java
+2 -2
View File
@@ -204,7 +204,7 @@ public class UnionCareDataCon {
put("num", baseService.count(sql1));
}});
list.add(new HashMap<String, Object>() {{
put("type", "分工会活动");
put("type", "基层工会活动");
put("num", baseService.count(sql2));
}});
list.add(new HashMap<String, Object>() {{
@@ -253,7 +253,7 @@ public class UnionCareDataCon {
list.add(new HashMap<String, Object>() {{
put("year", year);
put("type", "分工会活动");
put("type", "基层工会活动");
put("num", sysUserService.list(sql2.setParam("year", year)).get(0).getDouble("jf"));
}});
src/main/java/io/v/nutz/sys/controllers/platform/sys/unioncadre/UnionCadreController.java
+31 -8
View File
@@ -2,17 +2,20 @@ package io.v.nutz.sys.controllers.platform.sys.unioncadre;
import cn.wizzer.framework.base.Result;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.PageUtil;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.utils.PageUtil;
import io.v.nutz.sys.models.Sys_role;
import io.v.nutz.sys.models.Sys_user_role;
import io.v.nutz.sys.models.UnionCadre;
import io.v.nutz.sys.services.SysDictService;
import io.v.nutz.sys.services.SysRoleService;
import io.v.nutz.sys.services.UnionCadreService;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.Strings;
@@ -77,30 +80,50 @@ public class UnionCadreController {
@At
@ViReturn
@Aop(TransAop.READ_COMMITTED)
public Object createCadre(UnionCadre cadre, String roleCode) {
Sys_role role = roleService.fetch(Cnd.where("code", "=", roleCode));
if ("gh08".equals(roleCode) || "gh01".equals(roleCode)) {
int count = roleService.dao().count(UnionCadre.class, Cnd.where("roleId", "=", role.getId()).and("unionid", "=", cadre.getUnionId()));
if (count > 0) {
return Result.error("该角色只能设置一位，如仍要设置，请取消前任角色");
}
}
Cnd cnd = Cnd.where("userId", "=", cadre.getUserId()).and("roleId", "=", role.getId()).and("unionId", "=", cadre.getUnionId()).and("workersCongressSession", "=", cadre.getWorkersCongressSession());
if (unionCadreService.count(cnd) > 0) {
return Result.error("此操作重复！");
}
cadre.setJoining(true).setRoleId(role.getId()).setAuditStateId(UnionCadreAuditState.SCHOOL_UNION);
cadre.setJoining(true).setRoleId(role.getId()).setAuditStateId(UnionCadreAuditState.SUCCESS);
unionCadreService.insert(cadre);
Sys_user_role sur = new Sys_user_role();
sur.setRoleId(cadre.getRoleId());
sur.setUserId(cadre.getUserId());
sur.setUnionid(cadre.getUnionId());
roleService.insert(sur);
return null;
}
@At
@ViReturn
@Aop(TransAop.READ_COMMITTED)
public Object removeCadre(String id) {
UnionCadre cadre = unionCadreService.fetch(id);
if (UnionCadreAuditState.SUCCESS != cadre.getAuditStateId() && cadre.isJoining()) {
unionCadreService.delete(id);
} else {
cadre.setJoining(false).setAuditStateId(UnionCadreAuditState.SCHOOL_UNION);
unionCadreService.update(cadre);
}
unionCadreService.delete(id);
unionCadreService.dao().clear(Sys_user_role.class, Cnd.where("userId", "=", cadre.getUserId()).and("roleId", "=", cadre.getRoleId()));
// if (UnionCadreAuditState.SUCCESS != cadre.getAuditStateId() && cadre.isJoining()) {
// unionCadreService.delete(id);
// } else {
// cadre.setJoining(false).setAuditStateId(UnionCadreAuditState.SCHOOL_UNION);
// unionCadreService.update(cadre);
// }
return null;
}
src/main/java/io/v/nutz/sys/services/SysLocalProcessService.java
+1 -1
View File
@@ -10,7 +10,7 @@ public interface SysLocalProcessService {
*
* @param processName 流程实例名称 例如：xxx慰问申请
* @param processUniqueId 流程唯一id
* @param nodeName 流程当前节点名称 例如：分工会审核
* @param nodeName 流程当前节点名称 例如：基层工会审核
* @param processInitiatorId 流程发起人id 传申请人的id
* @param pcUrl pc端查看地址
* @param mobileUrl 手机端查看地址
src/main/java/io/v/nutz/sys/services/SysUserService.java
+1 -1
View File
@@ -52,7 +52,7 @@ public interface SysUserService extends BaseService<Sys_user> {
Sys_user fillModuleMenus(Sys_user user);
/**
* 绑定用户单位 分工会信息
* 绑定用户单位 基层工会信息
*
* @param user
* @return
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityApplyController.java
+1 -1
View File
@@ -202,7 +202,7 @@ public class ActivityApplyController {
Sys_user user = (Sys_user) ShiroUtil.getPrincipal();
Sys_unit unit = user.getUnit();
//根据当前登入人的单位查询他所属的活动分工会属于哪个
//根据当前登入人的单位查询他所属的活动基层工会属于哪个
ActivityBasicUnit activityBasicUnit = activitySchoolService.dao().fetch(ActivityBasicUnit.class, unit.getId());
ActivitySchool activity = activitySchoolService.fetch(activityId);
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityPrizeListController.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class ActivityPrizeListController {
;
/**
* 各个分工会奖品
* 各个基层工会奖品
*
* @param activityId
* @param unionId
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityResultsController.java
+1 -1
View File
@@ -210,7 +210,7 @@ public class ActivityResultsController {
/**
* 查询团体参赛分工会
* 查询团体参赛基层工会
*
* @param activityId
* @param eventId
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityScoreStatisticsController.java
+6 -6
View File
@@ -338,7 +338,7 @@ public class ActivityScoreStatisticsController {
List<ActivitySchool> activitySchoolList = dao.query(ActivitySchool.class, Cnd.where("YEAR(applyStartTime)", "=", year));
List<String> labelList = activitySchoolList.stream().map(v -> v.getName()).collect(Collectors.toList());
labelList.add(0, "分工会");
labelList.add(0, "基层工会");
unionList.forEach(u -> {
NutMap unionMap = Lang.obj2nutmap(u);
@@ -358,7 +358,7 @@ public class ActivityScoreStatisticsController {
unionMap.put(x.getName(), score);
});
unionMap.put("总分", scoreSum.get());
unionMap.put("分工会", unionMap.getString("unionname"));
unionMap.put("基层工会", unionMap.getString("unionname"));
resultMap.add(unionMap);
});
labelList.add("总分");
@@ -383,7 +383,7 @@ public class ActivityScoreStatisticsController {
List<String> eventIdList = dao.query(ActivitySchoolEvent.class, Cnd.where("activityId", "in", activityIdList)).stream().map(v -> v.getEventId()).collect(Collectors.toList());
activityNameList.add(0, "分工会");
activityNameList.add(0, "基层工会");
Sql sql = Sqls.create("""
SELECT
@@ -417,7 +417,7 @@ public class ActivityScoreStatisticsController {
unionMap.put(a.getName(), sexScore + (qwScore * 0.5));
});
unionMap.put("总分", scoreSum.get());
unionMap.put("分工会", unionMap.getString("unionname"));
unionMap.put("基层工会", unionMap.getString("unionname"));
resultMap.add(unionMap);
});
@@ -590,8 +590,8 @@ public class ActivityScoreStatisticsController {
List<NutMap> list = schoolViService.listMap(sql);
List<ExcelExportEntity> entityList = new ArrayList<>();
entityList.add(new ExcelExportEntity("分工会代码", "unioncode", 40));
entityList.add(new ExcelExportEntity("分工会名称", "unionname", 20));
entityList.add(new ExcelExportEntity("基层工会代码", "unioncode", 40));
entityList.add(new ExcelExportEntity("基层工会名称", "unionname", 20));
entityList.add(new ExcelExportEntity("工号", "loginname", 20));
entityList.add(new ExcelExportEntity("姓名", "username", 20));
entityList.add(new ExcelExportEntity("性别", "sex", 20));
src/main/java/io/v/nutz/zhgh/activity/controller/school/ActivityStatisticsTypeExportController.java
+8 -8
View File
@@ -59,7 +59,7 @@ public class ActivityStatisticsTypeExportController {
List<String> eventIdList = baseService.dao().query(ActivitySchoolEvent.class, Cnd.where("activityId", "in", activityIdList)).stream().map(v -> v.getEventId()).collect(Collectors.toList());
activityNameList.add(0, "分工会");
activityNameList.add(0, "基层工会");
Sql sql = Sqls.create("""
SELECT
@@ -90,7 +90,7 @@ public class ActivityStatisticsTypeExportController {
unionMap.put(a.getName(), sexScore + (qwScore * 0.5));
});
unionMap.put("总分", scoreSum.get());
unionMap.put("分工会", unionMap.getString("unionname"));
unionMap.put("基层工会", unionMap.getString("unionname"));
resultMap.add(unionMap);
});
@@ -128,7 +128,7 @@ public class ActivityStatisticsTypeExportController {
List<ActivitySchool> activitySchoolList = dao.query(ActivitySchool.class, Cnd.where("YEAR(applyStartTime)", "=", year));
List<String> labelList = activitySchoolList.stream().map(v -> v.getName()).collect(Collectors.toList());
labelList.add(0, "分工会");
labelList.add(0, "基层工会");
unionList.forEach(u -> {
NutMap unionMap = Lang.obj2nutmap(u);
@@ -148,7 +148,7 @@ public class ActivityStatisticsTypeExportController {
unionMap.put(x.getName(), score);
});
unionMap.put("总分", scoreSum.get());
unionMap.put("分工会", unionMap.getString("unionname"));
unionMap.put("基层工会", unionMap.getString("unionname"));
resultMap.add(unionMap);
});
labelList.add("总分");
@@ -275,13 +275,13 @@ public class ActivityStatisticsTypeExportController {
List<ExcelExportEntity> entityList = new ArrayList<>();
entityList.add(new ExcelExportEntity("名次", "名次", 20));
entityList.add(new ExcelExportEntity("分工会", "unionname", 40));
entityList.add(new ExcelExportEntity("基层工会", "unionname", 40));
eventList.forEach(v -> {
entityList.add(new ExcelExportEntity(v.getString("label"), v.getString("label"), 40));
});
entityList.add(new ExcelExportEntity("总分", "totalScore", 40));
try {
ViTool.excelResponse(response, "分工会" + sex + "项目积分.xls");
ViTool.excelResponse(response, "基层工会" + sex + "项目积分.xls");
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), entityList, result);
workbook.write(response.getOutputStream());
} catch (Exception e) {
@@ -461,7 +461,7 @@ public class ActivityStatisticsTypeExportController {
List<ExcelExportEntity> entityList = new ArrayList<>();
entityList.add(new ExcelExportEntity("名次", "名次", 20));
entityList.add(new ExcelExportEntity("分工会", "unionname", 40));
entityList.add(new ExcelExportEntity("基层工会", "unionname", 40));
entityList.add(new ExcelExportEntity("总分", "totalScore", 40));
result.sort(Comparator.comparing((Map m) -> (new BigDecimal(m.get("totalScore").toString()))).reversed());
@@ -470,7 +470,7 @@ public class ActivityStatisticsTypeExportController {
}
try {
ViTool.excelResponse(response, "分工会" + sex + "子总分.xls");
ViTool.excelResponse(response, "基层工会" + sex + "子总分.xls");
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), entityList, result);
workbook.write(response.getOutputStream());
} catch (Exception e) {
src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteReserveApplyController.java
+3 -3
View File
@@ -105,7 +105,7 @@ public class SiteReserveApplyController {
ActivitySiteInfo siteInfo = siteInfoService.fetch(activitySiteReserve.getSite_id());
if (activitySiteVo.getIsRetire()) {
//如如果是分工会，发送给分工会主席
//如如果是基层工会，发送给基层工会主席
Sql sql = Sqls.create("""
SELECT
u.loginname,
@@ -120,7 +120,7 @@ public class SiteReserveApplyController {
.setParam("unionid", Vi.getUnionId());
List<Record> processList = baseService.list(sql);
//移动端分工会审核
//移动端基层工会审核
String auditUrl = "https://zhghydd.cpu.edu.cn/mobile/activity/site/unionAudit";
List<String> auditLoginNameList = processList.stream().map(v -> v.getString("loginname")).collect(Collectors.toList());
@@ -188,7 +188,7 @@ public class SiteReserveApplyController {
dao.clear(ActivitySiteReserve.class, Cnd.where("id", "=", id));
//发送短信提醒
// //获取分工会主席
// //获取基层工会主席
// Sql sql = Sqls.create("""
// SELECT
// u.loginname,
src/main/java/io/v/nutz/zhgh/activity/controller/site/SiteUnionProcessController.java
+5 -5
View File
@@ -34,7 +34,7 @@ import java.util.List;
import java.util.stream.Collectors;
/**
* 场地预约分工会审核
* 场地预约基层工会审核
*/
@IocBean
@Ok("json:full")
@@ -57,7 +57,7 @@ public class SiteUnionProcessController {
@At
@ViReturn
@RequiresPermissions("activity.site.unionProcess")
@SLog(type = "活动场地预约",tag = "分工会审核",msg = "页面数据",param = true,result = true)
@SLog(type = "活动场地预约",tag = "基层工会审核",msg = "页面数据",param = true,result = true)
public Object pageData(PageForm pageForm,
@Param(value = "siteType", required = false) String siteType,
@Param(value = "time", required = false) String time,
@@ -124,7 +124,7 @@ public class SiteUnionProcessController {
@ViReturn
@RequiresPermissions("activity.site.unionProcess")
@Aop(TransAop.READ_COMMITTED)
@SLog(type = "活动场地预约",tag = "分工会审核",msg = "审核操作",param = true,result = true)
@SLog(type = "活动场地预约",tag = "基层工会审核",msg = "审核操作",param = true,result = true)
public Object doProcess(@Param("id") String id, @Param("audit") Audit audit) {
audit.setAuditor(ShiroUtil.getPrincipalProperty("id").toString());
audit.setUsername(ShiroUtil.getPrincipalProperty("username").toString());
@@ -146,7 +146,7 @@ public class SiteUnionProcessController {
//审核通过，发送给校工会审核(姜学军 1019911404)
String auditUrl = "https://zhghydd.cpu.edu.cn/mobile/activity/site/schoolAudit";
String content = "%s的%s老师申请的%s的场地预约，分工会审核已通过，转为校工会审核，请您通过门户网站或点击企业微信消息前往智慧工会平台进行审核。"
String content = "%s的%s老师申请的%s的场地预约，基层工会审核已通过，转为校工会审核，请您通过门户网站或点击企业微信消息前往智慧工会平台进行审核。"
.formatted(Vi.getUnion().getUnionname(),
reserve_person,
siteInfo.getName());
@@ -154,7 +154,7 @@ public class SiteUnionProcessController {
msgApi.sendWxMsg("智慧工会【场地预约】",auditUrl,"textcard",content,List.of("1019911404"),"");
} else {
//审核拒绝，发送短信给本人
String content = "%s老师您好！您预约的%s申请被分工会拒绝，您可重新提交其他场地或时间段的申请"
String content = "%s老师您好！您预约的%s申请被基层工会拒绝，您可重新提交其他场地或时间段的申请"
.formatted(reserve_person,
siteInfo.getName());
System.out.println(content);
src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionManageController.java
+1 -1
View File
@@ -54,7 +54,7 @@ import java.util.List;
/**
* @author: Aaron
* @create: 2021-03-08 16:07
* @description: 分工会活动信息管理
* @description: 基层工会活动信息管理
**/
@IocBean
src/main/java/io/v/nutz/zhgh/activity/controller/union/ActivityUnionPlanController.java
+1 -1
View File
@@ -17,7 +17,7 @@ import org.nutz.mvc.annotation.Param;
/**
* @author: Aaron
* @create: 2021-03-08 16:08
* @description: 分工会活动计划管理
* @description: 基层工会活动计划管理
**/
@IocBean
src/main/java/io/v/nutz/zhgh/activity/models/ActivityAuditTypeEnum.java
+1 -1
View File
@@ -8,7 +8,7 @@ public enum ActivityAuditTypeEnum {
ALL("ALL", "不限制"),
CLUB("CLUB", "审核本协会"),
DW("DW", "审核本单位"),
FGH("FGH", "审核本分工会");
FGH("FGH", "审核本基层工会");
public String value;
public String desc;
src/main/java/io/v/nutz/zhgh/activity/models/ActivityPlan.java
+2 -2
View File
@@ -53,12 +53,12 @@ public class ActivityPlan {
private Double money;
@Column
@Comment("计划类型(1-校活动、2-分工会活动、3协会社团活动)")
@Comment("计划类型(1-校活动、2-基层工会活动、3协会社团活动)")
@ColDefine(type = ColType.VARCHAR, width = 7)
private String type;
@Column
@Comment("分工会ID或社团ID")
@Comment("基层工会ID或社团ID")
@ColDefine(type = ColType.VARCHAR, width = 32)
private String tissueId;
src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchool.java
+2 -2
View File
@@ -113,7 +113,7 @@ public class ActivitySchool extends BaseModel implements Serializable {
private Double funding;
@Column
@Comment("报名方式(1：个人 2：分工会 3：小程序)")
@Comment("报名方式(1：个人 2：基层工会 3：小程序)")
@ColDefine(type = ColType.MYSQL_JSON)
private List<Integer> applyWay;
@@ -158,7 +158,7 @@ public class ActivitySchool extends BaseModel implements Serializable {
private Boolean close;
@Column
@Comment("活动级别（40001-校级、40002-分工会、40003-社团或协会）")
@Comment("活动级别（40001-校级、40002-基层工会、40003-社团或协会）")
@ColDefine(type = ColType.INT, width = 10)
private Integer activityLevel;
src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolApply.java
+1 -1
View File
@@ -138,7 +138,7 @@ public class ActivitySchoolApply implements Serializable {
private String unitname;
@Excel(name = "分工会", width = 30)
@Excel(name = "基层工会", width = 30)
private String unionname;
@Column
src/main/java/io/v/nutz/zhgh/activity/models/ActivitySchoolEvent.java
+1 -1
View File
@@ -138,7 +138,7 @@ public class ActivitySchoolEvent {
private ActivitySchool activitySchool;
@Column
@Comment("分工会人数限制")
@Comment("基层工会人数限制")
@ColDefine(type = ColType.MYSQL_JSON)
private List<NutMap> unionLimit;
src/main/java/io/v/nutz/zhgh/activity/models/ActivitySiteReserve.java
+1 -1
View File
@@ -138,7 +138,7 @@ public class ActivitySiteReserve extends BaseModel {
private String site_manager_id;
@Column
@Comment("分工会审核id")
@Comment("基层工会审核id")
@ColDefine(type = ColType.VARCHAR, width = 32)
private String reserve_person_union_process;
src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissue.java
+5 -5
View File
@@ -17,12 +17,12 @@ import java.util.List;
/**
* @author: Aaron
* @create: 2021-03-09 13:57
* @description: 社团或分工会活动校工会活动
* @description: 社团或基层工会活动校工会活动
**/
@Data
@Table("activity_tissue")
@Comment("社团或分工会活动校工会活动")
@Comment("社团或基层工会活动校工会活动")
public class ActivityTissue extends BaseModel implements Serializable, SysHomeConvert {
@Column
@@ -153,12 +153,12 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo
private String activityExamineContent;
@Column
@Comment("报名方式(1.个人 2.分工会 null.不需要报名)")
@Comment("报名方式(1.个人 2.基层工会 null.不需要报名)")
@ColDefine(type = ColType.INT)
private Integer signUpMethod;
@Column
@Comment("限制方式(1.总人数限制 2.分工会人数限制 null.不限制)")
@Comment("限制方式(1.总人数限制 2.基层工会人数限制 null.不限制)")
@ColDefine(type = ColType.INT)
private Integer userNumberLimit;
@@ -188,7 +188,7 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo
private Integer teamNum;
@Column
@Comment("分工会人数限制")
@Comment("基层工会人数限制")
@ColDefine(type = ColType.MYSQL_JSON)
private List<NutMap> unionUserNumberLimit;
src/main/java/io/v/nutz/zhgh/activity/models/ActivityTissuePerson.java
+1 -1
View File
@@ -22,7 +22,7 @@ public class ActivityTissuePerson {
private String id;
@Column
@Comment("分工会或社团活动ID")
@Comment("基层工会或社团活动ID")
@ColDefine(type = ColType.VARCHAR, width = 32)
private String tissueId;
src/main/java/io/v/nutz/zhgh/activity/models/ActivityYearSummary.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class ActivityYearSummary {
private String summaryType;
@Column
@Comment("总结来源（1-校活动、2-分工会活动、3协会社团活动）")
@Comment("总结来源（1-校活动、2-基层工会活动、3协会社团活动）")
@ColDefine(type = ColType.VARCHAR, width = 32)
private String summaryFrom;
src/main/java/io/v/nutz/zhgh/contribution/controller/ContributionStatisticsController.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class ContributionStatisticsController {
sql.setCondition(cnd);
List<NutMap> nutMaps = contributionApplyViService.listMap(sql);
unionMap.forEach(v -> {
//这个项目每个分工会有多少个人捐款
//这个项目每个基层工会有多少个人捐款
List<NutMap> userList = nutMaps.stream().collect(
Collectors.collectingAndThen(
Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(n -> n.getString("userId")))), ArrayList::new)
src/main/java/io/v/nutz/zhgh/diseaseaid/model/AidFundMemberAuditRecord.java
+2 -2
View File
@@ -66,12 +66,12 @@ public class AidFundMemberAuditRecord extends ViBaseModel {
private String unitName;
@Column
@Comment("分工会id")
@Comment("基层工会id")
@ColDefine(type = ColType.VARCHAR, width = 32)
private String unionId;
@Column
@Comment("分工会名称")
@Comment("基层工会名称")
@ColDefine(type = ColType.VARCHAR, width = 100)
private String unionName;
src/main/java/io/v/nutz/zhgh/evaluate/handler/EvaluateToDoHandler.java
+4 -4
View File
@@ -84,7 +84,7 @@ public enum EvaluateToDoHandler {
/**
* 创建分工会任务
* 创建基层工会任务
*/
CREATE_UNION_TASK() {
@Override
@@ -109,7 +109,7 @@ public enum EvaluateToDoHandler {
localProcessService.createTask(
"evaluate_apply@" + e.getId(),
"branchUnionAuditId",
"分工会审核",
"基层工会审核",
ShiroUtil.getUserId(),
loginNames,
"/platform/evaluate/audit/union",
@@ -118,12 +118,12 @@ public enum EvaluateToDoHandler {
"/platform/evaluate/audit/union"
);
localProcessService.updateProcessNodeName("evaluate_apply@" + e.getId(), "分工会审核");
localProcessService.updateProcessNodeName("evaluate_apply@" + e.getId(), "基层工会审核");
}
},
/**
* 分工会完成
* 基层工会完成
*/
COMPLETE_UNION_TASK() {
@Override
src/main/java/io/v/nutz/zhgh/evaluate/models/Evaluate.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class Evaluate {
private String directions;
@Column
@Comment("分工会名额分配")
@Comment("基层工会名额分配")
@ColDefine(type = ColType.MYSQL_JSON)
private List<NutMap> unionLimit;
src/main/java/io/v/nutz/zhgh/evaluate/models/EvaluateApply.java
+3 -3
View File
@@ -115,7 +115,7 @@ public class EvaluateApply extends BaseModel {
public String unitAuditId;
@Column
@Comment("分工会审核记录id")
@Comment("基层工会审核记录id")
@ColDefine(type = ColType.VARCHAR, width = 32)
public String unionAuditId;
@@ -195,9 +195,9 @@ public class EvaluateApply extends BaseModel {
private String unionLeader;
@Column
@Excel(name = "分工会")
@Excel(name = "基层工会")
@ColDefine(type = ColType.VARCHAR, width = 20)
@Comment("分工会")
@Comment("基层工会")
private String unionName;
@Column
src/main/java/io/v/nutz/zhgh/evaluate/service/impl/EvaluateServiceApplyImpl.java
+1 -1
View File
@@ -136,7 +136,7 @@ public class EvaluateServiceApplyImpl extends BaseServiceImpl<EvaluateApply> imp
if(count >= limitCount) {
return Result.error("抱歉，此评优评先活动您所在分工会人数已满！");
return Result.error("抱歉，此评优评先活动您所在基层工会人数已满！");
}
return Result.success();
}
src/main/java/io/v/nutz/zhgh/fellowship/controller/manage/FellowshipUserBlackListManage.java
+2 -2
View File
@@ -144,7 +144,7 @@ public class FellowshipUserBlackListManage {
excelCommonExportEntity.add(new ExcelExportEntity("姓名", "username", 20));
excelCommonExportEntity.add(new ExcelExportEntity("工号", "loginname", 20));
excelCommonExportEntity.add(new ExcelExportEntity("单位", "unitname", 20));
excelCommonExportEntity.add(new ExcelExportEntity("分工会", "unionname", 20));
excelCommonExportEntity.add(new ExcelExportEntity("基层工会", "unionname", 20));
excelCommonExportEntity.add(new ExcelExportEntity("性别", "sex", 20));
excelCommonExportEntity.add(new ExcelExportEntity("开始时间", "courseStartTimeExcel", 22));
excelCommonExportEntity.add(new ExcelExportEntity("结束时间", "courseEndTimeExcel", 22));
@@ -236,7 +236,7 @@ public class FellowshipUserBlackListManage {
excelCommonExportEntity.add(new ExcelExportEntity("姓名", "username", 20));
excelCommonExportEntity.add(new ExcelExportEntity("工号", "loginname", 20));
excelCommonExportEntity.add(new ExcelExportEntity("单位", "unitname", 20));
excelCommonExportEntity.add(new ExcelExportEntity("分工会", "unionname", 20));
excelCommonExportEntity.add(new ExcelExportEntity("基层工会", "unionname", 20));
excelCommonExportEntity.add(new ExcelExportEntity("性别", "sex", 20));
excelCommonExportEntity.add(new ExcelExportEntity("开始时间", "courseStartTimeExcel", 22));
excelCommonExportEntity.add(new ExcelExportEntity("结束时间", "courseEndTimeExcel", 22));
src/main/java/io/v/nutz/zhgh/fellowship/controller/mobile/MFellowshipActivityController.java
+2 -2
View File
@@ -122,7 +122,7 @@ public class MFellowshipActivityController {
return Result.error("您已经报过了!");
}
if (fellowshipActivityService.isSignFullByUnionId(courseId)) {
return Result.error("该活动您所在的分工会名额已报满!");
return Result.error("该活动您所在的基层工会名额已报满!");
}
if (fellowshipActivityService.isSignFull(courseId)) {
return Result.error("抱歉，此项已报满!");
@@ -267,7 +267,7 @@ public class MFellowshipActivityController {
return Result.error("该活动已报过了!");
}
if (fellowshipActivityService.isSignFullByUnionId(courseId)) {
return Result.error("该活动您所在的分工会名额已报满!");
return Result.error("该活动您所在的基层工会名额已报满!");
}
if (fellowshipActivityService.isSignFull(courseId)) {
return Result.error("该活动已报满!");
src/main/java/io/v/nutz/zhgh/fellowship/controller/statistics/FellowshipActivityStatisticsController.java
+1 -1
View File
@@ -209,7 +209,7 @@ public class FellowshipActivityStatisticsController {
excelCommonExportEntity.add(new ExcelExportEntity("姓名", "username", 20));
excelCommonExportEntity.add(new ExcelExportEntity("工号", "loginname", 20));
excelCommonExportEntity.add(new ExcelExportEntity("单位", "unitname", 20));
excelCommonExportEntity.add(new ExcelExportEntity("分工会", "unionname", 20));
excelCommonExportEntity.add(new ExcelExportEntity("基层工会", "unionname", 20));
excelCommonExportEntity.add(new ExcelExportEntity("性别", "sex", 20));
excelCommonExportEntity.add(new ExcelExportEntity("手机号", "mobile", 20));
excelCommonExportEntity.add(new ExcelExportEntity("出生年月", "birthday", 20));
src/main/java/io/v/nutz/zhgh/fellowship/models/FellowshipCourse.java
+1 -1
View File
@@ -100,7 +100,7 @@ public class FellowshipCourse extends BaseModel implements Serializable {
private MatchConditionStructure conditionStructure;
@Column
@Comment("分工会人数限制")
@Comment("基层工会人数限制")
@ColDefine(type = ColType.MYSQL_JSON)
private List<NutMap> unionLimit;
src/main/java/io/v/nutz/zhgh/fellowship/service/FellowshipActivityService.java
+1 -1
View File
@@ -86,7 +86,7 @@ public interface FellowshipActivityService extends ViService<FellowshipActivity>
void asyncInsertUserCourse(String activityId, String courseId, String userId);
/**
* 该培训班每个分工会名额是否报满
* 该培训班每个基层工会名额是否报满
*
* @param courseId
* @return
src/main/java/io/v/nutz/zhgh/fellowship/service/impl/FellowshipActivityServiceImpl.java
+1 -1
View File
@@ -326,7 +326,7 @@ public class FellowshipActivityServiceImpl extends ViServiceImpl<FellowshipActiv
}
/**
* 该培训班每个分工会名额是否报满
* 该培训班每个基层工会名额是否报满
*
* @param courseId
* @return
src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkPunchStatisticsController.java
+8 -8
View File
@@ -74,7 +74,7 @@ public class FitnessWalkPunchStatisticsController {
}
/**
* 分工会统计
* 基层工会统计
*
* @param activityId
* @param unionId
@@ -112,7 +112,7 @@ public class FitnessWalkPunchStatisticsController {
}
/**
* 导出各分工会报名人数、打卡人数
* 导出各基层工会报名人数、打卡人数
*
* @param activityId
*/
@@ -122,12 +122,12 @@ public class FitnessWalkPunchStatisticsController {
public void exportUnionRegCheckInNum(HttpServletResponse response, String activityId) {
List<NutMap> list = fitnessWalkPunchStatisticsService.unionRegCheckInNum(activityId, null);
List<ExcelExportEntity> entities = new ArrayList<>();
entities.add(new ExcelExportEntity("分工会", "unionname", 20));
entities.add(new ExcelExportEntity("基层工会", "unionname", 20));
entities.add(new ExcelExportEntity("报名人数", "regCount", 20));
entities.add(new ExcelExportEntity("打卡人数", "checkInCount", 20));
try {
ViTool.excelResponse(response, "各分工会统计人数.xlsx");
ViTool.excelResponse(response, "各基层工会统计人数.xlsx");
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), entities, list);
workbook.write(response.getOutputStream());
} catch (IOException e) {
@@ -136,7 +136,7 @@ public class FitnessWalkPunchStatisticsController {
}
/**
* 导出某个分工会的报名人员
* 导出某个基层工会的报名人员
*
* @param response
* @param activityId
@@ -158,7 +158,7 @@ public class FitnessWalkPunchStatisticsController {
entities.add(new ExcelExportEntity("报名时间", "register_time_str", 20));
try {
ViTool.excelResponse(response, unionName + "分工会报名人员.xlsx");
ViTool.excelResponse(response, unionName + "基层工会报名人员.xlsx");
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), entities, list);
workbook.write(response.getOutputStream());
} catch (IOException e) {
@@ -167,7 +167,7 @@ public class FitnessWalkPunchStatisticsController {
}
/**
* 导出某个分工会的打卡人员
* 导出某个基层工会的打卡人员
*
* @param response
* @param activityId
@@ -203,7 +203,7 @@ public class FitnessWalkPunchStatisticsController {
entities.add(new ExcelExportEntity("礼品券", "used", 20));
try {
ViTool.excelResponse(response, unionName + "分工会打卡人员.xlsx");
ViTool.excelResponse(response, unionName + "基层工会打卡人员.xlsx");
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), entities, list);
workbook.write(response.getOutputStream());
} catch (IOException e) {
src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkStepRankingController.java
+1 -1
View File
@@ -202,7 +202,7 @@ public class FitnessWalkStepRankingController {
entityList.add(no);
entityList.add(new ExcelExportEntity("姓名", "username", 20));
entityList.add(new ExcelExportEntity("工号", "loginname", 20));
entityList.add(new ExcelExportEntity("分工会", "unionname", 20));
entityList.add(new ExcelExportEntity("基层工会", "unionname", 20));
entityList.add(new ExcelExportEntity("单位", "unitname", 20));
entityList.add(new ExcelExportEntity("today".equals(mode) ? "今日步数" :"活动期间总步数", "step", 20));
try {
src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkStepStatisticsController.java
+1 -1
View File
@@ -148,7 +148,7 @@ public class FitnessWalkStepStatisticsController {
add(new ExcelExportEntity("姓名", "username", 20));
add(new ExcelExportEntity("工号", "loginname", 20));
add(new ExcelExportEntity("单位", "unitname", 20));
add(new ExcelExportEntity("分工会", "unionname", 20));
add(new ExcelExportEntity("基层工会", "unionname", 20));
add(new ExcelExportEntity("当前步数", "step", 20));
add(new ExcelExportEntity("日期", "prizeData", 20));
}};
src/main/java/io/v/nutz/zhgh/fitnessWalk/controller/FitnessWalkStepWiningController.java
+1 -1
View File
@@ -94,7 +94,7 @@ public class FitnessWalkStepWiningController {
entityList.add(no);
entityList.add(new ExcelExportEntity("工号", "loginName", 20));
entityList.add(new ExcelExportEntity("姓名", "username", 20));
entityList.add(new ExcelExportEntity("分工会", "unionName", 20));
entityList.add(new ExcelExportEntity("基层工会", "unionName", 20));
entityList.add(new ExcelExportEntity("单位", "unitName", 20));
entityList.add(new ExcelExportEntity("奖项名称", "awardName", 20));
entityList.add(new ExcelExportEntity("中奖时间", "applyDate", 20));
src/main/java/io/v/nutz/zhgh/fourOneActivity/models/FourOneActivity.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class FourOneActivity {
@Column
@ColDefine(type = ColType.VARCHAR, width = 32)
@Comment("分工会审核id")
@Comment("基层工会审核id")
private String unionAuditId;
@Column
src/main/java/io/v/nutz/zhgh/ghkh/controller/GhKhZpController.java
+1 -1
View File
@@ -69,7 +69,7 @@ public class GhKhZpController {
if (Strings.isNotBlank(annual) && Strings.isNotBlank(annual)) {
cnd.and("zb.annual", "=", annual);
}
cnd.and("zb.assessment", "!=", "模板V1.0（分工会工作量化考核评分请勿修改）");
cnd.and("zb.assessment", "!=", "模板V1.0（基层工会工作量化考核评分请勿修改）");
if (Strings.isNotBlank(assessment) && Strings.isNotBlank(assessment)) {
cnd.where().andLike("zb.assessment", assessment);
} else {
src/main/java/io/v/nutz/zhgh/ghkh/model/Kh_record.java
+1 -1
View File
@@ -25,7 +25,7 @@ public class Kh_record {
private String zb_id;
@Column
@Comment("分工会id")
@Comment("基层工会id")
@ColDefine(type = ColType.VARCHAR, width = 32)
private String union_id;
src/main/java/io/v/nutz/zhgh/ghkh/model/Kh_xghsh.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class Kh_xghsh extends BaseModel {
private String addition;
@Column
@Comment("分工会id")
@Comment("基层工会id")
@ColDefine(type = ColType.VARCHAR, width = 32)
private String flatid;
src/main/java/io/v/nutz/zhgh/ghkh/model/Kh_zp.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class Kh_zp {
private Integer zpf;
@Column
@Comment("分工会id")
@Comment("基层工会id")
@ColDefine(type = ColType.VARCHAR, width = 32)
private String flatid;
src/main/java/io/v/nutz/zhgh/hd/controller/ca/HdChildHjxxController.java
+3 -3
View File
@@ -114,7 +114,7 @@ public class HdChildHjxxController {
sql.setParam("cuserid", ShiroUtil.getPrincipalProperty("id"));
List<Record> list = baseService.list(sql);
fileName = "获奖人员名单";
String[] title = {"姓名", "工资号", "手机号", "单位", "分工会", "获奖次数"};
String[] title = {"姓名", "工资号", "手机号", "单位", "基层工会", "获奖次数"};
String[][] content = new String[list.size()][title.length];
for (int i = 0; i < list.size(); i++) {
Record r = list.get(i);
@@ -164,8 +164,8 @@ public class HdChildHjxxController {
Sql ghtjsql = Sqls.create(ghtjstr.toString());
ghtjsql.setParam("hdid", hdid);
List<Record> ghtjList = baseService.list(ghtjsql);
fileName = "分工会奖品统计";
String[] title = {"分工会", "参加人数", "应发奖品数"};
fileName = "基层工会奖品统计";
String[] title = {"基层工会", "参加人数", "应发奖品数"};
String[][] content = new String[ghtjList.size()][title.length];
for (int i = 0; i < ghtjList.size(); i++) {
Record r = ghtjList.get(i);
src/main/java/io/v/nutz/zhgh/hd/controller/ca/HdChildZpxxController.java
+1 -1
View File
@@ -238,7 +238,7 @@ public class HdChildZpxxController {
HSSFWorkbook wb = null;
String fileName = hdname;
//excel标题
String[] title = {"作品主题", "子女姓名", "教职工姓名", "工资号", "手机号", "活动主题", "活动类别", "作品类别", "年龄", "关系", "单位", "分工会"};
String[] title = {"作品主题", "子女姓名", "教职工姓名", "工资号", "手机号", "活动主题", "活动类别", "作品类别", "年龄", "关系", "单位", "基层工会"};
//content
String[][] content = new String[zpList.size()][title.length];
for (int i = 0; i < zpList.size(); i++) {
src/main/java/io/v/nutz/zhgh/hd/controller/wmhd/HdWmHjInfoController.java
+3 -3
View File
@@ -122,7 +122,7 @@ public class HdWmHjInfoController {
exportEntities.add(new ExcelExportEntity("姓名", "username", 20));
exportEntities.add(new ExcelExportEntity("工号", "loginname", 20));
exportEntities.add(new ExcelExportEntity("单位", "dwname", 20));
exportEntities.add(new ExcelExportEntity("分工会", "ghname", 20));
exportEntities.add(new ExcelExportEntity("基层工会", "ghname", 20));
exportEntities.add(new ExcelExportEntity("获奖次数", "hjcount", 20));
try {
@@ -154,12 +154,12 @@ public class HdWmHjInfoController {
sql.setCondition(cnd);
List<NutMap> unionList = hdWmsbxxService.listMap(sql);
List<ExcelExportEntity> exportEntities = new ArrayList<>();
exportEntities.add(new ExcelExportEntity("分工会", "unionname", 20));
exportEntities.add(new ExcelExportEntity("基层工会", "unionname", 20));
exportEntities.add(new ExcelExportEntity("参加人数", "joinNum", 20));
exportEntities.add(new ExcelExportEntity("应发奖品数", "prizeNum", 20));
try {
ViTool.excelResponse(response, "分工会获奖信息.xls");
ViTool.excelResponse(response, "基层工会获奖信息.xls");
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), exportEntities, unionList);
workbook.write(response.getOutputStream());
} catch (Exception e) {
src/main/java/io/v/nutz/zhgh/hd/controller/wmhd/HdWmInfoController.java
+1 -1
View File
@@ -451,7 +451,7 @@ public class HdWmInfoController {
exportEntities.add(new ExcelExportEntity("工号", "loginname", 20));
exportEntities.add(new ExcelExportEntity("性别", "sex", 20));
exportEntities.add(new ExcelExportEntity("单位", "dwname", 20));
exportEntities.add(new ExcelExportEntity("分工会", "ghname", 20));
exportEntities.add(new ExcelExportEntity("基层工会", "ghname", 20));
exportEntities.add(new ExcelExportEntity("作品主题", "hdname", 20));
exportEntities.add(new ExcelExportEntity("活动类别", "hdlbname", 20));
exportEntities.add(new ExcelExportEntity("作品类别", "zplbname", 20));
src/main/java/io/v/nutz/zhgh/hd/models/Hd_wm_sbxx.java
+1 -1
View File
@@ -70,7 +70,7 @@ public class Hd_wm_sbxx implements Serializable {
private String auditState;
@Column
@Comment("分工会审核id")
@Comment("基层工会审核id")
@ColDefine(type = ColType.VARCHAR, width = 32)
private String unionAuditId;
src/main/java/io/v/nutz/zhgh/healthCheckup/controller/HealthCheckupSingleController.java
+1 -1
View File
@@ -68,7 +68,7 @@ public class HealthCheckupSingleController {
/**
* 每个分工会领取人员/未领取人员
* 每个基层工会领取人员/未领取人员
*
* @param projectId
* @param unionId
src/main/java/io/v/nutz/zhgh/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class HealthCheckupSingleServiceImpl extends ViServiceImpl<HealthCheckupP
if (StrUtil.isNotBlank(unionGroupId)) {
sql.setVar("unionGroupIdCnd", "and u.unionGroupId = '%s'".formatted(unionGroupId));
}
//分工会参加体检人数汇总
//基层工会参加体检人数汇总
List<NutMap> healthCheckupList = listMap(sql);
//该体检项目下的套餐
List<HealthCheckupProjectSubject> subjectList = project.getHealthCheckupProjectSubjects();
src/main/java/io/v/nutz/zhgh/honor/controller/HonorBatchController.java
+2 -2
View File
@@ -120,7 +120,7 @@ public class HonorBatchController {
honorList.forEach(v -> {
if (lx.equals("1")) {
v.setHonorType(getBasicIdByName("个人荣誉"));
//设置分工会 单位
//设置基层工会 单位
Optional<NutMap> user = userList.stream().filter(u -> u.getString("username").equals(v.getUserName())).findFirst();
user.ifPresent(sys_user -> v.setUnionId(sys_user.getString("unionid")));
user.ifPresent(sys_user -> v.setUnionName(sys_user.getString("unionname")));
@@ -129,7 +129,7 @@ public class HonorBatchController {
user.ifPresent(sys_user -> v.setUserId(sys_user.getString("id")));
} else {
v.setHonorType(getBasicIdByName("集体荣誉"));
//设置分工会
//设置基层工会
Optional<Sys_union> union = unionList.stream().filter(u -> u.getUnionname().equals(v.getApplyUnionName())).findFirst();
union.ifPresent(sys_union -> v.setUnionId(sys_union.getId()));
union.ifPresent(sys_union -> v.setUnionName(sys_union.getUnionname()));
src/main/java/io/v/nutz/zhgh/honor/controller/HonorManageController.java
+1 -1
View File
@@ -242,7 +242,7 @@ public class HonorManageController {
excelExportEntity.add(new ExcelExportEntity("加入工会时间", "joinTime", 16));
excelExportEntity.add(new ExcelExportEntity("在职状态", "jobStatus", 10));
excelExportEntity.add(new ExcelExportEntity("政治面貌", "political", 10));
excelExportEntity.add(new ExcelExportEntity("分工会", "unionName", 20));
excelExportEntity.add(new ExcelExportEntity("基层工会", "unionName", 20));
excelExportEntity.add(new ExcelExportEntity("单位", "unitName", 20));
excelExportEntity.add(new ExcelExportEntity("奖项", "prize", 20));
excelExportEntity.add(new ExcelExportEntity("荣誉级别", "honorLevel", 20));
src/main/java/io/v/nutz/zhgh/honor/models/Honor.java
+3 -3
View File
@@ -98,9 +98,9 @@ public class Honor implements Serializable {
private String unionLeader;
@Column
@Excel(name = "分工会")
@Excel(name = "基层工会")
@ColDefine(type = ColType.VARCHAR, width = 20)
@Comment("分工会")
@Comment("基层工会")
private String unionName;
@Column
@@ -203,7 +203,7 @@ public class Honor implements Serializable {
@Column
@ColDefine(type = ColType.VARCHAR, width = 32)
@Comment("所属分工会")
@Comment("所属基层工会")
private String unionId;
@Column
src/main/java/io/v/nutz/zhgh/honor/models/HonorApply.java
+3 -3
View File
@@ -142,9 +142,9 @@ public class HonorApply {
private Integer stateId;
@Column
@Excel(name = "分工会")
@Excel(name = "基层工会")
@ColDefine(type = ColType.VARCHAR, width = 20)
@Comment("分工会")
@Comment("基层工会")
private String unionName;
@Column
@@ -164,7 +164,7 @@ public class HonorApply {
public String unitAuditId;
@Column
@Comment("分工会审核记录id")
@Comment("基层工会审核记录id")
@ColDefine(type = ColType.VARCHAR, width = 32)
public String unionAuditId;
src/main/java/io/v/nutz/zhgh/jdh/controller/db/JdhDbYlController.java
+1 -1
View File
@@ -445,7 +445,7 @@ public class JdhDbYlController {
maps.get(i).setv("isGdh", maps.get(i).getBoolean("isGdh") ? "√" : "");
}
map.put("unionname", Vi.getUnion().getUnionname().replaceAll("分工会*", ""));
map.put("unionname", Vi.getUnion().getUnionname().replaceAll("基层工会*", ""));
map.put("jdhJs", jdhxx.getJdhjs());
String fileName = null;
src/main/java/io/v/nutz/zhgh/jdh/controller/zzjg/DelegationController.java
+3 -3
View File
@@ -301,7 +301,7 @@ public class DelegationController {
}
/**
* 查询该教代会还未组成的分工会
* 查询该教代会还未组成的基层工会
*
* @param jdhid
* @param dbtid
@@ -333,7 +333,7 @@ public class DelegationController {
}
/**
* 查询该教代会还未组成的分工会
* 查询该教代会还未组成的基层工会
*
* @param jdhid
* @param dbtid
@@ -445,7 +445,7 @@ public class DelegationController {
}
/**
* 删除该代表团下的分工会
* 删除该代表团下的基层工会
*
* @param id
* @return
src/main/java/io/v/nutz/zhgh/jdh/model/two/Jdh_db2.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class Jdh_db2 implements Serializable {
private String jdhid;
@Column
@Comment("代表分工会id")
@Comment("代表基层工会id")
@ColDefine(type = ColType.VARCHAR, width = 32)
private String unionid;
src/main/java/io/v/nutz/zhgh/jdh/model/two/Jdh_jdhxx2.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class Jdh_jdhxx2 {
private String jdhcjsj;
@Column
@Comment("所属分工会")
@Comment("所属基层工会")
@ColDefine(type = ColType.VARCHAR, width = 32)
private String unionid;
src/main/java/io/v/nutz/zhgh/jdh/model/two/Jdh_jdj2.java
+1 -1
View File
@@ -28,7 +28,7 @@ public class Jdh_jdj2 implements Serializable {
private String hyname;
@Column
@Comment("所属分工会")
@Comment("所属基层工会")
@ColDefine(type = ColType.VARCHAR, width = 32)
private String fghid;
src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/AccountingCon.java
+37 -21
View File
@@ -1,15 +1,13 @@
package io.v.nutz.zhgh.jf.controller.activitybx;
import cn.hutool.core.util.StrUtil;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.model.Goods;
import io.v.nutz.base.service.BaseService;
import io.v.nutz.base.utils.DateUtil;
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.sys.models.Sys_signature;
import io.v.nutz.sys.models.Sys_user;
import io.v.nutz.sys.models.Sys_user_role;
import io.v.nutz.sys.services.SysSignatureService;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.jf.handle.funds.FundsToHandler;
@@ -18,13 +16,14 @@ import io.v.nutz.zhgh.jf.service.ActivityBxService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.aop.interceptor.ioc.TransAop;
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.json.Json;
import org.nutz.lang.Lang;
import org.nutz.lang.Strings;
import org.nutz.lang.util.NutMap;
import org.nutz.mvc.annotation.At;
@@ -46,16 +45,14 @@ public class AccountingCon {
@Inject
private Vi vi;
@Inject
private Dao dao;
@Inject
private ActivityBxService activityBxService;
@Inject
private BaseService baseService;
@Inject
private MsgApi msgApi;
@Inject
private SysSignatureService sysSignatureService;
@@ -105,12 +102,16 @@ public class AccountingCon {
cnd.and("act.projectTypeCode", "=", 50002);
}
Vi.cndPlus(cnd, "act.year", "=", year);
if (Vi.isNotBlank(searchName, searchKeyword)) {
cnd.where().andLike(searchName, searchKeyword);
if (StrUtil.isNotBlank(searchKeyword)) {
SqlExpressionGroup seg = new SqlExpressionGroup();
seg.or("u.username", "LIKE", "%" + searchKeyword + "%");
seg.or("u.loginname", "LIKE", "%" + searchKeyword + "%");
cnd.and(seg);
}
if (Vi.isNotBlank(pageOrderName, pageOrderBy)) {
cnd.orderBy(pageOrderName, pageOrderBy);
} else {
@@ -145,17 +146,32 @@ public class AccountingCon {
activityBxService.update(aid);
String nodeName = "";
if (nutMap.getBoolean("flag")) {
nodeName = "校工会主席审核";
Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.GH_WYH_ZX));
if (Lang.isNotEmpty(sys_user_role)) {
Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId());
msgApi.sendWxMsg("活动申报", "", "text", aid.getUser_name() + "申报了一条活动【" + aid.getActivity_name() + "】,请前往智慧工会进行审核。", List.of(user.getLoginname()), null);
FundsToHandler.CREATE_SCHOOL_TASK.exec(aid.getId(), null, List.of(user.getLoginname()));
}
nodeName = "校工会分管副主席审核";
// 获取校工会分管副主席
Sql roleSql = Sqls.create("""
SELECT
u.loginname
FROM
`sys_role` role
LEFT JOIN sys_user_role ur ON ur.roleId = role.id
LEFT JOIN `sys_user` u ON u.id = ur.userId
WHERE
role.`code` = 'SCHOOL_UNION_CHARGE_LEADER'
GROUP BY
u.loginname
""");
Sql sql = Sqls.queryString(roleSql.toString());
dao.execute(sql);
List<String> loginNameList = sql.getList(String.class);
FundsToHandler.CREATE_SCHOOL_TASK.exec(aid.getId(), null, loginNameList);
// if (Lang.isNotEmpty(sys_user_role)) {
// Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId());
// msgApi.sendWxMsg("活动申报", "", "text", aid.getUser_name() + "申报了一条活动【" + aid.getActivity_name() + "】,请前往智慧工会进行审核。", List.of(user.getLoginname()), null);
// }
} else {
nodeName = "校工会负责人拒绝";
Sys_user user = activityBxService.dao().fetch(Sys_user.class, aid.getUser_id());
msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被校工会负责人拒绝，审核意见：" + aid.getAccounting_idea(), List.of(user.getLoginname()), null);
nodeName = "校工会文体部负责人拒绝";
// Sys_user user = activityBxService.dao().fetch(Sys_user.class, aid.getUser_id());
// msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被校工会负责人拒绝，审核意见：" + aid.getAccounting_idea(), List.of(user.getLoginname()), null);
FundsToHandler.REFUSE_TASK.exec(aid.getId(), new NutMap().addv("option", nodeName), null);
}
FundsToHandler.COMPLETE_SCHOOL_FZR_TASK.exec(aid.getId(), new NutMap().addv("option", nodeName), null);
src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ApplyController.java
+111 -78
View File
@@ -6,11 +6,8 @@ import cn.wizzer.framework.base.service.BaseService;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.DateUtil;
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.sys.models.Sys_signature;
import io.v.nutz.sys.models.Sys_user;
import io.v.nutz.sys.models.Sys_user_role;
import io.v.nutz.sys.services.SysSignatureService;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.jf.handle.funds.FundsToHandler;
@@ -20,6 +17,9 @@ import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
@@ -53,13 +53,12 @@ public class ApplyController {
@Inject
private Vi vi;
@Inject
private Dao dao;
@Inject
private ActivityBxService activityBxService;
@Inject
private SysSignatureService sysSignatureService;
@Inject
private BaseService baseService;
@Inject
@@ -99,52 +98,73 @@ public class ApplyController {
@Aop(TransAop.READ_COMMITTED)
@RequiresPermissions(value = {"sys.jf.Funds.apply","sys.jf.Funds.apply2","sys.jf.reimbursement.apply","sys.jf.activity_bx.apply"},logical = Logical.OR)
public Object doAdd(@Param("activityBx") ActivityBx activityBx, @Param("sign") String sign) {
List<String> loginNames = new ArrayList<>();
activityBx.setYear(activityBx.getYear() != null ? activityBx.getYear() : DateUtil.getYear());
if (activityBx.getActivity_type() == 40001) {
// 校工会活动
activityBx.setState_id("1020");
loginNames.add("1019911404");
} else if (activityBx.getActivity_type() == 40002) {
// 分工会活动
activityBx.setState_id("1010");
Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.GH01).and("unionid", "=", Vi.getUnionId()));
if (Lang.isNotEmpty(sys_user_role)) {
Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId());
loginNames.add(user.getLoginname());
}
} else if (activityBx.getActivity_type() == 40003) {
// 协会活动
Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.club01).and("stid", "=", activityBx.getClubId()));
if (Lang.isNotEmpty(sys_user_role)) {
Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId());
loginNames.add(user.getLoginname());
}
activityBx.setState_id("1000");
} else {
activityBx.setState_id("1010");
}
// 哈尔滨师范大学，流程都是一样的，直接提交到校工会文体部负责人审核
activityBx.setState_id("1020");
// 获取校工会文体部负责人
Sql roleSql = Sqls.create("""
SELECT
u.loginname
FROM
`sys_role` role
LEFT JOIN sys_user_role ur ON ur.roleId = role.id
LEFT JOIN `sys_user` u ON u.id = ur.userId
WHERE
role.`code` = 'SCHOOL_UNION_SPORTS_ADMIN'
GROUP BY
u.loginname
""");
Sql sql = Sqls.queryString(roleSql.toString());
dao.execute(sql);
List<String> loginNameList = sql.getList(String.class);
// if (activityBx.getActivity_type() == 40001) {
// // 校工会活动
// activityBx.setState_id("1020");
// loginNames.add("1019911404");
// } else if (activityBx.getActivity_type() == 40002) {
// // 基层工会活动
// activityBx.setState_id("1010");
// Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.GH01).and("unionid", "=", Vi.getUnionId()));
// if (Lang.isNotEmpty(sys_user_role)) {
// Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId());
// loginNames.add(user.getLoginname());
// }
// } else if (activityBx.getActivity_type() == 40003) {
// // 协会活动
// Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.club01).and("stid", "=", activityBx.getClubId()));
// if (Lang.isNotEmpty(sys_user_role)) {
// Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId());
// loginNames.add(user.getLoginname());
// }
// activityBx.setState_id("1000");
// } else {
// activityBx.setState_id("1010");
// }
activityBx.setApply_time(StrUtil.isNotBlank(activityBx.getApply_time()) ? activityBx.getApply_time() : DateUtil.getDateTime());
activityBx.setUser_id(StrUtil.isNotBlank(activityBx.getUser_id()) ? activityBx.getUser_id() : ShiroUtil.getUserId());
if (Strings.isNotBlank(sign)) {
activityBx.setUser_signature(sysSignatureService.insert(new Sys_signature(sign)).getId());
}
activityBxService.doAdd(activityBx);
if (Lang.isNotEmpty(loginNames)) {
if (Lang.isNotEmpty(loginNameList)) {
// msgApi.sendWxMsg("活动申报", "", "text", activityBx.getUser_name() + "申请了一条活动申报【" + activityBx.getActivity_name() + "】,请前往智慧工会进行审核。", loginNames, null);
NutMap map = new NutMap();
map.setv("userId",activityBx.getUser_id());
map.setv("activityName",activityBx.getActivity_name());
FundsToHandler.START_PROCESS.exec(activityBx.getId(),map,loginNames);
FundsToHandler.START_PROCESS.exec(activityBx.getId(),map,loginNameList);
if (activityBx.getActivity_type() == 40001) {
FundsToHandler.CREATE_SCHOOL_FZR_TASK.exec(activityBx.getId(),map,loginNames);
} else if (activityBx.getActivity_type() == 40002) {
FundsToHandler.CREATE_UNION_TASK.exec(activityBx.getId(),map,loginNames);
} else if (activityBx.getActivity_type() == 40003) {
FundsToHandler.CREATE_CLUB_TASK.exec(activityBx.getId(),map,loginNames);
}
FundsToHandler.CREATE_SCHOOL_FZR_TASK.exec(activityBx.getId(),map,loginNameList);
// if (activityBx.getActivity_type() == 40001) {
// FundsToHandler.CREATE_SCHOOL_FZR_TASK.exec(activityBx.getId(),map,loginNames);
// } else if (activityBx.getActivity_type() == 40002) {
// FundsToHandler.CREATE_UNION_TASK.exec(activityBx.getId(),map,loginNames);
// } else if (activityBx.getActivity_type() == 40003) {
// FundsToHandler.CREATE_CLUB_TASK.exec(activityBx.getId(),map,loginNames);
// }
}
return null;
@@ -155,55 +175,68 @@ public class ApplyController {
@Aop(TransAop.READ_COMMITTED)
@RequiresPermissions(value = {"sys.jf.Funds.apply","sys.jf.Funds.apply2","sys.jf.reimbursement.apply","sys.jf.activity_bx.apply"},logical = Logical.OR)
public Object doEdit(@Param("activityBx") ActivityBx activityBx, @Param("sign") String sign) {
List<String> loginNames = new ArrayList<>();
// List<String> loginNames = new ArrayList<>();
ActivityBx oldActivity = activityBxService.dao().fetch(ActivityBx.class, activityBx.getId());
activityBx.setYear(Calendar.getInstance().get(Calendar.YEAR));
if (activityBx.getActivity_type() == 40001) {
activityBx.setState_id("1020");
loginNames.add("1019911404");
} else if (activityBx.getActivity_type() == 40002) {
activityBx.setState_id("1010");
Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.GH01).and("unionid", "=", Vi.getUnionId()));
if (Lang.isNotEmpty(sys_user_role)) {
Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId());
loginNames.add(user.getLoginname());
}
} else if (activityBx.getActivity_type() == 40003) {
activityBx.setState_id("1000");
// 协会活动
Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.club01).and("stid", "=", activityBx.getClubId()));
if (Lang.isNotEmpty(sys_user_role)) {
Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId());
loginNames.add(user.getLoginname());
}
} else {
activityBx.setState_id("1010");
}
// if (activityBx.getActivity_type() == 40001) {
// activityBx.setState_id("1020");
// loginNames.add("1019911404");
// } else if (activityBx.getActivity_type() == 40002) {
// activityBx.setState_id("1010");
// Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.GH01).and("unionid", "=", Vi.getUnionId()));
// if (Lang.isNotEmpty(sys_user_role)) {
// Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId());
// loginNames.add(user.getLoginname());
// }
// } else if (activityBx.getActivity_type() == 40003) {
// activityBx.setState_id("1000");
// // 协会活动
// Sys_user_role sys_user_role = activityBxService.dao().fetch(Sys_user_role.class, Cnd.where("roleId", "=", Roles.club01).and("stid", "=", activityBx.getClubId()));
// if (Lang.isNotEmpty(sys_user_role)) {
// Sys_user user = activityBxService.dao().fetch(Sys_user.class, sys_user_role.getUserId());
// loginNames.add(user.getLoginname());
// }
// } else {
// }
activityBx.setState_id("1020");
activityBx.setApply_time(DateUtil.getDateTime());
activityBx.setUser_id(ShiroUtil.getPrincipalProperty("id").toString());
if (Strings.isNotBlank(sign)) {
activityBx.setUser_signature(sysSignatureService.insert(new Sys_signature(sign)).getId());
}
if ("1025".equals(oldActivity.getState_id()) || "1045".equals(oldActivity.getState_id()) ) {
activityBx.setState_id("1025".equals(oldActivity.getState_id()) ? "1020" : "1040");
}
activityBxService.doEdit(activityBx);
NutMap map = new NutMap();
map.setv("userId",activityBx.getUser_id());
map.setv("activityName",activityBx.getActivity_name());
FundsToHandler.START_PROCESS.exec(activityBx.getId(),map,loginNames);
// 获取校工会文体部负责人
Sql roleSql = Sqls.create("""
SELECT
u.loginname
FROM
`sys_role` role
LEFT JOIN sys_user_role ur ON ur.roleId = role.id
LEFT JOIN `sys_user` u ON u.id = ur.userId
WHERE
role.`code` = 'SCHOOL_UNION_SPORTS_ADMIN'
GROUP BY
u.loginname
""");
Sql sql = Sqls.queryString(roleSql.toString());
dao.execute(sql);
List<String> loginNameList = sql.getList(String.class);
if ("999".equals(activityBx.getState_id())) {
if (activityBx.getActivity_type() == 40001) {
FundsToHandler.CREATE_SCHOOL_FZR_TASK.exec(activityBx.getId(),NutMap.NEW().addv("userId",ShiroUtil.getUserId()),loginNames);
} else if (activityBx.getActivity_type() == 40002) {
FundsToHandler.CREATE_UNION_TASK.exec(activityBx.getId(),NutMap.NEW().addv("userId",ShiroUtil.getUserId()),List.of("1019971597"));
} else if (activityBx.getActivity_type() == 40003) {
FundsToHandler.CREATE_CLUB_TASK.exec(activityBx.getId(),NutMap.NEW().addv("userId",ShiroUtil.getUserId()),loginNames);
}
if (Lang.isNotEmpty(loginNameList) && "999".equals(activityBx.getState_id())) {
NutMap map = new NutMap();
map.setv("userId",activityBx.getUser_id());
map.setv("activityName",activityBx.getActivity_name());
FundsToHandler.START_PROCESS.exec(activityBx.getId(), map, loginNameList);
FundsToHandler.CREATE_SCHOOL_FZR_TASK.exec(activityBx.getId(),map,loginNameList);
// if (activityBx.getActivity_type() == 40001) {
// FundsToHandler.CREATE_SCHOOL_FZR_TASK.exec(activityBx.getId(),NutMap.NEW().addv("userId",ShiroUtil.getUserId()),loginNames);
// } else if (activityBx.getActivity_type() == 40002) {
// FundsToHandler.CREATE_UNION_TASK.exec(activityBx.getId(),NutMap.NEW().addv("userId",ShiroUtil.getUserId()),List.of("1019971597"));
// } else if (activityBx.getActivity_type() == 40003) {
// FundsToHandler.CREATE_CLUB_TASK.exec(activityBx.getId(),NutMap.NEW().addv("userId",ShiroUtil.getUserId()),loginNames);
// }
}
return null;
src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementCon.java
+2 -4
View File
@@ -131,8 +131,6 @@ public class ReimbursementCon {
@Param("pageNumber") int pageNumber, @Param("pageSize") int pageSize,
@Param(value = "pageOrderName", required = false) String pageOrderName,
@Param(value = "pageOrderBy", required = false) String pageOrderBy) {
Sql sql = Sqls.create("""
SELECT
abs.`name` absName,
@@ -144,7 +142,7 @@ public class ReimbursementCon {
FROM
activity_bx bx
LEFT JOIN `user` bxr ON bx.user_id = bxr.id
LEFT JOIN state state ON state.state_id = bx.state_id
LEFT JOIN state state ON state.state_id = bx.state_id
LEFT JOIN activity_basic_settings abs ON abs.`code` = bx.projectJfCode
$condition
""");
@@ -237,7 +235,7 @@ public class ReimbursementCon {
if (one.getString("activity_type").equals("40001")) {
one.setv("jfName", "校工会");
} else if (one.getString("activity_type").equals("40002")) {
one.setv("jfName", "分工会");
one.setv("jfName", "基层工会");
} else if (one.getString("activity_type").equals("40003")) {
one.setv("jfName", "协会");
}
src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/UnionCon.java
+11 -7
View File
@@ -1,12 +1,12 @@
package io.v.nutz.zhgh.jf.controller.activitybx;
import cn.hutool.core.util.StrUtil;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.model.Goods;
import io.v.nutz.base.utils.DateUtil;
import io.v.nutz.base.utils.MsgApi;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.sys.models.Sys_signature;
import io.v.nutz.sys.models.Sys_user;
import io.v.nutz.sys.models.User;
import io.v.nutz.sys.services.SysSignatureService;
import io.v.nutz.web.commons.utils.ShiroUtil;
@@ -20,6 +20,7 @@ import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean;
@@ -98,10 +99,12 @@ public class UnionCon {
cnd.and("act.state_id", isAudit == 2 ? ">" : "=", 1040);
}
Vi.cndPlus(cnd, "act.year", "=", year);
if (Vi.isNotBlank(searchName, searchKeyword)) {
cnd.where().andLike(searchName, searchKeyword);
if (StrUtil.isNotBlank(searchKeyword)) {
SqlExpressionGroup seg = new SqlExpressionGroup();
seg.or("u.username", "LIKE", "%" + searchKeyword + "%");
seg.or("u.loginname", "LIKE", "%" + searchKeyword + "%");
cnd.and(seg);
}
if (Vi.isNotBlank(pageOrderName, pageOrderBy)) {
@@ -151,7 +154,7 @@ public class UnionCon {
String nodeName = "";
if (nutMap.getBoolean("flag")) {
User user = activityBxService.dao().fetch(User.class, Cnd.where("id", "=", aid.getUser_id()));
msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】已审核通过,请前往智慧工会进行查看。", List.of(user.getLoginname()), null);
// msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】已审核通过,请前往智慧工会进行查看。", List.of(user.getLoginname()), null);
if (aid.getActivity_id() == null) {
@@ -177,9 +180,10 @@ public class UnionCon {
aid.setActivity_id(activityTissue.getId());
}
nodeName = "审核通过";
FundsToHandler.COMPLETE_PROCESS.exec(aid.getId(), null, null);
} else {
Sys_user user = activityBxService.dao().fetch(Sys_user.class, aid.getUser_id());
msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被校工会主席拒绝，审核意见：" + aid.getUnion_chairman_idea(), List.of(user.getLoginname()), null);
// Sys_user user = activityBxService.dao().fetch(Sys_user.class, aid.getUser_id());
// msgApi.sendWxMsg("活动申报", "", "text", "您申报的活动【" + aid.getActivity_name() + "】被校工会主席拒绝，审核意见：" + aid.getUnion_chairman_idea(), List.of(user.getLoginname()), null);
FundsToHandler.REFUSE_TASK.exec(aid.getId(), new NutMap().addv("option", nodeName), null);
}
activityBxService.update(aid);
src/main/java/io/v/nutz/zhgh/jf/controller/club/clubTzController.java
+1 -1
View File
@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
/**
* @author zhf
* @date 2020/11/5 14:18
* @description 分工会经费使用情况
* @description 基层工会经费使用情况
*/
@IocBean
@At("/platform/jf/club/tz")
src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementApplyController.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class ActivityReimbursementApplyController {
//校工会申请，校工会负责人审核
ReimbursementToHandler.CREATE_SCHOOL_DIRECTOR_TASK.exec(activityBx.getId(), map);
} else if (activityBx.getActivity_type() == 40002) {
//分工会
//基层工会
ReimbursementToHandler.CREATE_UNION_TASK.exec(activityBx.getId(), map);
} else if (activityBx.getActivity_type() == 40003) {
//协会
src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementBoardController.java
+4 -4
View File
@@ -127,7 +127,7 @@ public class ActivityReimbursementBoardController {
list.add(new NutMap() {{
put("year", year);
put("type", "分工会活动");
put("type", "基层工会活动");
put("num", activityBxService.count(sql2.setParam("year", year)));
}});
@@ -160,7 +160,7 @@ public class ActivityReimbursementBoardController {
put("num", activityBxService.count(sql1));
}});
list.add(new NutMap() {{
put("type", "分工会活动");
put("type", "基层工会活动");
put("num", activityBxService.count(sql2));
}});
list.add(new NutMap() {{
@@ -201,7 +201,7 @@ public class ActivityReimbursementBoardController {
list.add(new NutMap() {{
put("year", year);
put("type", "分工会经费");
put("type", "基层工会经费");
put("num", activityBxService.list(sql2.setParam("year", year)).get(0).getDouble("jf"));
}});
@@ -233,7 +233,7 @@ public class ActivityReimbursementBoardController {
put("num", activityBxService.count(schoolSql));
}});
list.add(new NutMap() {{
put("type", "分工会经费");
put("type", "基层工会经费");
put("num", activityBxService.count(unionSql));
}});
list.add(new NutMap() {{
src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementUnionChairmanController.java
+2 -2
View File
@@ -28,7 +28,7 @@ import java.util.Date;
* @Author zzr
* @name：ActivityReimbursementUnionChairmanController
* @Date 2024/4/26 14:58
* @注释 活动报销，分工会主席审核
* @注释 活动报销，基层工会主席审核
*/
@IocBean
@Ok("json:full")
@@ -85,7 +85,7 @@ public class ActivityReimbursementUnionChairmanController {
@At
@ViReturn
@RequiresPermissions("sys.jf.reimbursement.unionChairman")
@SLog(type = "文体活动", tag = "活动报销", msg = "分工会主席审核", param = true, result = true)
@SLog(type = "文体活动", tag = "活动报销", msg = "基层工会主席审核", param = true, result = true)
public Object doAuditing(@Param("id") String id,@Param("audit") Audit audit){
audit.setAuditor(ShiroUtil.getPrincipalProperty("id").toString());
audit.setUsername(ShiroUtil.getPrincipalProperty("username").toString());
src/main/java/io/v/nutz/zhgh/jf/controller/yjgh/jfsyController.java
+1 -1
View File
@@ -30,7 +30,7 @@ import java.util.List;
/**
* @author zhf
* @date 2020/11/5 14:25
* @description 分工会经费使用情况
* @description 基层工会经费使用情况
*/
@IocBean
@At("/platform/jf/yjgh/jfsy")
src/main/java/io/v/nutz/zhgh/jf/handle/funds/FundsToHandler.java
+13 -11
View File
@@ -69,10 +69,10 @@ public enum FundsToHandler {
"退回重新修改",
ShiroUtil.getUserId(),
List.of(loginname),
"/platform/fw/singleChild/report",
"/platform/fw/singleChild/report",
"/platform/fw/singleChild/report",
"/platform/fw/singleChild/report"
"/platform/jf/activity_bx/reimbursement",
"/platform/jf/activity_bx/reimbursement",
"/platform/jf/activity_bx/reimbursement",
"/platform/jf/activity_bx/reimbursement"
);
}
},
@@ -131,7 +131,7 @@ public enum FundsToHandler {
},
/**
* 创建分工会任务
* 创建基层工会任务
*/
CREATE_UNION_TASK() {
@Override
@@ -152,7 +152,7 @@ public enum FundsToHandler {
}
},
/**
* 分工会完成
* 基层工会完成
*/
COMPLETE_UNION_TASK() {
@Override
@@ -168,7 +168,7 @@ public enum FundsToHandler {
},
/**
* 创建校工会负责人任务
* 创建校工会负责人任务, 哈尔滨师范大学是校工会文体部负责人审核
*/
CREATE_SCHOOL_FZR_TASK() {
@Override
@@ -176,7 +176,7 @@ public enum FundsToHandler {
localProcessService.createTask(
"funds_apply@" + reimbursementId,
"funds_accounting",
"校工会负责人审核",
"校工会文体部负责人审核",
ShiroUtil.getUserId(),
loginNames,
"/platform/jf/activity_bx/accounting",
@@ -185,7 +185,7 @@ public enum FundsToHandler {
"/platform/jf/activity_bx/accounting"
);
localProcessService.updateProcessNodeName("funds_apply@" + reimbursementId, "校工会负责人审核");
localProcessService.updateProcessNodeName("funds_apply@" + reimbursementId, "校工会文体部负责人审核");
}
},
/**
@@ -212,7 +212,7 @@ public enum FundsToHandler {
localProcessService.createTask(
"funds_apply@" + reimbursementId,
"funds_union",
"校工会主席审核",
"校工会分管副主席审核",
ShiroUtil.getUserId(),
loginNames,
"/platform/jf/activity_bx/union",
@@ -221,7 +221,7 @@ public enum FundsToHandler {
"/platform/jf/activity_bx/union"
);
localProcessService.updateProcessNodeName("funds_apply@" + reimbursementId, "校工会主席审核");
localProcessService.updateProcessNodeName("funds_apply@" + reimbursementId, "校工会分管副主席审核");
}
},
/**
@@ -247,6 +247,8 @@ public enum FundsToHandler {
@Override
public void exec(String reimbursementId, NutMap extra, List<String> loginNames) {
localProcessService.completeProcess("funds_apply@" + reimbursementId);
localProcessService.updateProcessNodeName("funds_apply@" + reimbursementId, "审核通过");
}
},
src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java
+3 -3
View File
@@ -100,12 +100,12 @@ public enum ReimbursementToHandler {
},
/**
* 创建分工会任务
* 创建基层工会任务
*/
CREATE_UNION_TASK() {
@Override
public void exec(String reimbursementId, NutMap extra) {
//获取分工会管理员的工号
//获取基层工会管理员的工号
List<String> unionLeader = condolenceService.getUnionLeader(ShiroUtil.getUserId());
localProcessService.createTask(
"activity_reimbursement@" + reimbursementId,
@@ -125,7 +125,7 @@ public enum ReimbursementToHandler {
/**
* 分工会完成
* 基层工会完成
*/
COMPLETE_UNION_TASK() {
@Override
src/main/java/io/v/nutz/zhgh/jf/model/ActivityBx.java
+6
View File
@@ -133,6 +133,12 @@ public class ActivityBx {
@ColDefine(type = ColType.VARCHAR, width = 50)
private String activity_number;
@Column
@Comment("参加活动人数")
@ColDefine(type = ColType.VARCHAR, width = 50)
private Integer joinActivityNum;
@Column
@Comment("报销金额")
@ColDefine(type = ColType.FLOAT, width = 10, precision = 2)
src/main/java/io/v/nutz/zhgh/jf/service/impl/ActivityBxServiceImpl.java
+1 -1
View File
@@ -243,7 +243,7 @@ public class ActivityBxServiceImpl extends ViServiceImpl<ActivityBx> implements
switch (one.getString("activity_type")) {
case "40001" -> one.setv("jfName", "校工会");
case "40002" -> one.setv("jfName", "分工会");
case "40002" -> one.setv("jfName", "基层工会");
case "40003" -> one.setv("jfName", "协会");
}
src/main/java/io/v/nutz/zhgh/leadthought/constant/LeadThoughtAuditStateConstant.java
+2 -2
View File
@@ -16,8 +16,8 @@ import lombok.Getter;
public enum LeadThoughtAuditStateConstant {
NOT_SUBMIT(10, "待提交"),
BRANCH_UNION_AUDIT(20, "待分工会审核"),
BRANCH_UNION_REJECT(30, "分工会审核拒绝"),
BRANCH_UNION_AUDIT(20, "待基层工会审核"),
BRANCH_UNION_REJECT(30, "基层工会审核拒绝"),
SCHOOL_UNION_AUDIT(40, "待校工会审核"),
SCHOOL_UNION_REJECT(50, "校工会拒绝"),
PASS(60, "申请通过");
src/main/java/io/v/nutz/zhgh/leadthought/model/LeadThoughtInfo.java
+4 -4
View File
@@ -158,22 +158,22 @@ public class LeadThoughtInfo extends BaseModel {
@Column
@ColDefine(type = ColType.VARCHAR, width = 10)
@Comment("分工会负责人")
@Comment("基层工会负责人")
private String fghFzr;
@Column
@ColDefine(type = ColType.TEXT)
@Comment("分工会负责人签字")
@Comment("基层工会负责人签字")
private String fghFzrQz;
@Column
@ColDefine(type = ColType.VARCHAR, width = 300)
@Comment("分工会意见")
@Comment("基层工会意见")
private String fghOption;
@Column
@ColDefine(type = ColType.VARCHAR, width = 20)
@Comment("分工会审核时间")
@Comment("基层工会审核时间")
private String fghTime;
@Column
src/main/java/io/v/nutz/zhgh/loveSubsidy/constant/LoveSubsidyAuditStateConstant.java
+2 -2
View File
@@ -16,8 +16,8 @@ import lombok.Getter;
public enum LoveSubsidyAuditStateConstant {
NOT_SUBMIT(1, "待提交"),
BRANCH_UNION_AUDIT(2, "待分工会审核"),
BRANCH_UNION_REJECT(3, "分工会审核拒绝"),
BRANCH_UNION_AUDIT(2, "待基层工会审核"),
BRANCH_UNION_REJECT(3, "基层工会审核拒绝"),
SCHOOL_UNION_AUDIT(4, "待校工会财务审核"),
SCHOOL_UNION_REJECT(5, "校工会财务审核拒绝"),
SCHOOL_UNION_ZX_AUDIT(6, "待校工会主席审核"),
src/main/java/io/v/nutz/zhgh/loveSubsidy/controller/LoveSubsidyBranchUnionAuditController.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class LoveSubsidyBranchUnionAuditController {
@At
@RequiresPermissions("loveSubsidy.branchUnionAudit")
@SLog(type = "loveSubsidy", tag = "分工会审核", msg = "分工会审核")
@SLog(type = "loveSubsidy", tag = "基层工会审核", msg = "基层工会审核")
@Aop(TransAop.READ_COMMITTED)
public Result doSubmit(Audit audit, String id, Boolean flag) {
dao.insert(audit);
src/main/java/io/v/nutz/zhgh/loveSubsidy/model/LoveSubsidy.java
+2 -2
View File
@@ -76,12 +76,12 @@ public class LoveSubsidy extends BaseModel {
@Column
@ColDefine(type = ColType.VARCHAR)
@Comment("分工会Id")
@Comment("基层工会Id")
private String unionId;
@Column
@ColDefine(type = ColType.VARCHAR)
@Comment("分工会")
@Comment("基层工会")
private String unionName;
@Column
src/main/java/io/v/nutz/zhgh/lxy/controller/LxyAgentController.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class LxyAgentController {
final String title = "【疗休养】";
List<NutMap> result = new ArrayList<>();
if (ShiroUtil.hasAnyRoles("sysadmin")) {
result.add(new NutMap().setv("title", title).setv("url", FGHSH).setv("iconClass", vi.getIconByPath(FGHSH)).setv("label", "待分工会审核").setv("number", getFghshCount()));
result.add(new NutMap().setv("title", title).setv("url", FGHSH).setv("iconClass", vi.getIconByPath(FGHSH)).setv("label", "待基层工会审核").setv("number", getFghshCount()));
result.add(new NutMap().setv("title", title).setv("url", XGHSH).setv("iconClass", vi.getIconByPath(XGHSH)).setv("label", "待校工会审核").setv("number", getXghshCount().size()));
}
return result;
src/main/java/io/v/nutz/zhgh/lxy/controller/LxyFghShController.java
+1 -1
View File
@@ -33,7 +33,7 @@ import java.util.List;
/**
* @author: Aaron
* @create: 2020-09-01 16:08
* @description: 疗修养分工会审核
* @description: 疗修养基层工会审核
**/
@At("/platform/zgfw/lxy/fghsh")
@Ok("json")
src/main/java/io/v/nutz/zhgh/lxy/model/Lxy_bm.java
+2 -2
View File
@@ -43,12 +43,12 @@ public class Lxy_bm {
private String bmsj;
@Column
@Comment("报名状态(1.待分工会审核 2.分工会审核不通过 3.待校工会审核 4 校工会审核不通过 5 报名成功 6 待填写个人资料)")
@Comment("报名状态(1.待基层工会审核 2.基层工会审核不通过 3.待校工会审核 4 校工会审核不通过 5 报名成功 6 待填写个人资料)")
@ColDefine(type = ColType.INT)
private Integer bmzt;
@Column
@Comment("报名类型(1.分工会统一报名 2.个人报名)")
@Comment("报名类型(1.基层工会统一报名 2.个人报名)")
@ColDefine(type = ColType.INT)
private Integer bmlx;
src/main/java/io/v/nutz/zhgh/manuscript/controller/ManuscriptAgentController.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class ManuscriptAgentController {
List<NutMap> result = new ArrayList<>();
result.add(new NutMap().setv("title", title).setv("url", union).setv("iconClass", vi.getIconByPath(union)).setv("label", "待分工会审核").setv("number", getUnionCount()));
result.add(new NutMap().setv("title", title).setv("url", union).setv("iconClass", vi.getIconByPath(union)).setv("label", "待基层工会审核").setv("number", getUnionCount()));
result.add(new NutMap().setv("title", title).setv("url", school).setv("iconClass", vi.getIconByPath(school)).setv("label", "待校工会审核").setv("number", getSchoolCount()));
Sys_user user = (Sys_user) ShiroUtil.getPrincipal();
src/main/java/io/v/nutz/zhgh/manuscript/models/Manuscript.java
+2 -2
View File
@@ -42,7 +42,7 @@ public class Manuscript extends BaseModel implements Serializable {
private String manuscriptCode;
@Column
@Comment("活动类型(1-协会协会、2-分工会,3校工会)")
@Comment("活动类型(1-协会协会、2-基层工会,3校工会)")
@ColDefine(type = ColType.INT, width = 10)
private Integer type;
@@ -77,7 +77,7 @@ public class Manuscript extends BaseModel implements Serializable {
private List<Sys_file> files;
@Column
@Comment("分工会审核记录id")
@Comment("基层工会审核记录id")
@ColDefine(type = ColType.MYSQL_JSON)
private List<String> union_audit;
src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/constant/MedicalMutualAidFundAuditStateConstant.java
+2 -2
View File
@@ -16,8 +16,8 @@ import lombok.Getter;
public enum MedicalMutualAidFundAuditStateConstant {
NOT_SUBMIT(1, "待提交"),
BRANCH_UNION_AUDIT(2, "待分工会审核"),
BRANCH_UNION_REJECT(3, "分工会审核拒绝"),
BRANCH_UNION_AUDIT(2, "待基层工会审核"),
BRANCH_UNION_REJECT(3, "基层工会审核拒绝"),
SCHOOL_UNION_AUDIT(4, "待导入医院审核金额"),
FUND_AID_GROUP_AUDIT(5, "待导入互助金小组审核金额"),
PASS(6,"申请通过");
src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/controller/MedicalMutualAidFundApplyController.java
+1 -1
View File
@@ -97,7 +97,7 @@ public class MedicalMutualAidFundApplyController {
MedicalMutualAidFundToDoHandler.START_PROCESS.exec(medicalMutualAidFund);
//完成修改任务 如果有的话
MedicalMutualAidFundToDoHandler.COMPLETE_APPLY_RE_MODIFY_TASK.exec(medicalMutualAidFund);
//创建分工会待办
//创建基层工会待办
MedicalMutualAidFundToDoHandler.CREATE_UNION_TASK.exec(medicalMutualAidFund);
return Result.success();
}
src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/controller/MedicalMutualAidFundBranchUnionAuditController.java
+3 -3
View File
@@ -27,7 +27,7 @@ import org.nutz.mvc.annotation.Param;
import javax.servlet.http.HttpServletRequest;
/**
* 分工会审核
* 基层工会审核
*
* @author jug
* @date 2024/01/17
@@ -70,7 +70,7 @@ public class MedicalMutualAidFundBranchUnionAuditController {
@At
@RequiresPermissions("medicalMutualAidFund.branchUnionAudit")
@SLog(type = "medicalMutualAidFund", tag = "分工会（离退休）审核通过", msg = "分工会（离退休）审核通过")
@SLog(type = "medicalMutualAidFund", tag = "基层工会（离退休）审核通过", msg = "基层工会（离退休）审核通过")
@Aop(TransAop.READ_COMMITTED)
public Result pass(Audit audit, String id) {
dao.insert(audit);
@@ -89,7 +89,7 @@ public class MedicalMutualAidFundBranchUnionAuditController {
@At
@RequiresPermissions("medicalMutualAidFund.branchUnionAudit")
@SLog(type = "medicalMutualAidFund", tag = "分工会（离退休）审核拒绝", msg = "分工会（离退休）审核拒绝")
@SLog(type = "medicalMutualAidFund", tag = "基层工会（离退休）审核拒绝", msg = "基层工会（离退休）审核拒绝")
@Aop(TransAop.READ_COMMITTED)
public Result reject(Audit audit, String id) {
dao.insert(audit);
src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/controller/MedicalMutualAidFundFinalAuditController.java
+1 -1
View File
@@ -152,7 +152,7 @@ public class MedicalMutualAidFundFinalAuditController {
exportEntities.add(new ExcelExportEntity("姓名","userName",20));
exportEntities.add(new ExcelExportEntity("工号","loginName",20));
exportEntities.add(new ExcelExportEntity("单位","unitName",20));
exportEntities.add(new ExcelExportEntity("分工会","unionName",20));
exportEntities.add(new ExcelExportEntity("基层工会","unionName",20));
exportEntities.add(new ExcelExportEntity("疾病","diseaseCategory",20));
exportEntities.add(new ExcelExportEntity("个人现金支付金额","selfPaymentAmount",20));
exportEntities.add(new ExcelExportEntity("病种","diseaseType",20));
src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/handler/MedicalMutualAidFundToDoHandler.java
+4 -4
View File
@@ -81,7 +81,7 @@ public enum MedicalMutualAidFundToDoHandler {
},
/**
* 创建分工会任务
* 创建基层工会任务
*/
CREATE_UNION_TASK() {
@Override
@@ -106,7 +106,7 @@ public enum MedicalMutualAidFundToDoHandler {
localProcessService.createTask(
"medical_mutual_aid_fund@" + mutualAidFund.getId(),
"branchUnionAuditId",
"分工会审核",
"基层工会审核",
ShiroUtil.getUserId(),
loginNames,
"/platform/medicalMutualAidFund/branchUnionAudit",
@@ -115,12 +115,12 @@ public enum MedicalMutualAidFundToDoHandler {
"/platform/medicalMutualAidFund/branchUnionAudit"
);
localProcessService.updateProcessNodeName("medical_mutual_aid_fund@" + mutualAidFund.getId(), "分工会审核");
localProcessService.updateProcessNodeName("medical_mutual_aid_fund@" + mutualAidFund.getId(), "基层工会审核");
}
},
/**
* 分工会完成
* 基层工会完成
*/
COMPLETE_UNION_TASK() {
@Override
src/main/java/io/v/nutz/zhgh/medicalMutualAidFund/model/MedicalMutualAidFund.java
+3 -3
View File
@@ -76,12 +76,12 @@ public class MedicalMutualAidFund extends BaseModel {
@Column
@ColDefine(type = ColType.VARCHAR)
@Comment("分工会Id")
@Comment("基层工会Id")
private String unionId;
@Column
@ColDefine(type = ColType.VARCHAR)
@Comment("分工会")
@Comment("基层工会")
private String unionName;
@Column
@@ -138,7 +138,7 @@ public class MedicalMutualAidFund extends BaseModel {
@Column
@ColDefine(type = ColType.VARCHAR, width = 32)
@Comment("分工会、离退休审核Id")
@Comment("基层工会、离退休审核Id")
private String branchUnionAuditId;
@Column
src/main/java/io/v/nutz/zhgh/meeting/controller/pc/MeetingOnlineController.java
+1 -1
View File
@@ -87,7 +87,7 @@ public class MeetingOnlineController {
entityArrayList.add(new ExcelExportEntity("姓名", "username", 20));
entityArrayList.add(new ExcelExportEntity("工号", "loginname", 20));
entityArrayList.add(new ExcelExportEntity("单位", "unitname", 20));
entityArrayList.add(new ExcelExportEntity("分工会", "unionname", 20));
entityArrayList.add(new ExcelExportEntity("基层工会", "unionname", 20));
entityArrayList.add(new ExcelExportEntity("签字", "", 20));
try {
ViTool.excelResponse(response, fileName + ".xlsx");
src/main/java/io/v/nutz/zhgh/meeting/controller/pc/statistics/MeetingBasicStatisticsController.java
+1 -1
View File
@@ -91,7 +91,7 @@ public class MeetingBasicStatisticsController {
entityList.add(new ExcelExportEntity("姓名", "userName", 20));
entityList.add(new ExcelExportEntity("工号", "loginName", 20));
entityList.add(new ExcelExportEntity("单位", "unitName", 30));
entityList.add(new ExcelExportEntity("分工会", "unionName", 35));
entityList.add(new ExcelExportEntity("基层工会", "unionName", 35));
Workbook workbook = new XSSFWorkbook();
src/main/java/io/v/nutz/zhgh/meeting/models/CustomAuditTypeEnum.java
+1 -1
View File
@@ -7,7 +7,7 @@ public enum CustomAuditTypeEnum {
CLUB("CLUB", "审核本协会"),
DW("DW", "审核本单位"),
FGH("FGH", "审核本分工会"),
FGH("FGH", "审核本基层工会"),
TZ("TZ", "审核本代表团");
public String value;
src/main/java/io/v/nutz/zhgh/member/constant/MemberApplyState.java
+2 -2
View File
@@ -9,12 +9,12 @@ package io.v.nutz.zhgh.member.constant;
*/
public interface MemberApplyState {
/**
* 待分工会审核
* 待基层工会审核
*/
int UNION = 10;
/**
* 分工会审核不通过
* 基层工会审核不通过
*/
int UNION_FAIL = 15;
src/main/java/io/v/nutz/zhgh/member/constant/MemberChangeApplyState.java
+2 -2
View File
@@ -9,12 +9,12 @@ package io.v.nutz.zhgh.member.constant;
*/
public interface MemberChangeApplyState {
/**
* 待分工会审核
* 待基层工会审核
*/
int UNION = 50;
/**
* 分工会审核不通过
* 基层工会审核不通过
*/
int UNION_FAIL = 55;
src/main/java/io/v/nutz/zhgh/member/constant/MemberChangeOrigin.java
+1 -1
View File
@@ -16,7 +16,7 @@ import lombok.Getter;
@AllArgsConstructor
public enum MemberChangeOrigin {
PERSONAL(1, "个人"),
UNION(2, "分工会"),
UNION(2, "基层工会"),
UNION_GROUP(3, "工会小组"),
SCHOOL(4, "校工会"),
OTHER(5, "其他"),
src/main/java/io/v/nutz/zhgh/member/controller/MemberCommonController.java
+1 -1
View File
@@ -257,7 +257,7 @@ public class MemberCommonController {
);
}
//需要包含分工会、校工会审核信息
//需要包含基层工会、校工会审核信息
String memberChangeRecordId = userHistory.getMemberChangeRecordId();
MemberChangeRecord memberChangeRecord = dao.fetch(MemberChangeRecord.class, memberChangeRecordId);
dao.fetchLinks(memberChangeRecord,"auditState|unionAudit|schoolAudit");
src/main/java/io/v/nutz/zhgh/member/controller/apply/MemberApplyAuditController.java
+1 -1
View File
@@ -46,7 +46,7 @@ public class MemberApplyAuditController {
/**
* @param pageForm 分页查询对象
* @param source 来源 1 分工会 2 校工会
* @param source 来源 1 基层工会 2 校工会
* @return
*/
@At
src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeApplyAuditController.java
+1 -1
View File
@@ -48,7 +48,7 @@ public class MemberChangeApplyAuditController {
/**
* @param pageForm 分页查询对象
* @param source 来源 1 分工会 2 校工会
* @param source 来源 1 基层工会 2 校工会
* @return
*/
@At
src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberAnalysisController.java
+9 -9
View File
@@ -281,7 +281,7 @@ public class MemberAnalysisController {
// cnd.and("dw.parentId", "=", 0).and("dw.id", "not in ", Lang.array("0", "000"));
cnd.asc("dw.unitcode");
}
if (searchType.equals("按分工会分析")) {
if (searchType.equals("按基层工会分析")) {
if (Strings.isNotBlank(unionId)) {
cnd.and("gh.id", "=", unionId);
}
@@ -298,9 +298,9 @@ public class MemberAnalysisController {
List<NutMap> list = NutMaplist.stream().filter(v -> v.getInt("currentYearMemberNum") != 0).collect(Collectors.toList());
list.forEach(v -> {
if (searchType.equals("按分工会分析")) {
v.put("分工会代码", v.getString("unionCode"));
v.put("分工会名称", v.getString("unionName"));
if (searchType.equals("按基层工会分析")) {
v.put("基层工会代码", v.getString("unionCode"));
v.put("基层工会名称", v.getString("unionName"));
} else {
v.put("单位代码", v.getString("unitCode"));
@@ -322,8 +322,8 @@ public class MemberAnalysisController {
});
NutMap sumMap = new NutMap() {{
put(searchType.equals("按分工会分析") ? "分工会名称" : "单位名称", "合计");
put(searchType.equals("按分工会分析") ? "分工会代码" : "单位代码", "");
put(searchType.equals("按基层工会分析") ? "基层工会名称" : "单位名称", "合计");
put(searchType.equals("按基层工会分析") ? "基层工会代码" : "单位代码", "");
put("年初数量", list.stream().mapToInt(v -> v.getInt("年初数量")).sum());
put("新增人数", list.stream().mapToInt(v -> v.getInt("新增人数")).sum());
put("新入职（恢复）", list.stream().mapToInt(v -> v.getInt("新入职（恢复）")).sum());
@@ -337,9 +337,9 @@ public class MemberAnalysisController {
list.add(sumMap);
List<ExcelExportEntity> entityList = new ArrayList<>();
if (searchType.equals("按分工会分析")) {
entityList.add(new ExcelExportEntity("分工会代码", "分工会代码", 20));
entityList.add(new ExcelExportEntity("分工会名称", "分工会名称", 20));
if (searchType.equals("按基层工会分析")) {
entityList.add(new ExcelExportEntity("基层工会代码", "基层工会代码", 20));
entityList.add(new ExcelExportEntity("基层工会名称", "基层工会名称", 20));
} else {
entityList.add(new ExcelExportEntity("单位代码", "单位代码", 20));
src/main/java/io/v/nutz/zhgh/member/controller/inquire/MemberStatisticsController.java
+2 -2
View File
@@ -227,8 +227,8 @@ public class MemberStatisticsController {
List<ExcelExportEntity> entityList = new ArrayList<>();
if (union) {
entityList.add(new ExcelExportEntity("分工会代码", "unionCode", 20));
entityList.add(new ExcelExportEntity("分工会名称", "unionName", 20));
entityList.add(new ExcelExportEntity("基层工会代码", "unionCode", 20));
entityList.add(new ExcelExportEntity("基层工会名称", "unionName", 20));
}else{
entityList.add(new ExcelExportEntity("单位代码", "unitCode", 20));
entityList.add(new ExcelExportEntity("单位名称", "unitName", 20));

Some files were not shown because too many files have changed in this diff Show More