Quellcode durchsuchen

修改订单特批类型处理

anderx vor 1 Jahr
Ursprung
Commit
6a6b7b1db8

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

@@ -81,7 +81,7 @@
         where  order_no= #{orderNo}
     </delete>
 
-    <select id="selectByOrderNo" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    <select id="selectByOrderNo"  resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
         from t_order_approval

+ 5 - 6
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -790,10 +790,10 @@
     <select id="selectOrderNewListByPage" resultType="com.goafanti.order.bo.TOrderNewBo">
         select a.order_no as orderNo,a.create_time as createTime, date_format(a.sign_time,'%Y-%m-%d' ) as signDate,a.delete_sign deleteSign,
         a.contract_no as contractNo, b.nickname as userName ,a.process_status as processStatus,a.total_amount as totalAmount,a.tag,
-        a.contract_picture_url contractPictureUrl,a.approval_type as approvalType,a.approval_type_explain as approvalTypeExplain,
-        a.order_status as orderStatus, a.liquidation_status as liquidationStatus,a.approval,c.salesman_name as salesmanName,c.project_type projectType,
-        dep.name as depName,c.finance_name as financeName,c.invoice_amount invoiceAmount,a.settlement_amount settlementAmount,
-        a.sales_type salesType, a.channel_id channelId ,a.other,a.examine_name examineName,c.stop_project stopProject
+        a.contract_picture_url contractPictureUrl, a.order_status as orderStatus, a.liquidation_status as liquidationStatus,
+        a.approval,c.salesman_name as salesmanName,c.project_type projectType,dep.name as depName,c.finance_name as financeName,
+        c.invoice_amount invoiceAmount,a.settlement_amount settlementAmount,a.sales_type salesType, a.channel_id channelId ,
+        a.other,a.examine_name examineName,c.stop_project stopProject
         <if test="specially == 2">
             ,f.name as initiateName ,e.reason ,date_format(e.create_time,'%Y-%m-%d' ) as backDate,e.id as backId
         </if>
@@ -1171,8 +1171,7 @@
             a.order_remarks as orderRemarks, a.delete_sign as deleteSign, a.salesman_id as salesmanId, a.finance_id as financeId, technician_id as technicianId,
             a.sign_time as signTime, a.settlement_time as settlementTime, a.contract_no as contractNo, a.contract_type as contractType, a.contacts,a.channel_id channelId,
             a.contact_mobile as contactMobile, a.legal_person as legalPerson, a.legal_person_tel as legalPersonTel, a.proof_count as proofCount,a.patent_status patentStatus,
-            a.proof_aid as proofAid,contract_picture_url as contractPictureUrl, c.name as salesmanName,dep.name as depName,d.name as financeName,a.approval_type as approvalType,
-            a.approval_type_explain as approvalTypeExplain,
+            a.proof_aid as proofAid,contract_picture_url as contractPictureUrl, c.name as salesmanName,dep.name as depName,d.name as financeName,
             c.contact_mobile as salesmanMobile,d.contact_mobile as financeMobile,b.username as userName ,b.nickname as nickname ,e.back_status as backStatus,f.name as initiateName,
             e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate,a.buyer_id as uid,a.order_dep as orderDep, g.location_province as locationProvince,
             g.location_city as locationCity,g.location_area locationArea,g.postal_address postalAddress,outsource,a.primary_order primaryOrder,a.agreement_url agreementUrl,

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

@@ -691,7 +691,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 						flag=true;
 					}
 				}
-				if (flag){
+				if (!flag){
 					TOrderApproval newTOA=new TOrderApproval();
 					newTOA.setType(Integer.valueOf(s));
 					newTOA.setOrderNo(t.getOrderNo());