Browse Source

变更项目修改

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
41a079c561

+ 3 - 1
src/main/java/com/goafanti/common/dao/TChanggeDunMapper.java

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.TChanggeDun;
 import com.goafanti.common.model.TChanggeDunExample;
+import com.goafanti.order.bo.TChanggeDunOut;
+
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
@@ -75,5 +77,5 @@ public interface TChanggeDunMapper {
 
 	void insertSelectiveList(@Param("list")List<TChanggeDun> list);
 
-	List<TChanggeDun> selectByCid(Integer id);
+	List<TChanggeDunOut> selectByCid(Integer id);
 }

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

@@ -460,10 +460,10 @@
     </foreach>
   </insert>
   
-  <select id="selectByCid" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from t_changge_dun
+  <select id="selectByCid" resultType="com.goafanti.order.bo.TChanggeDunOut">
+      select a.id,a.order_no orderNo, a.tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, b.set_up_amount setUpAmount,
+  a.effective_count effectiveCount, a.aid, a.create_time createTime ,b.commodity_name commodityName,a.money,a.status,
+  a.appropriation_ratio appropriationRatio from t_changge_dun a left join t_order_task b on a.tid=b.id 
     where cid= #{id}
   </select>
 </mapper>

+ 21 - 0
src/main/java/com/goafanti/order/bo/TChanggeDunOut.java

@@ -0,0 +1,21 @@
+package com.goafanti.order.bo;
+
+import com.goafanti.common.model.TChanggeDun;
+import com.goafanti.order.enums.NewOrderDunType;
+
+public class TChanggeDunOut extends TChanggeDun{
+	private String dunTypeName;
+	private String commodityName;
+	public String getDunTypeName() {
+		if(super.getDunType()!=null&&super.getProjectType()!=null) {
+			return NewOrderDunType.getValueByCode(Integer.valueOf(""+super.getProjectType()+super.getDunType()));
+		}
+		return dunTypeName;
+	}
+	public String getCommodityName() {
+		return commodityName;
+	}
+	public void setCommodityName(String commodityName) {
+		this.commodityName = commodityName;
+	}
+}

+ 2 - 1
src/main/java/com/goafanti/order/service/OrderChangeService.java

@@ -13,6 +13,7 @@ import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.NewOderCahngeListBo;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.bo.OrderChangeLogBo;
+import com.goafanti.order.bo.TChanggeDunOut;
 import com.goafanti.order.bo.TChanggeTaskOut;
 
 public interface OrderChangeService {
@@ -60,7 +61,7 @@ public interface OrderChangeService {
 
 	List<TChanggeTaskOut> selectChangeTask(Integer cid);
 	
-	List<TChanggeDun> selectChangeDun(Integer cid);
+	List<TChanggeDunOut> selectChangeDun(Integer cid);
 
 
 }

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

@@ -61,6 +61,7 @@ import com.goafanti.order.bo.NewOderCahngeListBo;
 import com.goafanti.order.bo.NewOrderChangeBo;
 import com.goafanti.order.bo.OrderChangeLogBo;
 import com.goafanti.order.bo.OutNewOrderDunBo;
+import com.goafanti.order.bo.TChanggeDunOut;
 import com.goafanti.order.bo.TChanggeTaskOut;
 import com.goafanti.order.bo.TOrderLogBo;
 import com.goafanti.order.bo.TOrderTaskBo;
@@ -667,7 +668,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			}
 
 			@Override
-			public List<TChanggeDun> selectChangeDun(Integer cid) {
+			public List<TChanggeDunOut> selectChangeDun(Integer cid) {
 				return tChanggeDunMapper.selectByCid(cid);
 			}