From 0683e3e4457dfb19aaa1924df1e88593951cf261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Sat, 24 May 2025 17:34:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=BE=E9=A2=98=E7=B1=BB?= =?UTF-8?q?=E7=89=A9=E8=B5=84=E7=AE=A1=E7=90=86=EF=BC=8C=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=92=8C?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=89=A9=E8=B5=84=E7=AE=A1=E7=90=86=E5=81=9A?= =?UTF-8?q?=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/lims/goods/entity/Apply.java | 5 +++++ .../springblade/lims/goods/entity/ApplyDetail.java | 6 ++++++ .../org/springblade/lims/goods/entity/Goods.java | 5 +++++ .../org/springblade/lims/goods/entity/Report.java | 5 +++++ .../lims/goods/controller/ApplyController.java | 12 +++++++++++- .../lims/goods/controller/ContractController.java | 1 + .../lims/goods/controller/GoodsController.java | 14 ++++++++++++++ .../lims/goods/controller/ReportController.java | 5 +++++ .../lims/goods/mapper/AppleDetailMapper.xml | 6 ++++++ .../springblade/lims/goods/mapper/GoodsMapper.xml | 3 +++ 10 files changed, 61 insertions(+), 1 deletion(-) diff --git a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Apply.java b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Apply.java index f12e2c0..e2c5f1b 100644 --- a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Apply.java +++ b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Apply.java @@ -141,6 +141,11 @@ public class Apply extends BaseEntity implements Serializable { // 出库时间 private Date ckTime; + /** + * 查看类型：1普通类 2课题类 + */ + private Integer getType; + @TableField(exist = false) private List detailList; diff --git a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/ApplyDetail.java b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/ApplyDetail.java index 8d9a635..b4b644b 100644 --- a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/ApplyDetail.java +++ b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/ApplyDetail.java @@ -124,6 +124,12 @@ public class ApplyDetail extends BaseEntity { @ApiModelProperty(value = "物品厂商") private String company; + /** + * 查看类型：1普通类 2课题类 + */ + @TableField(exist = false) + private Integer getType; + // 过期时间 @TableField(exist = false) private Date beyondTime; diff --git a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java index fb149c3..d85ee52 100644 --- a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java +++ b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java @@ -88,6 +88,11 @@ public class Goods extends BaseEntity { //过期时间 private Date beyondTime; + /** + * 查看类型：1普通类 2课题类 + */ + private Integer getType; + @TableField(exist = false) private Integer count; diff --git a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Report.java b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Report.java index b67bd47..50286a8 100644 --- a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Report.java +++ b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Report.java @@ -87,5 +87,10 @@ public class Report extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime dealTime; + /** + * 查看类型：1普通类 2课题类 + */ + private Integer getType; + } diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java index 65cc8b5..e9c3adc 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyController.java @@ -84,6 +84,10 @@ public class ApplyController extends BladeController { if (apply.getStartTime() != null && apply.getEndTime() != null) { wrapper.between(Apply::getCreateTime, apply.getStartTime(), apply.getEndTime()); } + // 查看类型：1普通类 2课题类 + if (apply.getGetType() != null) { + wrapper.eq(Apply::getGetType, apply.getGetType()); + } // 按照时间倒序 wrapper.orderByDesc(Apply::getCreateTime); IPage page = applyService.page(Condition.getPage(query), wrapper); @@ -99,13 +103,14 @@ public class ApplyController extends BladeController { * 2.申领列表 顶部状态栏数据 */ @GetMapping("/getEveryStatusAndCount") - public Map getEveryStatusAndCount(String isGetAll) { + public Map getEveryStatusAndCount(String isGetAll, Integer getType) { Map map = new HashMap<>(6); QueryWrapper queryWrapper = new QueryWrapper<>(); // 驳回 queryWrapper.eq("status", -1); if (!"1".equals(isGetAll)) { queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + queryWrapper.eq("get_type", getType); } map.put("bh", applyService.count(queryWrapper)); queryWrapper.clear(); @@ -113,6 +118,7 @@ public class ApplyController extends BladeController { queryWrapper.eq("status", 0); if (!"1".equals(isGetAll)) { queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + queryWrapper.eq("get_type", getType); } map.put("dsh", applyService.count(queryWrapper)); queryWrapper.clear(); @@ -120,6 +126,7 @@ public class ApplyController extends BladeController { queryWrapper.eq("status", 1); if (!"1".equals(isGetAll)) { queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + queryWrapper.eq("get_type", getType); } map.put("dck", applyService.count(queryWrapper)); queryWrapper.clear(); @@ -127,6 +134,7 @@ public class ApplyController extends BladeController { queryWrapper.eq("status", 2); if (!"1".equals(isGetAll)) { queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + queryWrapper.eq("get_type", getType); } map.put("dqd", applyService.count(queryWrapper)); queryWrapper.clear(); @@ -134,6 +142,7 @@ public class ApplyController extends BladeController { queryWrapper.eq("status", 3); if (!"1".equals(isGetAll)) { queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + queryWrapper.eq("get_type", getType); } map.put("dgh", applyService.count(queryWrapper)); queryWrapper.clear(); @@ -141,6 +150,7 @@ public class ApplyController extends BladeController { queryWrapper.eq("status", 4); if (!"1".equals(isGetAll)) { queryWrapper.eq("create_dept", AuthUtil.getDeptId()); + queryWrapper.eq("get_type", getType); } map.put("slwc", applyService.count(queryWrapper)); queryWrapper.clear(); diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ContractController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ContractController.java index a895710..bded5c0 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ContractController.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ContractController.java @@ -210,6 +210,7 @@ public class ContractController extends BladeController { goods.setBrand(contract.getBrand()); goods.setYt(contract.getYt()); goods.setCreateTime(new Date()); + goods.setGetType(1); goodsList.add(goods); detail.setGoodsId(goodIds); } else { diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java index 87d2433..61913b3 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java @@ -101,6 +101,11 @@ public class GoodsController extends BladeController { if(StringUtils.isBlank(query.getDescs()) && StringUtils.isBlank(query.getAscs())){ queryWrapper.orderByDesc(Goods::getCreateTime); } + // 查看类型：1普通类 2课题类 + if (goods.getGetType() != null) { + queryWrapper.eq(Goods::getGetType, goods.getGetType()); + } + queryWrapper.orderByDesc(Goods::getCreateTime); IPage page = goodsService.page(Condition.getPage(query), queryWrapper); List goodsList = page.getRecords(); for (Goods goods1 : goodsList) { @@ -222,6 +227,7 @@ public class GoodsController extends BladeController { wrapper.eq(Goods::getBigClassId, goods.getBigClassId()); wrapper.eq(Goods::getXh, goods.getXh()); wrapper.eq(Goods::getRule, goods.getRule()); + wrapper.eq(Goods::getType, goods.getGetType()); List list = goodsService.list(wrapper); if (list != null && list.size() > 0) { throw new Exception("数据重复！"); @@ -674,6 +680,10 @@ public class GoodsController extends BladeController { if (goods.getStartTime() != null && goods.getEndTime() != null) { wrapper.between(Goods::getCreateTime, goods.getStartTime(), goods.getEndTime()); } + // 查看类型：1普通类 2课题类 + if (goods.getGetType() != null) { + wrapper.eq(Goods::getGetType, goods.getGetType()); + } wrapper.orderByDesc(Goods::getCreateTime); IPage page = goodsService.page(Condition.getPage(query), wrapper); List records = page.getRecords(); @@ -720,6 +730,10 @@ public class GoodsController extends BladeController { if (goods.getStartTime() != null && goods.getEndTime() != null) { wrapper.between(Goods::getCreateTime, goods.getStartTime(), goods.getEndTime()); } + // 查看类型：1普通类 2课题类 + if (goods.getGetType() != null) { + wrapper.eq(Goods::getGetType, goods.getGetType()); + } wrapper.orderByDesc(Goods::getCreateTime); List goodsList = goodsService.list(wrapper); List excels = new ArrayList<>(); diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ReportController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ReportController.java index c22cc4e..ae220d1 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ReportController.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ReportController.java @@ -13,6 +13,7 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.StringUtil; import org.springblade.lims.capital.entity.ApplyOrderDetail; import org.springblade.lims.capital.vo.ApplyOrderDetailVO; +import org.springblade.lims.goods.entity.Goods; import org.springblade.lims.goods.entity.Report; import org.springblade.lims.goods.service.IReportService; import org.springblade.lims.goods.vo.ReportVO; @@ -38,6 +39,10 @@ public class ReportController extends BladeController { if (StringUtil.isNoneBlank(report.getReportGoodsName())) { wrapper.like(Report::getReportGoodsName, report.getReportGoodsName()); } + // 查看类型：1普通类 2课题类 + if (report.getGetType() != null) { + wrapper.eq(Report::getGetType, report.getGetType()); + } wrapper.orderByDesc(Report::getCreateTime); return R.data(reportService.page(Condition.getPage(query), wrapper)); } diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/AppleDetailMapper.xml b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/AppleDetailMapper.xml index ccf6915..0d9059b 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/AppleDetailMapper.xml +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/AppleDetailMapper.xml @@ -27,6 +27,9 @@ and b.create_time >= #{apply.startTime} and b.create_time <= #{apply.endTime} + + and a.get_type = #{apply.getType} + and b.is_deleted = 0 order by b.create_time desc @@ -55,6 +58,9 @@ and b.create_time >= #{apply.startTime} and b.create_time <= #{apply.endTime} + + and a.get_type = #{apply.getType} + and b.is_deleted = 0 order by b.create_time desc diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.xml b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.xml index 0851427..2e23b50 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.xml +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.xml @@ -36,6 +36,9 @@ AND A.location = #{goods.location} + + AND A.get_type = #{goods.getType} + ORDER BY A.name,B.p_num asc