!107 fix(syslog): 修正既有日志注解的错误操作类型
Merge pull request !107 from wsm/feature/module_log_fix
This commit is contained in:
+12
-3
@@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||
import org.jeecg.common.constant.CommonConstant;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.common.util.excel.ExcelAnnotationUtils;
|
||||
@@ -48,6 +49,7 @@ public class FixedContact20260730Controller extends JeecgController<FixedContact
|
||||
private final RuntimeService runtimeService;
|
||||
private final TaskTaskServiceImpl taskTaskServiceImpl;
|
||||
|
||||
@AutoLog(value = "定点联系单-分页列表查询")
|
||||
@Operation(summary = "定点联系单-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<FixedContact20260730>> queryPageList(FixedContact20260730 fixedContact20260730,
|
||||
@@ -143,6 +145,7 @@ public class FixedContact20260730Controller extends JeecgController<FixedContact
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
@AutoLog(value = "定点联系单-通过id查询")
|
||||
@Operation(summary = "定点联系单-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<FixedContact20260730> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
@@ -153,6 +156,7 @@ public class FixedContact20260730Controller extends JeecgController<FixedContact
|
||||
return Result.OK(fixedContact20260730);
|
||||
}
|
||||
|
||||
@AutoLog(value = "反馈子表-主表ID查询")
|
||||
@Operation(summary = "反馈子表-主表ID查询")
|
||||
@GetMapping(value = "/queryFixedContactFeedback20260730ByMainId")
|
||||
public Result<List<FixedContactFeedback20260730>> queryFixedContactFeedback20260730ListByMainId(@RequestParam(name = "id", required = true) String id) {
|
||||
@@ -160,18 +164,21 @@ public class FixedContact20260730Controller extends JeecgController<FixedContact
|
||||
return Result.OK(fixedContactFeedback20260730List);
|
||||
}
|
||||
|
||||
@AutoLog(value = "定点联系单-通过excel导出")
|
||||
@RequiresPermissions("bg.fixcontact:fixed_contact_20260730:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, FixedContact20260730 fixedContact20260730) {
|
||||
return super.exportXls(request, fixedContact20260730, FixedContact20260730.class, "定点联系单");
|
||||
}
|
||||
|
||||
@AutoLog(value = "定点联系单-通过excel导入")
|
||||
@RequiresPermissions("bg.fixcontact:fixed_contact_20260730:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, FixedContact20260730.class);
|
||||
}
|
||||
|
||||
@AutoLog(value = "定点联系单-通过EasyExcel导入")
|
||||
@RequiresPermissions("bg.fixcontact:fixed_contact_20260730:importExcel")
|
||||
@RequestMapping(value = "/importExcelByEasyExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcelByEasyExcel(HttpServletRequest request) {
|
||||
@@ -183,12 +190,14 @@ public class FixedContact20260730Controller extends JeecgController<FixedContact
|
||||
SupervisionConstant.DelFlag.NORMAL));
|
||||
}
|
||||
|
||||
@AutoLog(value = "定点联系单-通过EasyExcel校验导入")
|
||||
@RequiresPermissions("bg.fixcontact:fixed_contact_20260730:importExcel")
|
||||
@RequestMapping(value = "/checkExcelByEasyExcel", method = RequestMethod.POST)
|
||||
public Result<?> checkExcelByEasyExcel(HttpServletRequest request) {
|
||||
return super.checkExcelByEasyExcel(request, FixedContact20260730.class);
|
||||
}
|
||||
|
||||
@AutoLog(value = "定点联系单-通过EasyExcel导出模板")
|
||||
@RequiresPermissions("bg.fixcontact:fixed_contact_20260730:exportXls")
|
||||
@GetMapping(value = "/exportXlsHeaders")
|
||||
public void exportXlsHeaders(HttpServletResponse response) throws IOException {
|
||||
@@ -197,7 +206,7 @@ public class FixedContact20260730Controller extends JeecgController<FixedContact
|
||||
java.util.Collections.singletonList(example));
|
||||
}
|
||||
|
||||
@AutoLog(value = "保存业务数据同时更新流程变量jsonData")
|
||||
@AutoLog(value = "保存业务数据同时更新流程变量jsonData", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@Operation(summary = "保存业务数据同时更新流程变量jsonData")
|
||||
@PostMapping(value = "/saveBpmForm")
|
||||
public Result<String> saveBpmForm(@RequestBody FixedContact20260730BpmSaveDTO dto) {
|
||||
@@ -213,7 +222,7 @@ public class FixedContact20260730Controller extends JeecgController<FixedContact
|
||||
return Result.OK("保存成功");
|
||||
}
|
||||
|
||||
@AutoLog(value = "定点联系单-保存部门审批信息")
|
||||
@AutoLog(value = "定点联系单-保存部门审批信息", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@Operation(summary = "保存部门审批信息到业务表单")
|
||||
@PostMapping(value = "/saveSubApprove")
|
||||
public Result<String> saveSubApprove(@RequestBody Map<String, Object> params) {
|
||||
@@ -254,7 +263,7 @@ public class FixedContact20260730Controller extends JeecgController<FixedContact
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
@AutoLog(value = "定点联系单-删除关联流程")
|
||||
@AutoLog(value = "定点联系单-删除关联流程", operateType = CommonConstant.OPERATE_TYPE_4)
|
||||
@Operation(summary = "定点联系单-删除关联流程")
|
||||
@PostMapping(value = "/withDrawFixContact")
|
||||
public Result<String> withDrawFixContact(@RequestParam("id") String id) {
|
||||
|
||||
+15
-7
@@ -50,6 +50,7 @@ import com.alibaba.fastjson.JSON;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||
import org.jeecg.common.constant.CommonConstant;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
@@ -76,7 +77,7 @@ public class BgXiSpeakController extends JeecgController<BgXiSpeak, IBgXiSpeakSe
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "习总书记重要讲话指示批示情况-分页列表查询")
|
||||
@AutoLog(value = "习总书记重要讲话指示批示情况-分页列表查询")
|
||||
@Operation(summary="习总书记重要讲话指示批示情况-分页列表查询")
|
||||
@GetMapping(value = "/rootList")
|
||||
public Result<IPage<BgXiSpeak>> queryPageList(BgXiSpeak bgXiSpeak,
|
||||
@@ -159,6 +160,7 @@ public class BgXiSpeakController extends JeecgController<BgXiSpeak, IBgXiSpeakSe
|
||||
* @param deptIds
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "习总书记重要讲话指示批示情况-获取含部门根列表")
|
||||
@RequestMapping(value = "/getRootListWithDept", method = RequestMethod.GET)
|
||||
public Result<IPage<BgXiSpeak>> getRootListWithDept(@RequestParam(name = "dept_ids") String deptIds) {
|
||||
|
||||
@@ -178,6 +180,7 @@ public class BgXiSpeakController extends JeecgController<BgXiSpeak, IBgXiSpeakSe
|
||||
* @param pcode
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "习总书记重要讲话指示批示情况-加载树根节点")
|
||||
@RequestMapping(value = "/loadTreeRoot", method = RequestMethod.GET)
|
||||
public Result<List<SelectTreeModel>> loadTreeRoot(@RequestParam(name = "async") Boolean async, @RequestParam(name = "pcode") String pcode) {
|
||||
Result<List<SelectTreeModel>> result = new Result<>();
|
||||
@@ -217,7 +220,7 @@ public class BgXiSpeakController extends JeecgController<BgXiSpeak, IBgXiSpeakSe
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "习总书记重要讲话指示批示情况-获取子数据")
|
||||
@AutoLog(value = "习总书记重要讲话指示批示情况-获取子数据")
|
||||
@Operation(summary="习总书记重要讲话指示批示情况-获取子数据")
|
||||
@GetMapping(value = "/childList")
|
||||
public Result<IPage<BgXiSpeak>> queryPageList(BgXiSpeak bgXiSpeak,HttpServletRequest req) {
|
||||
@@ -235,7 +238,7 @@ public class BgXiSpeakController extends JeecgController<BgXiSpeak, IBgXiSpeakSe
|
||||
* @param parentIds
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "习总书记重要讲话指示批示情况-批量获取子数据")
|
||||
@AutoLog(value = "习总书记重要讲话指示批示情况-批量获取子数据")
|
||||
@Operation(summary="习总书记重要讲话指示批示情况-批量获取子数据")
|
||||
@GetMapping("/getChildListBatch")
|
||||
public Result getChildListBatch(@RequestParam("parentIds") String parentIds) {
|
||||
@@ -288,7 +291,7 @@ public class BgXiSpeakController extends JeecgController<BgXiSpeak, IBgXiSpeakSe
|
||||
* @param dto
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "保存业务数据同时更新流程变量jsonData")
|
||||
@AutoLog(value = "保存业务数据同时更新流程变量jsonData", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@Operation(summary="保存业务数据同时更新流程变量jsonData")
|
||||
@PostMapping(value = "/saveBpmForm")
|
||||
public Result<String> saveBpmForm(@RequestBody BgXiSpeakBpmSaveDTO dto) {
|
||||
@@ -323,7 +326,7 @@ public class BgXiSpeakController extends JeecgController<BgXiSpeak, IBgXiSpeakSe
|
||||
/**
|
||||
* 保存部门审批信息(isEnd、部门经办人)到业务表单 approveInfo JSON
|
||||
*/
|
||||
@AutoLog(value = "保存部门审批信息")
|
||||
@AutoLog(value = "保存部门审批信息", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@Operation(summary="保存部门审批信息到业务表单")
|
||||
@PostMapping(value = "/saveSubApprove")
|
||||
public Result<String> saveSubApprove(@RequestBody Map<String, Object> params) {
|
||||
@@ -345,7 +348,7 @@ public class BgXiSpeakController extends JeecgController<BgXiSpeak, IBgXiSpeakSe
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "根据传入的业务表单id撤回所有在运行的流程")
|
||||
@AutoLog(value = "根据传入的业务表单id撤回所有在运行的流程", operateType = CommonConstant.OPERATE_TYPE_4)
|
||||
@Operation(summary="根据传入的业务表单id撤回所有在运行的流程")
|
||||
@PostMapping(value = "/withDrawXiSpeak")
|
||||
public Result<String> withDrawXiSpeak(@RequestParam("id") String id) {
|
||||
@@ -391,7 +394,7 @@ public class BgXiSpeakController extends JeecgController<BgXiSpeak, IBgXiSpeakSe
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "习总书记重要讲话指示批示情况-通过id查询")
|
||||
@AutoLog(value = "习总书记重要讲话指示批示情况-通过id查询")
|
||||
@Operation(summary="习总书记重要讲话指示批示情况-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<BgXiSpeak> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -408,6 +411,7 @@ public class BgXiSpeakController extends JeecgController<BgXiSpeak, IBgXiSpeakSe
|
||||
* @param request
|
||||
* @param bgXiSpeak
|
||||
*/
|
||||
@AutoLog(value = "习总书记重要讲话指示批示情况-通过excel导出")
|
||||
@RequiresPermissions("bg.xispeak:bg_xi_speak:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, BgXiSpeak bgXiSpeak) {
|
||||
@@ -421,6 +425,7 @@ public class BgXiSpeakController extends JeecgController<BgXiSpeak, IBgXiSpeakSe
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "习总书记重要讲话指示批示情况-通过excel导入")
|
||||
@RequiresPermissions("bg.xispeak:bg_xi_speak:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
@@ -430,6 +435,7 @@ public class BgXiSpeakController extends JeecgController<BgXiSpeak, IBgXiSpeakSe
|
||||
/**
|
||||
* 通过EasyExcel导入数据
|
||||
*/
|
||||
@AutoLog(value = "习总书记重要讲话指示批示情况-通过EasyExcel导入")
|
||||
@RequiresPermissions("bg.xispeak:bg_xi_speak:importExcel")
|
||||
@RequestMapping(value = "/importExcelByEasyExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcelByEasyExcel(HttpServletRequest request) {
|
||||
@@ -444,6 +450,7 @@ public class BgXiSpeakController extends JeecgController<BgXiSpeak, IBgXiSpeakSe
|
||||
/**
|
||||
* 通过EasyExcel校验数据,只返回校验结果,不保存到数据库
|
||||
*/
|
||||
@AutoLog(value = "习总书记重要讲话指示批示情况-通过EasyExcel校验导入")
|
||||
@RequiresPermissions("bg.xispeak:bg_xi_speak:importExcel")
|
||||
@RequestMapping(value = "/checkExcelByEasyExcel", method = RequestMethod.POST)
|
||||
public Result<?> checkExcelByEasyExcel(HttpServletRequest request) {
|
||||
@@ -454,6 +461,7 @@ public class BgXiSpeakController extends JeecgController<BgXiSpeak, IBgXiSpeakSe
|
||||
/**
|
||||
* 仅导出Excel表头(EasyExcel)
|
||||
*/
|
||||
@AutoLog(value = "习总书记重要讲话指示批示情况-通过EasyExcel导出模板")
|
||||
@RequiresPermissions("bg.xispeak:bg_xi_speak:exportXls")
|
||||
@GetMapping(value = "/exportXlsHeaders")
|
||||
public void exportXlsHeaders(HttpServletResponse response) throws IOException {
|
||||
|
||||
+6
-1
@@ -61,6 +61,7 @@ public class BgXiSpeakFeedbackController extends JeecgController<BgXiSpeakFeedba
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "习总书记重要讲话反馈表-分页列表查询")
|
||||
@Operation(summary="习总书记重要讲话反馈表-分页列表查询")
|
||||
@GetMapping(value = "/listBgXiSpeakFeedbackByMainId")
|
||||
public Result<IPage<BgXiSpeakFeedback>> queryPageList(BgXiSpeakFeedback bgXiSpeakFeedback,
|
||||
@@ -82,6 +83,7 @@ public class BgXiSpeakFeedbackController extends JeecgController<BgXiSpeakFeedba
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "习总书记重要讲话反馈表-分页列表查询含用户部门")
|
||||
@Operation(summary="习总书记重要讲话反馈表-分页列表查询(含当前用户部门过滤)")
|
||||
@GetMapping(value = "/listBgXiSpeakFeedbackByMainIdWithUserDept")
|
||||
public Result<IPage<BgXiSpeakFeedback>> queryPageListWithUserDept(BgXiSpeakFeedback bgXiSpeakFeedback,
|
||||
@@ -178,6 +180,7 @@ public class BgXiSpeakFeedbackController extends JeecgController<BgXiSpeakFeedba
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "习总书记重要讲话反馈表-通过id查询")
|
||||
@Operation(summary="习总书记重要讲话反馈表-通过id查询")
|
||||
@GetMapping(value = "/queryBgXiSpeakFeedbackById")
|
||||
public Result<BgXiSpeakFeedback> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -194,6 +197,7 @@ public class BgXiSpeakFeedbackController extends JeecgController<BgXiSpeakFeedba
|
||||
* @param request
|
||||
* @param bgXiSpeakFeedback
|
||||
*/
|
||||
@AutoLog(value = "习总书记重要讲话反馈表-通过excel导出")
|
||||
@RequestMapping(value = "/exportBgXiSpeakFeedback")
|
||||
public ModelAndView exportXls(HttpServletRequest request, BgXiSpeakFeedback bgXiSpeakFeedback) {
|
||||
return super.exportXls(request, bgXiSpeakFeedback, BgXiSpeakFeedback.class, "习总书记重要讲话反馈表");
|
||||
@@ -206,9 +210,10 @@ public class BgXiSpeakFeedbackController extends JeecgController<BgXiSpeakFeedba
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "习总书记重要讲话反馈表-通过excel导入")
|
||||
@RequestMapping(value = "/importBgXiSpeakFeedback", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) {
|
||||
return super.importExcel(request, response, BgXiSpeakFeedback.class);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
+13
-3
@@ -38,6 +38,7 @@ import org.jeecg.modules.demo.bgpartymatter.constant.BgPartymatterConstant;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||
import org.jeecg.common.constant.CommonConstant;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.jeecg.common.system.vo.LoginUser;
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
@@ -89,7 +90,7 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "党委会-分页列表查询")
|
||||
@AutoLog(value = "党委会-分页列表查询")
|
||||
@Operation(summary = "党委会-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<BgPartymatter>> queryPageList(BgPartymatter bgPartymatter,
|
||||
@@ -130,6 +131,7 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
|
||||
return Result.OK(result);
|
||||
}
|
||||
|
||||
@AutoLog(value = "党委会-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<BgPartymatter> queryById(@RequestParam(name = "id", required = true) String id) {
|
||||
BgPartymatter bgPartymatter = bgPartymatterService.getById(id);
|
||||
@@ -185,7 +187,7 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
|
||||
* @param dto
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "保存业务数据同时更新流程变量jsonData")
|
||||
@AutoLog(value = "保存业务数据同时更新流程变量jsonData", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@Operation(summary = "保存业务数据同时更新流程变量jsonData")
|
||||
@PostMapping(value = "/saveBpmForm")
|
||||
public Result<String> saveBpmForm(@RequestBody BgPartymatterBpmSaveDTO dto) {
|
||||
@@ -276,6 +278,7 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "党委会-通过excel导出")
|
||||
@RequiresPermissions(value = {"bgpartymatter:bg_partymatter:exportXls", "bgofficematter:bg_officematter:exportXls"}, logical = Logical.OR)
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, BgPartymatter bgPartymatter) {
|
||||
@@ -288,6 +291,7 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "党委会-通过excel导入")
|
||||
@RequiresPermissions(value = {"bgpartymatter:bg_partymatter:importExcel", "bgofficematter:bg_officematter:importExcel"}, logical = Logical.OR)
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
@@ -303,7 +307,7 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "党委会反馈表-通过主表ID查询")
|
||||
@AutoLog(value = "党委会反馈表-通过主表ID查询")
|
||||
@Operation(summary = "党委会反馈表-通过主表ID查询")
|
||||
@GetMapping(value = "/listBgPartymatterFeedbackByMainId")
|
||||
public Result<IPage<BgPartymatterFeedback>> listBgPartymatterFeedbackByMainId(BgPartymatterFeedback bgPartymatterFeedback,
|
||||
@@ -380,6 +384,7 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "党委会反馈表-通过excel导出")
|
||||
@RequestMapping(value = "/exportBgPartymatterFeedback")
|
||||
public ModelAndView exportBgPartymatterFeedback(HttpServletRequest request, BgPartymatterFeedback bgPartymatterFeedback) {
|
||||
// Step.1 组装查询条件
|
||||
@@ -414,6 +419,7 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "党委会反馈表-通过excel导入")
|
||||
@RequestMapping(value = "/importBgPartymatterFeedback/{mainId}")
|
||||
public Result<?> importBgPartymatterFeedback(HttpServletRequest request, HttpServletResponse response, @PathVariable("mainId") String mainId) {
|
||||
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
||||
@@ -453,6 +459,7 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
|
||||
/**
|
||||
* 通过EasyExcel校验数据,只返回校验结果,不保存到数据库
|
||||
*/
|
||||
@AutoLog(value = "党委会-通过EasyExcel校验导入")
|
||||
@RequiresPermissions("bgpartymatter:bg_partymatter:importExcel")
|
||||
@RequestMapping(value = "/checkExcelByEasyExcel", method = RequestMethod.POST)
|
||||
public Result<?> checkExcelByEasyExcel(HttpServletRequest request) {
|
||||
@@ -462,6 +469,7 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
|
||||
/**
|
||||
* 通过EasyExcel导入数据,支持字典校验和Hibernate Validator,通过 meetingType 参数指定导入类型
|
||||
*/
|
||||
@AutoLog(value = "党委会-通过EasyExcel导入")
|
||||
@RequiresPermissions("bgpartymatter:bg_partymatter:importExcel")
|
||||
@PostMapping(value = "/importExcelByEasyExcel")
|
||||
public Result<?> importExcelByEasyExcel(HttpServletRequest request,
|
||||
@@ -477,6 +485,7 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
|
||||
/**
|
||||
* 通过EasyExcel导出数据,根据 meetingType 动态切换标题
|
||||
*/
|
||||
@AutoLog(value = "党委会-通过EasyExcel导出")
|
||||
@RequiresPermissions("bgpartymatter:bg_partymatter:exportXls")
|
||||
@GetMapping(value = "/exportXlsByEasyExcel")
|
||||
public void exportXlsByEasyExcel(HttpServletRequest request, HttpServletResponse response,
|
||||
@@ -488,6 +497,7 @@ public class BgPartymatterController extends JeecgController<BgPartymatter, IBgP
|
||||
/**
|
||||
* 导出Excel模板(含表头和一行示例数据),通过 meetingType 参数指定模板类型
|
||||
*/
|
||||
@AutoLog(value = "党委会-通过EasyExcel导出模板")
|
||||
@RequiresPermissions("bgpartymatter:bg_partymatter:exportXls")
|
||||
@GetMapping(value = "/exportXlsHeaders")
|
||||
public void exportXlsHeaders(HttpServletResponse response,
|
||||
|
||||
+12
-4
@@ -48,6 +48,7 @@ import lombok.extern.slf4j.Slf4j;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||
import org.jeecg.common.constant.CommonConstant;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
|
||||
@@ -78,7 +79,7 @@ public class BgTakepulseController extends JeecgController<BgTakepulse, IBgTakep
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "我为四所把把脉-分页列表查询")
|
||||
@AutoLog(value = "我为四所把把脉-分页列表查询")
|
||||
@Operation(summary="我为四所把把脉-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<BgTakepulse>> queryPageList(BgTakepulse bgTakepulse,
|
||||
@@ -201,7 +202,7 @@ public class BgTakepulseController extends JeecgController<BgTakepulse, IBgTakep
|
||||
* @param dto BPM表单数据
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "保存我为四所把把脉业务数据同时更新流程变量jsonData")
|
||||
@AutoLog(value = "保存我为四所把把脉业务数据同时更新流程变量jsonData", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@Operation(summary="保存我为四所把把脉业务数据同时更新流程变量jsonData")
|
||||
@PostMapping(value = "/saveBpmForm")
|
||||
public Result<String> saveBpmForm(@RequestBody BgTakepulseBpmSaveDTO dto) {
|
||||
@@ -253,7 +254,7 @@ public class BgTakepulseController extends JeecgController<BgTakepulse, IBgTakep
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "我为四所把把脉-通过id查询")
|
||||
@AutoLog(value = "我为四所把把脉-通过id查询")
|
||||
@Operation(summary="我为四所把把脉-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<BgTakepulse> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -271,7 +272,7 @@ public class BgTakepulseController extends JeecgController<BgTakepulse, IBgTakep
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "执行情况反馈通过主表ID查询")
|
||||
@AutoLog(value = "执行情况反馈通过主表ID查询")
|
||||
@Operation(summary="执行情况反馈主表ID查询")
|
||||
@GetMapping(value = "/queryBgTakepulseFeedbackByMainId")
|
||||
public Result<List<BgTakepulseFeedback>> queryBgTakepulseFeedbackListByMainId(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -284,6 +285,7 @@ public class BgTakepulseController extends JeecgController<BgTakepulse, IBgTakep
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "执行情况反馈-通过主表ID查询")
|
||||
@Operation(summary="执行情况反馈-通过主表ID和流程实例ID查询")
|
||||
@GetMapping(value = "/listBgTakepulseFeedbackByMainId")
|
||||
public Result<IPage<BgTakepulseFeedback>> listBgTakepulseFeedbackByMainId(BgTakepulseFeedback bgTakepulseFeedback,
|
||||
@@ -361,6 +363,7 @@ public class BgTakepulseController extends JeecgController<BgTakepulse, IBgTakep
|
||||
* @param request
|
||||
* @param bgTakepulse
|
||||
*/
|
||||
@AutoLog(value = "我为四所把把脉-通过excel导出")
|
||||
@RequiresPermissions("bqtakepulse:bg_takepulse:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, BgTakepulse bgTakepulse) {
|
||||
@@ -404,6 +407,7 @@ public class BgTakepulseController extends JeecgController<BgTakepulse, IBgTakep
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "我为四所把把脉-通过excel导入")
|
||||
@RequiresPermissions("bqtakepulse:bg_takepulse:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
@@ -441,6 +445,7 @@ public class BgTakepulseController extends JeecgController<BgTakepulse, IBgTakep
|
||||
/**
|
||||
* 通过EasyExcel校验数据,只返回校验结果,不保存到数据库
|
||||
*/
|
||||
@AutoLog(value = "我为四所把把脉-通过EasyExcel校验导入")
|
||||
@RequiresPermissions("bqtakepulse:bg_takepulse:importExcel")
|
||||
@RequestMapping(value = "/checkExcelByEasyExcel", method = RequestMethod.POST)
|
||||
public Result<?> checkExcelByEasyExcel(HttpServletRequest request) {
|
||||
@@ -450,6 +455,7 @@ public class BgTakepulseController extends JeecgController<BgTakepulse, IBgTakep
|
||||
/**
|
||||
* 通过EasyExcel导入数据,支持字典校验和Hibernate Validator
|
||||
*/
|
||||
@AutoLog(value = "我为四所把把脉-通过EasyExcel导入")
|
||||
@RequiresPermissions("bqtakepulse:bg_takepulse:importExcel")
|
||||
@PostMapping(value = "/importExcelByEasyExcel")
|
||||
public Result<?> importExcelByEasyExcel(HttpServletRequest request) {
|
||||
@@ -464,6 +470,7 @@ public class BgTakepulseController extends JeecgController<BgTakepulse, IBgTakep
|
||||
/**
|
||||
* 通过EasyExcel导出数据
|
||||
*/
|
||||
@AutoLog(value = "我为四所把把脉-通过EasyExcel导出")
|
||||
@RequiresPermissions("bqtakepulse:bg_takepulse:exportXls")
|
||||
@GetMapping(value = "/exportXlsByEasyExcel")
|
||||
public void exportXlsByEasyExcel(HttpServletRequest request, HttpServletResponse response,
|
||||
@@ -474,6 +481,7 @@ public class BgTakepulseController extends JeecgController<BgTakepulse, IBgTakep
|
||||
/**
|
||||
* 仅导出Excel表头(EasyExcel)
|
||||
*/
|
||||
@AutoLog(value = "我为四所把把脉-通过EasyExcel导出模板")
|
||||
@RequiresPermissions("bqtakepulse:bg_takepulse:exportXls")
|
||||
@GetMapping(value = "/exportXlsHeaders")
|
||||
public void exportXlsHeaders(HttpServletResponse response) throws IOException {
|
||||
|
||||
+4
-2
@@ -61,7 +61,7 @@ public class DjCheckController extends JeecgController<DjCheck, IDjCheckService>
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "党建检查台账-分页列表查询")
|
||||
@AutoLog(value = "党建检查台账-分页列表查询")
|
||||
@Operation(summary="党建检查台账-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<DjCheck>> queryPageList(DjCheck djCheck,
|
||||
@@ -143,7 +143,7 @@ public class DjCheckController extends JeecgController<DjCheck, IDjCheckService>
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "党建检查台账-通过id查询")
|
||||
@AutoLog(value = "党建检查台账-通过id查询")
|
||||
@Operation(summary="党建检查台账-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<DjCheck> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -160,6 +160,7 @@ public class DjCheckController extends JeecgController<DjCheck, IDjCheckService>
|
||||
* @param request
|
||||
* @param djCheck
|
||||
*/
|
||||
@AutoLog(value = "党建检查台账-通过excel导出")
|
||||
@RequiresPermissions("check:dj_check:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, DjCheck djCheck) {
|
||||
@@ -173,6 +174,7 @@ public class DjCheckController extends JeecgController<DjCheck, IDjCheckService>
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "党建检查台账-通过excel导入")
|
||||
@RequiresPermissions("check:dj_check:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
|
||||
+4
-2
@@ -61,7 +61,7 @@ public class DjDemoLifeMeetingController extends JeecgController<DjDemoLifeMeeti
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "所领导板子民主生活会问题台账-分页列表查询")
|
||||
@AutoLog(value = "所领导板子民主生活会问题台账-分页列表查询")
|
||||
@Operation(summary="所领导板子民主生活会问题台账-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<DjDemoLifeMeeting>> queryPageList(DjDemoLifeMeeting djDemoLifeMeeting,
|
||||
@@ -143,7 +143,7 @@ public class DjDemoLifeMeetingController extends JeecgController<DjDemoLifeMeeti
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "所领导板子民主生活会问题台账-通过id查询")
|
||||
@AutoLog(value = "所领导板子民主生活会问题台账-通过id查询")
|
||||
@Operation(summary="所领导板子民主生活会问题台账-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<DjDemoLifeMeeting> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -160,6 +160,7 @@ public class DjDemoLifeMeetingController extends JeecgController<DjDemoLifeMeeti
|
||||
* @param request
|
||||
* @param djDemoLifeMeeting
|
||||
*/
|
||||
@AutoLog(value = "所领导板子民主生活会问题台账-通过excel导出")
|
||||
@RequiresPermissions("demoMetting:dj_demo_life_meeting:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, DjDemoLifeMeeting djDemoLifeMeeting) {
|
||||
@@ -173,6 +174,7 @@ public class DjDemoLifeMeetingController extends JeecgController<DjDemoLifeMeeti
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "所领导板子民主生活会问题台账-通过excel导入")
|
||||
@RequiresPermissions("demoMetting:dj_demo_life_meeting:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
|
||||
+10
-4
@@ -61,7 +61,7 @@ public class DqInspectProblemController extends JeecgController<DqInspectProblem
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "dq_inspect_problem-分页列表查询")
|
||||
@AutoLog(value = "dq_inspect_problem-分页列表查询")
|
||||
@Operation(summary="dq_inspect_problem-分页列表查询")
|
||||
@GetMapping(value = "/rootList")
|
||||
public Result<IPage<DqInspectProblem>> queryPageList(DqInspectProblem dqInspectProblem,
|
||||
@@ -96,6 +96,7 @@ public class DqInspectProblemController extends JeecgController<DqInspectProblem
|
||||
* @param pid
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "dq_inspect_problem-加载树子节点")
|
||||
@RequestMapping(value = "/loadTreeChildren", method = RequestMethod.GET)
|
||||
public Result<List<SelectTreeModel>> loadTreeChildren(@RequestParam(name = "pid") String pid) {
|
||||
Result<List<SelectTreeModel>> result = new Result<>();
|
||||
@@ -118,6 +119,7 @@ public class DqInspectProblemController extends JeecgController<DqInspectProblem
|
||||
* @param pcode
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "dq_inspect_problem-加载树根节点")
|
||||
@RequestMapping(value = "/loadTreeRoot", method = RequestMethod.GET)
|
||||
public Result<List<SelectTreeModel>> loadTreeRoot(@RequestParam(name = "async") Boolean async, @RequestParam(name = "pcode") String pcode) {
|
||||
Result<List<SelectTreeModel>> result = new Result<>();
|
||||
@@ -157,7 +159,7 @@ public class DqInspectProblemController extends JeecgController<DqInspectProblem
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "dq_inspect_problem-获取子数据")
|
||||
@AutoLog(value = "dq_inspect_problem-获取子数据")
|
||||
@Operation(summary="dq_inspect_problem-获取子数据")
|
||||
@GetMapping(value = "/childList")
|
||||
public Result<IPage<DqInspectProblem>> queryPageList(DqInspectProblem dqInspectProblem,HttpServletRequest req) {
|
||||
@@ -175,7 +177,7 @@ public class DqInspectProblemController extends JeecgController<DqInspectProblem
|
||||
* @param parentIds
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "dq_inspect_problem-批量获取子数据")
|
||||
@AutoLog(value = "dq_inspect_problem-批量获取子数据")
|
||||
@Operation(summary="dq_inspect_problem-批量获取子数据")
|
||||
@GetMapping("/getChildListBatch")
|
||||
public Result getChildListBatch(@RequestParam("parentIds") String parentIds) {
|
||||
@@ -199,6 +201,7 @@ public class DqInspectProblemController extends JeecgController<DqInspectProblem
|
||||
* @param nodeType 当前节点类型
|
||||
* @return 父级候选树
|
||||
*/
|
||||
@AutoLog(value = "dq_inspect_problem-获取父级下拉选项")
|
||||
@Operation(summary="dq_inspect_problem-父级候选")
|
||||
@GetMapping(value = "/parentOptions")
|
||||
public Result<List<Map<String, Object>>> parentOptions(@RequestParam(name = "nodeType") String nodeType) {
|
||||
@@ -208,6 +211,7 @@ public class DqInspectProblemController extends JeecgController<DqInspectProblem
|
||||
/**
|
||||
* 任务清单选择具体问题时使用,分类和面上问题仅用于分组展示,不可选择。
|
||||
*/
|
||||
@AutoLog(value = "dq_inspect_problem-获取专项下拉选项")
|
||||
@Operation(summary="dq_inspect_problem-具体问题候选")
|
||||
@GetMapping(value = "/specificOptions")
|
||||
public Result<List<Map<String, Object>>> specificOptions() {
|
||||
@@ -280,7 +284,7 @@ public class DqInspectProblemController extends JeecgController<DqInspectProblem
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "dq_inspect_problem-通过id查询")
|
||||
@AutoLog(value = "dq_inspect_problem-通过id查询")
|
||||
@Operation(summary="dq_inspect_problem-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<DqInspectProblem> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -297,6 +301,7 @@ public class DqInspectProblemController extends JeecgController<DqInspectProblem
|
||||
* @param request
|
||||
* @param dqInspectProblem
|
||||
*/
|
||||
@AutoLog(value = "dq_inspect_problem-通过excel导出")
|
||||
@RequiresPermissions("dqinspectproblem:dq_inspect_problem:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, DqInspectProblem dqInspectProblem) {
|
||||
@@ -310,6 +315,7 @@ public class DqInspectProblemController extends JeecgController<DqInspectProblem
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "dq_inspect_problem-通过excel导入")
|
||||
@RequiresPermissions("dqinspectproblem:dq_inspect_problem:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
|
||||
+4
@@ -56,6 +56,7 @@ public class DqInspectProgressController extends JeecgController<DqInspectProgre
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "工作进展反馈-分页列表查询")
|
||||
@Operation(summary="工作进展反馈-分页列表查询")
|
||||
@GetMapping(value = "/listDqInspectProgressByMainId")
|
||||
public Result<IPage<DqInspectProgress>> queryPageList(DqInspectProgress dqInspectProgress,
|
||||
@@ -130,6 +131,7 @@ public class DqInspectProgressController extends JeecgController<DqInspectProgre
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "工作进展反馈-通过id查询")
|
||||
@Operation(summary="工作进展反馈-通过id查询")
|
||||
@GetMapping(value = "/queryDqInspectProgressById")
|
||||
public Result<DqInspectProgress> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -146,6 +148,7 @@ public class DqInspectProgressController extends JeecgController<DqInspectProgre
|
||||
* @param request
|
||||
* @param dqInspectProgress
|
||||
*/
|
||||
@AutoLog(value = "工作进展反馈-通过excel导出")
|
||||
@RequestMapping(value = "/exportDqInspectProgress")
|
||||
public ModelAndView exportXls(HttpServletRequest request, DqInspectProgress dqInspectProgress) {
|
||||
return super.exportXls(request, dqInspectProgress, DqInspectProgress.class, "工作进展反馈");
|
||||
@@ -158,6 +161,7 @@ public class DqInspectProgressController extends JeecgController<DqInspectProgre
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "工作进展反馈-通过excel导入")
|
||||
@RequestMapping(value = "/importDqInspectProgress", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, DqInspectProgress.class);
|
||||
|
||||
+9
-3
@@ -72,7 +72,7 @@ public class DqInspectTaskController extends JeecgController<DqInspectTask, IDqI
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "dq_inspect_task-分页列表查询")
|
||||
@AutoLog(value = "dq_inspect_task-分页列表查询")
|
||||
@Operation(summary="dq_inspect_task-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<DqInspectTask>> queryPageList(DqInspectTask dqInspectTask,
|
||||
@@ -93,6 +93,7 @@ public class DqInspectTaskController extends JeecgController<DqInspectTask, IDqI
|
||||
* @param pageSize
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "dq_inspect_task-台账列表查询")
|
||||
@Operation(summary="dq_inspect_task-台账分页列表查询")
|
||||
@GetMapping(value = "/ledgerList")
|
||||
public Result<IPage<DqInspectTaskLedgerVo>> queryLedgerList(DqInspectTask dqInspectTask,
|
||||
@@ -221,7 +222,7 @@ public class DqInspectTaskController extends JeecgController<DqInspectTask, IDqI
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "dq_inspect_task-通过id查询")
|
||||
@AutoLog(value = "dq_inspect_task-通过id查询")
|
||||
@Operation(summary="dq_inspect_task-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<DqInspectTask> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -239,7 +240,7 @@ public class DqInspectTaskController extends JeecgController<DqInspectTask, IDqI
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "工作进展反馈通过主表ID查询")
|
||||
@AutoLog(value = "工作进展反馈通过主表ID查询")
|
||||
@Operation(summary="工作进展反馈主表ID查询")
|
||||
@GetMapping(value = "/queryDqInspectProgressByMainId")
|
||||
public Result<List<DqInspectProgress>> queryDqInspectProgressListByMainId(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -253,6 +254,7 @@ public class DqInspectTaskController extends JeecgController<DqInspectTask, IDqI
|
||||
* @param request
|
||||
* @param dqInspectTask
|
||||
*/
|
||||
@AutoLog(value = "dq_inspect_task-通过excel导出")
|
||||
@RequiresPermissions("dqinspecttask:dq_inspect_task:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, DqInspectTask dqInspectTask) {
|
||||
@@ -296,6 +298,7 @@ public class DqInspectTaskController extends JeecgController<DqInspectTask, IDqI
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "dq_inspect_task-通过excel导入")
|
||||
@RequiresPermissions("dqinspecttask:dq_inspect_task:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
@@ -333,6 +336,7 @@ public class DqInspectTaskController extends JeecgController<DqInspectTask, IDqI
|
||||
/**
|
||||
* 通过EasyExcel导入数据,支持字典校验和Hibernate Validator
|
||||
*/
|
||||
@AutoLog(value = "dq_inspect_task-通过EasyExcel导入")
|
||||
@RequiresPermissions("dqinspecttask:dq_inspect_task:importExcel")
|
||||
@PostMapping(value = "/importExcelByEasyExcel")
|
||||
public Result<?> importExcelByEasyExcel(HttpServletRequest request) {
|
||||
@@ -342,6 +346,7 @@ public class DqInspectTaskController extends JeecgController<DqInspectTask, IDqI
|
||||
/**
|
||||
* 通过EasyExcel导出数据
|
||||
*/
|
||||
@AutoLog(value = "dq_inspect_task-通过EasyExcel导出")
|
||||
@RequiresPermissions("dqinspecttask:dq_inspect_task:exportXls")
|
||||
@GetMapping(value = "/exportXlsByEasyExcel")
|
||||
public void exportXlsByEasyExcel(HttpServletRequest request, HttpServletResponse response,
|
||||
@@ -352,6 +357,7 @@ public class DqInspectTaskController extends JeecgController<DqInspectTask, IDqI
|
||||
/**
|
||||
* 仅导出Excel表头(EasyExcel)
|
||||
*/
|
||||
@AutoLog(value = "dq_inspect_task-通过EasyExcel导出模板")
|
||||
@RequiresPermissions("dqinspecttask:dq_inspect_task:exportXls")
|
||||
@GetMapping(value = "/exportXlsHeaders")
|
||||
public void exportXlsHeaders(HttpServletResponse response) throws IOException {
|
||||
|
||||
+4
-2
@@ -61,7 +61,7 @@ public class DjPeopleServiceController extends JeecgController<DjPeopleService,
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "我为群众办实事台账-分页列表查询")
|
||||
@AutoLog(value = "我为群众办实事台账-分页列表查询")
|
||||
@Operation(summary="我为群众办实事台账-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<DjPeopleService>> queryPageList(DjPeopleService djPeopleService,
|
||||
@@ -143,7 +143,7 @@ public class DjPeopleServiceController extends JeecgController<DjPeopleService,
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "我为群众办实事台账-通过id查询")
|
||||
@AutoLog(value = "我为群众办实事台账-通过id查询")
|
||||
@Operation(summary="我为群众办实事台账-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<DjPeopleService> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -160,6 +160,7 @@ public class DjPeopleServiceController extends JeecgController<DjPeopleService,
|
||||
* @param request
|
||||
* @param djPeopleService
|
||||
*/
|
||||
@AutoLog(value = "我为群众办实事台账-通过excel导出")
|
||||
@RequiresPermissions("peopleService:dj_people_service:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, DjPeopleService djPeopleService) {
|
||||
@@ -173,6 +174,7 @@ public class DjPeopleServiceController extends JeecgController<DjPeopleService,
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "我为群众办实事台账-通过excel导入")
|
||||
@RequiresPermissions("peopleService:dj_people_service:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
|
||||
+8
-4
@@ -61,7 +61,7 @@ public class DjInspectionRectifyListController extends JeecgController<DjInspect
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "党建巡视整改提升工作台账-分页列表查询")
|
||||
@AutoLog(value = "党建巡视整改提升工作台账-分页列表查询")
|
||||
@Operation(summary="党建巡视整改提升工作台账-分页列表查询")
|
||||
@GetMapping(value = "/rootList")
|
||||
public Result<IPage<DjInspectionRectifyList>> queryPageList(DjInspectionRectifyList djInspectionRectifyList,
|
||||
@@ -96,6 +96,7 @@ public class DjInspectionRectifyListController extends JeecgController<DjInspect
|
||||
* @param pid
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "党建巡视整改提升工作台账-加载树子节点")
|
||||
@RequestMapping(value = "/loadTreeChildren", method = RequestMethod.GET)
|
||||
public Result<List<SelectTreeModel>> loadTreeChildren(@RequestParam(name = "pid") String pid) {
|
||||
Result<List<SelectTreeModel>> result = new Result<>();
|
||||
@@ -118,6 +119,7 @@ public class DjInspectionRectifyListController extends JeecgController<DjInspect
|
||||
* @param pcode
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "党建巡视整改提升工作台账-加载树根节点")
|
||||
@RequestMapping(value = "/loadTreeRoot", method = RequestMethod.GET)
|
||||
public Result<List<SelectTreeModel>> loadTreeRoot(@RequestParam(name = "async") Boolean async, @RequestParam(name = "pcode") String pcode) {
|
||||
Result<List<SelectTreeModel>> result = new Result<>();
|
||||
@@ -157,7 +159,7 @@ public class DjInspectionRectifyListController extends JeecgController<DjInspect
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "党建巡视整改提升工作台账-获取子数据")
|
||||
@AutoLog(value = "党建巡视整改提升工作台账-获取子数据")
|
||||
@Operation(summary="党建巡视整改提升工作台账-获取子数据")
|
||||
@GetMapping(value = "/childList")
|
||||
public Result<IPage<DjInspectionRectifyList>> queryPageList(DjInspectionRectifyList djInspectionRectifyList,HttpServletRequest req) {
|
||||
@@ -175,7 +177,7 @@ public class DjInspectionRectifyListController extends JeecgController<DjInspect
|
||||
* @param parentIds
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "党建巡视整改提升工作台账-批量获取子数据")
|
||||
@AutoLog(value = "党建巡视整改提升工作台账-批量获取子数据")
|
||||
@Operation(summary="党建巡视整改提升工作台账-批量获取子数据")
|
||||
@GetMapping("/getChildListBatch")
|
||||
public Result getChildListBatch(@RequestParam("parentIds") String parentIds) {
|
||||
@@ -259,7 +261,7 @@ public class DjInspectionRectifyListController extends JeecgController<DjInspect
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "党建巡视整改提升工作台账-通过id查询")
|
||||
@AutoLog(value = "党建巡视整改提升工作台账-通过id查询")
|
||||
@Operation(summary="党建巡视整改提升工作台账-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<DjInspectionRectifyList> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -276,6 +278,7 @@ public class DjInspectionRectifyListController extends JeecgController<DjInspect
|
||||
* @param request
|
||||
* @param djInspectionRectifyList
|
||||
*/
|
||||
@AutoLog(value = "党建巡视整改提升工作台账-通过excel导出")
|
||||
@RequiresPermissions("rectifylist:dj_inspection_rectify_list:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, DjInspectionRectifyList djInspectionRectifyList) {
|
||||
@@ -289,6 +292,7 @@ public class DjInspectionRectifyListController extends JeecgController<DjInspect
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "党建巡视整改提升工作台账-通过excel导入")
|
||||
@RequiresPermissions("rectifylist:dj_inspection_rectify_list:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
|
||||
+4
-2
@@ -61,7 +61,7 @@ public class SupervisionTestController extends JeecgController<SupervisionTest,
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "supervision_test-分页列表查询")
|
||||
@AutoLog(value = "supervision_test-分页列表查询")
|
||||
@Operation(summary="supervision_test-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<SupervisionTest>> queryPageList(SupervisionTest supervisionTest,
|
||||
@@ -143,7 +143,7 @@ public class SupervisionTestController extends JeecgController<SupervisionTest,
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "supervision_test-通过id查询")
|
||||
@AutoLog(value = "supervision_test-通过id查询")
|
||||
@Operation(summary="supervision_test-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<SupervisionTest> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -160,6 +160,7 @@ public class SupervisionTestController extends JeecgController<SupervisionTest,
|
||||
* @param request
|
||||
* @param supervisionTest
|
||||
*/
|
||||
@AutoLog(value = "supervision_test-通过excel导出")
|
||||
@RequiresPermissions("supervisiontest:supervision_test:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, SupervisionTest supervisionTest) {
|
||||
@@ -173,6 +174,7 @@ public class SupervisionTestController extends JeecgController<SupervisionTest,
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "supervision_test-通过excel导入")
|
||||
@RequiresPermissions("supervisiontest:supervision_test:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
|
||||
+4
-2
@@ -61,7 +61,7 @@ public class DjMeetingRecordController extends JeecgController<DjMeetingRecord,
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "统战座谈会意见台账及督办反馈-分页列表查询")
|
||||
@AutoLog(value = "统战座谈会意见台账及督办反馈-分页列表查询")
|
||||
@Operation(summary="统战座谈会意见台账及督办反馈-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<DjMeetingRecord>> queryPageList(DjMeetingRecord djMeetingRecord,
|
||||
@@ -143,7 +143,7 @@ public class DjMeetingRecordController extends JeecgController<DjMeetingRecord,
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "统战座谈会意见台账及督办反馈-通过id查询")
|
||||
@AutoLog(value = "统战座谈会意见台账及督办反馈-通过id查询")
|
||||
@Operation(summary="统战座谈会意见台账及督办反馈-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<DjMeetingRecord> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -160,6 +160,7 @@ public class DjMeetingRecordController extends JeecgController<DjMeetingRecord,
|
||||
* @param request
|
||||
* @param djMeetingRecord
|
||||
*/
|
||||
@AutoLog(value = "统战座谈会意见台账及督办反馈-通过excel导出")
|
||||
@RequiresPermissions("tzMetting:dj_meeting_record:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, DjMeetingRecord djMeetingRecord) {
|
||||
@@ -173,6 +174,7 @@ public class DjMeetingRecordController extends JeecgController<DjMeetingRecord,
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "统战座谈会意见台账及督办反馈-通过excel导入")
|
||||
@RequiresPermissions("tzMetting:dj_meeting_record:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
|
||||
+11
-4
@@ -64,7 +64,7 @@ public class DjInspectImproveController extends JeecgController<DjInspectImprove
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "巡视整改台账-分页列表查询")
|
||||
@AutoLog(value = "巡视整改台账-分页列表查询")
|
||||
@Operation(summary="巡视整改台账-分页列表查询")
|
||||
@GetMapping(value = "/rootList")
|
||||
public Result<IPage<DjInspectImprove>> queryPageList(DjInspectImprove djInspectImprove,
|
||||
@@ -99,6 +99,7 @@ public class DjInspectImproveController extends JeecgController<DjInspectImprove
|
||||
* @param pid
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "巡视整改台账-加载树子节点")
|
||||
@RequestMapping(value = "/loadTreeChildren", method = RequestMethod.GET)
|
||||
public Result<List<SelectTreeModel>> loadTreeChildren(@RequestParam(name = "pid") String pid) {
|
||||
Result<List<SelectTreeModel>> result = new Result<>();
|
||||
@@ -121,6 +122,7 @@ public class DjInspectImproveController extends JeecgController<DjInspectImprove
|
||||
* @param pcode
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "巡视整改台账-加载树根节点")
|
||||
@RequestMapping(value = "/loadTreeRoot", method = RequestMethod.GET)
|
||||
public Result<List<SelectTreeModel>> loadTreeRoot(@RequestParam(name = "async") Boolean async, @RequestParam(name = "pcode") String pcode) {
|
||||
Result<List<SelectTreeModel>> result = new Result<>();
|
||||
@@ -160,7 +162,7 @@ public class DjInspectImproveController extends JeecgController<DjInspectImprove
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "巡视整改台账-获取子数据")
|
||||
@AutoLog(value = "巡视整改台账-获取子数据")
|
||||
@Operation(summary="巡视整改台账-获取子数据")
|
||||
@GetMapping(value = "/childList")
|
||||
public Result<IPage<DjInspectImprove>> queryPageList(DjInspectImprove djInspectImprove,HttpServletRequest req) {
|
||||
@@ -178,7 +180,7 @@ public class DjInspectImproveController extends JeecgController<DjInspectImprove
|
||||
* @param parentIds
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "巡视整改台账-批量获取子数据")
|
||||
@AutoLog(value = "巡视整改台账-批量获取子数据")
|
||||
@Operation(summary="巡视整改台账-批量获取子数据")
|
||||
@GetMapping("/getChildListBatch")
|
||||
public Result getChildListBatch(@RequestParam("parentIds") String parentIds) {
|
||||
@@ -262,7 +264,7 @@ public class DjInspectImproveController extends JeecgController<DjInspectImprove
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "巡视整改台账-通过id查询")
|
||||
@AutoLog(value = "巡视整改台账-通过id查询")
|
||||
@Operation(summary="巡视整改台账-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<DjInspectImprove> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -279,6 +281,7 @@ public class DjInspectImproveController extends JeecgController<DjInspectImprove
|
||||
* @param request
|
||||
* @param djInspectImprove
|
||||
*/
|
||||
@AutoLog(value = "巡视整改台账-通过excel导出")
|
||||
@RequiresPermissions("dj.inspectimprove:dj_inspect_improve:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, DjInspectImprove djInspectImprove) {
|
||||
@@ -293,6 +296,7 @@ public class DjInspectImproveController extends JeecgController<DjInspectImprove
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "巡视整改台账-通过excel导入")
|
||||
@RequiresPermissions("dj.inspectimprove:dj_inspect_improve:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
@@ -302,6 +306,7 @@ public class DjInspectImproveController extends JeecgController<DjInspectImprove
|
||||
/**
|
||||
* 仅导出Excel表头(EasyExcel)
|
||||
*/
|
||||
@AutoLog(value = "巡视整改台账-通过EasyExcel导出模板")
|
||||
@RequiresPermissions("dj.inspectimprove:dj_inspect_improve:exportXls")
|
||||
@GetMapping(value = "/exportXlsHeaders")
|
||||
public void exportXlsHeaders(HttpServletResponse response) throws IOException {
|
||||
@@ -310,6 +315,7 @@ public class DjInspectImproveController extends JeecgController<DjInspectImprove
|
||||
/**
|
||||
* 通过EasyExcel导入数据
|
||||
*/
|
||||
@AutoLog(value = "巡视整改台账-通过EasyExcel导入")
|
||||
@RequiresPermissions("dj.inspectimprove:dj_inspect_improve:importExcel")
|
||||
@RequestMapping(value = "/importExcelByEasyExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcelByEasyExcel(HttpServletRequest request) {
|
||||
@@ -324,6 +330,7 @@ public class DjInspectImproveController extends JeecgController<DjInspectImprove
|
||||
/**
|
||||
* 通过EasyExcel校验数据,只返回校验结果,不保存到数据库
|
||||
*/
|
||||
@AutoLog(value = "巡视整改台账-通过EasyExcel校验导入")
|
||||
@RequiresPermissions("dj.inspectimprove:dj_inspect_improve:importExcel")
|
||||
@RequestMapping(value = "/checkExcelByEasyExcel", method = RequestMethod.POST)
|
||||
public Result<?> checkExcelByEasyExcel(HttpServletRequest request) {
|
||||
|
||||
+20
-5
@@ -50,6 +50,7 @@ import com.alibaba.fastjson.JSON;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||
import org.jeecg.common.constant.CommonConstant;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
|
||||
@@ -85,7 +86,7 @@ public class ImprovementProposalController {
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "improvement_proposal-分页列表查询")
|
||||
@AutoLog(value = "improvement_proposal-分页列表查询")
|
||||
@Operation(summary="improvement_proposal-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<ImprovementProposal>> queryPageList(ImprovementProposal improvementProposal,
|
||||
@@ -130,6 +131,7 @@ public class ImprovementProposalController {
|
||||
/**
|
||||
* 获取当前登录用户可作为改善提案归属的业务部门。
|
||||
*/
|
||||
@AutoLog(value = "improvement_proposal-获取我的提案部门")
|
||||
@GetMapping(value = "/myProposalDepartments")
|
||||
@RequiresPermissions("improvementproposal:improvement_proposal:add")
|
||||
public Result<List<ImprovementProposalDepartmentDTO>> getMyProposalDepartments() {
|
||||
@@ -161,6 +163,7 @@ public class ImprovementProposalController {
|
||||
/**
|
||||
* 使用改善提案主表作为流程业务数据发起审批,不复用督办任务表。
|
||||
*/
|
||||
@AutoLog(value = "改善提案-发起审批流程", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@PostMapping(value = "/startProcess")
|
||||
public Result<String> startProcess(@RequestBody(required = false) Map<String, String> requestBody,
|
||||
@RequestParam(name = "id", required = false) String id) {
|
||||
@@ -184,7 +187,7 @@ public class ImprovementProposalController {
|
||||
/**
|
||||
* 删除运行中的流程并回退草稿。提案基本信息和业务附件会保留,流程产生的评分、投票数据会清空。
|
||||
*/
|
||||
@AutoLog(value = "改善提案-删除流程并回退草稿")
|
||||
@AutoLog(value = "改善提案-删除流程并回退草稿", operateType = CommonConstant.OPERATE_TYPE_4)
|
||||
@Operation(summary = "改善提案-删除流程并回退草稿")
|
||||
@RequiresPermissions("improvementproposal:improvement_proposal:withdrawProcess")
|
||||
@PostMapping(value = "/withdrawProcess")
|
||||
@@ -197,12 +200,14 @@ public class ImprovementProposalController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "改善提案-保存部门初审结果", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@PostMapping(value = "/bpm/initialReview")
|
||||
@Operation(summary = "保存部门精益专员初审结果")
|
||||
public Result<String> saveInitialReview(@RequestBody ImprovementProposalBpmActionDTO action) {
|
||||
return handleBpmAction(() -> improvementProposalService.saveInitialReview(action, currentUser()));
|
||||
}
|
||||
|
||||
@AutoLog(value = "improvement_proposal-获取部门评分")
|
||||
@GetMapping(value = "/bpm/myDeptScore")
|
||||
@Operation(summary = "查询当前部门评委个人评分")
|
||||
public Result<ImprovementDeptScore> getMyDeptScore(@RequestParam String mainId, @RequestParam String processInstanceId,
|
||||
@@ -218,24 +223,28 @@ public class ImprovementProposalController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "改善提案-保存部门评委个人评分草稿", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@PostMapping(value = "/bpm/deptScore")
|
||||
@Operation(summary = "保存当前部门评委个人评分草稿")
|
||||
public Result<String> saveDeptScore(@RequestBody ImprovementDeptScoreBpmDTO score) {
|
||||
return handleBpmAction(() -> improvementProposalService.saveDeptScore(score, currentUser()));
|
||||
}
|
||||
|
||||
@AutoLog(value = "改善提案-锁定部门评委个人评分", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@PostMapping(value = "/bpm/submitDeptScore")
|
||||
@Operation(summary = "锁定当前部门评委个人评分")
|
||||
public Result<String> submitDeptScore(@RequestBody ImprovementProposalBpmActionDTO action) {
|
||||
return handleBpmAction(() -> improvementProposalService.submitDeptScore(action, currentUser()));
|
||||
}
|
||||
|
||||
@AutoLog(value = "改善提案-保存部门负责人确认奖项", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@PostMapping(value = "/bpm/leaderAward")
|
||||
@Operation(summary = "保存部门负责人确认奖项")
|
||||
public Result<String> saveLeaderAward(@RequestBody ImprovementProposalBpmActionDTO action) {
|
||||
return handleBpmAction(() -> improvementProposalService.saveLeaderAward(action, currentUser()));
|
||||
}
|
||||
|
||||
@AutoLog(value = "improvement_proposal-获取所级评议投票候选人")
|
||||
@GetMapping(value = "/bpm/instituteVoteCandidates")
|
||||
@Operation(summary = "查询所级评议投票候选人")
|
||||
public Result<List<ImprovementInstituteVoteCandidateDTO>> getInstituteVoteCandidates(@RequestParam String mainId,
|
||||
@@ -251,24 +260,28 @@ public class ImprovementProposalController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "改善提案-保存所级评议投票人员", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@PostMapping(value = "/bpm/instituteVoteMembers")
|
||||
@Operation(summary = "保存所级评议投票人员")
|
||||
public Result<String> saveInstituteVoteMembers(@RequestBody ImprovementProposalBpmActionDTO action) {
|
||||
return handleBpmAction(() -> improvementProposalService.saveInstituteVoteMembers(action, currentUser()));
|
||||
}
|
||||
|
||||
@AutoLog(value = "改善提案-保存归档最终奖项", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@PostMapping(value = "/bpm/archiveAward")
|
||||
@Operation(summary = "保存归档最终奖项")
|
||||
public Result<String> saveArchiveAward(@RequestBody ImprovementProposalBpmActionDTO action) {
|
||||
return handleBpmAction(() -> improvementProposalService.saveArchiveAward(action, currentUser()));
|
||||
}
|
||||
|
||||
@AutoLog(value = "改善提案-记录所级评委投票", operateType = CommonConstant.OPERATE_TYPE_2)
|
||||
@PostMapping(value = "/bpm/instituteVote")
|
||||
@Operation(summary = "记录所级评委投票")
|
||||
public Result<String> castInstituteVote(@RequestBody ImprovementProposalBpmActionDTO action) {
|
||||
return handleBpmAction(() -> improvementProposalService.castInstituteVote(action, currentUser()));
|
||||
}
|
||||
|
||||
@AutoLog(value = "改善提案-确认所级评委投票并完成流程", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@PostMapping(value = "/bpm/submitInstituteVote")
|
||||
@Operation(summary = "确认所级评委投票并直接完成流程任务")
|
||||
public Result<String> submitInstituteVote(@RequestBody ImprovementProposalBpmActionDTO action, HttpServletRequest request) {
|
||||
@@ -404,7 +417,7 @@ public class ImprovementProposalController {
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "improvement_proposal-通过id查询")
|
||||
@AutoLog(value = "improvement_proposal-通过id查询")
|
||||
@Operation(summary="improvement_proposal-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<ImprovementProposal> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -422,7 +435,7 @@ public class ImprovementProposalController {
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "部门评议评分表通过主表ID查询")
|
||||
@AutoLog(value = "部门评议评分表通过主表ID查询")
|
||||
@Operation(summary="部门评议评分表主表ID查询")
|
||||
@GetMapping(value = "/queryImprovementDeptScoreByMainId")
|
||||
public Result<List<ImprovementDeptScore>> queryImprovementDeptScoreListByMainId(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -435,7 +448,7 @@ public class ImprovementProposalController {
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "所级评议投票表通过主表ID查询")
|
||||
@AutoLog(value = "所级评议投票表通过主表ID查询")
|
||||
@Operation(summary="所级评议投票表主表ID查询")
|
||||
@GetMapping(value = "/queryImprovementInstituteVoteByMainId")
|
||||
public Result<List<ImprovementInstituteVote>> queryImprovementInstituteVoteListByMainId(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -457,6 +470,7 @@ public class ImprovementProposalController {
|
||||
* @param request
|
||||
* @param improvementProposal
|
||||
*/
|
||||
@AutoLog(value = "improvement_proposal-通过excel导出")
|
||||
@RequiresPermissions("improvementproposal:improvement_proposal:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, ImprovementProposal improvementProposal) {
|
||||
@@ -503,6 +517,7 @@ public class ImprovementProposalController {
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "改善提案-通过excel导入")
|
||||
@RequiresPermissions("improvementproposal:improvement_proposal:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
|
||||
+16
-13
@@ -52,6 +52,7 @@ import com.alibaba.fastjson.JSON;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||
import org.jeecg.common.constant.CommonConstant;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
|
||||
@@ -84,7 +85,7 @@ public class TaskListController {
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "任务清单表-分页列表查询")
|
||||
@AutoLog(value = "任务清单表-分页列表查询")
|
||||
@Operation(summary="任务清单表-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<TaskList>> queryPageList(TaskList taskList,
|
||||
@@ -171,7 +172,7 @@ public class TaskListController {
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "任务清单表-通过id查询")
|
||||
@AutoLog(value = "任务清单表-通过id查询")
|
||||
@Operation(summary="任务清单表-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<TaskList> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -207,7 +208,7 @@ public class TaskListController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单表-拖拽移动任务清单")
|
||||
@AutoLog(value = "任务清单表-拖拽移动任务清单", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@Operation(summary = "拖拽移动任务清单")
|
||||
@PostMapping(value = "/moveTaskList")
|
||||
public Result<String> moveTaskList(@RequestBody MoveTaskListReq req) {
|
||||
@@ -219,7 +220,7 @@ public class TaskListController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单表-拖拽移动分组")
|
||||
@AutoLog(value = "任务清单表-拖拽移动分组", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@Operation(summary = "拖拽移动分组")
|
||||
@PostMapping(value = "/moveGroup")
|
||||
public Result<String> moveGroup(@RequestBody Map<String, Object> params) {
|
||||
@@ -253,7 +254,7 @@ public class TaskListController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单表-移除收藏")
|
||||
@AutoLog(value = "任务清单表-移除收藏", operateType = CommonConstant.OPERATE_TYPE_4)
|
||||
@Operation(summary = "从收藏栏移除")
|
||||
@PostMapping(value = "/removeFavorite")
|
||||
public Result<String> removeFavorite(@RequestBody Map<String, String> params) {
|
||||
@@ -277,7 +278,7 @@ public class TaskListController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单表-移除分组")
|
||||
@AutoLog(value = "任务清单表-移除分组", operateType = CommonConstant.OPERATE_TYPE_4)
|
||||
@Operation(summary = "从收藏栏移除分组及子项")
|
||||
@PostMapping(value = "/removeFavoriteGroup")
|
||||
public Result<String> removeFavoriteGroup(@RequestBody Map<String, String> params) {
|
||||
@@ -289,7 +290,7 @@ public class TaskListController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单表-重命名分组")
|
||||
@AutoLog(value = "任务清单表-重命名分组", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@Operation(summary = "重命名任务清单分组")
|
||||
@PostMapping(value = "/renameGroup")
|
||||
public Result<String> renameGroup(@RequestBody Map<String, String> params) {
|
||||
@@ -301,7 +302,7 @@ public class TaskListController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单表-重命名清单")
|
||||
@AutoLog(value = "任务清单表-重命名清单", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@Operation(summary = "重命名任务清单")
|
||||
@PostMapping(value = "/renameTaskList")
|
||||
public Result<String> renameTaskList(@RequestBody Map<String, String> params) {
|
||||
@@ -384,7 +385,7 @@ public class TaskListController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单表-移除协作人")
|
||||
@AutoLog(value = "任务清单表-移除协作人", operateType = CommonConstant.OPERATE_TYPE_4)
|
||||
@Operation(summary = "移除协作人")
|
||||
@PostMapping(value = "/removeCollaborator")
|
||||
public Result<String> removeCollaborator(@RequestBody Map<String, String> params) {
|
||||
@@ -396,7 +397,7 @@ public class TaskListController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单表-修改协作人权限")
|
||||
@AutoLog(value = "任务清单表-修改协作人权限", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@Operation(summary = "修改协作人权限")
|
||||
@PostMapping(value = "/updateCollaboratorPermission")
|
||||
public Result<String> updateCollaboratorPermission(@RequestBody Map<String, String> params) {
|
||||
@@ -422,7 +423,7 @@ public class TaskListController {
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "任务清单详情表通过主表ID查询")
|
||||
@AutoLog(value = "任务清单详情表通过主表ID查询")
|
||||
@Operation(summary="任务清单详情表主表ID查询")
|
||||
@GetMapping(value = "/queryTaskListDetialByMainId")
|
||||
public Result<List<TaskListDetial>> queryTaskListDetialListByMainId(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -435,7 +436,7 @@ public class TaskListController {
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "任务清单权限表通过主表ID查询")
|
||||
@AutoLog(value = "任务清单权限表通过主表ID查询")
|
||||
@Operation(summary="任务清单权限表主表ID查询")
|
||||
@GetMapping(value = "/queryTaskListPermissionByMainId")
|
||||
public Result<List<TaskListPermission>> queryTaskListPermissionListByMainId(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -448,7 +449,7 @@ public class TaskListController {
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "任务清单收藏表通过主表ID查询")
|
||||
@AutoLog(value = "任务清单收藏表通过主表ID查询")
|
||||
@Operation(summary="任务清单收藏表主表ID查询")
|
||||
@GetMapping(value = "/queryTaskListFavoriteByMainId")
|
||||
public Result<List<TaskListFavorite>> queryTaskListFavoriteListByMainId(@RequestParam(name="id",required=true) String id) {
|
||||
@@ -462,6 +463,7 @@ public class TaskListController {
|
||||
* @param request
|
||||
* @param taskList
|
||||
*/
|
||||
@AutoLog(value = "任务清单表-通过excel导出")
|
||||
@RequiresPermissions("tasklist:task_list:exportXls")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, TaskList taskList) {
|
||||
@@ -509,6 +511,7 @@ public class TaskListController {
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "任务清单表-通过excel导入")
|
||||
@RequiresPermissions("tasklist:task_list:importExcel")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
|
||||
+13
@@ -1,6 +1,8 @@
|
||||
package org.jeecg.modules.demo.tasklist.controller;
|
||||
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||
import org.jeecg.common.constant.CommonConstant;
|
||||
import org.jeecg.modules.demo.tasklist.entity.TaskListDetial;
|
||||
import org.jeecg.modules.demo.tasklist.service.ITaskListDetialService;
|
||||
import org.jeecg.modules.demo.tasklist.vo.CreateTaskReq;
|
||||
@@ -19,6 +21,7 @@ public class TaskListDetialController {
|
||||
@Autowired
|
||||
private ITaskListDetialService taskListDetialService;
|
||||
|
||||
@AutoLog(value = "任务清单详情表-添加任务")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<TaskListDetial> add(@RequestBody CreateTaskReq req) {
|
||||
try {
|
||||
@@ -30,6 +33,7 @@ public class TaskListDetialController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单详情表-编辑任务")
|
||||
@PostMapping(value = "/edit")
|
||||
public Result<?> edit(@RequestBody TaskListDetial task) {
|
||||
try {
|
||||
@@ -41,6 +45,7 @@ public class TaskListDetialController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单详情表-删除任务")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<?> delete(@RequestParam(name = "id") String id) {
|
||||
try {
|
||||
@@ -52,12 +57,14 @@ public class TaskListDetialController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单详情表-通过主表ID查询")
|
||||
@GetMapping(value = "/listByMainId")
|
||||
public Result<List<TaskListDetial>> listByMainId(@RequestParam(name = "mainId") String mainId) {
|
||||
List<TaskListDetial> list = taskListDetialService.queryTopLevelByMainId(mainId);
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单详情表-通过主表ID查询全部")
|
||||
@GetMapping(value = "/listAllByMainId")
|
||||
public Result<List<TaskListDetial>> listAllByMainId(
|
||||
@RequestParam(name = "mainId") String mainId) {
|
||||
@@ -65,6 +72,7 @@ public class TaskListDetialController {
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单详情表-切换任务完成状态", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@PostMapping(value = "/toggleStatus")
|
||||
public Result<?> toggleStatus(@RequestBody Map<String, String> body) {
|
||||
try {
|
||||
@@ -77,6 +85,7 @@ public class TaskListDetialController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单详情表-移动任务", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@PostMapping(value = "/moveTask")
|
||||
public Result<?> moveTask(@RequestBody MoveTaskReq req) {
|
||||
try {
|
||||
@@ -88,6 +97,7 @@ public class TaskListDetialController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单详情表-移动任务分组", operateType = CommonConstant.OPERATE_TYPE_3)
|
||||
@PostMapping(value = "/moveTaskGroup")
|
||||
public Result<?> moveTaskGroup(@RequestBody Map<String, Object> params) {
|
||||
try {
|
||||
@@ -101,6 +111,7 @@ public class TaskListDetialController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单详情表-关注任务", operateType = CommonConstant.OPERATE_TYPE_2)
|
||||
@PostMapping(value = "/follow")
|
||||
public Result<?> follow(@RequestBody Map<String, String> body) {
|
||||
try {
|
||||
@@ -113,6 +124,7 @@ public class TaskListDetialController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单详情表-取消关注任务", operateType = CommonConstant.OPERATE_TYPE_4)
|
||||
@PostMapping(value = "/unfollow")
|
||||
public Result<?> unfollow(@RequestBody Map<String, String> body) {
|
||||
try {
|
||||
@@ -125,6 +137,7 @@ public class TaskListDetialController {
|
||||
}
|
||||
}
|
||||
|
||||
@AutoLog(value = "任务清单详情表-加载子任务")
|
||||
@GetMapping(value = "/loadSubTasks")
|
||||
public Result<List<TaskListDetial>> loadSubTasks(
|
||||
@RequestParam(name = "parentTaskId") String parentTaskId,
|
||||
|
||||
Reference in New Issue
Block a user