新增同步更新基础信息接口

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/FetchingDataDto/sizeDto.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/FetchingDataDto/SizeDto.java

@@ -6,7 +6,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
-public class sizeDto {
+public class SizeDto {
     /**
      * 装备号型ID
      */

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

@@ -13,6 +13,7 @@ public class PoliceFingerDto implements Serializable {
     private String policeId;
 
     private String name;
+    private String fingerNum;
 
     private String fingerInfo;
 

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

@@ -71,4 +71,6 @@ public class TjOrgCountDto implements Serializable {
 
     private String typeParentId;
 
+    private String name;
+
 }
\ No newline at end of file

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

+package com.junmp.jyzb.api.bean.req;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class InventorySummaryReq {
+    /**
+     * 装备汇总id
+     */
+    private Long id;
+
+    private String valuekey;
+    /**
+     * 组织机构id
+     */
+    private Long orgId;
+
+    /**
+     * 组织机构名称
+     */
+    private String orgName;
+
+
+    /**
+     * 组织机构编码
+     */
+    private String orgCode;
+    /**
+     * 装备类型id
+     */
+    private String typeId;
+
+    /**
+     * 类型名称
+     */
+    private String typeName;
+
+    /**
+     * 装备号型id
+     */
+    private String sizeId;
+
+    /**
+     * 号型名称
+     */
+    private String sizeName;
+
+    /**
+     * 位置类型，0代表仓库，1代表单警柜
+     */
+    private String locationType;
+
+    /**
+     * 位置信息id
+     */
+    private String locationId;
+
+    /**
+     * 位置名称
+     */
+    private String locationName;
+
+
+    /**
+     * 库存数量
+     */
+    private Integer number;
+
+    /**
+     * 物资单价
+     */
+    private BigDecimal unitPrice;
+
+    /**
+     * 总价
+     */
+    private BigDecimal price;
+
+    /**
+     * 在库数
+     */
+    private Integer stockNumber;
+
+    private BigDecimal stockNumberPrice;
+    /**
+     * 出库数量
+     */
+    private Integer outboundNumber;
+    private BigDecimal outboundNumberPrice;
+    /**
+     * 销毁数量
+     */
+    private Integer destructionNumber;
+    private BigDecimal destructionNumberPrice;
+
+    /**
+     * 销毁金额
+     */
+    private BigDecimal destructionPrice;
+    /**
+     * 过质保数量
+     */
+    private Integer expireNumber;
+
+
+    private BigDecimal expireNumberPrice;
+    /**
+     * 报废数量
+     */
+
+    private Integer brokenNumber;
+
+    private BigDecimal brokenNumberPrice;
+    /**
+     * 临近报废数量
+     */
+    private Integer nearBrokenNumber;
+
+    private Integer useCount;
+
+    private Integer fixCount;
+
+    /**
+     * 使用中数量（领用和借用）
+     */
+    private Integer useNumber;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+
+    /**
+     * 物资阈值
+     */
+    private Integer threshold;
+
+    /**
+     * 审核中的报废数量（仅移入报废区的业务单使用）
+     */
+    private Integer agentBrokenNum;
+}

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -29,4 +30,5 @@ public class UpdateEquipmentSizeReq {
     private String photo;
 
     private String instructions;
+    private Date updateTime;
 }

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

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -35,4 +36,6 @@ public class UpdateEquipmentTypeReq {
     private String photo;
 
     private List<String> supplierList;
+
+    private Date updateTime;
 }

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

@@ -31,4 +31,6 @@ public class UpdateSupplierReq {
 
     @NotBlank(message = "状态不能为空", groups = {ValidationApi.updateStatus.class})
     private Integer state;
+
+    private Date updateTime;
 }

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

@@ -2,7 +2,10 @@ package com.junmp.jyzb.controller;
 
 import cn.hutool.db.Page;
 import com.junmp.jyzb.api.bean.dto.EquipmentSizeDto;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.PoliceDto;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.SizeDto;
 import com.junmp.jyzb.api.bean.query.InventorySumReq;
+import com.junmp.jyzb.api.bean.query.PolicemanReq;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentSizeReq;
 import com.junmp.jyzb.api.bean.req.UpdateEquipmentSizeReq;
 import com.junmp.jyzb.entity.EquipmentSize;
@@ -88,5 +91,11 @@ public class EquipmentSizeController {
 //        return ApiRes.success(equipmentSizeService.selectByTypeIds(req.getTypeIdsList()));
 //    }
 
+    @PostMapping("/alignSizeInfo")
+    @ApiOperation("同步更新号型信息")
+    public ApiRes<List<SizeDto>> alignSizeInfo(@RequestBody UpdateEquipmentSizeReq req){
+        return ApiRes.success(equipmentSizeService.alignSizeInfo(req));
+    }
+
 
 }

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

@@ -3,7 +3,10 @@ package com.junmp.jyzb.controller;
 import com.junmp.jyzb.api.bean.dto.ESTypeDto;
 import com.junmp.jyzb.api.bean.dto.EquipmentTypeDto;
 import com.junmp.jyzb.api.bean.dto.EquipmentTreeDto;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.SizeDto;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.TypeDto;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
+import com.junmp.jyzb.api.bean.req.UpdateEquipmentSizeReq;
 import com.junmp.jyzb.api.bean.req.UpdateEquipmentTypeReq;
 import com.junmp.jyzb.service.EquipmentTypeService;
 import com.junmp.jyzb.utils.ResponseResult;
@@ -91,7 +94,12 @@ public class EquipmentTypeController {
     }
 
 
-    //根据组织机构查询出他现有的装备号型数量有哪些
+
+    @PostMapping("/alignTypeInfo")
+    @ApiOperation("同步更新类型信息")
+    public ApiRes<List<TypeDto>> alignTypeInfo(@RequestBody UpdateEquipmentTypeReq req){
+        return ApiRes.success(equipmentTypeService.alignTypeInfo(req));
+    }
 
 
 }

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

@@ -2,6 +2,7 @@ package com.junmp.jyzb.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.junmp.jyzb.api.bean.dto.FetchingDataDto.PoliceDto;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.UserDto;
 import com.junmp.jyzb.api.bean.dto.PolicemanDto;
 import com.junmp.jyzb.api.bean.dto.ReassignmentDto;
 import com.junmp.jyzb.api.bean.query.CabinetReq;
@@ -96,13 +97,13 @@ public class PoliceController {
     //重置密码
     @PostMapping("/reSetPassword")
     @ApiOperation("重置密码")
-    public ApiRes<Boolean> reSetPassword(@RequestBody SysUserReq req){
+    public ApiRes<Boolean> reSetPassword(@RequestBody @Validated(SysUserReq.resetPwd.class) SysUserReq req){
         return ApiRes.success(policemanService.reSetPassword(req));
     }
-    //重置密码
+    //修改密码
     @PostMapping("/updatePassword")
-    @ApiOperation("重置密码")
-    public ApiRes<Boolean> updatePassword(@RequestBody SysUserReq req){
+    @ApiOperation("修改密码")
+    public ApiRes<Boolean> updatePassword(@RequestBody @Validated(SysUserReq.updatePwd.class) SysUserReq req){
         return ApiRes.success(policemanService.updatePassword(req));
     }
 
@@ -259,4 +260,11 @@ public class PoliceController {
     public ApiRes<List<PoliceDto>> alignPoliceInfo(@RequestBody PolicemanReq req){
         return ApiRes.success(policemanService.alignPoliceInfo(req));
     }
+
+    @PostMapping("/alignUserInfo")
+    @ApiOperation("同步更新用户信息")
+    public ApiRes<List<UserDto>> alignUserInfo(@RequestBody PolicemanReq req){
+        return ApiRes.success(policemanService.alignUserInfo(req));
+    }
+
 }

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

 package com.junmp.jyzb.controller;
 
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.SizeDto;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.SupplierInfoDto;
 import com.junmp.jyzb.api.bean.dto.SupplierDto;
 import com.junmp.jyzb.api.bean.query.QuerySupplierReq;
+import com.junmp.jyzb.api.bean.req.UpdateEquipmentSizeReq;
 import com.junmp.jyzb.api.bean.req.UpdateSupplierReq;
 import com.junmp.jyzb.entity.Supplier;
 import com.junmp.jyzb.service.SupplierService;
@@ -65,4 +68,10 @@ public class SupplierController {
     public ApiRes<Boolean> changeSupplierState(@RequestBody @Validated(ValidationApi.edit.class) UpdateSupplierReq req) {
         return ApiRes.success(supplierService.ChangeSupplierState(req));
     }
+
+    @PostMapping("/alignSupplierInfo")
+    @ApiOperation("同步更新号型信息")
+    public ApiRes<List<SupplierInfoDto>> alignSupplierInfo(@RequestBody UpdateSupplierReq req){
+        return ApiRes.success(supplierService.alignSupplierInfo(req));
+    }
 }

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

 package com.junmp.jyzb.controller;
 
 import com.junmp.jyzb.api.bean.dto.*;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.UserDto;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.WarehouseInfoDto;
+import com.junmp.jyzb.api.bean.query.PolicemanReq;
 import com.junmp.jyzb.api.bean.query.ShelfReq;
 import com.junmp.jyzb.api.bean.query.WarehouseAreaReq;
 import com.junmp.jyzb.api.bean.query.WarehouseReq;
@@ -130,6 +133,10 @@ public class WarehouseController {
         return ApiRes.success(shelfService.GetShelfList(req));
     }
 
-
+    @PostMapping("/alignWarehouseInfo")
+    @ApiOperation("同步更新仓库信息")
+    public ApiRes<List<WarehouseInfoDto>> alignWarehouseInfo(@RequestBody UpdateWarehouseReq req){
+        return ApiRes.success(warehouseService.alignWarehouseInfo(req));
+    }
 
 }

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

@@ -64,6 +64,11 @@ public class Supplier implements Serializable {
     private Date updateTime;
 
 
+    /**
+     * 更新人ID
+     */
+    @TableField(value = "create_user")
+    private String createUser;
 
     /**
      * 更新人ID

jyzb-biz/src/main/java/com/junmp/jyzb/listener/CounterSignListener.java

@@ -254,7 +254,11 @@ public class CounterSignListener implements ExecutionListener {
                  {
 
                      String assigneeString = String.join(",", assigneeList);
+                     if (ObjectUtil.isNull(om.getCurrentAssign())){
                          om.setCurrentAssign(assigneeString);
+                     }else {
+                         om.setCurrentAssign(om.getCurrentAssign()+","+assigneeString);
+                     }
                      orderMainService.updateById(om);
                  }
 
@@ -267,7 +271,11 @@ public class CounterSignListener implements ExecutionListener {
                     {
 
                         String assigneeString = String.join(",", assigneeList);
+                        if (ObjectUtil.isNull(re.getCurrentAssign())){
                             re.setCurrentAssign(assigneeString);
+                        }else {
+                            re.setCurrentAssign(re.getCurrentAssign()+","+assigneeString);
+                        }
                         reassignmentService.updateById(re);
                     }
                 }
@@ -278,18 +286,26 @@ public class CounterSignListener implements ExecutionListener {
                     if (re!=null&&assigneeList.size()>0)//判断有没有启动的当前单据,并且下一审核人信息不为空,有启动的单据则把审核人信息加入
                     {
                         String assigneeString = String.join(",", assigneeList);
+                        if (ObjectUtil.isNull(re.getCurrentAssign())){
                             re.setCurrentAssign(assigneeString);
+                        }else {
+                            re.setCurrentAssign(re.getCurrentAssign()+","+assigneeString);
+                        }
                         busFormService.updateById(re);
                     }
                 }
-                else if (orderType.equals("stocktakeOrder"))//业务单据
+                else if (orderType.equals("stocktakeOrder"))//盘库单据
                 {
                     Stocktake re=  stocktakeService.getOne(new LambdaQueryWrapper<Stocktake>()
                             .eq(Stocktake::getProcessId, execution.getProcessInstanceId()));
                     if (re!=null&&assigneeList.size()>0)//判断有没有启动的当前单据,并且下一审核人信息不为空,有启动的单据则把审核人信息加入
                     {
                         String assigneeString = String.join(",", assigneeList);
+                        if (ObjectUtil.isNull(re.getCurrentAssign())){
                             re.setCurrentAssign(assigneeString);
+                        }else {
+                            re.setCurrentAssign(re.getCurrentAssign()+","+assigneeString);
+                        }
                         stocktakeService.updateById(re);
                     }
                 }

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

@@ -3,7 +3,9 @@ package com.junmp.jyzb.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.junmp.jyzb.api.bean.dto.EquipmentSizeDto;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.SizeDto;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentSizeReq;
+import com.junmp.jyzb.api.bean.req.UpdateEquipmentSizeReq;
 import com.junmp.jyzb.entity.Cabinet;
 import com.junmp.jyzb.entity.EquipmentSize;
 import org.apache.ibatis.annotations.Mapper;
@@ -35,4 +37,5 @@ public interface EquipmentSizeMapper extends BaseMapper<EquipmentSize> {
     //根据typeId返回号型名称
     List<String> searchByTypeIds(@Param("list") List<String> typeIdsList);
 
+    List<SizeDto> alignSizeInfo(@Param("req") UpdateEquipmentSizeReq req);
 }
\ No newline at end of file

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

@@ -2,7 +2,9 @@ package com.junmp.jyzb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.junmp.jyzb.api.bean.dto.EquipmentTypeDto;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.TypeDto;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
+import com.junmp.jyzb.api.bean.req.UpdateEquipmentTypeReq;
 import com.junmp.jyzb.entity.EquipmentType;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -22,4 +24,6 @@ public interface EquipmentTypeMapper extends BaseMapper<EquipmentType> {
                                @Param("list2") List<String> list2,
                                @Param("list3") List<String> list3,
                                @Param("list4") List<String> list4);
+
+    List<TypeDto> alignTypeInfo(@Param("req") UpdateEquipmentTypeReq req);
 }
\ No newline at end of file

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

@@ -3,9 +3,11 @@ package com.junmp.jyzb.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.UserDto;
 import com.junmp.jyzb.api.bean.dto.PolicemanDto;
 import com.junmp.jyzb.api.bean.dto.SysUserRoleDto;
 import com.junmp.jyzb.api.bean.dto.UserRoleDto;
+import com.junmp.jyzb.api.bean.query.PolicemanReq;
 import com.junmp.jyzb.entity.CabinetBox;
 import com.junmp.jyzb.entity.InventorySummary;
 import com.junmp.jyzb.entity.Policeman;
@@ -55,4 +57,6 @@ public interface PolicemanMapper extends BaseMapper<Policeman> {
                @Param("name") String name, @Param("policeCode")String policeCode,
                @Param("state")Integer state,
                @Param("phone")String phone,@Param("flag") String flag);
+
+    List<UserDto> alignUserInfo(@Param("req") PolicemanReq req);
 }
\ No newline at end of file

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

 package com.junmp.jyzb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.SupplierInfoDto;
 import com.junmp.jyzb.api.bean.dto.SupplierDto;
+import com.junmp.jyzb.api.bean.req.UpdateSupplierReq;
 import com.junmp.jyzb.entity.Supplier;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -11,4 +14,6 @@ import java.util.List;
 public interface SupplierMapper  extends BaseMapper<Supplier> {
 
     List<SupplierDto> selectDistinctList();
+
+    List<SupplierInfoDto> alignSupplierInfo(@Param("req") UpdateSupplierReq req);
 }
\ No newline at end of file

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

 package com.junmp.jyzb.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.WarehouseInfoDto;
+import com.junmp.jyzb.api.bean.query.PolicemanReq;
+import com.junmp.jyzb.api.bean.req.UpdateWarehouseReq;
 import com.junmp.jyzb.entity.Warehouse;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -25,4 +29,6 @@ public interface WarehouseMapper extends BaseMapper<Warehouse> {
 
 
     boolean SetInventoryInfo(String id);
+
+    List<WarehouseInfoDto> alignWarehouseInfo(@Param("req") UpdateWarehouseReq req);
 }
\ No newline at end of file

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

@@ -2,6 +2,7 @@ package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.junmp.jyzb.api.bean.dto.EquipmentSizeDto;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.SizeDto;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentSizeReq;
 import com.junmp.jyzb.api.bean.req.UpdateEquipmentSizeReq;
 import com.junmp.jyzb.entity.EquipmentSize;
@@ -29,6 +30,8 @@ public interface EquipmentSizeService extends IService<EquipmentSize> {
     //根据typeId返回号型名称
     List<String> getByTypeIds(QueryEquipmentSizeReq req);
 
+    List<SizeDto> alignSizeInfo(UpdateEquipmentSizeReq req);
+
     //根据typeId拿到装备typeIds
 //    List<String> selectByTypeIds(List<String> typeIdsList);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.junmp.jyzb.api.bean.dto.ESTypeDto;
 import com.junmp.jyzb.api.bean.dto.EquipmentTypeDto;
 import com.junmp.jyzb.api.bean.dto.EquipmentTreeDto;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.TypeDto;
 import com.junmp.jyzb.api.bean.dto.OrgDto;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
 import com.junmp.jyzb.api.bean.query.QueryOrgReq;
@@ -29,4 +30,6 @@ public interface EquipmentTypeService extends IService<EquipmentType> {
     ESTypeDto getTypeTreeByEs(QueryEquipmentTypeReq req) throws IOException;
 
     List<EquipmentTreeDto> GetTypeTree(QueryEquipmentTypeReq req);
+
+    List<TypeDto> alignTypeInfo(UpdateEquipmentTypeReq req);
 }

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

@@ -2,6 +2,7 @@ package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.junmp.jyzb.api.bean.dto.FetchingDataDto.PoliceDto;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.UserDto;
 import com.junmp.jyzb.api.bean.dto.PolicemanDto;
 import com.junmp.jyzb.api.bean.dto.ReassignmentDto;
 import com.junmp.jyzb.api.bean.dto.UploadPolicePhotoDto;
@@ -112,4 +113,6 @@ public interface PolicemanService extends IService<Policeman> {
     boolean updatePassword(SysUserReq req);
 
     List<PoliceDto> alignPoliceInfo(PolicemanReq req);
+
+    List<UserDto> alignUserInfo(PolicemanReq req);
 }

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

 package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.SupplierInfoDto;
 import com.junmp.jyzb.api.bean.dto.SupplierDto;
 import com.junmp.jyzb.api.bean.query.QuerySupplierReq;
 import com.junmp.jyzb.api.bean.req.UpdateSupplierReq;
@@ -55,4 +56,6 @@ public interface SupplierService extends IService<Supplier> {
     Boolean ChangeSupplierState(UpdateSupplierReq req);
 
     PageResult<Supplier> ShowSupplierPage(QuerySupplierReq req);
+
+    List<SupplierInfoDto> alignSupplierInfo(UpdateSupplierReq req);
 }

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

 package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.WarehouseInfoDto;
 import com.junmp.jyzb.api.bean.dto.WarehouseDto;
+import com.junmp.jyzb.api.bean.query.PolicemanReq;
 import com.junmp.jyzb.api.bean.query.WarehouseReq;
 import com.junmp.jyzb.api.bean.req.UpdateWarehouseReq;
 import com.junmp.jyzb.entity.Warehouse;
@@ -47,4 +49,6 @@ public interface WarehouseService extends IService<Warehouse> {
     Warehouse WarehoustExist(String id);
 
     boolean SetInventoryInfo(String id);
+
+    List<WarehouseInfoDto> alignWarehouseInfo(UpdateWarehouseReq req);
 }

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

@@ -485,8 +485,10 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
             c=inventorySummaryService.updateBatchById(updateSummaryList);
         }
         //创建log记录日志
+        String string = stringBuilder.toString();
+        string=string.substring(0,string.length()-1);
         OrderLog orderLog = new OrderLog();
-        orderLog.setHistoryMsg(stringBuilder.toString());
+        orderLog.setHistoryMsg(string);
         orderLog.setOrgId(busForm.getOrgId());
         orderLog.setBussinessType(busForm.getBussinessType());
         orderLog.setOrderCode(busForm.getBussinessCode());

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.Repository.SizeRepository;
 import com.junmp.jyzb.api.bean.dto.EquipmentSizeDto;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.SizeDto;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentSizeReq;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
 import com.junmp.jyzb.api.bean.req.UpdateEquipmentSizeReq;
@@ -16,6 +17,7 @@ import com.junmp.jyzb.entity.EquipmentType;
 import com.junmp.jyzb.mapper.EquipmentTypeMapper;
 import com.junmp.jyzb.service.EquipmentSizeService;
 import com.junmp.jyzb.service.EquipmentTypeService;
+import com.junmp.jyzb.utils.DateTimeUtil;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.util.BeanPlusUtil;
 import com.junmp.v2.db.api.factory.PageFactory;
@@ -57,9 +59,8 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
         if (one==null){
             throw new ServiceException(EquipmentExceptionEnum.EQUIPMENT_TYPE_NOT_EXIST);
         }
-        //判断同一个typeId下面是否有相同的name和code，如果有则添加失败
+        //判断同一个typeId下面是否有相同的name，如果有则添加失败
         List<EquipmentSize> list = list(new LambdaQueryWrapper<EquipmentSize>()
-                .eq(EquipmentSize::getCode, req.getCode())
                 .eq(EquipmentSize::getName, req.getName())
                 .eq(EquipmentSize::getTypeId,req.getTypeId()));
         if (list.size()>0){
@@ -69,6 +70,8 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
         String sizeID=UUID.randomUUID().toString();
         BeanPlusUtil.copyProperties(req, size);
         size.setId(sizeID);
+        size.setCreateTime(DateTimeUtil.getCurrentDateTime());
+        size.setUpdateTime(DateTimeUtil.getCurrentDateTime());
         this.save(size);
         sizeRepository.save(size);
         return sizeID;
@@ -95,6 +98,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
         }
         EquipmentSize size = this.querySize(req);
         BeanPlusUtil.copyProperties(req, size);
+        size.setUpdateTime(DateTimeUtil.getCurrentDateTime());
         sizeRepository.save(size);
         return this.updateById(size);
     }
@@ -141,6 +145,12 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
         return equipmentSizeMapper.searchByTypeIds(idsList);
     }
 
+    @Override
+    public List<SizeDto> alignSizeInfo(UpdateEquipmentSizeReq req) {
+
+        return equipmentSizeMapper.alignSizeInfo(req);
+    }
+
     public List<String> selectByTypeIds(List<String> typeIdsList){
         List<String> list1=new ArrayList<>();
         List<String> list2=new ArrayList<>();

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

@@ -7,6 +7,7 @@ import com.junmp.jyzb.Repository.TypeRepository;
 import com.junmp.jyzb.api.bean.dto.ESTypeDto;
 import com.junmp.jyzb.api.bean.dto.EquipmentTypeDto;
 import com.junmp.jyzb.api.bean.dto.EquipmentTreeDto;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.TypeDto;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
 import com.junmp.jyzb.api.bean.req.UpdateEquipmentTypeReq;
 import com.junmp.jyzb.api.exception.JYZBAppException;
@@ -76,14 +77,13 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
         EquipmentType type = new EquipmentType();
         //判断数据库是否已经存在相同的name，如果有，则提示名称已存在
         List<EquipmentType> list = list(new LambdaQueryWrapper<EquipmentType>()
-                .eq(EquipmentType::getMaxCode, req.getName()));
+                .eq(EquipmentType::getName, req.getName()));
         if (list.size()>0 ){
             throw new ServiceException(EquipmentExceptionEnum.EQUIPMENT_NAME_EXIST);
         }
 
         List<String> chekResult = supplierService.CheckSupplierList(req.getSupplierList());
         if (chekResult.size() == 0) {
-            //判断parentIds是否符合规则，唯一解决办法就是不管他最后输入什么值或者没有传递，我直接对他进行正确的赋值
 
             //先增加code码
             BeanPlusUtil.copyProperties(req, type);
@@ -108,7 +108,11 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
                 supplierTypeService.saveBatch(supplierType);
             }
             this.updateById(parentType);
+            type.setCreateTime(DateTimeUtil.getCurrentDateTime());
+            type.setUpdateTime(DateTimeUtil.getCurrentDateTime());
             this.save(type);
+            //更新parent_ids字段
+            equipmentTypeMapper.setTypeParentIds();
             return  String.valueOf(newcode);
         } else {
             String msg="以下供应商不存在：" +String.join(",", chekResult);
@@ -413,6 +417,12 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
         return dtoList;
     }
 
+    @Override
+    public List<TypeDto> alignTypeInfo(UpdateEquipmentTypeReq req) {
+
+        return equipmentTypeMapper.alignTypeInfo(req);
+    }
+
     private  EquipmentTreeDto convertNode(EquipmentType entity, List<EquipmentType> entityList,Integer type) {
         EquipmentTreeDto dto = new EquipmentTreeDto();
         BeanPlusUtil.copyProperties(entity,dto);

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

@@ -359,6 +359,7 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
     private OrderLog addLog(LogSummary logSummary,String string){
         OrderLog orderLog = new OrderLog();
         orderLog.setId(UUID.randomUUID().toString());
+        string=string.substring(0,string.length()-1);
         orderLog.setHistoryMsg(string);
         orderLog.setOrderCode(logSummary.getOrderCode());
         orderLog.setBussinessType(logSummary.getBussinessType());

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

@@ -370,6 +370,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                 .eq(OrderLog::getProcessType, "createOrder"));
         //我要的是detail的明细存入到history—msg中
         boolean a=true;
+        s=s.substring(0,s.length()-1);
         if (createOrder==null){
             OrderLog orderLog = new OrderLog();
             orderLog.setId(UUID.randomUUID().toString());
@@ -796,6 +797,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             for (UpdateOrderDetailReq uploadDetailReq : reqList) {
                 OrderDetail orderDetail = new OrderDetail();
                 BeanPlusUtil.copyProperties(uploadDetailReq,orderDetail);
+                if (ObjectUtil.isNull(uploadDetailReq.getActualNum())){
+                    uploadDetailReq.setActualNum(0);
+                }
                 //获取修改后的数量并且记录(modifyQuantity表示有记账数量)
                 if (uploadDetailReq.getModifyQuantity() >= 0 ){
                     //记账内容
@@ -952,6 +956,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         OrderLog orderLog = new OrderLog();
         BeanPlusUtil.copyProperties(req,orderLog);
         orderLog.setId(UUID.randomUUID().toString());
+        s=s.substring(0,s.length()-1);
         orderLog.setHistoryMsg(s);
 //        orderLog.setHistoryMsg(JSON.toJSONString(accountingDtoList));
         orderLog.setInventoryQuantity(req.getInventoryQuantity());

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

@@ -13,6 +13,7 @@ import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
 import com.junmp.junmpProcess.service.IFlowInstanceService;
 import com.junmp.jyzb.api.bean.dto.*;
 import com.junmp.jyzb.api.bean.dto.FetchingDataDto.PoliceDto;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.UserDto;
 import com.junmp.jyzb.api.bean.query.CabinetBoxReq;
 import com.junmp.jyzb.api.bean.query.CabinetReq;
 import com.junmp.jyzb.api.bean.query.PolicemanReq;
@@ -182,6 +183,8 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         policeman.setPassword(sysUser.getPassword());
         policeman.setState(1);
         policeman.setUserId(sysUser.getUserId());
+        policeman.setCreateTime(DateTimeUtil.getCurrentDateTime());
+        policeman.setUpdateTime(DateTimeUtil.getCurrentDateTime());
         save(policeman);
 
         return policeman.getId();
@@ -389,7 +392,6 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             sysUserRoleService.saveBatch(collect);
         }
         //人员信息修改之后推送至本地主机和单警柜
-        //查询出单警柜的单警柜id，将
         List<Cabinet> list = cabinetService.list(new LambdaQueryWrapper<Cabinet>().eq(Cabinet::getOrgIdInt, pubOrg.getOrgId()));
         List<String> cabinetIdList = list.stream().map(cabinet -> cabinet.getId()).collect(Collectors.toList());
 
@@ -760,7 +762,9 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         //记录日志
         OrderLog orderLog1 = new OrderLog();
         orderLog1.setBussinessType("调入警员修改库存汇总");
-        orderLog1.setHistoryMsg(stringBuilder.toString());
+        String string = stringBuilder.toString();
+        string=string.substring(0,string.length()-1);
+        orderLog1.setHistoryMsg(string);
         orderLog1.setOrgId(pubOrg.getOrgId());
         orderLog1.setOrgName(pubOrg.getOrgName());
         orderLog1.setCreateTime(DateTimeUtil.getCurrentDateTime());
@@ -933,7 +937,9 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
             //记录日志(如果警员携带装备,则进行记录 )
             if (ObjectUtil.isNotNull(reqEquipments)){
                 OrderLog orderLog = new OrderLog();
-                orderLog.setHistoryMsg(stringBuilder.toString());
+                String string = stringBuilder.toString();
+                string=string.substring(0,string.length()-1);
+                orderLog.setHistoryMsg(string);
                 orderLog.setOrgId(req.getOrgId());
                 //特殊记号，警员+警员编号
                 orderLog.setOrderType(req.getPoliceName()+req.getPoliceCode());
@@ -1365,4 +1371,9 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         return returnList;
     }
 
+    @Override
+    public List<UserDto> alignUserInfo(PolicemanReq req) {
+        return policemanMapper.alignUserInfo(req);
+    }
+
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.SupplierInfoDto;
 import com.junmp.jyzb.api.bean.dto.SupplierDto;
 import com.junmp.jyzb.api.bean.query.QuerySupplierReq;
 import com.junmp.jyzb.api.bean.req.UpdateSupplierReq;
@@ -11,6 +12,7 @@ import com.junmp.jyzb.api.exception.enums.SupplierExceptionEnum;
 import com.junmp.jyzb.entity.Supplier;
 import com.junmp.jyzb.service.OrderMainService;
 import com.junmp.jyzb.service.SupplierService;
+import com.junmp.jyzb.utils.DateTimeUtil;
 import com.junmp.v2.common.exception.base.ServiceException;
 import com.junmp.v2.common.util.BeanPlusUtil;
 import com.junmp.v2.db.api.factory.PageFactory;
@@ -42,6 +44,8 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
         String ID=UUID.randomUUID().toString();
         req.setId(ID);
         BeanPlusUtil.copyProperties(req, supplier);
+        supplier.setCreateTime(DateTimeUtil.getCurrentDateTime());
+        supplier.setUpdateTime(DateTimeUtil.getCurrentDateTime());
         this.save(supplier);
         return ID;
     }
@@ -58,6 +62,7 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
     public boolean UpdateSupplier(UpdateSupplierReq req) {
         Supplier supplier = this.QuerySupplier(req);
         BeanPlusUtil.copyProperties(req, supplier);
+        supplier.setUpdateTime(DateTimeUtil.getCurrentDateTime());
         return this.updateById(supplier);
     }
 
@@ -131,9 +136,15 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
     }
 
     @Override
+    public List<SupplierInfoDto> alignSupplierInfo(UpdateSupplierReq req) {
+        return supplierMapper.alignSupplierInfo(req);
+    }
+
+    @Override
     public Boolean ChangeSupplierState(UpdateSupplierReq req) {
         Supplier supplier = this.QuerySupplier(req);
         BeanPlusUtil.copyProperties(req, supplier);
+        supplier.setUpdateTime(DateTimeUtil.getCurrentDateTime());
         return this.updateById(supplier);
     }
 

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

@@ -3,7 +3,9 @@ package com.junmp.jyzb.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.jyzb.api.bean.dto.FetchingDataDto.WarehouseInfoDto;
 import com.junmp.jyzb.api.bean.dto.WarehouseDto;
+import com.junmp.jyzb.api.bean.query.PolicemanReq;
 import com.junmp.jyzb.api.bean.query.WarehouseReq;
 import com.junmp.jyzb.api.bean.req.UpdateWarehouseReq;
 import com.junmp.jyzb.api.exception.enums.WarehouseExceptionEnum;
@@ -128,19 +130,13 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
 
     @Override
     public boolean changeWarehouseState(WarehouseReq req) {
-        Warehouse warehouse = this.queryWarehouse(req);
+        Warehouse warehouse = WarehoustExist(req.getId());
         BeanPlusUtil.copyProperties(req, warehouse);
+        warehouse.setUpdateTime(DateTimeUtil.getCurrentDateTime());
         return this.updateById(warehouse);
     }
 
 
-
-
-    private Warehouse queryWarehouse(WarehouseReq req) {
-        Warehouse warehouse = WarehoustExist(req.getId());
-        return warehouse;
-    }
-
     //判断仓库是否存在
     @Override
     public Warehouse WarehoustExist(String id) {
@@ -160,4 +156,9 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper,Warehouse>
         return true;
     }
 
+    @Override
+    public List<WarehouseInfoDto> alignWarehouseInfo(UpdateWarehouseReq req) {
+        return warehouseMapper.alignWarehouseInfo(req);
+    }
+
 }

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

@@ -246,7 +246,7 @@
     </select>
     <select id="TjOrgCountByType" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto"
             parameterType="com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq">
-        select et.id as type_parent_id,a.org_id,max(a.org_name) as org_name,coalesce(sum(a.use_count),0) as use_count
+        select et.id as type_parent_id,et.name as name,a.org_id,max(a.org_name) as org_name,coalesce(sum(a.use_count),0) as use_count
         FROM base_equipment_type et
             LEFT JOIN
                (select
@@ -267,6 +267,6 @@
                  </if>
                 GROUP BY org_id,type_parent_id) as a on a.type_parent_id=et.id
         where TRIM(et.parent_ids )='' and et.id !="00000000-0000-0000-0000-000000000000"
-        GROUP BY et.id,a.org_id
+        GROUP BY et.id,et.name,a.org_id
     </select>
 </mapper>

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

@@ -63,4 +63,14 @@
             #{item}
           </foreach>
     </select>
+    <select id="alignSizeInfo" resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.SizeDto"
+            parameterType="com.junmp.jyzb.api.bean.req.UpdateEquipmentSizeReq">
+            select * from base_equipment_size where
+                <if test="req.updateTime!=null and req.updateTime !=''">
+                    update_time &gt; #{req.updateTime}
+                </if>
+                <if test="req.updateTime==null and req.updateTime ==''">
+                    1=1
+                </if>
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -82,7 +82,17 @@
             </foreach>
         </if>
     </select>
-
+    <select id="alignTypeInfo" resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.TypeDto"
+            parameterType="com.junmp.jyzb.api.bean.req.UpdateEquipmentTypeReq">
+        select id,name,unit,uint_type,parent_id,parent_ids,code,state,note,guid,type,create_time,update_time
+        from base_equipment_type where
+        <if test="req.updateTime!=null and req.updateTime !=''">
+            update_time &gt; #{req.updateTime}
+        </if>
+        <if test="req.updateTime==null and req.updateTime ==''">
+            1=1
+        </if>
+    </select>
 
 
 </mapper>
\ No newline at end of file

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

@@ -316,6 +316,14 @@ WHERE o.org_id IN
         )
         as f
     </select>
+    <select id="alignUserInfo" resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.UserDto"
+            parameterType="com.junmp.jyzb.api.bean.query.PolicemanReq">
+        SELECT su.* FROM `sys_user` su
+            join sys_user_org  suo on su.user_id=suo.user_id and suo.org_id=#{req.orgId}
+        <if test="req.updateTime !=null and req.updateTime != ''">
+            where su.update_time &gt; #{req.updateTime}
+        </if>
+    </select>
 
 
 </mapper>
\ No newline at end of file

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

@@ -23,6 +23,17 @@
       FROM base_supplier
       GROUP BY name
     </select>
+    <select id="alignSupplierInfo" resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.SupplierInfoDto"
+            parameterType="com.junmp.jyzb.api.bean.req.UpdateSupplierReq">
+      select id,name,code,short_name,contacts,phone,create_time,create_user,update_time,state
+      from base_supplier  where
+      <if test="req.updateTime!=null and req.updateTime !=''">
+        update_time &gt; #{req.updateTime}
+      </if>
+      <if test="req.updateTime==null and req.updateTime ==''">
+        1=1
+      </if>
+    </select>
 
 
 </mapper>
\ No newline at end of file

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

@@ -83,9 +83,17 @@
         #{item}
         </foreach>
 </select>
+    <select id="alignWarehouseInfo" resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.WarehouseInfoDto"
+            parameterType="com.junmp.jyzb.api.bean.req.UpdateWarehouseReq">
+        select id,name,location,phone,is_locked,org_id,state from base_warehouse
+        where org_id =#{req.oegId} 
+        <if test="req.updateTime !=null and req.updateTime !=''">
+            and update_time &gt; #{req.updateTime}
+        </if>
+    </select>
 
 
-<update id="SetInventoryInfo" parameterType="java.lang.String">
+    <update id="SetInventoryInfo" parameterType="java.lang.String">
     UPDATE base_warehouse AS w
     SET sum = (
         SELECT sum(number) as sum

jyzb-process/src/main/java/com/junmp/junmpProcess/mapper/QuickSuggestionsMapper.java

@@ -2,6 +2,11 @@ package com.junmp.junmpProcess.mapper;
 
 import com.junmp.junmpProcess.entity.QuickSuggestions;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.junmp.jyzb.api.bean.req.InventorySummaryReq;
+import com.junmp.jyzb.api.bean.req.UpdateBusFormReq;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * @author lxh专属坐骑
@@ -11,6 +16,17 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 */
 public interface QuickSuggestionsMapper extends BaseMapper<QuickSuggestions> {
 
+    void updateOrderMain(@Param("processId") String processInstanceId);
+
+    void updateBusForm(@Param("processId") String processInstanceId);
+
+    void updateReassignment(@Param("processId")String processInstanceId);
+
+    UpdateBusFormReq getBusForm(@Param("processId")String processInstanceId);
+
+    List<InventorySummaryReq> selectSumByItems(@Param("list") List<Object[]> searchItem);
+
+    void updateInventorySum(@Param("list") List<InventorySummaryReq> inventorySummaryList);
 }
 
 

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java

@@ -10,6 +10,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.junmp.junmpProcess.common.utils.HttpStatus;
@@ -21,6 +23,7 @@ import com.junmp.junmpProcess.dto.json.UserInfo;
 import com.junmp.junmpProcess.entity.ProcessTemplates;
 import com.junmp.junmpProcess.factory.FlowServiceFactory;
 import com.junmp.junmpProcess.mapper.OrgUserMapper;
+import com.junmp.junmpProcess.mapper.QuickSuggestionsMapper;
 import com.junmp.junmpProcess.service.IFlowInstanceService;
 import com.junmp.junmpProcess.service.IFlowTaskService;
 import com.junmp.junmpProcess.service.Repository.ProcessTemplateService;
@@ -28,6 +31,9 @@ import com.junmp.junmpProcess.utils.CreateNullData;
 import com.junmp.junmpProcess.vo.*;
 import com.junmp.jyzb.api.bean.dto.BusFormDto;
 import com.junmp.jyzb.api.bean.dto.PolicemanDto;
+import com.junmp.jyzb.api.bean.query.BussinessOrderDetialReq;
+import com.junmp.jyzb.api.bean.req.InventorySummaryReq;
+import com.junmp.jyzb.api.bean.req.UpdateBusFormReq;
 import com.junmp.v2.auth.api.bean.login.LoginUser;
 import com.junmp.v2.auth.api.context.LoginContext;
 import com.junmp.v2.common.bean.response.ApiRes;
@@ -97,6 +103,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
     @Autowired
     private IFlowInstanceService flowInstanceService;
 
+    @Resource
+    private QuickSuggestionsMapper quickSuggestionsMapper;
+
     @Override
     public ResponseResult agree(HandleDataDTO handleDataDTO) {
         SysUser StartUser=new SysUser();
@@ -266,6 +275,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             String startUser= MapUtil.getStr(processInstance.getProcessVariables(),START_USER_INFO);
             UserInfo user=  JSONObject.parseObject(startUser, UserInfo.class);
             String Types= MapUtil.getStr(processInstance.getProcessVariables(),ORDER_TYPE);
+            String bussinessType= MapUtil.getStr(processInstance.getProcessVariables(),BUSSINESS_TYPE);
             sendReq.setReceiveUserIds(String.valueOf(user.getUserId()));
 //            sendReq.setBizId(Long.valueOf(processInstance.getProcessInstanceId()));
             sendReq.setMsgTitle("您的审批被驳回");
@@ -282,7 +292,49 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             req1.setReceiveUserId(user.getUserId());
             Integer count1 = messageApi.queryCount(req1);
             messageApi.pushMsgToUser(startUser,count1);
+            runtimeService.deleteProcessInstance(task.getProcessInstanceId(), "拒绝");
+            switch (Types){
+                case "workOrder":
+                case "quickOrder":
+                    quickSuggestionsMapper.updateOrderMain(task.getProcessInstanceId());
+                    break;
+                case "bussinessOrder":
+                    if (bussinessType.equals("remove")){
+                        UpdateBusFormReq req=quickSuggestionsMapper.getBusForm(task.getProcessInstanceId());
+                        List<BussinessOrderDetialReq> list = JSON.parseArray(req.getDetailList(), BussinessOrderDetialReq.class);
+                        List<Object[]> searchItem=new ArrayList<>();
+                        for (BussinessOrderDetialReq detialReq:list) {
+                            //我先去数据库查询summary表中的数据
+                            Object[] item=new Object[]{req.getOrgId(),detialReq.getLocationId(),detialReq.getTypeId(),detialReq.getSizeId(),detialReq.getPrice()};
+                            searchItem.add(item);
+                        }
+                        List<InventorySummaryReq> inventorySummaryList=quickSuggestionsMapper.selectSumByItems(searchItem);
+                        for (BussinessOrderDetialReq detialReq:list) {
+                            for (InventorySummaryReq is:inventorySummaryList) {
+                                if (ObjectUtil.isNull(is.getAgentBrokenNum())){
+                                    is.setAgentBrokenNum(0);
+                                }
+                                if (detialReq.getLocationId().equals(is.getLocationId()) && detialReq.getTypeId().equals(is.getTypeId())
+                                        && detialReq.getSizeId().equals(is.getSizeId()) && detialReq.getPrice().compareTo(is.getUnitPrice())==0){
 
+                                    //直接将在审核中的数量修改为审核之前的状态
+                                    is.setAgentBrokenNum(is.getAgentBrokenNum()-detialReq.getPlanNum());
+
+                                }
+                                break;
+                            }
+
+                        }
+                        quickSuggestionsMapper.updateInventorySum(inventorySummaryList);
+
+                    }
+                    quickSuggestionsMapper.updateBusForm(task.getProcessInstanceId());
+                    break;
+                case "reassignment":
+
+                    quickSuggestionsMapper.updateReassignment(task.getProcessInstanceId());
+                    break;
+            }
 
         }else {
             runtimeService.deleteProcessInstance(taskId, "拒绝");

jyzb-process/src/main/resources/mapper/QuickSuggestionsMapper.xml

@@ -16,4 +16,40 @@
         id,user_id,text,
         create_time,update_time
     </sql>
+    <update id="updateOrderMain" parameterType="java.lang.String">
+        update bussiness_order_main om
+        set om.examine_state ="refuse" where om.process_id =#{processId}
+    </update>
+    <update id="updateBusForm" parameterType="java.lang.String">
+        update bussiness_bus_form om
+        set om.examine_state ="refuse" where om.process_id =#{processId}
+    </update>
+    <update id="updateReassignment" parameterType="java.lang.String">
+        update bussiness_breassignment om
+        set om.examine_state ="refuse" where om.process_id =#{processId}
+    </update>
+    <update id="updateInventorySum">
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            update base_inventory_summary is set agent_broken_num={item.agentBrokenNum} where id=#{item.id}
+        </foreach>
+
+    </update>
+    <select id="getBusForm" resultType="com.junmp.jyzb.api.bean.req.UpdateBusFormReq"
+            parameterType="java.lang.String">
+        select * from bussiness_bus_form om where om.process_id =#{processId}
+    </select>
+    <select id="selectSumByItems" resultType="com.junmp.jyzb.api.bean.req.InventorySummaryReq">
+        select id,valuekey,org_id_int as org_id,org_name,org_code,type_id,type_name,size_id,size_name,location_id,location_name,location_type,
+        number,unit_price,price,stock_number,outbound_number,destruction_price,destruction_number,expire_number,expire_price,
+        broken_price,broken_number,near_broken_price,near_broken_number,use_number,agent_broken_num,fix_count,use_count,create_time,update_time,threshold
+        from base_inventory_summary  where
+        <foreach collection="list" item="item" separator="or">
+            (
+            org_id_int = ${item[0]} AND location_id = '${item[1]}' AND type_id = ${item[2]} AND size_id = '${item[3]}'
+            AND unit_price = ${item[4]}
+            )
+        </foreach>
+    </select>
+
+
 </mapper>