Browse Source

Merge branch 'test'

# Conflicts:
#	src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml
anderx 2 years ago
parent
commit
7eb1205bb9

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

@@ -29,7 +29,7 @@ public interface TemporaryReceivablesMapper {
 
     List<TemporaryReceivables> selectByaid(@Param("aid") String aid,@Param("mergeStatus") Integer mergeStatus);
 
-    void deleteNormalByaid(String aid);
+    void deleteNormalByaid(@Param("aid") String aid,@Param("mergeStatus") Integer mergeStatus);
 
 
 
@@ -44,4 +44,5 @@ public interface TemporaryReceivablesMapper {
     int selectReceivablesNumberRepeats(TemporaryReceivables tr);
 
     void waitngMerge(@Value("list") List<Integer> list);
+
 }

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

@@ -218,7 +218,7 @@
 
   <select id="selectByPCid" resultType="com.goafanti.weChat.bo.OutPublicReleaseDetails">
     select
-      a.id,a.prid, a.`uid`, a.ufid, a.new_user newUser,a.longitude,a.latitude,b.nickname userName,
+      a.id,a.prid, a.`uid`, a.ufid, a.new_user newUser,a.longitude,a.latitude,b.nickname userName,a.main_status mainStatus,
       a.district_name districtName ,a.clock_in clockIn,date_format(a.clock_in_time, '%Y-%m-%d %H:%i:%S')  clockInTimes,a.photo_url photoUrl
     from public_release_details a left join user b on a.uid=b.id
     where prid = #{id,jdbcType=INTEGER} order by a.update_time desc

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

@@ -2082,7 +2082,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   </select>
 
   <select id="matchingOrderNoOrUserName" resultType="com.goafanti.order.bo.UserOrder">
-    select order_no orderNo ,buyer_id uid ,b.nickname userName
+    select order_no orderNo ,buyer_id uid ,b.username userName
     from t_order_new a left join `user` b on a.buyer_id =b.id
     where 1=1
     <if test="orderNo !=null">

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

@@ -1190,20 +1190,20 @@
   <update id="updateDimissionTransfer" parameterType="java.lang.String">
     update t_order_task a left join t_change_task b on a.id =b.tid
     left join (select * from admin where id= #{transferId,jdbcType=VARCHAR})c on 1=1
-    set a.task_allocator= #{aid,jdbcType=VARCHAR},a.task_receiver= c.id
+    set a.task_allocator= #{aid,jdbcType=VARCHAR},a.task_receiver= c.id,
         a.receiver_name=c.name,b.receiver_name=c.name
     <if test="type==0">
-      ,a.consultant_id=#{transferId,jdbcType=VARCHAR}
+      ,a.consultant_id=c.id
     </if>
     <if test="type==1">
-      ,a.manager_id=#{transferId,jdbcType=VARCHAR}
+      ,a.manager_id=c.id
     </if>
     <if test="type==3">
       ,a.consultant_id= null
-      ,a.manager_id=#{transferId,jdbcType=VARCHAR}
+      ,a.manager_id=c.id
     </if>
     <if test="type==4">
-      ,a.consultant_id=#{transferId,jdbcType=VARCHAR}
+      ,a.consultant_id=c.id
       ,a.manager_id= null
     </if>
     <if test="type==1">

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

@@ -169,7 +169,7 @@
   </delete>
   <delete id="deleteNormalByaid">
   delete from temporary_receivables
-    where aid = #{aid} and status &lt; 2
+    where aid = #{aid} and status &lt; 2 and merge_status =#{mergeStatus}
   </delete>
   <select id="selectByaid" resultMap="BaseResultMap">
     select

+ 1 - 1
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -538,7 +538,7 @@ public class OrderChangeApiController extends CertifyApiController {
 	}
 
 	/**
-	 * 新增会员子项目
+	 * 变更-新增会员子项目
 	 *
 	 * @return
 	 */

+ 2 - 2
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -586,7 +586,7 @@ public class OrderProjectApiController extends CertifyApiController {
 
 
 	/**
-	 * 新增会员子项目
+	 * 新增会员子项目(发起新增、无需审核)
 	 *
 	 * @return
 	 */
@@ -605,7 +605,7 @@ public class OrderProjectApiController extends CertifyApiController {
 
 	}
 	/**
-	 * 新增会员子项目
+	 * 新增会员子项目(审核)
 	 *
 	 * @return
 	 */

+ 24 - 5
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -967,10 +967,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 
 	private void pushTaskAndDun(Integer id,TOrderNew o) {
-		List<TChangeTaskOut> listct=tChangeTaskMapper.selectByCid(id,3);
-		HashMap<Integer, Integer> map=changeAddOrderTask(listct,null);
-		List<TChangeTaskOut> listct2=tChangeTaskMapper.selectByCid(id,2);
-		changeAddOrderTask(listct2,map);
+		pushChangeAddOrderTask(id);
+
 		//处理主项目显示派单年份
 		List<TChangeDunOut> listcd=tChangeDunMapper.selectByCid(id);
 		for (TChangeDunOut cd : listcd) {
@@ -1005,6 +1003,17 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	}
 
 	/**
+	 * 通过变更id来处理变更,先将父级新增、再新增子集。为了获取到订单项目的父子级关系
+	 * @param id
+	 */
+	private void pushChangeAddOrderTask(Integer id) {
+		List<TChangeTaskOut> listct=tChangeTaskMapper.selectByCid(id,3);
+		HashMap<Integer, Integer> map=changeAddOrderTask(listct,null);
+		List<TChangeTaskOut> listct2=tChangeTaskMapper.selectByCid(id,2);
+		changeAddOrderTask(listct2,map);
+	}
+
+	/**
 	 *
 	 * @param listct 变更数据
 	 * @param input  新增数据Id
@@ -1039,6 +1048,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 						if (tid==null)tid=tChangeTaskMapper.selectByPrimaryKey(cd.getChangeSplitSuper()).getTid();
 						ot.setSplitSuper(tid);
 					}
+					ot.setSplitId(pushSplitId(ot.getSplitSuper()));
+					ot.setCommodityPrice(new BigDecimal(0));
 				}
 				if (cd.getDeclarationBatch()!=null)ot.setDeclarationBatch(cd.getDeclarationBatch());
 				if (cd.getPatentType()!=null)ot.setPatentType(cd.getPatentType());
@@ -1066,6 +1077,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				ot.setId(cd.getTid());
 				ot.setCommodityPrice(cd.getCommodityPrice());
 				ot.setCommodityQuantity(cd.getCommodityQuantity());
+				if (ot.getSplitSuper()!=null)ot.setSplitId(pushSplitId(ot.getSplitSuper()));
 				if (cd.getDeclarationBatch()!=null)ot.setDeclarationBatch(cd.getDeclarationBatch());
 				if (cd.getPatentType()!=null)ot.setPatentType(cd.getPatentType());
 				tOrderTaskMapper.updateByPrimaryKeySelective(ot);
@@ -1078,11 +1090,17 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			}else if(cd.getType()==3) {
 				tOrderTaskMapper.deleteByPrimaryKey(cd.getTid());
 			}
-
 		}
 		return map;
 	}
 
+	private Integer pushSplitId(Integer splitSuper) {
+		//计算出拆分编号
+		Integer i = tOrderTaskMapper.getSplitCount(splitSuper);
+		i++;
+		return i;
+	}
+
 	private void updateTaskMid(Integer id, String lastYear, BigDecimal lastYearCapital, BigDecimal lastYearIncome) {
 		TTaskMid tTaskMid = new TTaskMid();
 		tTaskMid.setTid(id);
@@ -1490,6 +1508,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		}
 		tChangeTask.setType(1);
 		tChangeTask.setCommodityQuantity(1);
+		tChangeTask.setCommodityPrice(new BigDecimal(0));
 		tChangeTask.setTaskComment(taskComment);
 		tChangeTask.setServiceYear(serviceYear);
 		tChangeTaskMapper.insertSelective(tChangeTask);

+ 0 - 2
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -715,8 +715,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		String url=pushOrderService.processStatusConstant(tOrder);
 		tOrder.setContractPictureUrl(url);
 		if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE)||
-				TokenManager.hasRole(AFTConstants.TECH_MANAGER)||TokenManager.hasRole(AFTConstants.TECH)||
-				TokenManager.hasRole(AFTConstants.TECH_ADMIN)||TokenManager.hasRole(AFTConstants.TECH_FINANCE_DIRECTOR)||
 				tOrder.getSalesmanId().equals(TokenManager.getAdminId())) {
 
 		}else {

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

@@ -404,10 +404,14 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	public TOrderTaskDetailBo orderTaskDetail(Integer id) {
 		TOrderTaskDetailBo t=tOrderTaskMapper.getOrderTaskDetail(id);
 		if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)
-				||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||TokenManager.hasRole(AFTConstants.TECH_ADMIN)
+				||TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE)
 					||TokenManager.getAdminId().equals(t.getTaskReceiver())) {
 			return t;
 		}else {
+			t.setContacts("***");
+			t.setContactMobile("***");
+			t.setLegalPerson("***");
+			t.setLegalPersonTel("***");
 			t.setOutsourceName("****");
 			t.setOutsourcePrice("****");
 			t.setDeclareUser("****");
@@ -1279,7 +1283,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		tOrderTask.setCommodityQuantity(1);
 		tOrderTask.setTaskComment(taskComment);
 		tOrderTask.setMain(0);
-		if (i!=1)tOrderTask.setCommodityPrice(new BigDecimal(0));
+		tOrderTask.setCommodityPrice(new BigDecimal(0));
 		tOrderTaskMapper.insertSelective(tOrderTask);
 		TTaskMember t = tTaskMemberMapper.selectByTid(tid);
 		TOrderTaskBo tb=new TOrderTaskBo();
@@ -1295,12 +1299,13 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			if(t.getContractTerm()!=null)ttm.setContractTerm(t.getContractTerm());
 			tTaskMemberMapper.insertSelective(ttm);
 		}
-
 		orderNewService.addTaskMid(tOrderTask.getId(),tOrderTask.getCommodityId(), tOrderTask.getOrderNo());
 		//处理主项目本次派单年份
 		tTaskMemberMapper.updateServiceYearBySplitSuper(tid);
 		addMemberLog(tOrderTask.getId(),0,"新增会员项目");
-		addNoticMember(NoticeStatus.MENBER_START.getCode(),tOrderTask.getOrderNo(),null,0);
+		if(memberType!=null){
+			addNoticMember(NoticeStatus.MENBER_START.getCode(),tOrderTask.getOrderNo(),null,0);
+		}
 		return tb;
 	}
 	public void addNoticMember(Integer type,  String orderNo,Integer shiroType,Integer result) {

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -242,7 +242,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		}
 		if(!listBull.isEmpty()) {
 			tOrderBillNewMapper.insertBatch(listBull);
-			temporaryReceivablesMapper.deleteNormalByaid(TokenManager.getAdminId());
+			temporaryReceivablesMapper.deleteNormalByaid(TokenManager.getAdminId(),mergeStatus);
 		}else {
 			return -1;
 		}