From 2970211be1337c5e93ff71037acb284dd5c3f9ac Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Tue, 18 Jun 2024 11:49:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../worker/service/impl/WorkerInfoAuditRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java index 0fcba4b0d..7a223ade7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java @@ -119,7 +119,7 @@ public class WorkerInfoAuditRecordServiceImpl extends ServiceImpl Date: Tue, 18 Jun 2024 13:52:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E5=A4=B1=E8=B4=A5=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E9=9C=80=E8=A6=81=E5=8A=A0=E4=B8=8A=E5=A7=93=E5=90=8D?= =?UTF-8?q?=E5=92=8C=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XzWorkerInfoAuditRecordController.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java index c84561f20..592f283e5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java @@ -1,12 +1,12 @@ package com.zhgd.xmgl.modules.xz.controller; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.sun.corba.se.pept.transport.ContactInfo; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; @@ -34,8 +34,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.lang.reflect.Array; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @@ -65,6 +67,8 @@ public class XzWorkerInfoAuditRecordController { @Autowired private ISafeEducationQuestionAnswerService safeEducationQuestionAnswerService; + @Resource + private IUfaceDevService ufaceDevService; /** * 分页列表查询 @@ -124,7 +128,6 @@ public class XzWorkerInfoAuditRecordController { return Result.ok(); } - /** * 添加 * @@ -145,12 +148,13 @@ public class XzWorkerInfoAuditRecordController { } /** - * 编辑 + * 编辑 + * * @param workerInfoAuditRecord * @return */ - @OperLog(operModul = "劳务管理",operType = "编辑劳务人员-审核",operDesc = "编辑劳务人员-审核表信息") - @ApiOperation(value = "编辑劳务人员-审核表信息", notes = "编辑劳务人员-审核表信息" , httpMethod="POST") + @OperLog(operModul = "劳务管理", operType = "编辑劳务人员-审核", operDesc = "编辑劳务人员-审核表信息") + @ApiOperation(value = "编辑劳务人员-审核表信息", notes = "编辑劳务人员-审核表信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody WorkerInfoAuditRecord workerInfoAuditRecord) { workerInfoAuditRecordService.editWorkerInfoAuditRecord(workerInfoAuditRecord); @@ -229,9 +233,6 @@ public class XzWorkerInfoAuditRecordController { return result; } - @Resource - private IUfaceDevService ufaceDevService; - @OperLog(operModul = "劳务管理", operType = "劳务人员审核通过", operDesc = "劳务人员审核通过") @ApiOperation(value = "审核通过", notes = "审核通过", httpMethod = "POST") @ApiImplicitParams({ @@ -257,7 +258,7 @@ public class XzWorkerInfoAuditRecordController { List workerIds = new ArrayList<>(); JSONArray ids = paramMap.getJSONArray("id"); JSONArray workerInfo = new JSONArray(); - String [] param = {"workerId", "workerName", "enterpriseName", "teamName", "personType", "idCard", "upUrl", "downUrl", "contract", "insurance", "certificate"}; + String[] param = {"workerId", "workerName", "enterpriseName", "teamName", "personType", "idCard", "upUrl", "downUrl", "contract", "insurance", "certificate"}; for (int i = 0; i < ids.size(); i++) { JSONObject detailObj = new JSONObject(); JSONObject j = ids.getJSONObject(i); @@ -360,8 +361,9 @@ public class XzWorkerInfoAuditRecordController { List collect = systemUserList.stream().map(s -> s.getUserId()).collect(Collectors.toList()); collect.addAll(xzSystemUserToCompanyProjects.stream().map(x -> x.getUserId()).collect(Collectors.toList())); collect.add(Long.valueOf(paramMap.getString("startUser"))); + WorkerInfoAuditRecord wia = workerInfoAuditRecordService.getById(split[0]); for (Long userId : collect) { - noticeService.addUserNotice(userId, "人员同步异常,原因：" + split[1], "人员审批数据同步失败", "1"); + noticeService.addUserNotice(userId, StrUtil.format("人员同步异常,原因：{},姓名：{},身份证号：{}", split[1], wia.getWorkerName(), wia.getIdCard()), "人员审批数据同步失败", "1"); } } } From 4cd7edf07cb21ba8179e4a6cd695bb2b16204790 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Tue, 18 Jun 2024 14:25:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkerInfoController.java | 4 +-- ... WorkerTeamAndDepartmentStatisticsVo.java} | 14 ++++----- .../vo/WorkerTeamDepartmentStatisticsVo.java | 29 +++++++++++++++++++ .../modules/worker/mapper/TeamInfoMapper.java | 2 ++ .../worker/mapper/xml/WorkerInfoMapper.xml | 2 +- .../worker/service/IWorkerInfoService.java | 4 +-- .../service/impl/WorkerInfoServiceImpl.java | 20 ++++++------- 7 files changed, 52 insertions(+), 23 deletions(-) rename src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/{WorkerTeamStatisticsVo.java => WorkerTeamAndDepartmentStatisticsVo.java} (64%) create mode 100644 src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/WorkerTeamDepartmentStatisticsVo.java diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java index df147e5aa..09a5b5bd9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java @@ -522,7 +522,7 @@ public class WorkerInfoController { @ApiImplicitParam(name = "queryEndTime", value = "查询人员结束时间2022-03-01", paramType = "body", required = false, dataType = "String"), }) @PostMapping("/selectWorkerTeamStatistics") - public Result> selectWorkerTeamStatistics(@RequestBody Map map) { + public Result> selectWorkerTeamStatistics(@RequestBody Map map) { return Result.success(workerInfoService.selectWorkerTeamStatistics(map)); } @@ -531,7 +531,7 @@ public class WorkerInfoController { @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), }) @PostMapping("/selectWorkerTeamAndDepartmentStatistics") - public Result> selectWorkerTeamAndDepartmentStatistics(@RequestBody Map map) { + public Result selectWorkerTeamAndDepartmentStatistics(@RequestBody Map map) { return Result.success(workerInfoService.selectWorkerTeamAndDepartmentStatistics(map)); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/WorkerTeamStatisticsVo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/WorkerTeamAndDepartmentStatisticsVo.java similarity index 64% rename from src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/WorkerTeamStatisticsVo.java rename to src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/WorkerTeamAndDepartmentStatisticsVo.java index 1edd64b63..32f5f1a16 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/WorkerTeamStatisticsVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/WorkerTeamAndDepartmentStatisticsVo.java @@ -3,19 +3,17 @@ package com.zhgd.xmgl.modules.worker.entity.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -@Data -public class WorkerTeamStatisticsVo { +import java.util.List; + +@Data +public class WorkerTeamAndDepartmentStatisticsVo { - @ApiModelProperty(value = "班组名称") - private String teamName; - @ApiModelProperty(value = "班组ID") - private String teamId; - private String name; @ApiModelProperty(value = "出勤人数") private Integer attendancePersonTotal; @ApiModelProperty(value = "在场人数") private Integer presencePersonTotal; @ApiModelProperty(value = "在册人数") private Integer totalPerson; - + @ApiModelProperty(value = "部门班组统计") + private List list; } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/WorkerTeamDepartmentStatisticsVo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/WorkerTeamDepartmentStatisticsVo.java new file mode 100644 index 000000000..89d5369ef --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/WorkerTeamDepartmentStatisticsVo.java @@ -0,0 +1,29 @@ +package com.zhgd.xmgl.modules.worker.entity.vo; + +import com.alibaba.fastjson2.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@JsonInclude(JsonInclude.Include.NON_NULL) +public class WorkerTeamDepartmentStatisticsVo { + @ApiModelProperty(value = "班组名称") + private String teamName; + @ApiModelProperty(value = "部门名称") + private String departmentName; + @ApiModelProperty(value = "部门ID") + private String departmentId; + @ApiModelProperty(value = "班组ID") + private String teamId; + @ApiModelProperty(value = "班组或部门名称") + private String name; + @ApiModelProperty(value = "出勤人数") + private Integer attendancePersonTotal; + @ApiModelProperty(value = "在场人数") + private Integer presencePersonTotal; + @ApiModelProperty(value = "在册人数") + private Integer totalPerson; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/TeamInfoMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/TeamInfoMapper.java index 30ee4bf2f..6a4f7099c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/TeamInfoMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/TeamInfoMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.wflow.bean.vo.OrgTreeVo; +import com.zhgd.annotation.DataScope; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.worker.entity.TeamInfo; import com.zhgd.xmgl.modules.worker.entity.vo.GroupVo; @@ -32,6 +33,7 @@ public interface TeamInfoMapper extends BaseMapper { EntityMap selectTeamInfoById(@Param("teamId") Long teamId); + @DataScope(includeTable = "team_info") List selectTeamInfoList(Map map); List> selectEnterpriseTeamList(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml index 5782a8265..85d2ace9e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml @@ -223,7 +223,7 @@ order by a.enter_date desc - order by a.add_time desc,a.update_time desc + order by a.add_time desc,a.id desc diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java index 5f4ad427b..dd2e152f2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoService.java @@ -49,7 +49,7 @@ public interface IWorkerInfoService extends IService { Map selectWorkerPersonTypeStatistics(Map map); - List selectWorkerTeamStatistics(Map map); + List selectWorkerTeamStatistics(Map map); List> selectWorkerDepartmentStatistics(Map map); @@ -90,7 +90,7 @@ public interface IWorkerInfoService extends IService { List getLaborManagementInfoList(Map map); - Map selectWorkerTeamAndDepartmentStatistics(Map map); + WorkerTeamAndDepartmentStatisticsVo selectWorkerTeamAndDepartmentStatistics(Map map); void batchSendWorkerInfo(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java index b364b6864..c528e4aff 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java @@ -633,7 +633,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl selectWorkerOverviewStatistics(Map map) { Map data = new HashMap<>(); Map personType = selectWorkerPersonTypeStatistics(map); - List teamList = selectWorkerTeamStatistics(map); + List teamList = selectWorkerTeamStatistics(map); //map.put("sn",MapUtils.getString(map,"projectSn")); int totalEducationPerson = workerSafeEducationMapper.getProjectSafeEducationPersonToltal(map); data.put("totalEducationPerson", totalEducationPerson); @@ -686,7 +686,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl selectWorkerTeamStatistics(Map map) { + public List selectWorkerTeamStatistics(Map map) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(TeamInfo::getProjectSn, MapUtils.getString(map, "projectSn")); List list = teamInfoMapper.selectTeamInfoList(map); @@ -752,7 +752,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl voList = tempList.stream().map(e -> BeanUtil.toBean(e, WorkerTeamStatisticsVo.class)).collect(Collectors.toList()); + List voList = tempList.stream().map(e -> BeanUtil.toBean(e, WorkerTeamDepartmentStatisticsVo.class)).collect(Collectors.toList()); return voList; } @@ -1421,8 +1421,8 @@ public class WorkerInfoServiceImpl extends ServiceImpl selectWorkerTeamAndDepartmentStatistics(Map map) { - Map data = new HashMap<>(); + public WorkerTeamAndDepartmentStatisticsVo selectWorkerTeamAndDepartmentStatistics(Map map) { + WorkerTeamAndDepartmentStatisticsVo data = new WorkerTeamAndDepartmentStatisticsVo(); List> list = new ArrayList<>(); //部门统计 List> departmentList = selectWorkerDepartmentStatistics(map); @@ -1430,7 +1430,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl teamList = selectWorkerTeamStatistics(map); + List teamList = selectWorkerTeamStatistics(map); List> teamMapList = teamList.stream().map(e -> BeanUtil.beanToMap(e)).collect(Collectors.toList()); if (teamList.size() > 0) { list.addAll(teamMapList); @@ -1445,10 +1445,10 @@ public class WorkerInfoServiceImpl extends ServiceImpl