Browse Source

会员项目审核驳回不重置审核BUG修复

anderx 2 years ago
parent
commit
da152dccd3

+ 2 - 0
src/main/java/com/goafanti/common/dao/TOrderExamineMapper.java

@@ -31,4 +31,6 @@ public interface TOrderExamineMapper {
     void deleteByOrderNo(String orderNo);
 
     List<TOrderExamine> selectExamineBytidAndAid(@Param("list")List<Integer> ids,@Param("aid") String aid);
+
+    void deleteByTid(Integer tid);
 }

+ 5 - 0
src/main/java/com/goafanti/common/mapper/TOrderExamineMapper.xml

@@ -138,6 +138,7 @@
     </if>
   </update>
 
+
   <insert id="insertBatch">
     insert into t_order_examine (order_no, aid, `status`, aname,type,tid)
     values
@@ -162,6 +163,10 @@
     delete from t_order_examine
     where order_no = #{orderNo}
   </delete>
+  <delete id="deleteByTid">
+    delete from t_order_examine
+    where tid = #{tid}
+  </delete>
   <select id="selectExamineBytidAndAid" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />

+ 7 - 2
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1380,7 +1380,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			}else {
 				subtractionFinanceCountMember(task.getOrderNo(),tTaskMember.getCreateTime(),2);
 			}
-
 		}
 		addMemberLog(in.getId(),status,in.getRemarks());
 		if (nt.getProcessStatus()!=null&&nt.getProcessStatus()==3){
@@ -1428,11 +1427,15 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		addMemberLog(t.getId(),0,"修改重新发起");
 		t.setProcessStatus(1);
 		TOrderNewBo ono = tOrderNewMapper.getSaleIdByOno(task.getOrderNo());
-		addNoticMember(NoticeStatus.MENBER_START.getCode(), ono, null,0);
+		addNoticMember(NoticeStatus.MENBER_START.getCode(), ono, null,0,task);
 		TTaskMember tTaskMember = tTaskMemberMapper.selectByTid(t.getId());
 		addFinanceCountMember(task.getOrderNo(), tTaskMember.getCreateTime());
+		addMemberExamine(task);
 		return orderNewService.updateOrderTask(t);
 	}
+
+
+
 	@Override
 	public void addMemberLog(Integer id,Integer status ,String remarks){
 		MemberLog log = new MemberLog();
@@ -1503,6 +1506,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 	private void addMemberExamine(TOrderTask t) {
 		OrganizationListOut dep = tOrderNewMapper.selectOrderFinance(t.getOrderNo());
+		tOrderExamineMapper.deleteByTid(t.getId());
 		List<TOrderExamine> list=new ArrayList<>();
 		TOrderTask tOrderTask= new TOrderTask();
 		if(!Objects.isNull(dep)){
@@ -1522,6 +1526,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			tOrderTask.setExamineType(examineType);
 		}
 		tOrderTask.setId(t.getId());
+
 		tOrderTaskMapper.updateByPrimaryKeySelective(tOrderTask);
 		tOrderExamineMapper.insertBatch(list);
 	}