品类信息BUG修复

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCategoryEntity.java

@@ -114,6 +114,6 @@ public class BasicdataCategoryEntity extends TenantEntity {
 	 * 类型
 	 */
 	@ApiModelProperty(value = "类型")
-	private Integer type;
+	private String type;
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataCategoryImporter.java

@@ -60,7 +60,7 @@ public class BasicdataCategoryImporter implements ExcelImporter<BasicdataCategor
 				BasicdataCategoryEntity basicdataCategoryEntity = new BasicdataCategoryEntity();
 				basicdataCategoryEntity.setName(item.getName());
 				String dictValue = findDictValue(category, item.getType());
-				basicdataCategoryEntity.setType(dictValue==null?1:Integer.parseInt(dictValue));
+				basicdataCategoryEntity.setType(dictValue==null?"1":dictValue);
 				if(item.getParentCategory()==null){
 					pList.add(basicdataCategoryEntity);
 				}else{

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

@@ -405,10 +405,12 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		//对于合同开始时间比对
 		Predicate<Date> predicateContractStartTime = Predicate.isEqual(oldClientEntity.getContractStartTime());
+		if(!Objects.isNull(predicateContractStartTime)){
 			boolean contractStartTime = predicateContractStartTime.test(newClientEntity.getContractStartTime());
 			if (!contractStartTime) {
 				content.append("合同开始时间由[").append(sdf.format(oldClientEntity.getContractStartTime())).append("]变更为-->[").append(sdf.format(oldClientEntity.getContractStartTime())).append("],");
 			}
+		}
 		//对于合同结束时间比对
 		Predicate<Date> predicateContractEntTime = Predicate.isEqual(oldClientEntity.getContractEntTime());
 		boolean contractEndTime = predicateContractEntTime.test(newClientEntity.getContractEntTime());

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java

@@ -494,6 +494,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 	@Transactional(rollbackFor = Exception.class)
 	public void importUser(List<WarehousingEntryDetailExcel> data, Boolean isCovered) {
 		//分组
+
 		Map<String, List<WarehousingEntryDetailExcel>> collect = data.stream().collect(Collectors.groupingBy(o -> {
 			System.out.println("====<<<<<<<<" + o);
 			if (ObjectUtils.isEmpty(o) || ObjectUtils.isNull(o.getCustomerName()) || ObjectUtils.isNull(o.getCustomerCode())) {