diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java index 8bdcbece8..c3bec83c8 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; import java.util.List; @@ -47,6 +48,12 @@ public class WarehouseScanRecordVO extends WarehouseScanRecordEntity { @ApiModelProperty(value = "扫描详情") private String scanNodeType; + /** + * 二级扫描类型(扫描详情) + */ + @ApiModelProperty(value = "扫描详情") + private Date date; + /** * 仓库List diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java index 021543687..a00758288 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java @@ -301,7 +301,6 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl set =new HashSet<>(); QueryWrapper queryWrapper = new QueryWrapper<>(); List basicdataClients = baseMapper.selectList(queryWrapper); - log.info("查询客户信息>>>:{}",basicdataClients); for (BasicdataClientExcel i : data) { log.info("导入数据《》《》{}",i); if(set.isEmpty()){ @@ -318,6 +317,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl>>:{}",basicdataClient); + log.info("查询客户信息>>>:{}",basicdataClients); //查询客户编码和客户名称是否存在 boolean b = basicdataClients.stream().anyMatch(ii -> ii.getClientCode().equals(basicdataClient.getClientCode()) diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java index f565482f9..c9a6b5b8d 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java @@ -13,6 +13,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.redisson.api.condition.Conditions; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.utils.AuthUtil; @@ -20,8 +21,10 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @RestController @AllArgsConstructor @@ -34,6 +37,8 @@ public class ClassifyApi { + + @GetMapping("/classifyList") @ApiOperationSupport(order = 1) @ApiOperation(value = "小程序指标项列表", notes = "传入classify") @@ -50,13 +55,20 @@ public class ClassifyApi { // return R.fail("此账号无法对该部门进行考核"); // } // } + List a = new ArrayList<>(); List list = Func.toLongList(deptId); - int indexOf = list.indexOf(Long.parseLong(dept)); - if (list.size() - 1 == indexOf){ - //当前登录账号处于组织结构树最后一级就只能进行最后一级的指标项搜索 - list.remove(indexOf); + a.addAll(list); + Long aLong = list.get(list.size() - 1); + List userDeptList = Func.toLongList(dept); + a.addAll(userDeptList); +// list.addAll(userDeptList); + a = a.stream().distinct().collect(Collectors.toList()); + int indexOf = list.indexOf(aLong); + if (indexOf == list.size()){ + a.remove(indexOf); } - List detail = classifyService.selectClassifyList(deptId); + String collect = a.stream().map(String::valueOf).collect(Collectors.joining(",")); + List detail = classifyService.selectClassifyList(collect); return R.data(detail); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml index 482103132..5b4372ae2 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml @@ -98,7 +98,7 @@ `ldpl`.`accept_warehouse_id` AS `accept_warehouse_id`, `ldpl`.`accept_warehouse_name` AS `accept_warehouse_name`, `ldpl`.`order_package_delivery_status` AS `order_package_delivery_status`, - `ldl`.`create_time` AS `operatorTime`, + `ldl`.`update_time` AS `operatorTime`, `ldl`.`create_user` AS `operatorId`, '取消装车' AS `scanNodeType`, '配送' AS `nodeName` @@ -143,6 +143,9 @@ and ldpl.third_product like concat('%',#{param.thirdProduct},'%') + + and ldl.update_time like concat(#{param.date},'%') + UNION ALL SELECT @@ -241,6 +244,9 @@ and ldpl.third_product like concat('%',#{param.thirdProduct},'%') + + and ldl.create_time like concat(#{param.date},'%') + UNION ALL SELECT @@ -296,7 +302,7 @@ `ldpl`.`accept_warehouse_id` AS `accept_warehouse_id`, `ldpl`.`accept_warehouse_name` AS `accept_warehouse_name`, `ldpl`.`order_package_delivery_status` AS `order_package_delivery_status`, - `ldl`.`create_time` AS `operatorTime`, + `ldl`.`update_time` AS `operatorTime`, `ldl`.`create_user` AS `operatorId`, '签收' AS `scanNodeType`, '配送' AS `nodeName` @@ -339,6 +345,9 @@ and ldpl.third_product like concat('%',#{param.thirdProduct},'%') + + and ldl.update_time like concat(#{param.date},'%') + UNION ALL SELECT @@ -443,6 +452,9 @@ and ldpl.third_product like concat('%',#{param.thirdProduct},'%') + + and lds.create_time like concat(#{param.date},'%') + UNION ALL SELECT @@ -540,6 +552,9 @@ and ldpl.third_product like concat('%',#{param.thirdProduct},'%') + + and lwug.create_time like concat(#{param.date},'%') + UNION ALL SELECT @@ -637,6 +652,9 @@ and ldpl.third_product like concat('%',#{param.thirdProduct},'%') + + and lwtg.create_time like concat(#{param.date},'%') + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java index 3e497ac41..687ab921b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java @@ -34,16 +34,16 @@ import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.SpringUtil; import org.springblade.system.cache.DictBizCache; import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -66,12 +66,21 @@ public class WarehouseStockServiceImpl extends BaseServiceImpl selectWarehouseStockPage(IPage page, WarehouseScanRecordVO warehouseScanRecordVO) { warehouseScanRecordVO.setWarehouseIdList(this.loginPerson()); BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); - if (Func.isEmpty(myCurrentWarehouse)){ - return null; - } - if (Func.isEmpty(warehouseScanRecordVO.getCreateTime())){ - log.error("################查询扫描记录没有填写操作时间"); - return null; + + try { + if (Func.isEmpty(myCurrentWarehouse)){ + return null; + } + if (Func.isEmpty(warehouseScanRecordVO.getOperatorTime())){ + log.error("################查询扫描记录没有填写操作时间"); + return null; + } + String operatorTime = warehouseScanRecordVO.getOperatorTime(); + SimpleDateFormat sf = new SimpleDateFormat(DateUtil.PATTERN_DATE); + Date parse = sf.parse(operatorTime); + warehouseScanRecordVO.setDate(parse); + } catch (ParseException e) { + throw new RuntimeException(e); } List result = new ArrayList<>(); warehouseScanRecordVO.setWarehouseId(myCurrentWarehouse.getId());