Преглед изворни кода

修改报销审核人开发

anderx пре 1 година
родитељ
комит
95e8506c08

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

@@ -216,5 +216,5 @@ public interface AdminMapper {
     BigDecimal selectFinanceReceivablesCount(@Param("aid") String aid, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
 
-
+    void updateDepExpenseFinance(@Param("id") String id, @Param("expenseFinanceId") String expenseFinanceId);
 }

+ 9 - 0
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -798,6 +798,7 @@
     </update>
 
 
+
     <!--  用户是为正常的 -->
     <select id="getCountById" parameterType="java.lang.String" resultType="java.lang.Integer">
         select count(a.id)  from admin a
@@ -1342,4 +1343,12 @@
         where a.id= #{aid}
     </select>
 
+    <update id="updateDepExpenseFinance">
+        update expense_account a left join expense_account_examine b on a.id=b.eaid
+        left join admin c on c.id= #{expenseFinanceId}
+        set b.auditor =c.id ,b.auditorName =c.name
+        where a.process_status in (0,1,2,3) and a.status =1 and b.process_status =3 and b.status =0
+        and a.apply_dep = #{id}
+    </update>
+
 </mapper>

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

@@ -256,16 +256,19 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 		if(StringUtils.isBlank(useDep.getFinanceId())&&StringUtils.isNotBlank(in.getFinanceId())){
 			addExamine(useDep, in.getFinanceId(),orderS);
 		}
+		//财务复审
 		if(StringUtils.isBlank(useDep.getRetrialFinanceId())&&StringUtils.isNotBlank(in.getRetrialFinanceId())){
 			addExamine(useDep, in.getExpenseFinanceId(),orderS);
 		}
+		//技术总监审核人
 		if(StringUtils.isBlank(useDep.getTechAdminId())&&StringUtils.isNotBlank(in.getTechAdminId())){
 			addExamine(useDep, in.getTechAdminId(),orderS);
 		}
+		//已派财务与总监审核
 		if(!orderS.isEmpty()){
 			torderNewMapper.updateOrderDepFinanceExamineName(orderS,ProcessStatus.YPCW_JSZJ.getCode());
 		}
-
+		//运营保障审核人
 		if(StringUtils.isBlank(useDep.getOperationGuaranteeId())&&StringUtils.isNotBlank(in.getOperationGuaranteeId())){
 			List<String> strings = torderNewMapper.selectByDepAndProcess(useDep.getId(), ProcessStatus.YYBZSH.getCode());
 			if(!strings.isEmpty()){
@@ -429,6 +432,11 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 			}
 
 		}
+		//切换财务审核与财务复审
+		if (in.getExpenseFinanceId()!=null&&!in.getExpenseFinanceId().equals(useDep.getExpenseFinanceId())){
+			//如果新的财务审核人与旧财务审核人不一致,切换审核人
+			adminMapper.updateDepExpenseFinance(in.getId(),in.getExpenseFinanceId());
+		}
 
 		if (in.getExpenseFinanceId()!=null&&!in.getExpenseFinanceId().equals(useDep.getExpenseFinanceId())){
 			dep.setExpenseFinanceId(in.getExpenseFinanceId());