2023年8月23日17:41:15

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

@@ -268,5 +268,9 @@ public class Maintenance implements Serializable {
 	@ApiModelProperty(value = "维修描述")
 	private String repairDescription;
 
+	//检索
+	@TableField(exist = false)
+	private String retrieval;
+
 
 }

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

@@ -18,7 +18,6 @@ package org.springblade.client.equipment.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
@@ -27,11 +26,9 @@ import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.CorpEquipmentArchives;
 import org.springblade.client.entity.CorpEquipmentArchivesItem;
-import org.springblade.client.entity.GoodsDesc;
 import org.springblade.client.equipment.service.ICorpEquipmentArchivesItemService;
 import org.springblade.client.equipment.service.ICorpEquipmentArchivesService;
 import org.springblade.client.excel.CorpEquipmentArchivesExcel;
-import org.springblade.client.goods.excel.GoodsOutExcel;
 import org.springblade.client.vo.CorpEquipmentArchivesVO;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
@@ -40,16 +37,11 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.stock.entity.StockGoods;
-import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 客户设备档案 控制器
@@ -94,6 +86,7 @@ public class CorpEquipmentArchivesController extends BladeController {
 			.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())
+			.like(ObjectUtils.isNotNull(corpEquipmentArchives.getCorpName()), CorpEquipmentArchives::getCorpName, corpEquipmentArchives.getCorpName())
 			.orderByDesc(CorpEquipmentArchives::getCreateTime);
 		IPage<CorpEquipmentArchives> pages = corpEquipmentArchivesService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
@@ -178,4 +171,26 @@ public class CorpEquipmentArchivesController extends BladeController {
 	}
 
 
+	/**
+	 * 小程序扫码获取设备信息
+	 */
+	@GetMapping("/getDevice")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入corpEquipmentArchives")
+	public R<CorpEquipmentArchivesItem> getDevice(@RequestParam("deviceId") String deviceId, @RequestParam("corpId") String corpId) {
+		CorpEquipmentArchives corpEquipmentArchives = corpEquipmentArchivesService.getOne(new LambdaQueryWrapper<CorpEquipmentArchives>()
+			.eq(CorpEquipmentArchives::getTenantId, AuthUtil.getTenantId())
+			.eq(CorpEquipmentArchives::getIsDeleted, 0)
+			.eq(CorpEquipmentArchives::getCorpId, corpId));
+		if (corpEquipmentArchives == null) {
+			throw new RuntimeException("未找到档案信息");
+		}
+		CorpEquipmentArchivesItem detail = corpEquipmentArchivesItemService.getOne(new LambdaQueryWrapper<CorpEquipmentArchivesItem>()
+			.eq(CorpEquipmentArchivesItem::getTenantId, AuthUtil.getTenantId())
+			.eq(CorpEquipmentArchivesItem::getIsDeleted, 0)
+			.eq(CorpEquipmentArchivesItem::getPid, corpEquipmentArchives.getId())
+			.eq(CorpEquipmentArchivesItem::getId, deviceId));
+		return R.data(detail);
+	}
+
 }

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

@@ -165,31 +165,34 @@ public class CorpEquipmentArchivesServiceImpl extends ServiceImpl<CorpEquipmentA
 			}
 			corpEquipmentArchivesItemService.saveOrUpdateBatch(corpEquipmentArchives.getCorpEquipmentArchivesItemList());
 			for (CorpEquipmentArchivesItem item : corpEquipmentArchives.getCorpEquipmentArchivesItemList()) {
-				//生成二维码图片
-				try {
-					//创建文件夹
-					File packageFile = new File("/home/minio/file/" + AuthUtil.getTenantId() + "-bladex/upload");
-					//文件夹是否创建成功
-					if (!packageFile.getParentFile().exists()) {
-						boolean a = packageFile.mkdirs();
-						if (a) {
-							System.out.println("文件夹创建成功");
-						} else {
-							System.out.println("文件夹创建失败");
+				if(ObjectUtils.isNull(item.getUrl())){
+					//生成二维码图片
+					try {
+						//创建文件夹
+						File packageFile = new File("/home/minio/file/" + AuthUtil.getTenantId() + "-bladex/upload");
+						//文件夹是否创建成功
+						if (!packageFile.getParentFile().exists()) {
+							boolean a = packageFile.mkdirs();
+							if (a) {
+								System.out.println("文件夹创建成功");
+							} else {
+								System.out.println("文件夹创建失败");
+							}
 						}
+						//创建二维码图片
+						File qRCodeFile = new File(packageFile, item.getId() + "设备明细.png");
+						qRCodeFile.createNewFile();
+						//生成二维码
+						String qRCode = QRCodeTest.generateQRCode(qRCodeFile, item.getId() + "");
+						//替换地址
+						qRCode = qRCode.replace("/home/minio", "http://121.37.83.47");
+						item.setUrl(qRCode);
+					} catch (IOException e) {
+						throw new SecurityException("生成二维码失败");
 					}
-					//创建二维码图片
-					File qRCodeFile = new File(packageFile, item.getId() + "设备明细.png");
-					qRCodeFile.createNewFile();
-					//生成二维码
-					String qRCode = QRCodeTest.generateQRCode(qRCodeFile, item.getId() + "");
-					//替换地址
-					qRCode = qRCode.replace("/home/minio", "http://121.37.83.47");
-					item.setUrl(qRCode);
-				} catch (IOException e) {
-					throw new SecurityException("生成二维码失败");
 				}
 			}
+			corpEquipmentArchivesItemService.saveOrUpdateBatch(corpEquipmentArchives.getCorpEquipmentArchivesItemList());
 		}
 		if (ObjectUtils.isNotNull(corpEquipmentArchives.getFilesList()) && corpEquipmentArchives.getFilesList().size() > 0) {
 			for (CorpEquipmentArchivesFiles filesItem : corpEquipmentArchives.getFilesList()) {

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -224,6 +224,7 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 			);
 			if (filesList.size() > 0) {
 				goodsDescVO.setUrl(filesList.get(0).getUrl());
+				goodsDescVO.setFilesList(filesList);
 			}
 		}
 

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

@@ -97,6 +97,17 @@ public class MaintenanceController extends BladeController {
 			lambdaQueryWrapper.gt(Maintenance::getRepairReportDate, maintenance.getRepairReportDateList().get(0));
 			lambdaQueryWrapper.lt(Maintenance::getRepairReportDate, maintenance.getRepairReportDateList().get(0));
 		}
+		if (ObjectUtils.isNotNull(maintenance.getRetrieval())){
+			lambdaQueryWrapper.and(i-> i.like(Maintenance::getCorpName,maintenance.getRetrieval())
+			.or().like(Maintenance::getCorpTel,maintenance.getRetrieval())
+			.or().like(Maintenance::getDeviceAddress,maintenance.getRetrieval())
+			.or().like(Maintenance::getMaintenanceWorkerName,maintenance.getRetrieval())
+			.or().like(Maintenance::getMaintenanceWorkerTel,maintenance.getRetrieval())
+			.or().like(Maintenance::getDeviceName,maintenance.getRetrieval())
+			.or().like(Maintenance::getDeviceDescribe,maintenance.getRetrieval())
+			.or().like(Maintenance::getRepairDescription,maintenance.getRetrieval())
+			);
+		}
 		if (AuthUtil.getUserRole().contains("admin")) {
 			if (ObjectUtils.isNotNull(maintenance.getStatus())) {
 				if (maintenance.getStatus() == 1) {

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

@@ -132,7 +132,7 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 			maintenance.setCreateUserName(AuthUtil.getUserName());
 			maintenance.setCreateUser(AuthUtil.getUserId());
 			maintenance.setTenantId(AuthUtil.getTenantId());
-			maintenance.setStatus(3);
+			maintenance.setStatus(1);
 			maintenance.setDispatchingWorkers("1");
 			baseMapper.insert(maintenance);
 		} else {
@@ -240,10 +240,13 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 		}
 		if (maintenance.getStatus() <= 3) {
 			maintenance.setDispatchingWorkers("1");
-			maintenance.setStatus(3);
+			maintenance.setStatus(1);
 			maintenance.setUpdateTime(new Date());
 			maintenance.setUpdateUser(AuthUtil.getUserId());
 			maintenance.setUpdateUserName(AuthUtil.getUserName());
+			maintenance.setMaintenanceWorkerId(0L);
+			maintenance.setMaintenanceWorkerName("");
+			maintenance.setMaintenanceWorkerTel("");
 			baseMapper.updateById(maintenance);
 			//发送消息
 			Message sendMessage = new Message();