岗位总体信息接口-》岗位职责,异常履职,证书证件

mybatis-plus tinyint 类型转换异常 datasource加入一个自定义一个转换类
This commit is contained in:
79493 2022-10-09 17:33:16 +08:00
parent cfd3e38c05
commit 44aa7338fa
15 changed files with 1109 additions and 10 deletions

View File

@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.generator.AutoGenerator;
import com.baomidou.mybatisplus.generator.InjectionConfig;
import com.baomidou.mybatisplus.generator.config.*;
import com.baomidou.mybatisplus.generator.config.converts.MySqlTypeConvert;
import com.baomidou.mybatisplus.generator.config.po.TableInfo;
import com.baomidou.mybatisplus.generator.config.rules.DateType;
import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
import com.baomidou.mybatisplus.generator.config.rules.IColumnType;
import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
import com.common.utils.StringUtils;
@ -89,6 +92,7 @@ public class CodeGenerator {
dsc.setDriverName(DriverName);
dsc.setUsername(Username);
dsc.setPassword(Password);
dsc.setTypeConvert(new MySqlTypeConvertCustom());
mpg.setDataSource(dsc);
// 包配置生成的entitycontrollerservice等包名
@ -162,5 +166,18 @@ public class CodeGenerator {
mpg.execute();
}
/**
* 处理mybatis-plus 部分数据类型转换问题这里重写typeConvert加入判断
* */
static class MySqlTypeConvertCustom extends MySqlTypeConvert implements ITypeConvert {
@Override
public IColumnType processTypeConvert(GlobalConfig globalConfig, String fieldType) {
String t = fieldType.toLowerCase();
if (t.contains("tinyint")) {
return DbColumnType.INTEGER;
}
return super.processTypeConvert(globalConfig, fieldType);
}
}
}

View File

@ -0,0 +1,30 @@
package com.rzyc.mapper;
import com.rzyc.model.EntPostDuty;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* <p>
* 岗位职责 Mapper 接口
* </p>
*
* @author
* @since 2022-10-09
*/
@Repository
public interface EntPostDutyMapper extends BaseMapper<EntPostDuty> {
/**
* 企业用户岗位职责
* @param enterpriseId 企业id
* @param postId 岗位id
* @return EntPostTask 企业用户岗位职责
* */
List<EntPostDuty>selectEntUserPostDuty(@Param("enterpriseId") String enterpriseId, @Param("postId")String postId);
}

View File

@ -0,0 +1,36 @@
package com.rzyc.mapper;
import com.rzyc.model.EntPostTask;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* <p>
* Mapper 接口
* </p>
*
* @author
* @since 2022-10-09
*/
@Repository
public interface EntPostTaskMapper extends BaseMapper<EntPostTask> {
/**
* 查询企业用户清单任务
* @param enterpriseId 企业id
* @param entUserId 企业用户id
* @param postId 岗位id
* @param listId 清单id
* @param content 内容模糊搜索
* @param taskState 任务状态
* @return EntPostTask 企业用户清单任务
* */
List<EntPostTask>selectEntUserPostTask(@Param("enterpriseId") String enterpriseId, @Param("entUserId")String entUserId,
@Param("postId")String postId, @Param("listId")String listId,
@Param("content")String content,@Param("taskState") Integer taskState);
}

View File

@ -0,0 +1,55 @@
package com.rzyc.mapper;
import com.rzyc.model.EntUserCredential;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.rzyc.model.dto.EntUserCredentialUpdateDto;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* <p>
* Mapper 接口
* </p>
*
* @author
* @since 2022-10-09
*/
@Repository
public interface EntUserCredentialMapper extends BaseMapper<EntUserCredential> {
/**
* 企业用户岗位职责
* @param enterpriseId 企业id
* @param entUserId 企业用户id
* @return EntUserCredential 企业用户证照
* */
List<EntUserCredential>selectEntUserCredential(@Param("enterpriseId") String enterpriseId, @Param("entUserId")String entUserId);
/**
* 企业用户证件照修改
* @param entUserCredentialUpdateDto 企业用户证件照对象
* @return int
* */
int updateEntUserCredential(@Param("data") EntUserCredentialUpdateDto entUserCredentialUpdateDto);
/**
* 企业用户证件照新增
* @param entUserCredentialUpdateDto 企业用户证件照对象
* @return int
* */
int insertEntUserCredential(@Param("data") EntUserCredentialUpdateDto entUserCredentialUpdateDto);
/**
* 企业用户证件照删除
* @param credentialId 企业用户证件照id
* @return int
* */
int entUserCredentialDelete(@Param("credentialId") String credentialId);
}

View File

@ -0,0 +1,139 @@
package com.rzyc.model;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* <p>
* 岗位职责
* </p>
*
* @author
* @since 2022-10-09
*/
@TableName("ent_post_duty")
@ApiModel(value="EntPostDuty对象", description="岗位职责")
public class EntPostDuty implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "岗位职责id")
@TableId("duty_id")
private String dutyId;
@ApiModelProperty(value = "岗位id")
@TableField("post_id")
private String postId;
@ApiModelProperty(value = "职责内容")
@TableField("duty_item")
private String dutyItem;
@ApiModelProperty(value = "排序")
@TableField("sort_id")
private Integer sortId;
@ApiModelProperty(value = "企业id")
@TableField("enterprise_id")
private String enterpriseId;
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
private Date createTime;
@ApiModelProperty(value = "创建人")
@TableField("create_by")
private String createBy;
@ApiModelProperty(value = "修改时间")
@TableField("modify_time")
private Date modifyTime;
@ApiModelProperty(value = "修改人")
@TableField("modify_by")
private String modifyBy;
public String getDutyId() {
return dutyId;
}
public void setDutyId(String dutyId) {
this.dutyId = dutyId;
}
public String getPostId() {
return postId;
}
public void setPostId(String postId) {
this.postId = postId;
}
public String getDutyItem() {
return dutyItem;
}
public void setDutyItem(String dutyItem) {
this.dutyItem = dutyItem;
}
public Integer getSortId() {
return sortId;
}
public void setSortId(Integer sortId) {
this.sortId = sortId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public Date getModifyTime() {
return modifyTime;
}
public void setModifyTime(Date modifyTime) {
this.modifyTime = modifyTime;
}
public String getModifyBy() {
return modifyBy;
}
public void setModifyBy(String modifyBy) {
this.modifyBy = modifyBy;
}
@Override
public String toString() {
return "EntPostDuty{" +
"dutyId=" + dutyId +
", postId=" + postId +
", dutyItem=" + dutyItem +
", sortId=" + sortId +
", enterpriseId=" + enterpriseId +
", createTime=" + createTime +
", createBy=" + createBy +
", modifyTime=" + modifyTime +
", modifyBy=" + modifyBy +
"}";
}
}

View File

@ -0,0 +1,247 @@
package com.rzyc.model;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* <p>
*
* </p>
*
* @author
* @since 2022-10-09
*/
@TableName("ent_post_task")
@ApiModel(value="EntPostTask对象", description="")
public class EntPostTask implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "任务id")
@TableId("task_id")
private String taskId;
@ApiModelProperty(value = "岗位id")
@TableField("post_id")
private String postId;
@ApiModelProperty(value = "企业用户id")
@TableField("ent_user_id")
private String entUserId;
@ApiModelProperty(value = "企业id")
@TableField("enterprise_id")
private String enterpriseId;
@ApiModelProperty(value = "企业清单项id")
@TableField("ent_list_id")
private String entListId;
@ApiModelProperty(value = "清单id")
@TableField("list_id")
private String listId;
@ApiModelProperty(value = "岗位清单id")
@TableField("post_list_id")
private String postListId;
@ApiModelProperty(value = "任务标题")
@TableField("item_title")
private String itemTitle;
@ApiModelProperty(value = "任务内容")
@TableField("item_content")
private String itemContent;
@ApiModelProperty(value = "开始时间")
@TableField("start_time")
private Date startTime;
@ApiModelProperty(value = "结束时间")
@TableField("ent_time")
private Date entTime;
@ApiModelProperty(value = "任务状态 1、进行中 2、已完成 3、已超期")
@TableField("task_state")
private Integer taskState;
@ApiModelProperty(value = "完成次数")
@TableField("frequency")
private Integer frequency;
@ApiModelProperty(value = "删除状态 1正常 2:已删除")
@TableField("del_state")
private Integer delState;
@ApiModelProperty(value = "创建时间")
@TableField("create_time")
private Date createTime;
@ApiModelProperty(value = "创建人")
@TableField("create_by")
private String createBy;
@ApiModelProperty(value = "修改时间")
@TableField("modify_time")
private Date modifyTime;
@ApiModelProperty(value = "修改人")
@TableField("modify_by")
private String modifyBy;
public String getTaskId() {
return taskId;
}
public void setTaskId(String taskId) {
this.taskId = taskId;
}
public String getPostId() {
return postId;
}
public void setPostId(String postId) {
this.postId = postId;
}
public String getEntUserId() {
return entUserId;
}
public void setEntUserId(String entUserId) {
this.entUserId = entUserId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getEntListId() {
return entListId;
}
public void setEntListId(String entListId) {
this.entListId = entListId;
}
public String getListId() {
return listId;
}
public void setListId(String listId) {
this.listId = listId;
}
public String getPostListId() {
return postListId;
}
public void setPostListId(String postListId) {
this.postListId = postListId;
}
public String getItemTitle() {
return itemTitle;
}
public void setItemTitle(String itemTitle) {
this.itemTitle = itemTitle;
}
public String getItemContent() {
return itemContent;
}
public void setItemContent(String itemContent) {
this.itemContent = itemContent;
}
public Date getStartTime() {
return startTime;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
public Date getEntTime() {
return entTime;
}
public void setEntTime(Date entTime) {
this.entTime = entTime;
}
public Integer getTaskState() {
return taskState;
}
public void setTaskState(Integer taskState) {
this.taskState = taskState;
}
public Integer getFrequency() {
return frequency;
}
public void setFrequency(Integer frequency) {
this.frequency = frequency;
}
public Integer getDelState() {
return delState;
}
public void setDelState(Integer delState) {
this.delState = delState;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public Date getModifyTime() {
return modifyTime;
}
public void setModifyTime(Date modifyTime) {
this.modifyTime = modifyTime;
}
public String getModifyBy() {
return modifyBy;
}
public void setModifyBy(String modifyBy) {
this.modifyBy = modifyBy;
}
@Override
public String toString() {
return "EntPostTask{" +
"taskId=" + taskId +
", postId=" + postId +
", entUserId=" + entUserId +
", enterpriseId=" + enterpriseId +
", entListId=" + entListId +
", listId=" + listId +
", postListId=" + postListId +
", itemTitle=" + itemTitle +
", itemContent=" + itemContent +
", startTime=" + startTime +
", entTime=" + entTime +
", taskState=" + taskState +
", frequency=" + frequency +
", delState=" + delState +
", createTime=" + createTime +
", createBy=" + createBy +
", modifyTime=" + modifyTime +
", modifyBy=" + modifyBy +
"}";
}
}

View File

@ -0,0 +1,160 @@
package com.rzyc.model;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
* <p>
*
* </p>
*
* @author
* @since 2022-10-09
*/
@TableName("ent_user_credential")
@ApiModel(value="EntUserCredential对象", description="")
public class EntUserCredential implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "企业用户证照表id")
@TableId("credential_id")
private String credentialId;
@ApiModelProperty(value = "证照名")
@TableField("credential_name")
private String credentialName;
@ApiModelProperty(value = "证照状态 1.未超时 2.已超时")
@TableField("credential_state")
private Integer credentialState;
@ApiModelProperty(value = "证照地址")
@TableField("credential_image_address")
private String credentialImageAddress;
@ApiModelProperty(value = "企业用户id")
@TableField("ent_user_id")
private String entUserId;
@TableField("credential_start_time")
private Date credentialStartTime;
@TableField("credential_end_time")
private Date credentialEndTime;
@TableField("create_time")
private Date createTime;
@TableField("modify_time")
private Date modifyTime;
@TableField("create_by")
private String createBy;
@TableField("modify_by")
private String modifyBy;
public Date getCredentialStartTime() {
return credentialStartTime;
}
public void setCredentialStartTime(Date credentialStartTime) {
this.credentialStartTime = credentialStartTime;
}
public Date getCredentialEndTime() {
return credentialEndTime;
}
public void setCredentialEndTime(Date credentialEndTime) {
this.credentialEndTime = credentialEndTime;
}
public String getCredentialId() {
return credentialId;
}
public void setCredentialId(String credentialId) {
this.credentialId = credentialId;
}
public String getCredentialName() {
return credentialName;
}
public void setCredentialName(String credentialName) {
this.credentialName = credentialName;
}
public Integer getCredentialState() {
return credentialState;
}
public void setCredentialState(Integer credentialState) {
this.credentialState = credentialState;
}
public String getCredentialImageAddress() {
return credentialImageAddress;
}
public void setCredentialImageAddress(String credentialImageAddress) {
this.credentialImageAddress = credentialImageAddress;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getModifyTime() {
return modifyTime;
}
public void setModifyTime(Date modifyTime) {
this.modifyTime = modifyTime;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public String getModifyBy() {
return modifyBy;
}
public void setModifyBy(String modifyBy) {
this.modifyBy = modifyBy;
}
public String getEntUserId() {
return entUserId;
}
public void setEntUserId(String entUserId) {
this.entUserId = entUserId;
}
@Override
public String toString() {
return "EntUserCredential{" +
"credentialId='" + credentialId + '\'' +
", credentialName='" + credentialName + '\'' +
", credentialState=" + credentialState +
", credentialImageAddress='" + credentialImageAddress + '\'' +
", entUserId='" + entUserId + '\'' +
", credentialStartTime=" + credentialStartTime +
", credentialEndTime=" + credentialEndTime +
", createTime=" + createTime +
", modifyTime=" + modifyTime +
", createBy='" + createBy + '\'' +
", modifyBy='" + modifyBy + '\'' +
'}';
}
}

View File

@ -0,0 +1,140 @@
package com.rzyc.model.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
/**
* 企业用户证件照Dto
* @author Xuwanxin
* */
@ApiModel(value="企业用户证件对象", description="企业用户证件对象")
public class EntUserCredentialUpdateDto {
@ApiModelProperty(value = "企业用户证照表id")
private String credentialId;
@ApiModelProperty(value = "证照名")
private String credentialName;
@ApiModelProperty(value = "证照状态 1.未超时 2.已超时")
private Integer credentialState;
@ApiModelProperty(value = "证照地址")
private String credentialImageAddress;
@ApiModelProperty(value = "企业用户id")
private String entUserId;
@ApiModelProperty(value = "证照起始时间")
private Date credentialStartTime;
@ApiModelProperty(value = "证照结束时间")
private Date credentialEndTime;
private Date createTime;
private Date modifyTime;
private String createBy;
private String modifyBy;
public Date getCredentialStartTime() {
return credentialStartTime;
}
public void setCredentialStartTime(Date credentialStartTime) {
this.credentialStartTime = credentialStartTime;
}
public Date getCredentialEndTime() {
return credentialEndTime;
}
public void setCredentialEndTime(Date credentialEndTime) {
this.credentialEndTime = credentialEndTime;
}
public String getCredentialId() {
return credentialId;
}
public void setCredentialId(String credentialId) {
this.credentialId = credentialId;
}
public String getCredentialName() {
return credentialName;
}
public void setCredentialName(String credentialName) {
this.credentialName = credentialName;
}
public Integer getCredentialState() {
return credentialState;
}
public void setCredentialState(Integer credentialState) {
this.credentialState = credentialState;
}
public String getCredentialImageAddress() {
return credentialImageAddress;
}
public void setCredentialImageAddress(String credentialImageAddress) {
this.credentialImageAddress = credentialImageAddress;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getModifyTime() {
return modifyTime;
}
public void setModifyTime(Date modifyTime) {
this.modifyTime = modifyTime;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public String getModifyBy() {
return modifyBy;
}
public void setModifyBy(String modifyBy) {
this.modifyBy = modifyBy;
}
public String getEntUserId() {
return entUserId;
}
public void setEntUserId(String entUserId) {
this.entUserId = entUserId;
}
}

View File

@ -0,0 +1,27 @@
<?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.rzyc.mapper.EntPostDutyMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.rzyc.model.EntPostDuty">
<id column="duty_id" property="dutyId" />
<result column="post_id" property="postId" />
<result column="duty_item" property="dutyItem" />
<result column="sort_id" property="sortId" />
<result column="enterprise_id" property="enterpriseId" />
<result column="create_time" property="createTime" />
<result column="create_by" property="createBy" />
<result column="modify_time" property="modifyTime" />
<result column="modify_by" property="modifyBy" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
duty_id, post_id, duty_item, sort_id, enterprise_id, create_time, create_by, modify_time, modify_by
</sql>
<select id="selectEntUserPostDuty" resultMap="BaseResultMap">
select * from ent_post_duty where enterprise_id = #{enterpriseId} and post_id = #{postId}
</select>
</mapper>

View File

@ -0,0 +1,45 @@
<?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.rzyc.mapper.EntPostTaskMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.rzyc.model.EntPostTask">
<id column="task_id" property="taskId" />
<result column="post_id" property="postId" />
<result column="ent_user_id" property="entUserId" />
<result column="enterprise_id" property="enterpriseId" />
<result column="ent_list_id" property="entListId" />
<result column="list_id" property="listId" />
<result column="post_list_id" property="postListId" />
<result column="item_title" property="itemTitle" />
<result column="item_content" property="itemContent" />
<result column="start_time" property="startTime" />
<result column="ent_time" property="entTime" />
<result column="task_state" property="taskState" />
<result column="frequency" property="frequency" />
<result column="del_state" property="delState" />
<result column="create_time" property="createTime" />
<result column="create_by" property="createBy" />
<result column="modify_time" property="modifyTime" />
<result column="modify_by" property="modifyBy" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
task_id, post_id, ent_user_id, enterprise_id, ent_list_id, list_id, post_list_id, item_title, item_content, start_time, ent_time, task_state, frequency, del_state, create_time, create_by, modify_time, modify_by
</sql>
<select id="selectEntUserPostTask" resultMap="BaseResultMap">
select * from ent_post_task where ent_user_id = #{entUserId} and enterprise_id = #{enterpriseId} and list_id = #{listId}
<if test="null != postId and '' != postId">
and post_id = #{postId}
</if>
<if test="null != content and '' != content">
and item_content like concat('%',#{content},'%')
</if>
<if test="null != taskState and '' != taskState">
and task_state = #{taskState}
</if>
</select>
</mapper>

View File

@ -0,0 +1,44 @@
<?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.rzyc.mapper.EntUserCredentialMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.rzyc.model.EntUserCredential">
<id column="credential_id" property="credentialId" />
<result column="credential_name" property="credentialName" />
<result column="credential_state" property="credentialState" />
<result column="credential_image_address" property="credentialImageAddress" />
<result column="ent_user_id" property="entUserId"/>
<result column="credential_start_time" property="credentialStartTime"/>
<result column="credential_end_time" property="credentialEndTime"/>
<result column="create_time" property="createTime" />
<result column="modify_time" property="modifyTime" />
<result column="create_by" property="createBy" />
<result column="modify_by" property="modifyBy" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
credential_id, credential_name, credential_state, credential_image_address, create_time, modify_time, create_by, modify_by
</sql>
<select id="selectEntUserCredential">
select * from ent_user_credential where ent_user_id = #{entUserId}
</select>
<update id="updateEntUserCredential" parameterType="com.rzyc.model.dto.EntUserCredentialUpdateDto">
update ent_user_credential set credential_name= #{data.credentialName} ,credential_start_time = #{data.credentialStartTime},
credential_end_time = #{data.credentialEndTime},credential_image_address = #{data.credentialImageAddress},
modify_timne = #{data.modifyTime} , modify_by = #{data.modifyBy}
where ent_user_id = #{data.entUserId}
</update>
<insert id="insertEntUserCredential" parameterType="com.rzyc.model.dto.EntUserCredentialUpdateDto">
insert into ent_user_credential (credential_name,credential_start_time,credential_end_time,credential_image_address,ent_user_id,create_by,create_time) values(#{data.credentialName},#{data.credentialStartTime},#{data.credentialEndTime},#{data.credentialImageAddress},#{data.entUserId},#{data.createBy},#{data.createTime})
</insert>
<delete id="entUserCredentialDelete">
delete from ent_user_credential where credential_id = #{credentialId}
</delete>
</mapper>

View File

@ -462,6 +462,19 @@ public class BaseController {
@Autowired
protected EntPostListMapper entPostListMapper;
//企业用户清单任务
@Autowired
protected EntPostTaskMapper entPostTaskMapper;
@Autowired
protected EntPostDutyMapper entPostDutyMapper;
@Autowired
protected EntUserCredentialMapper entUserCredentialMapper;
/**
* 新都文件地址处理
* @param url

View File

@ -8,6 +8,8 @@ import com.common.utils.encryption.PasswdFactory;
import com.common.utils.jwt.JwtUtil;
import com.common.utils.model.SingleResult;
import com.rzyc.bean.user.dto.LoginDto;
import com.rzyc.model.EntUserCredential;
import com.rzyc.model.dto.EntUserCredentialUpdateDto;
import com.rzyc.model.ent.EntUser;
import com.rzyc.service.PcBusinessService;
import com.rzyc.service.UserLoginService;
@ -200,18 +202,109 @@ public class PersonalController extends BaseController{
@ApiImplicitParams({
@ApiImplicitParam(name = "enterpriseId", value = "公司id", required = true, dataType = "string"),
@ApiImplicitParam(name = "entUserId", value = "企业用户id", required = true, dataType = "string"),
@ApiImplicitParam(name = "listId", value = "清单类型Id", required = true, dataType = "string"),
@ApiImplicitParam(name = "postId", value = "企业用户岗位id",required = false, dataType = "string"),
@ApiImplicitParam(name = "listId", value = "清单类型Id", required = false, dataType = "string"),
@ApiImplicitParam(name = "content", value = "内容模糊搜索", required = false, dataType = "string"),
@ApiImplicitParam(name = "taskState", value = "任务状态 1、进行中 2、已完成 3、已超期", required = false, dataType = "int"),
})
@GetMapping(value = "/entUserPostList")
@GetMapping(value = "/entUserPostTask")
@PreAuthorize("hasAnyAuthority('PERSONAL:ENTUSERPOSTTASK','PERSONAL:ENTUSERPOSTTASK:UPDATE')")
@MethodAnnotation(authorizations = {"PERSONAL:ENTUSERPOSTTASK","PERSONAL:ENTUSERPOSTTASK:UPDATE"})
@ResponseBody
public SingleResult entUserPostTask(String enterpriseId, String entUserId,String postId,String listId)throws Exception{
return pcBusinessService.entUserPostTask(enterpriseId,entUserId,postId,listId);
public SingleResult entUserPostTask(String enterpriseId, String entUserId,String postId,String listId,String content,Integer taskState)throws Exception{
return pcBusinessService.entUserPostTask(enterpriseId,entUserId,postId,listId,content,taskState);
}
/**
* 企业用户岗位职责
* @param enterpriseId 企业id
* @param postId 岗位id
* @return 企业用户岗位职责
* @throws Exception
*/
@ApiOperation(value = "企业用户岗位职责", notes = "企业用户岗位职责")
@ApiImplicitParams({
@ApiImplicitParam(name = "enterpriseId", value = "公司id", required = true, dataType = "string"),
@ApiImplicitParam(name = "postId", value = "企业用户岗位id",required = true, dataType = "string"),
})
@GetMapping(value = "/entUserPostDuty")
@PreAuthorize("hasAnyAuthority('PERSONAL:POSTDUTY','PERSONAL:POSTDUTY:UPDATE')")
@MethodAnnotation(authorizations = {"PERSONAL:POSTDUTY","PERSONAL:POSTDUTY:UPDATE"})
@ResponseBody
public SingleResult entUserPostDuty(String enterpriseId, String postId)throws Exception{
return pcBusinessService.entUserPostDuty(enterpriseId,postId);
}
/**
* 企业用户证照表
* @param entUserId 企业用户id
* @return 企业用户证照表
* @throws Exception
*/
@ApiOperation(value = "企业用户证照表", notes = "企业用户证照表")
@ApiImplicitParams({
@ApiImplicitParam(name = "entUserId", value = "企业用户id",required = true, dataType = "string"),
})
@GetMapping(value = "/entUserCredential")
@PreAuthorize("hasAnyAuthority('PERSONAL:ENTUSERCREDENTIAL','PERSONAL:ENTUSERCREDENTIAL:UPDATE')")
@MethodAnnotation(authorizations = {"PERSONAL:ENTUSERCREDENTIAL","PERSONAL:ENTUSERCREDENTIAL:UPDATE"})
@ResponseBody
public SingleResult entUserCredential(String entUserId)throws Exception{
return pcBusinessService.entUserCredential(null,entUserId);
}
/**
* 企业用户证照表-新增,修改
* @param entUserCredentialUpdateDto 企业用户证件对象
* @return 成功或失败
* @throws Exception
*/
@ApiOperation(value = "企业用户证照表-新增,修改", notes = "企业用户证照表-新增,修改")
@ApiImplicitParams({
@ApiImplicitParam(name = "entUserId", value = "企业用户id",required = true, dataType = "string"),
})
@PostMapping(value = "/entUserCredentialUpdate")
@PreAuthorize("hasAnyAuthority('PERSONAL:ENTUSERCREDENTIAL:UPDATE')")
@MethodAnnotation(authorizations = {"PERSONAL:ENTUSERCREDENTIAL:UPDATE"})
@ResponseBody
public SingleResult entUserCredentialUpdate(@RequestBody EntUserCredentialUpdateDto entUserCredentialUpdateDto)throws Exception{
return pcBusinessService.entUserCredentialUpdate(entUserCredentialUpdateDto);
}
/**
* 企业用户证照表-删除
* @param credentialId 企业用户证件表删除
* @return 成功或失败
* @throws Exception
*/
@ApiOperation(value = "企业用户证照表-删除", notes = "企业用户证照表-删除")
@ApiImplicitParams({
@ApiImplicitParam(name = "entUserId", value = "企业用户id",required = true, dataType = "string"),
})
@PostMapping(value = "/entUserCredentialDelete")
@PreAuthorize("hasAnyAuthority('PERSONAL:ENTUSERCREDENTIAL:DELETE')")
@MethodAnnotation(authorizations = {"PERSONAL:ENTUSERCREDENTIAL:DELETE"})
@ResponseBody
public SingleResult entUserCredentialDelete(String credentialId)throws Exception{
return pcBusinessService.entUserCredentialDelete(credentialId);
}
/**
* 企业岗位总体信息
* @param keyContent
* @return list
* @throws Exception
*/
}

View File

@ -39,7 +39,7 @@ public class JwtAuthenticationTokenFiler extends OncePerRequestFilter {
@Override
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
//获取token
String token = request.getHeader("token");
String token = request.getHeader("userToken");
if (!StringUtils.hasText(token)) {
//放行
filterChain.doFilter(request, response);

View File

@ -1,23 +1,29 @@
package com.rzyc.service;
import cn.jiguang.common.TimeUnit;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.common.utils.DateUtils;
import com.common.utils.StringUtils;
import com.common.utils.TypeConversion;
import com.common.utils.model.Code;
import com.common.utils.model.Message;
import com.common.utils.model.SingleResult;
import com.rzyc.bean.emergency.PlanList;
import com.rzyc.controller.BaseController;
import com.rzyc.mapper.EntPostTaskMapper;
import com.rzyc.model.EntPostDuty;
import com.rzyc.model.EntPostList;
import com.rzyc.model.EntPostTask;
import com.rzyc.model.EntUserCredential;
import com.rzyc.model.dto.EntUserCredentialUpdateDto;
import com.rzyc.model.ent.EntPost;
import com.rzyc.model.ent.EntUser;
import com.rzyc.model.ent.SysEnterprise;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* 企业端pc业务 Service
@ -82,12 +88,59 @@ public class PcBusinessService extends BaseController {
}
public SingleResult entUserPostTask(String enterpriseId, String entUserId,String postId,String listId){
public SingleResult entUserPostTask(String enterpriseId, String entUserId,String postId,String listId,String content,Integer taskState){
SingleResult singleResult = new SingleResult();
//EntPostTask
List<EntPostTask>list = entPostTaskMapper.selectEntUserPostTask(enterpriseId,entUserId,postId,listId,content,taskState);
singleResult.setData(list);
return singleResult;
}
public SingleResult entUserPostDuty(String enterpriseId, String postId){
SingleResult singleResult = new SingleResult();
//EntPostDuty
List<EntPostDuty>list = entPostDutyMapper.selectEntUserPostDuty(enterpriseId,postId);
singleResult.setData(list);
return singleResult;
}
public SingleResult entUserCredential(String enterpriseId, String entUserId){
SingleResult singleResult = new SingleResult();
List<EntUserCredential>list = entUserCredentialMapper.selectEntUserCredential(enterpriseId,entUserId);
return singleResult;
}
public SingleResult entUserCredentialUpdate(EntUserCredentialUpdateDto entUserCredentialUpdateDto) throws Exception {
SingleResult singleResult = new SingleResult();
Integer result = 0;
if (StringUtils.isNotBlank(entUserCredentialUpdateDto.getCredentialId())) {
entUserCredentialUpdateDto.setModifyBy(getUserId());
entUserCredentialUpdateDto.setModifyTime(new Date());
result = entUserCredentialMapper.updateEntUserCredential(entUserCredentialUpdateDto);
}else {
entUserCredentialUpdateDto.setCreateBy(getUserId());
entUserCredentialUpdateDto.setCreateTime(new Date());
result = entUserCredentialMapper.insertEntUserCredential(entUserCredentialUpdateDto);
}
if (result==1){
singleResult.setCode(Code.SUCCESS.getCode());
singleResult.setMessage(Message.SUCCESS);
}
return singleResult;
}
public SingleResult entUserCredentialDelete(String credentialId){
SingleResult singleResult = new SingleResult();
int result = entUserCredentialMapper.entUserCredentialDelete(credentialId);
if (result==1){
singleResult.setCode(Code.SUCCESS.getCode());
singleResult.setMessage(Message.SUCCESS);
}
return singleResult;
}
}