diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java index 1fc0d97b..b7aa3edf 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java @@ -9,12 +9,14 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.drafting.entity.PayDraftingGroupSubItem; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem; import com.jero.functionalsafetycenter.service.SafetyCenterSubitemService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -44,6 +46,7 @@ public class SafetyCenterSubitemController extends JeroController> queryPageList(SafetyCenterSubitem safetyCenterSubitem, @@ -58,6 +61,7 @@ public class SafetyCenterSubitemController extends JeroController> queryList(SafetyCenterSubitem safetyCenterSubitem, @@ -71,6 +75,7 @@ public class SafetyCenterSubitemController extends JeroController add(@Validated @RequestBody SafetyCenterSubitem safetyCenterSubitem) { @@ -82,6 +87,7 @@ public class SafetyCenterSubitemController extends JeroController edit(@Validated @RequestBody SafetyCenterSubitem safetyCenterSubitem) { @@ -93,6 +99,7 @@ public class SafetyCenterSubitemController extends JeroController delete(@RequestBody IdsMapBody map) { @@ -108,6 +115,7 @@ public class SafetyCenterSubitemController extends JeroController deleteBatch(@RequestBody IdsMapBody map) { @@ -124,6 +132,7 @@ public class SafetyCenterSubitemController extends JeroController queryById(@RequestParam(name = "id") String id) { @@ -137,18 +146,34 @@ public class SafetyCenterSubitemController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { + List excelData = super.getExcelData(request, SafetyCenterSubitem.class); + return super.importExcel(request, response, SafetyCenterSubitem.class); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingController.java index b52464d3..30f523b1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingController.java @@ -70,7 +70,7 @@ public class SafetyCenterMeetingController extends JeroController queryPageList(PayMeeting payMeeting, @@ -86,7 +86,7 @@ public class SafetyCenterMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { @@ -212,7 +212,7 @@ public class SafetyCenterMeetingController extends JeroController uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) { @@ -224,7 +224,7 @@ public class SafetyCenterMeetingController extends JeroController release(@RequestBody PublishReminderVO publishReminderVO) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingSituationController.java index 789b3c83..4c95bcb0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingSituationController.java @@ -62,7 +62,7 @@ public class SafetyCenterMeetingSituationController extends JeroController queryPageList(PayMeetingSituation payMeetingSituation, @@ -96,7 +96,7 @@ public class SafetyCenterMeetingSituationController extends JeroController edit(@RequestBody PayMeetingSituationVO payMeetingSituationVO) { @@ -120,7 +120,7 @@ public class SafetyCenterMeetingSituationController extends JeroController objects = payMeetingSituationService.MeetingSituationGetModelAndView(request, payMeetingSituation,MEETING_TYPE); @@ -185,7 +185,7 @@ public class SafetyCenterMeetingSituationController extends JeroController checkRegister(@RequestBody CheckVO checkVO) { @@ -220,7 +220,7 @@ public class SafetyCenterMeetingSituationController extends JeroController