commit
This commit is contained in:
@jyuhsin
+2
-2
@@ -30,7 +30,7 @@ import java.util.List;
|
||||
*/
|
||||
@IocBean
|
||||
@Ok("json")
|
||||
@ApiOperation("活动申报,协会负责人审核")
|
||||
@ApiOperation("活动申报,社团负责人审核")
|
||||
@At("/platform/activityDeclare/clubPrincipal")
|
||||
public class ActivityDeclareClubPrincipalController {
|
||||
|
||||
@@ -51,7 +51,7 @@ public class ActivityDeclareClubPrincipalController {
|
||||
|
||||
|
||||
@At
|
||||
@ApiOperation("活动申报,协会负责人审核列表")
|
||||
@ApiOperation("活动申报,社团负责人审核列表")
|
||||
@SaCheckPermission("activityDeclare.clubPrincipal")
|
||||
public Result pageData(CommonPageParam pageParam) {
|
||||
Sql sql = Sqls.create("""
|
||||
|
||||
+2
-2
@@ -222,8 +222,8 @@ public class ActivityDeclareMineController {
|
||||
docData.put("fgh", approval);
|
||||
});
|
||||
|
||||
// 协会负责人审核
|
||||
doneTaskVos.stream().filter(task -> "协会负责人审核".equals(task.getDisplayName()))
|
||||
// 社团负责人审核
|
||||
doneTaskVos.stream().filter(task -> "社团负责人审核".equals(task.getDisplayName()))
|
||||
.max(Comparator.comparing(ProcessTaskVO::getCreatedAt))
|
||||
.ifPresent(v -> {
|
||||
Dict taskFormData = v.getTaskFormData();
|
||||
|
||||
+2
-2
@@ -58,7 +58,7 @@ public class ActivityDeclareInfo extends BaseModel {
|
||||
private String mobile;
|
||||
|
||||
@Column
|
||||
@Comment("申报单位（校工会/二级工会名称/协会名称）")
|
||||
@Comment("申报单位（校工会/二级工会名称/社团名称）")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 200)
|
||||
private String declareUnitName;
|
||||
|
||||
@@ -68,7 +68,7 @@ public class ActivityDeclareInfo extends BaseModel {
|
||||
private String unionId;
|
||||
|
||||
@Column
|
||||
@Comment("协会id")
|
||||
@Comment("社团id")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
private String clubId;
|
||||
|
||||
|
||||
+2
-2
@@ -25,9 +25,9 @@ public enum ActivityDeclareReimbursement {
|
||||
*/
|
||||
BRANCH_UNION("分工会活动"),
|
||||
/**
|
||||
* 协会
|
||||
* 社团
|
||||
*/
|
||||
CLUB("协会活动");
|
||||
CLUB("社团活动");
|
||||
|
||||
private final String typeName;
|
||||
}
|
||||
|
||||
+1
-1
@@ -250,7 +250,7 @@ public class ActivityReimbursementBoardController {
|
||||
|
||||
|
||||
@At
|
||||
@ApiOperation("所有协会的报销费用或活动数统计")
|
||||
@ApiOperation("所有社团的报销费用或活动数统计")
|
||||
@SaCheckPermission("activityReimbursement.board")
|
||||
public Result allClubActivityAndMoney(Integer year, Boolean isClubMoney) {
|
||||
Sql sql = Sqls.create("""
|
||||
|
||||
+2
-2
@@ -30,7 +30,7 @@ import java.util.List;
|
||||
*/
|
||||
@IocBean
|
||||
@Ok("json")
|
||||
@ApiOperation("活动报销,协会负责人审核")
|
||||
@ApiOperation("活动报销,社团负责人审核")
|
||||
@At("/platform/activityReimbursement/clubPrincipal")
|
||||
public class ActivityReimbursementClubPrincipalController {
|
||||
|
||||
@@ -51,7 +51,7 @@ public class ActivityReimbursementClubPrincipalController {
|
||||
|
||||
|
||||
@At
|
||||
@ApiOperation("活动报销,协会负责人审核列表")
|
||||
@ApiOperation("活动报销,社团负责人审核列表")
|
||||
@SaCheckPermission("activityReimbursement.clubPrincipal")
|
||||
public Result pageData(CommonPageParam pageParam) {
|
||||
Sql sql = Sqls.create("""
|
||||
|
||||
+2
-2
@@ -323,8 +323,8 @@ public class ActivityReimbursementMineController {
|
||||
docData.put("fgh", approval);
|
||||
});
|
||||
|
||||
// 协会负责人审核
|
||||
doneTaskVos.stream().filter(task -> "协会负责人审核".equals(task.getDisplayName()))
|
||||
// 社团负责人审核
|
||||
doneTaskVos.stream().filter(task -> "社团负责人审核".equals(task.getDisplayName()))
|
||||
.max(Comparator.comparing(ProcessTaskVO::getCreatedAt))
|
||||
.ifPresent(v -> {
|
||||
Dict taskFormData = v.getTaskFormData();
|
||||
|
||||
+1
-1
@@ -141,7 +141,7 @@ public class YearPlanController {
|
||||
}
|
||||
|
||||
@At
|
||||
@ApiOperation("获取协会")
|
||||
@ApiOperation("获取社团")
|
||||
@SaCheckPermission("planSummary.yearPlan.manage")
|
||||
public Result queryClub() {
|
||||
Cnd cnd = Cnd.NEW();
|
||||
|
||||
@@ -51,7 +51,7 @@ public class YearPlan extends BaseModel {
|
||||
private Double money;
|
||||
|
||||
@Column
|
||||
@Comment("计划类型(40001-校活动、40002-分工会活动、40003-协会社团活动)")
|
||||
@Comment("计划类型(40001-校活动、40002-分工会活动、40003-社团社团活动)")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 7)
|
||||
private String planType;
|
||||
|
||||
|
||||
@@ -72,7 +72,7 @@ public class YearSummary extends BaseModel {
|
||||
private String cTime;
|
||||
|
||||
@Column
|
||||
@Comment("工会/协会id")
|
||||
@Comment("工会/社团id")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
private String tissueId;
|
||||
|
||||
@@ -87,7 +87,7 @@ public class YearSummary extends BaseModel {
|
||||
private String summaryType;
|
||||
|
||||
@Column
|
||||
@Comment("总结来源（1-校活动、2-分工会活动、3协会社团活动）")
|
||||
@Comment("总结来源（1-校活动、2-分工会活动、3社团社团活动）")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 32)
|
||||
private String summaryFrom;
|
||||
|
||||
|
||||
@@ -160,7 +160,7 @@ public class ActivitySchool extends BaseModel implements Serializable , SysHomeC
|
||||
private Boolean close;
|
||||
|
||||
@Column
|
||||
@Comment("活动级别（40001-校级、40002-分工会、40003-社团或协会）")
|
||||
@Comment("活动级别（40001-校级、40002-分工会、40003-社团或社团）")
|
||||
@ColDefine(type = ColType.INT, width = 10)
|
||||
private Integer activityLevel;
|
||||
|
||||
|
||||
+1
-1
@@ -205,7 +205,7 @@ public class TrainSignUpManageController {
|
||||
|
||||
@At
|
||||
@Ok("json:full")
|
||||
@ApiOperation("查询分工会和协会")
|
||||
@ApiOperation("查询分工会和社团")
|
||||
@SaCheckPermission("trainSignUp.manage")
|
||||
public Result selectUnitAndClub() {
|
||||
List<NutMap> result = new ArrayList<>();
|
||||
|
||||
+1
-1
@@ -99,7 +99,7 @@ public class TrainSignUpActivityStatisticsController {
|
||||
if(!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name(), RoleConstant.SCHOOL_UNION_CHAIRMAN.name())) {
|
||||
// 获取当前登录用户的工会
|
||||
String unionId = SecurityUtil.getUnionId();
|
||||
// 获取当前登录用户的协会
|
||||
// 获取当前登录用户的社团
|
||||
List<String> clubIds = SecurityUtil.getClubIds();
|
||||
|
||||
List<TrainSignUpActivity> result = new ArrayList<>();
|
||||
|
||||
Reference in New Issue
Block a user