Browse Source

修改订单项目修改时,处理子项数据

anderx 3 years ago
parent
commit
2370d4dc13

+ 4 - 1
src/main/java/com/goafanti/common/dao/TTaskMemberMapper.java

@@ -3,6 +3,7 @@ package com.goafanti.common.dao;
 import com.goafanti.common.model.TTaskMember;
 import org.apache.ibatis.annotations.Param;
 
+
 public interface TTaskMemberMapper {
     int deleteByPrimaryKey(Integer id);
 
@@ -20,5 +21,7 @@ public interface TTaskMemberMapper {
 
     TTaskMember selectByTid(int tid);
 
-    void updateSplitSuper(@Param("id") Integer id,@Param("serviceLife") String serviceLife,@Param("serviceYear") String serviceYear,@Param("yearSum") Integer yearSum,@Param("contractTerm") String contractTerm);
+    void updateSplitSuper(@Param("id") Integer id, @Param("serviceLife") String serviceLife,
+                          @Param("serviceYear") String serviceYear, @Param("yearSum") Integer yearSum,
+                          @Param("contractTerm") String contractTerm);
 }

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

@@ -135,7 +135,20 @@
   </update>
     <update id="updateSplitSuper">
       update  t_order_task a ,t_task_member b
-      set b.service_life=#{serviceLife} ,b.service_year=#{serviceyear} ,b.year_sum= #{yearSum} ,b.contract_term= #{contractTerm}
+      <set>
+      <if test="serviceLife != null">
+       b.service_life= #{serviceLife} ,
+      </if>
+        <if test="serviceYear != null">
+          b.service_year= #{serviceYear} ,
+        </if>
+        <if test="yearSum != null">
+          b.year_sum= #{yearSum} ,
+        </if>
+        <if test="contractTerm != null">
+          b.contract_term= #{contractTerm},
+        </if>
+      </set>
       where a.id=b.tid and a.split_super = #{id}
     </update>
 

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

@@ -622,7 +622,6 @@ public class OrderProjectApiController extends CertifyApiController {
 			return res;
 		}
 		return res.data(orderProjectService.deleteMemberSonProject( id));
-
 	}
 
 }

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

@@ -30,6 +30,7 @@ import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -1203,7 +1204,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@Override
 	public TOrderTask addMemberSonProject(Integer tid, String serviceYear, String taskComment,Integer memberType,String pictureUrl) {
 		Date date =new Date();
-		TOrderTaskBo tOrderTask = (TOrderTaskBo) tOrderTaskMapper.selectByPrimaryKey(tid);
+		TOrderTask tOrderTask =  tOrderTaskMapper.selectByPrimaryKey(tid);
 		tOrderTask.setSplitStatus(1);
 		tOrderTask.setSplitAid(TokenManager.getAdminId());
 		tOrderTask.setSplitTime(date);
@@ -1223,21 +1224,24 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		tOrderTask.setTaskComment(taskComment);
 		tOrderTaskMapper.insertSelective(tOrderTask);
 		TTaskMember t = tTaskMemberMapper.selectByTid(tid);
+		TOrderTaskBo tb=new TOrderTaskBo();
+		BeanUtils.copyProperties(tOrderTask,tb);
 		if (t.getServiceLife()!=null||t.getYearSum()!=null||t.getContractTerm()!=null||serviceYear!=null){
 			TTaskMember ttm=new TTaskMember();
 			ttm.setId(null);
 			ttm.setTid(tOrderTask.getId());
 			if(t.getServiceLife()!=null)ttm.setServiceLife(t.getServiceLife());
 			ttm.setServiceYear(serviceYear);
-			tOrderTask.setServiceYear(serviceYear);
+			tb.setServiceYear(serviceYear);
 			if(t.getYearSum()!=null)ttm.setYearSum(t.getYearSum());
 			if(t.getContractTerm()!=null)ttm.setContractTerm(t.getContractTerm());
 			tTaskMemberMapper.insertSelective(ttm);
 		}
+
 		orderNewService.addTaskMid(tOrderTask.getId(),tOrderTask.getCommodityId(), tOrderTask.getOrderNo());
 		addMemberLog(tOrderTask.getId(),0,"新增会员项目");
 		addNoticMember(NoticeStatus.MENBER_START.getCode(),tOrderTask.getOrderNo(),null,0);
-		return tOrderTask;
+		return tb;
 	}
 	public void addNoticMember(Integer type,  String orderNo,Integer shiroType,Integer result) {
 		TOrderNewBo tn = tOrderNewMapper.getSaleIdByOno(orderNo);