Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

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

@@ -9,11 +9,15 @@ import java.util.Date;
 @Data
 public class OrderDetailDto implements Serializable {
 
+    private Long id;
+
+    private String orderId;
+
     private String typeId;
 
     private String typeName;
 
-    private Long sizeId;
+    private String sizeId;
 
     private String sizeName;
 

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

@@ -63,6 +63,11 @@ public class OrderMainDto implements Serializable {
     private String orderState;
 
     /**
+     * 是否记账（0未记账，1已记账）
+     */
+    private Integer manualState;
+
+    /**
      * 生产厂商id
      */
     private String manufacturerId;

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

@@ -42,5 +42,5 @@ public class PolicemanDto {
     private List<PoliceFingerDto> fingersList;
     private String fileContent;
 
-    private static final long serialVersionUID = 1L;
+    private String userId;
 }
\ No newline at end of file

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

@@ -94,6 +94,11 @@ public class StocktakeDto implements Serializable {
     private String examineState;
 
     /**
+     * 单据状态 ready待盘点，finished已完成，working盘点中
+     */
+    private String orderState;
+
+    /**
      * 备注
      */
     private String note;

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

+package com.junmp.jyzb.api.bean.query;
+
+import com.junmp.v2.common.bean.request.BaseRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class QueryOrderLogReq extends BaseRequest {
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 单据类型（in入库单，out出库单）
+     */
+    private String orderType;
+
+    /**
+     * 单据业务类型
+     */
+    private String bussinessType;
+
+    /**
+     * 单据id（对应order_main）
+     */
+    private String orderId;
+
+    /**
+     * 操作记录（upload上传消息）
+     */
+    private String historyMsg;
+
+    /**
+     * 组织机构id
+     */
+    private Long orgId;
+
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+
+    /**
+     * 单据单号
+     */
+    private String orderCode;
+
+    /**
+     * 应入/出库数量
+     */
+    private Integer inventoryQuantity;
+
+    /**
+     * 实际数量
+     */
+    private Integer actualQuantity;
+
+    /**
+     * 修改后数量
+     */
+    private Integer updateQuantity;
+
+    /**
+     * 创建人员
+     */
+    private String createUser;
+
+    /**
+     * 修改人员
+     */
+    private String updateUser;
+
+    private Date startTime;
+    private Date endTime;
+}

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

@@ -106,6 +106,10 @@ public class StocktakeReq extends BaseRequest {
 
      */
     private String examineState;
+    /**
+     * 单据状态 ready待盘点，finished已完成，working盘点中
+     */
+    private String orderState;
 
     /**
      * 备注

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/RabbitMqOrderReq.java

+package com.junmp.jyzb.api.bean.req;
+
+import com.junmp.jyzb.api.bean.query.InventoryReq;
+import com.junmp.jyzb.api.bean.query.OrderDetailReq;
+import com.junmp.jyzb.api.bean.query.OrderMainReq;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class RabbitMqOrderReq implements Serializable {
+    //主单据
+    private OrderMainReq orderMainReq;
+    //子单据
+    private OrderDetailReq orderDetailReq;
+    //具体装备epc
+    private  List<InventoryReq> inventoryReqList;
+}

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateStocktakeReq.java

@@ -119,6 +119,11 @@ public class UpdateStocktakeReq extends BaseRequest {
     private String examineState;
 
     /**
+     * 单据状态 ready待盘点，finished已完成，working盘点中
+     */
+    private String orderState;
+
+    /**
      * 备注
      */
     private String note;

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/vo/InOrderInfo.java

+package com.junmp.jyzb.api.bean.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.converters.bigdecimal.BigDecimalNumberConverter;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class InOrderInfo {
+
+    @ExcelProperty("序号")
+    private Integer numId;
+
+    @ExcelProperty("订单编号")
+    private String orderCode;
+
+    @ExcelProperty("入库类型")
+    private String orderType;
+
+    @ExcelProperty("收物单位")
+    private String endOrgName;
+
+    @ExcelProperty("数量")
+    private Integer inventoryQuantity;
+
+    @ExcelProperty(value = "金额")
+    private BigDecimal price;
+
+    @ExcelProperty("装备名称")
+    private String inventoryName;
+}

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

@@ -6,7 +6,9 @@ import com.junmp.jyzb.api.bean.dto.OrderMainDto;
 import com.junmp.jyzb.api.bean.query.OrderMainReq;
 import com.junmp.jyzb.api.bean.query.OrderUploadReq;
 import com.junmp.jyzb.api.bean.req.BaseOrderReq;
+import com.junmp.jyzb.api.bean.query.QueryOrderLogReq;
 import com.junmp.jyzb.api.bean.req.UpdateOrderReq;
+import com.junmp.jyzb.entity.OrderLog;
 import com.junmp.jyzb.service.OrderMainService;
 import com.junmp.jyzb.service.HandoverService;
 import com.junmp.v2.common.bean.request.ValidationApi;
@@ -16,10 +18,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -96,21 +95,11 @@ public class OrderController {
         return ApiRes.success(orderMainService.Accounting(req));
     }
 
-//    //将工作单添加到rabbitmq中去
-//    @PostMapping("/AddOrderRabbitMq")
-//    @ApiOperation("将工作单添加到rabbitmq消息队列中去")
-//    public ApiRes<Boolean> AddOrderRabbitMq(){
-//        List<OrderDto> order = orderMainService.getOrder();
-//        List<String> orderId=new ArrayList<>();
-//        for (OrderDto orderDto:order) {
-//            //将routingKey设置为收物机构id
-//            rabbitTemplate.convertAndSend("OrderExchange",orderDto.getEndOrgId(),orderDto);
-//            orderId.add(orderDto.getId());
-//        }
-//        //将未被上传的数据进行上传到rabbitmq中，同时添加到数据库，标记为已上传数据，比避免同意数据多次或者重复上传
-//        boolean b = orderLogService.addOrder(orderId);
-//        return ApiRes.success(true);
-//    }
+    @PostMapping("/ShowAccountingPage")
+    @ApiOperation("查看记账列表")
+    public ApiRes<PageResult<OrderLog>> ShowAccountingPage(@RequestBody QueryOrderLogReq req){
+        return ApiRes.success(orderMainService.ShowAccountingPage(req));
+    }
 
 
 
@@ -150,5 +139,19 @@ public class OrderController {
 //        }
 //    }
 
+    //入库单导出
+    @PostMapping("InOrderExport")
+    @ApiOperation("入库单导出")
+    public void InOrderExport(@RequestBody OrderMainReq req){
+        orderMainService.InOrderExport(req);
+    }
+
+    //出库单导出
+    @PostMapping("OutOrderExport")
+    @ApiOperation("入库单导出")
+    public void OutOrderExport(@RequestBody OrderMainReq req){
+        orderMainService.OutOrderExport(req);
+    }
+
 
 }

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

 package com.junmp.jyzb.controller;
 
-
+import com.junmp.jyzb.api.bean.query.InventoryReq;
 import com.junmp.jyzb.api.bean.req.FormEqsReq;
 import com.junmp.jyzb.service.PoliceEquipmentService;
 import com.junmp.v2.common.bean.response.ApiRes;
@@ -15,11 +15,21 @@ import javax.annotation.Resource;
 
 @RestController
 @Slf4j
-@RequestMapping("/ToOut")
-@Api(tags = "出库模块")
-public class ToOutController {
+@RequestMapping("/OutAndInbound")
+@Api(tags = "出入库模块")
+public class OutAndInboundController {
     @Resource
     private PoliceEquipmentService policeEquipmentService;
+    //装备入库，添加入库记录
+    @ApiOperation("添加装备入库记录")
+    @PostMapping("/AddInRecords")
+    public ApiRes<Boolean> AddInRecords(InventoryReq req){
+        return ApiRes.success();
+    }
+
+
+
+
 
     //警员借用装备后在在数据库中增加相关借用装备数据
     @PostMapping("/AddBorrowEqs")
@@ -33,5 +43,4 @@ public class ToOutController {
     public ApiRes<Boolean> AddTakeEqs(FormEqsReq req){
         return ApiRes.success(policeEquipmentService.AddPoliceEqs(req));
     }
-
 }

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

@@ -15,8 +15,10 @@ import com.junmp.v2.common.bean.request.ValidationApi;
 import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.db.api.page.PageResult;
 import com.junmp.v2.sys.api.bean.user.req.UserOrgReq;
+import com.junmp.v2.sys.user.controller.SysUserController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import liquibase.pro.packaged.B;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -162,16 +164,16 @@ public class PoliceController {
         return ApiRes.success(policeman);
     }
 
-    //警员绑定账号
-    @PostMapping("/PoliceBindUser")
-    @ApiOperation("警员绑定账号")
-    public ApiRes<Boolean> PoliceBindUser(@RequestBody @Validated(ValidationApi.add.class) PolicemanReq req){
-        boolean b = policemanService.PoliceBindUser(req);
-        if (!b){
-            return ApiRes.failure("操作失败");
-        }
-        return ApiRes.success(b);
-    }
+//    //警员绑定账号
+//    @PostMapping("/PoliceBindUser")
+//    @ApiOperation("警员绑定账号")
+//    public ApiRes<Boolean> PoliceBindUser(@RequestBody @Validated(ValidationApi.add.class) PolicemanReq req){
+//        boolean b = policemanService.PoliceBindUser(req);
+//        if (!b){
+//            return ApiRes.failure("操作失败");
+//        }
+//        return ApiRes.success(b);
+//    }
 
     /**
      * 人员绑定箱门
@@ -200,4 +202,10 @@ public class PoliceController {
         return ApiRes.success(policemanService.GetPoliceEqs(req));
     }
 
+    //将警员和user一一对应并且关系表也一一对应
+    @PostMapping("UpdatePoliceUser")
+    @ApiOperation("将警员关系一一对应")
+    public ApiRes<Boolean> UpdatePoliceUser(){
+        return ApiRes.success(policemanService.UpdatePoliceUser());
+    }
 }

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

-package com.junmp.jyzb.controller;
-
-import com.junmp.jyzb.api.bean.query.InventoryReq;
-import com.junmp.v2.common.bean.response.ApiRes;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@Slf4j
-@RequestMapping("/ToEnter")
-@Api(tags = "入库模块")
-public class ToEnterController {
-    //装备入库，添加入库记录
-    @ApiOperation("添加装备入库记录")
-    @PostMapping("/AddInRecords")
-    public ApiRes<Boolean> AddInRecords(InventoryReq req){
-        return ApiRes.success();
-    }
-}

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

+package com.junmp.jyzb.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+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;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * @TableName base_bus_form
+ */
+@TableName(value ="bussiness_bus_form")
+@Data
+public class BusForm implements Serializable {
+    /**
+     * id
+     */
+    @TableId(value = "id",type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 工作流id
+     */
+    @TableField(value = "process_id")
+    private String processId;
+
+    /**
+     * 单据业务类型
+     */
+    @TableField(value = "bussiness_type")
+    private String bussinessType;
+
+    /**
+     * 单据编号
+     */
+    @TableField(value = "order_code")
+    private String orderCode;
+
+    /**
+     * 发物单位id
+     */
+    @TableField(value = "start_org_id")
+    private Long startOrgId;
+
+    /**
+     * 发物单位
+     */
+    @TableField(value = "start_org_name")
+    private String startOrgName;
+
+    /**
+     * 收物单位id
+     */
+    @TableField(value = "end_org_id")
+    private Long endOrgId;
+
+    /**
+     * 收物单位
+     */
+    @TableField(value = "end_org_name")
+    private String endOrgName;
+
+    /**
+     * 审核状态
+     */
+    @TableField(value = "examine_state")
+    private String examineState;
+
+    /**
+     * 价格
+     */
+    @TableField(value = "price")
+    private BigDecimal price;
+
+    /**
+     * 数量
+     */
+    @TableField(value = "inventory_quantity")
+    private Integer inventoryQuantity;
+
+    /**
+     * 附件地址
+     */
+    @TableField(value = "attachment_location")
+    private String attachmentLocation;
+
+    /**
+     * 装备集合
+     */
+    @TableField(value = "inv_list")
+    private String invList;
+
+    /**
+     * 归还人id
+     */
+    @TableField(value = "return_user_id")
+    private String returnUserId;
+
+    /**
+     * 归还人
+     */
+    @TableField(value = "return_user")
+    private String returnUser;
+
+    /**
+     * 归还日期
+     */
+    @TableField(value = "return_date")
+    private Date returnDate;
+
+    /**
+     * 申请时间
+     */
+    @TableField(value = "apply_time")
+    private Date applyTime;
+
+    /**
+     * 申请人
+     */
+    @TableField(value = "apply_user")
+    private String applyUser;
+
+    /**
+     * 调拨类型（0支拨，1价拨）
+     */
+    @TableField(value = "transfer_type")
+    private Integer transferType;
+
+    /**
+     * 备注
+     */
+    private String note;
+
+    /**
+     * 生产厂商id
+     */
+    @TableField(value = "manufacturer_id")
+    private String manufacturerId;
+
+    /**
+     * 生产厂商名称
+     */
+    @TableField(value = "manufacturer_name")
+    private String manufacturerName;
+
+    /**
+     * 装备详情
+     */
+    @TableField(value = "item_details")
+    private String itemDetails;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "create_user")
+    private String createUser;
+
+    /**
+     * 更新人
+     */
+    @TableField(value = "update_user")
+    private String updateUser;
+
+    private static final long serialVersionUID = 1L;
+
+}
\ No newline at end of file

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

@@ -130,6 +130,12 @@ public class Stocktake implements Serializable {
     private String examineState;
 
     /**
+     * 单据状态 ready待盘点，finished已完成，working盘点中
+     */
+    @TableField(value = "order_state")
+    private String orderState;
+
+    /**
      * 备注
      */
     private String note;

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/BusFormMapper.java

+package com.junmp.jyzb.mapper;
+
+import com.junmp.jyzb.entity.BusForm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_bus_form】的数据库操作Mapper
+* @createDate 2023-09-25 10:16:46
+* @Entity com.junmp.jyzb.entity.BusForm
+*/
+public interface BusFormMapper extends BaseMapper<BusForm> {
+
+}
+
+
+
+

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PolicemanMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
+import java.util.Map;import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface PolicemanMapper extends BaseMapper<Policeman> {
@@ -31,4 +31,6 @@ public interface PolicemanMapper extends BaseMapper<Policeman> {
     IPage<Policeman> SearchPolicePage(Page<Policeman> page, String id);
 
     Long SearchPoliceSize(String id);
+
+    void updateBatchUserIdByAccountList(@Param("userIdList") List<Long> userIdList, @Param("accountList") List<String> accountList);
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/rabbitmq/a.java

 package com.junmp.jyzb.rabbitmq;
 
+import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
 import com.junmp.jyzb.api.bean.req.UpdateOrderReq;
 import com.rabbitmq.client.Channel;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
@@ -14,7 +15,7 @@ import java.io.IOException;
 
 public class a {
     @RabbitListener(queues = "11111")
-    private void a(UpdateOrderReq req,Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag){
+    private void a(RabbitMqOrderReq req, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag){
 
         try {
             //将消息进行消费

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

+package com.junmp.jyzb.service;
+
+import com.junmp.jyzb.entity.BusForm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_bus_form】的数据库操作Service
+* @createDate 2023-09-25 10:16:46
+*/
+public interface BusFormService extends IService<BusForm> {
+
+}

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

@@ -5,12 +5,13 @@ import com.junmp.jyzb.api.bean.dto.OrderDto;
 import com.junmp.jyzb.api.bean.dto.OrderMainDto;
 import com.junmp.jyzb.api.bean.query.OrderMainReq;
 import com.junmp.jyzb.api.bean.query.OrderUploadReq;
+import com.junmp.jyzb.api.bean.query.QueryOrderLogReq;
 import com.junmp.jyzb.api.bean.req.UpdateOrderReq;
+import com.junmp.jyzb.entity.OrderLog;
 import com.junmp.jyzb.entity.OrderMain;
 import com.junmp.v2.db.api.page.PageResult;
 
 import java.util.List;
-import java.util.Map;
 
 public interface OrderMainService extends IService<OrderMain> {
     List<String> AddOrder(UpdateOrderReq req);
@@ -30,12 +31,18 @@ public interface OrderMainService extends IService<OrderMain> {
     //根据任务单id查看业务明细
     OrderDto GetDetailById(OrderMainReq req);
 
-    //设置page的pageNo和pageSize的通用方法
-    Map<String,Long> getPage(Long no,Long size);
 
     //单据状态上报
     boolean PushState(OrderUploadReq req);
 
     //记账
     boolean Accounting(OrderMainReq req);
+
+    //查看记账列表
+    PageResult<OrderLog> ShowAccountingPage(QueryOrderLogReq req);
+
+    //入库单导出
+    void InOrderExport(OrderMainReq req);
+
+    void OutOrderExport(OrderMainReq req);
 }

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

@@ -10,6 +10,7 @@ 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;
+import com.junmp.v2.sys.user.service.SysUserService;
 
 import java.util.List;
 
@@ -56,7 +57,7 @@ public interface PolicemanService extends IService<Policeman> {
     Policeman SearchFaceInfo(PolicemanReq req);
 
     //绑定用户
-    boolean PoliceBindUser(PolicemanReq req);
+//    boolean PoliceBindUser(PolicemanReq req);
 
     boolean PoliceBindBox(PolicemanReq req);
 
@@ -72,4 +73,6 @@ public interface PolicemanService extends IService<Policeman> {
 
     //获取警员的装备信息
     PageResult<PoliceEquipment> GetPoliceEqs(PolicemanReq req);
+
+    boolean UpdatePoliceUser();
 }

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

 package com.junmp.jyzb.service;
 
-import com.junmp.jyzb.api.bean.dto.StocktakeDto;
 import com.junmp.jyzb.api.bean.query.StocktakeReq;
 import com.junmp.jyzb.api.bean.req.UpdateStocktakeReq;
 import com.junmp.jyzb.entity.Stocktake;

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

+package com.junmp.jyzb.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.jyzb.entity.BusForm;
+import com.junmp.jyzb.service.BusFormService;
+import com.junmp.jyzb.mapper.BusFormMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author lxh专属坐骑
+* @description 针对表【base_bus_form】的数据库操作Service实现
+* @createDate 2023-09-25 10:16:46
+*/
+@Service
+public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm>
+    implements BusFormService{
+
+}
+
+
+
+

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

@@ -530,10 +530,7 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
     @Override
     public PageResult<InventorySummary> EqsByCabinetBoxIdPage(CabinetBoxReq req) {
         cabinetBoxService.CabinetBoxExist(req.getId());
-        Map<String, Long> map = orderMainService.getPage(req.getPageNo(), req.getPageSize());
-        Long pageNo = map.get("pageNo");
-        Long pageSize = map.get("pageSize");
-        Page<InventorySummary> page=new Page<>(pageNo,pageSize);
+        Page<InventorySummary> page=new Page<>(req.getPageNo(), req.getPageSize());
         IPage<InventorySummary> pages = inventoryMapper.EqsByCabinetBoxIdPage(page,req.getId());
         page.setRecords(pages.getRecords());
         return PageResultFactory.createPageResult(page);

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

@@ -17,22 +17,29 @@ import com.junmp.jyzb.mapper.*;
 import com.junmp.jyzb.service.*;
 import com.junmp.jyzb.utils.*;
 import com.junmp.v2.auth.password.BcryptPasswordStoredEncrypt;
+import com.junmp.v2.common.bean.dict.SimpleDict;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.util.BeanPlusUtil;
 import com.junmp.v2.db.api.factory.PageFactory;
 import com.junmp.v2.db.api.factory.PageResultFactory;
 import com.junmp.v2.db.api.page.PageResult;
+import com.junmp.v2.sys.api.bean.user.SysUserDto;
+import com.junmp.v2.sys.api.bean.user.UserSelectTreeNode;
 import com.junmp.v2.sys.api.bean.user.req.SysUserReq;
 import com.junmp.v2.sys.api.bean.user.req.UserOrgReq;
 import com.junmp.v2.sys.user.entity.SysUser;
+import com.junmp.v2.sys.user.entity.SysUserOrg;
 import com.junmp.v2.sys.user.service.SysUserOrgService;
 import com.junmp.v2.sys.user.service.SysUserService;
+import liquibase.pro.packaged.L;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 @Service
@@ -93,20 +100,60 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         if (!req.getSex().equals("男") &&!req.getSex().equals("女")){
             throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
         }
+        //密码加密，bcrypt加密方式
+        BcryptPasswordStoredEncrypt passwordStoredEncrypt = new BcryptPasswordStoredEncrypt();
+        String encrypt = passwordStoredEncrypt.encrypt(req.getPassword());
         Policeman policeman = new Policeman();
         BeanPlusUtil.copyProperties(req, policeman);
+        policeman.setPassword(encrypt);
+        policeman.setIsCreatedAccount(1);
         policeman.setState(1);
         save(policeman);
-        //判断是否需要同步生成账号，如果为true则生成账号绑定
-        if (req.getIsCreatedAccount()==1){
-            PolicemanReq policemanReq = new PolicemanReq();
-            BeanPlusUtil.copyProperties(req,policemanReq);
-            policemanReq.setAccount(req.getPoliceCode());
-            PoliceBindUser(policemanReq);
-        }
+       //绑定账号
+        Long userId = PoliceBindUser(policeman);
         return policeman.getId();
     }
 
+    /**
+     * 警员绑定账号
+     *
+     * @param
+     * @return
+     */
+    public Long PoliceBindUser(Policeman policeman) {
+        SysUser user = new SysUser();
+        BeanPlusUtil.copyProperties(policeman, user);
+        //判断数据库中是否已经存在账号，如果存在则抛出异常提示账号已存在
+        //密码加密，bcrypt加密方式
+        user.setPassword(policeman.getPassword());
+        user.setAccount(policeman.getPoliceCode());
+        SysUser one = sysUserService.getOne(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getAccount, user.getAccount())
+                .eq(SysUser::getPassword, user.getPassword()));
+        if (ObjectUtil.isNotNull(one)){
+            throw new ServiceException(UserExceptionEnum.USER_IS_EXIST);
+        }
+
+        //存储到数据库
+        //判断传入的sex是什么，需要做处理
+        if (policeman.getSex().equals("男")) {
+            user.setSex("M");
+        } else {
+            user.setSex("F");
+        }
+        user.setRealName(policeman.getName());
+        user.setNickName(policeman.getName());
+        sysUserService.save(user);
+        //创建到关系表中
+        SysUserOrg sysUserOrg = new SysUserOrg();
+        sysUserOrg.setUserId(user.getUserId());
+        sysUserOrg.setOrgId(policeman.getOrgId());
+        sysUserOrgService.save(sysUserOrg);
+        return user.getUserId();
+    }
+
+
+
     // 更新缓存的方法，新增警员信息时调用
     private void updatePoliceIdCache(String orgId, String newPoliceId) {
         // 构建 Redis 缓存键
@@ -185,7 +232,8 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         //通过警员信息中的userId对账号进行删除
         sysUserService.remove(new LambdaQueryWrapper<SysUser>()
                 .eq(SysUser::getUserId, policeman.getUserId()));
-        //
+        //还要对关系表进行删除
+        sysUserOrgService.remove(new LambdaQueryWrapper<SysUserOrg>().eq(SysUserOrg::getUserId,policeman.getUserId()));
         return removeById(req.getId());
 
     }
@@ -222,6 +270,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             cabinetBoxService.CabinetBoxExist(req.getCabinetBoxId());
         }
         policeman.setUpdateTime(DateTimeUtil.getCurrentDateTime());
+
         return updateById(policeman);
     }
 
@@ -456,55 +505,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     }
 
 
-    /**
-     * 警员绑定账号
-     *
-     * @param req
-     * @return
-     */
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public boolean PoliceBindUser(PolicemanReq req) {
-        //判断警员是否存在并且判断该警员是否已经绑定账号，如果绑定则抛出异常
-//        Policeman policeman = PoliceExist(req.getId());
-//        if (ObjectUtil.isNotNull(policeman.getUserId())){
-//            throw new ServiceException(PolicemanExceptionEnum.POLICEUSER_IS_EXISTS);
-//        }
-        SysUser user = new SysUser();
-        BeanPlusUtil.copyProperties(req, user);
-        //判断数据库中是否已经存在账号，如果存在则抛出异常提示账号已存在
-        //密码加密，bcrypt加密方式
-        BcryptPasswordStoredEncrypt passwordStoredEncrypt = new BcryptPasswordStoredEncrypt();
-        String encrypt = passwordStoredEncrypt.encrypt(req.getPassword());
-        user.setPassword(encrypt);
-        SysUser one = sysUserService.getOne(new LambdaQueryWrapper<SysUser>()
-                .eq(SysUser::getAccount, user.getAccount())
-                .eq(SysUser::getPassword, user.getPassword()));
-        if (ObjectUtil.isNotNull(one)){
-            throw new ServiceException(UserExceptionEnum.USER_IS_EXIST);
-        }
-
-        //存储到数据库
-        //判断传入的sex是什么，需要做处理
-        if (req.getSex().equals("男")) {
-            user.setSex("M");
-        } else {
-            user.setSex("F");
-        }
-        user.setRealName(req.getName());
-        user.setNickName(req.getName());
-        sysUserService.save(user);
-        UserOrgReq userOrgReq = new UserOrgReq();
-        BeanPlusUtil.copyProperties(user,userOrgReq);
-        userOrgReq.setOrgId(req.getOrgId());
-        this.sysUserOrgService.add(userOrgReq);
-        //通过警员id将查询到的警员信息进行修改设置
-        Policeman policeman = new Policeman();
-        policeman.setUserId(user.getUserId());
-        policeman.setIsCreatedAccount(1);
-        policeman.setPassword(encrypt);
-        return updateById(policeman);
-    }
+    
 
     //人员绑定箱门
     @Override
@@ -589,4 +590,48 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     }
 
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean UpdatePoliceUser() {
+        List<Policeman> list = list();
+        List<SysUserReq> collect = list.stream().map(policeman -> {
+                    SysUserReq sysUserReq = new SysUserReq();
+                    BeanPlusUtil.copyProperties(policeman,sysUserReq);
+                    sysUserReq.setAccount(policeman.getPoliceCode());
+                    if (ObjectUtil.isNotNull(policeman.getPassword())){
+                        sysUserReq.setPassword(policeman.getPassword());
+                    }else {
+                        BcryptPasswordStoredEncrypt passwordStoredEncrypt = new BcryptPasswordStoredEncrypt();
+                        String encrypt = passwordStoredEncrypt.encrypt("123456");
+                        sysUserReq.setPassword(encrypt);
+                    }
+                    if (policeman.getSex().equals("男") || policeman.getSex().equalsIgnoreCase("man")) {
+                        sysUserReq.setSex("M");
+                    } else {
+                        sysUserReq.setSex("F");
+                    }
+                    sysUserReq.setNickName(policeman.getName());
+                    sysUserReq.setRealName(policeman.getName());
+                    sysUserService.add(sysUserReq);
+                    return sysUserReq;
+                })
+                .collect(Collectors.toList());
+
+
+//        sysUserService.saveBatch(collect);
+//        List<Long> userIdList = collect.stream().map(SysUser::getUserId).collect(Collectors.toList());
+//        List<String> accountList = collect.stream().map(SysUser::getAccount).collect(Collectors.toList());
+//
+//        policemanMapper.updateBatchUserIdByAccountList(userIdList, accountList);
+//        List<Policeman> list1 = list();
+//        List<SysUserOrg> collect1 = list1.stream().map(policeman -> {
+//                    SysUserOrg sysUserOrg = new SysUserOrg();
+//                    BeanPlusUtil.copyProperties(policeman, sysUserOrg);
+//                    return sysUserOrg;
+//                })
+//                .collect(Collectors.toList());
+//        sysUserOrgService.saveBatch(collect1);
+        return false;
+    }
+
 }

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

@@ -91,11 +91,11 @@ public class StocktakeServiceImpl extends ServiceImpl<StocktakeMapper, Stocktake
     //更新盘库单据（未进入工作流时才能进行修改）
     @Override
     public boolean UpdateStocktakeOrder(UpdateStocktakeReq req) {
-        if (!req.getExamineState().equals("none"))
+        Stocktake stocktake = getById(req.getId());
+        if (!stocktake.getExamineState().equals("none"))
         {
             throw new ServiceException(OrderExceptionEnum.ORDER_CAN_NOT_UPDATE);
         }
-        Stocktake stocktake = getById(req.getId());
         BeanPlusUtil.copyProperties(req,stocktake);
         stocktake.setUpdateTime(DateTimeUtil.getCurrentDateTime());
         return updateById(stocktake);

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.junmp.jyzb.mapper.BusFormMapper">
+
+    <resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.BusForm">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="processId" column="process_id" jdbcType="VARCHAR"/>
+            <result property="bussinessType" column="bussiness_type" jdbcType="VARCHAR"/>
+            <result property="orderCode" column="order_code" jdbcType="VARCHAR"/>
+            <result property="startOrgId" column="start_org_id" jdbcType="BIGINT"/>
+            <result property="startOrgName" column="start_org_name" jdbcType="VARCHAR"/>
+            <result property="endOrgId" column="end_org_id" jdbcType="BIGINT"/>
+            <result property="endOrgName" column="end_org_name" jdbcType="VARCHAR"/>
+            <result property="examineState" column="examine_state" jdbcType="VARCHAR"/>
+            <result property="price" column="price" jdbcType="DECIMAL"/>
+            <result property="inventoryQuantity" column="inventory_quantity" jdbcType="INTEGER"/>
+            <result property="attachmentLocation" column="attachment_location" jdbcType="VARCHAR"/>
+            <result property="invList" column="inv_list" jdbcType="VARCHAR"/>
+            <result property="returnUserId" column="return_user_id" jdbcType="VARCHAR"/>
+            <result property="returnUser" column="return_user" jdbcType="VARCHAR"/>
+            <result property="returnDate" column="return_date" jdbcType="TIMESTAMP"/>
+            <result property="applyTime" column="apply_time" jdbcType="TIMESTAMP"/>
+            <result property="applyUser" column="apply_user" jdbcType="VARCHAR"/>
+            <result property="transferType" column="transfer_type" jdbcType="INTEGER"/>
+            <result property="note" column="note" jdbcType="VARCHAR"/>
+            <result property="manufacturerId" column="manufacturer_id" jdbcType="VARCHAR"/>
+            <result property="manufacturerName" column="manufacturer_name" jdbcType="VARCHAR"/>
+            <result property="itemDetails" column="item_details" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
+            <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,process_id,bussiness_type,
+        order_code,start_org_id,start_org_name,
+        end_org_id,end_org_name,examine_state,
+        price,inventory_quantity,attachment_location,
+        inv_list,return_user_id,return_user,
+        return_date,apply_time,apply_user,
+        transfer_type,note,manufacturer_id,
+        manufacturer_name,item_details,create_time,
+        update_time,create_user,update_user
+    </sql>
+</mapper>

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

@@ -2,7 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.junmp.jyzb.mapper.PolicemanMapper">
 
-<!--<resultMap id="PolicemanMap" type="Map">-->
+
+    <!--<resultMap id="PolicemanMap" type="Map">-->
 <!--  <id property="id" column="id"/>-->
 <!--    <result property="orgId" column="orgId"/>-->
 <!--    <result property="orgName" column="orgName"/>-->
@@ -21,7 +22,17 @@
 <!--    </collection>-->
 <!--</resultMap>-->
 
-
+    <update id="updateBatchUserIdByAccountList">
+        UPDATE base_policeman SET userId = CASE account
+        <foreach collection='accountList' item='account' index='index' separator=' '>
+        WHEN #{account} THEN #{userIdList[index]}
+        </foreach>
+        END
+        WHERE account IN
+        <foreach collection='accountList' item='account' separator=',' open='(' close=')'>
+        #{account}
+        </foreach>
+    </update>
 
     <select id="getOnePolice" resultType="Map">
         SELECT