From 8bcbb1ebceffc2e0e150b7c6728cc477eb2dee65 Mon Sep 17 00:00:00 2001 From: Administrator <1923636941@qq.com> Date: Mon, 13 Mar 2023 17:59:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA=E5=9B=9B=E5=B1=80=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=8F=AD=E7=BB=84=E6=8E=A5=E5=8F=A3=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xml/HighFormworkAlarmDataMapper.xml | 2 +- .../ProjectWorkerApiController.java | 11 +- .../xmgl/modules/worker/entity/TeamInfo.java | 119 +++++++++++------- .../modules/worker/entity/vo/GroupVo.java | 33 +++++ .../modules/worker/mapper/TeamInfoMapper.java | 6 + .../worker/mapper/xml/TeamInfoMapper.xml | 26 ++++ .../worker/service/ITeamInfoService.java | 2 + .../service/impl/TeamInfoServiceImpl.java | 41 ++++++ 8 files changed, 184 insertions(+), 56 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/GroupVo.java diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkAlarmDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkAlarmDataMapper.xml index d8a656b25..20afea753 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkAlarmDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkAlarmDataMapper.xml @@ -8,7 +8,7 @@ INNER JOIN high_formwork_measure_point hfmp ON hfmp.id = hfad.measure_point_id - and hfmp.id = #{q.projectSn} + and hfmp.project_sn = #{q.projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java index 09531cb2f..8ab72a0aa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java @@ -527,16 +527,7 @@ public class ProjectWorkerApiController { }) @PostMapping(value = "/getGroup") public Map getGroup(@RequestBody Map map) { - Map resultMap = new HashMap<>(); - try { - resultMap.put("msg", "操作成功"); - resultMap.put("status", "1"); - } catch (Exception e) { - e.printStackTrace(); - resultMap.put("msg", "操作失败"); - resultMap.put("status", "0"); - } - return resultMap; + return teamInfoService.getGroup(map); } @ApiOperation(value = "获取企业类型", notes = "获取企业类型", httpMethod = "POST") diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/TeamInfo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/TeamInfo.java index f1408af36..7ee6b8393 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/TeamInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/TeamInfo.java @@ -4,77 +4,106 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; + /** * @Description: 人员班组 * @author： pds - * @date： 2020-08-13 + * @date： 2020-08-13 * @version： V1.0 */ @Data @TableName("team_info") -@ApiModel(value="TeamInfo实体类",description="TeamInfo") +@ApiModel(value = "TeamInfo实体类", description = "TeamInfo") public class TeamInfo implements Serializable { - private static final long serialVersionUID = 1L; - - /**id*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value="id") - private java.lang.Long id ; - /**班组名称*/ + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Long id; + /** + * 班组名称 + */ @Excel(name = "班组名称", width = 15) - @ApiModelProperty(value="班组名称") - private java.lang.String teamName ; - /**负责人姓名*/ + @ApiModelProperty(value = "班组名称") + private java.lang.String teamName; + /** + * 负责人姓名 + */ @Excel(name = "负责人姓名", width = 15) - @ApiModelProperty(value="负责人姓名") - private java.lang.String leaderName ; - /**负责人身份证号*/ + @ApiModelProperty(value = "负责人姓名") + private java.lang.String leaderName; + /** + * 负责人身份证号 + */ @Excel(name = "负责人身份证号", width = 15) - @ApiModelProperty(value="负责人身份证号") - private java.lang.String leaderIdCard ; - /**负责人手机号*/ + @ApiModelProperty(value = "负责人身份证号") + private java.lang.String leaderIdCard; + /** + * 负责人手机号 + */ @Excel(name = "负责人手机号", width = 15) - @ApiModelProperty(value="负责人手机号") - private java.lang.String leaderPhone ; - /**工种id*/ + @ApiModelProperty(value = "负责人手机号") + private java.lang.String leaderPhone; + /** + * 工种id + */ @Excel(name = "工种id", width = 15) - @ApiModelProperty(value="工种id") + @ApiModelProperty(value = "工种id") - private java.lang.Long workerTypeId ; - /**班组类型*/ + private java.lang.Long workerTypeId; + /** + * 班组类型 + */ @Excel(name = "班组类型", width = 15) - @ApiModelProperty(value="班组类型") - private java.lang.String teamType ; - /**描述*/ + @ApiModelProperty(value = "班组类型") + private java.lang.String teamType; + /** + * 描述 + */ @Excel(name = "描述", width = 15) - @ApiModelProperty(value="描述") - private java.lang.String describeValue ; - /**项目sn*/ + @ApiModelProperty(value = "描述") + private java.lang.String describeValue; + /** + * 项目sn + */ @Excel(name = "项目sn", width = 15) - @ApiModelProperty(value="项目sn") - private java.lang.String projectSn ; - /**班组唯一标识*/ + @ApiModelProperty(value = "项目sn") + private java.lang.String projectSn; + /** + * 班组唯一标识 + */ @Excel(name = "班组唯一标识", width = 15) - @ApiModelProperty(value="班组唯一标识") - private java.lang.String teamSn ; - /**所属企业id*/ + @ApiModelProperty(value = "班组唯一标识") + private java.lang.String teamSn; + /** + * 所属企业id + */ @Excel(name = "所属企业id", width = 15) - @ApiModelProperty(value="所属企业id") + @ApiModelProperty(value = "所属企业id") - private java.lang.Long enterpriseId ; + private java.lang.Long enterpriseId; - @ApiModelProperty(value="是否特殊工种，0否，1是") - private java.lang.Integer specialTeam ; + @ApiModelProperty(value = "是否特殊工种，0否，1是") + private java.lang.Integer specialTeam; + + @TableField(exist = false) + @ApiModelProperty(value = "人员数量") + private java.lang.Integer workerNum; + + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date lastUpdateTime; - @TableField(exist = false) - @ApiModelProperty(value="人员数量") - private java.lang.Integer workerNum ; } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/GroupVo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/GroupVo.java new file mode 100644 index 000000000..074b36289 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/GroupVo.java @@ -0,0 +1,33 @@ +package com.zhgd.xmgl.modules.worker.entity.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * 获取班组接口Vo + */ +@Data +public class GroupVo { + @ApiModelProperty(value = "班组所属的劳务公司统一社会信用代码") + private String socialCode; + @ApiModelProperty(value = "班组负责人身份证，如果传入班组负责人身份证，必须保证人员存在，否则班组将会创建失败") + private String idCard; + @ApiModelProperty(value = "企业名称") + private String companyName; + @ApiModelProperty(value = "分组Id'") + private java.lang.Long groupId; + @ApiModelProperty(value = "班组名称，在一个项目下，班组名称必须唯一") + private String groupName; + @ApiModelProperty(value = "姓名") + private java.lang.String workerName; + @ApiModelProperty(value = "项目编码") + private java.lang.String projectCode; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date lastUpdateTime; + +} 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 598e0ccf7..cfba1e766 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 @@ -3,8 +3,12 @@ package com.zhgd.xmgl.modules.worker.mapper; import java.util.List; import java.util.Map; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.modules.basicdata.entity.DictionariesRecord; import com.zhgd.xmgl.modules.worker.entity.TeamInfo; +import com.zhgd.xmgl.modules.worker.entity.vo.GroupVo; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -35,4 +39,6 @@ public interface TeamInfoMapper extends BaseMapper { Map getTeamInfoMapBySn(@Param("projectSn") String projectSn); List selectTeamDetailsList(Map map); + + IPage getGroup(Page page,@Param("q") Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/TeamInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/TeamInfoMapper.xml index 51cae4f3d..e02e0ea29 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/TeamInfoMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/TeamInfoMapper.xml @@ -85,4 +85,30 @@ and FIND_IN_SET(a.enterprise_id,#{userEnterpriseId}) + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/ITeamInfoService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/ITeamInfoService.java index a5ec354d6..5dc376677 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/ITeamInfoService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/ITeamInfoService.java @@ -30,4 +30,6 @@ public interface ITeamInfoService extends IService { List> selectEnterpriseTeamList(Map map); List selectTeamDetailsList(Map map); + + Map getGroup(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/TeamInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/TeamInfoServiceImpl.java index 12f212edd..eb8583c9c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/TeamInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/TeamInfoServiceImpl.java @@ -1,12 +1,15 @@ package com.zhgd.xmgl.modules.worker.service.impl; 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.execption.OpenAlertException; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.async.AsyncWorker; import com.zhgd.xmgl.modules.worker.entity.TeamInfo; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; +import com.zhgd.xmgl.modules.worker.entity.vo.GroupVo; import com.zhgd.xmgl.modules.worker.mapper.TeamInfoMapper; import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper; import com.zhgd.xmgl.modules.worker.service.ITeamInfoService; @@ -122,4 +125,42 @@ public class TeamInfoServiceImpl extends ServiceImpl i public List selectTeamDetailsList(Map map) { return teamInfoMapper.selectTeamDetailsList(map); } + + @Override + public Map getGroup(Map map) { + if (map.get("projectCode") == null) { + Map resultMap = new HashMap<>(); + resultMap.put("msg", "projectCode不能为空"); + resultMap.put("status", "0"); + return resultMap; + } + + Integer pageIndex = null; + if (map.get("pageIndex") != null) { + pageIndex = Integer.valueOf(String.valueOf(map.get("pageIndex"))); + } else { + pageIndex = 1; + } + Integer pageSize = null; + if (map.get("pageSize") != null) { + pageSize = Integer.valueOf(String.valueOf(map.get("pageSize"))); + } else { + pageSize = 10; + } + + Page page = new Page(pageIndex, pageSize); + IPage pageList = teamInfoMapper.getGroup(page, map); + Map resultMap = new HashMap<>(); + try { + resultMap.put("data", pageList.getRecords()); + resultMap.put("total", pageList.getTotal()); + resultMap.put("msg", "操作成功"); + resultMap.put("status", "1"); + } catch (Exception e) { + e.printStackTrace(); + resultMap.put("msg", "操作失败"); + resultMap.put("status", "0"); + } + return resultMap; + } }