指标列表查询修复

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

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java

@@ -301,7 +301,6 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 		Set<String> set =new HashSet<>();
 		QueryWrapper<BasicdataClientEntity> queryWrapper = new QueryWrapper<>();
 		List<BasicdataClientEntity> 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<BasicdataClientM
 				BasicdataClientEntity basicdataClient = new BasicdataClientEntity();
 				BeanUtil.copyProperties(i,basicdataClient);
 			log.info("比对对象>>>:{}",basicdataClient);
+			log.info("查询客户信息>>>:{}",basicdataClients);
 
 			//查询客户编码和客户名称是否存在
 			boolean b = basicdataClients.stream().anyMatch(ii -> ii.getClientCode().equals(basicdataClient.getClientCode())

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<Long> a = new ArrayList<>();
 		List<Long> list = Func.toLongList(deptId);
-		int indexOf = list.indexOf(Long.parseLong(dept));
+		a.addAll(list);
-		if (list.size() - 1 == indexOf){
+		Long aLong = list.get(list.size() - 1);
-			//当前登录账号处于组织结构树最后一级就只能进行最后一级的指标项搜索
+		List<Long> userDeptList = Func.toLongList(dept);
-			list.remove(indexOf);
+		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<ClassifyApiVO> detail = classifyService.selectClassifyList(deptId);
+		String collect = a.stream().map(String::valueOf).collect(Collectors.joining(","));
+		List<ClassifyApiVO> detail = classifyService.selectClassifyList(collect);
 		return R.data(detail);
 	}
 

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 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
+            <if test="param.date != null and param.date != '' ">
+                and ldl.update_time like concat(#{param.date},'%')
+            </if>
         </where>
         UNION ALL
         SELECT
@@ -241,6 +244,9 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
+            <if test="param.date != null and param.date != '' ">
+                and ldl.create_time like concat(#{param.date},'%')
+            </if>
         </where>
         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 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
+            <if test="param.date != null and param.date != '' ">
+                and ldl.update_time like concat(#{param.date},'%')
+            </if>
         </where>
         UNION ALL
         SELECT
@@ -443,6 +452,9 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
+            <if test="param.date != null and param.date != '' ">
+                and lds.create_time like concat(#{param.date},'%')
+            </if>
         </where>
         UNION ALL
         SELECT
@@ -540,6 +552,9 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
+            <if test="param.date != null and param.date != '' ">
+                and lwug.create_time like concat(#{param.date},'%')
+            </if>
         </where>
         UNION ALL
         SELECT
@@ -637,6 +652,9 @@
             <if test="param.thirdProduct != null and param.thirdProduct != '' ">
                 and ldpl.third_product like concat('%',#{param.thirdProduct},'%')
             </if>
+            <if test="param.date != null and param.date != '' ">
+                and lwtg.create_time like concat(#{param.date},'%')
+            </if>
         </where>
 
     </select>

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.text.ParseException;
-import java.util.Arrays;
+import java.text.SimpleDateFormat;
-import java.util.List;
+import java.util.*;
-import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -66,12 +66,21 @@ public class WarehouseStockServiceImpl extends BaseServiceImpl<WarehouseStockMap
 	public IPage<WarehouseScanRecordVO> selectWarehouseStockPage(IPage<WarehouseScanRecordVO> page, WarehouseScanRecordVO warehouseScanRecordVO) {
 		warehouseScanRecordVO.setWarehouseIdList(this.loginPerson());
 		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
-		if (Func.isEmpty(myCurrentWarehouse)){
+
-			return null;
+		try {
-		}
+			if (Func.isEmpty(myCurrentWarehouse)){
-		if (Func.isEmpty(warehouseScanRecordVO.getCreateTime())){
+				return null;
-			log.error("################查询扫描记录没有填写操作时间");
+			}
-			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<WarehouseScanRecordVO> result = new ArrayList<>();
 		warehouseScanRecordVO.setWarehouseId(myCurrentWarehouse.getId());