Просмотр исходного кода

订单催款自动转法务开发

anderx лет назад: 4
Родитель
Сommit
83260421e8

+ 1 - 1
.idea/free-mybatis-generator-config.xml

@@ -247,8 +247,8 @@
               <option name="overrideJava" value="true" />
               <option name="overrideJava" value="true" />
               <option name="overrideXML" value="true" />
               <option name="overrideXML" value="true" />
               <option name="projectFolder" value="$PROJECT_DIR$" />
               <option name="projectFolder" value="$PROJECT_DIR$" />
-              <option name="useLombokPlugin" value="true" />
               <option name="xmlPackage" value="com.goafanti.common.mapper" />
               <option name="xmlPackage" value="com.goafanti.common.mapper" />
+	<option name="xmlMvnPath" value="src/main/java"/>
             </Config>
             </Config>
           </value>
           </value>
         </entry>
         </entry>

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

@@ -1239,7 +1239,7 @@
 	left join business_project i on a.commodity_id=i.id left join
 	left join business_project i on a.commodity_id=i.id left join
 	business_category c on b.cid=c.id left join admin d on
 	business_category c on b.cid=c.id left join admin d on
 	a.task_receiver=d.id
 	a.task_receiver=d.id
-	where a.super_id is null and a.split_status !=2 and a.order_no= #{orderNo,jdbcType=VARCHAR} order by a.id
+	where a.super_id is null and a.split_status in(0,1) and a.order_no= #{orderNo,jdbcType=VARCHAR} order by a.id
   </select>
   </select>
   
   
   <select id="selectOrderTaskAll" resultType="com.goafanti.order.bo.TOrderTaskBo">
   <select id="selectOrderTaskAll" resultType="com.goafanti.order.bo.TOrderTaskBo">

+ 14 - 1
src/main/java/com/goafanti/order/controller/LegalAffairsApiController.java

@@ -16,6 +16,11 @@ public class LegalAffairsApiController extends CertifyApiController {
     @Autowired
     @Autowired
     private LegalAffairsService legalAffairsService;
     private LegalAffairsService legalAffairsService;
 
 
+    /**
+     * 订单催款转交法务
+     * @param orderNo
+     * @return
+     */
     @RequestMapping(value = "/transfer")
     @RequestMapping(value = "/transfer")
     public Result transferLagalAffairs(String orderNo){
     public Result transferLagalAffairs(String orderNo){
         Result res =new Result();
         Result res =new Result();
@@ -24,16 +29,24 @@ public class LegalAffairsApiController extends CertifyApiController {
             return res;
             return res;
 
 
         }
         }
+        if (legalAffairsService.checkTask(orderNo)){
+            res.getError().add(buildError("高新项目未完成,请先完成项目!","高新项目未完成,请先完成项目!"));
+            return res;
+        }
         res.data(legalAffairsService.pushTransferLagalAffairs(orderNo));
         res.data(legalAffairsService.pushTransferLagalAffairs(orderNo));
         return res;
         return res;
 
 
     }
     }
 
 
+    /**
+     * 订单催款列表(法务)
+     * @param in
+     * @return
+     */
     @RequestMapping(value = "/orderList",method = RequestMethod.GET)
     @RequestMapping(value = "/orderList",method = RequestMethod.GET)
     public Result orderList(InputOrderListBo in){
     public Result orderList(InputOrderListBo in){
         Result res =new Result();
         Result res =new Result();
         res.data(legalAffairsService.orderList(in));
         res.data(legalAffairsService.orderList(in));
         return res;
         return res;
-
     }
     }
 }
 }

+ 2 - 0
src/main/java/com/goafanti/order/service/LegalAffairsService.java

@@ -13,4 +13,6 @@ public interface LegalAffairsService {
     Object orderList(InputOrderListBo in);
     Object orderList(InputOrderListBo in);
 
 
     List<OutOrderLegalAffairsListBo> getLegalAffairsOrder();
     List<OutOrderLegalAffairsListBo> getLegalAffairsOrder();
+
+    boolean checkTask(String orderNo);
 }
 }

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

@@ -2,12 +2,15 @@ package com.goafanti.order.service.impl;
 
 
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.TOrderMidMapper;
 import com.goafanti.common.dao.TOrderMidMapper;
+import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.model.TOrderMid;
 import com.goafanti.common.model.TOrderMid;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.InputOrderListBo;
 import com.goafanti.order.bo.InputOrderListBo;
 import com.goafanti.order.bo.OutOrderLegalAffairsListBo;
 import com.goafanti.order.bo.OutOrderLegalAffairsListBo;
+import com.goafanti.order.bo.TOrderTaskBo;
+import com.goafanti.order.enums.NewProjectStatus;
 import com.goafanti.order.service.LegalAffairsService;
 import com.goafanti.order.service.LegalAffairsService;
 import org.apache.poi.ss.formula.functions.Now;
 import org.apache.poi.ss.formula.functions.Now;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +26,8 @@ import java.util.List;
 public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> implements LegalAffairsService {
 public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> implements LegalAffairsService {
     @Autowired
     @Autowired
     private TOrderMidMapper tOrderMidMapper;
     private TOrderMidMapper tOrderMidMapper;
+    @Autowired
+    private TOrderTaskMapper    tOrderTaskMapper;
 
 
 
 
 
 
@@ -57,4 +62,15 @@ public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> imp
     public List<OutOrderLegalAffairsListBo> getLegalAffairsOrder() {
     public List<OutOrderLegalAffairsListBo> getLegalAffairsOrder() {
         return (List<OutOrderLegalAffairsListBo>) findList("legalAffairsOrderList",new HashMap<>(),1,999999);
         return (List<OutOrderLegalAffairsListBo>) findList("legalAffairsOrderList",new HashMap<>(),1,999999);
     }
     }
+
+    @Override
+    public boolean checkTask(String orderNo) {
+        List<TOrderTaskBo> list =tOrderTaskMapper.selectOrderTask(orderNo);
+        for (TOrderTaskBo bo : list) {
+            if (bo.getType()==5&&bo.getProjectStatus()!= NewProjectStatus.YXZ.getCode()){
+                return true;
+            }
+        }
+        return false;
+    }
 }
 }