From 749dcdea3a4e67d82890e5cbc958094e14fe457d Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 11 Apr 2024 16:21:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=94=B3=E8=AF=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/scmapplyinbound/ScmApplyInboundQuery.java    |  6 ++++++
 .../biz/scmapplyinbound/ScmApplyInboundService.java  | 12 ++++++++++--
 .../as/biz/asservicetype/AsServiceTypeService.java   |  1 +
 .../anrui/as/feign/flowable/flow/ProcDefEnum.java    |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java
index 325de7b3e8..ca76f0dbf0 100644
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundQuery.java
@@ -30,6 +30,12 @@ public class ScmApplyInboundQuery implements Query {
     private String modelName;
     @ApiModelProperty("排产申请编号")
     private String pcApplicationCode;
+    @ApiModelProperty("申请开始时间")
+    private String createStartTime; // 申请开始时间
+    @ApiModelProperty("申请结束时间")
+    private String createEndTime; // 申请结束时间
+    @ApiModelProperty("流程状态")
+    private String nodeState;
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
 }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
index e992497e56..bbf38ee333 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
@@ -155,6 +155,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<ScmApplyInbound> qw = new QueryWrapper<>();
+        qw.eq("sai.useOrgSid", query.getCreateOrgSid());
         if (StringUtils.isNotBlank(query.getPurchaseOrderNo())) {
             qw.like("sai.purchaseOrderNo", query.getPurchaseOrderNo());
         }
@@ -164,7 +165,14 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         if (StringUtils.isNotBlank(query.getPcApplicationCode())) {
             qw.like("sai.pcApplicationCode", query.getPcApplicationCode());
         }
-        qw.eq("sai.useOrgSid", query.getCreateOrgSid());
+        if (StringUtils.isNotBlank(query.getNodeState())) {
+            qw.like("sai.nodeState", query.getNodeState());
+        }
+        String createStartTime = query.getCreateStartTime();
+        String createEndTime = query.getCreateEndTime();
+        qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (sai.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(createEndTime), "date_format (sai.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+                );
         return qw;
     }
 
@@ -1042,7 +1050,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 }
                 //判断相同车架号在整个集团中是否存在非退库的
                 Integer count = baseVehicleFeign.selectVinNo(scmApplyInboundVehicleDto.getVinNo().substring(scmApplyInboundVehicleDto.getVinNo().length() - 8)).getData();
-                if (count > 0){
+                if (count > 0) {
                     return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo() + "在集团中存在未退库的车辆，无法入库");
                 }
             }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java
index bf2bd98c86..cf89252fa1 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicetype/AsServiceTypeService.java
@@ -86,6 +86,7 @@ public class AsServiceTypeService extends MybatisBaseService<AsServiceTypeMapper
             String orgPath = dto.getOrgPath();
             String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
+            dto.setUseOrgSid(createOrgSid);
             dto.setCreateOrgSid(createOrgSid);
             dto.setCreateOrgName(sysOrganizationVo.getName());
             this.insertByDto(dto);
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java
index c6b227d139..dbe7d6aef4 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java
@@ -82,7 +82,7 @@ public enum ProcDefEnum {
     LOANCASECLOSEAPPLY("案件结案申请", "process_llaxpwkd:1:8220008"),
     LOANLAWSUITAPPLY("诉讼申请", "process_xc4lp97d:1:8380004"),
     LOANCASEENTRUSTLAWYERAPPLY("案件委托律师", "process_oe3nvzgn:1:8525004"),
-    ASARREARSOUTAPPLY("欠款出厂申请", ""),
+    ASARREARSOUTAPPLY("欠款出厂申请", "process_u14c671d:1:10442504"),
 
     /******************************测试流程id*********************************************/