整改提案

整改慰问增加骨架屏
整改作品征集
整改困难帮扶

src/main/java/com/budwk/app/flow/service/FlowCommonService.java

@@ -70,7 +70,7 @@ public class FlowCommonService {
         args.put(FlowConst.TASK_FORM_DATA_PREFIX + "userName", SecurityUtil.getUserUsername());
         args.put(FlowConst.TASK_FORM_DATA_PREFIX + "loginName", SecurityUtil.getUserLoginname());
         args.put(FlowConst.TASK_FORM_DATA_PREFIX + "unitId", SecurityUtil.getUnitId());
-        args.put(FlowConst.TASK_FORM_DATA_PREFIX + "unitName", Optional.of(sysUnit).map(Sys_unit::getName).orElse(""));
+        args.put(FlowConst.TASK_FORM_DATA_PREFIX + "unitName", Optional.ofNullable(sysUnit).map(Sys_unit::getName).orElse(""));
         args.put(FlowConst.TASK_FORM_DATA_PREFIX + "unionId", SecurityUtil.getUnionId());
 
         if (ObjectUtil.equals(submitType, ProcessSubmitTypeEnum.ROLLBACK.getCode())) {

src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionNewController.java

@@ -11,7 +11,7 @@ import org.nutz.mvc.annotation.Ok;
 public class ActivityWorksCollectionNewController {
 
     @At("")
-    @Ok("beetl:/platform/zhgh/activity/workscollection/manage/index.html")
+    @Ok("beetl:/platform/zhgh/activity/workscollection/new/index.html")
     @SaCheckPermission(value = {"activity.workscollection.manage", "activity.workscollection.new"}, mode = SaMode.OR)
     public void index() {
     }

src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/ActivityWorksCollectionUploadController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.zhgh.activity.workscollection.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+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;
@@ -19,6 +20,7 @@ import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
 import org.nutz.dao.util.Daos;
 import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.dao.util.cri.Static;
 import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
@@ -56,16 +58,21 @@ public class ActivityWorksCollectionUploadController {
     /**
      * @param pageForm   分页
      * @param activityId 活动id
-     * @param subjectId  作品类型
-     * @return
+     * @param subjectId  主题类型主键
+     * @param worksId    作品类型主键
+     * @param year       活动开始时间所在年度
+     * @param activityType 活动状态：1 全部、2 征集中、3 已结束
+     * @return Result，data 为当前登录人的作品分页数据
      */
     @At
     @SaCheckPermission("activity.workscollection.upload")
-    public Result pageData(@Valid PageForm pageForm, String activityId, String subjectId, String worksId, Long year) {
+    public Result pageData(@Valid PageForm pageForm, String activityId, String subjectId, String worksId,
+                           Long year, Integer activityType) {
         Sql sql = Sqls.create("""
                 select
                     up.*,
                     co.NAME AS activityName,
+                    co.cover AS cover,
                     co.startDateTime AS activityStartDateTime,
                     co.endDateTime AS activityEndDateTime,
                     su.typeName AS subjectName,
@@ -83,6 +90,19 @@ public class ActivityWorksCollectionUploadController {
         cnd.andEX("up.activityId", "=", activityId);
         cnd.andEX("up.subjectId", "=", subjectId);
         cnd.andEX("up.worksId", "=", worksId);
+        // searchKeyword 支持按作品名称或所属活动名称搜索，空值不参与筛选。
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            String keyword = "%" + pageForm.getSearchKeyword().trim() + "%";
+            SqlExpressionGroup keywordGroup = Cnd.exps("up.name", "like", keyword)
+                    .or("co.name", "like", keyword);
+            cnd.and(keywordGroup);
+        }
+        // activityType：1 或空值查询全部，2 查询征集中，3 查询已结束。
+        if (activityType != null && activityType == 2) {
+            cnd.and(new Static("now() >= co.startDateTime and now() < co.endDateTime"));
+        } else if (activityType != null && activityType == 3) {
+            cnd.and(new Static("now() >= co.endDateTime"));
+        }
         cnd.desc("up.createdAt");
         sql.setCondition(cnd);
         Pagination pagination = baseService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);

src/main/java/com/budwk/app/zhgh/activity/workscollection/controller/h5/H5ActivityWorksUploadCollectionController.java

@@ -2,6 +2,7 @@ package com.budwk.app.zhgh.activity.workscollection.controller.h5;
 
 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;
@@ -64,7 +65,11 @@ public class H5ActivityWorksUploadCollectionController {
                 """);
         Cnd cnd = Cnd.NEW();
         cnd.andEX("YEAR(awc.startDateTime)", "=", year);
-        //查询报名中
+        // searchKeyword 为活动名称关键字，空值不参与筛选；接口仍返回分页对象。
+        if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
+            cnd.and("awc.name", "like", "%" + pageForm.getSearchKeyword().trim() + "%");
+        }
+        // activityType：1 全部、2 征集中、3 已结束、4 即将开始。
         if (activityType == 2) {
             cnd.and(new Static("now() > awc.startDateTime and now() < awc.endDateTime"));
         }//查询已结束的

src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpMineController.java

@@ -99,7 +99,6 @@ public class DifficultHelpMineController {
                     difficult_help_info info
                     LEFT JOIN `wf_process_instance` ins ON ins.businessNo = info.id
                     LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
-                    LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
                 $condition
                 """);
         Cnd cnd = Cnd.NEW();