Browse Source

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

anderx 3 years ago
parent
commit
094bf4bb54

+ 9 - 1
src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java

@@ -40,7 +40,15 @@ public interface TOrderTaskMapper {
 
     List<TOrderTaskListBo> splitProjectList(Integer tid);
 
-    List<TOrderTaskBo> selectOrderTaskAll(String orderNo);
+    List<TOrderTaskBo> selectOrderTaskAll(@Param("orderNo")String orderNo);
+
+    /**
+     *
+     * @param orderNo 订单编号
+     * @param splitStatus null 所有 1主项目 2子项目 3所有项目
+     * @return
+     */
+    List<TOrderTaskBo> selectOrderTaskAll(@Param("orderNo") String orderNo,@Param("splitStatus")Integer splitStatus);
 
     String selectByidGetCname(String pid);
 

+ 7 - 4
src/main/java/com/goafanti/common/mapper/TChangeTaskMapper.xml

@@ -329,8 +329,9 @@
     select a.id,a.order_no as orderNo,a.main, c.cname,c.sort cSort,a.commodity_name as commodityName,a.official_cost officialCost,
 	a.official_cost officialCost, a.commodity_quantity as commodityQuantity,i.price,a.commodity_id as commodityId,a.type,a.tid,
 	a.receiver_name receiverName, a.task_comment as taskComment ,a.commodity_price as commodityPrice,a.split_status splitStatus,
-	a.split_super splitSuper, a.service_life serviceLife ,a.service_year serviceYear,a.year_sum yearSum,
-    a.declaration_batch declarationBatch,a.patent_type patentType,a.contract_term contractTerm
+	a.split_super splitSuper, a.service_life serviceLife ,a.service_year serviceYear,a.year_sum yearSum,i.patent_transfer patentTransfer,
+    i.type taskType, a.declaration_batch declarationBatch,a.patent_type patentType,a.contract_term contractTerm,
+    a.change_split_super changeSplitSuper
     from t_change_task a left join business_project i on a.commodity_id=i.id
   	left join business_category c on i.cid=c.id
   	where 1=1
@@ -338,7 +339,7 @@
   	and a.split_status= #{splitStatus}
   	</if>
   	<if test="splitStatus ==3">
-  	and a.split_status !=2
+  	and a.split_status in (0,1)
   	</if>
   	 and a.cid= #{id} order by a.id
   </select>
@@ -391,7 +392,9 @@
   <select id="selectBySuper" resultType="com.goafanti.order.bo.TChangeTaskOut">
 	select a.id,a.order_no as orderNo,a.main, c.cname,c.sort cSort,a.commodity_name as commodityName,
   	a.commodity_quantity as commodityQuantity,i.price,a.commodity_id as commodityId,a.type,a.tid,a.receiver_name receiverName,
-	a.task_comment as taskComment ,a.commodity_price as commodityPrice,a.split_status splitStatus,a.split_super splitSuper
+	a.task_comment as taskComment ,a.commodity_price as commodityPrice,a.split_status splitStatus,a.split_super splitSuper,
+    a.service_life serviceLife ,a.service_year serviceYear,a.year_sum yearSum, a.declaration_batch declarationBatch,
+	a.patent_type patentType,a.contract_term contractTerm,a.change_split_super changeSplitSuper
     from t_change_task a left join business_project i on a.commodity_id=i.id
   	left join business_category c on i.cid=c.id
   	where a.split_status=2 and a.cid= #{cid}

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

@@ -819,7 +819,16 @@
     left join admin f on e.salesman_id=f.id left join department g on e.order_dep=g.id left join user h on e.buyer_id=h.id
     left join business_project i on a.commodity_id=i.id left join business_category c on b.cid=c.id left join admin d on a.task_receiver=d.id
     left join t_task_member ttm on a.id=ttm.tid
-    where a.super_id is null  and  a.order_no= #{orderNo,jdbcType=VARCHAR} order by a.id
+    where a.super_id is null   and  a.order_no= #{orderNo,jdbcType=VARCHAR}
+    <if test="splitStatus !=null">
+      <if test="splitStatus  &lt; 3">
+        and a.split_status= #{splitStatus}
+      </if>
+      <if test="splitStatus ==3">
+        and a.split_status in(0,1)
+      </if>
+    </if>
+    order by a.id
   </select>
 
 

+ 20 - 2
src/main/java/com/goafanti/order/bo/TChangeTaskOut.java

@@ -9,7 +9,25 @@ public class TChangeTaskOut extends TChangeTask{
 	private String cname;
 	private String receiverName;
 	private Integer cSort;
+	private Integer patentTransfer;
+	private Integer taskType;
 	private List<?> list;
+
+	public Integer getTaskType() {
+		return taskType;
+	}
+
+	public void setTaskType(Integer taskType) {
+		this.taskType = taskType;
+	}
+
+	public Integer getPatentTransfer() {
+		return patentTransfer;
+	}
+
+	public void setPatentTransfer(Integer patentTransfer) {
+		this.patentTransfer = patentTransfer;
+	}
 	public Integer getcSort() {
 		return cSort;
 	}
@@ -34,6 +52,6 @@ public class TChangeTaskOut extends TChangeTask{
 	public void setReceiverName(String receiverName) {
 		this.receiverName = receiverName;
 	}
-	
-	
+
+
 }

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

@@ -586,7 +586,7 @@ public class OrderProjectApiController extends CertifyApiController {
 	@RequestMapping(value = "/addMemberFirstSonProject" ,method = RequestMethod.POST)
 	public Result addMemberFirstSonProject(Integer tid,String serviceYear,String taskComment){
 		Result res = new Result();
-		if(tid==null||StringUtils.isBlank(serviceYear)||StringUtils.isBlank(taskComment)){
+		if(tid==null||StringUtils.isBlank(serviceYear)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","参数"));
 			return res;
 		}

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

@@ -999,10 +999,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				List<TChangeTaskOut> list=tChangeTaskMapper.selectByCid(cid,3);//3设置不等于2
 				for (TChangeTaskOut tChangeTaskOut : list) {
 					if(tChangeTaskOut.getSplitStatus()==1){
-						if (tChangeTaskOut.getChangeSplitSuper()==null){
+						//有tid的是从订单过来的,没tid是变更新增
+						if (tChangeTaskOut.getTid()!=null){
 							tChangeTaskOut.setList(tChangeTaskMapper.selectBySuper(tChangeTaskOut.getTid(),null,cid));
 						}else {
-							tChangeTaskOut.setList(tChangeTaskMapper.selectBySuper(null,tChangeTaskOut.getChangeSplitSuper(),cid));
+							tChangeTaskOut.setList(tChangeTaskMapper.selectBySuper(null,tChangeTaskOut.getId(),cid));
 						}
 
 
@@ -1200,11 +1201,12 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		tChangeTask.setSplitStatus(1);
 		tChangeTaskMapper.updateByPrimaryKey(tChangeTask);
 		tChangeTask.setId(null);
+		tChangeTask.setSplitStatus(2);
 		tChangeTask.setChangeSplitSuper(id);
 		tChangeTask.setSplitSuper(tChangeTask.getId());
 		tChangeTask.setCommodityQuantity(1);
 		tChangeTask.setTaskComment(taskComment);
-		tChangeTask.setServiceLife(serviceYear);
+		tChangeTask.setServiceYear(serviceYear);
 		tChangeTaskMapper.insertSelective(tChangeTask);
 		return tChangeTask;
 	}

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

@@ -1327,7 +1327,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			orderAmount=tOrderNew.getTotalAmount();
 		}
 
-		List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(t.getOrderNo());
+		List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(t.getOrderNo(),3);
 		List<OutNewOrderDunBo> tOrderDuns = newOrderDunMapper.selectListNewOrderDun(t.getOrderNo(),null);
 		BigDecimal taskAmount=new BigDecimal(0);
 		for (TOrderTaskBo tOrderTaskBo : tOrderTaskBos) {