Browse Source

项目进度详情开发

anderx 1 year ago
parent
commit
618b939959

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

@@ -44,5 +44,5 @@ public interface ExpenseAccountExamineMapper {
 
     Integer selectYesByParam(@Param("id") Integer id, @Param("aid") String aid);
 
-    void updateExamine(@Param("managerId") String managerId, @Param("useId") String useId);
+    void updateExamine(@Param("managerId") String managerId, @Param("useId") String useId,@Param("depId") String depId);
 }

+ 4 - 2
src/main/java/com/goafanti/common/mapper/ExpenseAccountExamineMapper.xml

@@ -164,8 +164,10 @@
       and eaid = #{id}
   </select>
   <update id="updateExamine">
-    update expense_account_examine a ,admin b
+    update expense_account_examine a ,admin b ,expense_account c
     set a.auditor =b.id ,a.auditorName =b.name
-    where a.process_status =2 and a.auditor = #{useId} and b.id = #{managerId}
+    where c.apply_dep=#{depId} and c.id = a.eaid
+    and a.process_status =2 and a.status=0
+      and a.auditor = #{useId} and b.id = #{managerId}
   </update>
 </mapper>

+ 2 - 1
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -259,7 +259,8 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 			addExamine(useDep, in.getFinanceId(),orderS);
 		}
 		if(in.getManagerId()!=null&&useDep.getManagerId()!=null&&!in.getManagerId().equals(useDep.getManagerId())){
-			expenseAccountExamineMapper.updateExamine(in.getManagerId(),useDep.getManagerId());
+
+			expenseAccountExamineMapper.updateExamine(in.getManagerId(),useDep.getManagerId(),useDep.getId());
 		}
 
 		//财务复审