Gitlink
/
microservices
43
0
Fork 9
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

feat(制品库功能开发): 重构制品库原代码 

完善制品库仓库列表接口
This commit is contained in:
OTTO 2024-06-20 15:01:28 +08:00
parent 3c3d979219
commit a62f768ea1
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryRepositoriesController.java
View File

@ -5,7 +5,6 @@ import com.microservices.common.core.web.domain.AjaxResult;
import com.microservices.common.core.web.page.GenericsTableDataInfo;
import com.microservices.common.log.annotation.Log;
import com.microservices.common.log.enums.BusinessType;
import com.microservices.common.security.annotation.RequiresPermissions;
import com.microservices.pms.productLibrary.domain.PmsProductLibraryRepositories;
import com.microservices.pms.productLibrary.domain.vo.PmsProductLibraryRepositoriesSimpleVo;
import com.microservices.pms.productLibrary.service.IPmsProductLibraryRepositoriesService;
@ -32,12 +31,12 @@ public class PmsProductLibraryRepositoriesController extends BaseController {
/**
* 查询制品库-仓库列表
*/
@RequiresPermissions("pms:pmsProductLibraryRepositories:list")
// @RequiresPermissions("pms:pmsProductLibraryRepositories:list")
@GetMapping("/list")
@ApiOperation(value = "查询制品库仓库列表")
public GenericsTableDataInfo<PmsProductLibraryRepositoriesSimpleVo> list(
@PathVariable String enterpriseIdentifier,
@ApiParam("搜索制品库名称") @RequestParam("search") String search) {
@ApiParam("搜索制品库名称") @RequestParam(value = "search", required = false) String search) {
startPage();
return pmsProductLibraryRepositoriesService.selectPmsProductLibraryRepositoriesPageList(enterpriseIdentifier, search);
}
@ -45,7 +44,7 @@ public class PmsProductLibraryRepositoriesController extends BaseController {
/**
* 获取制品库-仓库详细信息
*/
@RequiresPermissions("pms:pmsProductLibraryRepositories:query")
// @RequiresPermissions("pms:pmsProductLibraryRepositories:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(pmsProductLibraryRepositoriesService.selectPmsProductLibraryRepositoriesById(id));
@ -54,7 +53,7 @@ public class PmsProductLibraryRepositoriesController extends BaseController {
/**
* 新增制品库-仓库
*/
@RequiresPermissions("pms:pmsProductLibraryRepositories:add")
// @RequiresPermissions("pms:pmsProductLibraryRepositories:add")
@Log(title = "制品库-仓库", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody PmsProductLibraryRepositories pmsProductLibraryRepositories) {
@ -64,7 +63,7 @@ public class PmsProductLibraryRepositoriesController extends BaseController {
/**
* 修改制品库-仓库
*/
@RequiresPermissions("pms:pmsProductLibraryRepositories:edit")
// @RequiresPermissions("pms:pmsProductLibraryRepositories:edit")
@Log(title = "制品库-仓库", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody PmsProductLibraryRepositories pmsProductLibraryRepositories) {
@ -74,7 +73,7 @@ public class PmsProductLibraryRepositoriesController extends BaseController {
/**
* 删除制品库-仓库
*/
@RequiresPermissions("pms:pmsProductLibraryRepositories:remove")
// @RequiresPermissions("pms:pmsProductLibraryRepositories:remove")
@Log(title = "制品库-仓库", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {

4
microservices-modules/microservices-modules-pms/src/main/resources/mapper/pms/PmsProductLibraryRepositoriesMapper.xml
View File

@ -63,14 +63,14 @@
<select id="selectPmsProductLibraryRepositoriesList" parameterType="PmsProductLibraryRepositories"
resultMap="PmsProductLibraryRepositoriesResult">
<include refid="selectPmsProductLibraryRepositoriesVo"/>
<include refid="selectPmsProductLibraryRepositoriesAliasVo"/>
<where>
<if test="name != null and name != ''">and pplr.name like concat('%', #{name}, '%')</if>
<if test="type != null and type != ''">and pplr.type = #{type}</if>
<if test="url != null and url != ''">and pplr.url = #{url}</if>
<if test="deptId != null ">and pplr.dept_id = #{deptId}</if>
<if test="pmsEnterpriseId != null ">and pplr.pms_enterprise_id = #{pmsEnterpriseId}</if>
<if test="pmsEnterpriseIdentifier != null ">and pplr.enterprise_identifier = #{pmsEnterpriseIdentifier}</if>
<if test="pmsEnterpriseIdentifier != null ">and pe.enterprise_identifier = #{pmsEnterpriseIdentifier}</if>
</where>
</select>