BJ_FS / urbanops

Commit 0e22b45c51d68bb8e087fd423cd89de76476a222

Authored by wangqian
1 parent 75729b30

物料管理迁移

Inline Side-by-side
Showing 25 changed files with 1206 additions and 135 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/material/MaterialController.java 0 → 100644
  View file @0e22b45
  1 +package com.zteits.urbanops.module.garden.controller.admin.material;
  2 +
  3 +import org.springframework.web.bind.annotation.*;
  4 +import jakarta.annotation.Resource;
  5 +import org.springframework.validation.annotation.Validated;
  6 +import org.springframework.security.access.prepost.PreAuthorize;
  7 +import io.swagger.v3.oas.annotations.tags.Tag;
  8 +import io.swagger.v3.oas.annotations.Parameter;
  9 +import io.swagger.v3.oas.annotations.Operation;
  10 +
  11 +import jakarta.validation.constraints.*;
  12 +import jakarta.validation.*;
  13 +import jakarta.servlet.http.*;
  14 +import java.util.*;
  15 +import java.io.IOException;
  16 +
  17 +import com.zteits.urbanops.framework.common.pojo.PageParam;
  18 +import com.zteits.urbanops.framework.common.pojo.PageResult;
  19 +import com.zteits.urbanops.framework.common.pojo.CommonResult;
  20 +import com.zteits.urbanops.framework.common.util.object.BeanUtils;
  21 +import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
  22 +
  23 +import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
  24 +
  25 +import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
  26 +import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*;
  27 +
  28 +import com.zteits.urbanops.module.garden.controller.admin.material.vo.*;
  29 +import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialDO;
  30 +import com.zteits.urbanops.module.garden.service.material.MaterialService;
  31 +
  32 +@Tag(name = "管理后台 - 耗材管理")
  33 +@RestController
  34 +@RequestMapping("/garden/material")
  35 +@Validated
  36 +public class MaterialController {
  37 +
  38 + @Resource
  39 + private MaterialService materialService;
  40 +
  41 + @PostMapping("/create")
  42 + @Operation(summary = "创建耗材管理")
  43 + @PreAuthorize("@ss.hasPermission('garden:material:create')")
  44 + public CommonResult<Long> createMaterial(@Valid @RequestBody MaterialSaveReqVO createReqVO) {
  45 + return success(materialService.createMaterial(createReqVO));
  46 + }
  47 +
  48 + @PutMapping("/update")
  49 + @Operation(summary = "更新耗材管理")
  50 + @PreAuthorize("@ss.hasPermission('garden:material:update')")
  51 + public CommonResult<Boolean> updateMaterial(@Valid @RequestBody MaterialSaveReqVO updateReqVO) {
  52 + materialService.updateMaterial(updateReqVO);
  53 + return success(true);
  54 + }
  55 +
  56 + @DeleteMapping("/delete")
  57 + @Operation(summary = "删除耗材管理")
  58 + @Parameter(name = "id", description = "编号", required = true)
  59 + @PreAuthorize("@ss.hasPermission('garden:material:delete')")
  60 + public CommonResult<Boolean> deleteMaterial(@RequestParam("id") Long id) {
  61 + materialService.deleteMaterial(id);
  62 + return success(true);
  63 + }
  64 +
  65 + @DeleteMapping("/delete-list")
  66 + @Parameter(name = "ids", description = "编号", required = true)
  67 + @Operation(summary = "批量删除耗材管理")
  68 + @PreAuthorize("@ss.hasPermission('garden:material:delete')")
  69 + public CommonResult<Boolean> deleteMaterialList(@RequestParam("ids") List<Long> ids) {
  70 + materialService.deleteMaterialListByIds(ids);
  71 + return success(true);
  72 + }
  73 +
  74 + @GetMapping("/get")
  75 + @Operation(summary = "获得耗材管理")
  76 + @Parameter(name = "id", description = "编号", required = true, example = "1024")
  77 + @PreAuthorize("@ss.hasPermission('garden:material:query')")
  78 + public CommonResult<MaterialRespVO> getMaterial(@RequestParam("id") Long id) {
  79 + MaterialDO material = materialService.getMaterial(id);
  80 + return success(BeanUtils.toBean(material, MaterialRespVO.class));
  81 + }
  82 +
  83 + @GetMapping("/page")
  84 + @Operation(summary = "获得耗材管理分页")
  85 + @PreAuthorize("@ss.hasPermission('garden:material:query')")
  86 + public CommonResult<PageResult<MaterialRespVO>> getMaterialPage(@Valid MaterialPageReqVO pageReqVO) {
  87 + PageResult<MaterialDO> pageResult = materialService.getMaterialPage(pageReqVO);
  88 + return success(BeanUtils.toBean(pageResult, MaterialRespVO.class));
  89 + }
  90 +
  91 + @GetMapping("/export-excel")
  92 + @Operation(summary = "导出耗材管理 Excel")
  93 + @PreAuthorize("@ss.hasPermission('garden:material:export')")
  94 + @ApiAccessLog(operateType = EXPORT)
  95 + public void exportMaterialExcel(@Valid MaterialPageReqVO pageReqVO,
  96 + HttpServletResponse response) throws IOException {
  97 + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
  98 + List<MaterialDO> list = materialService.getMaterialPage(pageReqVO).getList();
  99 + // 导出 Excel
  100 + ExcelUtils.write(response, "耗材管理.xls", "数据", MaterialRespVO.class,
  101 + BeanUtils.toBean(list, MaterialRespVO.class));
  102 + }
  103 +
  104 +}
0 105 \ No newline at end of file
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/material/MaterialInController.java
  View file @0e22b45
... ... @@ -76,7 +76,7 @@ public class MaterialInController {
76 76 @Transactional(rollbackFor = Throwable.class)
77 77 public CommonResult<Boolean> add(@RequestBody MaterialInventoryInDO req) {
78 78 Long userId = SecurityFrameworkUtils.getLoginUserId();
79   - MaterialDO material = materialService.selectById(req.getMaterialId());
  79 + MaterialDO material = materialService.getMaterial(req.getMaterialId());
80 80 if (material == null) {
81 81 return com.zteits.urbanops.framework.common.pojo.CommonResult.error(400, "无效参数-materialId");
82 82 }
... ... @@ -148,4 +148,4 @@ public class MaterialInController {
148 148 inventoryMapper.updateById(upd);
149 149 return success(inMapper.deleteById(id) > 0);
150 150 }
151   -}
152 151 \ No newline at end of file
  152 +}
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/material/MaterialManagerController.java deleted
View file @75729b3
1   -package com.zteits.urbanops.module.garden.controller.admin.material;
2   -
3   -import com.zteits.urbanops.framework.common.pojo.CommonResult;
4   -import com.zteits.urbanops.framework.common.pojo.PageParam;
5   -import com.zteits.urbanops.framework.common.pojo.PageResult;
6   -import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
7   -import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialManagerDO;
8   -import com.zteits.urbanops.module.garden.dal.mysql.material.MaterialManagerMapper;
9   -import io.swagger.v3.oas.annotations.Operation;
10   -import io.swagger.v3.oas.annotations.tags.Tag;
11   -import jakarta.annotation.Resource;
12   -import org.springframework.security.access.prepost.PreAuthorize;
13   -import org.springframework.web.bind.annotation.*;
14   -
15   -import java.util.List;
16   -
17   -import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
18   -
19   -@Tag(name = "管理后台 - 物料管理")
20   -@RestController
21   -@RequestMapping("/material/manager")
22   -public class MaterialManagerController {
23   -
24   - @Resource
25   - private MaterialManagerMapper mapper;
26   -
27   - @PostMapping("/listForPage")
28   - @Operation(summary = "物料管理-分页")
29   - @PreAuthorize("@ss.hasPermission('material:manager:list')")
30   - public CommonResult<PageResult<MaterialManagerDO>> listForPage(@RequestBody MaterialManagerDO where,
31   - @RequestParam(value = "pageNum", required = false) Integer pageNum,
32   - @RequestParam(value = "pageSize", required = false) Integer pageSize) {
33   - PageParam page = new PageParam();
34   - page.setPageNo(pageNum == null ? 1 : pageNum);
35   - page.setPageSize(pageSize == null ? 10 : pageSize);
36   - where.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
37   - return success(mapper.selectPage(page, where));
38   - }
39   -
40   - @GetMapping("/list")
41   - @Operation(summary = "物料管理-列表")
42   - @PreAuthorize("@ss.hasPermission('material:manager:list')")
43   - public CommonResult<List<MaterialManagerDO>> list() {
44   - MaterialManagerDO where = new MaterialManagerDO();
45   - where.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
46   - return success(mapper.selectList(where));
47   - }
48   -
49   - @PostMapping("/add")
50   - @Operation(summary = "物料管理-添加")
51   - @PreAuthorize("@ss.hasPermission('material:manager:add')")
52   - public CommonResult<Boolean> add(@RequestBody MaterialManagerDO entity) {
53   - entity.setDeptId(SecurityFrameworkUtils.getLoginUserDeptId());
54   - entity.setCreator(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
55   - entity.setUpdater(entity.getCreator());
56   - entity.clean();
57   - return success(mapper.insert(entity) > 0);
58   - }
59   -
60   - @PostMapping("/edit")
61   - @Operation(summary = "物料管理-修改")
62   - @PreAuthorize("@ss.hasPermission('material:manager:edit')")
63   - public CommonResult<Boolean> edit(@RequestBody MaterialManagerDO entity) {
64   - entity.setUpdater(String.valueOf(SecurityFrameworkUtils.getLoginUserId()));
65   - entity.clean();
66   - return success(mapper.updateById(entity) > 0);
67   - }
68   -
69   - @GetMapping("/deleteById")
70   - @Operation(summary = "物料管理-删除")
71   - @PreAuthorize("@ss.hasPermission('material:manager:delete')")
72   - public CommonResult<Boolean> deleteById(@RequestParam("id") Long id) {
73   - return success(mapper.deleteById(id) > 0);
74   - }
75   -}
76 0 \ No newline at end of file
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/material/MaterialOutController.java
  View file @0e22b45
... ... @@ -76,7 +76,7 @@ public class MaterialOutController {
76 76 @Transactional(rollbackFor = Throwable.class)
77 77 public CommonResult<Boolean> add(@RequestBody MaterialInventoryOutDO req) {
78 78 Long userId = SecurityFrameworkUtils.getLoginUserId();
79   - MaterialDO material = materialService.selectById(req.getMaterialId());
  79 + MaterialDO material = materialService.getMaterial(req.getMaterialId());
80 80 if (material == null) {
81 81 return com.zteits.urbanops.framework.common.pojo.CommonResult.error(400, "无效参数");
82 82 }
... ... @@ -123,4 +123,4 @@ public class MaterialOutController {
123 123 inventoryMapper.updateById(upd);
124 124 return success(outMapper.deleteById(id) > 0);
125 125 }
126   -}
127 126 \ No newline at end of file
  127 +}
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/material/MaterialTypeController.java
  View file @0e22b45
... ... @@ -80,7 +80,7 @@ public class MaterialTypeController {
80 80 return success(BeanUtils.toBean(materialType, MaterialTypeRespVO.class));
81 81 }
82 82  
83   - @GetMapping("/page")
  83 + @GetMapping("/listForPage")
84 84 @Operation(summary = "获得物料类型分页")
85 85 @PreAuthorize("@ss.hasPermission('garden:material-type:query')")
86 86 public CommonResult<PageResult<MaterialTypeRespVO>> getMaterialTypePage(@Valid MaterialTypePageReqVO pageReqVO) {
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/material/MaterialTypeManagerController.java 0 → 100644
  View file @0e22b45
  1 +package com.zteits.urbanops.module.garden.controller.admin.material;
  2 +
  3 +import org.springframework.web.bind.annotation.*;
  4 +import jakarta.annotation.Resource;
  5 +import org.springframework.validation.annotation.Validated;
  6 +import org.springframework.security.access.prepost.PreAuthorize;
  7 +import io.swagger.v3.oas.annotations.tags.Tag;
  8 +import io.swagger.v3.oas.annotations.Parameter;
  9 +import io.swagger.v3.oas.annotations.Operation;
  10 +
  11 +import jakarta.validation.constraints.*;
  12 +import jakarta.validation.*;
  13 +import jakarta.servlet.http.*;
  14 +import java.util.*;
  15 +import java.io.IOException;
  16 +
  17 +import com.zteits.urbanops.framework.common.pojo.PageParam;
  18 +import com.zteits.urbanops.framework.common.pojo.PageResult;
  19 +import com.zteits.urbanops.framework.common.pojo.CommonResult;
  20 +import com.zteits.urbanops.framework.common.util.object.BeanUtils;
  21 +import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
  22 +
  23 +import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
  24 +
  25 +import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
  26 +import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.*;
  27 +
  28 +import com.zteits.urbanops.module.garden.controller.admin.material.vo.*;
  29 +import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialTypeManagerDO;
  30 +import com.zteits.urbanops.module.garden.service.material.MaterialTypeManagerService;
  31 +
  32 +@Tag(name = "管理后台 - 耗材类别管理")
  33 +@RestController
  34 +@RequestMapping("/garden/material-type-manager")
  35 +@Validated
  36 +public class MaterialTypeManagerController {
  37 +
  38 + @Resource
  39 + private MaterialTypeManagerService materialTypeManagerService;
  40 +
  41 + @PostMapping("/create")
  42 + @Operation(summary = "创建耗材类别管理")
  43 + @PreAuthorize("@ss.hasPermission('garden:material-type-manager:create')")
  44 + public CommonResult<Long> createMaterialTypeManager(@Valid @RequestBody MaterialTypeManagerSaveReqVO createReqVO) {
  45 + return success(materialTypeManagerService.createMaterialTypeManager(createReqVO));
  46 + }
  47 +
  48 + @PutMapping("/update")
  49 + @Operation(summary = "更新耗材类别管理")
  50 + @PreAuthorize("@ss.hasPermission('garden:material-type-manager:update')")
  51 + public CommonResult<Boolean> updateMaterialTypeManager(@Valid @RequestBody MaterialTypeManagerSaveReqVO updateReqVO) {
  52 + materialTypeManagerService.updateMaterialTypeManager(updateReqVO);
  53 + return success(true);
  54 + }
  55 +
  56 + @DeleteMapping("/delete")
  57 + @Operation(summary = "删除耗材类别管理")
  58 + @Parameter(name = "id", description = "编号", required = true)
  59 + @PreAuthorize("@ss.hasPermission('garden:material-type-manager:delete')")
  60 + public CommonResult<Boolean> deleteMaterialTypeManager(@RequestParam("id") Long id) {
  61 + materialTypeManagerService.deleteMaterialTypeManager(id);
  62 + return success(true);
  63 + }
  64 +
  65 + @DeleteMapping("/delete-list")
  66 + @Parameter(name = "ids", description = "编号", required = true)
  67 + @Operation(summary = "批量删除耗材类别管理")
  68 + @PreAuthorize("@ss.hasPermission('garden:material-type-manager:delete')")
  69 + public CommonResult<Boolean> deleteMaterialTypeManagerList(@RequestParam("ids") List<Long> ids) {
  70 + materialTypeManagerService.deleteMaterialTypeManagerListByIds(ids);
  71 + return success(true);
  72 + }
  73 +
  74 + @GetMapping("/get")
  75 + @Operation(summary = "获得耗材类别管理")
  76 + @Parameter(name = "id", description = "编号", required = true, example = "1024")
  77 + @PreAuthorize("@ss.hasPermission('garden:material-type-manager:query')")
  78 + public CommonResult<MaterialTypeManagerRespVO> getMaterialTypeManager(@RequestParam("id") Long id) {
  79 + MaterialTypeManagerDO materialTypeManager = materialTypeManagerService.getMaterialTypeManager(id);
  80 + return success(BeanUtils.toBean(materialTypeManager, MaterialTypeManagerRespVO.class));
  81 + }
  82 +
  83 + @GetMapping("/page")
  84 + @Operation(summary = "获得耗材类别管理分页")
  85 + @PreAuthorize("@ss.hasPermission('garden:material-type-manager:query')")
  86 + public CommonResult<PageResult<MaterialTypeManagerRespVO>> getMaterialTypeManagerPage(@Valid MaterialTypeManagerPageReqVO pageReqVO) {
  87 + PageResult<MaterialTypeManagerDO> pageResult = materialTypeManagerService.getMaterialTypeManagerPage(pageReqVO);
  88 + return success(BeanUtils.toBean(pageResult, MaterialTypeManagerRespVO.class));
  89 + }
  90 +
  91 + @GetMapping("/export-excel")
  92 + @Operation(summary = "导出耗材类别管理 Excel")
  93 + @PreAuthorize("@ss.hasPermission('garden:material-type-manager:export')")
  94 + @ApiAccessLog(operateType = EXPORT)
  95 + public void exportMaterialTypeManagerExcel(@Valid MaterialTypeManagerPageReqVO pageReqVO,
  96 + HttpServletResponse response) throws IOException {
  97 + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
  98 + List<MaterialTypeManagerDO> list = materialTypeManagerService.getMaterialTypeManagerPage(pageReqVO).getList();
  99 + // 导出 Excel
  100 + ExcelUtils.write(response, "耗材类别管理.xls", "数据", MaterialTypeManagerRespVO.class,
  101 + BeanUtils.toBean(list, MaterialTypeManagerRespVO.class));
  102 + }
  103 +
  104 +}
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/material/vo/MaterialPageReqVO.java 0 → 100644
  View file @0e22b45
  1 +package com.zteits.urbanops.module.garden.controller.admin.material.vo;
  2 +
  3 +import lombok.*;
  4 +import java.util.*;
  5 +import io.swagger.v3.oas.annotations.media.Schema;
  6 +import com.zteits.urbanops.framework.common.pojo.PageParam;
  7 +import org.springframework.format.annotation.DateTimeFormat;
  8 +import java.time.LocalDateTime;
  9 +
  10 +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  11 +
  12 +@Schema(description = "管理后台 - 耗材管理分页 Request VO")
  13 +@Data
  14 +public class MaterialPageReqVO extends PageParam {
  15 +
  16 + @Schema(description = "完整编码")
  17 + private String fullCode;
  18 +
  19 + @Schema(description = "物料编码")
  20 + private String materialCode;
  21 +
  22 + @Schema(description = "耗材名称", example = "李四")
  23 + private String materialName;
  24 +
  25 + @Schema(description = "耗材类型ID", example = "3767")
  26 + private Long materialTypeId;
  27 +
  28 + @Schema(description = "耗材类型名称", example = "张三")
  29 + private String materialTypeName;
  30 +
  31 + @Schema(description = "类别ID", example = "25951")
  32 + private Long typeId;
  33 +
  34 + @Schema(description = "类别名称：药品", example = "张三")
  35 + private String typeName;
  36 +
  37 + @Schema(description = "类别明细ID", example = "5524")
  38 + private Long typeDetailId;
  39 +
  40 + @Schema(description = "类别明细", example = "赵六")
  41 + private String typeDetailName;
  42 +
  43 + @Schema(description = "规格编码")
  44 + private String specCode;
  45 +
  46 + @Schema(description = "规格")
  47 + private String specifications;
  48 +
  49 + @Schema(description = "归属公司ID", example = "990")
  50 + private Long belongCompanyId;
  51 +
  52 + @Schema(description = "归属公司", example = "王五")
  53 + private String belongCompanyName;
  54 +
  55 + @Schema(description = "单位ID", example = "14415")
  56 + private Long unitId;
  57 +
  58 + @Schema(description = "单位", example = "芋艿")
  59 + private String unitName;
  60 +
  61 + @Schema(description = "创建时间")
  62 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  63 + private LocalDateTime[] createTime;
  64 +
  65 + @Schema(description = "备注", example = "随便")
  66 + private String remark;
  67 +
  68 + @Schema(description = "是否关联工单：0-否，1-是")
  69 + private Boolean isAssociatedOrder;
  70 +
  71 +}
0 72 \ No newline at end of file
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/material/vo/MaterialRespVO.java 0 → 100644
  View file @0e22b45
  1 +package com.zteits.urbanops.module.garden.controller.admin.material.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.*;
  5 +import java.util.*;
  6 +import org.springframework.format.annotation.DateTimeFormat;
  7 +import java.time.LocalDateTime;
  8 +import cn.idev.excel.annotation.*;
  9 +
  10 +@Schema(description = "管理后台 - 耗材管理 Response VO")
  11 +@Data
  12 +@ExcelIgnoreUnannotated
  13 +public class MaterialRespVO {
  14 +
  15 + @Schema(description = "耗材ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14347")
  16 + @ExcelProperty("耗材ID")
  17 + private Long materialId;
  18 +
  19 + @Schema(description = "完整编码")
  20 + @ExcelProperty("完整编码")
  21 + private String fullCode;
  22 +
  23 + @Schema(description = "物料编码")
  24 + @ExcelProperty("物料编码")
  25 + private String materialCode;
  26 +
  27 + @Schema(description = "耗材名称", example = "李四")
  28 + @ExcelProperty("耗材名称")
  29 + private String materialName;
  30 +
  31 + @Schema(description = "耗材类型ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3767")
  32 + @ExcelProperty("耗材类型ID")
  33 + private Long materialTypeId;
  34 +
  35 + @Schema(description = "耗材类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
  36 + @ExcelProperty("耗材类型名称")
  37 + private String materialTypeName;
  38 +
  39 + @Schema(description = "类别ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25951")
  40 + @ExcelProperty("类别ID")
  41 + private Long typeId;
  42 +
  43 + @Schema(description = "类别名称：药品", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
  44 + @ExcelProperty("类别名称：药品")
  45 + private String typeName;
  46 +
  47 + @Schema(description = "类别明细ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5524")
  48 + @ExcelProperty("类别明细ID")
  49 + private Long typeDetailId;
  50 +
  51 + @Schema(description = "类别明细", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
  52 + @ExcelProperty("类别明细")
  53 + private String typeDetailName;
  54 +
  55 + @Schema(description = "规格编码")
  56 + @ExcelProperty("规格编码")
  57 + private String specCode;
  58 +
  59 + @Schema(description = "规格", requiredMode = Schema.RequiredMode.REQUIRED)
  60 + @ExcelProperty("规格")
  61 + private String specifications;
  62 +
  63 + @Schema(description = "归属公司ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "990")
  64 + @ExcelProperty("归属公司ID")
  65 + private Long belongCompanyId;
  66 +
  67 + @Schema(description = "归属公司", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
  68 + @ExcelProperty("归属公司")
  69 + private String belongCompanyName;
  70 +
  71 + @Schema(description = "单位ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14415")
  72 + @ExcelProperty("单位ID")
  73 + private Long unitId;
  74 +
  75 + @Schema(description = "单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
  76 + @ExcelProperty("单位")
  77 + private String unitName;
  78 +
  79 + @Schema(description = "创建时间")
  80 + @ExcelProperty("创建时间")
  81 + private LocalDateTime createTime;
  82 +
  83 + @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "随便")
  84 + @ExcelProperty("备注")
  85 + private String remark;
  86 +
  87 + @Schema(description = "是否关联工单：0-否，1-是")
  88 + @ExcelProperty("是否关联工单：0-否，1-是")
  89 + private Boolean isAssociatedOrder;
  90 +
  91 +}
0 92 \ No newline at end of file
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/material/vo/MaterialSaveReqVO.java 0 → 100644
  View file @0e22b45
  1 +package com.zteits.urbanops.module.garden.controller.admin.material.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.*;
  5 +import java.util.*;
  6 +import jakarta.validation.constraints.*;
  7 +
  8 +@Schema(description = "管理后台 - 耗材管理新增/修改 Request VO")
  9 +@Data
  10 +public class MaterialSaveReqVO {
  11 +
  12 + @Schema(description = "耗材ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14347")
  13 + private Long materialId;
  14 +
  15 + @Schema(description = "完整编码")
  16 + private String fullCode;
  17 +
  18 + @Schema(description = "物料编码")
  19 + private String materialCode;
  20 +
  21 + @Schema(description = "耗材名称", example = "李四")
  22 + private String materialName;
  23 +
  24 + @Schema(description = "耗材类型ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3767")
  25 + @NotNull(message = "耗材类型ID不能为空")
  26 + private Long materialTypeId;
  27 +
  28 + @Schema(description = "耗材类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
  29 + @NotEmpty(message = "耗材类型名称不能为空")
  30 + private String materialTypeName;
  31 +
  32 + @Schema(description = "类别ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25951")
  33 + @NotNull(message = "类别ID不能为空")
  34 + private Long typeId;
  35 +
  36 + @Schema(description = "类别名称：药品", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
  37 + @NotEmpty(message = "类别名称：药品不能为空")
  38 + private String typeName;
  39 +
  40 + @Schema(description = "类别明细ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5524")
  41 + @NotNull(message = "类别明细ID不能为空")
  42 + private Long typeDetailId;
  43 +
  44 + @Schema(description = "类别明细", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六")
  45 + @NotEmpty(message = "类别明细不能为空")
  46 + private String typeDetailName;
  47 +
  48 + @Schema(description = "规格编码")
  49 + private String specCode;
  50 +
  51 + @Schema(description = "规格", requiredMode = Schema.RequiredMode.REQUIRED)
  52 + @NotEmpty(message = "规格不能为空")
  53 + private String specifications;
  54 +
  55 + @Schema(description = "归属公司ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "990")
  56 + @NotNull(message = "归属公司ID不能为空")
  57 + private Long belongCompanyId;
  58 +
  59 + @Schema(description = "归属公司", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
  60 + @NotEmpty(message = "归属公司不能为空")
  61 + private String belongCompanyName;
  62 +
  63 + @Schema(description = "单位ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14415")
  64 + @NotNull(message = "单位ID不能为空")
  65 + private Long unitId;
  66 +
  67 + @Schema(description = "单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
  68 + @NotEmpty(message = "单位不能为空")
  69 + private String unitName;
  70 +
  71 + @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "随便")
  72 + @NotEmpty(message = "备注不能为空")
  73 + private String remark;
  74 +
  75 + @Schema(description = "是否关联工单：0-否，1-是")
  76 + private Boolean isAssociatedOrder;
  77 +
  78 +}
0 79 \ No newline at end of file
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/material/vo/MaterialTypeManagerPageReqVO.java 0 → 100644
  View file @0e22b45
  1 +package com.zteits.urbanops.module.garden.controller.admin.material.vo;
  2 +
  3 +import lombok.*;
  4 +import java.util.*;
  5 +import io.swagger.v3.oas.annotations.media.Schema;
  6 +import com.zteits.urbanops.framework.common.pojo.PageParam;
  7 +import org.springframework.format.annotation.DateTimeFormat;
  8 +import java.time.LocalDateTime;
  9 +
  10 +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  11 +
  12 +@Schema(description = "管理后台 - 耗材类别管理分页 Request VO")
  13 +@Data
  14 +public class MaterialTypeManagerPageReqVO extends PageParam {
  15 +
  16 + @Schema(description = "种类ID", example = "1958")
  17 + private Long classifyId;
  18 +
  19 + @Schema(description = "种类名称", example = "芋艿")
  20 + private String classifyName;
  21 +
  22 + @Schema(description = "类别ID", example = "22418")
  23 + private Long typeId;
  24 +
  25 + @Schema(description = "类别名称", example = "王五")
  26 + private String typeName;
  27 +
  28 + @Schema(description = "类别明细ID", example = "22381")
  29 + private Long typeDetailId;
  30 +
  31 + @Schema(description = "类别明细名称", example = "芋艿")
  32 + private String typeDetailName;
  33 +
  34 + @Schema(description = "公司ID", example = "22461")
  35 + private Long companyId;
  36 +
  37 + @Schema(description = "公司名称", example = "李四")
  38 + private String companyName;
  39 +
  40 + @Schema(description = "数量")
  41 + private Long num;
  42 +
  43 + @Schema(description = "单位ID", example = "26719")
  44 + private Long unitId;
  45 +
  46 + @Schema(description = "单位", example = "张三")
  47 + private String unitName;
  48 +
  49 + @Schema(description = " 描述", example = "你说的对")
  50 + private String remark;
  51 +
  52 + @Schema(description = "状态（0正常 1停用）", example = "1")
  53 + private Integer status;
  54 +
  55 + @Schema(description = "创建者")
  56 + private String creator;
  57 +
  58 + @Schema(description = "创建时间")
  59 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  60 + private LocalDateTime[] createTime;
  61 +
  62 + @Schema(description = "更新者")
  63 + private String updater;
  64 +
  65 +}
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/material/vo/MaterialTypeManagerRespVO.java 0 → 100644
  View file @0e22b45
  1 +package com.zteits.urbanops.module.garden.controller.admin.material.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.*;
  5 +import java.util.*;
  6 +import org.springframework.format.annotation.DateTimeFormat;
  7 +import java.time.LocalDateTime;
  8 +import cn.idev.excel.annotation.*;
  9 +
  10 +@Schema(description = "管理后台 - 耗材类别管理 Response VO")
  11 +@Data
  12 +@ExcelIgnoreUnannotated
  13 +public class MaterialTypeManagerRespVO {
  14 +
  15 + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "22778")
  16 + @ExcelProperty("ID")
  17 + private Long id;
  18 +
  19 + @Schema(description = "种类ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1958")
  20 + @ExcelProperty("种类ID")
  21 + private Long classifyId;
  22 +
  23 + @Schema(description = "种类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
  24 + @ExcelProperty("种类名称")
  25 + private String classifyName;
  26 +
  27 + @Schema(description = "类别ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "22418")
  28 + @ExcelProperty("类别ID")
  29 + private Long typeId;
  30 +
  31 + @Schema(description = "类别名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
  32 + @ExcelProperty("类别名称")
  33 + private String typeName;
  34 +
  35 + @Schema(description = "类别明细ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "22381")
  36 + @ExcelProperty("类别明细ID")
  37 + private Long typeDetailId;
  38 +
  39 + @Schema(description = "类别明细名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
  40 + @ExcelProperty("类别明细名称")
  41 + private String typeDetailName;
  42 +
  43 + @Schema(description = "公司ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "22461")
  44 + @ExcelProperty("公司ID")
  45 + private Long companyId;
  46 +
  47 + @Schema(description = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
  48 + @ExcelProperty("公司名称")
  49 + private String companyName;
  50 +
  51 + @Schema(description = "数量", requiredMode = Schema.RequiredMode.REQUIRED)
  52 + @ExcelProperty("数量")
  53 + private Long num;
  54 +
  55 + @Schema(description = "单位ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26719")
  56 + @ExcelProperty("单位ID")
  57 + private Long unitId;
  58 +
  59 + @Schema(description = "单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
  60 + @ExcelProperty("单位")
  61 + private String unitName;
  62 +
  63 + @Schema(description = " 描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对")
  64 + @ExcelProperty(" 描述")
  65 + private String remark;
  66 +
  67 + @Schema(description = "状态（0正常 1停用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  68 + @ExcelProperty("状态（0正常 1停用）")
  69 + private Integer status;
  70 +
  71 + @Schema(description = "创建者")
  72 + @ExcelProperty("创建者")
  73 + private String creator;
  74 +
  75 + @Schema(description = "创建时间")
  76 + @ExcelProperty("创建时间")
  77 + private LocalDateTime createTime;
  78 +
  79 + @Schema(description = "更新者")
  80 + @ExcelProperty("更新者")
  81 + private String updater;
  82 +
  83 +}
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/material/vo/MaterialTypeManagerSaveReqVO.java 0 → 100644
  View file @0e22b45
  1 +package com.zteits.urbanops.module.garden.controller.admin.material.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.*;
  5 +import java.util.*;
  6 +import jakarta.validation.constraints.*;
  7 +
  8 +@Schema(description = "管理后台 - 耗材类别管理新增/修改 Request VO")
  9 +@Data
  10 +public class MaterialTypeManagerSaveReqVO {
  11 +
  12 + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "22778")
  13 + private Long id;
  14 +
  15 + @Schema(description = "种类ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1958")
  16 + @NotNull(message = "种类ID不能为空")
  17 + private Long classifyId;
  18 +
  19 + @Schema(description = "种类名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
  20 + @NotEmpty(message = "种类名称不能为空")
  21 + private String classifyName;
  22 +
  23 + @Schema(description = "类别ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "22418")
  24 + @NotNull(message = "类别ID不能为空")
  25 + private Long typeId;
  26 +
  27 + @Schema(description = "类别名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
  28 + @NotEmpty(message = "类别名称不能为空")
  29 + private String typeName;
  30 +
  31 + @Schema(description = "类别明细ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "22381")
  32 + @NotNull(message = "类别明细ID不能为空")
  33 + private Long typeDetailId;
  34 +
  35 + @Schema(description = "类别明细名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
  36 + @NotEmpty(message = "类别明细名称不能为空")
  37 + private String typeDetailName;
  38 +
  39 + @Schema(description = "公司ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "22461")
  40 + @NotNull(message = "公司ID不能为空")
  41 + private Long companyId;
  42 +
  43 + @Schema(description = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
  44 + @NotEmpty(message = "公司名称不能为空")
  45 + private String companyName;
  46 +
  47 + @Schema(description = "数量", requiredMode = Schema.RequiredMode.REQUIRED)
  48 + @NotNull(message = "数量不能为空")
  49 + private Long num;
  50 +
  51 + @Schema(description = "单位ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26719")
  52 + @NotNull(message = "单位ID不能为空")
  53 + private Long unitId;
  54 +
  55 + @Schema(description = "单位", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三")
  56 + @NotEmpty(message = "单位不能为空")
  57 + private String unitName;
  58 +
  59 + @Schema(description = " 描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对")
  60 + @NotEmpty(message = " 描述不能为空")
  61 + private String remark;
  62 +
  63 + @Schema(description = "状态（0正常 1停用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  64 + @NotNull(message = "状态（0正常 1停用）不能为空")
  65 + private Integer status;
  66 +
  67 + @Schema(description = "创建者")
  68 + private String creator;
  69 +
  70 + @Schema(description = "更新者")
  71 + private String updater;
  72 +
  73 +}
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/material/vo/MaterialTypePageReqVO.java
  View file @0e22b45
... ... @@ -44,13 +44,13 @@ public class MaterialTypePageReqVO extends PageParam {
44 44 private String status;
45 45  
46 46 @Schema(description = "创建者")
47   - private String createBy;
  47 + private String creator;
48 48  
49 49 @Schema(description = "创建时间")
50 50 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
51 51 private LocalDateTime[] createTime;
52 52  
53 53 @Schema(description = "更新者")
54   - private String updateBy;
  54 + private String updater;
55 55  
56 56 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/material/vo/MaterialTypeRespVO.java
  View file @0e22b45
... ... @@ -58,7 +58,7 @@ public class MaterialTypeRespVO {
58 58  
59 59 @Schema(description = "创建者")
60 60 @ExcelProperty("创建者")
61   - private String createBy;
  61 + private String creator;
62 62  
63 63 @Schema(description = "创建时间")
64 64 @ExcelProperty("创建时间")
... ... @@ -66,6 +66,6 @@ public class MaterialTypeRespVO {
66 66  
67 67 @Schema(description = "更新者")
68 68 @ExcelProperty("更新者")
69   - private String updateBy;
  69 + private String updater;
70 70  
71 71 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/material/MaterialDO.java
  View file @0e22b45
1 1 package com.zteits.urbanops.module.garden.dal.dataobject.material;
2 2  
3   -import com.baomidou.mybatisplus.annotation.TableId;
4   -import com.baomidou.mybatisplus.annotation.TableName;
  3 +import lombok.*;
  4 +import java.util.*;
  5 +import java.time.LocalDateTime;
  6 +import java.time.LocalDateTime;
  7 +import com.baomidou.mybatisplus.annotation.*;
5 8 import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO;
6   -import lombok.Data;
7 9  
  10 +/**
  11 + * 耗材管理 DO
  12 + *
  13 + * @author 超级管理员
  14 + */
8 15 @TableName("garden_material")
  16 +@KeySequence("garden_material_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
9 17 @Data
  18 +@EqualsAndHashCode(callSuper = true)
  19 +@ToString(callSuper = true)
  20 +@Builder
  21 +@NoArgsConstructor
  22 +@AllArgsConstructor
10 23 public class MaterialDO extends BaseDO {
  24 +
  25 + /**
  26 + * 耗材ID
  27 + */
11 28 @TableId
12 29 private Long materialId;
  30 + /**
  31 + * 完整编码
  32 + */
13 33 private String fullCode;
  34 + /**
  35 + * 物料编码
  36 + */
14 37 private String materialCode;
  38 + /**
  39 + * 耗材名称
  40 + */
15 41 private String materialName;
  42 + /**
  43 + * 耗材类型ID
  44 + */
16 45 private Long materialTypeId;
  46 + /**
  47 + * 耗材类型名称
  48 + */
17 49 private String materialTypeName;
  50 + /**
  51 + * 类别ID
  52 + */
18 53 private Long typeId;
  54 + /**
  55 + * 类别名称：药品
  56 + */
19 57 private String typeName;
  58 + /**
  59 + * 类别明细ID
  60 + */
20 61 private Long typeDetailId;
  62 + /**
  63 + * 类别明细
  64 + */
21 65 private String typeDetailName;
  66 + /**
  67 + * 规格编码
  68 + */
22 69 private String specCode;
  70 + /**
  71 + * 规格
  72 + */
23 73 private String specifications;
24   - private Long unitId;
25   - private String unitName;
  74 + /**
  75 + * 归属公司ID
  76 + */
26 77 private Long belongCompanyId;
  78 + /**
  79 + * 归属公司
  80 + */
27 81 private String belongCompanyName;
28   - private String status;
29   - private Integer isAssociatedOrder;
  82 + /**
  83 + * 单位ID
  84 + */
  85 + private Long unitId;
  86 + /**
  87 + * 单位
  88 + */
  89 + private String unitName;
  90 + /**
  91 + * 备注
  92 + */
  93 + private String remark;
  94 + /**
  95 + * 是否关联工单：0-否，1-是
  96 + */
  97 + private Boolean isAssociatedOrder;
  98 +
  99 +
30 100 }
31 101 \ No newline at end of file
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/material/MaterialTypeManagerDO.java 0 → 100644
  View file @0e22b45
  1 +package com.zteits.urbanops.module.garden.dal.dataobject.material;
  2 +
  3 +import lombok.*;
  4 +import java.util.*;
  5 +import java.time.LocalDateTime;
  6 +import java.time.LocalDateTime;
  7 +import com.baomidou.mybatisplus.annotation.*;
  8 +import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO;
  9 +
  10 +/**
  11 + * 耗材类别管理 DO
  12 + *
  13 + * @author 超级管理员
  14 + */
  15 +@TableName("garden_material_type_manager")
  16 +@KeySequence("garden_material_type_manager_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  17 +@Data
  18 +@EqualsAndHashCode(callSuper = true)
  19 +@ToString(callSuper = true)
  20 +@Builder
  21 +@NoArgsConstructor
  22 +@AllArgsConstructor
  23 +public class MaterialTypeManagerDO extends BaseDO {
  24 +
  25 + /**
  26 + * ID
  27 + */
  28 + @TableId
  29 + private Long id;
  30 + /**
  31 + * 种类ID
  32 + */
  33 + private Long classifyId;
  34 + /**
  35 + * 种类名称
  36 + */
  37 + private String classifyName;
  38 + /**
  39 + * 类别ID
  40 + */
  41 + private Long typeId;
  42 + /**
  43 + * 类别名称
  44 + */
  45 + private String typeName;
  46 + /**
  47 + * 类别明细ID
  48 + */
  49 + private Long typeDetailId;
  50 + /**
  51 + * 类别明细名称
  52 + */
  53 + private String typeDetailName;
  54 + /**
  55 + * 公司ID
  56 + */
  57 + private Long companyId;
  58 + /**
  59 + * 公司名称
  60 + */
  61 + private String companyName;
  62 + /**
  63 + * 数量
  64 + */
  65 + private Long num;
  66 + /**
  67 + * 单位ID
  68 + */
  69 + private Long unitId;
  70 + /**
  71 + * 单位
  72 + */
  73 + private String unitName;
  74 + /**
  75 + * 描述
  76 + */
  77 + private String remark;
  78 + /**
  79 + * 状态（0正常 1停用）
  80 + */
  81 + private Integer status;
  82 +
  83 +}
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/material/MaterialManagerMapper.java deleted
View file @75729b3
1   -package com.zteits.urbanops.module.garden.dal.mysql.material;
2   -
3   -import com.zteits.urbanops.framework.common.pojo.PageResult;
4   -import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
5   -import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
6   -import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialManagerDO;
7   -import org.apache.ibatis.annotations.Mapper;
8   -
9   -import java.util.List;
10   -
11   -@Mapper
12   -public interface MaterialManagerMapper extends BaseMapperX<MaterialManagerDO> {
13   - default PageResult<MaterialManagerDO> selectPage(com.zteits.urbanops.framework.common.pojo.PageParam pageParam, MaterialManagerDO where) {
14   - return selectPage(pageParam, null, new LambdaQueryWrapperX<MaterialManagerDO>()
15   - .likeIfPresent(MaterialManagerDO::getName, where.getName())
16   - .eqIfPresent(MaterialManagerDO::getDeptId, where.getDeptId())
17   - .orderByDesc(MaterialManagerDO::getUpdateTime));
18   - }
19   -
20   - default List<MaterialManagerDO> selectList(MaterialManagerDO where) {
21   - return selectList(new LambdaQueryWrapperX<MaterialManagerDO>()
22   - .likeIfPresent(MaterialManagerDO::getName, where.getName())
23   - .eqIfPresent(MaterialManagerDO::getDeptId, where.getDeptId())
24   - .orderByAsc(MaterialManagerDO::getName));
25   - }
26   -}
27 0 \ No newline at end of file
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/material/MaterialMapper.java
  View file @0e22b45
1 1 package com.zteits.urbanops.module.garden.dal.mysql.material;
2 2  
  3 +import java.util.*;
  4 +
  5 +import com.zteits.urbanops.framework.common.pojo.PageResult;
  6 +import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
3 7 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
4 8 import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialDO;
5 9 import org.apache.ibatis.annotations.Mapper;
  10 +import com.zteits.urbanops.module.garden.controller.admin.material.vo.*;
6 11  
  12 +/**
  13 + * 耗材管理 Mapper
  14 + *
  15 + * @author 超级管理员
  16 + */
7 17 @Mapper
8 18 public interface MaterialMapper extends BaseMapperX<MaterialDO> {
9   -}
10 19 \ No newline at end of file
  20 +
  21 + default PageResult<MaterialDO> selectPage(MaterialPageReqVO reqVO) {
  22 + return selectPage(reqVO, new LambdaQueryWrapperX<MaterialDO>()
  23 + .eqIfPresent(MaterialDO::getFullCode, reqVO.getFullCode())
  24 + .eqIfPresent(MaterialDO::getMaterialCode, reqVO.getMaterialCode())
  25 + .likeIfPresent(MaterialDO::getMaterialName, reqVO.getMaterialName())
  26 + .eqIfPresent(MaterialDO::getMaterialTypeId, reqVO.getMaterialTypeId())
  27 + .likeIfPresent(MaterialDO::getMaterialTypeName, reqVO.getMaterialTypeName())
  28 + .eqIfPresent(MaterialDO::getTypeId, reqVO.getTypeId())
  29 + .likeIfPresent(MaterialDO::getTypeName, reqVO.getTypeName())
  30 + .eqIfPresent(MaterialDO::getTypeDetailId, reqVO.getTypeDetailId())
  31 + .likeIfPresent(MaterialDO::getTypeDetailName, reqVO.getTypeDetailName())
  32 + .eqIfPresent(MaterialDO::getSpecCode, reqVO.getSpecCode())
  33 + .eqIfPresent(MaterialDO::getSpecifications, reqVO.getSpecifications())
  34 + .eqIfPresent(MaterialDO::getBelongCompanyId, reqVO.getBelongCompanyId())
  35 + .likeIfPresent(MaterialDO::getBelongCompanyName, reqVO.getBelongCompanyName())
  36 + .eqIfPresent(MaterialDO::getUnitId, reqVO.getUnitId())
  37 + .likeIfPresent(MaterialDO::getUnitName, reqVO.getUnitName())
  38 + .betweenIfPresent(MaterialDO::getCreateTime, reqVO.getCreateTime())
  39 + .eqIfPresent(MaterialDO::getRemark, reqVO.getRemark())
  40 + .eqIfPresent(MaterialDO::getIsAssociatedOrder, reqVO.getIsAssociatedOrder())
  41 + .orderByDesc(MaterialDO::getMaterialId));
  42 + }
  43 +
  44 +}
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/material/MaterialTypeManagerMapper.java 0 → 100644
  View file @0e22b45
  1 +package com.zteits.urbanops.module.garden.dal.mysql.material;
  2 +
  3 +import java.util.*;
  4 +
  5 +import com.zteits.urbanops.framework.common.pojo.PageResult;
  6 +import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
  7 +import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
  8 +import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialTypeManagerDO;
  9 +import org.apache.ibatis.annotations.Mapper;
  10 +import com.zteits.urbanops.module.garden.controller.admin.material.vo.*;
  11 +
  12 +/**
  13 + * 耗材类别管理 Mapper
  14 + *
  15 + * @author 超级管理员
  16 + */
  17 +@Mapper
  18 +public interface MaterialTypeManagerMapper extends BaseMapperX<MaterialTypeManagerDO> {
  19 +
  20 + default PageResult<MaterialTypeManagerDO> selectPage(MaterialTypeManagerPageReqVO reqVO) {
  21 + return selectPage(reqVO, new LambdaQueryWrapperX<MaterialTypeManagerDO>()
  22 + .eqIfPresent(MaterialTypeManagerDO::getClassifyId, reqVO.getClassifyId())
  23 + .likeIfPresent(MaterialTypeManagerDO::getClassifyName, reqVO.getClassifyName())
  24 + .eqIfPresent(MaterialTypeManagerDO::getTypeId, reqVO.getTypeId())
  25 + .likeIfPresent(MaterialTypeManagerDO::getTypeName, reqVO.getTypeName())
  26 + .eqIfPresent(MaterialTypeManagerDO::getTypeDetailId, reqVO.getTypeDetailId())
  27 + .likeIfPresent(MaterialTypeManagerDO::getTypeDetailName, reqVO.getTypeDetailName())
  28 + .eqIfPresent(MaterialTypeManagerDO::getCompanyId, reqVO.getCompanyId())
  29 + .likeIfPresent(MaterialTypeManagerDO::getCompanyName, reqVO.getCompanyName())
  30 + .eqIfPresent(MaterialTypeManagerDO::getNum, reqVO.getNum())
  31 + .eqIfPresent(MaterialTypeManagerDO::getUnitId, reqVO.getUnitId())
  32 + .likeIfPresent(MaterialTypeManagerDO::getUnitName, reqVO.getUnitName())
  33 + .eqIfPresent(MaterialTypeManagerDO::getRemark, reqVO.getRemark())
  34 + .eqIfPresent(MaterialTypeManagerDO::getStatus, reqVO.getStatus())
  35 + .betweenIfPresent(MaterialTypeManagerDO::getCreateTime, reqVO.getCreateTime())
  36 + .orderByDesc(MaterialTypeManagerDO::getId));
  37 + }
  38 +
  39 +}
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/ErrorCodeConstants.java
  View file @0e22b45
... ... @@ -73,4 +73,7 @@ public interface ErrorCodeConstants {
73 73 ErrorCode PLAN_RATE_LEVEL_ID_DUPLICATE = new ErrorCode(1-200-200-002, "养护等级重复");
74 74  
75 75 ErrorCode MATERIAL_TYPE_NOT_EXISTS = new ErrorCode(1-100-004-001, "物料类型不存在");
  76 + ErrorCode MATERIAL_TYPE_MANAGER_NOT_EXISTS = new ErrorCode(1-100-004-002, "耗材类别管理不存在");
  77 +
  78 + ErrorCode MATERIAL_NOT_EXISTS = new ErrorCode(1-100-004-003, "耗材管理不存在");
76 79 }
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/material/MaterialService.java
  View file @0e22b45
1 1 package com.zteits.urbanops.module.garden.service.material;
2 2  
  3 +import java.util.*;
  4 +import jakarta.validation.*;
  5 +import com.zteits.urbanops.module.garden.controller.admin.material.vo.*;
3 6 import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialDO;
  7 +import com.zteits.urbanops.framework.common.pojo.PageResult;
  8 +import com.zteits.urbanops.framework.common.pojo.PageParam;
4 9  
  10 +/**
  11 + * 耗材管理 Service 接口
  12 + *
  13 + * @author 超级管理员
  14 + */
5 15 public interface MaterialService {
6   - MaterialDO selectById(Long id);
  16 +
  17 + /**
  18 + * 创建耗材管理
  19 + *
  20 + * @param createReqVO 创建信息
  21 + * @return 编号
  22 + */
  23 + Long createMaterial(@Valid MaterialSaveReqVO createReqVO);
  24 +
  25 + /**
  26 + * 更新耗材管理
  27 + *
  28 + * @param updateReqVO 更新信息
  29 + */
  30 + void updateMaterial(@Valid MaterialSaveReqVO updateReqVO);
  31 +
  32 + /**
  33 + * 删除耗材管理
  34 + *
  35 + * @param id 编号
  36 + */
  37 + void deleteMaterial(Long id);
  38 +
  39 + /**
  40 + * 批量删除耗材管理
  41 + *
  42 + * @param ids 编号
  43 + */
  44 + void deleteMaterialListByIds(List<Long> ids);
  45 +
  46 + /**
  47 + * 获得耗材管理
  48 + *
  49 + * @param id 编号
  50 + * @return 耗材管理
  51 + */
  52 + MaterialDO getMaterial(Long id);
  53 +
  54 + /**
  55 + * 获得耗材管理分页
  56 + *
  57 + * @param pageReqVO 分页查询
  58 + * @return 耗材管理分页
  59 + */
  60 + PageResult<MaterialDO> getMaterialPage(MaterialPageReqVO pageReqVO);
  61 +
7 62 }
8 63 \ No newline at end of file
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/material/MaterialServiceImpl.java
  View file @0e22b45
1 1 package com.zteits.urbanops.module.garden.service.material;
2 2  
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import com.baomidou.mybatisplus.core.conditions.Wrapper;
  5 +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  6 +import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialTypeDO;
  7 +import org.springframework.stereotype.Service;
  8 +import jakarta.annotation.Resource;
  9 +import org.springframework.validation.annotation.Validated;
  10 +import org.springframework.transaction.annotation.Transactional;
  11 +
  12 +import java.util.*;
  13 +import com.zteits.urbanops.module.garden.controller.admin.material.vo.*;
3 14 import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialDO;
  15 +import com.zteits.urbanops.framework.common.pojo.PageResult;
  16 +import com.zteits.urbanops.framework.common.pojo.PageParam;
  17 +import com.zteits.urbanops.framework.common.util.object.BeanUtils;
  18 +
4 19 import com.zteits.urbanops.module.garden.dal.mysql.material.MaterialMapper;
5   -import jakarta.annotation.Resource;
6   -import org.springframework.stereotype.Service;
7 20  
  21 +import static com.zteits.urbanops.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST;
  22 +import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
  23 +import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception0;
  24 +import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertList;
  25 +import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.diffList;
  26 +import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*;
  27 +
  28 +/**
  29 + * 耗材管理 Service 实现类
  30 + *
  31 + * @author 超级管理员
  32 + */
8 33 @Service
  34 +@Validated
9 35 public class MaterialServiceImpl implements MaterialService {
  36 +
10 37 @Resource
11 38 private MaterialMapper materialMapper;
12 39  
13 40 @Override
14   - public MaterialDO selectById(Long id) {
  41 + public Long createMaterial(MaterialSaveReqVO createReqVO) {
  42 + QueryWrapper<MaterialDO> queryWrapper = new QueryWrapper<>();
  43 + queryWrapper.lambda().eq(MaterialDO::getMaterialCode, createReqVO.getMaterialCode())
  44 + .eq(MaterialDO::getSpecCode, createReqVO.getSpecCode())
  45 + .eq(MaterialDO::getMaterialTypeId, createReqVO.getTypeDetailId());
  46 + List<MaterialDO> tdMaterials = materialMapper.selectList(queryWrapper);
  47 + if (null != tdMaterials && tdMaterials.size() > 0) {
  48 + MaterialDO material = tdMaterials.get(0);
  49 + throw exception0(BAD_REQUEST.getCode(), "名称:"+material.getMaterialName()+"，规格:"+material.getSpecifications() +"，类别明细:"+material.getTypeDetailName()+ " 的物料已存在");
  50 + }
  51 +
  52 + createReqVO.setFullCode(createReqVO.getTypeDetailId()+createReqVO.getMaterialCode()+createReqVO.getSpecCode());
  53 + // 插入
  54 + MaterialDO material = BeanUtils.toBean(createReqVO, MaterialDO.class);
  55 + materialMapper.insert(material);
  56 +
  57 + // 返回
  58 + return material.getMaterialId();
  59 + }
  60 +
  61 + @Override
  62 + public void updateMaterial(MaterialSaveReqVO updateReqVO) {
  63 + // 校验存在
  64 + validateMaterialExists(updateReqVO.getMaterialId());
  65 + // 更新
  66 + MaterialDO updateObj = BeanUtils.toBean(updateReqVO, MaterialDO.class);
  67 + materialMapper.updateById(updateObj);
  68 + }
  69 +
  70 + @Override
  71 + public void deleteMaterial(Long id) {
  72 + // 校验存在
  73 + validateMaterialExists(id);
  74 + // 删除
  75 + materialMapper.deleteById(id);
  76 + }
  77 +
  78 + @Override
  79 + public void deleteMaterialListByIds(List<Long> ids) {
  80 + // 删除
  81 + materialMapper.deleteByIds(ids);
  82 + }
  83 +
  84 +
  85 + private void validateMaterialExists(Long id) {
  86 + if (materialMapper.selectById(id) == null) {
  87 + throw exception(MATERIAL_NOT_EXISTS);
  88 + }
  89 + }
  90 +
  91 + @Override
  92 + public MaterialDO getMaterial(Long id) {
15 93 return materialMapper.selectById(id);
16 94 }
17   -}
18 95 \ No newline at end of file
  96 +
  97 + @Override
  98 + public PageResult<MaterialDO> getMaterialPage(MaterialPageReqVO pageReqVO) {
  99 + return materialMapper.selectPage(pageReqVO);
  100 + }
  101 +
  102 +}
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/material/MaterialTypeManagerService.java 0 → 100644
  View file @0e22b45
  1 +package com.zteits.urbanops.module.garden.service.material;
  2 +
  3 +import java.util.*;
  4 +import jakarta.validation.*;
  5 +import com.zteits.urbanops.module.garden.controller.admin.material.vo.*;
  6 +import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialTypeManagerDO;
  7 +import com.zteits.urbanops.framework.common.pojo.PageResult;
  8 +import com.zteits.urbanops.framework.common.pojo.PageParam;
  9 +
  10 +/**
  11 + * 耗材类别管理 Service 接口
  12 + *
  13 + * @author 超级管理员
  14 + */
  15 +public interface MaterialTypeManagerService {
  16 +
  17 + /**
  18 + * 创建耗材类别管理
  19 + *
  20 + * @param createReqVO 创建信息
  21 + * @return 编号
  22 + */
  23 + Long createMaterialTypeManager(@Valid MaterialTypeManagerSaveReqVO createReqVO);
  24 +
  25 + /**
  26 + * 更新耗材类别管理
  27 + *
  28 + * @param updateReqVO 更新信息
  29 + */
  30 + void updateMaterialTypeManager(@Valid MaterialTypeManagerSaveReqVO updateReqVO);
  31 +
  32 + /**
  33 + * 删除耗材类别管理
  34 + *
  35 + * @param id 编号
  36 + */
  37 + void deleteMaterialTypeManager(Long id);
  38 +
  39 + /**
  40 + * 批量删除耗材类别管理
  41 + *
  42 + * @param ids 编号
  43 + */
  44 + void deleteMaterialTypeManagerListByIds(List<Long> ids);
  45 +
  46 + /**
  47 + * 获得耗材类别管理
  48 + *
  49 + * @param id 编号
  50 + * @return 耗材类别管理
  51 + */
  52 + MaterialTypeManagerDO getMaterialTypeManager(Long id);
  53 +
  54 + /**
  55 + * 获得耗材类别管理分页
  56 + *
  57 + * @param pageReqVO 分页查询
  58 + * @return 耗材类别管理分页
  59 + */
  60 + PageResult<MaterialTypeManagerDO> getMaterialTypeManagerPage(MaterialTypeManagerPageReqVO pageReqVO);
  61 +
  62 +}
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/material/MaterialTypeManagerServiceImpl.java 0 → 100644
  View file @0e22b45
  1 +package com.zteits.urbanops.module.garden.service.material;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import org.springframework.stereotype.Service;
  5 +import jakarta.annotation.Resource;
  6 +import org.springframework.validation.annotation.Validated;
  7 +import org.springframework.transaction.annotation.Transactional;
  8 +
  9 +import java.util.*;
  10 +import com.zteits.urbanops.module.garden.controller.admin.material.vo.*;
  11 +import com.zteits.urbanops.module.garden.dal.dataobject.material.MaterialTypeManagerDO;
  12 +import com.zteits.urbanops.framework.common.pojo.PageResult;
  13 +import com.zteits.urbanops.framework.common.pojo.PageParam;
  14 +import com.zteits.urbanops.framework.common.util.object.BeanUtils;
  15 +
  16 +import com.zteits.urbanops.module.garden.dal.mysql.material.MaterialTypeManagerMapper;
  17 +
  18 +import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
  19 +import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertList;
  20 +import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.diffList;
  21 +import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*;
  22 +
  23 +/**
  24 + * 耗材类别管理 Service 实现类
  25 + *
  26 + * @author 超级管理员
  27 + */
  28 +@Service
  29 +@Validated
  30 +public class MaterialTypeManagerServiceImpl implements MaterialTypeManagerService {
  31 +
  32 + @Resource
  33 + private MaterialTypeManagerMapper materialTypeManagerMapper;
  34 +
  35 + @Override
  36 + public Long createMaterialTypeManager(MaterialTypeManagerSaveReqVO createReqVO) {
  37 + // 插入
  38 + MaterialTypeManagerDO materialTypeManager = BeanUtils.toBean(createReqVO, MaterialTypeManagerDO.class);
  39 + materialTypeManagerMapper.insert(materialTypeManager);
  40 +
  41 + // 返回
  42 + return materialTypeManager.getId();
  43 + }
  44 +
  45 + @Override
  46 + public void updateMaterialTypeManager(MaterialTypeManagerSaveReqVO updateReqVO) {
  47 + // 校验存在
  48 + validateMaterialTypeManagerExists(updateReqVO.getId());
  49 + // 更新
  50 + MaterialTypeManagerDO updateObj = BeanUtils.toBean(updateReqVO, MaterialTypeManagerDO.class);
  51 + materialTypeManagerMapper.updateById(updateObj);
  52 + }
  53 +
  54 + @Override
  55 + public void deleteMaterialTypeManager(Long id) {
  56 + // 校验存在
  57 + validateMaterialTypeManagerExists(id);
  58 + // 删除
  59 + materialTypeManagerMapper.deleteById(id);
  60 + }
  61 +
  62 + @Override
  63 + public void deleteMaterialTypeManagerListByIds(List<Long> ids) {
  64 + // 删除
  65 + materialTypeManagerMapper.deleteByIds(ids);
  66 + }
  67 +
  68 +
  69 + private void validateMaterialTypeManagerExists(Long id) {
  70 + if (materialTypeManagerMapper.selectById(id) == null) {
  71 + throw exception(MATERIAL_TYPE_MANAGER_NOT_EXISTS);
  72 + }
  73 + }
  74 +
  75 + @Override
  76 + public MaterialTypeManagerDO getMaterialTypeManager(Long id) {
  77 + return materialTypeManagerMapper.selectById(id);
  78 + }
  79 +
  80 + @Override
  81 + public PageResult<MaterialTypeManagerDO> getMaterialTypeManagerPage(MaterialTypeManagerPageReqVO pageReqVO) {
  82 + return materialTypeManagerMapper.selectPage(pageReqVO);
  83 + }
  84 +
  85 +}
... ...
urbanops-module-garden/src/main/resources/mapper/materialtype/MaterialTypeMapper.xml deleted
View file @75729b3
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3   -<mapper namespace="com.zteits.urbanops.module.garden.dal.mysql.material.MaterialTypeMapper">
4   -
5   - <!--
6   - 一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
7   - 无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
8   - 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
9   - 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
10   - -->
11   -
12   -</mapper>
13 0 \ No newline at end of file