diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceSchoolAuditController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceSchoolAuditController.java deleted file mode 100644 index ab2ed14d..00000000 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceSchoolAuditController.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.budwk.app.zhgh.staffbenefit.mutualInsurance.controller; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.annotation.SaMode; -import cn.hutool.core.util.StrUtil; -import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.param.PageForm; -import com.budwk.app.base.result.Result; -import com.budwk.app.base.utils.PageUtil; -import com.budwk.app.flow.enums.ProcessTaskStateEnum; -import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.staffbenefit.mutualInsurance.service.MutualInsuranceUserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.nutz.dao.Cnd; -import org.nutz.dao.Sqls; -import org.nutz.dao.sql.Sql; -import org.nutz.ioc.loader.annotation.Inject; -import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.util.NutMap; -import org.nutz.mvc.annotation.At; -import org.nutz.mvc.annotation.Ok; - -import java.util.List; - -/** - * @author : hongqiwei - * @description : - * @createDate : 2025/9/23 17:35 - */ - -@IocBean -@At("/platform/mutualInsurance/schoolAudit") -@Api("校工会审核") -@Ok("json:full") -@Slf4j -public class MutualInsuranceSchoolAuditController { - - @Inject - private MutualInsuranceUserService mutualInsuranceUserService; - - @At("/index") - @Ok("beetl:/platform/zhgh/staffbenefit/mutualInsurance/schoolAudit/index.html") - @SaCheckPermission("mutualInsurance.schoolAudit") - public void index() { - } - @At("/h5") - @Ok("beetl:/platform/zhghh5/staffbenefit/mutualInsurance/schoolAudit/index.html") - @SaCheckPermission("h5.mutualInsurance.schoolAudit") - public void h5Index() { - } - - @At - @ApiOperation("分页查询") - @SaCheckPermission(value = {"mutualInsurance.schoolAudit", "h5.mutualInsurance.schoolAudit"}, mode = SaMode.OR) - public Result pageData(PageForm pageForm, - boolean approval, - String projectId, - String unionId, - String unitId, - String userName, - String sex) { - Sql sql = Sqls.create(""" - SELECT - info.*, - ins.id AS instanceId, - ins.businessNo, - ins.state instanceState, - ins.variable instanceVariable, - ins.processDefineId instanceProcessDefineId, - t.id taskId, - t.taskName AS taskKey, - t.displayName taskName, - t.taskType, - t.performType taskPerformType, - t.taskState, - t.finishTime, - t.taskParentId, - t.variable taskVariable, - IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName, - IF(rt.id IS NOT NULL, 1, 0) AS canRevoke - FROM - wf_process_task t - LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId - LEFT JOIN mutual_insurance_user_info info ON info.id = ins.businessNo - LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id - LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10 - LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10 - $condition - """); - Cnd cnd = Cnd.NEW(); - cnd.and("t.taskName", "=", "3e4e3785-64f4-4e7c-89bc-ea54dca216cd"); - cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); - - if (approval) { - cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); - } else { - cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); - } - // 年度查询条件 -// cnd.andEX("year(info.applyTime)", "=", year); - - //事项id查询 - cnd.andEX("info.projectId", "=", projectId); - - // 工会、单位名称查询条件 - cnd.andEX("info.unionId", "=", unionId); - cnd.andEX("info.unitId", "=", unitId); - - // 性别查询条件 - cnd.andEX("info.sex", "=", sex); - - // 姓名查询条件 - if (StrUtil.isNotBlank(userName)) { - cnd.and("info.userName", "like", "%" + userName + "%"); - } - if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { - cnd.desc("info.applyTime"); - } else { - cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); - } - cnd.groupBy("t.id"); - cnd.desc("t.createdAt"); - sql.setCondition(cnd); - Pagination pagination = mutualInsuranceUserService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); - return Result.success(pagination); - } -} - diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceSecretaryAuditController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceSecretaryAuditController.java deleted file mode 100644 index e09183a3..00000000 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceSecretaryAuditController.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.budwk.app.zhgh.staffbenefit.mutualInsurance.controller; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.annotation.SaMode; -import cn.hutool.core.util.StrUtil; -import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.param.PageForm; -import com.budwk.app.base.result.Result; -import com.budwk.app.base.utils.PageUtil; -import com.budwk.app.flow.enums.ProcessTaskStateEnum; -import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.staffbenefit.mutualInsurance.service.MutualInsuranceUserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.nutz.dao.Cnd; -import org.nutz.dao.Sqls; -import org.nutz.dao.sql.Sql; -import org.nutz.ioc.loader.annotation.Inject; -import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.util.NutMap; -import org.nutz.mvc.annotation.At; -import org.nutz.mvc.annotation.Ok; - -import java.util.List; - -/** - * @author : hongqiwei - * @description : - * @createDate : 2025/9/23 17:42 - */ - -@IocBean -@At("/platform/mutualInsurance/secretaryAudit") -@Api("党委书记审核") -@Ok("json:full") -@Slf4j -public class MutualInsuranceSecretaryAuditController { - - @Inject - private MutualInsuranceUserService mutualInsuranceUserService; - - @At("/index") - @Ok("beetl:/platform/zhgh/staffbenefit/mutualInsurance/secretaryAudit/index.html") - @SaCheckPermission("mutualInsurance.secretaryAudit") - public void index() { - } - @At("/h5") - @Ok("beetl:/platform/zhghh5/staffbenefit/mutualInsurance/secretaryAudit/index.html") - @SaCheckPermission("h5.mutualInsurance.secretaryAudit") - public void h5Index() { - } - - @At - @ApiOperation("分页查询") - @SaCheckPermission(value = {"mutualInsurance.secretaryAudit", "h5.mutualInsurance.secretaryAudit"}, mode = SaMode.OR) - public Result pageData(PageForm pageForm, - boolean approval, - String projectId, - String unionId, - String unitId, - String userName, - String sex) { - Sql sql = Sqls.create(""" - SELECT - info.*, - ins.id AS instanceId, - ins.businessNo, - ins.state instanceState, - ins.variable instanceVariable, - ins.processDefineId instanceProcessDefineId, - t.id taskId, - t.taskName AS taskKey, - t.displayName taskName, - t.taskType, - t.performType taskPerformType, - t.taskState, - t.finishTime, - t.taskParentId, - t.variable taskVariable, - IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName, - IF(rt.id IS NOT NULL, 1, 0) AS canRevoke - FROM - wf_process_task t - LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId - LEFT JOIN mutual_insurance_user_info info ON info.id = ins.businessNo - LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id - LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10 - LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10 - $condition - """); - Cnd cnd = Cnd.NEW(); - cnd.and("t.taskName", "=", "8567fa6e-7207-4958-ab82-767e22d04159"); - cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); - - if (approval) { - cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); - } else { - cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); - } - // 年度查询条件 -// cnd.andEX("year(info.applyTime)", "=", year); - - //事项id查询 - cnd.andEX("info.projectId", "=", projectId); - - // 工会、单位名称查询条件 - cnd.andEX("info.unionId", "=", unionId); - cnd.andEX("info.unitId", "=", unitId); - - // 性别查询条件 - cnd.andEX("info.sex", "=", sex); - - // 姓名查询条件 - if (StrUtil.isNotBlank(userName)) { - cnd.and("info.userName", "like", "%" + userName + "%"); - } - if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { - cnd.desc("info.applyTime"); - } else { - cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); - } - cnd.groupBy("t.id"); - cnd.desc("t.createdAt"); - sql.setCondition(cnd); - Pagination pagination = mutualInsuranceUserService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); - return Result.success(pagination); - } -} - diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceUnionAuditController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceUnionAuditController.java deleted file mode 100644 index 7dde774a..00000000 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceUnionAuditController.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.budwk.app.zhgh.staffbenefit.mutualInsurance.controller; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.annotation.SaMode; -import cn.hutool.core.util.StrUtil; -import com.budwk.app.base.page.Pagination; -import com.budwk.app.base.param.PageForm; -import com.budwk.app.base.result.Result; -import com.budwk.app.base.utils.PageUtil; -import com.budwk.app.flow.enums.ProcessTaskStateEnum; -import com.budwk.app.web.commons.auth.utils.SecurityUtil; -import com.budwk.app.zhgh.staffbenefit.mutualInsurance.service.MutualInsuranceUserService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.nutz.dao.Cnd; -import org.nutz.dao.Sqls; -import org.nutz.dao.sql.Sql; -import org.nutz.ioc.loader.annotation.Inject; -import org.nutz.ioc.loader.annotation.IocBean; -import org.nutz.lang.util.NutMap; -import org.nutz.mvc.annotation.At; -import org.nutz.mvc.annotation.Ok; - -import java.util.List; - -/** - * @author : hongqiwei - * @description : - * @createDate : 2025/9/23 17:35 - */ - -@IocBean -@At("/platform/mutualInsurance/unionAudit") -@Api("分工会审核") -@Ok("json:full") -@Slf4j -public class MutualInsuranceUnionAuditController { - - @Inject - private MutualInsuranceUserService mutualInsuranceUserService; - @At("/index") - @Ok("beetl:/platform/zhgh/staffbenefit/mutualInsurance/unionAudit/index.html") - @SaCheckPermission("mutualInsurance.unionAudit") - public void index() { - } - @At("/h5") - @Ok("beetl:/platform/zhghh5/staffbenefit/mutualInsurance/unionAudit/index.html") - @SaCheckPermission("h5.mutualInsurance.unionAudit") - public void h5Index() { - } - - @At - @ApiOperation("分页查询") - @SaCheckPermission(value = {"mutualInsurance.unionAudit", "h5.mutualInsurance.unionAudit"}, mode = SaMode.OR) - public Result pageData(PageForm pageForm, - boolean approval, - String projectId, - String unionId, - String unitId, - String userName, - String sex) { - Sql sql = Sqls.create(""" - SELECT - info.*, - ins.id AS instanceId, - ins.businessNo, - ins.state instanceState, - ins.variable instanceVariable, - ins.processDefineId instanceProcessDefineId, - t.id taskId, - t.taskName AS taskKey, - t.displayName taskName, - t.taskType, - t.performType taskPerformType, - t.taskState, - t.finishTime, - t.taskParentId, - t.variable taskVariable, - IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName, - IF(rt.id IS NOT NULL, 1, 0) AS canRevoke - FROM - wf_process_task t - LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId - LEFT JOIN mutual_insurance_user_info info ON info.id = ins.businessNo - LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id - LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10 - LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10 - $condition - """); - Cnd cnd = Cnd.NEW(); - cnd.and("t.taskName", "=", "7e4a33fb-cd1e-4373-9bc5-815125568471"); - cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); - - if (approval) { - cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.WITHDRAW.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); - } else { - cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); - } - // 年度查询条件 -// cnd.andEX("year(info.applyTime)", "=", year); - - //事项id查询 - cnd.andEX("info.projectId", "=", projectId); - - // 工会、单位名称查询条件 - cnd.andEX("info.unionId", "=", unionId); - cnd.andEX("info.unitId", "=", unitId); - - // 性别查询条件 - cnd.andEX("info.sex", "=", sex); - - // 姓名查询条件 - if (StrUtil.isNotBlank(userName)) { - cnd.and("info.userName", "like", "%" + userName + "%"); - } - if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { - cnd.desc("info.applyTime"); - } else { - cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); - } - cnd.groupBy("t.id"); - cnd.desc("t.createdAt"); - sql.setCondition(cnd); - Pagination pagination = mutualInsuranceUserService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); - return Result.success(pagination); - } - -} - diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/schoolAudit/index.html deleted file mode 100644 index 8354a28e..00000000 --- a/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/schoolAudit/index.html +++ /dev/null @@ -1,240 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 已审核 - 未审核 - - - - - - - - - - - - · - - - - - - - - - - - - -
- - - - diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/secretaryAudit/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/secretaryAudit/index.html deleted file mode 100644 index 7a88e58d..00000000 --- a/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/secretaryAudit/index.html +++ /dev/null @@ -1,240 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 已审核 - 未审核 - - - - - - - - - - - - · - - - - - - - - - - - - -
- - - - diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/unionAudit/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/unionAudit/index.html deleted file mode 100644 index 0f229da8..00000000 --- a/src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/unionAudit/index.html +++ /dev/null @@ -1,240 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 已审核 - 未审核 - - - - - - - - - - - - · - - - - - - - - - - - - -
- - - -