小程序审批流程

bailuntec-cost-core/pom.xml

@@ -190,11 +190,6 @@
             </exclusions>
         </dependency>
 
-        <dependency> <!-- 引入log4j2依赖 -->
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
-        </dependency>
-
         <!--mp 增加Mybatis-->
         <dependency>
             <groupId>com.baomidou</groupId>

bailuntec-cost-core/src/main/docker/Dockerfile

 FROM openjdk:8-jdk-alpine
 VOLUME /tmp
-ADD bailuntec-cost-core-1.0-SNAPSHOT.jar app.jar
-
+ADD bailuntec-cost-core-1.0-SNAPSHOT.jar bailuntec-cost-core-1.0-SNAPSHOT.jar
 RUN echo "Asia/Shanghai" > /etc/timezone
 
-ENTRYPOINT ["java","-Xms300m","-Xmx600m","-jar","-Dspring.profiles.active=test","/app.jar"]
+ENTRYPOINT ["java","-Xms1G","-Xmx1G","-jar","-Dspring.profiles.active=test","/bailuntec-cost-core-1.0-SNAPSHOT.jar"]
 EXPOSE 8082
-cost/list/reset/resetInvoice

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/AppCostServiceImpl.java

@@ -33,33 +33,47 @@ public class AppCostServiceImpl implements AppCostService {
 
     @Override
     public Page<CostDto> appCheckCostList(AppCheckCostListReq req) {
-        IPage<CostDomain> costDomainIPage = new Page<>(req.getPageNum(), req.getPageSize())
+        IPage<CostDomain> costDomainIPage = new Page<>(req.getPageNum(), req.getPageSize());
         return (Page<CostDto>) costDao.appCheckCostList(costDomainIPage, req).convert(CostDomain::castToDto);
     }
 
     @Override
     public void appCostPass(AppCostPassReq req) {
-        CostState costState = this.getCostState(req.getCostNo());
-        costState.handle();
+        CostContext costContext = this.getCostState(req.getCostNo(), req.getOaUserId());
+        costContext.handle();
     }
 
     @Override
     public void appCostReject(AppCostRejectReq req) {
-        CostState costState = this.getCostState(req.getCostNo());
-        costState.refuse(req.getRejectReason());
+        CostContext costContext = this.getCostState(req.getCostNo(), req.getOaUserId());
+        costContext.refuse(req.getRejectReason());
     }
 
-    private CostState getCostState(String costNo) {
+    private CostContext getCostState(String costNo, Integer oaUserId) {
         CostDomain costDomain = costDao.selectByCostNo(costNo);
+        CostState costState;
+        CostContext costContext;
         switch (costDomain.getCostStatus()) {
             case CostDomain.STATUS_DEPARTMENT_CHECK:
-                return SpringContextUtil.getBean(DepartmentCheckState.class);
+                costState = SpringContextUtil.getBean(DepartmentCheckState.class);
+                costContext = new CostContext(costNo, oaUserId);
+                costContext.setCostState(costState);
+                return costContext;
             case CostDomain.STATUS_FINANCIAL_CHECK:
-                return SpringContextUtil.getBean(FinancialCheckState.class);
+                costState = SpringContextUtil.getBean(FinancialCheckState.class);
+                costContext = new CostContext(costNo, oaUserId);
+                costContext.setCostState(costState);
+                return costContext;
             case CostDomain.STATUS_HR_CHECK:
-                return SpringContextUtil.getBean(HrCheckState.class);
+                costState = SpringContextUtil.getBean(HrCheckState.class);
+                costContext = new CostContext(costNo, oaUserId);
+                costContext.setCostState(costState);
+                return costContext;
             case CostDomain.STATUS_FINAL_CHECK:
-                return SpringContextUtil.getBean(FinalCheckState.class);
+                costState = SpringContextUtil.getBean(FinalCheckState.class);
+                costContext = new CostContext(costNo, oaUserId);
+                costContext.setCostState(costState);
+                return costContext;
             default:
                 throw new BizRuntimeException("invalid cost status");
         }

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/utils/CostFileUtil.java

@@ -98,6 +98,7 @@ public class CostFileUtil {
         return qiniuUpload(localFile);
     }
 
+    @SuppressWarnings("all")
     public String qiniuUpload(File localFilePath) {
         //1、构造一个带指定Zone对象的配置类
         Configuration cfg = new Configuration(Zone.zone2());