Browse Source

Merge branch 'test' of ssh://git@git.jishutao.com:55555/jishutao/kede-server.git into test

anderx 7 years ago
parent
commit
806fd5590b

+ 9 - 6
src/main/java/com/goafanti/common/mapper/TOrderBonusMapper.xml

@@ -371,8 +371,8 @@
   		o.liquidation_status as liquidationStatus, ga.name as byName,
   		bonus_subject as bonusSubject, grant_status as grantStatus, a.name as targetName
   		from t_order_bonus b
-  		left join t_order_new o on o.order_no = b.order_no
-  		left join t_order_task t on t.order_no = b.order_no and b.grant_target = t.task_receiver
+  		left join t_order_task t on b.task_id = t.id
+  		left join t_order_new o on o.order_no = t.order_no
   		left join admin a on a.id = t.task_receiver 
   		left join admin oa on oa.id = o.salesman_id
   		left join admin ga on ga.id = b.grant_by 
@@ -410,8 +410,8 @@
   <select id="technicianBonusCount" parameterType="Map" resultType="java.lang.Integer">
   select count(*)
   from t_order_bonus b
-  		left join t_order_new o on o.order_no = b.order_no
-  		left join t_order_task t on t.order_no = b.order_no and b.grant_target = t.task_receiver
+  		left join t_order_task t on b.task_id = t.id
+  		left join t_order_new o on o.order_no = t.order_no
   		left join admin a on a.id = t.task_receiver 
   		left join admin oa on oa.id = o.salesman_id
   		where b.grant_type = 1
@@ -550,8 +550,8 @@
   		o.liquidation_status as liquidationStatus, ga.name as byName,
   		bonus_subject as bonusSubject, grant_status as grantStatus, a.name as targetName
   		from t_order_bonus b
-  		left join t_order_new o on o.order_no = b.order_no
-  		left join t_order_task t on t.order_no = b.order_no and b.grant_target = t.task_receiver
+  		left join t_order_task t on b.task_id = t.id
+  		left join t_order_new o on o.order_no = t.order_no
   		left join admin a on a.id = t.task_receiver 
   		left join admin oa on oa.id = o.salesman_id
   		left join admin ga on ga.id = b.grant_by 
@@ -616,6 +616,9 @@
   <select id="checkByOnoAndSub" parameterType="com.goafanti.common.model.TOrderBonus" resultType="java.lang.Integer">
   	select count(*) from t_order_bonus where order_no = #{orderNo,jdbcType=VARCHAR} and bonus_subject = #{bonusSubject,jdbcType=INTEGER} 
   	and grant_target = #{grantTarget,jdbcType=VARCHAR} and grant_type = #{grantType,jdbcType=INTEGER}
+  	<if test="taskId != null">
+  	and task_id = #{taskId,jdbcType=INTEGER}
+  	</if>
   </select>
   <!-- 判断当前订单中有没有未发放的数据 -->
   <select id="checkNoPay" parameterType="com.goafanti.order.bo.TOrderBonusBo" resultType="java.lang.Integer">

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

@@ -872,8 +872,8 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
   </select>
   	<!-- 根据订单编号获得所有的任务负责人 -->
   	<select id="getReceiverByOid" parameterType="java.lang.String" resultMap="BaseResultMap">
-  	select distinct task_receiver, a.name, a.email from t_order_task t
+  	select distinct task_receiver, a.name, a.email, t.id, t.project_status from t_order_task t
 	inner join admin a on t.task_receiver = a.id
-	where order_no = #{orderNo,jdbcType=VARCHAR} and task_status &gt; 0
+	where order_no = #{orderNo,jdbcType=VARCHAR} and task_status &gt; 0 and super_id is null
   	</select>
 </mapper>

+ 1 - 1
src/main/java/com/goafanti/common/utils/ExportExcelUtil.java

@@ -262,7 +262,7 @@ public class ExportExcelUtil {
 					case "任务编号": o = ob.getTid().toString(); break;
 					case "任务名称": o = ob.getCommodityName(); break;
 					case "订单编号": o = ob.getOrderNo(); break;
-					case "任务负责人": o = ob.getSalesName(); break;
+					case "任务负责人": o = ob.getTargetName(); break;
 					case "任务状态": o = TaskState.getValueByCode(ob.getTaskStatus()); break;
 					case "任务数量": o = ob.getCommodityQuantity().toString(); break;
 					case "项目状态": o = ProjectNewStage.getValueByCode(ob.getProjectStatus()); break;

+ 3 - 3
src/main/java/com/goafanti/order/enums/BonusSubject.java

@@ -10,11 +10,11 @@ import java.util.Map;
  */
 public enum BonusSubject {
 	SF(11,"首付奖"),
-	WK(12,"结算奖"),
+	WK(12,"尾款奖"),
 	TK(16,"退款"),
 	SB(21,"申报奖"),
-	RZ(23,"认证奖"),
-	RZQ(24,"认证奖"),
+	RZ(23,"立项奖"),
+	RZQ(24,"公示奖"),
 	
 	/** 无效 **/
 	INVALID(10, "INVALID");

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

@@ -212,6 +212,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 				if(null == tOrderTask ||null == tOrderTask.getTaskReceiver()){
 					return -3;
 				}
+				bonus.setTaskId(tOrderTask.getId());//任务id
 				bonus.setGrantTarget(tOrderTask.getTaskReceiver());
 				bonus.setGrantType(1);
 				int c = bonusMapper.checkByOnoAndSub(bonus);