From 2eca209d1041efb1fc15f06ccd088599ff9bda12 Mon Sep 17 00:00:00 2001 From: Administrator <1923636941@qq.com> Date: Tue, 18 Apr 2023 18:01:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GtMaterialContractArrivalAcceptanceController.java | 2 +- .../gt/controller/GtMaterialContractController.java | 2 +- .../GtMaterialContractPaymentRecordController.java | 2 +- .../modules/gt/controller/GtMaterialDeviceController.java | 2 +- .../GtMaterialDeviceMaintenanceRecordController.java | 2 +- ...MaterialDeviceMandatoryInspectionRecordController.java | 2 +- .../gt/controller/GtMaterialInOutWarehouseController.java | 2 +- ...GtMaterialPointCheckIntoWarehouseDetailController.java | 2 +- .../GtMaterialPurchaseDemandPlanningController.java | 2 +- .../GtMaterialSupplierEvaluationRecordController.java | 2 +- .../gt/controller/GtMaterialTenderBidController.java | 2 +- .../modules/gt/controller/GtMaterialTenderController.java | 2 +- .../gt/controller/GtMaterialTenderRecordController.java | 2 +- .../modules/gt/controller/GtMaterialVendorController.java | 2 +- .../worker/controller/UfaceCallbackController.java | 7 +++---- .../modules/worker/service/IWorkerAttendanceService.java | 3 ++- .../worker/service/impl/WorkerAttendanceServiceImpl.java | 8 ++++++-- 17 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialContractArrivalAcceptanceController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialContractArrivalAcceptanceController.java index d447053db..4797464fe 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialContractArrivalAcceptanceController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialContractArrivalAcceptanceController.java @@ -48,7 +48,7 @@ import com.alibaba.fastjson.JSON; @RestController @RequestMapping("/xmgl/gt/gtMaterialContractArrivalAcceptance") @Slf4j -@Api(tags = "GtMaterialContractArrivalAcceptanceController相关Api") +@Api(tags = "GtMaterial合同-到货验收") public class GtMaterialContractArrivalAcceptanceController { @Autowired private IGtMaterialContractArrivalAcceptanceService gtMaterialContractArrivalAcceptanceService; diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialContractController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialContractController.java index 145ace1a3..2c42c3ffa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialContractController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialContractController.java @@ -48,7 +48,7 @@ import com.alibaba.fastjson.JSON; @RestController @RequestMapping("/xmgl/gt/gtMaterialContract") @Slf4j -@Api(tags = "GtMaterialContractController相关Api") +@Api(tags = "GtMaterial合同") public class GtMaterialContractController { @Autowired private IGtMaterialContractService gtMaterialContractService; diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialContractPaymentRecordController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialContractPaymentRecordController.java index 0fd2852b1..e2ba278de 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialContractPaymentRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialContractPaymentRecordController.java @@ -48,7 +48,7 @@ import com.alibaba.fastjson.JSONObject; @RestController @RequestMapping("/xmgl/gt/gtMaterialContractPaymentRecord") @Slf4j -@Api(tags = "GtMaterialContractPaymentRecordController相关Api") +@Api(tags = "GtMaterial合同-付款记录") public class GtMaterialContractPaymentRecordController { @Autowired private IGtMaterialContractPaymentRecordService gtMaterialContractPaymentRecordService; diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialDeviceController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialDeviceController.java index 2858229f2..8d73719c6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialDeviceController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialDeviceController.java @@ -48,7 +48,7 @@ import com.alibaba.fastjson.JSONObject; @RestController @RequestMapping("/xmgl/gt/gtMaterialDevice") @Slf4j -@Api(tags = "GtMaterialDeviceController相关Api") +@Api(tags = "GtMaterial设备") public class GtMaterialDeviceController { @Autowired private IGtMaterialDeviceService gtMaterialDeviceService; diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialDeviceMaintenanceRecordController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialDeviceMaintenanceRecordController.java index 3b5243b1f..c77fdef63 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialDeviceMaintenanceRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialDeviceMaintenanceRecordController.java @@ -48,7 +48,7 @@ import com.alibaba.fastjson.JSONObject; @RestController @RequestMapping("/xmgl/gt/gtMaterialDeviceMaintenanceRecord") @Slf4j -@Api(tags = "GtMaterialDeviceMaintenanceRecordController相关Api") +@Api(tags = "GtMaterial设备维保记录") public class GtMaterialDeviceMaintenanceRecordController { @Autowired private IGtMaterialDeviceMaintenanceRecordService gtMaterialDeviceMaintenanceRecordService; diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialDeviceMandatoryInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialDeviceMandatoryInspectionRecordController.java index e5df777eb..e258aaff7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialDeviceMandatoryInspectionRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialDeviceMandatoryInspectionRecordController.java @@ -48,7 +48,7 @@ import com.alibaba.fastjson.JSONObject; @RestController @RequestMapping("/xmgl/gt/gtMaterialDeviceMandatoryInspectionRecord") @Slf4j -@Api(tags = "GtMaterialDeviceMandatoryInspectionRecordController相关Api") +@Api(tags = "GtMaterial设备强制检验记录") public class GtMaterialDeviceMandatoryInspectionRecordController { @Autowired private IGtMaterialDeviceMandatoryInspectionRecordService gtMaterialDeviceMandatoryInspectionRecordService; diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialInOutWarehouseController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialInOutWarehouseController.java index 6d112f7fc..0bdd9208b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialInOutWarehouseController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialInOutWarehouseController.java @@ -48,7 +48,7 @@ import com.alibaba.fastjson.JSONObject; @RestController @RequestMapping("/xmgl/gt/gtMaterialInOutWarehouse") @Slf4j -@Api(tags = "GtMaterialInOutWarehouseController相关Api") +@Api(tags = "GtMaterial出入库") public class GtMaterialInOutWarehouseController { @Autowired private IGtMaterialInOutWarehouseService gtMaterialInOutWarehouseService; diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPointCheckIntoWarehouseDetailController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPointCheckIntoWarehouseDetailController.java index fcf789169..f4d9c3dc8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPointCheckIntoWarehouseDetailController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPointCheckIntoWarehouseDetailController.java @@ -48,7 +48,7 @@ import com.alibaba.fastjson.JSON; @RestController @RequestMapping("/xmgl/gt/gtMaterialPointCheckIntoWarehouseDetail") @Slf4j -@Api(tags = "GtMaterialPointCheckIntoWarehouseDetailController相关Api") +@Api(tags = "GtMaterial出入库的物料详情") public class GtMaterialPointCheckIntoWarehouseDetailController { @Autowired private IGtMaterialPointCheckIntoWarehouseDetailService gtMaterialPointCheckIntoWarehouseDetailService; diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPurchaseDemandPlanningController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPurchaseDemandPlanningController.java index bdd1d8f17..b23ad2869 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPurchaseDemandPlanningController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialPurchaseDemandPlanningController.java @@ -48,7 +48,7 @@ import com.alibaba.fastjson.JSONObject; @RestController @RequestMapping("/xmgl/gt/gtMaterialPurchaseDemandPlanning") @Slf4j -@Api(tags = "GtMaterialPurchaseDemandPlanningController相关Api") +@Api(tags = "GtMaterial采购需求计划") public class GtMaterialPurchaseDemandPlanningController { @Autowired private IGtMaterialPurchaseDemandPlanningService gtMaterialPurchaseDemandPlanningService; diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialSupplierEvaluationRecordController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialSupplierEvaluationRecordController.java index b699e1278..e7e36cb67 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialSupplierEvaluationRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialSupplierEvaluationRecordController.java @@ -48,7 +48,7 @@ import com.alibaba.fastjson.JSONObject; @RestController @RequestMapping("/xmgl/gt/gtMaterialSupplierEvaluationRecord") @Slf4j -@Api(tags = "GtMaterialSupplierEvaluationRecordController相关Api") +@Api(tags = "GtMaterial供应商评价记录") public class GtMaterialSupplierEvaluationRecordController { @Autowired private IGtMaterialSupplierEvaluationRecordService gtMaterialSupplierEvaluationRecordService; diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTenderBidController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTenderBidController.java index b67a8efac..6119d9905 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTenderBidController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTenderBidController.java @@ -48,7 +48,7 @@ import com.alibaba.fastjson.JSONObject; @RestController @RequestMapping("/xmgl/gt/gtMaterialTenderBid") @Slf4j -@Api(tags = "GtMaterialTenderBidController相关Api") +@Api(tags = "GtMaterial招标-投标清单") public class GtMaterialTenderBidController { @Autowired private IGtMaterialTenderBidService gtMaterialTenderBidService; diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTenderController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTenderController.java index c9866e159..ac9721e84 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTenderController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTenderController.java @@ -48,7 +48,7 @@ import com.alibaba.fastjson.JSONObject; @RestController @RequestMapping("/xmgl/gt/gtMaterialTender") @Slf4j -@Api(tags = "GtMaterialTenderController相关Api") +@Api(tags = "GtMaterial招标") public class GtMaterialTenderController { @Autowired private IGtMaterialTenderService gtMaterialTenderService; diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTenderRecordController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTenderRecordController.java index 0aec51643..4e64ff33e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTenderRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialTenderRecordController.java @@ -48,7 +48,7 @@ import com.alibaba.fastjson.JSONObject; @RestController @RequestMapping("/xmgl/gt/gtMaterialTenderRecord") @Slf4j -@Api(tags = "GtMaterialTenderRecordController相关Api") +@Api(tags = "GtMaterial招标-投标记录") public class GtMaterialTenderRecordController { @Autowired private IGtMaterialTenderRecordService gtMaterialTenderRecordService; diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialVendorController.java b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialVendorController.java index 8a5a22e79..9c3d215ba 100644 --- a/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialVendorController.java +++ b/src/main/java/com/zhgd/xmgl/modules/gt/controller/GtMaterialVendorController.java @@ -48,7 +48,7 @@ import com.alibaba.fastjson.JSONObject; @RestController @RequestMapping("/xmgl/gt/gtMaterialVendor") @Slf4j -@Api(tags = "GtMaterialVendorController相关Api") +@Api(tags = "GtMaterial供应商") public class GtMaterialVendorController { @Autowired private IGtMaterialVendorService gtMaterialVendorService; diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceCallbackController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceCallbackController.java index 3ef22fe85..8bc00944e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceCallbackController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceCallbackController.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.worker.controller; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; +import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.worker.service.IWorkerAttendanceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -131,10 +132,8 @@ public class UfaceCallbackController { @ApiOperation(value = " 保存考勤数据", notes = "保存考勤数据", httpMethod="POST") @PostMapping(value = "/saveAttendance") - public String saveAttendance(@RequestBody Map map) { - workerAttendanceService.saveAttendance(map); - String result = "{\"result\":1,\"success\":true}"; - return result; + public Result saveAttendance(@RequestBody Map map) { + return workerAttendanceService.saveAttendance(map); } @ApiOperation(value = " 海康考勤回调", notes = "海康考勤回调", httpMethod="POST") diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java index 0cbaeef69..b81c84145 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.worker.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.worker.entity.WorkerAttendance; import com.baomidou.mybatisplus.extension.service.IService; @@ -57,7 +58,7 @@ public interface IWorkerAttendanceService extends IService { List selectWorkNewAttendanceList(Map map); - void saveAttendance(Map map); + Result saveAttendance(Map map); Map saveExternalPassRecord(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java index 23671b3c0..89f9ed71b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.worker.service.impl; +import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.io.FileUtil; import cn.xuyanwu.spring.file.storage.FileInfo; import com.alibaba.fastjson.JSONObject; @@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.async.AsyncSendAttendance; import com.zhgd.xmgl.modules.basicdata.service.ICompanyService; @@ -718,7 +720,7 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl map) { + public Result saveAttendance(Map map) { try { String idCard = MapUtils.getString(map, "idCard"); Integer type = MapUtils.getInteger(map, "passType"); @@ -758,8 +760,10 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl