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/OrderDto.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -79,4 +80,8 @@ public class OrderDto implements Serializable {
      */
     private List<OrderDetailDto>  detailList;
 
+    private Date useDate;
+
+    private String createUser;
+
 }

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

@@ -88,5 +88,10 @@ public class OrderMainDto implements Serializable {
      */
     private String attachmentLocation;
 
+    /**
+     * 创建人员
+     */
+    private String createUser;
+
 }
 

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

@@ -100,6 +100,6 @@ public class OrderMainReq extends BaseRequest {
      */
     private String returnUserId;
 
-    private List<OrderDetailReq> childrenOrder;
+    private List<OrderDetailReq> detailList;
 
 }

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

@@ -7,6 +7,9 @@ import lombok.EqualsAndHashCode;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 
+/**
+ * 盘库申请实体类
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class StocktakeReq extends BaseRequest {
@@ -62,9 +65,17 @@ public class StocktakeReq extends BaseRequest {
     private String shelfId;
 
     /**
-     * 货架位置（类型为1时特有）
+     * 排（类型为1时特有）
+     */
+    private String shelfRanges;
+    /**
+     * 列（类型为1时特有）
+     */
+    private String shelfColumns;
+    /**
+     * 行（类型为1时特有）
      */
-    private String shelfLocation;
+    private String shelfRows;
 
     /**
      * 号型id（类型为2时特有）

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

@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -126,5 +127,10 @@ public class UpdateOrderReq extends BaseRequest implements Serializable {
      */
     private String returnUserId;
 
+    private Date useDate;
+
+    private String createUser;
+    private String updateUser;
+
 }
 

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

+package com.junmp.jyzb.api.bean.req;
+
+import com.junmp.v2.common.bean.request.BaseRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UpdateReassignmentReq extends BaseRequest {
+    /**
+     * id
+     */
+    private String id;
+
+    private String userId;
+
+    /**
+     * 工作流id
+     */
+    private String processDefinitionId;
+
+    /**
+     * 调岗警员id
+     */
+    private String policeId;
+
+    /**
+     * 调岗警员姓名
+     */
+    private String policeName;
+
+    /**
+     * 警员带走装备
+     */
+    private String eqsList;
+
+    /**
+     * 组织机构id（警员原组织机构id）
+     */
+    private Long orgId;
+
+    /**
+     * 目标组织机构id
+     */
+    private Long targetOrgId;
+
+    /**
+     * 调岗原因
+     */
+    private String note;
+
+    /**
+     * 审核状态(none未接入工作流，working审批中，finished审批完成)
+     */
+    private String examineState;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 创建人员
+     */
+    private String createUser;
+
+    /**
+     * 更新人员
+     */
+    private String updateUser;
+
+    /**
+     * 排序规则
+     */
+    private String order;
+    /**
+     * 排序字段
+     */
+    private String column;
+}

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

@@ -6,9 +6,11 @@ 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.api.bean.req.UpdateReassignmentReq;
 import com.junmp.jyzb.entity.EquipmentSize;
 import com.junmp.jyzb.entity.PoliceEquipment;
 import com.junmp.jyzb.entity.Policeman;
+import com.junmp.jyzb.entity.Reassignment;
 import com.junmp.jyzb.service.PolicemanService;
 import com.junmp.jyzb.utils.ResponseResult;
 import com.junmp.v2.common.bean.request.ValidationApi;
@@ -126,19 +128,6 @@ public class PoliceController {
     }
 
 
-    @PostMapping("/PoliceReassignment")
-    @ApiOperation("警员调岗申请单")
-    public ApiRes<String> PoliceReassignment(){
-        return ApiRes.success(policemanService.PoliceReassignment());
-    }
-
-    @PostMapping("/ChangePoliceOrg")
-    @ApiOperation("警员调岗（业务过程）")
-    public ApiRes<Boolean> changePoliceOrg(@RequestBody @Validated(ValidationApi.edit.class)PoliceReassignmentReq req){
-        return ApiRes.success(policemanService.changePoliceOrg(req));
-    }
-
-
     @PostMapping("/AddFaceInfo")
     @ApiOperation("添加警员面部信息")
     public ApiRes<Boolean> AddFaceInfo(@RequestBody @Validated(ValidationApi.detail.class) UpdatePolicemanReq req) {
@@ -213,4 +202,23 @@ public class PoliceController {
     public ApiRes<Boolean> UpdatePoliceUser(){
         return ApiRes.success(policemanService.UpdatePoliceUser());
     }
+
+    @PostMapping("/PoliceReassignment")
+    @ApiOperation("警员调岗申请单")
+    public ApiRes<String> PoliceReassignment(@RequestBody UpdateReassignmentReq req){
+        return ApiRes.success(policemanService.PoliceReassignment(req));
+    }
+
+    @PostMapping("/ShowReassignmentPage")
+    @ApiOperation("查看警员调岗申请单")
+    public ApiRes<PageResult<Reassignment>> ShowReassignmentPage(@RequestBody UpdateReassignmentReq req){
+        return ApiRes.success(policemanService.ShowReassignmentPage(req));
+    }
+
+    @PostMapping("/ChangePoliceOrg")
+    @ApiOperation("警员调岗（业务过程）")
+    public ApiRes<Boolean> changePoliceOrg(@RequestBody @Validated(ValidationApi.edit.class)PoliceReassignmentReq req){
+        return ApiRes.success(policemanService.changePoliceOrg(req));
+    }
+
 }

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

@@ -147,12 +147,6 @@ public class InventorySummary implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-    /**
-     * 唯一值
-     */
-    @ApiModelProperty(value = "唯一值")
-    @TableField("one_id")
-    private String oneId;
 
     /**
      * 物资阈值

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

@@ -30,7 +30,7 @@ public class Policeman implements Serializable {
     @TableField(value = "cabinet_box_id",updateStrategy  = FieldStrategy.IGNORED)
     private String cabinetBoxId;
 
-    @TableField(value = "org_id_int")
+    @TableField(value = "org_id_int",updateStrategy  = FieldStrategy.IGNORED)
     private Long orgId;
 
     @TableField(value = "department_id")

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

@@ -74,6 +74,11 @@ public class Reassignment implements Serializable {
     private String examineState;
 
     /**
+     * 申请时间
+     */
+    @TableField(value = "apply_time")
+    private Date applyTime;
+    /**
      * 创建时间
      */
     @TableField(value = "create_time")

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

@@ -6,11 +6,12 @@ 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.api.bean.req.UpdateReassignmentReq;
 import com.junmp.jyzb.entity.PoliceEquipment;
 import com.junmp.jyzb.entity.Policeman;
+import com.junmp.jyzb.entity.Reassignment;
 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;
 
@@ -78,5 +79,8 @@ public interface PolicemanService extends IService<Policeman> {
     boolean UpdatePoliceUser();
 
     //警员调岗申请单
-    String PoliceReassignment();
+    String PoliceReassignment(UpdateReassignmentReq req);
+
+    //查看警员调岗申请单
+    PageResult<Reassignment> ShowReassignmentPage(UpdateReassignmentReq req);
 }

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

@@ -428,11 +428,11 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         //判断传递的订单主id是否存在
         OrderMain orderMain = orderMainExist(req.getId());
         //记账子单据不能传空
-        if (req.getChildrenOrder().size()==0){
+        if (req.getDetailList().size()==0){
             throw new ServiceException(OrderExceptionEnum.ORDERDETAIL_ISNOT_NULL);
         }
         //前端传递的子单数据
-        List<OrderDetailReq> reqList = req.getChildrenOrder();
+        List<OrderDetailReq> reqList = req.getDetailList();
         //将记账数量进行相加
         Integer updateQuantity=0;
         //将价格进行添加修改
@@ -441,7 +441,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         List<OrderDetail> list = orderDetailService.list(new LambdaQueryWrapper<OrderDetail>()
                 .eq(OrderDetail::getOrderId,req.getId()));
         //获取所有传递的子单据id
-        Set<Long> collect = req.getChildrenOrder().stream().map(OrderDetailReq::getId).collect(Collectors.toSet());
+        Set<Long> collect = req.getDetailList().stream().map(OrderDetailReq::getId).collect(Collectors.toSet());
         //获取所有数据库的子单据id
         Set<Long> existingIds = list.stream().map(OrderDetail::getId).collect(Collectors.toSet());
         //创建一个操作记录
@@ -543,6 +543,8 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                             .eq(InventorySummary::getTypeId, orderDetailReq.getTypeId())
                             .eq(InventorySummary::getLocationId, orderDetailReq.getWarehouseId())
                             .eq(InventorySummary::getPrice, orderDetailReq.getPrice()));
+                    //如果one为空，则添加一条数据？？？？？存疑
+
                     //更新数量和总价格，在库数和出库数也需要对应进行修改
                     //修改的数量和价格
                     BigDecimal totalPrice = one.getPrice().subtract(BigDecimal.valueOf(orderDetailReq.getActualNum()).multiply(orderDetailReq.getPrice()))
@@ -593,7 +595,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         LambdaQueryWrapper<OrderLog> eq = new LambdaQueryWrapper<OrderLog>()
                 .eq(ObjectUtil.isNotNull(req.getBussinessType()), OrderLog::getBussinessType, req.getBussinessType())
                 .eq(ObjectUtil.isNotNull(req.getOrderType()), OrderLog::getOrderType, req.getOrderType())
-                .eq(ObjectUtil.isNotNull(req.getOrderId()), OrderLog::getOrgId, req.getOrgId())
+//                .eq(ObjectUtil.isNotNull(req.getOrderId()), OrderLog::getOrgId, req.getOrgId())
                 .ge(ObjectUtil.isNotNull(req.getStartTime()), OrderLog::getCreateTime, req.getStartTime())
                 .le(ObjectUtil.isNotNull(req.getEndTime()), OrderLog::getCreateTime, req.getEndTime());
         Page<OrderLog> page = orderLogService.page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), eq);

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

@@ -8,13 +8,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
 import com.junmp.junmpProcess.exception.WorkFlowException;
+import com.junmp.junmpProcess.service.IFlowInstanceService;
 import com.junmp.jyzb.api.bean.dto.PoliceFingerDto;
 import com.junmp.jyzb.api.bean.dto.PolicemanDto;
 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.FormEqsReq;
 import com.junmp.jyzb.api.bean.req.UpdatePolicemanReq;
+import com.junmp.jyzb.api.bean.req.UpdateReassignmentReq;
 import com.junmp.jyzb.api.exception.enums.*;
 import com.junmp.jyzb.entity.*;
 import com.junmp.jyzb.mapper.*;
@@ -46,6 +50,7 @@ import org.apache.catalina.User;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -82,7 +87,11 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     @Resource
     private PoliceEquipmentService policeEquipmentService;
 
+    @Resource
+    private ReassignmentService reassignmentService;
 
+    @Resource
+    private IFlowInstanceService FlowInstanceService;
 
     @Resource
     private SysUserOrgService sysUserOrgService;
@@ -541,32 +550,41 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     public boolean changePoliceOrg(PoliceReassignmentReq req) {
         //通过警员id查询出该警员的基本信息
         Policeman policeman = getById(req.getId());
+        //将其组织机构号设为空
+        policeman.setOrgId(null);
         //如果警员绑定账号，将警员的账号进行删除
         if (ObjectUtil.isNotNull(policeman.getUserId())){
             policeman.setUserId(null);
             policeman.setPassword(null);
             sysUserService.removeById(policeman.getUserId());
         }
-        //修改警员的个人信息(删除指纹信息，修改组织机构信息)
+
+        //修改警员的个人信息(删除指纹信息)
         List<PoliceFinger> list = policeFingerService.list(new LambdaQueryWrapper<PoliceFinger>()
                 .eq(PoliceFinger::getPoliceId, policeman.getId()));
         if (list.size()!=0){
             policeFingerService.removeBatchByIds(list);
         }
-        policeman.setOrgId(req.getGoalOrgId());
         //如果绑定箱门，进行解绑
         if (ObjectUtil.isNotNull(policeman.getCabinetBoxId())){
             policeman.setCabinetBoxId(null);
         }
         //对装备进行相关操作
-        //判断前端传递的装备列表是否为空，如果为空则表示该警员不拿走任何装备信息，将警员装备表中的数据删除即可
+        //判断前端传递的装备列表是否为空，如果为空则表示该警员不拿走任何装备信息
         if (req.getEqsReqList().size()==0){
-            policeEquipmentService.remove(new LambdaQueryWrapper<PoliceEquipment>()
-                    .eq(PoliceEquipment::getPoliceId, policeman.getId()));
+            LambdaQueryWrapper<PoliceEquipment> eq = new LambdaQueryWrapper<PoliceEquipment>()
+                    .eq(PoliceEquipment::getPoliceId, policeman.getId());
+            //查询该警员是否存在装备信息，如果存在则进行删除
+            List<PoliceEquipment> list1 = policeEquipmentService.list(eq);
+            if (list1.size()!=0){
+                policeEquipmentService.remove(eq);
+            }
         }else{
-            //警员带走的装备
+            //警员带走的装备（如果没有全部拿走，那么剩下的装备信息删除）那么他带走的装备怎么处理呢，应该是inventory这张表中的数据进行操作，但是具体是哪几件装备修改信息呢？应该是具体到epc的吧
+            for (FormEqsReq eqsReq:req.getEqsReqList()) {
 
             }
+        }
         return updateById(policeman);
     }
 
@@ -611,9 +629,47 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         return updateBatchById(policemanList);
     }
 
+    //警员调岗申请
     @Override
-    public String PoliceReassignment() {
-        return null;
+    public String PoliceReassignment(UpdateReassignmentReq req) {
+        Reassignment reassignment = new Reassignment();
+        BeanPlusUtil.copyProperties(req,reassignment);
+        reassignmentService.save(reassignment);
+        //执行工作流
+        if (req.getExamineState().equals("working"))
+        {
+            StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
+            startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
+            startProcessInstanceDTO.setOrderId(reassignment.getId());
+            startProcessInstanceDTO.setOrderType("workOrder");
+            startProcessInstanceDTO.setUserId(req.getUserId());
+            String ProcessInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
+            reassignment.setProcessId(ProcessInstanceId);
+        }
+        return reassignment.getId();
+    }
+
+    //查看警员调岗申请单
+    @Override
+    public PageResult<Reassignment> ShowReassignmentPage(UpdateReassignmentReq req) {
+        //(如果传其他不是数据库字段参数或者排序规则不是deac或者asc可能会出现错误)
+        if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() &&
+                (req.getOrder().equalsIgnoreCase("asc")|| req.getOrder().equalsIgnoreCase("desc")) &&
+                ObjectUtil.isNotNull(req.getOrder()) && !req.getOrder().trim().isEmpty()) {
+            //修改字段，和数据库字段进行统一
+            req.setColumn(req.getColumn().replaceAll("[A-Z]", "_$0").toLowerCase());
+            req.setOrder(req.getOrder().toLowerCase());
+        }
+        LambdaQueryWrapper<Reassignment> eq = new LambdaQueryWrapper<Reassignment>()
+                .eq(ObjectUtil.isNotNull(req.getOrgId()), Reassignment::getOrgId, req.getOrgId())
+                .eq(ObjectUtil.isNotNull(req.getTargetOrgId()), Reassignment::getTargetOrgId, req.getTargetOrgId())
+                .eq(ObjectUtil.isNotNull(req.getExamineState()), Reassignment::getExamineState, req.getExamineState())
+                .like(ObjectUtil.isNotNull(req.getPoliceName()), Reassignment::getPoliceName, req.getPoliceName())
+                .ge(ObjectUtil.isNotNull(req.getStartTime()), Reassignment::getApplyTime, req.getStartTime())
+                .le(ObjectUtil.isNotNull(req.getEndTime()), Reassignment::getApplyTime, req.getEndTime())
+                .last("order by " + req.getColumn() + " " + req.getOrder());
+        Page<Reassignment> page = reassignmentService.page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), eq);
+        return PageResultFactory.createPageResult(page);
     }
 
 }