Browse Source

Merge branch 'test'

anderx 1 year ago
parent
commit
00454c75d5

+ 7 - 1
pom.xml

@@ -72,7 +72,13 @@
 			<artifactId>spring-web</artifactId>
 			<version>${org.springframework-version}</version>
 		</dependency>
-	<!-- Javax Annotation -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${org.springframework-version}</version>
+		</dependency>
+
+		<!-- Javax Annotation -->
 <dependency>
      <groupId>javax.xml.bind</groupId>
      <artifactId>jaxb-api</artifactId>

+ 20 - 19
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -1651,24 +1651,27 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         if (in.getStatus()!=null)param.put("status",in.getStatus());
         //如果前端未传 0自己 1审核的参数,默认自己,在审核列表的时候判断Aid,在
         param.put("auditor",TokenManager.getAdminId());
-        if(TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
-             //财务经理查看权限
-             in.setProcessStatus(5);
-             param.put("auditor",TokenManager.getAdminId());
-         }else if(TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.SUPERADMIN)||
-                 TokenManager.hasRole(AFTConstants.VICE_CEO)|| TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
-             //财务管理员和超级管理员查看全部
-             in.setProcessStatus(6);
-             param.put("auditor",TokenManager.getAdminId());
-         }else if (TokenManager.hasRole(AFTConstants.FINANCE)){
-             //0 设置为财务查看
-
-             param.put("auditor",TokenManager.getAdminId());
-             //如果是空设置为
-             if (in.getProcessStatus()==null)in.setProcessStatus(2);
-         }else {
-            in.setProcessStatus(0);
+        if(in.getProcessStatus()==null){
+            if(TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
+                //财务经理查看权限
+                in.setProcessStatus(5);
+                param.put("auditor",TokenManager.getAdminId());
+            }else if(TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.SUPERADMIN)||
+                    TokenManager.hasRole(AFTConstants.VICE_CEO)|| TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
+                //财务管理员和超级管理员查看全部
+                in.setProcessStatus(6);
+                param.put("auditor",TokenManager.getAdminId());
+            }else if (TokenManager.hasRole(AFTConstants.FINANCE)){
+                //0 设置为财务查看
+
+                param.put("auditor",TokenManager.getAdminId());
+                //如果是空设置为
+                if (in.getProcessStatus()==null)in.setProcessStatus(2);
+            }else {
+                in.setProcessStatus(0);
+            }
         }
+        param.put("processStatus",in.getProcessStatus());
          if (in.getRoleType()==null){
              param.put("roleType",0);
          }else {
@@ -1679,8 +1682,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                     param.put("aid",in.getAid());
                 }
         }
-
-        param.put("processStatus",in.getProcessStatus());
         if (in.getExamineStatus()!=null){
             param.put("examineStatus",in.getExamineStatus());
         }else {

+ 4 - 0
src/main/java/com/goafanti/order/enums/ProcessStatus.java

@@ -17,6 +17,10 @@ public enum ProcessStatus {
 	YPYXGLY(2,"已派营销管理员"),
 	/** 已派财务与技术总监**/
 	YPCW_JSZJ(3,"已派财务与技术总监"),
+	/**
+	 * 指定审核
+	 */
+//	ZDSH(4,"财务指定审核人"),
 	/** 已派特批审核 **/
 	YPTPSH(4,"已派特批审核"),
 	/** 已派咨询师管理员 **/

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -1,8 +1,8 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 
-#static.host=//static.jishutao.com/1.3.11
-static.host=//172.16.1.187/1.3.11
+static.host=//static.jishutao.com/1.3.12
+#static.host=//172.16.1.187/1.3.12
 
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20221026?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -52,7 +52,7 @@ amb.maxLvl=6
 
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.3.11
+static.host=//static.jishutao.com/1.3.12
 rd.static.host=//static.jishutao.com/RD/1.0.03
 avatar.upload.host=//static.jishutao.com/upload