Quellcode durchsuchen

修改财务审核人与复审人同时处理订单

anderx vor 1 Jahr
Ursprung
Commit
b54e5dcfe0

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

@@ -117,4 +117,8 @@ public interface DepartmentMapper {
     Department selectByDepNo(String superId);
 
     void updateDepFinance(@Param("aid") String aid, @Param("transferId") String transferId);
+
+    void updateOrderDepFinance(@Param("newFinanceId") String newFinanceId, @Param("useFinanceId") String useFinanceId);
+
+    void updateOrderDepFinanceNotExamine(String financeId, String financeId1);
 }

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

@@ -696,5 +696,18 @@
     set finance_id= #{transferId}
     where finance_id= #{aid}
   </update>
+  <update id="updateOrderDepFinance">
+    update t_order_new a left join t_order_examine b on a.order_no =b.order_no
+      ,admin c
+    set a.examine_name=c.name,b.aid =c.id,b.aname=c.name
+    where a.process_status =3 and b.aid = #{useFinanceId}
+      and b.status =0 and c.id= #{newFinanceId}
+  </update>
+  <update id="updateOrderDepFinanceNotExamine">
+    update t_order_examine a ,admin b
+    set a.aid=b.id , aname =b.name
+    where a.aid=#{useFinanceId} and a.status =0
+      and b.id= #{newFinanceId}
+  </update>
 
 </mapper>

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

@@ -202,6 +202,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 	public int updateOrganization(InputDep in) {
 		//获取上级编号
 		Department superDep=departmentMapper.selectByPrimaryKey(in.getSuperId());
+		Department department = departmentMapper.selectByPrimaryKey(in.getId());
 		Date now=new Date();
 		Department dep=new Department();
 		dep.setLvl(superDep.getLvl()+1);
@@ -215,13 +216,25 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 		dep.setSuperId(in.getSuperId());
 		dep.setDepNo(in.getDepNo());
 		dep.setAbbreviation(in.getAbbreviation());
-		dep.setFinanceId(in.getFinanceId());
 		dep.setProvince(in.getProvince());
 		dep.setHideSign(in.getHideSign());
 		dep.setWorkingHoursType(in.getWorkingHoursType());
 		dep.setApproval(in.getApproval());
 		dep.setApprovalAid(in.getApprovalAid());
-		dep.setExpenseFinanceId(in.getExpenseFinanceId());
+		//财务与复审切换的时候要切换所有未审核的财务
+		if(StringUtils.isNotBlank(in.getFinanceId())&&department.getFinanceId().equals(in.getFinanceId())){
+			dep.setFinanceId(in.getFinanceId());
+			//处理订单
+			departmentMapper.updateOrderDepFinance(in.getFinanceId(),department.getFinanceId());
+			departmentMapper.updateOrderDepFinanceNotExamine(in.getFinanceId(),department.getFinanceId());
+
+		}
+		if (StringUtils.isNotBlank(in.getExpenseFinanceId())&&
+				department.getExpenseFinanceId().equals(in.getExpenseFinanceId())){
+			dep.setExpenseFinanceId(in.getExpenseFinanceId());
+			departmentMapper.updateOrderDepFinance(in.getFinanceId(),department.getFinanceId());
+		}
+
 		checkFinaceUpdate(in.getId(),in.getFinanceId());
 		if (in.getExpenseRetrialFinanceExamine()==1){
 			dep.setExpenseRetrialFinanceExamine(in.getExpenseRetrialFinanceExamine());