流程

hx-service-api/service-flow-api/src/main/java/com/fjhx/utils/ExampleAbstract.java

@@ -7,12 +7,6 @@ import lombok.Setter;
 public abstract class ExampleAbstract {
 
     /**
-     * 流程编码
-     */
-    @Getter
-    private String code;
-
-    /**
      * 流程缓存值
      */
     @Setter
@@ -28,7 +22,7 @@ public abstract class ExampleAbstract {
     /**
      * 设置流程编码
      */
-    public abstract void setCode();
+    public abstract String getCode();
 
     /**
      * 实例结束方法

hx-service-api/service-flow-api/src/main/java/com/fjhx/utils/FlowConstructor.java

@@ -13,7 +13,7 @@ import org.springblade.core.tool.api.R;
 
 public class FlowConstructor {
 
-    private static final IFlowClient flowClient = SpringUtil.getBean(IFlowClient.class);
+//    private static final
 
     private ExampleAbstract exampleAbstract;
 
@@ -38,6 +38,8 @@ public class FlowConstructor {
      */
     public ExampleInfo create(Long businessId) {
 
+        IFlowClient flowClient = SpringUtil.getBean(IFlowClient.class);
+
         // 获取流程编码
         String code = exampleAbstract.getCode();
         Assert.notEmpty(code, FlowExplainConstant.CODE_EMPTY);

hx-service/pom.xml

@@ -67,6 +67,12 @@
 
             <dependency>
                 <groupId>com.fjhx</groupId>
+                <artifactId>service-flow-api</artifactId>
+                <version>${hx.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.fjhx</groupId>
                 <artifactId>library-product</artifactId>
                 <version>${hx.version}</version>
             </dependency>

hx-service/storage-restructure/pom.xml

@@ -33,6 +33,11 @@
             <artifactId>aliyun-sdk-oss</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>service-flow-api</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

hx-service/storage-restructure/src/main/java/com/fjhx/controller/common/CommonFileController.java

@@ -13,7 +13,7 @@ import java.util.Map;
 
 /**
  * <p>
- * 文件 前端控制器
+ * 通用 前端控制器
  * </p>
  *
  * @author ${author}
@@ -38,6 +38,6 @@ public class CommonFileController {
                 .eq(CommonFile::getBusinessId, commonFile.getBusinessId()));
         return R.success(list);
     }
-    
+
 }
 

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockDetailServiceImpl.java

@@ -68,7 +68,7 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
         String jobNo = condition.get("jobNo");
 
         Date date = new Date();
-        if (Integer.parseInt(DateUtil.format(date, "H")) >= 7) {
+        if (Integer.parseInt(DateUtil.format(date, "H")) >= 7 && Integer.parseInt(DateUtil.format(date, "m")) >= 30) {
             date = DateUtil.beginOfDay(date);
         } else {
             date = DateUtil.beginOfDay(DateUtil.yesterday());