2023年8月17日17:52:35

blade-service-api/blade-client-api/src/main/java/org/springblade/client/dto/GoodsDescDto.java

@@ -56,6 +56,8 @@ public class GoodsDescDto implements Serializable {
 	private String category;
 	//产品分类
 	private String categoryitem;
+	//功能分类
+	private String categoryitemId;
 	//计量单位
 	private String unit;
 	//图片

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

@@ -71,6 +71,9 @@ public class CorpEquipmentArchivesItem implements Serializable {
 	 */
 	@ApiModelProperty(value = "功能分类")
 	private String categoryitem;
+	//功能分类
+	@ApiModelProperty(value = "功能分类")
+	private String categoryitemId;
 	/**
 	 * 图片
 	 */

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

@@ -87,6 +87,9 @@ public class GoodsDesc implements Serializable {
 	private String category;
 	//产品分类
 	private String categoryitem;
+
+	//功能分类
+	private String categoryitemId;
 	//备注（收费指示）
 	private String providers;
 	//长度单位

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

@@ -138,4 +138,16 @@ public class PjBrandDesc implements Serializable {
 	 */
 	@TableField(exist = false)
 	private List<PjBrandFiles> brandFilesList;
+
+	/**
+	 * 类型（品牌  功能分类）PP   GN
+	 */
+	@ApiModelProperty(value = "类型")
+	private String type;
+
+	/**
+	 * 排序
+	 */
+	@ApiModelProperty(value = "排序")
+	private int sort;
 }

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/excel/MaintenanceExcel.java

@@ -16,18 +16,15 @@
  */
 package org.springblade.salesPart.excel;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
-import org.springblade.salesPart.maintenance.entity.MaintenanceFees;
-import org.springblade.salesPart.maintenance.entity.MaintenanceFiles;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 
 /**
  * 配件汽保维修表实体类
@@ -36,98 +33,101 @@ import java.util.List;
  * @since 2023-08-10
  */
 @Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
 public class MaintenanceExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 	/**
 	 * 单号
 	 */
-	@ApiModelProperty(value = "单号")
+	@ExcelProperty(value = "单号")
 	private String sysNo;
 	/**
 	 * 设备名称
 	 */
-	@ApiModelProperty(value = "设备名称")
+	@ExcelProperty(value = "设备名称")
 	private String deviceName;
 	/**
 	 * 客户名称
 	 */
-	@ApiModelProperty(value = "客户名称")
+	@ExcelProperty(value = "客户名称")
 	private String corpName;
 	/**
 	 * 客户电话
 	 */
-	@ApiModelProperty(value = "客户电话")
+	@ExcelProperty(value = "客户电话")
 	private String corpTel;
 	/**
 	 * 地址
 	 */
-	@ApiModelProperty(value = "地址")
+	@ExcelProperty(value = "地址")
 	private String deviceAddress;
 	/**
 	 * 故障描述
 	 */
-	@ApiModelProperty(value = "故障描述")
+	@ExcelProperty(value = "故障描述")
 	private String faultDescribe;
 	/**
 	 * 维修工名称
 	 */
-	@ApiModelProperty(value = "维修工名称")
+	@ExcelProperty(value = "维修工名称")
 	private String maintenanceWorkerName;
 	/**
 	 * 维修工电话
 	 */
-	@ApiModelProperty(value = "维修工电话")
+	@ExcelProperty(value = "维修工电话")
 	private String maintenanceWorkerTel;
 	/**
 	 * 维修金额
 	 */
-	@ApiModelProperty(value = "维修金额")
+	@ExcelProperty(value = "维修金额")
 	private BigDecimal maintenanceAmount;
 	/**
 	 * 报修日期
 	 */
-	@ApiModelProperty(value = "报修日期")
+	@ExcelProperty(value = "报修日期")
 	private Date repairReportDate;
 	/**
 	 * 完成日期
 	 */
-	@ApiModelProperty(value = "完成日期")
+	@ExcelProperty(value = "完成日期")
 	private Date completeDate;
 
 	/**
 	 * 支付状态
 	 */
-	@ApiModelProperty(value = "支付状态")
-	private String paymentStatus;
+	/*@ExcelProperty(value = "支付状态")
+	private String paymentStatus;*/
 	/**
 	 * 结算金额
 	 */
-	@ApiModelProperty(value = "结算金额")
+	@ExcelProperty(value = "结算金额")
 	private BigDecimal settlementAmount;
 
 	/**
 	 * 状态
 	 */
-	@ApiModelProperty(value = "状态")
-	private Integer status;
+	/*@ExcelProperty(value = "状态")
+	private Integer status;*/
 
 	/**
 	 * 工厂
 	 */
-	@ApiModelProperty(value = "工厂")
+	@ExcelProperty(value = "工厂")
 	private String factoryName;
 
 	/**
 	 * 功能分类
 	 */
-	@ApiModelProperty(value = "功能分类")
+	@ExcelProperty(value = "功能分类")
 	private String categoryitem;
 
 	/**
 	 * 费用明细
 	 */
-	@ApiModelProperty(value = "费用明细")
+	@ExcelProperty(value = "费用明细")
 	private String feesItem;
 
 

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

@@ -256,5 +256,9 @@ public class Maintenance implements Serializable {
 	@TableField(exist = false)
 	private Integer type;
 
+	//功能分类
+	@ApiModelProperty(value = "功能分类")
+	private String categoryitemId;
+
 
 }

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

@@ -81,7 +81,7 @@ public class CorpEquipmentArchivesServiceImpl extends ServiceImpl<CorpEquipmentA
 				.eq(CorpEquipmentArchivesItem::getTenantId, AuthUtil.getTenantId())
 				.eq(CorpEquipmentArchivesItem::getIsDeleted, 0)
 				.eq(CorpEquipmentArchivesItem::getPid, detail.getId()));
-			for (CorpEquipmentArchivesItem item : corpEquipmentArchives.getCorpEquipmentArchivesItemList()) {
+			for (CorpEquipmentArchivesItem item : itemList) {
 				item.setFilesList(corpEquipmentArchivesFilesService.list(new LambdaQueryWrapper<CorpEquipmentArchivesFiles>()
 					.eq(CorpEquipmentArchivesFiles::getTenantId, AuthUtil.getTenantId())
 					.eq(CorpEquipmentArchivesFiles::getIsDeleted, 0)
@@ -143,30 +143,6 @@ public class CorpEquipmentArchivesServiceImpl extends ServiceImpl<CorpEquipmentA
 					item.setCreateUser(AuthUtil.getUserId());
 					item.setTenantId(AuthUtil.getTenantId());
 					item.setPid(corpEquipmentArchives.getId());
-					//生成二维码图片
-					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("生成二维码失败");
-					}
 				} else {
 					item.setUpdateTime(new Date());
 					item.setUpdateUser(AuthUtil.getUserId());
@@ -189,6 +165,32 @@ 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("文件夹创建失败");
+						}
+					}
+					//创建二维码图片
+					File qRCodeFile = new File(packageFile, item.getCode() + "设备明细.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("生成二维码失败");
+				}
+			}
 		}
 		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/controller/GoodsDescController.java

@@ -28,13 +28,15 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.springblade.client.corps.excel.CorpDWTExcel;
 import org.springblade.client.corps.service.ICorpsAttnService;
 import org.springblade.client.corps.service.ICorpsDescService;
 import org.springblade.client.entity.*;
 import org.springblade.client.feign.IRedisClient;
 import org.springblade.client.goods.enums.GoodsTypeEnum;
-import org.springblade.client.goods.excel.*;
+import org.springblade.client.goods.excel.GoodsExcels;
+import org.springblade.client.goods.excel.GoodsInfoExcel;
+import org.springblade.client.goods.excel.GoodsOutDWTExcel;
+import org.springblade.client.goods.excel.GoodsOutExcel;
 import org.springblade.client.goods.mapper.GoodsFilesMapper;
 import org.springblade.client.goods.service.*;
 import org.springblade.client.vo.GoodsDescVO;
@@ -49,7 +51,6 @@ import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.mocha.entity.PriceBank;
-
 import org.springblade.mocha.feign.IPriceBankClient;
 import org.springblade.mocha.feign.ISalesPolicyClient;
 import org.springblade.purchase.sales.entity.OrderItems;
@@ -235,7 +236,7 @@ public class GoodsDescController extends BladeController {
 				e.setShoppingMall(finalShoppingMall);
 
 				List<StockGoods> stockGoodsList = stockGoodsClient.selectListByGoodsId(e.getId());
-				if (ObjectUtils.isNotNull(stockGoodsList) && stockGoodsList.size()>0){
+				if (ObjectUtils.isNotNull(stockGoodsList) && stockGoodsList.size() > 0) {
 					e.setStockGoodsNumber(stockGoodsList.stream().map(StockGoods::getBalanceQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 				}
 			});
@@ -243,23 +244,95 @@ public class GoodsDescController extends BladeController {
 		return R.data(iPage);
 	}
 
+	@GetMapping("/descListNew")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入goodsDesc")
+	public R<?> descListNew(@RequestParam(name = "current", defaultValue = "1") Integer current,
+							@RequestParam(name = "size", defaultValue = "10") Integer size,
+							@RequestParam(name = "cname", required = false) String cname,
+							@RequestParam(name = "cnameInt", required = false) String cnameInt,
+							@RequestParam(name = "ename", required = false) String ename,
+							@RequestParam(name = "code", required = false) String code,
+							@RequestParam(name = "goodsTypeId", required = false) String goodsTypeId,
+							@RequestParam(name = "belongToCorpId", required = false) String belongToCorpId,
+							@RequestParam(name = "status", required = false) String status,
+							@RequestParam(name = "unit", required = false) String unit,
+							@RequestParam(name = "remarks", required = false) String remarks,
+							@RequestParam(name = "upperFrame", required = false) String upperFrame,
+							@RequestParam(name = "label", required = false) String label,
+							@RequestParam(name = "categoryitem", required = false) String categoryitem,
+							@RequestParam(name = "artsVision", required = false) String artsVision) {
+		LambdaQueryWrapper<GoodsDesc> goodsDescLambdaQueryWrapper = new LambdaQueryWrapper<>();
+
+		//指定分类为一级分类,查询此分类所有二级分类的商品
+		if (StringUtils.isNotBlank(goodsTypeId)) {
+			Long goodsId = Long.parseLong(goodsTypeId);
+			List<Long> goodsIdList = new ArrayList<>();
+			selectChildById(goodsId, goodsIdList);
+			goodsIdList.add(goodsId);
+
+			goodsDescLambdaQueryWrapper.in(GoodsDesc::getGoodsTypeId, goodsIdList);
+		}
+		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(cname), GoodsDesc::getCname, cname);
+		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(cnameInt), GoodsDesc::getCnameInt, cnameInt);
+		goodsDescLambdaQueryWrapper.like(!StringUtils.isBlank(ename), GoodsDesc::getEname, ename);
+		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.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId());
+		goodsDescLambdaQueryWrapper.eq(GoodsDesc::getType, 0);
+		goodsDescLambdaQueryWrapper.eq(ObjectUtils.isNotNull(status), GoodsDesc::getStatus, status);
+		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.orderByDesc(GoodsDesc::getCreateTime);
+		Page<GoodsDesc> page = new Page<>(current, size);
+		List<GoodsType> types = goodsDescType.list(new LambdaQueryWrapper<GoodsType>()
+			.eq(GoodsType::getTenantId, AuthUtil.getTenantId())
+			.eq(GoodsType::getIsDeleted, 0));
+		List<String> typeIds = new ArrayList<>();
+		for (GoodsType item : types) {
+			typeIds.add(item.getId() + "");
+		}
+		IPage<GoodsDesc> iPage = goodsDescService.page(page, goodsDescLambdaQueryWrapper);
+		if (CollectionUtils.isNotEmpty(iPage.getRecords())) {
+			iPage.getRecords().forEach(e -> {
+				String typeId = e.getGoodsTypeId();
+				String[] split = typeId.split(",");
+				List<String> stringList = Arrays.asList(split);
+				typeIds.retainAll(stringList);
+				if (CollectionUtils.isNotEmpty(typeIds)) {
+					String goodsTypeName = "";
+					for (String item : typeIds) {
+						goodsTypeName = types.stream().filter(i -> i.getId().equals(Long.parseLong(item))).findFirst().orElse(new GoodsType()).getCname() + ",";
+					}
+					e.setGoodsTypeName(goodsTypeName);
+				}
+			});
+		}
+		return R.data(iPage);
+	}
+
 	@GetMapping("/export")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入goodsDesc")
 	public void export(
-					 @RequestParam(name = "cname", required = false) String cname,
-					 @RequestParam(name = "cnameInt", required = false) String cnameInt,
-					 @RequestParam(name = "ename", required = false) String ename,
-					 @RequestParam(name = "code", required = false) String code,
-					 @RequestParam(name = "goodsTypeId", required = false) String goodsTypeId,
-					 @RequestParam(name = "belongToCorpId", required = false) String belongToCorpId,
-					 @RequestParam(name = "status", required = false) String status,
-					 @RequestParam(name = "unit", required = false) String unit,
-					 @RequestParam(name = "remarks", required = false) String remarks,
-					 @RequestParam(name = "upperFrame", required = false) String upperFrame,
-					 @RequestParam(name = "label", required = false) String label,
-					 @RequestParam(name = "artsVision", required = false) String artsVision,
-		 HttpServletResponse response) {
+		@RequestParam(name = "cname", required = false) String cname,
+		@RequestParam(name = "cnameInt", required = false) String cnameInt,
+		@RequestParam(name = "ename", required = false) String ename,
+		@RequestParam(name = "code", required = false) String code,
+		@RequestParam(name = "goodsTypeId", required = false) String goodsTypeId,
+		@RequestParam(name = "belongToCorpId", required = false) String belongToCorpId,
+		@RequestParam(name = "status", required = false) String status,
+		@RequestParam(name = "unit", required = false) String unit,
+		@RequestParam(name = "remarks", required = false) String remarks,
+		@RequestParam(name = "upperFrame", required = false) String upperFrame,
+		@RequestParam(name = "label", required = false) String label,
+		@RequestParam(name = "artsVision", required = false) String artsVision,
+		HttpServletResponse response) {
 		LambdaQueryWrapper<GoodsDesc> goodsDescLambdaQueryWrapper = new LambdaQueryWrapper<>();
 
 		//指定分类为一级分类,查询此分类所有二级分类的商品
@@ -499,12 +572,12 @@ public class GoodsDescController extends BladeController {
 					}
 				}
 
-				if (ObjectUtils.isNotNull(list)){
+				if (ObjectUtils.isNotNull(list)) {
 					PriceBank bank = list.stream().filter(priceBank -> priceBank.getItemId().equals(e.getId())).findFirst().orElse(null);
-					if (ObjectUtils.isNotNull(bank)){
-						if (ObjectUtils.isNotNull(bank.getPrice())){
+					if (ObjectUtils.isNotNull(bank)) {
+						if (ObjectUtils.isNotNull(bank.getPrice())) {
 							e.setDisplayPrice(bank.getPrice());
-						}else {
+						} else {
 							e.setDisplayPrice(BigDecimal.ZERO);
 						}
 					}
@@ -705,19 +778,19 @@ public class GoodsDescController extends BladeController {
 			lambdaQueryWrapper.in(GoodsDesc::getGoodsTypeId, goodsIdList);
 		}
 		String shoppingMall = "";
-		if (ObjectUtils.isNotNull(corpId)){
+		if (ObjectUtils.isNotNull(corpId)) {
 			CorpsDesc corpsDesc = corpsDescService.getById(Long.parseLong(corpId));
 			if (ObjectUtils.isNull(corpsDesc)) {
 				throw new RuntimeException("未查到用户信息");
 			} else {
 				shoppingMall = corpsDesc.getShoppingMall();
 			}
-		}else{
+		} else {
 			if (AuthUtil.getUserRole().equals("客户")) {
 				CorpsAttn corpsAttn = corpsAttnService.getOne(new LambdaQueryWrapper<CorpsAttn>()
-					.eq(CorpsAttn::getIsDeleted,0)
-					.eq(CorpsAttn::getTenantId,AuthUtil.getTenantId())
-					.eq(CorpsAttn::getUserId,AuthUtil.getUserId()));
+					.eq(CorpsAttn::getIsDeleted, 0)
+					.eq(CorpsAttn::getTenantId, AuthUtil.getTenantId())
+					.eq(CorpsAttn::getUserId, AuthUtil.getUserId()));
 				if (ObjectUtils.isNull(corpsAttn)) {
 					throw new RuntimeException("未查到用户信息");
 				} else {
@@ -819,8 +892,8 @@ public class GoodsDescController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入goodsDesc")
 	public R<?> descListByCname(GoodsDesc goodsDesc) {
 		LambdaQueryWrapper<GoodsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(GoodsDesc::getIsDeleted,0).eq(GoodsDesc::getTenantId,AuthUtil.getTenantId())
-			.like(ObjectUtils.isNotNull(goodsDesc.getCname()),GoodsDesc::getCname,goodsDesc.getCname());
+		lambdaQueryWrapper.eq(GoodsDesc::getIsDeleted, 0).eq(GoodsDesc::getTenantId, AuthUtil.getTenantId())
+			.like(ObjectUtils.isNotNull(goodsDesc.getCname()), GoodsDesc::getCname, goodsDesc.getCname());
 		List<GoodsDesc> iPage = goodsDescService.list(lambdaQueryWrapper);
 		return R.data(iPage);
 	}

blade-service/blade-client/src/main/java/org/springblade/client/serial/service/impl/SerialServiceImpl.java

@@ -59,7 +59,7 @@ public class SerialServiceImpl extends ServiceImpl<SerialMapper, Serial> impleme
 		if (tradeType.equals("CK")){
 			yyyyMM = DateFormatUtils.format(date, "yy");
 		}else if (tradeType.equals("YPJ")){
-			if ("DA".equals(type)){
+			if ("DA".equals(type) || "WX".equals(type)){
 				yyyyMM = DateFormatUtils.format(date, "yyyyMMdd");
 			}else{
 				yyyyMM = DateFormatUtils.format(date, "yyyyMMddHHmmss");
@@ -93,7 +93,7 @@ public class SerialServiceImpl extends ServiceImpl<SerialMapper, Serial> impleme
 				baseMapper.insert(billNoSerial);
 			}
 		}else if (tradeType.equals("YPJ")){
-			if ("DA".equals(type)){
+			if ("DA".equals(type)|| "WX".equals(type)){
 				yyyyMM = DateFormatUtils.format(date, "yyyyMMdd");
 			}else{
 				yyyyMM = DateFormatUtils.format(date, "yyyyMMddHHmmss");

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

@@ -101,9 +101,9 @@ public class MaintenanceController extends BladeController {
 			lambdaQueryWrapper.lt(Maintenance::getRepairReportDate, maintenance.getRepairReportDateList().get(0));
 		}
 		if (AuthUtil.getUserRole().contains("维修工")) {
-			lambdaQueryWrapper.eq(Maintenance::getDispatchingWorkers, AuthUtil.getUserId());
+			lambdaQueryWrapper.eq(Maintenance::getMaintenanceWorkerId, AuthUtil.getUserId());
 		} else {
-			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(maintenance.getDispatchingWorkers()), Maintenance::getDispatchingWorkers, maintenance.getDispatchingWorkers());
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(maintenance.getMaintenanceWorkerId()), Maintenance::getMaintenanceWorkerId, maintenance.getMaintenanceWorkerId());
 		}
 		if (AuthUtil.getUserRole().contains("客户")) {
 			lambdaQueryWrapper.eq(Maintenance::getCreateUser, AuthUtil.getUserId());

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

@@ -127,6 +127,7 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 				return R.fail(500, "生成系统编号失败");
 			}
 			maintenance.setSysNo(billNo.getData().toString());
+			maintenance.setRepairReportDate(new Date());
 			maintenance.setCreateTime(new Date());
 			maintenance.setCreateUserName(AuthUtil.getUserName());
 			maintenance.setCreateUser(AuthUtil.getUserId());
@@ -190,7 +191,7 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 		}
 		if (ObjectUtils.isNotNull(maintenance.getMaintenanceWorkerId())) {
 			maintenance.setDispatchingWorkers("2");
-			maintenance.setStatus(3);
+			maintenance.setStatus(2);
 			maintenance.setUpdateTime(new Date());
 			maintenance.setUpdateUser(AuthUtil.getUserId());
 			maintenance.setUpdateUserName(AuthUtil.getUserName());
@@ -235,7 +236,7 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 		if (maintenance.getId() == null) {
 			throw new RuntimeException("缺少必要参数");
 		}
-		if (maintenance.getStatus() <= 1) {
+		if (maintenance.getStatus() <= 2) {
 			maintenance.setDispatchingWorkers("1");
 			maintenance.setStatus(1);
 			maintenance.setUpdateTime(new Date());