commit

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceApplyController.java

@@ -14,18 +14,22 @@ import com.budwk.app.flow.engine.FlowEngine;
 import com.budwk.app.flow.entity.ProcessInstance;
 import com.budwk.app.flow.entity.ProcessTask;
 import com.budwk.app.flow.enums.ProcessSubmitTypeEnum;
+import com.budwk.app.flow.service.FlowCommonService;
 import com.budwk.app.sys.views.View_user;
 import com.budwk.app.web.commons.auth.utils.AuthUtil;
 import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.suggestionBox.models.SuggestionBox;
 import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence;
 import com.budwk.app.zhgh.staffbenefit.condolence.service.CondolenceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
 import org.nutz.dao.Dao;
 import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
 import org.nutz.dao.util.cri.SqlExpressionGroup;
+import org.nutz.ioc.aop.Aop;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.mvc.annotation.At;
@@ -53,6 +57,8 @@ public class CondolenceApplyController {
 	private FlowEngine flowEngine;
 	@Inject
 	private CondolenceService condolenceService;
+	@Inject
+	private FlowCommonService flowCommonService;
 
 	@At("")
 	@Ok("beetl:/platform/zhgh/staffbenefit/condolence/apply/index.html")
@@ -90,6 +96,20 @@ public class CondolenceApplyController {
 		return Result.success();
 	}
 
+	@At
+	@ApiOperation("重新提交申请")
+	@Aop(TransAop.READ_COMMITTED)
+	@SaCheckPermission("condolence.apply")
+	public Result submitAgain(@Param("data") Condolence condolence, @Param("taskId") Long taskId) {
+		dao.insertOrUpdate(condolence);
+
+		Dict dict = Dict.create();
+		dict.set(FlowConst.PROCESS_TASK_ID_KEY, taskId);
+		dict.set(FlowConst.SUBMIT_TYPE, ProcessSubmitTypeEnum.RE_APPLY.getCode());
+		flowCommonService.executeTask(dict);
+		return Result.success();
+	}
+
 	@At
 	@ApiOperation("查询用户")
 	@SaCheckPermission("condolence.apply")

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceBranchUnionApprovalController.java

@@ -90,7 +90,7 @@ public class CondolenceBranchUnionApprovalController {
 		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()));
+			cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
 		} else {
 			cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
 		}

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java

@@ -107,7 +107,7 @@ public class CondolenceMineController {
 	@At
 	@ApiOperation("删除")
 	@Aop(TransAop.READ_COMMITTED)
-	@SaCheckPermission("condolence.mine")
+	@SaCheckPermission("condolence")
 	@SLog(type = "condolence", tag = "删除职工慰问", msg = "删除职工慰问")
 	public Result delete(@Param("id") String id) {
 		condolenceService.delete(id);

src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolUnionApprovalController.java

@@ -94,7 +94,7 @@ public class CondolenceSchoolUnionApprovalController {
 		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()));
+			cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode()));
 		} else {
 			cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
 		}