Sfoglia il codice sorgente

特批审核列表修改

anderx 2 anni fa
parent
commit
47c9f855f2

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -2181,7 +2181,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     where a.order_no =#{orderNo}
   </select>
   <select id="selectDepByOrderNo" resultType="com.goafanti.common.model.Department">
-    select a.id,a.name,a.province,a.finance_id financeId
+    select a.id,a.name,a.province,a.finance_id financeId,a.approval ,a.approval_aid approvalAid
     from department a left join t_order_new b on a.id =b.order_dep
     where b.order_no= #{orderNo}
   </select>

+ 9 - 10
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1471,15 +1471,15 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			tOrderTask.setProcessStatus(1);
 			tOrderTask.setMemberType(memberType);
 			tOrderTask.setPictureUrl(pictureUrl);
-			if(memberType==1||memberType==2){
-				//判定项目省内外
-				Department dep = tOrderNewMapper.selectDepByOrderNo(tOrderTask.getOrderNo());
-				if (dep!=null&&dep.getProvince()==AFTConstants.HN_PROVINCE){
-					tOrderTask.setApproval(2);
-				}else {
-					tOrderTask.setApproval(1);
-				}
-			}
+//			if(memberType==1||memberType==2){
+//				//判定项目省内外
+//				Department dep = tOrderNewMapper.selectDepByOrderNo(tOrderTask.getOrderNo());
+//				if (dep!=null&&dep.getProvince()==AFTConstants.HN_PROVINCE){
+//					tOrderTask.setApproval(2);
+//				}else {
+//					tOrderTask.setApproval(1);
+//				}
+//			}
 		}
 		Integer i=tOrderTaskMapper.getSplitCount(tid);
 		i++;
@@ -1489,7 +1489,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		tOrderTask.setMain(0);
 		tOrderTask.setCommodityPrice(new BigDecimal(0));
 		tOrderTaskMapper.insertSelective(tOrderTask);
-
 		TTaskMember t = tTaskMemberMapper.selectByTid(tid);
 		TOrderTaskBo tb=new TOrderTaskBo();
 		BeanUtils.copyProperties(tOrderTask,tb);