Browse Source

法务列表修改

anderx 4 years ago
parent
commit
2da22bfec3

+ 12 - 0
src/main/java/com/goafanti/common/mapper/TOrderMidMapper.xml

@@ -402,6 +402,9 @@
       ,b.operation_time operationTime,date_format(b.operation_time,'%Y-%m-%d')operationDate,b.legal_affairs_type `type`
     </if>
     from t_order_new a left join t_order_mid b on a.order_no =b.order_no
+    <if test="type==3">
+      left join t_order_legal_affairs d on a.order_no=d.order_no
+    </if>
     <if test="shiro == 2">
       left join admin c on a.salesman_id =c.id
     </if>
@@ -411,6 +414,9 @@
     <if test="type==0">
       where b.order_receivables >0
     </if>
+    <if test="status != null">
+      and d.status = #{status}
+    </if>
     <if test="shiro==1">
       and a.order_type in
       <foreach close=")" collection="deps" item="dep" open="(" separator=",">
@@ -453,6 +459,9 @@
   <select id="legalAffairsOrderCount" resultType="integer">
     select count(*)
     from t_order_new a left join t_order_mid b on a.order_no =b.order_no
+    <if test="type==3">
+      left join t_order_legal_affairs d on a.order_no=d.order_no
+    </if>
     <if test="shiro == 2">
       left join admin c on a.salesman_id =c.id
     </if>
@@ -462,6 +471,9 @@
     <if test="type==0">
       where b.order_receivables >0
     </if>
+    <if test="status != null">
+      and d.status = #{status}
+    </if>
     <if test="shiro==1">
       and a.order_type in
       <foreach close=")" collection="deps" item="dep" open="(" separator=",">

+ 0 - 6
src/main/java/com/goafanti/order/controller/LegalAffairsApiController.java

@@ -41,7 +41,6 @@ public class LegalAffairsApiController extends CertifyApiController {
         if (orderNo==null){
             res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"订单编号"));
             return res;
-
         }
         if (legalAffairsService.checkTask(orderNo)){
             res.getError().add(buildError("高新项目未完成,请先完成项目!","高新项目未完成,请先完成项目!"));
@@ -135,9 +134,4 @@ public class LegalAffairsApiController extends CertifyApiController {
         res.data(legalAffairsService.lagalAffairsLogList(orderNo));
         return res;
     }
-
-
-
-
-
 }

+ 6 - 0
src/main/java/com/goafanti/order/service/impl/LegalAffairsServiceImpl.java

@@ -209,6 +209,12 @@ public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> imp
             if (in.getType()==1||in.getType()==2||in.getType()==3)sb=sb.append("法务时间:");
             sb=sb.append(in.getStartTime()).append("~").append(in.getEndTime()).append(",");
         }
+        if(in.getStatus()!=null){
+            sb=sb.append("完成状态:");
+            if (in.getStatus()==1)sb=sb.append("已回款").append(",");
+            else if (in.getStatus()==2)sb=sb.append("已诉讼").append(",");
+            else if (in.getStatus()==3)sb=sb.append("已坏账处理").append(",");
+        }
         return newExcelUtil.exportExcel(list,tile,uploadPath,sb.substring(0,sb.length()-1));
     }
 }