From 3ce55c6f515c5eee6fbf76ea61c50bc8e395ad3c Mon Sep 17 00:00:00 2001 From: guo Date: Fri, 8 Sep 2023 15:16:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhgd/xmgl/async/AsyncAttendance.java | 4 +- .../enterprise/EntAppIndexController.java | 4 +- .../EntWorkerAttendanceController.java | 4 +- .../enterprise/EntWorkerInfoController.java | 4 +- .../government/GovAppIndexController.java | 4 +- .../government/GovWorkerInfoController.java | 4 +- .../government/GovWorkerStatController.java | 6 +- .../project/AppIndexController.java | 4 +- .../controller/EnterpriseController.java | 4 +- .../service/impl/EnterpriseServiceImpl.java | 11 +++ .../WorkerAttendanceController.java | 10 +-- .../controller/WorkerInfoController.java | 82 ++----------------- .../worker}/entity/WorkerAttendance.java | 2 +- .../entity/WorkerInfo.java | 9 +- .../mapper/WorkerAttendanceMapper.java | 4 +- .../mapper/WorkerInfoMapper.java | 4 +- .../mapper/xml/WorkerAttendanceMapper.xml | 4 +- .../mapper/xml/WorkerInfoMapper.xml | 8 +- .../service/IWorkerAttendanceService.java | 4 +- .../service/IWorkerInfoService.java | 4 +- .../impl/WorkerAttendanceServiceImpl.java | 12 +-- .../service/impl/WorkerInfoServiceImpl.java | 14 +++- .../wisdom/dto/WorkerAttendanceDto.java | 2 +- .../wisdom/mapper/AttendanceDevMapper.java | 2 +- .../java/com/zhgd/xmgl/task/WorkerTask.java | 8 +- 25 files changed, 86 insertions(+), 132 deletions(-) rename src/main/java/com/zhgd/xmgl/modules/{basicdata/controller/project => city/worker/controller}/WorkerAttendanceController.java (91%) rename src/main/java/com/zhgd/xmgl/modules/city/{basicdata => worker}/controller/WorkerInfoController.java (69%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/worker}/entity/WorkerAttendance.java (98%) rename src/main/java/com/zhgd/xmgl/modules/city/{basicdata => worker}/entity/WorkerInfo.java (97%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/worker}/mapper/WorkerAttendanceMapper.java (85%) rename src/main/java/com/zhgd/xmgl/modules/city/{basicdata => worker}/mapper/WorkerInfoMapper.java (93%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/worker}/mapper/xml/WorkerAttendanceMapper.xml (89%) rename src/main/java/com/zhgd/xmgl/modules/city/{basicdata => worker}/mapper/xml/WorkerInfoMapper.xml (96%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/worker}/service/IWorkerAttendanceService.java (83%) rename src/main/java/com/zhgd/xmgl/modules/city/{basicdata => worker}/service/IWorkerInfoService.java (91%) rename src/main/java/com/zhgd/xmgl/modules/{wisdom => city/worker}/service/impl/WorkerAttendanceServiceImpl.java (83%) rename src/main/java/com/zhgd/xmgl/modules/city/{basicdata => worker}/service/impl/WorkerInfoServiceImpl.java (96%) diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncAttendance.java b/src/main/java/com/zhgd/xmgl/async/AsyncAttendance.java index 157db7a..5635447 100644 --- a/src/main/java/com/zhgd/xmgl/async/AsyncAttendance.java +++ b/src/main/java/com/zhgd/xmgl/async/AsyncAttendance.java @@ -8,9 +8,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zhgd.xmgl.modules.wisdom.entity.AttendanceDev; import com.zhgd.xmgl.modules.wisdom.entity.AttendanceDevSync; import com.zhgd.xmgl.modules.basicdata.entity.SystemDictData; -import com.zhgd.xmgl.modules.city.basicdata.entity.WorkerInfo; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.wisdom.mapper.AttendanceDevMapper; -import com.zhgd.xmgl.modules.city.basicdata.mapper.WorkerInfoMapper; +import com.zhgd.xmgl.modules.city.worker.mapper.WorkerInfoMapper; import com.zhgd.xmgl.modules.wisdom.service.IAttendanceDevSyncService; import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; import com.zhgd.xmgl.util.HttpUtil; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAppIndexController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAppIndexController.java index 2fba6bf..b4fae2c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAppIndexController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAppIndexController.java @@ -7,11 +7,11 @@ import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDevAlarmDto; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDeviceDto; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexTopStatDto; import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; -import com.zhgd.xmgl.modules.city.basicdata.entity.WorkerInfo; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.wisdom.service.ICompanyService; import com.zhgd.xmgl.modules.city.monitor.service.IMonitorDevService; import com.zhgd.xmgl.modules.city.monitor.service.IMonitorQuestionService; -import com.zhgd.xmgl.modules.city.basicdata.service.IWorkerInfoService; +import com.zhgd.xmgl.modules.city.worker.service.IWorkerInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntWorkerAttendanceController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntWorkerAttendanceController.java index bc76f43..4bcef66 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntWorkerAttendanceController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntWorkerAttendanceController.java @@ -7,8 +7,8 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.wisdom.dto.WorkerAttendanceDto; import com.zhgd.xmgl.modules.wisdom.entity.AttendanceStatistics; -import com.zhgd.xmgl.modules.wisdom.entity.WorkerAttendance; -import com.zhgd.xmgl.modules.wisdom.service.IWorkerAttendanceService; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerAttendance; +import com.zhgd.xmgl.modules.city.worker.service.IWorkerAttendanceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntWorkerInfoController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntWorkerInfoController.java index c06f322..7bc97ad 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntWorkerInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntWorkerInfoController.java @@ -8,9 +8,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.wisdom.dto.WorkerInfoDto; -import com.zhgd.xmgl.modules.city.basicdata.entity.WorkerInfo; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; -import com.zhgd.xmgl.modules.city.basicdata.service.IWorkerInfoService; +import com.zhgd.xmgl.modules.city.worker.service.IWorkerInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAppIndexController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAppIndexController.java index 7c0c76a..e0206b6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAppIndexController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovAppIndexController.java @@ -9,10 +9,10 @@ import com.zhgd.xmgl.modules.basicdata.dto.AppIndexTopStatDto; import com.zhgd.xmgl.modules.city.enterprise.entity.Enterprise; import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.city.enterprise.service.IEnterpriseService; -import com.zhgd.xmgl.modules.city.basicdata.entity.WorkerInfo; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.city.monitor.service.IMonitorDevService; import com.zhgd.xmgl.modules.city.monitor.service.IMonitorQuestionService; -import com.zhgd.xmgl.modules.city.basicdata.service.IWorkerInfoService; +import com.zhgd.xmgl.modules.city.worker.service.IWorkerInfoService; import com.zhgd.xmgl.security.SecurityUser; import com.zhgd.xmgl.security.SecurityUtil; import io.swagger.annotations.Api; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerInfoController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerInfoController.java index b37145a..c8ebf31 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerInfoController.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.wisdom.dto.WorkerInfoDto; -import com.zhgd.xmgl.modules.city.basicdata.entity.WorkerInfo; -import com.zhgd.xmgl.modules.city.basicdata.service.IWorkerInfoService; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo; +import com.zhgd.xmgl.modules.city.worker.service.IWorkerInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerStatController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerStatController.java index 6354cee..33b7901 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerStatController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovWorkerStatController.java @@ -12,10 +12,10 @@ import com.zhgd.xmgl.modules.basicdata.statistics.EngineeringStat; import com.zhgd.xmgl.modules.wisdom.dto.AttendanceRecordDto; import com.zhgd.xmgl.modules.wisdom.dto.WorkerAttendanceStatDto; import com.zhgd.xmgl.modules.wisdom.dto.WorkerInfoDto; -import com.zhgd.xmgl.modules.city.basicdata.entity.WorkerInfo; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.wisdom.service.IAttendanceRecordService; -import com.zhgd.xmgl.modules.wisdom.service.IWorkerAttendanceService; -import com.zhgd.xmgl.modules.city.basicdata.service.IWorkerInfoService; +import com.zhgd.xmgl.modules.city.worker.service.IWorkerAttendanceService; +import com.zhgd.xmgl.modules.city.worker.service.IWorkerInfoService; import com.zhgd.xmgl.modules.wisdom.statistics.WorkerInfoStat; import com.zhgd.xmgl.modules.wisdom.vo.AttendanceRecordVo; import io.swagger.annotations.Api; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AppIndexController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AppIndexController.java index a88c403..f48c6c4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AppIndexController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AppIndexController.java @@ -7,11 +7,11 @@ import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDevAlarmDto; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDeviceDto; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexTopStatDto; import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; -import com.zhgd.xmgl.modules.city.basicdata.entity.WorkerInfo; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.wisdom.service.ICompanyService; import com.zhgd.xmgl.modules.city.monitor.service.IMonitorDevService; import com.zhgd.xmgl.modules.city.monitor.service.IMonitorQuestionService; -import com.zhgd.xmgl.modules.city.basicdata.service.IWorkerInfoService; +import com.zhgd.xmgl.modules.city.worker.service.IWorkerInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/zhgd/xmgl/modules/city/enterprise/controller/EnterpriseController.java b/src/main/java/com/zhgd/xmgl/modules/city/enterprise/controller/EnterpriseController.java index 1bf3946..ce55cb6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/enterprise/controller/EnterpriseController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/enterprise/controller/EnterpriseController.java @@ -3,7 +3,6 @@ package com.zhgd.xmgl.modules.city.enterprise.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.modules.city.enterprise.entity.Enterprise; import com.zhgd.xmgl.modules.city.enterprise.service.IEnterpriseMainService; import com.zhgd.xmgl.modules.city.enterprise.service.IEnterpriseService; @@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; -import java.util.List; import java.util.Map; @@ -43,6 +41,7 @@ public class EnterpriseController { /** * 政务分页列表查询企业 + * * @return */ @OperLog(operModul = "企业管理", operType = "分页查询", operDesc = "政务分页列表查询企业") @@ -50,6 +49,7 @@ public class EnterpriseController { @ApiImplicitParams({ @ApiImplicitParam(name = "creditCode", value = "社会信用代码", paramType = "body", dataType = "String"), @ApiImplicitParam(name = "enterpriseName", value = "企业名称", paramType = "body", dataType = "String"), + @ApiImplicitParam(name = "engineeringSn", value = "工程sn", paramType = "body", dataType = "String"), @ApiImplicitParam(name = "mainType", value = "企业主体类型", paramType = "body", dataType = "Integer"), @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") diff --git a/src/main/java/com/zhgd/xmgl/modules/city/enterprise/service/impl/EnterpriseServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/enterprise/service/impl/EnterpriseServiceImpl.java index c78bd30..5848e9c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/enterprise/service/impl/EnterpriseServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/enterprise/service/impl/EnterpriseServiceImpl.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.city.enterprise.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.util.PageUtil; +import com.zhgd.xmgl.modules.basicdata.entity.EngineeringMain; import com.zhgd.xmgl.modules.basicdata.entity.EnterpriseMainLicense; import com.zhgd.xmgl.modules.basicdata.mapper.EngineeringMainMapper; import com.zhgd.xmgl.modules.basicdata.service.IEnterpriseMainLicenseService; @@ -70,6 +72,7 @@ public class EnterpriseServiceImpl extends ServiceImpl page = PageUtil.getPage(map); QueryWrapper wrapper = Wrappers.query(); if (StringUtils.isNotBlank(creditCode)) { @@ -84,6 +87,7 @@ public class EnterpriseServiceImpl extends ServiceImpl() .eq(Government::getGovernmentSn, sn)); @@ -91,6 +95,13 @@ public class EnterpriseServiceImpl extends ServiceImpl engineeringMains = engineeringMainMapper.selectList(new LambdaQueryWrapper().eq(EngineeringMain::getEngineeringSn, engineeringSn)); + List snList = engineeringMains.stream().map(EngineeringMain::getEnterpriseSn).collect(Collectors.toList()); + wrapper.in("a.enterprise_sn", snList); + } + wrapper.orderByAsc("a.state").orderByDesc("a.create_time"); Page rtPage = baseMapper.pageList(page, wrapper); List records = rtPage.getRecords(); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/WorkerAttendanceController.java b/src/main/java/com/zhgd/xmgl/modules/city/worker/controller/WorkerAttendanceController.java similarity index 91% rename from src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/WorkerAttendanceController.java rename to src/main/java/com/zhgd/xmgl/modules/city/worker/controller/WorkerAttendanceController.java index 507a377..fa03592 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/WorkerAttendanceController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/worker/controller/WorkerAttendanceController.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.basicdata.controller.project; +package com.zhgd.xmgl.modules.city.worker.controller; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; @@ -7,10 +7,10 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.wisdom.dto.WorkerAttendanceDto; import com.zhgd.xmgl.modules.wisdom.entity.AttendanceStatistics; -import com.zhgd.xmgl.modules.wisdom.entity.WorkerAttendance; -import com.zhgd.xmgl.modules.city.basicdata.entity.WorkerInfo; -import com.zhgd.xmgl.modules.wisdom.service.IWorkerAttendanceService; -import com.zhgd.xmgl.modules.city.basicdata.service.IWorkerInfoService; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerAttendance; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo; +import com.zhgd.xmgl.modules.city.worker.service.IWorkerAttendanceService; +import com.zhgd.xmgl.modules.city.worker.service.IWorkerInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/city/basicdata/controller/WorkerInfoController.java b/src/main/java/com/zhgd/xmgl/modules/city/worker/controller/WorkerInfoController.java similarity index 69% rename from src/main/java/com/zhgd/xmgl/modules/city/basicdata/controller/WorkerInfoController.java rename to src/main/java/com/zhgd/xmgl/modules/city/worker/controller/WorkerInfoController.java index c2cbd4c..7a022ff 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/basicdata/controller/WorkerInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/worker/controller/WorkerInfoController.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.city.basicdata.controller; +package com.zhgd.xmgl.modules.city.worker.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -10,11 +10,9 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.base.entity.vo.TrendVo; -import com.zhgd.xmgl.modules.city.basicdata.entity.WorkerInfo; -import com.zhgd.xmgl.modules.city.basicdata.service.IWorkerInfoService; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo; +import com.zhgd.xmgl.modules.city.worker.service.IWorkerInfoService; import com.zhgd.xmgl.modules.wisdom.dto.WorkerInfoDto; -import com.zhgd.xmgl.security.SecurityUser; -import com.zhgd.xmgl.security.SecurityUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -60,7 +58,9 @@ public class WorkerInfoController { @ApiImplicitParam(name = "idCard", value = "身份证号", paramType = "body", dataType = "String"), @ApiImplicitParam(name = "inServiceType", value = "人员状态 1在场 2离场", paramType = "body", dataType = "Integer"), @ApiImplicitParam(name = "current", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), - @ApiImplicitParam(name = "size", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") + @ApiImplicitParam(name = "size", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer"), + @ApiImplicitParam(name = "companyType", value = "单位类型", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "companyName", value = "参建单位名称", paramType = "body", required = false, dataType = "String") }) @PostMapping(value = "/page") public Result> queryPageList(@ApiIgnore Page page, @ApiIgnore @RequestBody WorkerInfo workerInfo) { @@ -86,49 +86,6 @@ public class WorkerInfoController { return Result.success(list); } - /** - * 添加 - * - * @param workerInfo - * @return - */ - @OperLog(operModul = "人员管理", operType = "新增", operDesc = "添加人员信息") - @ApiOperation(value = " 添加人员信息", notes = "添加人员信息", httpMethod = "POST") - @PostMapping(value = "/add") - public Result add(@RequestBody WorkerInfo workerInfo) { - workerInfoService.saveInfo(workerInfo); - return Result.success("添加成功！"); - } - - /** - * 编辑 - * - * @param workerInfo - * @return - */ - @OperLog(operModul = "人员管理", operType = "修改", operDesc = "编辑人员信息") - @ApiOperation(value = "编辑人员信息", notes = "编辑人员信息", httpMethod = "POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody WorkerInfo workerInfo) { - Result result = new Result(); - WorkerInfo workerInfoEntity = workerInfoService.getById(workerInfo.getId()); - if (workerInfoEntity == null) { - result.error500("未找到对应实体"); - } else { - SecurityUser user = SecurityUtil.getUser(); - workerInfo.setProjectSn(user.getSn()); - workerInfo.setAdmitGuid(workerInfoEntity.getAdmitGuid()); - workerInfo.setFaceGuid(workerInfoEntity.getFaceGuid()); - boolean ok = workerInfoService.updateInfo(workerInfo); - if (ok) { - result.success("修改成功!"); - } - result.success("操作失败!"); - } - - return result; - } - /** * 通过id查询 * @@ -150,33 +107,6 @@ public class WorkerInfoController { return result; } - /** - * 批量复职 - * - * @return - */ - @OperLog(operModul = "人员管理", operType = "修改", operDesc = "批量复职") - @ApiOperation(value = "批量复职", notes = "批量复职", httpMethod = "POST") - @ApiImplicitParam(name = "ids", value = "人员ID", paramType = "body", required = true, dataType = "List") - @PostMapping(value = "/entry") - public Result entry(@RequestBody List ids) { - return Result.success(workerInfoService.updateInServiceType(1, ids)); - } - - /** - * 批量离场 - * - * @return - */ - @OperLog(operModul = "人员管理", operType = "修改", operDesc = "批量离场") - @ApiOperation(value = "批量离场", notes = "批量离场", httpMethod = "POST") - @ApiImplicitParam(name = "ids", value = "人员ID", paramType = "body", required = true, dataType = "List") - @PostMapping(value = "/exit") - public Result exit(@RequestBody List ids) { - return Result.success(workerInfoService.updateInServiceType(2, ids)); - } - - /** * 考勤统计 * diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/WorkerAttendance.java b/src/main/java/com/zhgd/xmgl/modules/city/worker/entity/WorkerAttendance.java similarity index 98% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/entity/WorkerAttendance.java rename to src/main/java/com/zhgd/xmgl/modules/city/worker/entity/WorkerAttendance.java index 3f43c4c..65b2f25 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/WorkerAttendance.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/worker/entity/WorkerAttendance.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.wisdom.entity; +package com.zhgd.xmgl.modules.city.worker.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/zhgd/xmgl/modules/city/basicdata/entity/WorkerInfo.java b/src/main/java/com/zhgd/xmgl/modules/city/worker/entity/WorkerInfo.java similarity index 97% rename from src/main/java/com/zhgd/xmgl/modules/city/basicdata/entity/WorkerInfo.java rename to src/main/java/com/zhgd/xmgl/modules/city/worker/entity/WorkerInfo.java index 17e786b..8327acf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/basicdata/entity/WorkerInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/worker/entity/WorkerInfo.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.city.basicdata.entity; +package com.zhgd.xmgl.modules.city.worker.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -318,4 +318,11 @@ public class WorkerInfo implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "学历") private String educationLevelName; + @TableField(exist = false) + @ApiModelProperty(value = "参建单位") + private String companyName; + @TableField(exist = false) + @ApiModelProperty(value = "单位类型") + private String companyType; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/WorkerAttendanceMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/worker/mapper/WorkerAttendanceMapper.java similarity index 85% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/WorkerAttendanceMapper.java rename to src/main/java/com/zhgd/xmgl/modules/city/worker/mapper/WorkerAttendanceMapper.java index 1714d8e..d094dac 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/WorkerAttendanceMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/worker/mapper/WorkerAttendanceMapper.java @@ -1,10 +1,10 @@ -package com.zhgd.xmgl.modules.wisdom.mapper; +package com.zhgd.xmgl.modules.city.worker.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.zhgd.xmgl.modules.wisdom.dto.WorkerAttendanceDto; -import com.zhgd.xmgl.modules.wisdom.entity.WorkerAttendance; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerAttendance; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/zhgd/xmgl/modules/city/basicdata/mapper/WorkerInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/worker/mapper/WorkerInfoMapper.java similarity index 93% rename from src/main/java/com/zhgd/xmgl/modules/city/basicdata/mapper/WorkerInfoMapper.java rename to src/main/java/com/zhgd/xmgl/modules/city/worker/mapper/WorkerInfoMapper.java index d290ea2..8c3a33c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/basicdata/mapper/WorkerInfoMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/worker/mapper/WorkerInfoMapper.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.city.basicdata.mapper; +package com.zhgd.xmgl.modules.city.worker.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -8,7 +8,7 @@ import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.wisdom.dto.WorkerInfoDto; -import com.zhgd.xmgl.modules.city.basicdata.entity.WorkerInfo; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.wisdom.statistics.WorkerAttributeStat; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/WorkerAttendanceMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/worker/mapper/xml/WorkerAttendanceMapper.xml similarity index 89% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/WorkerAttendanceMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/city/worker/mapper/xml/WorkerAttendanceMapper.xml index 85878f5..da7276e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/WorkerAttendanceMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/worker/mapper/xml/WorkerAttendanceMapper.xml @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/city/basicdata/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/worker/mapper/xml/WorkerInfoMapper.xml similarity index 96% rename from src/main/java/com/zhgd/xmgl/modules/city/basicdata/mapper/xml/WorkerInfoMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/city/worker/mapper/xml/WorkerInfoMapper.xml index 70ae1fc..a62f6e8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/basicdata/mapper/xml/WorkerInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/worker/mapper/xml/WorkerInfoMapper.xml @@ -1,6 +1,6 @@ - + - + - SELECT * FROM worker_info ${ew.customSqlSegment} @@ -74,7 +74,7 @@ ORDER BY workerNum DESC - SELECT birthday, in_service_type FROM worker_info diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/IWorkerAttendanceService.java b/src/main/java/com/zhgd/xmgl/modules/city/worker/service/IWorkerAttendanceService.java similarity index 83% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/IWorkerAttendanceService.java rename to src/main/java/com/zhgd/xmgl/modules/city/worker/service/IWorkerAttendanceService.java index 1da86b3..ff0e68b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/IWorkerAttendanceService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/worker/service/IWorkerAttendanceService.java @@ -1,10 +1,10 @@ -package com.zhgd.xmgl.modules.wisdom.service; +package com.zhgd.xmgl.modules.city.worker.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.wisdom.dto.WorkerAttendanceDto; import com.zhgd.xmgl.modules.wisdom.dto.WorkerAttendanceStatDto; -import com.zhgd.xmgl.modules.wisdom.entity.WorkerAttendance; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerAttendance; import java.util.List; diff --git a/src/main/java/com/zhgd/xmgl/modules/city/basicdata/service/IWorkerInfoService.java b/src/main/java/com/zhgd/xmgl/modules/city/worker/service/IWorkerInfoService.java similarity index 91% rename from src/main/java/com/zhgd/xmgl/modules/city/basicdata/service/IWorkerInfoService.java rename to src/main/java/com/zhgd/xmgl/modules/city/worker/service/IWorkerInfoService.java index 20b027f..34bd3e9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/basicdata/service/IWorkerInfoService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/worker/service/IWorkerInfoService.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.city.basicdata.service; +package com.zhgd.xmgl.modules.city.worker.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.wisdom.dto.WorkerInfoDto; -import com.zhgd.xmgl.modules.city.basicdata.entity.WorkerInfo; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.wisdom.statistics.WorkerInfoStat; import java.util.List; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/WorkerAttendanceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/worker/service/impl/WorkerAttendanceServiceImpl.java similarity index 83% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/WorkerAttendanceServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/city/worker/service/impl/WorkerAttendanceServiceImpl.java index 1bfe910..cb0c7c6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/WorkerAttendanceServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/worker/service/impl/WorkerAttendanceServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.wisdom.service.impl; +package com.zhgd.xmgl.modules.city.worker.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; @@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.xmgl.modules.wisdom.dto.WorkerAttendanceDto; import com.zhgd.xmgl.modules.wisdom.dto.WorkerAttendanceStatDto; -import com.zhgd.xmgl.modules.wisdom.entity.WorkerAttendance; -import com.zhgd.xmgl.modules.city.basicdata.entity.WorkerInfo; -import com.zhgd.xmgl.modules.wisdom.mapper.WorkerAttendanceMapper; -import com.zhgd.xmgl.modules.city.basicdata.mapper.WorkerInfoMapper; -import com.zhgd.xmgl.modules.wisdom.service.IWorkerAttendanceService; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerAttendance; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo; +import com.zhgd.xmgl.modules.city.worker.mapper.WorkerAttendanceMapper; +import com.zhgd.xmgl.modules.city.worker.mapper.WorkerInfoMapper; +import com.zhgd.xmgl.modules.city.worker.service.IWorkerAttendanceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zhgd/xmgl/modules/city/basicdata/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/worker/service/impl/WorkerInfoServiceImpl.java similarity index 96% rename from src/main/java/com/zhgd/xmgl/modules/city/basicdata/service/impl/WorkerInfoServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/city/worker/service/impl/WorkerInfoServiceImpl.java index b064afb..2e04e7b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/basicdata/service/impl/WorkerInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/worker/service/impl/WorkerInfoServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.city.basicdata.service.impl; +package com.zhgd.xmgl.modules.city.worker.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; @@ -16,9 +16,9 @@ import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; import com.zhgd.xmgl.modules.basicdata.entity.SystemDictData; import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; -import com.zhgd.xmgl.modules.city.basicdata.entity.WorkerInfo; -import com.zhgd.xmgl.modules.city.basicdata.mapper.WorkerInfoMapper; -import com.zhgd.xmgl.modules.city.basicdata.service.IWorkerInfoService; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo; +import com.zhgd.xmgl.modules.city.worker.mapper.WorkerInfoMapper; +import com.zhgd.xmgl.modules.city.worker.service.IWorkerInfoService; import com.zhgd.xmgl.modules.wisdom.dto.WorkerInfoDto; import com.zhgd.xmgl.modules.wisdom.entity.AttendanceStatistics; import com.zhgd.xmgl.modules.wisdom.entity.WorkerType; @@ -85,6 +85,12 @@ public class WorkerInfoServiceImpl extends ServiceImpl pageList = baseMapper.getDetailPageList(page, wrapper); for (WorkerInfoDto workerInfoDto : pageList.getRecords()) { workerInfoDto.setAge(DateUtil.ageOfNow(workerInfoDto.getBirthday())); diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/WorkerAttendanceDto.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/WorkerAttendanceDto.java index a0f0cd9..831951f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/WorkerAttendanceDto.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/dto/WorkerAttendanceDto.java @@ -1,6 +1,6 @@ package com.zhgd.xmgl.modules.wisdom.dto; -import com.zhgd.xmgl.modules.wisdom.entity.WorkerAttendance; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerAttendance; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/AttendanceDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/AttendanceDevMapper.java index 17af514..a23ba09 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/AttendanceDevMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/AttendanceDevMapper.java @@ -3,7 +3,7 @@ package com.zhgd.xmgl.modules.wisdom.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zhgd.annotation.DataScope; import com.zhgd.xmgl.modules.wisdom.entity.AttendanceDev; -import com.zhgd.xmgl.modules.city.basicdata.entity.WorkerInfo; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/zhgd/xmgl/task/WorkerTask.java b/src/main/java/com/zhgd/xmgl/task/WorkerTask.java index 51da33f..72f09fb 100644 --- a/src/main/java/com/zhgd/xmgl/task/WorkerTask.java +++ b/src/main/java/com/zhgd/xmgl/task/WorkerTask.java @@ -10,12 +10,12 @@ import com.zhgd.xmgl.modules.city.government.service.IGovernmentService; import com.zhgd.xmgl.modules.city.project.service.IProjectService; import com.zhgd.xmgl.modules.wisdom.entity.AttendanceRecord; import com.zhgd.xmgl.modules.wisdom.entity.AttendanceStatistics; -import com.zhgd.xmgl.modules.wisdom.entity.WorkerAttendance; -import com.zhgd.xmgl.modules.city.basicdata.entity.WorkerInfo; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerAttendance; +import com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.wisdom.service.IAttendanceRecordService; import com.zhgd.xmgl.modules.wisdom.service.IAttendanceStatisticsService; -import com.zhgd.xmgl.modules.wisdom.service.IWorkerAttendanceService; -import com.zhgd.xmgl.modules.city.basicdata.service.IWorkerInfoService; +import com.zhgd.xmgl.modules.city.worker.service.IWorkerAttendanceService; +import com.zhgd.xmgl.modules.city.worker.service.IWorkerInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled;