diff --git a/src/main/java/com/budwk/app/zhgh/democratic/opinion/controller/transact/OpinionSchoolAuditController.java b/src/main/java/com/budwk/app/zhgh/democratic/opinion/controller/transact/OpinionSchoolAuditController.java
index b1e64035..187e64e4 100644
--- a/src/main/java/com/budwk/app/zhgh/democratic/opinion/controller/transact/OpinionSchoolAuditController.java
+++ b/src/main/java/com/budwk/app/zhgh/democratic/opinion/controller/transact/OpinionSchoolAuditController.java
@@ -12,6 +12,7 @@ import com.budwk.app.flow.entity.ProcessInstance;
import com.budwk.app.flow.entity.ProcessTask;
import com.budwk.app.flow.enums.ProcessTaskStateEnum;
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
+import com.budwk.app.zhgh.democratic.opinion.service.OpinionSchoolAuditService;
import com.budwk.app.zhgh.democratic.opinion.models.OpinionInfo;
import com.budwk.app.zhgh.democratic.opinion.param.OpinionSearchParam;
import com.budwk.app.zhgh.democratic.opinion.service.common.OpinionCommonService;
@@ -27,11 +28,15 @@ import org.nutz.dao.sql.Sql;
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.AdaptBy;
import org.nutz.lang.util.NutMap;
import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
+import org.nutz.mvc.upload.TempFile;
+import org.nutz.mvc.upload.UploadAdaptor;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
@@ -55,6 +60,8 @@ public class OpinionSchoolAuditController {
private OpinionCommonService opinionCommonService;
@Inject
private FlowEngine flowEngine;
+ @Inject
+ private OpinionSchoolAuditService opinionSchoolAuditService;
@At("")
@Ok("beetl:/platform/zhgh/democratic/opinion/transact/schoolAudit/index.html")
@@ -145,4 +152,22 @@ public class OpinionSchoolAuditController {
return Result.success();
}
+
+ @At
+ @SaCheckPermission("opinion.schoolAudit")
+ @ApiOperation("校工会审核结果导入")
+ @SLog(tag = "意见管理系统-校工会审核", msg = "校工会审核结果导入")
+ @Aop(TransAop.READ_COMMITTED)
+ @AdaptBy(type = UploadAdaptor.class, args = {"ioc:fileUpload"})
+ public Result importAuditResult(@Param("file") TempFile file, @Param("sessionId") String sessionId) {
+ return Result.success(opinionSchoolAuditService.importAuditResult(file, sessionId));
+ }
+
+ @At
+ @Ok("void")
+ @SaCheckPermission("opinion.schoolAudit")
+ @ApiOperation("校工会审核结果导入模板下载")
+ public void downloadAuditImportTemplate(HttpServletResponse response) {
+ opinionSchoolAuditService.downloadAuditImportTemplate(response);
+ }
}
diff --git a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/schoolAudit/index.html
index ec319928..fa69d236 100644
--- a/src/main/resources/views/platform/zhgh/democratic/opinion/transact/schoolAudit/index.html
+++ b/src/main/resources/views/platform/zhgh/democratic/opinion/transact/schoolAudit/index.html
@@ -29,6 +29,7 @@ layout("/layouts/platform.html"){
已审核
未审核
+ 导入审核结果
@@ -138,6 +139,17 @@ layout("/layouts/platform.html"){
+
+