From 6a86f99eb500b39922363d30b613d538cae73abd Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 16 May 2024 10:05:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8F=8D=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E6=B5=81=E7=A8=8B=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=95=86?= =?UTF-8?q?=E5=93=81=E7=AE=A1=E7=90=86=E5=9B=BE=E7=89=87=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBusrepairBillReverseSettle.java | 2 - .../AsBusrepairBillReverseSettleService.java | 186 ++++++++++-------- .../BaseGoodsSkuExtend.java | 7 +- .../basegoodsspu/BaseGoodsDetailsDto.java | 4 +- .../base/basegoodsspu/BaseGoodsDetailsVo.java | 4 +- .../base/basegoodsspu/BaseGoodsSpuListVo.java | 2 +- .../base/basegoodsspu/BaseGoodsSpuMapper.xml | 4 +- .../basegoodsspu/BaseGoodsSpuService.java | 58 ++++-- .../base/biz/base/basegoodsspu/UrlQuery.java | 13 ++ 9 files changed, 167 insertions(+), 113 deletions(-) create mode 100644 yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/UrlQuery.java diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillreversesettle/AsBusrepairBillReverseSettle.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillreversesettle/AsBusrepairBillReverseSettle.java index dbdf98c1dc..794d5a16cb 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillreversesettle/AsBusrepairBillReverseSettle.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillreversesettle/AsBusrepairBillReverseSettle.java @@ -73,8 +73,6 @@ public class AsBusrepairBillReverseSettle extends BaseEntity { private String useOrgSid; // 使用组织sid @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("组织全路径") - private String orgSidPath; // 组织全路径 @ApiModelProperty("taskId") private String taskId; // taskId @ApiModelProperty("环节定义的sid") diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleService.java index 07c856a324..a2791a5f04 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleService.java @@ -26,17 +26,20 @@ package com.yxt.anrui.as.biz.asbusrepairbillreversesettle; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.as.api.asbusrepairbill.*; +import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNode; import com.yxt.anrui.as.api.asbusrepairbillreversesettle.*; import com.yxt.anrui.as.api.asbusrepairbillreversesettle.flowable.*; import com.yxt.anrui.as.api.enums.AsBillTypeEnum; import com.yxt.anrui.as.api.utils.AsRule; import com.yxt.anrui.as.api.utils.domain.AsBillNo; import com.yxt.anrui.as.biz.asbusrepairbill.AsBusrepairBillService; +import com.yxt.anrui.as.biz.asbusrepairbillnode.AsBusrepairBillNodeService; import com.yxt.anrui.as.feign.flowable.flow.*; import com.yxt.anrui.as.feign.flowable.flow2.FlowDelegateQuery; import com.yxt.anrui.as.feign.flowable.flow2.FlowFeign; @@ -96,7 +99,8 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService createQueryWrapper(AsBusrepairBillReverseSettleQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -108,43 +112,43 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(query.getMenuUrl())) { - PrivilegeQuery privilegeQuery = new PrivilegeQuery(); - privilegeQuery.setOrgPath(query.getOrgPath()); - privilegeQuery.setMenuUrl(query.getMenuUrl()); - privilegeQuery.setUserSid(query.getUserSid()); - ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { - //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - String orgSidPath = query.getOrgPath(); - orgSidPath = orgSidPath + "/"; - int i1 = orgSidPath.indexOf("/"); - int i2 = orgSidPath.indexOf("/", i1 + 1); - int i3 = orgSidPath.indexOf("/", i2 + 1); - int i4 = orgSidPath.indexOf("/", i3 + 1); - String orgLevelKey = defaultIdReltBean.getData(); - if ("1".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i1); - qw.like("s.orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i2); - qw.like("s.orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i3); - qw.like("s.orgSidPath", orgSidPath); - } else if ("4".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i4); - qw.like("s.orgSidPath", orgSidPath); - } else if ("5".equals(orgLevelKey)) { - qw.eq("s.createBySid", query.getUserSid()); - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } else { - PagerVo p = new PagerVo<>(); - return p; - } - qw.orderByDesc("s.createTime"); +// PrivilegeQuery privilegeQuery = new PrivilegeQuery(); +// privilegeQuery.setOrgPath(query.getOrgPath()); +// privilegeQuery.setMenuUrl(query.getMenuUrl()); +// privilegeQuery.setUserSid(query.getUserSid()); +// ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); +// if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { +// //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) +// String orgSidPath = query.getOrgPath(); +// orgSidPath = orgSidPath + "/"; +// int i1 = orgSidPath.indexOf("/"); +// int i2 = orgSidPath.indexOf("/", i1 + 1); +// int i3 = orgSidPath.indexOf("/", i2 + 1); +// int i4 = orgSidPath.indexOf("/", i3 + 1); +// String orgLevelKey = defaultIdReltBean.getData(); +// if ("1".equals(orgLevelKey)) { +// orgSidPath = orgSidPath.substring(0, i1); +// qw.like("s.orgSidPath", orgSidPath); +// } else if ("2".equals(orgLevelKey)) { +// orgSidPath = orgSidPath.substring(0, i2); +// qw.like("s.orgSidPath", orgSidPath); +// } else if ("3".equals(orgLevelKey)) { +// orgSidPath = orgSidPath.substring(0, i3); +// qw.like("s.orgSidPath", orgSidPath); +// } else if ("4".equals(orgLevelKey)) { +// orgSidPath = orgSidPath.substring(0, i4); +// qw.like("s.orgSidPath", orgSidPath); +// } else if ("5".equals(orgLevelKey)) { +// qw.eq("s.createBySid", query.getUserSid()); +// } else { +// PagerVo p = new PagerVo<>(); +// return p; +// } +// } else { +// PagerVo p = new PagerVo<>(); +// return p; +// } +// qw.orderByDesc("s.createTime"); } if (StringUtils.isNotBlank(query.getUseOrgName())) { qw.like("s.useOrgName", query.getUseOrgName()); @@ -175,7 +179,7 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService= date_format('" + closeDateStart + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(closeDateEnd), "date_format (s.closeDate,'%Y-%m-%d') <= date_format('" + closeDateEnd + "','%Y-%m-%d')" + apply(StringUtils.isNotEmpty(closeDateEnd), "date_format (s.closeDate,'%Y-%m-%') <= date_format('" + closeDateEnd + "','%Y-%m-%d')" ); if (StringUtils.isNotBlank(query.getCustomerName())) { qw.like("b.customerName", query.getCustomerName()); @@ -223,8 +227,10 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService 0) { - return rb.setMsg("当前工单已在反结算申请中，请勿重复提交"); - } - } //新增修改保存 String businessSid = saveReverseSettle(dto); - reverseSettleApply = fetchBySid(businessSid); + reverseSettle = fetchBySid(businessSid); //创建BusinessVariables实体对象 BusinessVariables bv = new BusinessVariables(); //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 Map variables = new HashMap<>(); //用户的部门全路径sid - bv.setOrgSidPath(reverseSettleApply.getOrgSidPath()); + SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(reverseSettle.getDeptSid()).getData(); + bv.setOrgSidPath(deptVo.getOrgSidPath()); //业务sid bv.setBusinessSid(businessSid); //用户sid - bv.setUserSid(reverseSettleApply.getCreateBySid()); + bv.setUserSid(reverseSettle.getCreateBySid()); //若app移动端有此功能，则传递appMap参数 Map appMap = new HashMap<>(); appMap.put("sid", businessSid); @@ -500,7 +499,7 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); - if (StringUtils.isBlank(settleApply.getProcDefId())) { + if (StringUtils.isBlank(reverseSettle.getProcDefId())) { flowProcessMapQuery.setProDefKey(bv.getModelId()); } else { - flowProcessMapQuery.setProDefKey(settleApply.getProcDefId()); + flowProcessMapQuery.setProDefKey(reverseSettle.getProcDefId()); } flowProcessMapQuery.setVariables(variables); variables = flowableFeign.getMap(flowProcessMapQuery).getData(); //======================================= bv.setFormVariables(variables); - bv.setOrgSidPath(settleApply.getOrgSidPath()); - if (bv.getTaskId().equals(settleApply.getTaskId())) { + SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(reverseSettle.getDeptSid()).getData(); + bv.setOrgSidPath(deptVo.getOrgSidPath()); + if (bv.getTaskId().equals(reverseSettle.getTaskId())) { ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -580,20 +580,40 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(reverseSettleApply.getCreateBySid())) { + if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(reverseSettle.getCreateBySid())) { messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); } else { - messageFlowableQuery.setMsgContent(reverseSettleApply.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgContent(reverseSettle.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); } messageFlowableQuery.setMsgTitle("工单反结算申请"); messageFeign.pushMessage(messageFlowableQuery); @@ -689,8 +709,8 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java index 9abe320914..a92bafb86c 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsskuextend/BaseGoodsSkuExtend.java @@ -13,7 +13,8 @@ public class BaseGoodsSkuExtend extends BaseEntity { private String goodsSkuSid;//商品Sku代码 private String finalPurchasePrice;//最后采购价 private String safetyStockDays;//安全库存天数 - private String isOriginalFactory;//是否原厂 + private String isOriginalFactory;//是否原厂 1是2否 + private String isOriginalFactoryValue;//是否原厂 private String isInventoryAlert;//是否库存警戒 @TableField(value = "InventoryAlertUpperLimit") private String inventoryAlertUpperLimit;//库存警戒上线 @@ -26,9 +27,11 @@ public class BaseGoodsSkuExtend extends BaseEntity { private String agencyPrice;//代理价 private String discount;//折扣 private String minimumSalesPrice;//最低零售价 - private String isLockingSalesPrice;//是否锁定销售价 + private String isLockingSalesPrice;//是否锁定销售价 1是2否 + private String isLockingSalesPriceValue;//是否锁定销售价 private String isIntegralExchange;//是否可以积分兑换 private String integralAmount;//积分数量 private String sortNo;//排序 private String picUrl;//商品的图片，多个图片以‘,’分割 + } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsDto.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsDto.java index 564fad62d7..ac59d059d1 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsDto.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsDto.java @@ -34,14 +34,16 @@ public class BaseGoodsDetailsDto implements Dto { private String manufacturerSid;//厂家sid private String manufacturerName;//厂家名称 private String isOriginalFactory;//是否原厂 1 是 2否 + private String isOriginalFactoryValue;//是否原厂 1 是 2否 private String sortNo;//排序 private String skuRemarks;//备注 private String inventoryAlertUpperLimit;//库存上限 private String inventoryAlertLowerLimit;//库存下限 private String isLockingSalesPrice;//是否锁定销售价 1 是 2否 + private String isLockingSalesPriceValue;//是否锁定销售价 1 是 2否 private String minimumSalesPrice;//销售底价 private String standardPurchasePrice;//三包价格 private String agencyPrice;//首保价格 - private List picPath = new ArrayList<>();//商品图片 + private List picPath = new ArrayList<>();//商品图片 } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsVo.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsVo.java index 6195b0fa02..8e9f5a9603 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsVo.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsVo.java @@ -33,14 +33,16 @@ public class BaseGoodsDetailsVo implements Vo { private String manufacturerSid;//厂家sid private String manufacturerName;//厂家名称 private String isOriginalFactory;//是否原厂 1 是 2否 + private String isOriginalFactoryValue;//是否原厂 1 是 2否 private String sortNo;//排序 private String skuRemarks;//备注 private String inventoryAlertUpperLimit;//库存上限 private String inventoryAlertLowerLimit;//库存下限 private String isLockingSalesPrice;//是否锁定销售价 1 是 2否 + private String isLockingSalesPriceValue;//是否锁定销售价 1 是 2否 private String minimumSalesPrice;//销售底价 private String standardPurchasePrice;//三包价格 private String agencyPrice;//首保价格 - private List picPath = new ArrayList<>();//商品图片 + private List picPath = new ArrayList<>();//商品图片 } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListVo.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListVo.java index 936904e7b0..a6f5962a63 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListVo.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuListVo.java @@ -33,7 +33,7 @@ public class BaseGoodsSpuListVo implements Vo { private String standardPurchasePrice;//三包价格 private String agencyPrice;//首保价格 private String picUrl; - private List picPath = new ArrayList<>();//商品图片 + private List picPath = new ArrayList<>();//商品图片 } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml index 32235f8135..b2cf261859 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml @@ -50,10 +50,10 @@ WHERE p.shelfLife, b.brandName, m.manufacturerName, - ke.isOriginalFactory, + ke.isOriginalFactoryValue, ke.InventoryAlertUpperLimit, ke.InventoryAlertLowerLimit, - ke.isLockingSalesPrice, + ke.isLockingSalesPriceValue, ke.minimumSalesPrice, ke.standardPurchasePrice, ke.agencyPrice, diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java index df8ef16a5f..37fd7a665a 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java @@ -227,11 +227,13 @@ public class BaseGoodsSpuService extends MybatisBaseService files = new ArrayList<>(); + List files = new ArrayList<>(); String picUrl = record.getPicUrl(); String[] split = picUrl.split(","); for (String s : split) { - files.add(urlPrefix + s); + UrlQuery urlQuery = new UrlQuery(); + urlQuery.setUrl(urlPrefix + s); + files.add(urlQuery); } record.setPicPath(files); } @@ -279,13 +281,16 @@ public class BaseGoodsSpuService extends MybatisBaseService picPath = dto.getPicPath(); + List picPath = dto.getPicPath(); if (!picPath.isEmpty()) { StringBuilder sb = new StringBuilder(); String urlPrefix = fileUploadComponent.getUrlPrefix(); - for (String filePath : picPath) { - String path = filePath.substring(urlPrefix.length()); - sb.append(path).append(","); + for (UrlQuery urlQuery : picPath) { + if (StringUtils.isNotBlank(urlQuery.getUrl())) { + String filePath = urlQuery.getUrl(); + String path = filePath.substring(urlPrefix.length()); + sb.append(path).append(","); + } } sb.delete(sb.length() - 1, sb.length()); skuExtendUpdate.setPicUrl(sb.toString()); @@ -298,16 +303,19 @@ public class BaseGoodsSpuService extends MybatisBaseService picPath = dto.getPicPath(); + List picPath = dto.getPicPath(); if (!picPath.isEmpty()) { StringBuilder sb = new StringBuilder(); String urlPrefix = fileUploadComponent.getUrlPrefix(); - for (String filePath : picPath) { - String path = filePath.substring(urlPrefix.length()); - sb.append(path).append(","); + for (UrlQuery urlQuery : picPath) { + if (StringUtils.isNotBlank(urlQuery.getUrl())) { + String filePath = urlQuery.getUrl(); + String path = filePath.substring(urlPrefix.length()); + sb.append(path).append(","); + } } sb.delete(sb.length() - 1, sb.length()); - skuExtend.setPicUrl(sb.toString()); + skuExtendUpdate.setPicUrl(sb.toString()); } baseGoodsSkuExtendService.insert(skuExtend); } @@ -332,13 +340,16 @@ public class BaseGoodsSpuService extends MybatisBaseService picPath = dto.getPicPath(); + List picPath = dto.getPicPath(); if (!picPath.isEmpty()) { StringBuilder sb = new StringBuilder(); String urlPrefix = fileUploadComponent.getUrlPrefix(); - for (String filePath : picPath) { - String path = filePath.substring(urlPrefix.length()); - sb.append(path).append(","); + for (UrlQuery urlQuery : picPath) { + if (StringUtils.isNotBlank(urlQuery.getUrl())) { + String filePath = urlQuery.getUrl(); + String path = filePath.substring(urlPrefix.length()); + sb.append(path).append(","); + } } sb.delete(sb.length() - 1, sb.length()); skuExtend.setPicUrl(sb.toString()); @@ -404,13 +415,16 @@ public class BaseGoodsSpuService extends MybatisBaseService picPath = dto.getPicPath(); + List picPath = dto.getPicPath(); if (!picPath.isEmpty()) { StringBuilder sb = new StringBuilder(); String urlPrefix = fileUploadComponent.getUrlPrefix(); - for (String filePath : picPath) { - String path = filePath.substring(urlPrefix.length()); - sb.append(path).append(","); + for (UrlQuery urlQuery : picPath) { + if (StringUtils.isNotBlank(urlQuery.getUrl())) { + String filePath = urlQuery.getUrl(); + String path = filePath.substring(urlPrefix.length()); + sb.append(path).append(","); + } } sb.delete(sb.length() - 1, sb.length()); skuExtend.setPicUrl(sb.toString()); @@ -464,11 +478,13 @@ public class BaseGoodsSpuService extends MybatisBaseService files = new ArrayList<>(); + List files = new ArrayList<>(); String picUrl = skuExtend.getPicUrl(); String[] split = picUrl.split(","); for (String s : split) { - files.add(urlPrefix + s); + UrlQuery urlQuery = new UrlQuery(); + urlQuery.setUrl(urlPrefix + s); + files.add(urlQuery); } vo.setPicPath(files); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/UrlQuery.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/UrlQuery.java new file mode 100644 index 0000000000..f961ae697b --- /dev/null +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/UrlQuery.java @@ -0,0 +1,13 @@ +package com.yxt.base.biz.base.basegoodsspu; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/5/16 10:00 + */ +@Data +public class UrlQuery { + private String url; +} From 462764bbdc325ecb8e2506639e08dad13e936909 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 16 May 2024 10:09:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=8F=8D=E7=BB=93=E7=AE=97=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/operation/workslrsettlement.js | 14 +++---- .../workslrsettlement/workslrsettlement.vue | 38 +++++++++++++++++++ 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/yxt-as-ui/src/api/operation/workslrsettlement.js b/yxt-as-ui/src/api/operation/workslrsettlement.js index faf29470b0..c620422959 100644 --- a/yxt-as-ui/src/api/operation/workslrsettlement.js +++ b/yxt-as-ui/src/api/operation/workslrsettlement.js @@ -51,7 +51,7 @@ export default { // 流程审批（同意） complete: function(params) { return request({ - url: '/pms/v1/asbusrepairbillreversesettle/complete', + url: '/as/v1/asbusrepairbillreversesettle/complete', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } @@ -60,7 +60,7 @@ export default { // 流程审批（加签） delegate: function(params) { return request({ - url: '/pms/v1/asbusrepairbillreversesettle/delegate', + url: '/as/v1/asbusrepairbillreversesettle/delegate', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } @@ -69,7 +69,7 @@ export default { // 流程审批（驳回） reject: function(params) { return request({ - url: '/pms/v1/asbusrepairbillreversesettle/reject', + url: '/as/v1/asbusrepairbillreversesettle/reject', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } @@ -78,7 +78,7 @@ export default { // 流程审批（终止） breakProcess: function(params) { return request({ - url: '/pms/v1/asbusrepairbillreversesettle/breakProcess', + url: '/as/v1/asbusrepairbillreversesettle/breakProcess', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } @@ -87,7 +87,7 @@ export default { // 流程审批（撤回） revokeProcess: function(params) { return request({ - url: '/pms/v1/asbusrepairbillreversesettle/revokeProcess', + url: '/as/v1/asbusrepairbillreversesettle/revokeProcess', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } @@ -96,7 +96,7 @@ export default { // 审批流程（同意）获取下一环节 getNextNodesForSubmit: function(data) { return request({ - url: '/pms/v1/asbusrepairbillreversesettle/getNextNodesForSubmit', + url: '/as/v1/asbusrepairbillreversesettle/getNextNodesForSubmit', method: 'get', params: data }) @@ -104,7 +104,7 @@ export default { // 审批流程（驳回）获取上一环节 getPreviousNodesForReject: function(data) { return request({ - url: '/pms/v1/asbusrepairbillreversesettle/getPreviousNodesForReject', + url: '/as/v1/asbusrepairbillreversesettle/getPreviousNodesForReject', method: 'get', params: data }) diff --git a/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlement.vue b/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlement.vue index 498714af7a..ae21b9d407 100644 --- a/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlement.vue +++ b/yxt-as-ui/src/views/operation/workslrsettlement/workslrsettlement.vue @@ -109,6 +109,10 @@ + + + + @@ -120,6 +124,7 @@ import req from '@/api/operation/workslrsettlement' import workslrsettlementAdd from './workslrsettlementAdd' import workslrsettlementInfo from './workslrsettlementInfo' import { typeValues } from '@/api/Common/dictcommons' +import { getStorage } from '@/utils/auth' export default { name: 'WorkSLRSettlement', @@ -132,6 +137,9 @@ export default { }, data() { return { + url: '', + dialogHeight: '80%', + centerDialogVisible: false, btndisabled: false, btnList: [ { @@ -191,6 +199,8 @@ export default { this.getList() }, mounted() { + // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage + window.addEventListener('message', this.handleMessage) this.$refs['btnbar'].setButtonList(this.btnList) }, methods: { @@ -201,6 +211,34 @@ export default { } }) }, + async handleMessage(event) { + var code = '' + if (event.data.params !== null && event.data.params !== undefined) { + code = event.data.params.code + } + if (code === 1) { + this.centerDialogVisible = false + } else if (code === 2) { + this.dialogHeight = event.data.params.data + this.setIframeHeight(document.getElementById('iframe')) + } + }, + closeIt() { + this.url = '' + this.centerDialogVisible = false + }, + setIframeHeight(iframe) { + iframe.height = this.dialogHeight + }, + flowRecord(row) { + this.centerDialogVisible = true + var params = { + deployId: row.procDefId, + procInsId: row.procInstId, + token: getStorage() + } + this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) + }, // 搜索条件效果 clicksearchShow() { this.isSearchShow = !this.isSearchShow From b559880f6df758c209bb9a035af7e0c75b1cb76d Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 16 May 2024 12:01:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=BF=98=E6=AC=BE=E6=83=85=E5=86=B5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanRepaymentHistoryService.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java index ad061d73da..62824948da 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java @@ -120,6 +120,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService saveHistory(LoanRepaymentHistoryDto dto) { ResultBean rb = ResultBean.fireFail(); LoanRepaymentHistory entity = new LoanRepaymentHistory(); @@ -1735,7 +1736,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService(); } } else { - return new ArrayList<>(); + return new ArrayList<>(); } //======================= if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())) { @@ -1748,7 +1749,13 @@ public class LoanRepaymentHistoryService extends MybatisBaseService