admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

中建四局获取班组接口编写

Browse Source
This commit is contained in:
Administrator 2023-03-13 17:59:35 +08:00
parent 268af8c6f0
commit 8bcbb1ebce
8 changed files with 184 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkAlarmDataMapper.xml
View File

@ -8,7 +8,7 @@
INNER JOIN high_formwork_measure_point hfmp ON hfmp.id = hfad.measure_point_id
<where>
<if test="q.projectSn!=null and q.projectSn!=''">
and hfmp.id = #{q.projectSn}
and hfmp.project_sn = #{q.projectSn}
</if>
</where>
</select>

11
src/main/java/com/zhgd/xmgl/modules/worker/controller/ProjectWorkerApiController.java
View File

@ -527,16 +527,7 @@ public class ProjectWorkerApiController {
})
@PostMapping(value = "/getGroup")
public Map<String, Object> getGroup(@RequestBody Map<String, Object> map) {
Map<String, Object> 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")

119
src/main/java/com/zhgd/xmgl/modules/worker/entity/TeamInfo.java
View File

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

33
src/main/java/com/zhgd/xmgl/modules/worker/entity/vo/GroupVo.java Normal file
View File

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

6
src/main/java/com/zhgd/xmgl/modules/worker/mapper/TeamInfoMapper.java
View File

@ -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<TeamInfo> {
Map<String, Object> getTeamInfoMapBySn(@Param("projectSn") String projectSn);
List<EntityMap> selectTeamDetailsList(Map<String, Object> map);
IPage<GroupVo> getGroup(Page<GroupVo> page,@Param("q") Map<String, Object> map);
}

26
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/TeamInfoMapper.xml
View File

@ -85,4 +85,30 @@
and FIND_IN_SET(a.enterprise_id,#{userEnterpriseId})
</if>
</select>
<select id="getGroup" resultType="com.zhgd.xmgl.modules.worker.entity.vo.GroupVo">
SELECT ei.social_code,
ti.leader_id_card as id_card,
ei.enterprise_name as company_name,
ti.id AS group_id,
ti.team_name as group_name,
ti.leader_name AS worker_name,
ti.project_sn AS project_code,
ti.last_update_time
FROM `team_info` ti
INNER JOIN enterprise_info ei ON ei.id = ti.enterprise_id
<where>
<if test="q.projectCode!=null and q.projectCode!=''">
and ti.project_sn = #{q.projectCode}
</if>
<if test="q.groupName!=null and q.groupName!=''">
and ti.team_name like concat('%',#{q.groupName},'%')
</if>
<if test="q.startTime!=null and q.startTime!=''">
and ti.last_update_time <![CDATA[>=]]> #{q.startTime}
</if>
<if test="q.endTime!=null and q.endTime!=''">
and ti.last_update_time <![CDATA[<=]]> #{q.endTime}
</if>
</where>
</select>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/worker/service/ITeamInfoService.java
View File

@ -30,4 +30,6 @@ public interface ITeamInfoService extends IService<TeamInfo> {
List<Map<String, Object>> selectEnterpriseTeamList(Map<String, Object> map);
List<EntityMap> selectTeamDetailsList(Map<String, Object> map);
Map<String, Object> getGroup(Map<String, Object> map);
}

41
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/TeamInfoServiceImpl.java
View File

@ -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<TeamInfoMapper, TeamInfo> i
public List<EntityMap> selectTeamDetailsList(Map<String, Object> map) {
return teamInfoMapper.selectTeamDetailsList(map);
}
@Override
public Map<String, Object> getGroup(Map<String, Object> map) {
if (map.get("projectCode") == null) {
Map<String, Object> 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<GroupVo> page = new Page<GroupVo>(pageIndex, pageSize);
IPage<GroupVo> pageList = teamInfoMapper.getGroup(page, map);
Map<String, Object> 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;
}
}