新增课题类物资管理，部门接口添加字段和之前物资管理做区分

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<ApplyDetail> detailList;
 

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;

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;
 

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;
+
 
 }

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<Apply> page = applyService.page(Condition.getPage(query), wrapper);
@@ -99,13 +103,14 @@ public class ApplyController extends BladeController {
      * 2.申领列表 顶部状态栏数据
      */
     @GetMapping("/getEveryStatusAndCount")
-    public Map<String, Integer> getEveryStatusAndCount(String isGetAll) {
+    public Map<String, Integer> getEveryStatusAndCount(String isGetAll, Integer getType) {
         Map<String, Integer> map = new HashMap<>(6);
         QueryWrapper<Apply> 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();

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 {

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<Goods> page = goodsService.page(Condition.getPage(query), queryWrapper);
         List<Goods> 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<Goods> 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<Goods> page = goodsService.page(Condition.getPage(query), wrapper);
         List<Goods> 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<Goods> goodsList = goodsService.list(wrapper);
         List<InAndOutExcel> excels = new ArrayList<>();

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));
     }

lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/AppleDetailMapper.xml

@@ -27,6 +27,9 @@
             <if test="apply.startTime != null and apply.endTime != null">
                 and b.create_time &gt;= #{apply.startTime} and b.create_time &lt;= #{apply.endTime}
             </if>
+            <if test="apply.getType != null">
+                and a.get_type = #{apply.getType}
+            </if>
             and b.is_deleted = 0
             order by b.create_time desc
         </where>
@@ -55,6 +58,9 @@
             <if test="apply.startTime != null and apply.endTime != null">
                 and b.create_time &gt;= #{apply.startTime} and b.create_time &lt;= #{apply.endTime}
             </if>
+            <if test="apply.getType != null">
+                and a.get_type = #{apply.getType}
+            </if>
             and b.is_deleted = 0
             order by b.create_time desc
         </where>

lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/GoodsMapper.xml

@@ -36,6 +36,9 @@
                 AND
                 A.location = #{goods.location}
             </if>
+            <if test="goods.getType != null">
+                AND A.get_type = #{goods.getType}
+            </if>
         </where>
         ORDER BY
             A.name,B.p_num asc