diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyListController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyListController.java
index 74c112a..6526503 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyListController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/outlay/activityBudget/conteoller/ActivityBudgetApplyListController.java
@@ -8,6 +8,7 @@ import com.budwk.app.base.annotation.SLog;
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.flow.engine.FlowEngine;
import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.models.ActivityBudget;
import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.models.ActivityBudgetDetails;
import com.budwk.app.zhgh.dayofficework.outlay.activityBudget.service.ActivityBudgetService;
@@ -45,7 +46,8 @@ public class ActivityBudgetApplyListController {
@Inject
private ActivityBudgetService activityBudgetService;
-
+ @Inject
+ private FlowEngine flowEngine;
@At("")
@Ok("beetl:/platform/zhgh/dayofficework/outlay/activityBudget/applyList/index.html")
@@ -53,7 +55,6 @@ public class ActivityBudgetApplyListController {
public void index() {
}
-
@At
@ApiOperation("分页查询")
@SaCheckPermission("activity.budget.applyList")
@@ -72,6 +73,10 @@ public class ActivityBudgetApplyListController {
if (ObjectUtil.isNotEmpty(ids)) {
activityBudgetService.clear(Cnd.where("id", "in", ids));
activityBudgetService.dao().clear(ActivityBudgetDetails.class, Cnd.where("budgetId", "in", ids));
+
+ for (String id : ids) {
+ flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
+ }
}
return Result.success();
}
@@ -84,6 +89,8 @@ public class ActivityBudgetApplyListController {
public Result doDelete(String id) {
activityBudgetService.dao().delete(ActivityBudget.class, id);
activityBudgetService.dao().clear(ActivityBudgetDetails.class, Cnd.where("budgetId", "=", id));
+
+ flowEngine.processInstanceService().deleteProcessInstanceByBusinessKey(id);
return Result.success();
}
diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/meetings/controller/TeacherCongressMeetingController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/meetings/controller/TeacherCongressMeetingController.java
index 88cc889..2392588 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/meetings/controller/TeacherCongressMeetingController.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/meetings/controller/TeacherCongressMeetingController.java
@@ -7,6 +7,7 @@ import com.budwk.app.base.param.PageForm;
import com.budwk.app.base.result.Result;
import com.budwk.app.base.service.BaseService;
import com.budwk.app.zhgh.democratic.teachercongress.meetings.models.Teacher_congress_meeting;
+import com.budwk.app.zhgh.democratic.teachercongress.meetings.models.Teacher_congress_meeting_file;
import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd;
import org.nutz.dao.Dao;
diff --git a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java
index 44dbddf..4bc86b9 100644
--- a/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java
+++ b/src/main/java/com/budwk/app/zhgh/welfare/controller/WelfareUserSelectController.java
@@ -72,7 +72,7 @@ public class WelfareUserSelectController {
cnd.andEX("YEAR(wp.choiceTimeStart)", "in", year);
cnd.and("wp.isDisabled", "=", 0);
cnd.groupBy("wp.id");
- cnd.desc("YEAR(wp.choiceTimeStart)");
+ cnd.desc("wp.choiceTimeStart");
sql.setCondition(cnd);
Pagination pagination = welfareProjectService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
return Result.success(pagination);
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyList/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyList/index.html
index e8b9e60..6180adb 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyList/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/applyList/index.html
@@ -104,7 +104,7 @@ layout("/layouts/platform.html"){