Browse Source

特批审核分成部门特批审核与董事长特批审核

anderx 1 year ago
parent
commit
599cf99340

+ 1 - 0
src/main/java/com/goafanti/common/dao/DepartmentMapper.java

@@ -132,4 +132,5 @@ public interface DepartmentMapper {
 
     void updateNull(InputDep in);
 
+    int selectByApproval(String aid);
 }

+ 7 - 0
src/main/java/com/goafanti/common/mapper/DepartmentMapper.xml

@@ -603,6 +603,7 @@
         from department where super_id=  #{superId}
         order by dep_no desc limit 1
     </select>
+
     <update id="updateDepFinance">
         update department
         set finance_id= #{transferId}
@@ -636,4 +637,10 @@
         </set>
         where id=#{id}
     </update>
+
+    <select id="selectByApproval"  resultType="integer">
+    select count(*)
+    from department
+    where  approval=1 and approval_aid =#{aid}
+    </select>
 </mapper>

+ 8 - 10
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1515,22 +1515,20 @@
       </if>
       <if test="approval ==1">
         and a.process_status =5
-        and a.approval in
         <if test="manageType ==0">
-          (1)
-        </if>
-        <if test="manageType ==1">
-          (4)
+            and a.approval =1
         </if>
+          <if test="manageType ==1">
+              and a.approval =4
+          </if>
       </if>
       <if test="approval ==2">
-        and a.approval in
         <if test="manageType ==0">
-          (2,3)
-        </if>
-        <if test="manageType ==1">
-          (5,6)
+            and a.approval in (2,3)
         </if>
+          <if test="manageType ==1">
+              and a.approval in (5,6)
+          </if>
       </if>
     </if>
     <if test="specially !=3 ">

+ 1 - 11
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1272,11 +1272,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			}
 		}else if (in.getSpecially()==3){
 			params.put("aid", TokenManager.getAdminId());
-			if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
-				params.put("manageType",1);
-			}else  {
-				params.put("manageType",0);
-			}
+
 		}else if (in.getSpecially()==12){
 			PublicConfig config=publicConfigMapper.queryById(1);
 			String aid=TokenManager.getAdminId();
@@ -1290,12 +1286,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			}
 			params.put("configType", configType);
 			params.put("aid", aid);
-			if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT)||TokenManager.hasRole(AFTConstants.SUPERADMIN)){
-				params.put("manageType",1);
-			}else  {
-				params.put("manageType",0);
-			}
-
 		}
 		params.put("specially", in.getSpecially());
 		if (StringUtils.isNotBlank(in.getName())) {