1
This commit is contained in:
+25
@@ -12,6 +12,7 @@ import com.budwk.app.flow.entity.ProcessInstance;
|
|||||||
import com.budwk.app.flow.entity.ProcessTask;
|
import com.budwk.app.flow.entity.ProcessTask;
|
||||||
import com.budwk.app.flow.enums.ProcessTaskStateEnum;
|
import com.budwk.app.flow.enums.ProcessTaskStateEnum;
|
||||||
import com.budwk.app.web.commons.auth.utils.SecurityUtil;
|
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.models.OpinionInfo;
|
||||||
import com.budwk.app.zhgh.democratic.opinion.param.OpinionSearchParam;
|
import com.budwk.app.zhgh.democratic.opinion.param.OpinionSearchParam;
|
||||||
import com.budwk.app.zhgh.democratic.opinion.service.common.OpinionCommonService;
|
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.aop.Aop;
|
||||||
import org.nutz.ioc.loader.annotation.Inject;
|
import org.nutz.ioc.loader.annotation.Inject;
|
||||||
import org.nutz.ioc.loader.annotation.IocBean;
|
import org.nutz.ioc.loader.annotation.IocBean;
|
||||||
|
import org.nutz.mvc.annotation.AdaptBy;
|
||||||
import org.nutz.lang.util.NutMap;
|
import org.nutz.lang.util.NutMap;
|
||||||
import org.nutz.mvc.annotation.At;
|
import org.nutz.mvc.annotation.At;
|
||||||
import org.nutz.mvc.annotation.Ok;
|
import org.nutz.mvc.annotation.Ok;
|
||||||
import org.nutz.mvc.annotation.Param;
|
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 javax.validation.Valid;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -55,6 +60,8 @@ public class OpinionSchoolAuditController {
|
|||||||
private OpinionCommonService opinionCommonService;
|
private OpinionCommonService opinionCommonService;
|
||||||
@Inject
|
@Inject
|
||||||
private FlowEngine flowEngine;
|
private FlowEngine flowEngine;
|
||||||
|
@Inject
|
||||||
|
private OpinionSchoolAuditService opinionSchoolAuditService;
|
||||||
|
|
||||||
@At("")
|
@At("")
|
||||||
@Ok("beetl:/platform/zhgh/democratic/opinion/transact/schoolAudit/index.html")
|
@Ok("beetl:/platform/zhgh/democratic/opinion/transact/schoolAudit/index.html")
|
||||||
@@ -145,4 +152,22 @@ public class OpinionSchoolAuditController {
|
|||||||
|
|
||||||
return Result.success();
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+13
@@ -29,6 +29,7 @@ layout("/layouts/platform.html"){
|
|||||||
<el-radio-button :label="true">已审核</el-radio-button>
|
<el-radio-button :label="true">已审核</el-radio-button>
|
||||||
<el-radio-button :label="false">未审核</el-radio-button>
|
<el-radio-button :label="false">未审核</el-radio-button>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
|
<el-button size="small" type="primary" icon="el-icon-upload2" @click="showAuditImportDialog = true">导入审核结果</el-button>
|
||||||
</table-tool>
|
</table-tool>
|
||||||
<el-table :data="tableData" @sort-change="pageOrder" ref="tableRef" row-key="id" style="width: 100%">
|
<el-table :data="tableData" @sort-change="pageOrder" ref="tableRef" row-key="id" style="width: 100%">
|
||||||
<el-table-column label="序号" width="50" type="index" :index="indexMethod" fixed="left"></el-table-column>
|
<el-table-column label="序号" width="50" type="index" :index="indexMethod" fixed="left"></el-table-column>
|
||||||
@@ -138,6 +139,17 @@ layout("/layouts/platform.html"){
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
</guava>
|
</guava>
|
||||||
|
|
||||||
|
<excel-import
|
||||||
|
ref="auditImportRef"
|
||||||
|
url="/platform/opinion/schoolAudit/importAuditResult"
|
||||||
|
template_url="/platform/opinion/schoolAudit/downloadAuditImportTemplate"
|
||||||
|
:visible.sync="showAuditImportDialog"
|
||||||
|
title="导入审核结果"
|
||||||
|
width="700px"
|
||||||
|
@import-success="doSearch"
|
||||||
|
:extra_params="{sessionId: pageForm.sessionId}"
|
||||||
|
></excel-import>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@@ -174,6 +186,7 @@ layout("/layouts/platform.html"){
|
|||||||
tf_slaveUnitIds: []
|
tf_slaveUnitIds: []
|
||||||
},
|
},
|
||||||
showApprovalForm: false,
|
showApprovalForm: false,
|
||||||
|
showAuditImportDialog: false,
|
||||||
sessionOptions: [],
|
sessionOptions: [],
|
||||||
delegationOptions: [],
|
delegationOptions: [],
|
||||||
underTakeOptions: [],
|
underTakeOptions: [],
|
||||||
|
|||||||
Reference in New Issue
Block a user