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

修改订单搜索客户接口

anderx 1 год назад
Родитель
Сommit
3bcb98312f

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

@@ -1955,7 +1955,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
 
   <select id="selectgetAll" resultType="com.goafanti.common.model.TOrderNew">
     select order_no orderNo,contract_picture_url contractPictureUrl ,agreement_url agreementUrl ,service_content serviceContent
-    from t_order_new where delete_sign in (0,2)
+    from t_order_new where delete_sign in (0,2) and process_status>0
   </select>
   <select id="getProcessName" resultType="com.goafanti.order.bo.OrderProcessName">
     select a.order_no orderNo,a.approval,a.process_status processStatus  ,b.name yxy,mg.name yxjl,

+ 9 - 0
src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java

@@ -438,6 +438,15 @@ public class ExpenseAccountController extends CertifyApiController {
     }
 
     /**
+     * 主类分类说明
+     */
+    @RequestMapping(value = "/pushExpenseTotalAmount",method = RequestMethod.GET)
+    public Result pushExpenseTotalAmount(){
+        expenseAccountService.pushExpenseTotalAmount();
+        return null;
+    }
+
+    /**
      *  获取报销部门设置
      */
     @RequestMapping(value = "/getDepDetails",method = RequestMethod.GET)

+ 2 - 0
src/main/java/com/goafanti/expenseAccount/service/ExpenseAccountService.java

@@ -77,4 +77,6 @@ public interface ExpenseAccountService {
     Object updateDetailsTypeOther(Integer id, String typeOther);
 
     Object mainExpenseExport(Integer id, HttpServletResponse response);
+
+    void pushExpenseTotalAmount();
 }

+ 11 - 0
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -24,6 +24,7 @@ import com.goafanti.expenseAccount.Enums.EATypes;
 import com.goafanti.expenseAccount.Enums.EAsecondaryTypes;
 import com.goafanti.expenseAccount.bo.*;
 import com.goafanti.expenseAccount.service.ExpenseAccountService;
+import com.goafanti.order.service.OrderNewService;
 import com.goafanti.organization.bo.OrganizationListOut;
 import com.itextpdf.text.Document;
 import com.itextpdf.text.DocumentException;
@@ -82,6 +83,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     private ExpenseConfigDetailsMapper expenseConfigDetailsMapper;
     @Autowired
     private TOrderPublicReleaseCountMapper tOrderPublicReleaseCountMapper;
+    @Autowired
+    private OrderNewService orderNewService;
 
 
 
@@ -463,6 +466,14 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         return 1;
     }
 
+    @Override
+    public void pushExpenseTotalAmount() {
+        List<TOrderNew> tOrderNews = orderNewService.selectGetAll();
+        for (TOrderNew e : tOrderNews) {
+            orderNewService.pushOrderPublicReleaseCount(e.getOrderNo());
+        }
+    }
+
     public void pushMainExpenseExport(MainExpenseAccount mainExpenseAccount,HttpServletResponse response, String uploadPath) {
         String title = "报销明细表";
         String attName = String.format("报销明细表_%s.pdf",new Date().getTime());

+ 3 - 1
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -230,5 +230,7 @@ public interface OrderNewService {
 
 	void orderNewListDownload(InputOrderNewListBo in, HttpServletResponse response);
 
-	void pushOrderPublicReleaseCount(String orderNo, Integer prid);
+	void pushOrderPublicReleaseCount(String orderNo);
+
+	List<TOrderNew> selectGetAll();
 }

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

@@ -960,7 +960,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		date.setTime(date.getTime()+500);
 		addOrderChangeLog("变更完成。", 4, nb.getOrderNo(), nb.getId(),date);
 		pushGeneralSendNoticeAndEmail(alist,NoticeStatus.ORDER_CHANGE_END.getCode(), order, TokenManager.getAdminId(),0);
-		orderNewService.pushOrderPublicReleaseCount(nb.getOrderNo(),null);
+		orderNewService.pushOrderPublicReleaseCount(nb.getOrderNo());
 		//修改投标标识
 		tOrderMidMapper.updateBidTypeByOrderNo(nb.getOrderNo());
 		return 1;

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

@@ -644,7 +644,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 		tOrderNewMapper.updateByPrimaryKeySelective(t);
 		//计算公出统计
-		pushOrderPublicReleaseCount(t.getOrderNo(),null);
+		pushOrderPublicReleaseCount(t.getOrderNo());
 		updateAdminUserCountOrder(t2.getSalesmanId(),t2.getCreateTime());
 		if (newOrderFlag){
 			updateAdminUserCountOrder(t2.getSalesmanId(),date);
@@ -654,7 +654,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 
-	public void pushOrderPublicReleaseCount(String orderNo,Integer prId) {
+	public void pushOrderPublicReleaseCount(String orderNo) {
 			List<PublicRelease> list = publicReleaseMapper.selectByOrderNo(orderNo);
 			TOrderNewBo t = tOrderNewMapper.getOrderNewDetail(orderNo);
 			BigDecimal durationCount = BigDecimal.ZERO;
@@ -690,6 +690,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	}
 
+	@Override
+	public List<TOrderNew> selectGetAll() {
+		return tOrderNewMapper.selectgetAll();
+	}
+
 	private void pushMaxDuration(TOrderNewBo t,TOrderPublicReleaseCount out ) {
 		BigDecimal res=BigDecimal.ZERO;
 		//新增如果有会员年份,计算金额改为总金额除以年份