修改接口代码

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EquipmentTreeDto.java

@@ -7,12 +7,17 @@ import java.util.List;
 
 @Data
 public class EquipmentTreeDto {
+    private String id;
     private String name;
+    private String unit;
+    private String unitType;
+    private String parentId;
     private String code;
+    private Integer state;
     private Integer type;
-    private String parentId;
-    private List<EquipmentTreeDto> child = new ArrayList<>();
-    public void addChild(EquipmentTreeDto child) {
-        this.child.add(child);
-    }
+    private String warrantyPeriod;
+    private String maintenancePeriod;
+    private Boolean isLeaf;
+    private List<EquipmentTreeDto> children = new ArrayList<>();
+
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/EquipmentTypeDto.java

@@ -2,6 +2,8 @@ package com.junmp.jyzb.api.bean.dto;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class EquipmentTypeDto {
 
@@ -16,4 +18,6 @@ public class EquipmentTypeDto {
     private String warrantyPeriod;
     private String maintenancePeriod;
     private Boolean isLeaf;
+    private List<String> supplierList;
+    private String photo;
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TypeTreeDto.java

-package com.junmp.jyzb.api.bean.dto;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-public class TypeTreeDto {
-    private String id;
-    private String name;
-    private String unit;
-    private String unitType;
-    private String parentId;
-    private String code;
-    private Integer state;
-    private Integer type;
-    private String warrantyPeriod;
-    private String maintenancePeriod;
-    private Boolean isLeaf;
-    private List<TypeTreeDto> children = new ArrayList<>();
-
-}

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrderMainReq.java

@@ -80,4 +80,6 @@ public class OrderMainReq extends BaseRequest {
     private String endTime;
 
     private String typeId;
+
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentTypeController.java

 package com.junmp.jyzb.controller;
 
-import cn.hutool.core.util.ObjectUtil;
-import com.junmp.jyzb.api.bean.dto.EquipmentTreeDto;
 import com.junmp.jyzb.api.bean.dto.EquipmentTypeDto;
-import com.junmp.jyzb.api.bean.dto.OrgDto;
-import com.junmp.jyzb.api.bean.dto.TypeTreeDto;
+import com.junmp.jyzb.api.bean.dto.EquipmentTreeDto;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
-import com.junmp.jyzb.api.bean.query.QueryOrgReq;
 import com.junmp.jyzb.api.bean.req.UpdateEquipmentTypeReq;
-import com.junmp.jyzb.entity.PubOrg;
 import com.junmp.jyzb.service.EquipmentTypeService;
 import com.junmp.jyzb.utils.ResponseResult;
 import com.junmp.v2.common.bean.request.ValidationApi;
@@ -21,7 +16,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @Slf4j
@@ -86,7 +80,7 @@ public class EquipmentTypeController {
     //返回整棵物资树
     @PostMapping("/GetTypeTree")
     @ApiOperation("/获取整棵物资树")
-    public ApiRes<List<TypeTreeDto>> GetTypeTree(){
+    public ApiRes<List<EquipmentTreeDto>> GetTypeTree(){
         return ApiRes.success(equipmentTypeService.GetTypeTree());
     }
 

jyzb-biz/src/main/java/com/junmp/jyzb/controller/OrderController.java

@@ -8,7 +8,7 @@ import com.junmp.jyzb.api.bean.query.OrderUploadReq;
 import com.junmp.jyzb.api.bean.req.BaseOrderReq;
 import com.junmp.jyzb.api.bean.req.UpdateOrderReq;
 import com.junmp.jyzb.service.OrderMainService;
-import com.junmp.jyzb.service.OrderService;
+import com.junmp.jyzb.service.HandoverService;
 import com.junmp.v2.common.bean.request.ValidationApi;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.db.api.page.PageResult;
@@ -33,7 +33,7 @@ public class OrderController {
     public OrderMainService orderMainService;
 
     @Resource
-    public OrderService orderService;
+    public HandoverService handoverService;
 
     //通过工作流进行操作处理的
     @PostMapping("/AddOrder")
@@ -112,7 +112,7 @@ public class OrderController {
 
 
 
-    //个人装备管理申请单（移交申请，维修，报废申请等）
+    //个人装备管理申请单（移交申请）
     @PostMapping("/AddPersonalEqsOrder")
     @ApiOperation("/新增个人装备申请单")
     public ApiRes<List<String>> AddPersonalEqsOrder(@RequestBody BaseOrderReq req){
@@ -125,14 +125,14 @@ public class OrderController {
         {
             req.setExamineState("working");
         }
-        return ApiRes.success(orderService.EquipmentHandover(req));
+        return ApiRes.success(handoverService.EquipmentHandover(req));
     }
 
-    //个人装备管理申请单的修改（）
+    //个人装备管理申请单的修改（移交申请）
     @PostMapping("/UpdatePersonalEqsOrder")
     @ApiOperation("修改个人装备申请单")
     public ApiRes<Boolean>  UpdatePersonalEqsOrder(@RequestBody BaseOrderReq req) {
-        return ApiRes.success(orderService.UpdatePersonalEqsOrder(req));
+        return ApiRes.success(handoverService.UpdatePersonalEqsOrder(req));
     }
 
 }

jyzb-biz/src/main/java/com/junmp/jyzb/controller/PoliceController.java

@@ -6,6 +6,8 @@ import com.junmp.jyzb.api.bean.query.CabinetReq;
 import com.junmp.jyzb.api.bean.query.PoliceReassignmentReq;
 import com.junmp.jyzb.api.bean.query.PolicemanReq;
 import com.junmp.jyzb.api.bean.req.UpdatePolicemanReq;
+import com.junmp.jyzb.entity.EquipmentSize;
+import com.junmp.jyzb.entity.PoliceEquipment;
 import com.junmp.jyzb.entity.Policeman;
 import com.junmp.jyzb.service.PolicemanService;
 import com.junmp.jyzb.utils.ResponseResult;
@@ -191,4 +193,11 @@ public class PoliceController {
         return ApiRes.success(policemanService.UpdatePoliceInfo(req));
     }
 
+    //获取警员的装备信息
+    @PostMapping("/GetPoliceEqs")
+    @ApiOperation("获取警员装备信息")
+    public ApiRes<PageResult<PoliceEquipment>> GetPoliceEqs(@RequestBody PolicemanReq req){
+        return ApiRes.success(policemanService.GetPoliceEqs(req));
+    }
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/controller/ToOutController.java

@@ -25,10 +25,13 @@ public class ToOutController {
     @PostMapping("/AddBorrowEqs")
     @ApiOperation("增加警员借用装备数据信息")
     public ApiRes<Boolean> AddBorrowEqs(FormEqsReq req){
-        return ApiRes.success(policeEquipmentService.AddBorrowEqs(req));
+        return ApiRes.success(policeEquipmentService.AddPoliceEqs(req));
     }
     //警员领用装备后在数据库中增加相关领用装备数据
-//    @PostMapping("/AddTakeEqs")
-//    @ApiOperation("增加警员领用装备数据信息")
+    @PostMapping("/AddTakeEqs")
+    @ApiOperation("增加警员领用装备数据信息")
+    public ApiRes<Boolean> AddTakeEqs(FormEqsReq req){
+        return ApiRes.success(policeEquipmentService.AddPoliceEqs(req));
+    }
 
 }

jyzb-biz/src/main/java/com/junmp/jyzb/entity/Order.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/Handover.java

@@ -12,9 +12,9 @@ import lombok.Data;
  * 
  * @TableName base_order
  */
-@TableName(value ="base_order")
+@TableName(value ="bussiness_handover")
 @Data
-public class Order implements Serializable {
+public class Handover implements Serializable {
     /**
      * 单子id
      */

jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderItems.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/HandoverBill.java

@@ -2,7 +2,6 @@ package com.junmp.jyzb.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -13,9 +12,9 @@ import lombok.Data;
  * 
  * @TableName base_order_items
  */
-@TableName(value ="base_order_items")
+@TableName(value ="bussiness_handover_bill")
 @Data
-public class OrderItems implements Serializable {
+public class HandoverBill implements Serializable {
     /**
      * 子单据id
      */

jyzb-biz/src/main/java/com/junmp/jyzb/entity/InventorySummary.java

@@ -109,6 +109,13 @@ public class InventorySummary implements Serializable {
     private Integer number;
 
     /**
+     * 物资单价
+     */
+    @ApiModelProperty(value = "物资单价")
+    @TableField("unit_price")
+    private BigDecimal unitPrice;
+
+    /**
      * 总价
      */
     @ApiModelProperty(value = "总价")

jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderNum.java

@@ -29,8 +29,15 @@ public class OrderNum implements Serializable {
 
     private Integer year;
 
-    @TableField("org_id")
-    private Long orgId;
+    private Integer month;
+
+    private Integer day;
+
+    @TableField("start_org_id")
+    private Long startOrgId;
+
+    @TableField("end_org_id")
+    private Long endOrgId;
 
     /**
      * 创建时间

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/OrderItemsMapper.java → jyzb-biz/src/main/java/com/junmp/jyzb/mapper/HandoverBillMapper.java

 package com.junmp.jyzb.mapper;
 
-import com.junmp.jyzb.entity.OrderItems;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
 * @author lxh专属坐骑
 * @description 针对表【base_order_items】的数据库操作Mapper
 * @createDate 2023-09-12 12:53:49
-* @Entity com.junmp.jyzb.entity.OrderItems
+* @Entity com.junmp.jyzb.entity.HandoverBillMapper
 */
-public interface OrderItemsMapper extends BaseMapper<OrderItems> {
+public interface HandoverBillMapper extends BaseMapper<com.junmp.jyzb.entity.HandoverBill> {
 
 }
 

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/OrderMapper.java → jyzb-biz/src/main/java/com/junmp/jyzb/mapper/HandoverMapper.java

 package com.junmp.jyzb.mapper;
 
-import com.junmp.jyzb.entity.Order;
+import com.junmp.jyzb.entity.Handover;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
 * @author lxh专属坐骑
 * @description 针对表【base_order】的数据库操作Mapper
 * @createDate 2023-09-12 12:53:49
-* @Entity com.junmp.jyzb.entity.Order
+* @Entity com.junmp.jyzb.entity.Handover
 */
-public interface OrderMapper extends BaseMapper<Order> {
+public interface HandoverMapper extends BaseMapper<Handover> {
 
 }
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/EquipmentTypeService.java

 package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.junmp.jyzb.api.bean.dto.EquipmentTreeDto;
 import com.junmp.jyzb.api.bean.dto.EquipmentTypeDto;
-import com.junmp.jyzb.api.bean.dto.TypeTreeDto;
+import com.junmp.jyzb.api.bean.dto.EquipmentTreeDto;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
 import com.junmp.jyzb.api.bean.req.UpdateEquipmentTypeReq;
 import com.junmp.jyzb.entity.EquipmentType;
 import com.junmp.jyzb.utils.ResponseResult;
 
 import java.util.List;
-import java.util.Map;
 
 public interface EquipmentTypeService extends IService<EquipmentType> {
 
@@ -31,5 +29,5 @@ public interface EquipmentTypeService extends IService<EquipmentType> {
 
     ResponseResult setTypeParentIds();
 
-    List<TypeTreeDto> GetTypeTree();
+    List<EquipmentTreeDto> GetTypeTree();
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/OrderItemsService.java → jyzb-biz/src/main/java/com/junmp/jyzb/service/HandoverBillService.java

 package com.junmp.jyzb.service;
 
-import com.junmp.jyzb.entity.OrderItems;
+import com.junmp.jyzb.entity.HandoverBill;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -8,6 +8,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 * @description 针对表【base_order_items】的数据库操作Service
 * @createDate 2023-09-12 12:53:49
 */
-public interface OrderItemsService extends IService<OrderItems> {
+public interface HandoverBillService extends IService<HandoverBill> {
 
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/OrderService.java → jyzb-biz/src/main/java/com/junmp/jyzb/service/HandoverService.java

 package com.junmp.jyzb.service;
 
 import com.junmp.jyzb.api.bean.req.BaseOrderReq;
-import com.junmp.jyzb.entity.Order;
+import com.junmp.jyzb.entity.Handover;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -11,7 +11,7 @@ import java.util.List;
 * @description 针对表【base_order】的数据库操作Service
 * @createDate 2023-09-12 12:53:49
 */
-public interface OrderService extends IService<Order> {
+public interface HandoverService extends IService<Handover> {
 
     //个人装备管理申请单（移交申请，维修，报废申请等）
     List<String> EquipmentHandover(BaseOrderReq req);

jyzb-biz/src/main/java/com/junmp/jyzb/service/PoliceEquipmentService.java

@@ -11,5 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface PoliceEquipmentService extends IService<PoliceEquipment> {
 
-    boolean AddBorrowEqs(FormEqsReq req);
+    boolean AddPoliceEqs(FormEqsReq req);
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/PolicemanService.java

@@ -6,6 +6,7 @@ import com.junmp.jyzb.api.bean.query.CabinetReq;
 import com.junmp.jyzb.api.bean.query.PoliceReassignmentReq;
 import com.junmp.jyzb.api.bean.query.PolicemanReq;
 import com.junmp.jyzb.api.bean.req.UpdatePolicemanReq;
+import com.junmp.jyzb.entity.PoliceEquipment;
 import com.junmp.jyzb.entity.Policeman;
 import com.junmp.v2.db.api.page.PageResult;
 import com.junmp.v2.sys.api.bean.user.req.UserOrgReq;
@@ -68,4 +69,7 @@ public interface PolicemanService extends IService<Policeman> {
 
     //警员调岗
     boolean changePoliceOrg(PoliceReassignmentReq req);
+
+    //获取警员的装备信息
+    PageResult<PoliceEquipment> GetPoliceEqs(PolicemanReq req);
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java

 package com.junmp.jyzb.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.junmp.jyzb.api.bean.dto.EquipmentTreeDto;
 import com.junmp.jyzb.api.bean.dto.EquipmentTypeDto;
-import com.junmp.jyzb.api.bean.dto.OrgDto;
-import com.junmp.jyzb.api.bean.dto.TypeTreeDto;
+import com.junmp.jyzb.api.bean.dto.EquipmentTreeDto;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
-import com.junmp.jyzb.api.bean.query.QueryOrgReq;
 import com.junmp.jyzb.api.bean.req.UpdateEquipmentTypeReq;
 import com.junmp.jyzb.api.exception.JYZBAppException;
 import com.junmp.jyzb.api.exception.enums.EquipmentTypeExceptionEnum;
 import com.junmp.jyzb.entity.*;
-import com.junmp.jyzb.mapper.SupplierMapper;
 import com.junmp.jyzb.service.EquipmentTypeService;
 import com.junmp.jyzb.service.SupplierService;
 import com.junmp.jyzb.service.SupplierTypeService;
 import com.junmp.jyzb.utils.*;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.util.BeanPlusUtil;
-import org.springframework.data.annotation.Id;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.junmp.jyzb.mapper.EquipmentTypeMapper;
@@ -32,7 +24,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
 
 @Service
 public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, EquipmentType> implements EquipmentTypeService {
@@ -58,14 +49,6 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
         list.forEach(p->{
             EquipmentTypeDto org=new EquipmentTypeDto();
             BeanPlusUtil.copyProperties(p, org);
-            //查询数据库中是否有他的下级，如果没有表示它就是叶子节点，返回true，否则返回false；
-            List<EquipmentType> list1 = list(new LambdaQueryWrapper<EquipmentType>()
-                    .eq(EquipmentType::getParentId, p.getId()));
-            if (list1.size()==0){
-                org.setIsLeaf(true);
-            }else {
-                org.setIsLeaf(false);
-            }
             orgs.add(org);
         });
         return orgs;
@@ -87,11 +70,6 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
             type.setId(String.valueOf(newcode));
             type.setCode(String.valueOf(newcode));
 
-            //创建下级需要对下级的maxcode进行设置(生成三位随机数进行拼接)
-            Integer random = (int) ((Math.random() * 900) + 100);
-            String maxcode = random+"1000";
-            type.setMaxCode(Integer.valueOf(maxcode));
-
             parentType.setMaxCode(newcode);
             parentType.setCode(String.valueOf(newcode));
             List<SupplierType> supplierType = new ArrayList<>();
@@ -213,10 +191,16 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
     }
 
 
+    //获取单个物资的信息
     @Override
     public EquipmentTypeDto getEquipment(QueryEquipmentTypeReq req) {
         EquipmentTypeDto equipment = new EquipmentTypeDto();
         BeanPlusUtil.copyProperties(this.getById(req.getId()), equipment);
+        //获取该物资的供应商id
+        List<SupplierType> list = supplierTypeService.list(new LambdaQueryWrapper<SupplierType>()
+                .eq(SupplierType::getTypeId, req.getId()));
+        List<String> collect = list.stream().map(SupplierType::getSupplierId).distinct().collect(Collectors.toList());
+        equipment.setSupplierList(collect);
         return equipment;
     }
     public List<EquipmentTypeDto> getLowType(QueryEquipmentTypeReq req){
@@ -276,34 +260,34 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
 
     //获取type整棵树
     @Override
-    public List<TypeTreeDto> GetTypeTree() {
+    public List<EquipmentTreeDto> GetTypeTree() {
         //创建一个list存放整棵树
         //获取第一层数据
         List<EquipmentType> list = list(new LambdaQueryWrapper<EquipmentType>()
                 .eq(EquipmentType::getParentId, "00000000-0000-0000-0000-000000000000")
                 .ne(EquipmentType::getId,"00000000-0000-0000-0000-000000000000"));
         //遍历第一层数据
-        List<TypeTreeDto> collect = list.stream().map(equipmentType -> {
-            TypeTreeDto typeTreeDto = new TypeTreeDto();
-            BeanPlusUtil.copyProperties(equipmentType, typeTreeDto);
-            typeTreeDto.setIsLeaf(false);
+        List<EquipmentTreeDto> collect = list.stream().map(equipmentType -> {
+            EquipmentTreeDto equipmentTreeDto = new EquipmentTreeDto();
+            BeanPlusUtil.copyProperties(equipmentType, equipmentTreeDto);
+            equipmentTreeDto.setIsLeaf(false);
             //遍历第二层数据
-            List<TypeTreeDto> collect1 = queryChildren(typeTreeDto.getId()).stream().map(equipmentType1 -> {
-                TypeTreeDto typeTreeDto1 = new TypeTreeDto();
-                BeanPlusUtil.copyProperties(equipmentType1, typeTreeDto1);
-                typeTreeDto1.setIsLeaf(false);
+            List<EquipmentTreeDto> collect1 = queryChildren(equipmentTreeDto.getId()).stream().map(equipmentType1 -> {
+                EquipmentTreeDto equipmentTreeDto1 = new EquipmentTreeDto();
+                BeanPlusUtil.copyProperties(equipmentType1, equipmentTreeDto1);
+                equipmentTreeDto1.setIsLeaf(false);
                 //遍历第三层数据
-                List<TypeTreeDto> collect2 = queryChildren(typeTreeDto1.getId()).stream().map(equipmentType2 -> {
-                    TypeTreeDto typeTreeDto2 = new TypeTreeDto();
-                    BeanPlusUtil.copyProperties(equipmentType2, typeTreeDto2);
-                    typeTreeDto2.setIsLeaf(true);
-                    return typeTreeDto2;
+                List<EquipmentTreeDto> collect2 = queryChildren(equipmentTreeDto1.getId()).stream().map(equipmentType2 -> {
+                    EquipmentTreeDto equipmentTreeDto2 = new EquipmentTreeDto();
+                    BeanPlusUtil.copyProperties(equipmentType2, equipmentTreeDto2);
+                    equipmentTreeDto2.setIsLeaf(true);
+                    return equipmentTreeDto2;
                 }).collect(Collectors.toList());
-                typeTreeDto1.setChildren(collect2);
-                return typeTreeDto1;
+                equipmentTreeDto1.setChildren(collect2);
+                return equipmentTreeDto1;
             }).collect(Collectors.toList());
-            typeTreeDto.setChildren(collect1);
-            return typeTreeDto;
+            equipmentTreeDto.setChildren(collect1);
+            return equipmentTreeDto;
         }).collect(Collectors.toList());
         return collect;
     }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderItemsServiceImpl.java → jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/HandoverBillServiceImpl.java

 package com.junmp.jyzb.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.junmp.jyzb.entity.OrderItems;
-import com.junmp.jyzb.service.OrderItemsService;
-import com.junmp.jyzb.mapper.OrderItemsMapper;
+import com.junmp.jyzb.mapper.HandoverBillMapper;
+import com.junmp.jyzb.service.HandoverBillService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -12,8 +11,8 @@ import org.springframework.stereotype.Service;
 * @createDate 2023-09-12 12:53:49
 */
 @Service
-public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderItems>
-    implements OrderItemsService{
+public class HandoverBillServiceImpl extends ServiceImpl<HandoverBillMapper, com.junmp.jyzb.entity.HandoverBill>
+    implements HandoverBillService {
 
 }
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderServiceImpl.java → jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/HandoverServiceImpl.java

@@ -5,15 +5,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.api.bean.req.BaseOrderItemReq;
 import com.junmp.jyzb.api.bean.req.BaseOrderReq;
-import com.junmp.jyzb.api.bean.req.DetailListReq;
 import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.OrderExceptionEnum;
-import com.junmp.jyzb.entity.Order;
-import com.junmp.jyzb.entity.OrderDetail;
-import com.junmp.jyzb.entity.OrderItems;
-import com.junmp.jyzb.service.OrderItemsService;
-import com.junmp.jyzb.service.OrderService;
-import com.junmp.jyzb.mapper.OrderMapper;
+import com.junmp.jyzb.entity.Handover;
+import com.junmp.jyzb.entity.HandoverBill;
+import com.junmp.jyzb.service.HandoverBillService;
+import com.junmp.jyzb.service.HandoverService;
+import com.junmp.jyzb.mapper.HandoverMapper;
 import com.junmp.jyzb.utils.DateTimeUtil;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.util.BeanPlusUtil;
@@ -30,11 +28,11 @@ import java.util.*;
 * @createDate 2023-09-12 12:53:49
 */
 @Service
-public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order>
-    implements OrderService{
+public class HandoverServiceImpl extends ServiceImpl<HandoverMapper, Handover>
+    implements HandoverService {
 
     @Resource
-    private OrderItemsService orderItemsService;
+    private HandoverBillService handoverBillService;
 
 
     //装备移交申请
@@ -43,36 +41,36 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order>
         //存放主单据和子单据id
         List<String> list=new ArrayList<>();
         //添加单据存储到数据库
-        Order order = new Order();
-        BeanPlusUtil.copyProperties(req,order);
+        Handover handover = new Handover();
+        BeanPlusUtil.copyProperties(req, handover);
         //设置总价格和应出入库数量
         //设置id
         String id= UUID.randomUUID().toString();
-        order.setId(id);
+        handover.setId(id);
         Integer sumNum=0;
         BigDecimal priceTotal=new BigDecimal(0);
-        List<OrderItems> itemsList=new ArrayList<>();
+        List<HandoverBill> itemsList=new ArrayList<>();
         //通过遍历批量保存详细信息
         for (BaseOrderItemReq listReq:req.getOrderItemList()) {
-            OrderItems orderItems = new OrderItems();
-            BeanPlusUtil.copyProperties(listReq, orderItems);
-            orderItems.setOrderId(order.getId());
+            HandoverBill handoverBill = new HandoverBill();
+            BeanPlusUtil.copyProperties(listReq, handoverBill);
+            handoverBill.setOrderId(handover.getId());
             //将数量和价格进行累加
-            sumNum += orderItems.getNum();
-            priceTotal = priceTotal.add(BigDecimal.valueOf(orderItems.getNum()).multiply(orderItems.getPrice())) ;
-            orderItems.setCreateTime(DateTimeUtil.getCurrentDateTime());
-            itemsList.add(orderItems);
+            sumNum += handoverBill.getNum();
+            priceTotal = priceTotal.add(BigDecimal.valueOf(handoverBill.getNum()).multiply(handoverBill.getPrice())) ;
+            handoverBill.setCreateTime(DateTimeUtil.getCurrentDateTime());
+            itemsList.add(handoverBill);
         }
-        orderItemsService.saveBatch(itemsList);
+        handoverBillService.saveBatch(itemsList);
         //设置总价格和总数量
-        order.setPrice(priceTotal);
-        order.setTotalNum(sumNum);
-        order.setCreateTime(DateTimeUtil.getCurrentDateTime());
+        handover.setPrice(priceTotal);
+        handover.setTotalNum(sumNum);
+        handover.setCreateTime(DateTimeUtil.getCurrentDateTime());
         //保存
-        this.save(order);
-        list.add(order.getId());
-        for (OrderItems orderItems:itemsList) {
-            list.add(Long.toString(orderItems.getId()));
+        this.save(handover);
+        list.add(handover.getId());
+        for (HandoverBill handoverBill :itemsList) {
+            list.add(Long.toString(handoverBill.getId()));
         }
         return list;
     }
@@ -81,18 +79,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order>
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean UpdatePersonalEqsOrder(BaseOrderReq req) {
-        Order order = getById(req.getId());
+        Handover handover = getById(req.getId());
         if (!req.getExamineState().equals("none"))
         {
             throw new ServiceException(OrderExceptionEnum.ORDER_CAN_NOT_UPDATE);
         }
-        List<OrderItems> list = orderItemsService.list(new LambdaQueryWrapper<OrderItems>()
-                .eq(OrderItems::getOrderId, req.getId()));
+        List<HandoverBill> list = handoverBillService.list(new LambdaQueryWrapper<HandoverBill>()
+                .eq(HandoverBill::getOrderId, req.getId()));
 
         //idSet中存放的是存在数据库中的子单据中的id（原始的工作单中的数据id）
         Set<Long> idSet =new HashSet<>();
-        for (OrderItems orderItems:list){
-            idSet.add(orderItems.getId());
+        for (HandoverBill handoverBill :list){
+            idSet.add(handoverBill.getId());
         }
         //将该任务单的所有id转换为String,并添加到updateList中，用来判断删除或者修改新增的是否存在
         //判断删除列表是否为空，如果不为空则进行批量删除
@@ -101,42 +99,42 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order>
             for (Long s:req.getDeleteList()){
                 if (idSet.contains(s)){
                     //将要删除的装备价格和数据进行查询出来，并别对任务单的总数量和总价格进行更改
-                    OrderItems one = orderItemsService.getOne(new LambdaQueryWrapper<OrderItems>()
-                            .eq(OrderItems::getOrderId, s));
-                    order.setPrice(order.getPrice().subtract(one.getPrice().multiply(BigDecimal.valueOf(one.getNum()))));
-                    order.setTotalNum(order.getTotalNum() - one.getNum());
-                    orderItemsService.removeBatchByIds(req.getDeleteList());
+                    HandoverBill one = handoverBillService.getOne(new LambdaQueryWrapper<HandoverBill>()
+                            .eq(HandoverBill::getOrderId, s));
+                    handover.setPrice(handover.getPrice().subtract(one.getPrice().multiply(BigDecimal.valueOf(one.getNum()))));
+                    handover.setTotalNum(handover.getTotalNum() - one.getNum());
+                    handoverBillService.removeBatchByIds(req.getDeleteList());
                 }else {
                     throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
                 }
             }
         }
         //对detaillist进行处理
-        List<OrderItems> addList = new ArrayList<>();//新增的
-        List<OrderItems> updateList = new ArrayList<>();//更新
+        List<HandoverBill> addList = new ArrayList<>();//新增的
+        List<HandoverBill> updateList = new ArrayList<>();//更新
         for (BaseOrderItemReq baseOrderItemReq :req.getOrderItemList()) {
             //判断是否存在，存在则进行修改
             if (idSet.contains(baseOrderItemReq.getId())){
-                OrderItems one = orderItemsService.getOne(new LambdaQueryWrapper<OrderItems>()
-                        .eq(OrderItems::getId, baseOrderItemReq.getId()));
+                HandoverBill one = handoverBillService.getOne(new LambdaQueryWrapper<HandoverBill>()
+                        .eq(HandoverBill::getId, baseOrderItemReq.getId()));
                 BeanPlusUtil.copyProperties(baseOrderItemReq,one);
                 //判断数量和价格是否有变动，如果有变动，则将order的总价和总数量进行更新操作，否则不变
                 if (one.getNum().equals(baseOrderItemReq.getNum()) && one.getPrice().compareTo(baseOrderItemReq.getPrice())!=0){
-                    order.setPrice(order.getPrice().subtract(one.getPrice().multiply(BigDecimal.valueOf(one.getNum())))
+                    handover.setPrice(handover.getPrice().subtract(one.getPrice().multiply(BigDecimal.valueOf(one.getNum())))
                             .add(baseOrderItemReq.getPrice().multiply(BigDecimal.valueOf(baseOrderItemReq.getNum()))));
-                    order.setTotalNum(order.getTotalNum() - one.getNum()+ baseOrderItemReq.getNum());
+                    handover.setTotalNum(handover.getTotalNum() - one.getNum()+ baseOrderItemReq.getNum());
                 }
                 one.setUpdateTime(DateTimeUtil.getCurrentDateTime());
                 updateList.add(one);
             }else {
                 //否则判断id是否为空或者错误，如果为空则添加，不为空则抛出异常
                 if (ObjectUtil.isNull(baseOrderItemReq.getId()) || ObjectUtil.isEmpty(baseOrderItemReq.getId())){
-                    OrderItems detail=new OrderItems();
+                    HandoverBill detail=new HandoverBill();
                     BeanPlusUtil.copyProperties(baseOrderItemReq, detail);
                     detail.setOrderId(req.getId());
                     //将数量和价格进行相加处理
-                    order.setPrice(order.getPrice().add(baseOrderItemReq.getPrice().multiply(BigDecimal.valueOf(baseOrderItemReq.getNum()))));
-                    order.setTotalNum(order.getTotalNum() + baseOrderItemReq.getNum());
+                    handover.setPrice(handover.getPrice().add(baseOrderItemReq.getPrice().multiply(BigDecimal.valueOf(baseOrderItemReq.getNum()))));
+                    handover.setTotalNum(handover.getTotalNum() + baseOrderItemReq.getNum());
                     detail.setUpdateTime(DateTimeUtil.getCurrentDateTime());
                     addList.add(detail);
                 }else {
@@ -145,10 +143,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order>
 
             }
         }
-        orderItemsService.updateBatchById(updateList);
-        orderItemsService.saveBatch(addList);
-        BeanPlusUtil.copyProperties(req,order);
-        return this.updateById(order);
+        handoverBillService.updateBatchById(updateList);
+        handoverBillService.saveBatch(addList);
+        BeanPlusUtil.copyProperties(req, handover);
+        return this.updateById(handover);
     }
 }
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -38,6 +38,7 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.time.Month;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -74,8 +75,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         //设置单据单号（订单号）
         OrderNum orderNum = setOrderCode(req);
         String codeValue=String.format("%04d",orderNum.getNum());
-
-        order.setOrderCode(orderNum.getBussinessType()+"-"+orderNum.getOutInType()+"-"+orderNum.getYear()+"-"+codeValue);
+        order.setOrderCode(orderNum.getBussinessType()+"-"+orderNum.getYear()+"-"+orderNum.getMonth()+"-"+orderNum.getDay()+"-"+codeValue);
         //设置总价格和应出入库数量
         //设置id
         String id=UUID.randomUUID().toString();
@@ -115,24 +115,34 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     public OrderNum setOrderCode(UpdateOrderReq req){
         //设置采购单号，需要先判断该组织机构的采购单号是否存在，如果存在则将数量进行增加，如果不存在则新增一条对应的数据
         OrderNum orderNum = new OrderNum();
-        //获取年份，获取业务出入状态，获取组织机构id，获取业务类型
+        //获取年,月，日，获取业务出入状态，获取组织机构id，获取业务类型
         orderNum.setYear(LocalDateTime.now().getYear());
+        orderNum.setMonth(LocalDateTime.now().getMonth().getValue());
+        orderNum.setDay(LocalDateTime.now().getDayOfMonth());
+        //将业务类型转为中文简写
+        String bussinessType = req.getBussinessType();
         //判断是出库还是入库，出库为发物单位，入库为收物单位
+        OrderNum one = new OrderNum();
         if (req.getOrderType().equals("in")){
-            orderNum.setOrgId(Long.valueOf(req.getEndOrgId()));
+            orderNum.setEndOrgId(Long.valueOf(req.getEndOrgId()));
+            one = orderNumService.getOne(new LambdaQueryWrapper<OrderNum>()
+                    .eq(OrderNum::getEndOrgId, orderNum.getEndOrgId())
+                    .eq(OrderNum::getBussinessType, orderNum.getBussinessType())
+                    .eq(OrderNum::getYear, orderNum.getYear())
+                    .eq(OrderNum::getOutInType, orderNum.getOutInType()));
         }else {
-            orderNum.setOrgId(Long.valueOf(req.getStartOrgId()));
+            orderNum.setStartOrgId(Long.valueOf(req.getStartOrgId()));
+            one = orderNumService.getOne(new LambdaQueryWrapper<OrderNum>()
+                    .eq(OrderNum::getStartOrgId, orderNum.getStartOrgId())
+                    .eq(OrderNum::getBussinessType, orderNum.getBussinessType())
+                    .eq(OrderNum::getYear, orderNum.getYear())
+                    .eq(OrderNum::getOutInType, orderNum.getOutInType()));
         }
         //业务类型
         orderNum.setBussinessType(req.getBussinessType());
         //出入业务状态
         orderNum.setOutInType(req.getOrderType());
-
-        OrderNum one = orderNumService.getOne(new LambdaQueryWrapper<OrderNum>()
-                .eq(OrderNum::getOrgId, orderNum.getOrgId())
-                .eq(OrderNum::getBussinessType, orderNum.getBussinessType())
-                .eq(OrderNum::getYear, orderNum.getYear())
-                .eq(OrderNum::getOutInType, orderNum.getOutInType()));
+        //设置num的数量
         if (ObjectUtil.isNull(one)){
             orderNum.setNum(1);
             orderNumService.save(orderNum);

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PoliceEquipmentServiceImpl.java

@@ -28,7 +28,7 @@ public class PoliceEquipmentServiceImpl extends ServiceImpl<PoliceEquipmentMappe
      * @return
      */
     @Override
-    public boolean AddBorrowEqs(FormEqsReq req) {
+    public boolean AddPoliceEqs(FormEqsReq req) {
         PoliceEquipment policeEquipment = new PoliceEquipment();
         //判断警员是否存在
         policemanService.PoliceExist(req.getPoliceId());

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java

@@ -578,5 +578,15 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         return updateById(policeman);
     }
 
+    //获取警员下面的装备
+    @Override
+    public PageResult<PoliceEquipment> GetPoliceEqs(PolicemanReq req) {
+        LambdaQueryWrapper<PoliceEquipment> eq = new LambdaQueryWrapper<PoliceEquipment>()
+                .eq(PoliceEquipment::getPoliceId, req.getId());
+        Page<PoliceEquipment> page = policeEquipmentService
+                .page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), eq);
+        return PageResultFactory.createPageResult(page);
+    }
+
 
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/SupplierServiceImpl.java

@@ -66,16 +66,15 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 
 
     public List<String>  CheckSupplierList(List<String> req){
+        List<String> nonexistentSuppliers = new ArrayList<>();
+        //如果供应商为空，直接返回一个空的数组
         if (ObjectUtil.isNull(req)){
-//            String msg="以下供应商不存在：" +String.join(",", req);
-            String msg= "供应商为空";
-            throw new JYZBAppException(EquipmentTypeExceptionEnum.SUPPLIER_NOT_EXIST, msg);
+            return nonexistentSuppliers;
         }
         LambdaQueryWrapper<Supplier> wp = new LambdaQueryWrapper<>();
         wp.in(ObjectUtil.isNotEmpty(req), Supplier::getId, req);
         List<Supplier> st = list(wp);
 
-        List<String> nonexistentSuppliers = new ArrayList<>();
         for (String supplierId : req) {
             boolean found = false;
             for (Supplier supplier : st) {

jyzb-biz/src/main/resources/mapper/OrderItemsMapper.xml → jyzb-biz/src/main/resources/mapper/HandoverBillMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.junmp.jyzb.mapper.OrderItemsMapper">
+<mapper namespace="com.junmp.jyzb.mapper.HandoverBillMapper">
 
-    <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.OrderItems">
+    <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.HandoverBill">
             <id property="id" column="id" jdbcType="BIGINT"/>
             <result property="orderId" column="order_id" jdbcType="VARCHAR"/>
             <result property="sizeId" column="size_id" jdbcType="VARCHAR"/>

jyzb-biz/src/main/resources/mapper/OrderMapper.xml → jyzb-biz/src/main/resources/mapper/HandoverMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.junmp.jyzb.mapper.OrderMapper">
+<mapper namespace="com.junmp.jyzb.mapper.HandoverMapper">
 
-    <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.Order">
+    <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.Handover">
             <id property="id" column="id" jdbcType="VARCHAR"/>
             <result property="processId" column="process_id" jdbcType="VARCHAR"/>
             <result property="bussinessType" column="bussiness_type" jdbcType="VARCHAR"/>

jyzb-biz/src/main/resources/mapper/ProductBatchMapper.xml

@@ -30,7 +30,7 @@
                 and s1.batchNo  like concat('%',#{batch.batchNo},'%')
             </if>
         </if>
-        order by s1.createTime desc
+        handover by s1.createTime desc
     </select>
 
     <select id="getBatchProcessPage" resultType="com.junmp.jyzb.api.bean.dto.ProductProcessDto">
@@ -49,7 +49,7 @@
                 and s1.batchNo  like concat('%',#{batch.batchNo},'%')
             </if>
         </if>
-        order by s1.createTime desc
+        handover by s1.createTime desc
     </select>
 
 </mapper>

jyzb-biz/src/main/resources/mapper/ProductTagMapper.xml

@@ -9,7 +9,7 @@
         from biz_product_tag s1
         where s1.batch_id = #{batchId}
           and s1.has_init = 0
-        order by s1.serial_id asc limit 0,1
+        handover by s1.serial_id asc limit 0,1
     </select>
 
     <select id="getTagInfoByTagId" resultType="com.junmp.jyzb.api.bean.dto.ProductTagDto">