组织人员机具管理
This commit is contained in:
parent
2a17bb2201
commit
89e293575d
|
|
@ -14,7 +14,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
|
|||
* @author bonus
|
||||
*/
|
||||
@EnableCustomConfig
|
||||
@EnableCustomSwagger2
|
||||
//@EnableCustomSwagger2
|
||||
@EnableRyFeignClients
|
||||
@SpringBootApplication(scanBasePackages = {"com.bonus.common.biz.*", "com.bonus.material.*"}, exclude = { DataSourceAutoConfiguration.class })
|
||||
@EnableScheduling
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import java.util.List;
|
|||
import javax.servlet.http.HttpServletResponse;
|
||||
import com.bonus.common.log.enums.OperaType;
|
||||
import com.bonus.material.common.annotation.PreventRepeatSubmit;
|
||||
import com.bonus.material.ma.domain.vo.MaTypeVo;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
|
@ -141,4 +142,43 @@ public class TypeRepairController extends BaseController
|
|||
{
|
||||
return toAjax(typeRepairService.deleteTypeRepairByUserIdAndTypeId(typeRepairs));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增人员配置
|
||||
*/
|
||||
@ApiOperation(value = "新增人员配置")
|
||||
@PreventRepeatSubmit
|
||||
@RequiresPermissions("ma:manage:add")
|
||||
@SysLog(title = "新增人员配置", businessType = OperaType.INSERT, module = "仓储管理->新增人员配置")
|
||||
@PostMapping("/addTypeManage")
|
||||
public AjaxResult addTypeManage(@RequestBody List<TypeRepair> typeRepairs)
|
||||
{
|
||||
return toAjax(typeRepairService.addTypeManage(typeRepairs));
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询人员配置列表
|
||||
*/
|
||||
@ApiOperation(value = "查询人员配置列表")
|
||||
@RequiresPermissions("ma:manage:list")
|
||||
@GetMapping("/getTypeManageList")
|
||||
public TableDataInfo getTypeManageList(MaTypeVo maTypeVo)
|
||||
{
|
||||
startPage();
|
||||
List<MaTypeVo> list = typeRepairService.getTypeManageList(maTypeVo);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除维修班机具配置
|
||||
*/
|
||||
@ApiOperation(value = "删除单个维修班机具配置")
|
||||
@PreventRepeatSubmit
|
||||
@RequiresPermissions("ma:manage:remove")
|
||||
@SysLog(title = "维修班机具配置", businessType = OperaType.DELETE, module = "仓储管理->删除单个维修班机具配置")
|
||||
@PostMapping("/unbindTypeManage")
|
||||
public AjaxResult unbindTypeManage(@RequestBody List<TypeRepair> typeRepairs)
|
||||
{
|
||||
return toAjax(typeRepairService.deleteTypeManageByUserIdAndTypeId(typeRepairs));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,6 +25,11 @@ public class TypeRepair extends BaseEntity {
|
|||
/** 类型ID */
|
||||
private Long typeId;
|
||||
|
||||
/**
|
||||
* 类型名称
|
||||
*/
|
||||
private String typeName;
|
||||
|
||||
/** 用户 */
|
||||
@Excel(name = "用户")
|
||||
@ApiModelProperty(value = "用户")
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import java.util.List;
|
|||
|
||||
import com.bonus.common.core.web.domain.AjaxResult;
|
||||
import com.bonus.material.ma.domain.TypeRepair;
|
||||
import com.bonus.material.ma.domain.vo.MaTypeVo;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
/**
|
||||
|
|
@ -79,4 +80,19 @@ public interface TypeRepairMapper {
|
|||
* @return
|
||||
*/
|
||||
List<TypeRepair> getRepairList(TypeRepair typeRepair);
|
||||
|
||||
/**
|
||||
*删除人员配置
|
||||
*/
|
||||
int deleteTypeManageByUserIdAndTypeId(List<TypeRepair> typeRepairs);
|
||||
|
||||
/**
|
||||
* 新增人员配置
|
||||
*/
|
||||
int insertTypeManage(List<TypeRepair> typeRepairs);
|
||||
|
||||
/**
|
||||
* 查询人员配置列表
|
||||
*/
|
||||
List<MaTypeVo> getTypeManageList(MaTypeVo maTypeVo);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import java.util.List;
|
|||
|
||||
import com.bonus.common.core.web.domain.AjaxResult;
|
||||
import com.bonus.material.ma.domain.TypeRepair;
|
||||
import com.bonus.material.ma.domain.vo.MaTypeVo;
|
||||
|
||||
/**
|
||||
* 维修班机具配置Service接口
|
||||
|
|
@ -76,4 +77,21 @@ public interface ITypeRepairService {
|
|||
* @return
|
||||
*/
|
||||
AjaxResult getRepairList(TypeRepair typeRepair);
|
||||
|
||||
/**
|
||||
* 新增人员配置
|
||||
*/
|
||||
int addTypeManage(List<TypeRepair> typeRepairs);
|
||||
|
||||
/**
|
||||
* 查询人员配置列表
|
||||
*/
|
||||
List<MaTypeVo> getTypeManageList(MaTypeVo maTypeVo);
|
||||
|
||||
/**
|
||||
* 删除维修班机具配置
|
||||
* @param typeRepairs
|
||||
* @return
|
||||
*/
|
||||
int deleteTypeManageByUserIdAndTypeId(List<TypeRepair> typeRepairs);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package com.bonus.material.ma.service.impl;
|
|||
import java.util.List;
|
||||
import com.bonus.common.core.utils.DateUtils;
|
||||
import com.bonus.common.core.web.domain.AjaxResult;
|
||||
import com.bonus.material.ma.domain.vo.MaTypeVo;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.bonus.material.ma.mapper.TypeRepairMapper;
|
||||
|
|
@ -129,4 +130,39 @@ public class TypeRepairServiceImpl implements ITypeRepairService {
|
|||
public AjaxResult getRepairList(TypeRepair typeRepair) {
|
||||
return AjaxResult.success(typeRepairMapper.getRepairList(typeRepair));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增人员配置
|
||||
*/
|
||||
@Override
|
||||
public int addTypeManage(List<TypeRepair> typeRepairs) {
|
||||
if (CollectionUtils.isEmpty(typeRepairs)) {
|
||||
return 0;
|
||||
}
|
||||
typeRepairs.forEach(typeRepair -> typeRepair.setCreateTime(DateUtils.getNowDate()));
|
||||
typeRepairMapper.deleteTypeManageByUserIdAndTypeId(typeRepairs);
|
||||
return typeRepairMapper.insertTypeManage(typeRepairs);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询人员配置列表
|
||||
*/
|
||||
@Override
|
||||
public List<MaTypeVo> getTypeManageList(MaTypeVo maTypeVo) {
|
||||
|
||||
return typeRepairMapper.getTypeManageList(maTypeVo);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除维修班机具配置
|
||||
* @param typeRepairs
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public int deleteTypeManageByUserIdAndTypeId(List<TypeRepair> typeRepairs) {
|
||||
return typeRepairMapper.deleteTypeManageByUserIdAndTypeId(typeRepairs);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,6 +43,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
)
|
||||
</foreach>
|
||||
</insert>
|
||||
<insert id="insertTypeManage">
|
||||
insert into ma_type_manage (type_id,user_id,create_time,update_time,company_id)
|
||||
values
|
||||
<foreach collection="list" item="item" separator=",">
|
||||
(
|
||||
#{item.typeId},
|
||||
#{item.userId},
|
||||
#{item.createTime},
|
||||
#{item.updateTime},
|
||||
#{item.companyId}
|
||||
)
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<update id="updateTypeRepair" parameterType="com.bonus.material.ma.domain.TypeRepair">
|
||||
update ma_type_repair
|
||||
|
|
@ -93,6 +106,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
mtk.user_id,
|
||||
su.nick_name
|
||||
</select>
|
||||
<select id="getTypeManageList" resultType="com.bonus.material.ma.domain.vo.MaTypeVo">
|
||||
SELECT DISTINCT
|
||||
mt.type_id as typeId,
|
||||
mt.type_name as typeName,
|
||||
mtm.user_id as keeperUserId,
|
||||
su.nick_name as keeperUserName
|
||||
FROM
|
||||
ma_type mt
|
||||
LEFT JOIN wh_house_set mhs on mt.type_id = mhs.type_id
|
||||
LEFT JOIN ma_type_manage mtm on mt.type_id = mtm.type_id
|
||||
LEFT JOIN sys_user su on su.user_id = mtm.user_id
|
||||
<where>
|
||||
<if test="level == 1">
|
||||
and mt.type_id = #{typeId}
|
||||
</if>
|
||||
and mt.type_id is not null
|
||||
and mhs.house_id = #{houseId} and mhs.del_flag = 0
|
||||
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<delete id="deleteTypeRepairByUserIdAndTypeId">
|
||||
delete from ma_type_repair where
|
||||
|
|
@ -106,4 +139,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
#{item.userId}
|
||||
</foreach>
|
||||
</delete>
|
||||
<delete id="deleteTypeManageByUserIdAndTypeId">
|
||||
delete from ma_type_manage where
|
||||
type_id in
|
||||
<foreach collection="list" item="item" open="(" separator="," close=")">
|
||||
#{item.typeId}
|
||||
</foreach>
|
||||
and
|
||||
user_id in
|
||||
<foreach collection="list" item="item" open="(" separator="," close=")">
|
||||
#{item.userId}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue