anderx 5 years ago
parent
commit
7156e4769d

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

@@ -241,6 +241,9 @@
       <if test="patentType != null">
         patent_type,
       </if>
+      <if test="actualOfficial != null">
+        actual_official,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -300,6 +303,9 @@
       <if test="patentType != null">
         #{patentType,jdbcType=INTEGER},
       </if>
+      <if test="actualOfficial != null">
+        #{actualOfficial,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.TOrderOutsourceExample" resultType="java.lang.Long">
@@ -475,6 +481,9 @@
       <if test="patentType != null">
         patent_type = #{patentType,jdbcType=INTEGER},
       </if>
+      <if test="actualOfficial != null">
+        actual_official = #{actualOfficial,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -509,7 +518,7 @@
      	select id, order_no orderNo, refund_status refundStatus, date_format(create_time,'%Y-%m-%d %H:%i:%S') createTimes , remarks,
 	 date_format(audit_time,'%Y-%m-%d %H:%i:%S') auditTimes,attachment_url attachmentUrl, picture_url pictureUrl, amount,
 	 company_name companyName ,unit_price unitPrice,unit_number unitNumber,outsource_remarks outsourceRemarks,start_type startType,
-	 patent_name patentName,patent_type patentType,patent_name_type patentNameType
+	 patent_name patentName,patent_type patentType,patent_name_type patentNameType,actual_official actualOfficial
 	 from t_order_outsource
 	 where 1=1
 	  <if test="orderNo != null">

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

@@ -1559,7 +1559,7 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
   	</if>
   </select>
   <select id="getOrderTaskDetail" resultType="com.goafanti.order.bo.TOrderTaskDetailBo">
-select  
+ select  
 	a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.task_comment as taskComment,a.project_status as projectStatus,
 	a.task_status as taskStatus,e.contacts,a.attachment_url as attachmentUrl,a.outsource_name outsourceName, f.nickname as userName,a.set_up_amount as setUpAmount,
 	g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,a.retrieve_content as retrieveContent, a.arrival_money as arrivalMoney,
@@ -1568,7 +1568,8 @@ select
 	date_format(a.task_end_time,'%Y-%m-%d') as endDate,date_format(a.accept_time,'%Y-%m-%d') as acceptDate,h.name as depName,e.contact_mobile as contactMobile ,
 	date_format(a.review_time,'%Y-%m-%d') as reviewDate,date_format(a.publicity_time,'%Y-%m-%d') as publicityDate,a.outsource_price outsourcePrice,
 	date_format(a.licence_time,'%Y-%m-%d') as licenceDate,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,e.legal_person as legalPerson,
-	e.legal_person_tel as legalPersonTel, a.split_status splitStatus, a.split_super splitSuper, a.split_id splitId,a.declaration_batch declarationBatch
+	e.legal_person_tel as legalPersonTel, a.split_status splitStatus, a.split_super splitSuper, a.split_id splitId,a.declaration_batch declarationBatch,
+	a.cost_reduction costReduction,  a.official_cost officialCost
 	from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
     left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no
     left join department h on e.order_dep=h.id left join user f on e.buyer_id=f.id

+ 17 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java

@@ -83,6 +83,11 @@ public class TOrderTaskDetailBo {
 	 */
 	private Integer bpType;
 	
+	/** 官费 */
+	private Integer officialCost;
+	/** 费减 */
+	private Integer costReduction;
+	
 	
 	public Integer getSplitStatus() {
 		return splitStatus;
@@ -361,6 +366,18 @@ public class TOrderTaskDetailBo {
 	public void setBpType(Integer bpType) {
 		this.bpType = bpType;
 	}
+	public Integer getOfficialCost() {
+		return officialCost;
+	}
+	public void setOfficialCost(Integer officialCost) {
+		this.officialCost = officialCost;
+	}
+	public Integer getCostReduction() {
+		return costReduction;
+	}
+	public void setCostReduction(Integer costReduction) {
+		this.costReduction = costReduction;
+	}
 	
 	
 }

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

@@ -96,7 +96,6 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.order.bo.InputArrearsDunListBo;
 import com.goafanti.order.bo.OrderDunTaskBo;
-import com.goafanti.order.bo.OrderOutsourceDtails;
 import com.goafanti.order.bo.OrderRefundDetailBo;
 import com.goafanti.order.bo.OutArrearsDunListBo;
 import com.goafanti.order.bo.OutNewOrderDunBo;
@@ -1343,7 +1342,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		BigDecimal tCount=new BigDecimal(0);
 		for (OutThirdPartyCompany op : list) {
 			tCount=tCount.add(new BigDecimal(op.getTotalAmount()));
-			if(op.getOfficialCost()==1 && startType==1 && actualOfficial==1) {
+			if(op.getOfficialCost()==1 && startType==1 && actualOfficial==0) {
 				BigDecimal sum= new BigDecimal(0);
 				if (op.getCostReduction()==0) {
 					sum= new BigDecimal(op.getOfficialUnitPrice()).multiply(new BigDecimal(op.getQuantity()));

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -64,12 +64,12 @@ user_remind_days=15
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com:3000/1.1.57
+#static.host=//sb.jishutao.com:3000/1.1.58
 #avatar.host=//sb.jishutao.com
 
 #连测试
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.57
+static.host=//static.jishutao.com/1.1.58
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload