anderx преди 1 година
родител
ревизия
c3cfd050cb

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

@@ -793,13 +793,14 @@
         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
+        a.other,a.examine_name examineName,c.stop_project stopProject,toa.type,toa.type_explain typeExpalin
         <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>
         <if test="specially == 4">
             ,e.receiver_name as consultantName,a.settlement_amount as settlementAmount,if(isnull(g.order_no)=0,1,0) ischange
         </if>
+
         from t_order_new a  left join `user` b on a.buyer_id=b.id left join t_order_mid c on a.order_no=c.order_no
         left join department dep on a.order_dep=dep.id
         <if test="specially == 2">
@@ -817,6 +818,15 @@
         <if test="specially == 10">
             left join admin mg on a.salesman_id=mg.id
         </if>
+        inner join (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
+        from t_order_approval
+        <if test="type !=null">
+            where `type` in
+            <foreach collection="type" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        group by order_no) toa on a.order_no=toa.order_no
         where a.delete_sign in(0,2)
         <include refid="selectOrderNewSql"/>
         order by
@@ -1006,6 +1016,15 @@
         <if test="specially == 10">
             left join admin mg on a.salesman_id=mg.id
         </if>
+        inner join (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
+        from t_order_approval
+        <if test="type !=null">
+            where `type` in
+            <foreach collection="type" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        group by order_no) toa on a.order_no=toa.order_no
         where a.delete_sign in(0,2)
         <include refid="selectOrderNewSql"/>
 

+ 5 - 5
src/main/java/com/goafanti/order/bo/InputOrderNewListBo.java

@@ -21,19 +21,19 @@ public class InputOrderNewListBo {
     private String contractStart;
     private String contractEnd;
     private String uid;
-    private String approvalType;
+    private String type;
     private Integer projectType;
     private Integer processStatus;
     private Integer tag;
     private  Integer pageNo;
     private Integer pageSize;
 
-    public String getApprovalType() {
-        return approvalType;
+    public String getType() {
+        return type;
     }
 
-    public void setApprovalType(String approvalType) {
-        this.approvalType = approvalType;
+    public void setType(String type) {
+        this.type = type;
     }
 
     public Integer getTag() {

+ 20 - 0
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -97,6 +97,26 @@ public class TOrderNewBo extends TOrderNew{
 	private String operationGuaranteeId;
 	private String operationGuaranteeName;
 
+	private String typeExpalin;
+
+	private String type;
+
+	public String getTypeExpalin() {
+		return typeExpalin;
+	}
+
+	public void setTypeExpalin(String typeExpalin) {
+		this.typeExpalin = typeExpalin;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
 	public String getOperationGuaranteeId() {
 		return operationGuaranteeId;
 	}

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

@@ -1220,8 +1220,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if(null != in.getTag()){
 			params.put("tag",in.getTag());
 		}
-		if(in.getApprovalType()!=null){
-			params.put("approvalType",in.getApprovalType());
+		if(in.getType()!=null){
+			if (!in.getType().equals("0,1,2,3,4,5,6,7")){
+				String[] split = in.getType().split(",");
+				params.put("type", split);
+			}
 		}
 		params.put("outsource", in.getOutsource());
 		return null;