2023年8月18日20:30:34

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/CorpEquipmentArchives.java

@@ -128,6 +128,8 @@ public class CorpEquipmentArchives implements Serializable {
 	 * 报修日期
 	 */
 	@ApiModelProperty(value = "报修日期")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date repairReportDate;
 
 	@TableField(exist = false)

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/CorpEquipmentArchivesFiles.java

@@ -115,6 +115,12 @@ public class CorpEquipmentArchivesFiles implements Serializable {
 	private String type;
 
 	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "文件类型")
+	private String typeFiles;
+
+	/**
 	 * 租户id
 	 */
 	@ApiModelProperty(value = "租户id")

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/CorpEquipmentArchivesItem.java

@@ -173,5 +173,8 @@ public class CorpEquipmentArchivesItem implements Serializable {
 	@TableField(exist = false)
 	private List<CorpEquipmentArchivesFiles> filesList;
 
+	@ApiModelProperty(value = "设备id")
+	private Long srcId;
+
 
 }

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/maintenance/entity/Maintenance.java

@@ -260,5 +260,9 @@ public class Maintenance implements Serializable {
 	@ApiModelProperty(value = "功能分类")
 	private String categoryitemId;
 
+	//档案id
+	@ApiModelProperty(value = "档案id")
+	private Long archivesId;
+
 
 }

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/maintenance/entity/MaintenanceFiles.java

@@ -110,5 +110,11 @@ public class MaintenanceFiles implements Serializable {
 	@ApiModelProperty(value = "租户")
 	private String tenantId;
 
+	/**
+	 * 上传类型
+	 */
+	@ApiModelProperty(value = "上传类型")
+	private String uploadType;
+
 
 }

blade-service/blade-client/src/main/java/org/springblade/client/equipment/controller/CorpEquipmentArchivesController.java

@@ -91,6 +91,7 @@ public class CorpEquipmentArchivesController extends BladeController {
 			.like(ObjectUtils.isNotNull(corpEquipmentArchives.getSysNo()), CorpEquipmentArchives::getSysNo, corpEquipmentArchives.getSysNo())
 			.like(ObjectUtils.isNotNull(corpEquipmentArchives.getDeviceJson()), CorpEquipmentArchives::getDeviceJson, corpEquipmentArchives.getDeviceJson())
 			.eq(ObjectUtils.isNotNull(corpEquipmentArchives.getContactsTel()), CorpEquipmentArchives::getContactsTel, corpEquipmentArchives.getContactsTel())
+			.like(ObjectUtils.isNotNull(corpEquipmentArchives.getContacts()), CorpEquipmentArchives::getContacts, corpEquipmentArchives.getContacts())
 			.lt(ObjectUtils.isNotNull(corpEquipmentArchives.getSigningDateEnd()), CorpEquipmentArchives::getSigningDateEnd, corpEquipmentArchives.getSigningDateEnd())
 			.eq(ObjectUtils.isNotNull(corpEquipmentArchives.getCorpId()), CorpEquipmentArchives::getCorpId, corpEquipmentArchives.getCorpId())
 			.orderByDesc(CorpEquipmentArchives::getCreateTime);

blade-service/blade-client/src/main/java/org/springblade/client/equipment/service/impl/CorpEquipmentArchivesServiceImpl.java

@@ -112,7 +112,6 @@ public class CorpEquipmentArchivesServiceImpl extends ServiceImpl<CorpEquipmentA
 			}
 			long count = baseMapper.selectCount(new LambdaQueryWrapper<CorpEquipmentArchives>()
 				.eq(CorpEquipmentArchives::getCorpId, corpEquipmentArchives.getCorpId())
-				.eq(CorpEquipmentArchives::getAddress, corpEquipmentArchives.getAddress())
 				.eq(CorpEquipmentArchives::getTenantId, AuthUtil.getTenantId())
 				.eq(CorpEquipmentArchives::getIsDeleted, 0));
 			if (count > 0) {
@@ -180,7 +179,7 @@ public class CorpEquipmentArchivesServiceImpl extends ServiceImpl<CorpEquipmentA
 						}
 					}
 					//创建二维码图片
-					File qRCodeFile = new File(packageFile, item.getCode() + "设备明细.png");
+					File qRCodeFile = new File(packageFile, item.getId() + "设备明细.png");
 					qRCodeFile.createNewFile();
 					//生成二维码
 					String qRCode = QRCodeTest.generateQRCode(qRCodeFile, item.getId() + "");

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -261,6 +261,9 @@ public class GoodsDescController extends BladeController {
 							@RequestParam(name = "upperFrame", required = false) String upperFrame,
 							@RequestParam(name = "label", required = false) String label,
 							@RequestParam(name = "categoryitem", required = false) String categoryitem,
+							@RequestParam(name = "categoryitemId", required = false) String categoryitemId,
+							@RequestParam(name = "brandId", required = false) String brandId,
+							@RequestParam(name = "specs", required = false) String specs,
 							@RequestParam(name = "artsVision", required = false) String artsVision) {
 		LambdaQueryWrapper<GoodsDesc> goodsDescLambdaQueryWrapper = new LambdaQueryWrapper<>();
 
@@ -279,15 +282,18 @@ public class GoodsDescController extends BladeController {
 		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(code), GoodsDesc::getCode, code);
 		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(label), GoodsDesc::getCode, label);
 		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(remarks), GoodsDesc::getCode, remarks);
+		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(specs), GoodsDesc::getSpecs, specs);
 		goodsDescLambdaQueryWrapper.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId());
 		goodsDescLambdaQueryWrapper.eq(GoodsDesc::getType, 0);
 		goodsDescLambdaQueryWrapper.eq(ObjectUtils.isNotNull(status), GoodsDesc::getStatus, status);
+		goodsDescLambdaQueryWrapper.eq(ObjectUtils.isNotNull(brandId), GoodsDesc::getBrandId, brandId);
 		goodsDescLambdaQueryWrapper.eq(ObjectUtils.isNotNull(unit), GoodsDesc::getUnit, unit);
 		goodsDescLambdaQueryWrapper.eq(ObjectUtils.isNotNull(categoryitem), GoodsDesc::getCategoryitem, categoryitem);
 		goodsDescLambdaQueryWrapper.eq(ObjectUtils.isNotNull(upperFrame), GoodsDesc::getUpperFrame, upperFrame);
 		if (StringUtils.isNotEmpty(artsVision)) {
 			goodsDescLambdaQueryWrapper.and(i -> i.like(GoodsDesc::getArtsVision, artsVision).or().isNull(GoodsDesc::getArtsVision));
 		}
+		goodsDescLambdaQueryWrapper.apply(ObjectUtils.isNotNull(categoryitemId), "find_in_set(categoryitem_id,'" + categoryitemId + "')");
 		goodsDescLambdaQueryWrapper.orderByDesc(GoodsDesc::getCreateTime);
 		Page<GoodsDesc> page = new Page<>(current, size);
 		List<GoodsType> types = goodsDescType.list(new LambdaQueryWrapper<GoodsType>()

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderServiceImpl.java

@@ -1283,13 +1283,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 		// =============================
 
 		order.getOrderItemList().forEach(item -> {
-			item.setBillNo(order.getBillNo());
-			item.setShippingMode(order.getShippingMode());
-			item.setSalesman(order.getSalesman());
-			item.setSalesmanDept(order.getSalesmanDept());
-			item.setUpdateUser(AuthUtil.getUserId());
-			item.setUpdateTime(new Date());
-			orderItemMapper.updateById(item);
+			OrderItem orderItem = new OrderItem();
+			orderItem.setId(item.getId());
+			orderItem.setBillNo(order.getBillNo());
+			orderItem.setShippingMode(order.getShippingMode());
+			orderItem.setSalesman(order.getSalesman());
+			orderItem.setSalesmanDept(order.getSalesmanDept());
+			orderItem.setUpdateUser(AuthUtil.getUserId());
+			orderItem.setUpdateTime(new Date());
+			orderItemMapper.updateById(orderItem);
 		});
 
 		StringBuilder addressDetail = new StringBuilder();

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/brand/controller/BrandDescController.java

@@ -87,11 +87,13 @@ public class BrandDescController extends BladeController {
 			.eq(PjBrandDesc::getIsDeleted, 0)
 			.eq(ObjectUtils.isNotNull(brandDesc.getEnableOrNot()), PjBrandDesc::getEnableOrNot, brandDesc.getEnableOrNot())//状态
 			.eq(ObjectUtils.isNotNull(brandDesc.getCreateUser()), PjBrandDesc::getCreateUser, brandDesc.getCreateUser())
+			.eq(ObjectUtils.isNotNull(brandDesc.getType()), PjBrandDesc::getType, brandDesc.getType())
 			.like(ObjectUtils.isNotEmpty(brandDesc.getCname()), PjBrandDesc::getCname, brandDesc.getCname());
 		if (brandDesc.getCreateTimeList() != null && brandDesc.getCreateTimeList().size() > 1) {//业务日期
 			lambdaQueryWrapper.ge(PjBrandDesc::getCreateTime, brandDesc.getCreateTimeList().get(0));
 			lambdaQueryWrapper.le(PjBrandDesc::getCreateTime, brandDesc.getCreateTimeList().get(1));
 		}
+		lambdaQueryWrapper.orderByDesc(PjBrandDesc::getSort);
 		IPage<PjBrandDesc> pages = brandDescService.page(Condition.getPage(query), lambdaQueryWrapper);
 
 		String updateUserIds = "";//修改人id拼接
@@ -216,6 +218,7 @@ public class BrandDescController extends BladeController {
 		LambdaQueryWrapper<PjBrandDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(PjBrandDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(PjBrandDesc::getIsDeleted, 0)
+			.eq(PjBrandDesc::getType, brandDesc.getType())
 			.like(ObjectUtils.isNotEmpty(brandDesc.getCname()), PjBrandDesc::getCname, brandDesc.getCname());
 		List<PjBrandDesc> list = brandDescService.list(lambdaQueryWrapper);
 

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/maintenance/controller/MaintenanceController.java

@@ -91,7 +91,8 @@ public class MaintenanceController extends BladeController {
 			.eq(ObjectUtils.isNotNull(maintenance.getMaintenanceWorkerTel()), Maintenance::getMaintenanceWorkerTel, maintenance.getMaintenanceWorkerTel())
 			.eq(ObjectUtils.isNotNull(maintenance.getMaintenanceWorkerId()), Maintenance::getMaintenanceWorkerId, maintenance.getMaintenanceWorkerId())
 			.eq(ObjectUtils.isNotNull(maintenance.getPaymentStatus()), Maintenance::getPaymentStatus, maintenance.getPaymentStatus())
-			.eq(ObjectUtils.isNotNull(maintenance.getStatus()), Maintenance::getStatus, maintenance.getStatus());
+			.eq(ObjectUtils.isNotNull(maintenance.getDeviceId()), Maintenance::getDeviceId, maintenance.getDeviceId())
+			.eq(ObjectUtils.isNotNull(maintenance.getArchivesId()), Maintenance::getArchivesId, maintenance.getArchivesId());
 		if (ObjectUtils.isNotNull(maintenance.getCompleteDateList()) && maintenance.getCompleteDateList().size() > 0) {
 			lambdaQueryWrapper.gt(Maintenance::getCompleteDate, maintenance.getCompleteDateList().get(0));
 			lambdaQueryWrapper.lt(Maintenance::getCompleteDate, maintenance.getCompleteDateList().get(0));
@@ -102,11 +103,24 @@ public class MaintenanceController extends BladeController {
 		}
 		if (AuthUtil.getUserRole().contains("维修工")) {
 			lambdaQueryWrapper.eq(Maintenance::getMaintenanceWorkerId, AuthUtil.getUserId());
+			if (ObjectUtils.isNotNull(maintenance.getStatus())) {
+				lambdaQueryWrapper.eq(Maintenance::getStatus, maintenance.getStatus());
+			} else {
+				lambdaQueryWrapper.in(Maintenance::getStatus, 2, 3, 4, 5);
+			}
 		} else {
-			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(maintenance.getMaintenanceWorkerId()), Maintenance::getMaintenanceWorkerId, maintenance.getMaintenanceWorkerId());
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(maintenance.getMaintenanceWorkerId()), Maintenance::getMaintenanceWorkerId, maintenance.getMaintenanceWorkerId())
+				.eq(ObjectUtils.isNotNull(maintenance.getStatus()), Maintenance::getStatus, maintenance.getStatus());
 		}
 		if (AuthUtil.getUserRole().contains("客户")) {
 			lambdaQueryWrapper.eq(Maintenance::getCreateUser, AuthUtil.getUserId());
+			if (ObjectUtils.isNotNull(maintenance.getStatus())) {
+				lambdaQueryWrapper.eq(Maintenance::getStatus, maintenance.getStatus());
+			} else {
+				lambdaQueryWrapper.in(Maintenance::getStatus, 1, 3, 4, 5);
+			}
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(maintenance.getStatus()), Maintenance::getStatus, maintenance.getStatus());
 		}
 		lambdaQueryWrapper.orderByDesc(Maintenance::getCreateTime);
 		IPage<Maintenance> pages = maintenanceService.page(Condition.getPage(query), lambdaQueryWrapper);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/maintenance/service/impl/MaintenanceServiceImpl.java

@@ -132,6 +132,7 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 			maintenance.setCreateUserName(AuthUtil.getUserName());
 			maintenance.setCreateUser(AuthUtil.getUserId());
 			maintenance.setTenantId(AuthUtil.getTenantId());
+			maintenance.setStatus(1);
 			baseMapper.insert(maintenance);
 		} else {
 			maintenance.setUpdateTime(new Date());