Commit 9617defa by zhiwj

bug

parent 494f2f9e
package com.gic.store.dto;
import java.io.Serializable;
import java.util.Date;
/**
* @author zhiwj
* @Description:
* @date 2020-07-15 16:55
*/
public class ClerkPositionDTO implements Serializable {
private static final long serialVersionUID = -1393821407141417895L;
/**
*
*/
private Integer clerkPositionId;
/**
*
*/
private Integer enterpriseId;
/**
*
*/
private String positionName;
/**
*
*/
private String positionCode;
/**
*
*/
private Double sort;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
/**
*
*/
private Integer status;
public Integer getClerkPositionId() {
return clerkPositionId;
}
public void setClerkPositionId(Integer clerkPositionId) {
this.clerkPositionId = clerkPositionId;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getPositionName() {
return positionName;
}
public void setPositionName(String positionName) {
this.positionName = positionName;
}
public String getPositionCode() {
return positionCode;
}
public void setPositionCode(String positionCode) {
this.positionCode = positionCode;
}
public Double getSort() {
return sort;
}
public void setSort(Double sort) {
this.sort = sort;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
}
package com.gic.store.service;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.store.dto.ClerkPositionDTO;
import java.util.List;
/**
* @author zhiwj
* @Description:
* @date 2020-07-15 16:55
*/
public interface ClerkPositionApiService {
/**
* @Title: save
* @Description:
* @author zhiwj
* @param clerkPositionDTO
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<Void> save(ClerkPositionDTO clerkPositionDTO);
/**
* @Title: update
* @Description:
* @author zhiwj
* @param clerkPositionDTO
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<Void> update(ClerkPositionDTO clerkPositionDTO);
/**
* @Title: getByClerkPositionId
* @Description:
* @author zhiwj
* @param clerkPositionId
* @return com.gic.api.base.commons.ServiceResponse<com.gic.store.dto.ClerkPositionDTO>
* @throws
*/
ServiceResponse<ClerkPositionDTO> getByClerkPositionId(Integer clerkPositionId);
/**
* @Title: delete
* @Description:
* @author zhiwj
* @param clerkPositionId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<Void> delete(Integer clerkPositionId);
/**
* @Title: listClerkPosition
* @Description:
* @author zhiwj
* @param search
* @param currentPage
* @param pageSize
* @return com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.store.dto.ClerkPositionDTO>>
* @throws
*/
ServiceResponse<Page<ClerkPositionDTO>> listClerkPosition(String search, Integer currentPage, Integer pageSize);
/**
* @Title: listAllClerkPosition
* @Description:
* @author zhiwj
* @param search
* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.store.dto.ClerkPositionDTO>>
* @throws
*/
ServiceResponse<List<ClerkPositionDTO>> listAllClerkPosition(String search);
/**
* @Title: setSort
* @Description:
* @author zhiwj
* @param enterpriseId
* @param clerkPositionId
* @param seq
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse<Void> setSort(Integer enterpriseId, Integer clerkPositionId, Integer seq);
}
......@@ -58,7 +58,7 @@ public interface TabClerkMapper {
Integer countByPhoneNumber(@Param("storeId") Integer storeId, @Param("phoneNumber") String phoneNumber, @Param("clerkId") Integer clerkId);
List<TabClerk> listClerkByStoreInfoId(@Param("enterpriseId") Integer enterpriseId, @Param("storeClerkIds") List<Integer> storeClerkIds, @Param("storeInfoIds") String storeInfoIds, @Param("search") String search, @Param("clerkType") Integer clerkType);
List<TabClerk> listClerkByStoreInfoId(@Param("enterpriseId") Integer enterpriseId, @Param("storeClerkIds") List<Integer> storeClerkIds, @Param("storeInfoIds") String storeInfoIds, @Param("search") String search, @Param("clerkType") Integer clerkType, @Param("status") Integer status);
Integer getTotalClerk(@Param("enterpriseId") Integer enterpriseId, @Param("storeClerkIds") List<Integer> storeClerkIds, @Param("search") String search);
......
package com.gic.store.dao.mapper;
import com.gic.store.entity.TabClerkPosition;
import com.github.pagehelper.Page;
public interface TabClerkPositionMapper {
/**
* 根据主键删除
*
* @param clerkPositionId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer clerkPositionId);
/**
* 插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insert(TabClerkPosition record);
/**
* 动态插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insertSelective(TabClerkPosition record);
/**
* 根据主键查询
*
* @param clerkPositionId 主键
* @return 实体对象
*/
TabClerkPosition selectByPrimaryKey(Integer clerkPositionId);
/**
* 根据主键动态更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKeySelective(TabClerkPosition record);
/**
* 根据主键更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKey(TabClerkPosition record);
TabClerkPosition getSelective(TabClerkPosition tabClerkPosition);
Page<TabClerkPosition> listClerkPosition(String search);
}
\ No newline at end of file
package com.gic.store.entity;
import java.util.Date;
/**
* tab_clerk_position
*/
public class TabClerkPosition {
/**
*
*/
private Integer clerkPositionId;
/**
*
*/
private Integer enterpriseId;
/**
*
*/
private String positionName;
/**
*
*/
private String positionCode;
/**
*
*/
private Double sort;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
/**
*
*/
private Integer status;
public Integer getClerkPositionId() {
return clerkPositionId;
}
public void setClerkPositionId(Integer clerkPositionId) {
this.clerkPositionId = clerkPositionId;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getPositionName() {
return positionName;
}
public void setPositionName(String positionName) {
this.positionName = positionName;
}
public String getPositionCode() {
return positionCode;
}
public void setPositionCode(String positionCode) {
this.positionCode = positionCode;
}
public Double getSort() {
return sort;
}
public void setSort(Double sort) {
this.sort = sort;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
}
\ No newline at end of file
package com.gic.store.service;
import com.gic.store.dto.ClerkPositionDTO;
import com.gic.store.entity.TabClerkPosition;
import com.github.pagehelper.Page;
import java.util.List;
/**
* @author zhiwj
* @Description:
* @date 2020-07-15 17:08
*/
public interface ClerkPositionService {
boolean isPositionNameRepeat(Integer enterpriseId, String positionName, Integer clerkPositionId);
boolean isPositionCodeRepeat(Integer enterpriseId, String positionCode, Integer clerkPositionId);
void save(ClerkPositionDTO clerkPositionDTO);
void update(ClerkPositionDTO clerkPositionDTO);
TabClerkPosition getByClerkPositionId(Integer clerkPositionId);
Page<TabClerkPosition> listClerkPosition(String search, Integer currentPage, Integer pageSize);
List<TabClerkPosition> listAllClerkPosition(String search);
void deleteById(Integer clerkPositionId);
}
package com.gic.store.service.impl;
import com.gic.commons.util.EntityUtil;
import com.gic.store.dao.mapper.TabClerkPositionMapper;
import com.gic.store.dto.ClerkPositionDTO;
import com.gic.store.entity.TabClerkPosition;
import com.gic.store.service.ClerkPositionService;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
* @author zhiwj
* @Description:
* @date 2020-07-15 17:08
*/
@Service
public class ClerkPositionServiceImpl implements ClerkPositionService {
@Autowired
private TabClerkPositionMapper tabClerkPositionMapper;
@Override
public boolean isPositionNameRepeat(Integer enterpriseId, String positionName, Integer clerkPositionId) {
TabClerkPosition tabClerkPosition = new TabClerkPosition();
tabClerkPosition.setEnterpriseId(enterpriseId);
tabClerkPosition.setPositionName(positionName);
tabClerkPosition.setClerkPositionId(clerkPositionId);
return tabClerkPositionMapper.getSelective(tabClerkPosition) != null;
}
@Override
public boolean isPositionCodeRepeat(Integer enterpriseId, String positionCode, Integer clerkPositionId) {
TabClerkPosition tabClerkPosition = new TabClerkPosition();
tabClerkPosition.setEnterpriseId(enterpriseId);
tabClerkPosition.setPositionName(positionCode);
tabClerkPosition.setClerkPositionId(clerkPositionId);
return tabClerkPositionMapper.getSelective(tabClerkPosition) != null;
}
@Override
public void save(ClerkPositionDTO clerkPositionDTO) {
TabClerkPosition clerkPosition = EntityUtil.changeEntityByJSON(TabClerkPosition.class, clerkPositionDTO);
clerkPosition.setCreateTime(new Date());
clerkPosition.setStatus(1);
tabClerkPositionMapper.insertSelective(clerkPosition);
}
@Override
public void update(ClerkPositionDTO clerkPositionDTO) {
TabClerkPosition clerkPosition = EntityUtil.changeEntityByJSON(TabClerkPosition.class, clerkPositionDTO);
tabClerkPositionMapper.updateByPrimaryKeySelective(clerkPosition);
}
@Override
public TabClerkPosition getByClerkPositionId(Integer clerkPositionId) {
return tabClerkPositionMapper.selectByPrimaryKey(clerkPositionId);
}
@Override
public Page<TabClerkPosition> listClerkPosition(String search, Integer currentPage, Integer pageSize) {
PageHelper.startPage(currentPage, pageSize);
return tabClerkPositionMapper.listClerkPosition(search);
}
@Override
public List<TabClerkPosition> listAllClerkPosition(String search) {
return tabClerkPositionMapper.listClerkPosition(search);
}
@Override
public void deleteById(Integer clerkPositionId) {
TabClerkPosition clerkPosition = new TabClerkPosition();
clerkPosition.setClerkPositionId(clerkPositionId);
clerkPosition.setStatus(0);
tabClerkPositionMapper.updateByPrimaryKeySelective(clerkPosition);
}
}
......@@ -97,17 +97,17 @@ public class ClerkServiceImpl implements ClerkService {
@Override
public List<TabClerk> listClerkByStoreInfoId(Integer enterpriseId, List<Integer> storeInfoIds, String search) {
return this.listClerkByStoreInfoId(enterpriseId, storeInfoIds, search, null);
return tabClerkMapper.listClerkByStoreInfoId(enterpriseId, storeInfoIds, null, search, null, 1);
}
@Override
public List<TabClerk> listClerkByStoreInfoId(Integer enterpriseId, String storeInfoIds, String search) {
return tabClerkMapper.listClerkByStoreInfoId(enterpriseId, null, storeInfoIds, search, null);
return tabClerkMapper.listClerkByStoreInfoId(enterpriseId, null, storeInfoIds, search, null, null);
}
@Override
public List<TabClerk> listClerkByStoreInfoId(Integer enterpriseId, List<Integer> storeInfoIds, String search, Integer clerkType) {
return tabClerkMapper.listClerkByStoreInfoId(enterpriseId, storeInfoIds, null, search, clerkType);
return tabClerkMapper.listClerkByStoreInfoId(enterpriseId, storeInfoIds, null, search, clerkType, null);
}
@Override
......@@ -151,7 +151,7 @@ public class ClerkServiceImpl implements ClerkService {
@Override
public List<TabClerk> listClerkByStoreInfoId(Integer enterpriseId, String search) {
return this.tabClerkMapper.listClerkByStoreInfoId(enterpriseId, null, null, search, null);
return this.tabClerkMapper.listClerkByStoreInfoId(enterpriseId, null, null, search, null, null);
}
@Override
......
package com.gic.store.service.outer.impl;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.response.EnterpriseServiceResponse;
import com.gic.store.dto.ClerkPositionDTO;
import com.gic.store.entity.TabClerkPosition;
import com.gic.store.service.ClerkPositionApiService;
import com.gic.store.service.ClerkPositionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("clerkPositionApiService")
public class ClerkPositionApiServiceImpl implements ClerkPositionApiService {
@Autowired
private ClerkPositionService clerkPositionService;
@Override
public ServiceResponse<Void> save(ClerkPositionDTO clerkPositionDTO) {
// 校验参数
if (clerkPositionService.isPositionNameRepeat(clerkPositionDTO.getEnterpriseId(), clerkPositionDTO.getPositionName(), null)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "角色名称错误");
}
if (clerkPositionService.isPositionCodeRepeat(clerkPositionDTO.getEnterpriseId(), clerkPositionDTO.getPositionCode(), null)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "角色代码错误");
}
// 保存实体
clerkPositionService.save(clerkPositionDTO);
return ServiceResponse.success();
}
@Override
public ServiceResponse<Void> update(ClerkPositionDTO clerkPositionDTO) {
if (clerkPositionService.isPositionNameRepeat(clerkPositionDTO.getEnterpriseId(), clerkPositionDTO.getPositionName(), clerkPositionDTO.getClerkPositionId())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "角色名称错误");
}
if (clerkPositionService.isPositionCodeRepeat(clerkPositionDTO.getEnterpriseId(), clerkPositionDTO.getPositionCode(), clerkPositionDTO.getClerkPositionId())) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "角色代码错误");
}
// 保存实体
clerkPositionService.update(clerkPositionDTO);
return ServiceResponse.success();
}
@Override
public ServiceResponse<ClerkPositionDTO> getByClerkPositionId(Integer clerkPositionId) {
TabClerkPosition clerkPosition = this.clerkPositionService.getByClerkPositionId(clerkPositionId);
ClerkPositionDTO clerkPositionDTO = EntityUtil.changeEntityByJSON(ClerkPositionDTO.class, clerkPosition);
return EnterpriseServiceResponse.success(clerkPositionDTO);
}
@Override
public ServiceResponse<Page<ClerkPositionDTO>> listClerkPosition(String search, Integer currentPage, Integer pageSize) {
com.github.pagehelper.Page<TabClerkPosition> clerkPositionList = clerkPositionService.listClerkPosition(search, currentPage, pageSize);
Page<ClerkPositionDTO> clerkPositionDTOPage = PageHelperUtils.changePageHelperToCurrentPage(clerkPositionList, ClerkPositionDTO.class);
return EnterpriseServiceResponse.success(clerkPositionDTOPage);
}
@Override
public ServiceResponse<List<ClerkPositionDTO>> listAllClerkPosition(String search) {
List<TabClerkPosition> clerkPositionList = clerkPositionService.listAllClerkPosition(search);
return EnterpriseServiceResponse.success(EntityUtil.changeEntityListByJSON(ClerkPositionDTO.class, clerkPositionList));
}
@Override
public ServiceResponse<Void> setSort(Integer enterpriseId, Integer clerkPositionId, Integer seq) {
return null;
}
@Override
public ServiceResponse<Void> delete(Integer clerkPositionId) {
TabClerkPosition clerkPosition = this.clerkPositionService.getByClerkPositionId(clerkPositionId);
if (clerkPosition == null) {
return EnterpriseServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "数据不存在或已删除");
}
this.clerkPositionService.deleteById(clerkPositionId);
return EnterpriseServiceResponse.success();
}
}
\ No newline at end of file
......@@ -253,6 +253,9 @@
<if test="clerkType != null ">
and clerk_type = #{clerkType}
</if>
<if test="status != null ">
and status = #{status}
</if>
</select>
<select id="getTotalClerk" resultType="int">
select
......
<?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.gic.store.dao.mapper.TabClerkPositionMapper">
<resultMap id="BaseResultMap" type="com.gic.store.entity.TabClerkPosition">
<id column="clerk_position_id" jdbcType="INTEGER" property="clerkPositionId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="position_name" jdbcType="VARCHAR" property="positionName" />
<result column="position_code" jdbcType="VARCHAR" property="positionCode" />
<result column="sort" jdbcType="DOUBLE" property="sort" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="status" jdbcType="INTEGER" property="status" />
</resultMap>
<sql id="Base_Column_List">
clerk_position_id, enterprise_id, position_name, position_code, sort, create_time,
update_time, status
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_clerk_position
where clerk_position_id = #{clerkPositionId,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from tab_clerk_position
where clerk_position_id = #{clerkPositionId,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.gic.store.entity.TabClerkPosition">
insert into tab_clerk_position (clerk_position_id, enterprise_id, position_name,
position_code, sort, create_time,
update_time, status)
values (#{clerkPositionId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{positionName,jdbcType=VARCHAR},
#{positionCode,jdbcType=VARCHAR}, #{sort,jdbcType=DOUBLE}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="com.gic.store.entity.TabClerkPosition">
insert into tab_clerk_position
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="clerkPositionId != null">
clerk_position_id,
</if>
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="positionName != null">
position_name,
</if>
<if test="positionCode != null">
position_code,
</if>
<if test="sort != null">
sort,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
<if test="status != null">
status,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="clerkPositionId != null">
#{clerkPositionId,jdbcType=INTEGER},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="positionName != null">
#{positionName,jdbcType=VARCHAR},
</if>
<if test="positionCode != null">
#{positionCode,jdbcType=VARCHAR},
</if>
<if test="sort != null">
#{sort,jdbcType=DOUBLE},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.store.entity.TabClerkPosition">
update tab_clerk_position
<set>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="positionName != null">
position_name = #{positionName,jdbcType=VARCHAR},
</if>
<if test="positionCode != null">
position_code = #{positionCode,jdbcType=VARCHAR},
</if>
<if test="sort != null">
sort = #{sort,jdbcType=DOUBLE},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
</set>
where clerk_position_id = #{clerkPositionId,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.store.entity.TabClerkPosition">
update tab_clerk_position
set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
position_name = #{positionName,jdbcType=VARCHAR},
position_code = #{positionCode,jdbcType=VARCHAR},
sort = #{sort,jdbcType=DOUBLE},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
status = #{status,jdbcType=INTEGER}
where clerk_position_id = #{clerkPositionId,jdbcType=INTEGER}
</update>
<select id="getSelective" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_clerk_position where status = 1
<if test="enterpriseId != null ">
and enterprise_id = #{enterpriseId}
</if>
<if test="positionName != null ">
and position_name = #{positionName}
</if>
<if test="positionCode != null ">
and position_code = #{positionCode}
</if>
<if test="clerkPositionId != null ">
and clerk_position_id &lt;&gt; #{clerkPositionId}
</if>
</select>
<select id="listClerkPosition" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_clerk_position where status = 1
<if test="search != null and search != '' ">
and ( position_name like concat('%', #{search}, '%') or position_code like concat('%', #{search}, '%') )
</if>
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment