调整协议条款跳转；订单下单时间支持

src/main/java/com/qs/serve/controller/util/SyKeyLoginUtil.java

@@ -22,6 +22,11 @@ public class SyKeyLoginUtil {
                 ||templateCode.equals(TbsSeeYonConst.CostApplyContractConf.Code())){
             return "my-expense-application-approval-pending-detail?expenseApplicationId="+targetId+"&approvalId="+affairId;
         }
+
+        if(templateCode.equals(TbsSeeYonConst.CheckCostAgreeConf.Code())){
+            return "my-expense-application-agreement-terms-approval-pending-detail?agreementTermsId="+targetId+"&approvalId="+affairId;
+        }
+
 //        if(templateCode.equals(TbsSeeYonConst.CostCheckConf.Code())){
 //            return "my-expense-application-activity-write-off-approval-pending-detail?" +
 //                    "expenseApplicationId=382658" + //费用id

src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java

@@ -58,6 +58,12 @@ public class OmsOrderController {
         PageUtil.startPage();
         LambdaQueryWrapper<OmsOrder> orderWrapper = new LambdaQueryWrapper<>(param);
         orderWrapper.orderByDesc(OmsOrder::getId);
+        if(param.getCheckStartTime()!=null){
+            orderWrapper.ge(OmsOrder::getCheckTime,param.getCheckStartTime().atStartOfDay());
+        }
+        if(param.getCheckEndTime()!=null){
+            orderWrapper.le(OmsOrder::getCheckTime,param.getCheckEndTime().atTime(23,59,59));
+        }
         List<OmsOrder> list = omsOrderService.list(orderWrapper);
         for (OmsOrder order : list) {
             BmsSupplierAddress supplierAddress = bmsSupplierAddressService.getById(order.getSupplierAddrId());

src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java

@@ -1,5 +1,6 @@
 package com.qs.serve.modules.oms.entity;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.List;
@@ -160,5 +161,22 @@ public class OmsOrder implements Serializable {
     /** 订单明细项 */
     @TableField(exist = false)
     private Object brandRuleInfo;
+
+    /**
+     * 确认订单开始时间
+     */
+    @TableField(exist = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private LocalDate checkStartTime;
+
+    /**
+     * 确认订单结束时间
+     */
+    @TableField(exist = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private LocalDate checkEndTime;
+
 }
 

src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java

@@ -133,7 +133,7 @@ public class TbsCostTodoController {
 //            return R.ok();
 //        }
         Integer state = tbsCostTodo.getCheckStatus();
-        if(!state.equals(TbsCommonCheckState.State_1_apply)&&!state.equals(TbsCommonCheckState.State_2_finished)){
+        if(state.equals(TbsCommonCheckState.State_1_apply)||state.equals(TbsCommonCheckState.State_2_finished)){
             return R.error("审批中或已完成的无法编辑");
         }
         boolean result = tbsCostTodoService.updateById(param);

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostTodoOperationServiceImpl.java

@@ -73,6 +73,7 @@ public class TbsCostTodoOperationServiceImpl implements SeeYonOperationService {
         data.put("exsp1", templateCode);
         //添加跳转地址业务
         String baseJumpUrl = JumpToUtil.getJumpUrl(projectProperties.getWebUrl(),templateCode,todoId+"");
+        log.debug("baseJumpUrl=>{}",baseJumpUrl);
         data.put("cmsLink",baseJumpUrl);
         data.put("rowDate", DateUtils.format(LocalDateTime.now(), DateFormatString.DATE_TIME));
         data.put("rowState","03");

src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java

@@ -581,11 +581,23 @@ public class PortalOfCostApplication {
             payLqw.eq(PayPayment::getBillNumber,billNumber);
             long countPay = paymentService.count(payLqw);
             if(countPay>0){Assert.throwEx("发票号已存在，请勿重复提交");}
+
+            LambdaQueryWrapper<TbsCostApply> lqw = new LambdaQueryWrapper<>();
+            lqw.eq(TbsCostApply::getBillNumber,billNumber);
+            long countPay2 = costApplyService.count(lqw);
+            if(countPay2>0){Assert.throwEx("发票号已存在，请勿重复提交");}
+
         }else if (StringUtils.hasText(disNumber)){
             LambdaQueryWrapper<PayPayment> payLqw = new LambdaQueryWrapper<>();
             payLqw.eq(PayPayment::getErpCode,disNumber);
             long countPay = paymentService.count(payLqw);
             if(countPay>0){Assert.throwEx("发货单已存在，请勿重复提交");}
+
+            LambdaQueryWrapper<TbsCostApply> lqw = new LambdaQueryWrapper<>();
+            lqw.eq(TbsCostApply::getDisCode,disNumber);
+            long countPay2 = costApplyService.count(lqw);
+            if(countPay2>0){Assert.throwEx("发货单已存在，请勿重复提交");}
+
         }else {
             Assert.throwEx("发票号或发货单号不能为空");
         }