zhouxingyu 3 tygodni temu
rodzic
commit
8713a6f50b

+ 7 - 5
lg-code/src/main/java/org/jeecg/modules/ProdPlan/controller/ProdPlanController.java

@@ -90,7 +90,7 @@ public class ProdPlanController extends JeecgController<ProdPlan, IProdPlanServi
 		IPage<ProdPlan> pageList = prodPlanService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -104,7 +104,7 @@ public class ProdPlanController extends JeecgController<ProdPlan, IProdPlanServi
 		prodPlanService.save(prodPlan);
 		return Result.OK("添加成功!");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -118,7 +118,7 @@ public class ProdPlanController extends JeecgController<ProdPlan, IProdPlanServi
 		prodPlanService.updateById(prodPlan);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -132,7 +132,7 @@ public class ProdPlanController extends JeecgController<ProdPlan, IProdPlanServi
 		prodPlanService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -146,7 +146,7 @@ public class ProdPlanController extends JeecgController<ProdPlan, IProdPlanServi
 		this.prodPlanService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
@@ -212,6 +212,8 @@ public class ProdPlanController extends JeecgController<ProdPlan, IProdPlanServi
 		 List<DelayProduct> delayProducts = this.prodPlanService.parseExcel(filePath);
 		 if (delayProducts.size()>0) {
 			 delayProductService.saveBatch(delayProducts);
+			 prodPlan.setAnalysisState(1);
+			 prodPlanService.updateById(prodPlan);
 			 return Result.OK("解析成功");
 		 }else{
 	         return Result.error("解析失败");

+ 4 - 0
lg-code/src/main/java/org/jeecg/modules/ProdPlan/entity/ProdPlan.java

@@ -70,6 +70,10 @@ public class ProdPlan implements Serializable {
 	@Excel(name = "发件状态", width = 15)
     @ApiModelProperty(value = "发件状态")
     private java.lang.Integer sendState;
+    /**解析状态*/
+    @Excel(name = "解析状态", width = 15)
+    @ApiModelProperty(value = "解析状态")
+    private java.lang.Integer analysisState;
 
 
     private transient byte[] pie;