From 43bd2379c59acfdc211357be785c03ea69192307 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 28 May 2024 09:20:30 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml | 4 ++-- .../yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java | 6 +++--- .../com/yxt/base/biz/base/basegoodssku/GoodsSkuQuery.java | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml index e49e783453..95fccc0688 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml @@ -63,7 +63,7 @@ - \ No newline at end of file + diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java index 73378c2221..a11d268b14 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java @@ -222,12 +222,12 @@ public class BaseGoodsSkuService extends MybatisBaseService qw = new QueryWrapper<>(); if (query != null) { - if (StringUtils.isNotBlank(query.getOrgSid())) { - qw.eq("spu.createOrgSid", query.getOrgSid()); + if (StringUtils.isNotBlank(query.getUseOrgSid())) { + qw.eq("spu.useOrgSid", query.getUseOrgSid()); } //商品名称 if (StringUtils.isNotBlank(query.getGoodsSpuName())) { - qw.like("spu.goodsName", query.getGoodsSpuName()); + qw.like("sku.title", query.getGoodsSpuName()); } //商品编码 if (StringUtils.isNotBlank(query.getGoodsSkuCode())) { diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuQuery.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuQuery.java index b21b7acd4d..018c1f3e30 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuQuery.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsSkuQuery.java @@ -21,5 +21,6 @@ public class GoodsSkuQuery implements Query { private String goodsSkuCode; @ApiModelProperty("厂家名称") private String manufacturerName; - + @ApiModelProperty("部门sid") + private String useOrgSid; } From 3c3399f90d6ed5d078348280ddca31dc8a0216ec Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 28 May 2024 10:00:50 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/views/basicinformation/supplier/supplier.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yxt-as-ui/src/views/basicinformation/supplier/supplier.vue b/yxt-as-ui/src/views/basicinformation/supplier/supplier.vue index 6050193e74..805f4cf2e7 100644 --- a/yxt-as-ui/src/views/basicinformation/supplier/supplier.vue +++ b/yxt-as-ui/src/views/basicinformation/supplier/supplier.vue @@ -46,8 +46,8 @@ 查看 - - + + From 838fc1e63cc75cd0cc5169516ed1c16881abf8b2 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 28 May 2024 10:05:00 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8F=AD=E7=BB=84?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asservicegroup/AsServiceGroupMapper.xml | 2 +- .../asservicegroup/AsServiceGroupRest.java | 4 +- .../asservicegroup/AsServiceGroupService.java | 261 +++++++++--------- 3 files changed, 131 insertions(+), 136 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml index bf5c0cf0ed..513a986336 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml @@ -13,7 +13,7 @@ select sid as groupSid, groupName from as_service_group - where createOrgSid = #{useOrgSid} + where useOrgSid = #{useOrgSid} and isDelete = '0' diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java index 754400fc44..6adc771e5c 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java @@ -67,9 +67,9 @@ public class AsServiceGroupRest { @ApiOperation("查询分公司班组信息") @PostMapping("/getGroupList") - public ResultBean> getGroupList(@RequestParam("orgPath") String orgPath) { + public ResultBean> getGroupList(@RequestParam("useOrgSid") String useOrgSid) { ResultBean rb = ResultBean.fireFail(); - List list = asServiceGroupService.getGroupList(orgPath); + List list = asServiceGroupService.getGroupList(useOrgSid); return rb.success().setData(list); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java index 42ed7a6032..5ff044d502 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java @@ -65,150 +65,145 @@ import java.util.List; @Service public class AsServiceGroupService extends MybatisBaseService { - @Autowired - private SysStaffOrgFeign sysStaffOrgFeign; - @Autowired - private SysOrganizationFeign sysOrganizationFeign; - @Autowired - private SysUserFeign sysUserFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private SysUserFeign sysUserFeign; - public PagerVo listPageVo(PagerQuery pq) { - AsServiceGroupQuery query = pq.getParams(); - QueryWrapper 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("asg.createBySid", query.getUserSid()); - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } - if (StringUtils.isNotBlank(query.getGroupName())){ - qw.like("asg.groupName",query.getGroupName()); - } - qw.orderByAsc("asg.sortNo"); - qw.eq("asg.isDelete",0); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } + public PagerVo listPageVo(PagerQuery pq) { + AsServiceGroupQuery query = pq.getParams(); + QueryWrapper 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("asg.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getGroupName())) { + qw.like("asg.groupName", query.getGroupName()); + } + qw.orderByAsc("asg.sortNo"); + qw.eq("asg.isDelete", 0); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } - public ResultBean saveOrUpdateDto(AsServiceGroupDto dto){ - ResultBean rb = ResultBean.fireFail(); + public ResultBean saveOrUpdateDto(AsServiceGroupDto dto) { + ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { - String deptName = ""; - String deptSid = ""; - String createOrgSid = ""; - String orgPath = dto.getOrgPath(); - if (StringUtils.isNotBlank(orgPath)) { - List split = Arrays.asList(orgPath.split("/")); - if (split.size() > 1) { - //获取本级sid获取本级部门信息 - SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); - SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); - deptName = sysOrganization.getName() + "/" + sysOrganization1.getName(); - deptName = sysOrganization1.getName(); - deptSid = sysOrganization1.getSid(); - } else { - SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); - deptName = sysOrganization.getName(); - deptName = sysOrganization.getName(); - deptSid = sysOrganization.getSid(); - } - dto.setUseOrgSid(deptSid); - dto.setUseOrgName(deptName); - createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); - //创建组织使用组织 - ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); - if (organizationResultBean.getData() != null) { - dto.setCreateOrgSid(createOrgSid); - dto.setCreateOrgName(organizationResultBean.getData().getName()); - } - } - int i = baseMapper.checkByCodeAndUseOrgSid(dto.getGroupName(), dto.getUseOrgSid()); - if (i > 0){ - return rb.setMsg("编码已存在"); - } - this.insertByDto(dto); - return rb.success(); + String deptName = ""; + String deptSid = ""; + String createOrgSid = ""; + String orgPath = dto.getOrgPath(); + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + deptName = sysOrganization.getName() + "/" + sysOrganization1.getName(); + deptName = sysOrganization1.getName(); + deptSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + deptName = sysOrganization.getName(); + deptName = sysOrganization.getName(); + deptSid = sysOrganization.getSid(); + } + dto.setUseOrgSid(deptSid); + dto.setUseOrgName(deptName); + createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + //创建组织使用组织 + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); + if (organizationResultBean.getData() != null) { + dto.setCreateOrgSid(createOrgSid); + dto.setCreateOrgName(organizationResultBean.getData().getName()); + } + } + int i = baseMapper.checkByCodeAndUseOrgSid(dto.getGroupName(), dto.getUseOrgSid()); + if (i > 0) { + return rb.setMsg("编码已存在"); + } + this.insertByDto(dto); + return rb.success(); + } + int i = baseMapper.checkSidByCodeAndUseOrgSid(dto.getGroupName(), dto.getUseOrgSid(), dtoSid); + if (i > 0) { + return rb.setMsg("编码已存在"); } - int i = baseMapper.checkSidByCodeAndUseOrgSid(dto.getGroupName(), dto.getUseOrgSid(),dtoSid); - if (i > 0){ - return rb.setMsg("编码已存在"); - } - this.updateByDto(dto); - return rb.success(); - } + this.updateByDto(dto); + return rb.success(); + } - public void insertByDto(AsServiceGroupDto dto){ - AsServiceGroup entity = new AsServiceGroup(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } + public void insertByDto(AsServiceGroupDto dto) { + AsServiceGroup entity = new AsServiceGroup(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } - public void updateByDto(AsServiceGroupDto dto){ - String dtoSid = dto.getSid(); + public void updateByDto(AsServiceGroupDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; } - AsServiceGroup entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } + AsServiceGroup entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } - public AsServiceGroupDetailsVo fetchDetailsVoBySid(String sid){ - AsServiceGroup entity = baseMapper.fetchIsDeleteBySid(sid); - AsServiceGroupDetailsVo vo = new AsServiceGroupDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + public AsServiceGroupDetailsVo fetchDetailsVoBySid(String sid) { + AsServiceGroup entity = baseMapper.fetchIsDeleteBySid(sid); + AsServiceGroupDetailsVo vo = new AsServiceGroupDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } - public List getGroupList(String orgPath) { - ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath); - if (orgSidByPath.getSuccess()) { - String useOrgSid = orgSidByPath.getData(); - List list = baseMapper.getGroupList(useOrgSid); - return list; - } - return new ArrayList<>(); - } + public List getGroupList(String useOrgSid) { + List list = baseMapper.getGroupList(useOrgSid); + return list; + } - public void delete(String[] sids) { - for (String sid : sids) { - baseMapper.updateIsDeleteBySid(sid); - } - } + public void delete(String[] sids) { + for (String sid : sids) { + baseMapper.updateIsDeleteBySid(sid); + } + } } From 0fd32ce0b5ea0c0dbf7b1ebc0b8541e6d7703269 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 28 May 2024 10:06:23 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maintenanceitem/maintenanceitemAdd.vue | 37 +++++++++++-------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue index b55b522581..fe9dabb5ab 100644 --- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue +++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue @@ -52,36 +52,36 @@ -
排序
- +
*排序
+ -
工时单价
- +
*工时单价
+ -
工时数
- +
*工时数
+ -
销售价
- +
*销售价
+ -
考核工时
- +
*考核工时
+ -
成本
- +
*成本
+ -
预约项目
- +
*预约项目
+ 是 否 @@ -147,7 +147,14 @@ export default { }, rules: { sitemName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }], - serviceType: [{ required: true, message: '工种不能为空', trigger: 'change' }] + serviceType: [{ required: true, message: '工种不能为空', trigger: 'change' }], + sortNo: [{ required: true, message: '排序不能为空', trigger: 'blur' }], + hourPrice: [{ required: true, message: '工时单价不能为空', trigger: 'blur' }], + hours: [{ required: true, message: '工时数不能为空', trigger: 'blur' }], + price: [{ required: true, message: '销售价不能为空', trigger: 'blur' }], + examineHourPrice: [{ required: true, message: '考核工时不能为空', trigger: 'blur' }], + cost: [{ required: true, message: '成本不能为空', trigger: 'blur' }], + isReserve: [{ required: true, message: '预约项目不能为空', trigger: 'change' }] } } }, From e49d5ce313779450cad74c062046793685aded54 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 28 May 2024 10:13:11 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue index c67de7dc05..95e02a7d1d 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue @@ -758,17 +758,17 @@ export default { this.otherSettle_list = res.data } }) - getServiceType({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => { + getServiceType({ useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => { if (resp.success) { this.serviceType_list = resp.data } }) - selSubjectInfo({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => { + selSubjectInfo({ useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => { if (resp.success) { this.subject_list = resp.data } }) - getGroupList({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => { + getGroupList({ useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => { if (resp.success) { this.group_list = resp.data } From bffc5fe2e6531bfc474a741041009ad004a54b65 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 28 May 2024 10:24:04 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=B1=BB=E5=9E=8B=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../suppliertype/suppliertype.vue | 42 ++++++++++++------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/yxt-as-ui/src/views/basicinformation/suppliertype/suppliertype.vue b/yxt-as-ui/src/views/basicinformation/suppliertype/suppliertype.vue index 21038909d8..d7631a9daa 100644 --- a/yxt-as-ui/src/views/basicinformation/suppliertype/suppliertype.vue +++ b/yxt-as-ui/src/views/basicinformation/suppliertype/suppliertype.vue @@ -46,15 +46,15 @@ - +
*供应商类型
- + -
*供应商编码
- +
*供应商类型编码
+ @@ -139,6 +139,10 @@ export default { supplierTypeName: '', supplierTypeCode: '', orgPath: '' + }, + rules: { + supplierTypeName: [{ required: true, message: '供应商类型不能为空', trigger: 'blur' }], + supplierTypeCode: [{ required: true, message: '供应商类型编码不能为空', trigger: 'blur' }] } } }, @@ -233,6 +237,9 @@ export default { }, toAdd() { this.dialogVisible = true + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) this.formobj = { sid: '', supplierTypeName: '', @@ -254,16 +261,16 @@ export default { } }, handleConfirm() { - if (this.formobj.supplierTypeName === '' || this.formobj.supplierTypeCode === '') { - this.$message({ showClose: true, type: 'error', message: '供应商类型或编码不能为空' }) - return - } - this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath') - req.saveOrUpdate(this.formobj).then((res) => { - if (res.success) { - this.dialogVisible = false - this.$message({ showClose: true, type: 'success', message: '保存成功' }) - this.getList() + this.$refs['form_obj'].validate((valid) => { + if (valid) { + this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath') + req.saveOrUpdate(this.formobj).then((res) => { + if (res.success) { + this.dialogVisible = false + this.$message({ showClose: true, type: 'success', message: '保存成功' }) + this.getList() + } + }) } }) }, @@ -305,9 +312,12 @@ export default { From 6c71ded466bda1d0772f2eb5518a1717e4232d4a Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 28 May 2024 10:24:23 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=8D=95=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBusreserveBillMapper.xml | 6 ++- .../AsBusreserveBillService.java | 38 +++++++++---------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml index 329392d9dd..ee6e1fa5e5 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml @@ -4,7 +4,11 @@ - \ No newline at end of file + + diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java index d4b90f3271..afc6305879 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyRest.java @@ -92,4 +92,9 @@ public class BaseVehicleOutApplyRest implements BaseVehicleOutApplyFeign { BaseVehicleOutApplyDetailsVo vo = baseVehicleOutApplyService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @Override + public ResultBean selectSidByVinNo(String vinNo) { + return baseVehicleOutApplyService.selectSidByVinNo(vinNo); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java index 1fc30454c9..a75d03a42f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java @@ -55,6 +55,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; +import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -295,4 +296,12 @@ public class BaseVehicleOutApplyService extends MybatisBaseService selectSidByVinNo(String vinNo) { + ResultBean rb = ResultBean.fireFail(); + String sid = ""; + String substringVinNo = vinNo.substring(vinNo.length() - 8); + sid = baseMapper.selectSidByVinNo(substringVinNo); + return rb.success().setData(sid); + } +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index 8b14c99ce5..c82917f543 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; +import com.yxt.anrui.base.api.basevehicleoutapply.BaseVehicleOutApplyFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower; @@ -122,7 +123,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService jrList = new ArrayList<>();//金融应收 List loanFundDays = new ArrayList<>();//资金占用费生成记录 for (HistoryDataImportVo v : list) { + String isOther = "0";//是否有其他融 1是0否 + String sameBank = "0";//是否资方一致 1是0否 String customerNo = ""; //客户编码 String customerSid = ""; String customerName = ""; @@ -4671,6 +4675,31 @@ public class LoanRepaymentScheduleService extends MybatisBaseService