Browse Source

订单流程列表修改

anderx 1 year ago
parent
commit
ca3cd8f1f0

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

@@ -1047,6 +1047,11 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
       and a.process_status = 1  and a.order_status in (0,1,2)
       and mg.manager_id= #{aid}
     </if>
+    <if test="specially == 11">
+      and a.process_status = 4  and a.approval >0
+      and dep.operation_guarantee_id =#{aid}
+    </if>
+
     <if test="specially == 1">
       and a.process_status = 2  and a.order_status in (0,1,2)
     </if>

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

@@ -327,7 +327,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 
 	/**
 	 * 		订单列表
-	 *  specially 0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询 6客服查询 7统计签单订单 8客户订单列表 9 复审订单 10 营销经理
+	 *  specially 0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询 6客服查询 7统计签单订单 8客户订单列表 9 复审订单 10 营销经理 11运营保障
 	 *  distribution (咨询师管理列表 0 未分配 1部分 2全部
 	 *  amountStatus  0 10万元以下 1 10万~20万 2 20万~30万 3 30万~40万  4 40万以上
 	 * @return

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

@@ -553,7 +553,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		if (new1.getApproval()==ApprovalNewState.TPDSH.getCode()|| new1.getApproval()==ApprovalNewState.TPBH.getCode()) {
 			if (order.getOperationGuaranteeId()!=null){
 				t.setProcessStatus(ProcessStatus.YYBZSH.getCode());
-				str.append(order.getApprovalName()).append(",");
+				str.append(order.getOperationGuaranteeName()).append(",");
 			} else if (order.getApprovalStatus()==0){
 				t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
 				t.setApproval(ApprovalNewState.TPTG.getCode());

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

@@ -1012,7 +1012,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	private Pagination<TOrderNewBo> addParams(InputOrderNewListBo in, Map<String, Object> params) {
 //		specially 0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询 6客服查询 7统计签单订单 8客户订单列表 9 复审订单 10 营销经理
 		if (in.getSpecially()!=null&&(in.getSpecially()==0|| in.getSpecially()==1|| in.getSpecially()==2||
-				in.getSpecially()==4|| in.getSpecially()==5|| in.getSpecially()==7|| in.getSpecially()==10)) {
+				in.getSpecially()==4|| in.getSpecially()==5|| in.getSpecially()==7|| in.getSpecially()==10|| in.getSpecially()==11)) {
 			//0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询
 			if (in.getSpecially()!=3&& in.getSpecially()!=4) {
 				if (in.getAid() ==null){

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

@@ -1,8 +1,8 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 
-static.host=//static.jishutao.com/1.3.17
-#static.host=//172.16.1.187/1.3.17
+#static.host=//static.jishutao.com/1.3.17
+static.host=//172.16.1.187/1.3.17
 
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20240430?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false