diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/RemindCustomerScheduledService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/RemindCustomerScheduledService.java index f777d843c2..6a6c7cfb9a 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/RemindCustomerScheduledService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/RemindCustomerScheduledService.java @@ -34,6 +34,7 @@ public class RemindCustomerScheduledService { private KafkaTemplate kafkaTemplate; @Scheduled(cron = "0 0 10 * * ?") +// @Scheduled(cron = "0 0/5 15 * * ?") public void remindCustomer() { String today = DateUtils.dateConvertStr(new Date(), "yyyy-MM-dd"); List list = customerTempService.selectRemindCustomerTempList(today); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java index ad00ae56d9..c005f5e7ee 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java @@ -86,7 +86,7 @@ public interface FinKingDeeFeign { @PostMapping("/draftStkTransferDirect") @ResponseBody public ResultBean draftStkTransferDirect(@RequestBody @Valid StkTransferDirect stkTransferDirect) ; - @ApiOperation("暂存直接调拨单的接口") + @ApiOperation("暂存组织机构的接口") @PostMapping("/draftOrgOrganizations") @ResponseBody public ResultBean draftOrgOrganizations(@RequestBody @Valid OrgOrganizations orgOrganizations) ; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bddepartment/BdDepartment.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bddepartment/BdDepartment.java index 85f0f01366..b4a47ec575 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bddepartment/BdDepartment.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/bddepartment/BdDepartment.java @@ -25,12 +25,12 @@ public class BdDepartment { @JsonProperty("FName") @NotBlank(message = "FName不能为空") public String FName; - /* 名称:FGroup (必填项)*/ + /* 部门分组:FGroup (必填项)*/ @JsonProperty("FGroup") - @NotBlank(message = "FGroup不能为空") + // @NotBlank(message = "FGroup不能为空") public String FGroup=""; - /* 名称:FParentID */ + /* 上级id:FParentID */ @JsonProperty("FParentID") - @NotBlank(message = "FParentID不能为空") + // @NotBlank(message = "FParentID不能为空") public String FParentID=""; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml index 461b42b86a..32c6689d85 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml @@ -48,7 +48,7 @@ (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.state = 1 and svp.mainSid = #{mainSid}) AS totalNumber, (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '001' and svp.mainSid = #{mainSid}) AS unHandledNumber, (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '002' and svp.mainSid = #{mainSid}) AS processedNumber, - (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.isDelete = 0 and svp.mainSid = #{mainSid}) AS notHandledNumber, + (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.mainSid = #{mainSid}) AS notHandledNumber, (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.mainSid = #{mainSid}) AS surplusNumber, (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '003' and svp.mainSid = #{mainSid}) AS normalNumber FROM scm_vehicle_patrolinspection svp