考勤

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;

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;

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.city.worker.entity.WorkerAttendance;
-import com.zhgd.xmgl.modules.wisdom.service.IWorkerAttendanceService;
+import com.zhgd.xmgl.modules.city.worker.service.IWorkerAttendanceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

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;

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;

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.worker.entity.WorkerInfo;
-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;

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.worker.service.IWorkerAttendanceService;
-import com.zhgd.xmgl.modules.city.basicdata.service.IWorkerInfoService;
+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;

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;

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")

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<EnterpriseMapper, Enterpr
         String enterpriseName = MapUtils.getString(map, "enterpriseName");
         String creditCode = MapUtils.getString(map, "creditCode");
         Integer state = MapUtils.getInteger(map, "state");
+        String engineeringSn = MapUtils.getString(map, "engineeringSn");
         Page<Enterprise> page = PageUtil.getPage(map);
         QueryWrapper<Enterprise> wrapper = Wrappers.<Enterprise>query();
         if (StringUtils.isNotBlank(creditCode)) {
@@ -84,6 +87,7 @@ public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterpr
         if (state != null) {
             wrapper.eq("a.state", state);
         }
+
         String sn = SecurityUtil.getUser().getSn();
         Government one = governmentMapper.selectOne(new LambdaQueryWrapper<Government>()
                 .eq(Government::getGovernmentSn, sn));
@@ -91,6 +95,13 @@ public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterpr
                 .eq(Government::getParentId, one.getGovernmentId()));
         governments.add(one);
         wrapper.in("a.government_sn", governments.stream().map(Government::getGovernmentSn).collect(Collectors.toList()));
+
+        if (StrUtil.isNotBlank(engineeringSn)) {
+            List<EngineeringMain> engineeringMains = engineeringMainMapper.selectList(new LambdaQueryWrapper<EngineeringMain>().eq(EngineeringMain::getEngineeringSn, engineeringSn));
+            List<String> snList = engineeringMains.stream().map(EngineeringMain::getEnterpriseSn).collect(Collectors.toList());
+            wrapper.in("a.enterprise_sn", snList);
+        }
+
         wrapper.orderByAsc("a.state").orderByDesc("a.create_time");
         Page<Enterprise> rtPage = baseMapper.pageList(page, wrapper);
         List<Enterprise> records = rtPage.getRecords();

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.worker.entity.WorkerAttendance;
-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.IWorkerAttendanceService;
+import com.zhgd.xmgl.modules.city.worker.service.IWorkerAttendanceService;
-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;

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.worker.entity.WorkerInfo;
-import com.zhgd.xmgl.modules.city.basicdata.service.IWorkerInfoService;
+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<IPage<WorkerInfoDto>> 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<Object> 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<WorkerInfo> edit(@RequestBody WorkerInfo workerInfo) {
-        Result<WorkerInfo> result = new Result<WorkerInfo>();
-        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<Object> entry(@RequestBody List<String> 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<Object> exit(@RequestBody List<String> ids) {
-        return Result.success(workerInfoService.updateInServiceType(2, ids));
-    }
-
-
     /**
      * 考勤统计
      *

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;

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;
+
 }

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;
 

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;

src/main/java/com/zhgd/xmgl/modules/city/worker/mapper/xml/WorkerAttendanceMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhgd.xmgl.modules.wisdom.mapper.WorkerAttendanceMapper">
+<mapper namespace="com.zhgd.xmgl.modules.city.worker.mapper.WorkerAttendanceMapper">
 
     <select id="getWorkerAttendanceNum" resultType="java.lang.Integer">
         SELECT COUNT(1) FROM worker_attendance w RIGHT JOIN (SELECT id FROM worker_attendance WHERE create_time > #{dateTime} GROUP BY worker_id) a ON w.id = a.id

src/main/java/com/zhgd/xmgl/modules/city/worker/mapper/xml/WorkerInfoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhgd.xmgl.modules.city.basicdata.mapper.WorkerInfoMapper">
+<mapper namespace="com.zhgd.xmgl.modules.city.worker.mapper.WorkerInfoMapper">
     <select id="getDetailPageList" resultType="com.zhgd.xmgl.modules.wisdom.dto.WorkerInfoDto">
         SELECT w.*, c.company_name, c.type as companyType, t.team_name, wt.type_name as workerTypeName
         FROM worker_info w
@@ -35,7 +35,7 @@
             ${ew.customSqlSegment}
     </select>
 
-    <!--    <select id="statisticsList" resultType="com.zhgd.xmgl.modules.city.basicdata.entity.WorkerInfo">-->
+    <!--    <select id="statisticsList" resultType="com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo">-->
     <!--        SELECT in_service_type, worker_type, address, nation FROM worker_info-->
     <!--    </select>-->
     <select id="statisticsMap" resultType="java.util.Map">
@@ -48,7 +48,7 @@
         FROM worker_info
     </select>
 
-    <select id="getPageList" resultType="com.zhgd.xmgl.modules.city.basicdata.entity.WorkerInfo">
+    <select id="getPageList" resultType="com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo">
         SELECT *
         FROM worker_info ${ew.customSqlSegment}
     </select>
@@ -74,7 +74,7 @@
         ORDER BY workerNum DESC
     </select>
 
-    <select id="statAge" resultType="com.zhgd.xmgl.modules.city.basicdata.entity.WorkerInfo">
+    <select id="statAge" resultType="com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo">
         SELECT birthday, in_service_type
         FROM worker_info
     </select>

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;
 

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;

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.worker.entity.WorkerAttendance;
-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.WorkerAttendanceMapper;
+import com.zhgd.xmgl.modules.city.worker.mapper.WorkerAttendanceMapper;
-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.IWorkerAttendanceService;
+import com.zhgd.xmgl.modules.city.worker.service.IWorkerAttendanceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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.worker.entity.WorkerInfo;
-import com.zhgd.xmgl.modules.city.basicdata.mapper.WorkerInfoMapper;
+import com.zhgd.xmgl.modules.city.worker.mapper.WorkerInfoMapper;
-import com.zhgd.xmgl.modules.city.basicdata.service.IWorkerInfoService;
+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<WorkerInfoMapper, WorkerI
         if (StringUtils.isNotBlank(workerInfo.getProjectSn())) {
             wrapper.eq("w.project_sn", workerInfo.getProjectSn()).eq("w.engineering_sn", StrUtil.EMPTY);
         }
+        if (StringUtils.isNotBlank(workerInfo.getCompanyName())) {
+            wrapper.like("c.company_name", workerInfo.getCompanyName());
+        }
+        if (workerInfo.getCompanyType() != null) {
+            wrapper.like("c.type", workerInfo.getCompanyType());
+        }
         Page<WorkerInfoDto> pageList = baseMapper.getDetailPageList(page, wrapper);
         for (WorkerInfoDto workerInfoDto : pageList.getRecords()) {
             workerInfoDto.setAge(DateUtil.ageOfNow(workerInfoDto.getBirthday()));

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;

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;

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.worker.entity.WorkerAttendance;
-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.IAttendanceStatisticsService;
-import com.zhgd.xmgl.modules.wisdom.service.IWorkerAttendanceService;
+import com.zhgd.xmgl.modules.city.worker.service.IWorkerAttendanceService;
-import com.zhgd.xmgl.modules.city.basicdata.service.IWorkerInfoService;
+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;