Explorar el Código

财务审核修改

anderx hace 2 años
padre
commit
809a873e69

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

@@ -139,11 +139,11 @@
   </update>
   </update>
 
 
   <insert id="insertBatch">
   <insert id="insertBatch">
-    insert into t_order_examine (order_no, aid, `status`, aname,type)
+    insert into t_order_examine (order_no, aid, `status`, aname,type,tid)
     values
     values
     <foreach item="item" index="index" collection="list" separator=",">
     <foreach item="item" index="index" collection="list" separator=",">
       (#{item.orderNo,jdbcType=VARCHAR}, #{item.aid,jdbcType=VARCHAR}, #{item.status,jdbcType=INTEGER},
       (#{item.orderNo,jdbcType=VARCHAR}, #{item.aid,jdbcType=VARCHAR}, #{item.status,jdbcType=INTEGER},
-      #{item.aname,jdbcType=VARCHAR},#{item.type,jdbcType=INTEGER})
+      #{item.aname,jdbcType=VARCHAR},#{item.type,jdbcType=INTEGER},#{item.tid,jdbcType=INTEGER})
     </foreach>
     </foreach>
   </insert>
   </insert>
   <select id="selectByOrderNoAndAid" resultType="java.lang.Integer">
   <select id="selectByOrderNoAndAid" resultType="java.lang.Integer">

+ 5 - 3
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1288,7 +1288,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			//0=财务 1=特批
 			//0=财务 1=特批
 			if (in.getType()==0){
 			if (in.getType()==0){
 				if(task.getProcessStatus()!=1)throw  new BusinessException("审核状态错误");
 				if(task.getProcessStatus()!=1)throw  new BusinessException("审核状态错误");
-				List<TOrderExamine> list = tOrderExamineMapper.selectByOrderNo(task.getOrderNo(), 1);
+				List<TOrderExamine> list = tOrderExamineMapper.selectByTid(task.getId());
 				int count =0;
 				int count =0;
 				for (TOrderExamine e : list) {
 				for (TOrderExamine e : list) {
 					//当前未审核修改为审核
 					//当前未审核修改为审核
@@ -1338,7 +1338,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		}
 		}
 		addNoticMember(notice, ono, in.getType(),result);
 		addNoticMember(notice, ono, in.getType(),result);
 		addMemberLog(in.getId(),status,in.getRemarks());
 		addMemberLog(in.getId(),status,in.getRemarks());
-		if (nt.getProcessStatus()==3){
+		if (nt.getProcessStatus()==null&&nt.getProcessStatus()==3){
 			tTaskMemberMapper.updateServiceYearBySplitSuper(task.getSplitSuper());
 			tTaskMemberMapper.updateServiceYearBySplitSuper(task.getSplitSuper());
 		}
 		}
 
 
@@ -1497,6 +1497,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 
 	public void addNoticMember(Integer type,  TOrderNewBo b,Integer shiroType,Integer result,TOrderTask tOrderTask) {
 	public void addNoticMember(Integer type,  TOrderNewBo b,Integer shiroType,Integer result,TOrderTask tOrderTask) {
 		StringBuffer sb=new StringBuffer();
 		StringBuffer sb=new StringBuffer();
+		Date date = new Date();
 		String aid=null;
 		String aid=null;
 		List<Admin>admins=new ArrayList<>();
 		List<Admin>admins=new ArrayList<>();
 		sb.append("客户名称【").append(b.getUserName()).append("】,订单编号【").append(b.getOrderNo()).append("】,");
 		sb.append("客户名称【").append(b.getUserName()).append("】,订单编号【").append(b.getOrderNo()).append("】,");
@@ -1531,9 +1532,10 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				list.add(sendMemberEmail(type,admin.getId(),sb.toString()));
 				list.add(sendMemberEmail(type,admin.getId(),sb.toString()));
 				Notice n = new Notice();
 				Notice n = new Notice();
 				n.setId(UUID.randomUUID().toString());
 				n.setId(UUID.randomUUID().toString());
-				n.setAid(aid);
+				n.setAid(admin.getAid());
 				n.setNoticeType(type);
 				n.setNoticeType(type);
 				n.setContent(sb.toString());
 				n.setContent(sb.toString());
+				n.setCreateTime(date);
 				n.setReaded(0);//未读
 				n.setReaded(0);//未读
 				notices.add(n);
 				notices.add(n);
 			}
 			}