Merge remote-tracking branch 'origin/master'

zhangherong

6 天以前 c557836de5be6a7de591a7cdea6b400ff75b8213

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java

@@ -337,7 +337,7 @@
     */
    @GetMapping("/exportInsOrderBaseInfo")
    public JSONObject exportInspectionOrderBaseInfo(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
                                                    @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
                                                    @RequestParam(name = "inspectionDate", required = false) String inspectionDate) {
        return eamInspectionOrderService.exportInspectionOrderBaseInfo(equipmentCode, inspectionDate);
    }

@@ -349,7 +349,7 @@
     */
    @GetMapping("/exportInsOrderDetailList")
    public JSONObject exportInspectionOrderDetailList(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
                                                    @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
                                                    @RequestParam(name = "inspectionDate", required = false) String inspectionDate) {
        return eamInspectionOrderService.exportInspectionOrderDetailList(equipmentCode, inspectionDate);
    }

@@ -361,7 +361,7 @@
     */
    @GetMapping("/exportInsOrderDetailUserList")
    public JSONObject exportInspectionOrderDetailUserList(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
                                                    @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
                                                    @RequestParam(name = "inspectionDate", required = false) String inspectionDate) {
        return eamInspectionOrderService.exportInspectionOrderDetailUserList(equipmentCode, inspectionDate);
    }

@@ -373,7 +373,7 @@
     */
    @GetMapping("/exportWeekInsDetailList")
    public JSONObject exportWeekInsDetailList(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
                                                    @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
                                                    @RequestParam(name = "inspectionDate", required = false) String inspectionDate) {
        return eamInspectionOrderService.exportWeekInsDetailList(equipmentCode, inspectionDate);
    }

@@ -385,7 +385,7 @@
     */
    @GetMapping("/exportWeekInsOrderDetailUserList")
    public JSONObject exportInspectionOrder(@RequestParam(name = "equipmentCode", required = true) String equipmentCode,
                                                    @RequestParam(name = "inspectionDate", required = true) String inspectionDate) {
                                                    @RequestParam(name = "inspectionDate", required = false) String inspectionDate) {
        return eamInspectionOrderService.exportWeekInsOrderDetailUserList(equipmentCode, inspectionDate);
    }