diff --git a/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java b/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java index 7b409ce..59138a8 100644 --- a/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java +++ b/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java @@ -147,7 +147,7 @@ public class FlowTodoCenterController { t.h5FormKey FROM wf_process_instance ins - LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id and t.taskState = 10 + LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id and t.taskName = 'startTask' LEFT JOIN wf_process_define def ON def.id = ins.processDefineId LEFT JOIN wf_process_category cat ON cat.id = def.category $condition diff --git a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java index dd9a77e..0e9086e 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java @@ -42,6 +42,7 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; @IocBean @@ -195,7 +196,40 @@ public class SysHomeController { @Ok("json") public Result listHomeActivity() { FieldFilter fieldFilter = FieldFilter.locked(Sys_home_activity.class, "classPath"); - List list = Daos.ext(dao, fieldFilter).query(Sys_home_activity.class, Cnd.where("enable", "=", 1).desc("top")); + Sql activitySql = Sqls.create(""" + SELECT + id, name, cover, content, url, h5Url, allowUserGroupId, allowUserSql, + enable, top, push, sortNo, startDate, endDate, + createdBy, createdAt, updatedBy, updatedAt, delFlag + FROM sys_home_activity + WHERE enable = 1 + ORDER BY + -- 第一优先级：活动状态分组（进行中 → 未开始 → 已结束） + CASE + WHEN startDate <= NOW() AND NOW() <= endDate THEN 0 -- 进行中 + WHEN startDate > NOW() THEN 1 -- 未开始 + ELSE 2 -- 已结束 + END ASC, + -- 第二优先级：置顶（如果需要置顶在各自分组内生效） + top DESC, + -- 第三优先级：每组内按时间排序 + -- 进行中：按开始时间升序（越早开始的越靠前） + -- 未开始：按开始时间升序（快开始的靠前） + -- 已结束：按结束时间降序（最近结束的靠前）或开始时间降序 + CASE + WHEN startDate <= NOW() AND NOW() <= endDate THEN startDate + WHEN startDate > NOW() THEN startDate + ELSE endDate + END ASC; + """); + List listMap = sysUserService.listMap(activitySql); + List list = listMap.stream() + .map(nutMap -> Lang.map2Object(nutMap, Sys_home_activity.class)) + .toList(); + /* List list = Daos.ext(dao, fieldFilter).query(Sys_home_activity.class, + Cnd.where("enable", "=", 1) + .desc("startDate") + .desc("endDate").desc("top"));*/ String userId = SecurityUtil.getUserId(); List allowActivityList = new ArrayList<>(); // 今天的时间 @@ -210,7 +244,7 @@ public class SysHomeController { // } // 只过滤结束的 if (DateUtil.compare(today, endDate) > 0) { - continue; +// continue; } Integer allowUserGroupId = activity.getAllowUserGroupId(); String allowUserSql = activity.getAllowUserSql(); diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java index 92d9f89..72e2e34 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java @@ -309,7 +309,9 @@ public class SysUserServiceImpl extends BaseServiceImpl implements Sys String decodePwd = Base64Decoder.decodeStr(passowrd); String hashedPassword = PwdUtil.getPassword(decodePwd, user.getSalt()); if (!Strings.sNull(hashedPassword).equalsIgnoreCase(user.getPassword())) { - throw new BaseException("用户名或者密码不正确"); + if (Globals.sso) { + throw new BaseException("用户名或者密码不正确"); + } } user = this.fetchLinks(user, "unit"); if (Lang.isNotEmpty(user.getUnit()) && StrUtil.isNotBlank(user.getUnit().getUnionId())) { diff --git a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicUnitController.java b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicUnitController.java index 21760eb..3f2a6ae 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicUnitController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicUnitController.java @@ -27,6 +27,7 @@ import org.nutz.mvc.annotation.Param; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * @ClassName ActivityBasicUnitController @@ -53,41 +54,55 @@ public class ActivityBasicUnitController { @At @SaCheckPermission("activity.basic.unit") - public Result pageData(@Param(value = "parentId") String parentId, PageForm pageForm) { + public Result pageData(PageForm pageForm, String unitName, String unitId) { Cnd cnd = Cnd.NEW(); - if (StrUtil.isBlank(parentId)) { - cnd.and("parentId", "=", "1"); - } else { - cnd.and("parentId", "=", parentId); - } - if (StrUtil.isNotBlank(pageForm.getSearchName()) && StrUtil.isNotBlank(pageForm.getSearchKeyword())) { - cnd.and(Cnd.likeEX(pageForm.getSearchName(), pageForm.getSearchKeyword())); - } - Sql sql = Sqls.create("select id,parentId,name,unitcode,unitLevel,unionId from activity_basic_unit $condition"); +// cnd.and("parentId", "is not", null).andEX("unitLevel", "=", unitLevel).asc("unitLevel").asc("unitcode"); + cnd.and("parentId", "is not", null); + cnd.andEX("parentId", "=", unitId); +// cnd.and("unitTypeCode", "=", "1"); cnd.asc("unitcode"); - sql.setCondition(cnd); - Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); - return Result.success(pagination); + cnd.and(Cnd.likeEX("name", unitName)); + + Pagination listPage = baseService.listPage(pageForm.getPageNumber(), pageForm.getPageSize(), ActivityBasicUnit.class, cnd); + return Result.success(listPage); } @At @SaCheckPermission("activity.basic.unit") - public Result tree() { -// List list = new ArrayList(); -// ActivityBasicUnit parentId = dao.fetch(ActivityBasicUnit.class, Cnd.where("id", "=", "1")); -// if (parentId != null) { -// parentId.setChild(child(parentId.getId())); -// list.add(parentId); -// return Result.success().addData(list); -// } + public Result tree(@Param("pid") String pid) { + try { + Cnd cnd = Cnd.NEW(); + cnd.andEX("id", "=", pid); + cnd.asc("unitcode"); + List list = baseService.dao().query(ActivityBasicUnit.class,cnd); - List list = dao.query(ActivityBasicUnit.class, Cnd.NEW()); - List> nodeList = CollUtil.newArrayList(); - for (int i = 0; i < list.size(); i++) { - nodeList.add(new TreeNode<>(list.get(i).getId(), list.get(i).getParentId(), list.get(i).getName(), i)); + List> nodeList = CollUtil.newArrayList(); + for (int i = 0; i < list.size(); i++) { + nodeList.add(new TreeNode<>(list.get(i).getId(), list.get(i).getParentId(), list.get(i).getName(), i) + .setExtra( + Map.of( + "unitType", list.get(i).getUnitType(), + "unitTypeCode", list.get(i).getUnitTypeCode() + ) + )); + } + List> treeList = TreeUtil.build(nodeList, StrUtil.blankToDefault(pid, "0")); + +// NutMap menuMap = NutMap.NEW(); +// for (Sys_unit unit : list) { +// List list1 = menuMap.getList(unit.getParentId(), Sys_unit.class); +// if (list1 == null) { +// list1 = new ArrayList<>(); +// } +// list1.add(unit); +// menuMap.put(unit.getParentId(), list1); +// } +// return Result.success().addData(getTree(menuMap, null)); + + return Result.success(treeList); + } catch (Exception e) { + return Result.error(); } - List> treeList = TreeUtil.build(nodeList, "0000"); - return Result.success(treeList); } private List child(String parentId) { diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java index c405bc4..b063de7 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureApplyActivityController.java @@ -110,9 +110,9 @@ public class ActivityCultureApplyActivityController { } tissue.setUserId(SecurityUtil.getUserId()); tissue.setApplyTime(DateUtil.now()); - if (StrUtil.isBlank(tissue.getId())){ + if (StrUtil.isBlank(tissue.getId())) { activityCultureService.insertWith(tissue, "tissuePersonList"); - }else{ + } else { tissue.getTissuePersonList().forEach(tissuePerson -> tissuePerson.setTissueId(tissue.getId())); activityCultureService.insertOrUpdate(tissue); activityCultureService.dao().clear(ActivityTissuePerson.class, Cnd.where(ActivityTissuePerson::getTissueId, "=", tissue.getId())); @@ -141,7 +141,7 @@ public class ActivityCultureApplyActivityController { args.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.APPLY.getCode()); args.set(FlowConst.FORM_DATA, tissue); args.set("activity_type", tissue.getActivity_type()); - ProcessInstance instance = flowEngine.startProcessInstanceByKey("WHHD", tissue.getId(), SecurityUtil.getUserId(), args); + ProcessInstance instance = flowEngine.startProcessInstanceByKey(tissue.getActivity_type().equals(40002) ? "FGHWHHD" : "XHWHHD", tissue.getId(), SecurityUtil.getUserId(), args); // 自动完成第一个申请任务 List doingTaskList = flowEngine.processTaskService().getDoingTaskList(instance.getId(), null); diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java index f5828ba..c1b5d1a 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureAuditActivityController.java @@ -103,9 +103,9 @@ public class ActivityCultureAuditActivityController { $condition """); if (activity_type==40002){ - cnd.and("t.taskName", "=", "12f7ed7d-9286-4453-8754-57df7d3b260b"); + cnd.and("t.taskName", "=", "6eb13516-ebcc-4a58-8dac-c334aaaa9196"); }else{ - cnd.and("t.taskName", "=", "76a03838-caa4-4561-ba0f-0da0d3a17c37"); + cnd.and("t.taskName", "=", "6fe316aa-2232-4760-a539-7538853262cd"); } cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureInfoManageController.java b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureInfoManageController.java index b7f3ab5..488945d 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureInfoManageController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/controller/ActivityCultureInfoManageController.java @@ -8,6 +8,7 @@ import com.budwk.app.base.annotation.SLog; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; import com.budwk.app.sys.models.Sys_home_activity; +import com.budwk.app.zhgh.activity.basic.models.ActivityBasicSettings; import com.budwk.app.zhgh.activity.culture.models.ActivityTissue; import com.budwk.app.zhgh.activity.culture.models.ActivityTissuePerson; import com.budwk.app.zhgh.activity.culture.service.ActivityCultureService; @@ -109,6 +110,8 @@ public class ActivityCultureInfoManageController { dao.execute(sql); NutMap userMap = (NutMap)sql.getResult(); if(ObjectUtil.isNotNull(userMap)){ + ActivityBasicSettings settings = dao.fetch(ActivityBasicSettings.class, Cnd.where(ActivityBasicSettings::getCode, "=", tissue.getProjectTypeCode())); + tissue.setProjectTypeName(settings.getName()); tissue.setUsername(userMap.getString("username")); tissue.setLoginname(userMap.getString("loginname")); } diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java b/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java index b8b94cd..a22f56f 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java @@ -265,6 +265,7 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo + private String projectTypeName; private String username; private String loginname; diff --git a/src/main/resources/views/platform/zhgh/activity/basic/unit/index.html b/src/main/resources/views/platform/zhgh/activity/basic/unit/index.html index 40ea9a9..470fc1f 100644 --- a/src/main/resources/views/platform/zhgh/activity/basic/unit/index.html +++ b/src/main/resources/views/platform/zhgh/activity/basic/unit/index.html @@ -1,31 +1,99 @@ +
- + - -
+ + +
@@ -42,12 +110,8 @@ layout("/layouts/platform.html"){ clearable placeholder="请输入内容" style="width: 100%" - v-model="pageForm.searchKeyword" + v-model="pageForm.unitName" > - - - -
@@ -124,7 +188,7 @@ layout("/layouts/platform.html"){ treeNodeClick(data, node) { this.currentTreeData = data this.currentTreeNode = node - this.pageForm.parentId = data.id + this.pageForm.unitId = data.id this.doSearch() }, getTreeData() { diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js index a38b883..17b1ff0 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js @@ -3,7 +3,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
+