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

会员

Browse Source
This commit is contained in:
Paidax
2025-02-20 13:56:04 +08:00
parent 409ff2e0bb
commit bce946e651
189 changed files with 9732 additions and 4037 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareAgendaController.java
+4 -4
View File
@@ -2,8 +2,8 @@ package io.v.nutz.zhgh.welfare.controller;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.zhgh.member.constant.MemberChangeApplyState;
import io.v.nutz.zhgh.member.constant.MemberChangeRecordMode;
//import io.v.nutz.zhgh.member.constant.MemberChangeApplyState;
//import io.v.nutz.zhgh.member.constant.MemberChangeRecordMode;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.welfare.constant.WelfareMemberApplyState;
import io.v.nutz.zhgh.welfare.service.WelfareMemberService;
@@ -45,8 +45,8 @@ public class WelfareAgendaController {
int welfareMemberAuditNumber = service.count(Sqls.create("SELECT count(1) from welfare_member_apply_record WHERE stateId = @state").setParam("state", WelfareMemberApplyState.SCHOOL_UNION));
list.add(new NutMap().addv("iconClass", vi.getIconByPath("/platform/welfare/member/audit/school")).addv("label", "福利会员审核").addv("number", welfareMemberAuditNumber).addv("url", "/platform/welfare/member/audit/school"));
int welfareMemberChangeAuditNumber = service.count(Sqls.create("SELECT count(1) from member_change_record WHERE recordMode = @mode and stateId = @state").setParam("mode", MemberChangeRecordMode.WELFARE_MEMBER.getCode()).setParam("state", MemberChangeApplyState.SCHOOL_UNION));
list.add(new NutMap().addv("iconClass", vi.getIconByPath("/platform/welfare/member/change/audit")).addv("label", "福利会员变更审核").addv("number", welfareMemberChangeAuditNumber).addv("url", "/platform/welfare/member/change/audit"));
// int welfareMemberChangeAuditNumber = service.count(Sqls.create("SELECT count(1) from member_change_record WHERE recordMode = @mode and stateId = @state").setParam("mode", MemberChangeRecordMode.WELFARE_MEMBER.getCode()).setParam("state", MemberChangeApplyState.SCHOOL_UNION));
// list.add(new NutMap().addv("iconClass", vi.getIconByPath("/platform/welfare/member/change/audit")).addv("label", "福利会员变更审核").addv("number", welfareMemberChangeAuditNumber).addv("url", "/platform/welfare/member/change/audit"));
return list;
}
src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareCommonController.java
+2 -4
View File
@@ -10,7 +10,6 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.wizzer.framework.base.Result;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
@@ -20,7 +19,7 @@ import io.v.nutz.base.utils.ExpressSelectUtil;
import io.v.nutz.base.utils.OfficeTemplateUtil;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.zhgh.member.service.MemberService;
import io.v.nutz.zhgh.staffmanage.member.service.MemberCommonService;
import io.v.nutz.sys.models.Sys_dict;
import io.v.nutz.sys.services.SysDictService;
import io.v.nutz.base.utils.ViTool;
@@ -39,7 +38,6 @@ import lombok.Data;
import org.apache.commons.io.IOUtils;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.authz.annotation.RequiresRoles;
import org.nutz.dao.Chain;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
@@ -78,7 +76,7 @@ import java.util.stream.Collectors;
public class WelfareCommonController {
@Inject
private MemberService memberService;
private MemberCommonService memberService;
@Inject
private WelfareProjectService projectService;
src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareMemberAdjustmentController.java
+29 -32
View File
@@ -7,12 +7,9 @@ import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.zhgh.data.constant.UserChangeType;
import io.v.nutz.zhgh.data.service.HistoryUserService;
import io.v.nutz.base.lang.Lang;
import io.v.nutz.zhgh.member.MemberMode;
import io.v.nutz.zhgh.member.constant.MemberChangeApplyState;
import io.v.nutz.zhgh.member.constant.MemberChangeOrigin;
import io.v.nutz.zhgh.member.constant.MemberChangeRecordMode;
import io.v.nutz.zhgh.member.handle.MemberChangeAuditHandle;
import io.v.nutz.zhgh.member.model.MemberChangeRecord;
import io.v.nutz.zhgh.staffmanage.member.MemberMode;
import io.v.nutz.zhgh.staffmanage.member.constant.MemberChangeOrigin;
import io.v.nutz.zhgh.staffmanage.member.model.MemberChangeRecord;
import io.v.nutz.base.model.Audit;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.sys.models.User;
@@ -107,10 +104,10 @@ public class WelfareMemberAdjustmentController {
LEFT JOIN audit_state mcr_state ON mcr_state.stateId = mcr.stateId
$condition
""")
.setParam("recordMode", MemberChangeRecordMode.WELFARE_MEMBER.getCode())
.setParam("changeUnitAuditing", MemberChangeApplyState.SCHOOL_UNION)
.setParam("changeUnitError", MemberChangeApplyState.SCHOOL_UNION_FAIL);
""");
// .setParam("recordMode", MemberChangeRecordMode.WELFARE_MEMBER.getCode())
// .setParam("changeUnitAuditing", MemberChangeApplyState.SCHOOL_UNION)
// .setParam("changeUnitError", MemberChangeApplyState.SCHOOL_UNION_FAIL);
sql.setVar("states", Joiner.on(",").join(List.of(WelfareMemberApplyState.SCHOOL_UNION_FAIL)));
@@ -323,18 +320,18 @@ public class WelfareMemberAdjustmentController {
for (String userId : userIds) {
User user = historyUserService.dao().fetch(User.class, Cnd.where("id", "=", userId));
MemberChangeRecord changeRecord = new MemberChangeRecord();
changeRecord.setType(UserChangeType.NEW.getCode());
changeRecord.setApplyOrigin(io.v.nutz.web.commons.utils.ShiroUtil.hasAnyRoles("H04,gh12") ? MemberChangeOrigin.UNION.getCode() : MemberChangeOrigin.UNION_GROUP.getCode());
changeRecord.setStateId(MemberChangeApplyState.SCHOOL_UNION);
changeRecord.setUpdateWelfareMember(true);
changeRecord.setUserId(userId);
changeRecord.setApplyTime(new Date());
changeRecord.setOriginUnitId(user.getUnitid());
changeRecord.setOriginUnionId(user.getUnionid());
changeRecord.setOriginThreeUnitId(user.getThreeUnitId());
changeRecord.setUnionAuditId(audit.getId());
changeRecord.setRecordMode(MemberChangeRecordMode.WELFARE_MEMBER.getCode());
changeRecord.setTaskId(null);
// changeRecord.setType(UserChangeType.NEW.getCode());
//// changeRecord.setApplyOrigin(io.v.nutz.web.commons.utils.ShiroUtil.hasAnyRoles("H04,gh12") ? MemberChangeOrigin.UNION.getCode() : MemberChangeOrigin.UNION_GROUP.getCode());
//// changeRecord.setStateId(MemberChangeApplyState.SCHOOL_UNION);
// changeRecord.setUpdateWelfareMember(true);
// changeRecord.setUserId(userId);
// changeRecord.setApplyTime(new Date());
// changeRecord.setOriginUnitId(user.getUnitid());
// changeRecord.setOriginUnionId(user.getUnionid());
// changeRecord.setOriginThreeUnitId(user.getThreeUnitId());
// changeRecord.setUnionAuditId(audit.getId());
//// changeRecord.setRecordMode(MemberChangeRecordMode.WELFARE_MEMBER.getCode());
// changeRecord.setTaskId(null);
maps.add(changeRecord);
}
historyUserService.insert(maps);
@@ -352,16 +349,16 @@ public class WelfareMemberAdjustmentController {
@ViReturn
@RequiresPermissions("welfare.member.adjustment")
public Object change(MemberChangeRecord record) {
record.setRecordMode(MemberChangeRecordMode.WELFARE_MEMBER.getCode());
if (WelfareFeature.judgmentAuthority()) {
record.setApplyOrigin(MemberChangeOrigin.SCHOOL.getCode());
record = MemberChangeAuditHandle.CREATE.next(record, null);
MemberChangeAuditHandle.SCHOOL.next(record, new Audit().setAuditPass(true));
} else {
record.setApplyOrigin(MemberChangeOrigin.UNION.getCode());
record = MemberChangeAuditHandle.CREATE.next(record, null);
MemberChangeAuditHandle.UNION.next(record, new Audit().setAuditPass(true));
}
// record.setRecordMode(MemberChangeRecordMode.WELFARE_MEMBER.getCode());
// if (WelfareFeature.judgmentAuthority()) {
// record.setApplyOrigin(MemberChangeOrigin.SCHOOL.getCode());
// record = MemberChangeAuditHandle.CREATE.next(record, null);
// MemberChangeAuditHandle.SCHOOL.next(record, new Audit().setAuditPass(true));
// } else {
// record.setApplyOrigin(MemberChangeOrigin.UNION.getCode());
// record = MemberChangeAuditHandle.CREATE.next(record, null);
// MemberChangeAuditHandle.UNION.next(record, new Audit().setAuditPass(true));
// }
return null;
}
src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareMemberChangeApplyAuditController.java
+7 -10
View File
@@ -5,10 +5,7 @@ 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.lang.Enum;
import io.v.nutz.zhgh.member.constant.MemberChangeApplyState;
import io.v.nutz.zhgh.member.constant.MemberChangeRecordMode;
import io.v.nutz.zhgh.member.handle.MemberChangeAuditHandle;
import io.v.nutz.zhgh.member.model.MemberChangeRecord;
import io.v.nutz.zhgh.staffmanage.member.model.MemberChangeRecord;
import io.v.nutz.base.model.Audit;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.ViService;
@@ -102,7 +99,7 @@ public class WelfareMemberChangeApplyAuditController {
pageForm.defaultSortAsc("mcr.stateId");
cnd.and(pageForm);
cnd.and("mcr.recordMode", "=", MemberChangeRecordMode.WELFARE_MEMBER.getCode());
// cnd.and("mcr.recordMode", "=", MemberChangeRecordMode.WELFARE_MEMBER.getCode());
if (date != null && date.length == 2) {
cnd.and("date(mcr.applyTime)", ">=", date[0]);
@@ -110,7 +107,7 @@ public class WelfareMemberChangeApplyAuditController {
}
if (audit) {
cnd.and("mcr.stateId", "=", source == 1 ? MemberChangeApplyState.UNION : MemberChangeApplyState.SCHOOL_UNION);
// cnd.and("mcr.stateId", "=", source == 1 ? MemberChangeApplyState.UNION : MemberChangeApplyState.SCHOOL_UNION);
}
cnd.andEx("u.unionid", "=", unionId);
@@ -118,8 +115,8 @@ public class WelfareMemberChangeApplyAuditController {
cnd.andEx("wun.welfareUnitId", "=", welfareUnit);
cnd.and("mcr.stateId", ">=", MemberChangeApplyState.SCHOOL_UNION);
sql.setParam("auditState", MemberChangeApplyState.SCHOOL_UNION);
// cnd.and("mcr.stateId", ">=", MemberChangeApplyState.SCHOOL_UNION);
// sql.setParam("auditState", MemberChangeApplyState.SCHOOL_UNION);
sql.setCondition(cnd);
@@ -133,8 +130,8 @@ public class WelfareMemberChangeApplyAuditController {
@RequiresPermissions("welfare.member.change.audit.school")
public Object doAudit(@ViRequired String recordId, Audit audit) {
MemberChangeRecord record = recordViService.fetch(recordId);
MemberChangeAuditHandle applyHandle = Enum.instance(MemberChangeAuditHandle.class, record.getStateId());
applyHandle.next(record, audit);
// MemberChangeAuditHandle applyHandle = Enum.instance(MemberChangeAuditHandle.class, record.getStateId());
// applyHandle.next(record, audit);
return null;
}
src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareMemberMangeController.java
+3 -3
View File
@@ -21,9 +21,9 @@ import io.v.nutz.sys.models.Sys_user_role;
import io.v.nutz.sys.models.User;
import io.v.nutz.sys.services.SysUserService;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.zhgh.member.MemberMode;
import io.v.nutz.zhgh.member.WelfareMemberMode;
import io.v.nutz.zhgh.member.model.MemberCheckTask;
import io.v.nutz.zhgh.staffmanage.member.MemberMode;
import io.v.nutz.zhgh.staffmanage.member.WelfareMemberMode;
import io.v.nutz.zhgh.staffmanage.member.model.MemberCheckTask;
import io.v.nutz.zhgh.welfare.feature.WelfareFeature;
import io.v.nutz.zhgh.welfare.model.template.WelfareMemberTemp;
import io.v.nutz.zhgh.welfare.service.WelfareMemberService;
src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareSelfAgentController.java
+4 -5
View File
@@ -3,9 +3,8 @@ package io.v.nutz.zhgh.welfare.controller;
import cn.hutool.core.date.DateUtil;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.service.BaseService;
import io.v.nutz.zhgh.member.constant.MemberChangeRecordMode;
import io.v.nutz.zhgh.member.model.MemberCheckSelfTask;
import io.v.nutz.zhgh.member.model.MemberCheckTask;
import io.v.nutz.zhgh.staffmanage.member.model.MemberCheckSelfTask;
import io.v.nutz.zhgh.staffmanage.member.model.MemberCheckTask;
import io.v.nutz.web.commons.utils.ShiroUtil;
import org.nutz.dao.Cnd;
import org.nutz.ioc.loader.annotation.Inject;
@@ -39,8 +38,8 @@ public class WelfareSelfAgentController {
List<MemberCheckTask> checkTasks = baseService.dao().query(MemberCheckTask.class, Cnd.where("startTime", "<", DateUtil.date())
.and("endTime", ">", DateUtil.date())
.and("createTaskMode", "=", 2)
.and("year", "=", DateUtil.thisYear())
.and("taskMode", "=", MemberChangeRecordMode.WELFARE_MEMBER.getCode()));
.and("year", "=", DateUtil.thisYear()));
// .and("taskMode", "=", MemberChangeRecordMode.WELFARE_MEMBER.getCode()));
final String title = "【福利系统】";
List<NutMap> list = new ArrayList<>();
src/main/java/io/v/nutz/zhgh/welfare/controller/check/WelfareCheckPersonalController.java
+1 -1
View File
@@ -5,7 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.Vi;
import io.v.nutz.zhgh.member.service.MemberCheckPersonalService;
import io.v.nutz.zhgh.staffmanage.member.service.MemberCheckPersonalService;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.base.utils.ViTool;
src/main/java/io/v/nutz/zhgh/welfare/controller/check/WelfareMemberCheckSchoolController.java
+12 -14
View File
@@ -11,9 +11,7 @@ import io.v.nutz.base.service.SimpleService;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.base.utils.ViTool;
import io.v.nutz.zhgh.data.constant.UserChangeType;
import io.v.nutz.zhgh.member.constant.MemberChangeApplyState;
import io.v.nutz.zhgh.member.constant.MemberChangeRecordMode;
import io.v.nutz.zhgh.member.model.MemberChangeRecord;
import io.v.nutz.zhgh.staffmanage.member.model.MemberChangeRecord;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.dao.Cnd;
@@ -89,9 +87,9 @@ public class WelfareMemberCheckSchoolController {
cnd.asc("gh.unioncode");
sql.setCondition(cnd);
List<NutMap> map = simpleService.listMap(sql);
List<MemberChangeRecord> changeRecords = simpleService.dao().query(MemberChangeRecord.class,
Cnd.where("stateId", "=", MemberChangeApplyState.SCHOOL_UNION)
.and("taskId", "=", taskId));
// List<MemberChangeRecord> changeRecords = simpleService.dao().query(MemberChangeRecord.class,
// Cnd.where("stateId", "=", MemberChangeApplyState.SCHOOL_UNION)
// .and("taskId", "=", taskId));
map.forEach(v -> {
//该工会有多少个人需要审核
//找出原工会和现工会不等于空的
@@ -101,11 +99,11 @@ public class WelfareMemberCheckSchoolController {
StrUtil.isNotEmpty(c.getOriginUnionId()) &&
c.getCurrentUnionId().equals(v.getString("id"))).collect(Collectors.toList()).size();*/
//找出除了单位变更的其他会员
int size2 = changeRecords.stream().filter(c ->
StrUtil.isNotEmpty(c.getOriginUnionId()) &&
c.getOriginUnionId().equals(v.getString("id"))).collect(Collectors.toList()).size();
v.setv("notCheckNum", size2);
// int size2 = changeRecords.stream().filter(c ->
// StrUtil.isNotEmpty(c.getOriginUnionId()) &&
//
// c.getOriginUnionId().equals(v.getString("id"))).collect(Collectors.toList()).size();
// v.setv("notCheckNum", size2);
});
return map;
}
@@ -147,9 +145,9 @@ public class WelfareMemberCheckSchoolController {
Cnd cnd = Cnd.NEW();
cnd.and("mcr.taskId", "=", taskId);
if (!isView) {
cnd.and("mcr.stateId", "=", MemberChangeApplyState.SCHOOL_UNION);
// cnd.and("mcr.stateId", "=", MemberChangeApplyState.SCHOOL_UNION);
} else {
cnd.and("mcr.stateId", "in", List.of(MemberChangeApplyState.SCHOOL_UNION_FAIL, MemberChangeApplyState.SUCCESS));
// cnd.and("mcr.stateId", "in", List.of(MemberChangeApplyState.SCHOOL_UNION_FAIL, MemberChangeApplyState.SUCCESS));
}
cnd.and("mcr.originUnionId", "=", unionId);
sql.setCondition(cnd);
@@ -207,7 +205,7 @@ public class WelfareMemberCheckSchoolController {
AND mcr.recordMode = @mode
""");
sql.setParam("taskId", taskId);
sql.setParam("mode", MemberChangeRecordMode.WELFARE_MEMBER.getCode());
// sql.setParam("mode", MemberChangeRecordMode.WELFARE_MEMBER.getCode());
List<NutMap> dataList = (List<NutMap>) simpleService.listMap(sql);
for (NutMap map : dataList) {
src/main/java/io/v/nutz/zhgh/welfare/controller/check/WelfareMemberCheckTaskController.java
+9 -10
View File
@@ -7,11 +7,10 @@ import io.v.nutz.base.query.PageForm;
import io.v.nutz.base.service.SimpleService;
import io.v.nutz.sys.models.Sys_union;
import io.v.nutz.sys.models.Sys_user;
import io.v.nutz.zhgh.member.constant.MemberChangeRecordMode;
import io.v.nutz.zhgh.member.model.MemberChangeRecord;
import io.v.nutz.zhgh.member.model.MemberCheckSelfTask;
import io.v.nutz.zhgh.member.model.MemberCheckTask;
import io.v.nutz.zhgh.member.model.MemberCheckUnionTask;
import io.v.nutz.zhgh.staffmanage.member.model.MemberChangeRecord;
import io.v.nutz.zhgh.staffmanage.member.model.MemberCheckSelfTask;
import io.v.nutz.zhgh.staffmanage.member.model.MemberCheckTask;
import io.v.nutz.zhgh.staffmanage.member.model.MemberCheckUnionTask;
import io.v.nutz.zhgh.welfare.model.WelfareMemberCheckUser;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.dao.Cnd;
@@ -62,7 +61,7 @@ public class WelfareMemberCheckTaskController {
select * from member_check_task $condition
""");
Cnd cnd = Cnd.NEW();
cnd.and("taskMode", "=", MemberChangeRecordMode.WELFARE_MEMBER.getCode());
// cnd.and("taskMode", "=", MemberChangeRecordMode.WELFARE_MEMBER.getCode());
cnd.andEX("year", "=", year);
sql.setCondition(cnd);
return simpleService.list(pageForm, sql);
@@ -78,7 +77,7 @@ public class WelfareMemberCheckTaskController {
Trans.exec(() -> {
task.setYear(calendar.get(Calendar.YEAR));
task.setTaskMode(MemberChangeRecordMode.WELFARE_MEMBER.getCode());
// task.setTaskMode(MemberChangeRecordMode.WELFARE_MEMBER.getCode());
dao.insert(task);
if (task.getCreateTaskMode() == 1) {
List<MemberCheckUnionTask> unionTasks = sysUnions.stream().map(v -> {
@@ -159,7 +158,7 @@ public class WelfareMemberCheckTaskController {
Calendar calendar = Calendar.getInstance();
calendar.setTime(task.getStartTime());
task.setTaskMode(MemberChangeRecordMode.WELFARE_MEMBER.getCode());
// task.setTaskMode(MemberChangeRecordMode.WELFARE_MEMBER.getCode());
task.setYear(calendar.get(Calendar.YEAR));
dao.updateIgnoreNull(task);
return null;
@@ -184,7 +183,7 @@ public class WelfareMemberCheckTaskController {
public Object getAllTask(Integer year) {
Cnd cnd = Cnd.NEW();
cnd.andEX("year", "=", year);
cnd.and("taskMode", "=", MemberChangeRecordMode.WELFARE_MEMBER.getCode());
// cnd.and("taskMode", "=", MemberChangeRecordMode.WELFARE_MEMBER.getCode());
cnd.and("createTaskMode", "=", 1);
cnd.desc("startTime");
return dao.query(MemberCheckTask.class, cnd);
@@ -196,7 +195,7 @@ public class WelfareMemberCheckTaskController {
Cnd cnd = Cnd.NEW();
cnd.andEX("year", "=", year);
cnd.andEX("createTaskMode", "=", 2);
cnd.and("taskMode", "=", MemberChangeRecordMode.WELFARE_MEMBER.getCode());
// cnd.and("taskMode", "=", MemberChangeRecordMode.WELFARE_MEMBER.getCode());
return dao.query(MemberCheckTask.class, cnd);
}
src/main/java/io/v/nutz/zhgh/welfare/controller/check/WelfareMemberCheckUnionController.java
+73 -78
View File
@@ -13,13 +13,10 @@ import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.sys.models.Sys_config;
import io.v.nutz.zhgh.data.constant.UserChangeType;
import io.v.nutz.zhgh.member.constant.MemberChangeApplyState;
import io.v.nutz.zhgh.member.constant.MemberChangeOrigin;
import io.v.nutz.zhgh.member.constant.MemberChangeRecordMode;
import io.v.nutz.zhgh.member.handle.MemberChangeAuditHandle;
import io.v.nutz.zhgh.member.model.MemberChangeRecord;
import io.v.nutz.zhgh.member.model.MemberCheckTask;
import io.v.nutz.zhgh.member.model.MemberCheckUnionTask;
import io.v.nutz.zhgh.staffmanage.member.constant.MemberChangeOrigin;
import io.v.nutz.zhgh.staffmanage.member.model.MemberChangeRecord;
import io.v.nutz.zhgh.staffmanage.member.model.MemberCheckTask;
import io.v.nutz.zhgh.staffmanage.member.model.MemberCheckUnionTask;
import io.v.nutz.base.model.Audit;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.sys.models.User;
@@ -27,9 +24,7 @@ import io.v.nutz.web.commons.utils.ShiroUtil;
import io.v.nutz.base.utils.ViTool;
import io.v.nutz.zhgh.welfare.constant.WelfareMemberApplyState;
import io.v.nutz.zhgh.welfare.feature.WelfareFeature;
import io.v.nutz.zhgh.welfare.handle.WelfareMemberApplyAuditHandle;
import io.v.nutz.zhgh.welfare.mode.WelfareMemberMode;
import io.v.nutz.zhgh.welfare.model.WelfareMemberApplyRecord;
import io.v.nutz.zhgh.welfare.model.WelfareMemberCheckUser;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -122,10 +117,10 @@ public class WelfareMemberCheckUnionController {
LEFT JOIN audit_state state ON wmar.stateId = state.stateId
LEFT JOIN audit_state mcr_state ON mcr_state.stateId = mcr.stateId
$condition
""")
.setParam("recordMode", MemberChangeRecordMode.WELFARE_MEMBER.getCode())
.setParam("changeUnitAuditing", MemberChangeApplyState.SCHOOL_UNION)
.setParam("changeUnitError", MemberChangeApplyState.SCHOOL_UNION_FAIL);
""");
// .setParam("recordMode", MemberChangeRecordMode.WELFARE_MEMBER.getCode())
// .setParam("changeUnitAuditing", MemberChangeApplyState.SCHOOL_UNION)
// .setParam("changeUnitError", MemberChangeApplyState.SCHOOL_UNION_FAIL);
sql.setVar("states", Joiner.on(",").join(List.of(WelfareMemberApplyState.SCHOOL_UNION_FAIL)));
@@ -244,54 +239,54 @@ public class WelfareMemberCheckUnionController {
@ViReturn
@RequiresPermissions("welfare.member.check.union")
public Object doSubmitChangeUser(MemberChangeRecord memberChangeRecord) {
if (Objects.equals(memberChangeRecord.getType(), UserChangeType.NEW.getCode())) {
return Result.error("您已经入职，可以选择恢复功能入会！");
}
if (Objects.equals(memberChangeRecord.getType(), UserChangeType.UNIT_CHANGE.getCode())) {
boolean unionGroupEnable = Optional.ofNullable(dao.fetch(Sys_config.class, Cnd.where("configKey", "=", "isThreeUnit"))).map(v -> v.getConfigValue()).orElse("false").equals("true");
// if (Objects.equals(memberChangeRecord.getType(), UserChangeType.NEW.getCode())) {
// return Result.error("您已经入职，可以选择恢复功能入会！");
// }
// if (Objects.equals(memberChangeRecord.getType(), UserChangeType.UNIT_CHANGE.getCode())) {
// boolean unionGroupEnable = Optional.ofNullable(dao.fetch(Sys_config.class, Cnd.where("configKey", "=", "isThreeUnit"))).map(v -> v.getConfigValue()).orElse("false").equals("true");
//
// if (unionGroupEnable && memberChangeRecord.getCurrentThreeUnitId().equals(memberChangeRecord.getOriginThreeUnitId())) {
// return Result.error("请选择不同的单位！");
// } else if (!unionGroupEnable && memberChangeRecord.getCurrentUnitId().equals(memberChangeRecord.getOriginUnitId())) {
// return Result.error("请选择不同的单位！");
// }
// }
// if (!Objects.equals(memberChangeRecord.getType(), UserChangeType.UNIT_CHANGE.getCode())) {
// memberChangeRecord.setCurrentUnitId(null);
// memberChangeRecord.setCurrentUnionId(null);
// }
//
// Sql userSql = Sqls.fetchString("select userState from sys_user where id = @userId");
// userSql.setParam("userId", memberChangeRecord.getUserId());
// dao.execute(userSql);
// String userState = StrUtil.blankToDefault(userSql.getString(), "");
//
// if (memberChangeRecord.getType() == UserChangeType.WORK.getCode()) {
// if (userState.equals(UserChangeType.WORK.getDescription())) {
// return Result.error("该用户当前的状态已经是" + UserChangeType.WORK.getDescription() + "，您无需变更！");
// }
// }
// if (memberChangeRecord.getType() == UserChangeType.RESIGN.getCode()) {
// if (userState.equals(UserChangeType.RESIGN.getDescription())) {
// return Result.error("该用户当前的状态已经是" + UserChangeType.RESIGN.getDescription() + "，您无需变更！");
// }
// }
// if (memberChangeRecord.getType() == UserChangeType.RETIREMENT.getCode()) {
// if (userState.equals(UserChangeType.RETIREMENT.getDescription())) {
// return Result.error("该用户当前的状态已经是" + UserChangeType.RETIREMENT.getDescription() + "，您无需变更！");
// }
// }
//
//
//// memberChangeRecord.setRecordMode(MemberChangeRecordMode.WELFARE_MEMBER.getCode());
//// memberChangeRecord.setApplyOrigin(MemberChangeOrigin.UNION.getCode());
//// memberChangeRecord = MemberChangeAuditHandle.CREATE.next(memberChangeRecord, null);
//
// Audit audit = new Audit();
// audit.setAuditPass(true);
// audit.setAuditOpinion(memberChangeRecord.getRemark());
if (unionGroupEnable && memberChangeRecord.getCurrentThreeUnitId().equals(memberChangeRecord.getOriginThreeUnitId())) {
return Result.error("请选择不同的单位！");
} else if (!unionGroupEnable && memberChangeRecord.getCurrentUnitId().equals(memberChangeRecord.getOriginUnitId())) {
return Result.error("请选择不同的单位！");
}
}
if (!Objects.equals(memberChangeRecord.getType(), UserChangeType.UNIT_CHANGE.getCode())) {
memberChangeRecord.setCurrentUnitId(null);
memberChangeRecord.setCurrentUnionId(null);
}
Sql userSql = Sqls.fetchString("select userState from sys_user where id = @userId");
userSql.setParam("userId", memberChangeRecord.getUserId());
dao.execute(userSql);
String userState = StrUtil.blankToDefault(userSql.getString(), "");
if (memberChangeRecord.getType() == UserChangeType.WORK.getCode()) {
if (userState.equals(UserChangeType.WORK.getDescription())) {
return Result.error("该用户当前的状态已经是" + UserChangeType.WORK.getDescription() + "，您无需变更！");
}
}
if (memberChangeRecord.getType() == UserChangeType.RESIGN.getCode()) {
if (userState.equals(UserChangeType.RESIGN.getDescription())) {
return Result.error("该用户当前的状态已经是" + UserChangeType.RESIGN.getDescription() + "，您无需变更！");
}
}
if (memberChangeRecord.getType() == UserChangeType.RETIREMENT.getCode()) {
if (userState.equals(UserChangeType.RETIREMENT.getDescription())) {
return Result.error("该用户当前的状态已经是" + UserChangeType.RETIREMENT.getDescription() + "，您无需变更！");
}
}
memberChangeRecord.setRecordMode(MemberChangeRecordMode.WELFARE_MEMBER.getCode());
memberChangeRecord.setApplyOrigin(MemberChangeOrigin.UNION.getCode());
memberChangeRecord = MemberChangeAuditHandle.CREATE.next(memberChangeRecord, null);
Audit audit = new Audit();
audit.setAuditPass(true);
audit.setAuditOpinion(memberChangeRecord.getRemark());
MemberChangeAuditHandle.UNION.next(memberChangeRecord, audit);
// MemberChangeAuditHandle.UNION.next(memberChangeRecord, audit);
return null;
}
@@ -348,25 +343,25 @@ public class WelfareMemberCheckUnionController {
MemberChangeRecord changeRecord = new MemberChangeRecord();
// changeRecord.setType(UserChangeType.NEW_WELFARE_LIST.getCode());
// changeRecord.setRemark(UserChangeType.NEW_WELFARE_LIST.getDescription());
changeRecord.setApplyOrigin(MemberChangeOrigin.UNION.getCode());
changeRecord.setStateId(MemberChangeApplyState.SCHOOL_UNION);
changeRecord.setUpdateWelfareMember(true);
changeRecord.setUserId(userId);
changeRecord.setApplyTime(new Date());
changeRecord.setOriginUnitId(user.getUnitid());
changeRecord.setOriginUnionId(user.getUnionid());
changeRecord.setOriginThreeUnitId(user.getThreeUnitId());
changeRecord.setCurrentUnionId(user.getUnionid());
changeRecord.setCurrentUnitId(unitId);
changeRecord.setCurrentThreeUnitId(threeUnitId);
changeRecord.setUnionAuditId(audit.getId());
changeRecord.setRecordMode(MemberChangeRecordMode.WELFARE_MEMBER.getCode());
changeRecord.setTaskId(taskId);
// changeRecord.setApplyOrigin(MemberChangeOrigin.UNION.getCode());
// changeRecord.setStateId(MemberChangeApplyState.SCHOOL_UNION);
// changeRecord.setUpdateWelfareMember(true);
// changeRecord.setUserId(userId);
// changeRecord.setApplyTime(new Date());
// changeRecord.setOriginUnitId(user.getUnitid());
// changeRecord.setOriginUnionId(user.getUnionid());
// changeRecord.setOriginThreeUnitId(user.getThreeUnitId());
// changeRecord.setCurrentUnionId(user.getUnionid());
// changeRecord.setCurrentUnitId(unitId);
// changeRecord.setCurrentThreeUnitId(threeUnitId);
// changeRecord.setUnionAuditId(audit.getId());
//// changeRecord.setRecordMode(MemberChangeRecordMode.WELFARE_MEMBER.getCode());
// changeRecord.setTaskId(taskId);
// maps.add(changeRecord);
changeRecord.setRecordMode(MemberChangeRecordMode.WELFARE_MEMBER.getCode());
changeRecord.setApplyOrigin(MemberChangeOrigin.UNION.getCode());
changeRecord = MemberChangeAuditHandle.CREATE.next(changeRecord, null);
MemberChangeAuditHandle.UNION.next(changeRecord, audit);
// changeRecord.setRecordMode(MemberChangeRecordMode.WELFARE_MEMBER.getCode());
// changeRecord.setApplyOrigin(MemberChangeOrigin.UNION.getCode());
// changeRecord = MemberChangeAuditHandle.CREATE.next(changeRecord, null);
// MemberChangeAuditHandle.UNION.next(changeRecord, audit);
WelfareMemberCheckUser checkUser = new WelfareMemberCheckUser();
checkUser.setUserId(userId);
src/main/java/io/v/nutz/zhgh/welfare/handle/WelfareMemberApplyAuditHandle.java
+1 -2
View File
@@ -7,7 +7,6 @@ import io.v.nutz.base.utils.Vi;
import io.v.nutz.base.utils.ViResource;
import io.v.nutz.sys.models.Sys_user_role;
import io.v.nutz.sys.services.SysUserService;
import io.v.nutz.zhgh.member.constant.MemberApplyState;
import io.v.nutz.zhgh.welfare.constant.WelfareMemberApplyState;
import io.v.nutz.zhgh.welfare.feature.WelfareFeature;
import io.v.nutz.zhgh.welfare.mode.WelfareMemberMode;
@@ -59,7 +58,7 @@ public enum WelfareMemberApplyAuditHandle {
/**
* 校工会审核
*/
AUDIT_SCHOOL(MemberApplyState.SCHOOL_UNION) {
AUDIT_SCHOOL(null) {
@Override
public void next(WelfareMemberApplyRecord record, Audit audit) {
next(List.of(record), audit);