diff --git a/lzbi-module/src/main/java/com/lzbi/common/SelectOptionsControl.java b/lzbi-module/src/main/java/com/lzbi/common/SelectOptionsControl.java index 12346bc..d5d54de 100644 --- a/lzbi-module/src/main/java/com/lzbi/common/SelectOptionsControl.java +++ b/lzbi-module/src/main/java/com/lzbi/common/SelectOptionsControl.java @@ -8,7 +8,7 @@ import com.lzbi.common.core.controller.BaseController; import com.lzbi.common.core.domain.AjaxResult; import com.lzbi.common.core.domain.TreeSelect; import com.lzbi.common.core.domain.entity.SysDept; -import com.lzbi.special.domain.DcBaseWorkSpecialDao; +import com.lzbi.special.domain.DcBaseWorkSpecial; import com.lzbi.special.service.DcBaseWorkSpecialService; import com.lzbi.system.service.impl.SysDeptServiceImpl; import io.swagger.annotations.ApiModel; @@ -74,8 +74,8 @@ public class SelectOptionsControl extends BaseController { @GetMapping("/special/list") public AjaxResult getSepcialSelectList() { - DcBaseWorkSpecialDao dcBaseWorkSpecialDao=new DcBaseWorkSpecialDao(); - return AjaxResult.success( dcBaseWorkSpecialService.selectDcBaseWorkSpecialDaoDictList(dcBaseWorkSpecialDao)); + DcBaseWorkSpecial dcBaseWorkSpecialDao=new DcBaseWorkSpecial(); + return AjaxResult.success( dcBaseWorkSpecialService.selectDcBaseWorkSpecialDictList(dcBaseWorkSpecialDao)); } //根据条件获取统计单元列表 @PostMapping("/assetInfo/list") diff --git a/lzbi-module/src/main/java/com/lzbi/module/base/BaseModuleEntity.java b/lzbi-module/src/main/java/com/lzbi/module/base/BaseModuleEntity.java index b7888ae..df79afa 100644 --- a/lzbi-module/src/main/java/com/lzbi/module/base/BaseModuleEntity.java +++ b/lzbi-module/src/main/java/com/lzbi/module/base/BaseModuleEntity.java @@ -41,6 +41,12 @@ public class BaseModuleEntity implements Serializable,Cloneable{ private Integer pageNum ; @ApiModelProperty("分页大小") private Integer pageSize ; + /** 部门id */ + @ApiModelProperty(name = "部门id",notes = "") + private Long deptId ; + /** 用户id */ + @ApiModelProperty(name = "用户id",notes = "") + private Long userId ; public String getTenantId() { return tenantId; } @@ -120,4 +126,19 @@ public class BaseModuleEntity implements Serializable,Cloneable{ public void setPageSize(Integer pageSize) { this.pageSize = pageSize; } + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } } diff --git a/lzbi-module/src/main/java/com/lzbi/special/mapper/DcBaseWorkSpecialMapper.java b/lzbi-module/src/main/java/com/lzbi/special/mapper/DcBaseWorkSpecialMapper.java index 11b2940..1dfc9a0 100644 --- a/lzbi-module/src/main/java/com/lzbi/special/mapper/DcBaseWorkSpecialMapper.java +++ b/lzbi-module/src/main/java/com/lzbi/special/mapper/DcBaseWorkSpecialMapper.java @@ -3,7 +3,7 @@ package com.lzbi.special.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.lzbi.special.domain.DcBaseWorkSpecialDao; +import com.lzbi.special.domain.DcBaseWorkSpecial; /** @@ -13,7 +13,7 @@ import com.lzbi.special.domain.DcBaseWorkSpecialDao; * @date 2023-11-28 */ -public interface DcBaseWorkSpecialMapper extends BaseMapper +public interface DcBaseWorkSpecialMapper extends BaseMapper { /** * 查询生产专业管理 @@ -21,32 +21,31 @@ public interface DcBaseWorkSpecialMapper extends BaseMapper selectDcBaseWorkSpecialDaoList(DcBaseWorkSpecialDao dcBaseWorkSpecialDao); - public List selectDcBaseWorkSpecialDaoDictList(DcBaseWorkSpecialDao dcBaseWorkSpecialDao); - + public List selectDcBaseWorkSpecialList(DcBaseWorkSpecial dcBaseWorkSpecial); + public List selectDcBaseWorkSpecialDictList(DcBaseWorkSpecial dcBaseWorkSpecial); /** * 新增生产专业管理 * - * @param dcBaseWorkSpecialDao 生产专业管理 + * @param dcBaseWorkSpecial 生产专业管理 * @return 结果 */ - public int insertDcBaseWorkSpecialDao(DcBaseWorkSpecialDao dcBaseWorkSpecialDao); + public int insertDcBaseWorkSpecial(DcBaseWorkSpecial dcBaseWorkSpecial); /** * 修改生产专业管理 * - * @param dcBaseWorkSpecialDao 生产专业管理 + * @param dcBaseWorkSpecial 生产专业管理 * @return 结果 */ - public int updateDcBaseWorkSpecialDao(DcBaseWorkSpecialDao dcBaseWorkSpecialDao); + public int updateDcBaseWorkSpecial(DcBaseWorkSpecial dcBaseWorkSpecial); /** * 删除生产专业管理 @@ -54,7 +53,7 @@ public interface DcBaseWorkSpecialMapper extends BaseMapper selectDcBaseWorkSpecialDaoList(DcBaseWorkSpecial dcBaseWorkSpecial) + public List selectDcBaseWorkSpecialList(DcBaseWorkSpecial dcBaseWorkSpecial) { return baseMapper.selectDcBaseWorkSpecialList(dcBaseWorkSpecial); } - public List selectDcBaseWorkSpecialDaoDictList(DcBaseWorkSpecialDao dcBaseWorkSpecialDao) + public List selectDcBaseWorkSpecialDictList(DcBaseWorkSpecial dcBaseWorkSpecial) { - return baseMapper.selectDcBaseWorkSpecialDaoDictList(dcBaseWorkSpecialDao); + return baseMapper.selectDcBaseWorkSpecialDictList(dcBaseWorkSpecial); } /** * 新增生产专业管理 @@ -66,7 +66,7 @@ public class DcBaseWorkSpecialService extends ServiceImpl - + @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select TENANT_ID, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DELETE_BY, DELETE_TIME, id, special_code, special_name from dc_base_work_special - and TENANT_ID = #{tenantId}, @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and special_name like concat('%', #{specialName}, '%') - select special_code, special_name from dc_base_work_special and TENANT_ID = #{tenantId}, @@ -38,12 +38,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and special_name like concat('%', #{specialName}, '%') - + select special_code, special_name from dc_base_work_special + + and TENANT_ID = #{tenantId}, + and special_code = #{specialCode} + and special_name like concat('%', #{specialName}, '%') + + + - + insert into dc_base_work_special TENANT_ID, @@ -71,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update dc_base_work_special TENANT_ID = #{tenantId}, @@ -88,11 +96,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + delete from dc_base_work_special where id = #{id} - + delete from dc_base_work_special where id in #{id}