From 1fe0e0d2c210e243d6d403cbbd05d9d57db0bc3d Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 10 Jul 2024 16:16:18 +0800 Subject: [PATCH 1/7] =?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 | 20 +++++++++++++++++-- .../maintenanceitem/maintenanceitemInfo.vue | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue index b77299bb27..790d3161c0 100644 --- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue +++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue @@ -74,8 +74,13 @@ {{ calculatePrice }} -
*考核工时
- +
*工时提成
+ +
+ + +
+
备注
@@ -129,6 +134,7 @@ export default { goodsModel_list: [], manufacturer_list: [], subject_list: [], + royaltiesRatio: '', // 提成比例 formobj: { sid: '', createBySid: '', @@ -224,6 +230,8 @@ export default { req.fetchBySid(row.sid).then((res) => { if (res.success) { this.formobj = res.data + // 因提成比例不存数据库，则编辑信息时需要计算出值 + this.examineHourPriceInput(this.formobj) } }) }, @@ -277,6 +285,14 @@ export default { this.formobj.manufacturerSid = '' } }, + // 计算提成比例 = 工时提成 / 销售价 + royaltiesRatioInput(val) { + this.royaltiesRatio = Math.round((parseFloat(val.examineHourPrice !== '' ? val.examineHourPrice : '0') / parseFloat(val.price !== '' ? val.price : '0')) * 100) / 100 + }, + // 计算工时提成 = 销售价 * 提成比例 + examineHourPriceInput(val) { + val.examineHourPrice = Math.round((parseFloat(val.price !== '' ? val.price : '0') * parseFloat(this.royaltiesRatio !== '' ? this.royaltiesRatio : '0')) * 100) / 100 + }, saveOrUpdate() { this.formobj.price = this.calculatePrice this.$refs['form_obj'].validate((valid) => { diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue index faebb37cf9..466366049a 100644 --- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue +++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemInfo.vue @@ -57,7 +57,7 @@ {{ formobj.price }} -
考核工时
+
工时提成
{{ formobj.examineHourPrice }} From 4e26cc362de77633b9b63db9521fcbf07455b74a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 10 Jul 2024 16:21:04 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index 8e5248f599..5b52e47776 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -77,7 +77,8 @@ bo.nowCarUnknownVinNum, if(length(bo.nodeState)>0,true,false) as showRePublishBtn, bo.companyInvoicingSid, - bo.companyInvoicingName + bo.companyInvoicingName, + bo.useOrgName as dealer FROM bus_sales_order bo left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid From 395c0b1acc6735b90d7327863196648e9d33ae5f Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 10 Jul 2024 16:24:10 +0800 Subject: [PATCH 3/7] =?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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue index 790d3161c0..23bfb878f1 100644 --- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue +++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue @@ -76,9 +76,9 @@
*工时提成
-
- - +
+ +
@@ -287,11 +287,11 @@ export default { }, // 计算提成比例 = 工时提成 / 销售价 royaltiesRatioInput(val) { - this.royaltiesRatio = Math.round((parseFloat(val.examineHourPrice !== '' ? val.examineHourPrice : '0') / parseFloat(val.price !== '' ? val.price : '0')) * 100) / 100 + this.royaltiesRatio = Math.round((parseFloat(val.examineHourPrice !== '' ? val.examineHourPrice : '0') / parseFloat(this.calculatePrice)) * 100) / 100 }, // 计算工时提成 = 销售价 * 提成比例 examineHourPriceInput(val) { - val.examineHourPrice = Math.round((parseFloat(val.price !== '' ? val.price : '0') * parseFloat(this.royaltiesRatio !== '' ? this.royaltiesRatio : '0')) * 100) / 100 + val.examineHourPrice = Math.round((parseFloat(this.calculatePrice) * parseFloat(this.royaltiesRatio !== '' ? this.royaltiesRatio : '0')) * 100) / 100 }, saveOrUpdate() { this.formobj.price = this.calculatePrice From c896b91d3f9b61257f06424e646487b15f732dfb Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 10 Jul 2024 16:52:17 +0800 Subject: [PATCH 4/7] =?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 --- .../basicinformation/maintenanceitem/maintenanceitemAdd.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue index 23bfb878f1..8025f3bb69 100644 --- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue +++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue @@ -287,11 +287,11 @@ export default { }, // 计算提成比例 = 工时提成 / 销售价 royaltiesRatioInput(val) { - this.royaltiesRatio = Math.round((parseFloat(val.examineHourPrice !== '' ? val.examineHourPrice : '0') / parseFloat(this.calculatePrice)) * 100) / 100 + this.royaltiesRatio = Math.round(((parseFloat(val.examineHourPrice !== '' ? val.examineHourPrice : '0') / parseFloat(this.calculatePrice)) * 100) * 100) / 100 }, // 计算工时提成 = 销售价 * 提成比例 examineHourPriceInput(val) { - val.examineHourPrice = Math.round((parseFloat(this.calculatePrice) * parseFloat(this.royaltiesRatio !== '' ? this.royaltiesRatio : '0')) * 100) / 100 + val.examineHourPrice = Math.round((parseFloat(this.calculatePrice) * (parseFloat(this.royaltiesRatio !== '' ? this.royaltiesRatio : '0') / 100)) * 100) / 100 }, saveOrUpdate() { this.formobj.price = this.calculatePrice From d574c3cfe237c1c964c60169aace8affa88f6571 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 10 Jul 2024 17:12:36 +0800 Subject: [PATCH 5/7] =?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 --- .../basicinformation/maintenanceitem/maintenanceitemAdd.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue index 8025f3bb69..667ee0bfa5 100644 --- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue +++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue @@ -78,7 +78,7 @@
- + %
@@ -287,11 +287,11 @@ export default { }, // 计算提成比例 = 工时提成 / 销售价 royaltiesRatioInput(val) { - this.royaltiesRatio = Math.round(((parseFloat(val.examineHourPrice !== '' ? val.examineHourPrice : '0') / parseFloat(this.calculatePrice)) * 100) * 100) / 100 + this.royaltiesRatio = Math.round((((parseFloat(val.examineHourPrice !== '' ? val.examineHourPrice : '0') / parseFloat(this.calculatePrice)) * 100).toFixed(2)) * 100) / 100 }, // 计算工时提成 = 销售价 * 提成比例 examineHourPriceInput(val) { - val.examineHourPrice = Math.round((parseFloat(this.calculatePrice) * (parseFloat(this.royaltiesRatio !== '' ? this.royaltiesRatio : '0') / 100)) * 100) / 100 + val.examineHourPrice = Math.round((parseFloat(this.calculatePrice) * ((parseFloat(this.royaltiesRatio !== '' ? this.royaltiesRatio : '0') / 100)).toFixed(2)) * 100) / 100 }, saveOrUpdate() { this.formobj.price = this.calculatePrice From ac6d5286d50887dc225ebd54470a2613315af0ee Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 10 Jul 2024 17:14:31 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/sysstaffinfo/RoleCodeListQuery.java | 20 ++++++ .../portal/api/sysstaffinfo/StaffByRole.java | 17 +++++ .../api/sysstaffinfo/SysStaffinfoFeign.java | 6 +- .../SysStaffinfoFeignFallback.java | 9 ++- .../biz/sysstaffinfo/SysStaffinfoMapper.java | 4 +- .../biz/sysstaffinfo/SysStaffinfoMapper.xml | 18 ++++- .../biz/sysstaffinfo/SysStaffinfoRest.java | 7 ++ .../biz/sysstaffinfo/SysStaffinfoService.java | 64 +++++++++-------- .../asserviceitem/AsServiceItemMapper.java | 4 +- .../biz/asserviceitem/AsServiceItemMapper.xml | 2 + .../asserviceitem/AsServiceItemService.java | 11 +-- .../apiadmin/base/WmsWarehouseInfoRest.java | 9 +++ .../WmsWarehouseAreaMapper.java | 2 + .../WmsWarehouseAreaMapper.xml | 5 ++ .../WmsWarehouseAreaService.java | 28 +++++--- .../biz/base/wmswarehouseinfo/MangerVo.java | 15 ++++ .../wmswarehouseinfo/WmsWarehouseInfoDto.java | 6 +- .../WmsWarehouseInfoMapper.java | 2 + .../WmsWarehouseInfoMapper.xml | 5 ++ .../WmsWarehouseInfoService.java | 71 +++++++++++++------ .../wmswarehouseinfo/WmsWarehouseInfoVo.java | 6 +- .../sysstaffinfo/RoleCodeListQuery.java | 20 ++++++ .../portal/sysstaffinfo/StaffByRole.java | 17 +++++ .../sysstaffinfo/SysStaffinfoFeign.java | 40 +++++++++++ .../src/main/java/com/yxt/wms/utils/Rule.java | 6 ++ 25 files changed, 317 insertions(+), 77 deletions(-) create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/RoleCodeListQuery.java create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/StaffByRole.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/MangerVo.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/RoleCodeListQuery.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/StaffByRole.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/RoleCodeListQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/RoleCodeListQuery.java new file mode 100644 index 0000000000..2f983b1b70 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/RoleCodeListQuery.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.portal.api.sysstaffinfo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/7/10 16:53 + */ +@Data +public class RoleCodeListQuery { + @ApiModelProperty("分公司sid") + private String createOrgSid; + @ApiModelProperty("角色编码") + private List roleCode; + +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/StaffByRole.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/StaffByRole.java new file mode 100644 index 0000000000..b715f01e34 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/StaffByRole.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.portal.api.sysstaffinfo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/10 16:50 + */ +@Data +public class StaffByRole { + @ApiModelProperty("姓名") + private String manager; + @ApiModelProperty("userSid") + private String managerSid; +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java index 61de446906..96d6ed40a0 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java @@ -96,6 +96,10 @@ public interface SysStaffinfoFeign { @GetMapping("/getStaffName") public ResultBean>> getStaffName(@RequestParam(value = "staffName", required = false) String staffName, @RequestParam(value = "deptSid") String deptSid); + @ApiOperation("根据角色编码获取分公司下人员") + @PostMapping("/getStaffNameByRole") + public ResultBean> getStaffNameByRoleCode(@RequestBody RoleCodeListQuery query); + /** * 获取部门内全部员工姓名 * @@ -159,4 +163,4 @@ public interface SysStaffinfoFeign { ResultBean> selectStaffListss(); -} \ No newline at end of file +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java index 8f516e152a..2292102419 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java @@ -31,7 +31,7 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui_portal/sysstaffinfo/listPage无法访问"); } - + @Override public ResultBean save(SysStaffinfoDto dto) { return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffinfo/save无法访问"); @@ -58,6 +58,11 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign { return null; } + @Override + public ResultBean> getStaffNameByRoleCode(RoleCodeListQuery query) { + return null; + } + @Override public ResultBean>> getStaffNameByDeptSid(String staffName, String deptSid) { return null; @@ -113,4 +118,4 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign { return null; } -} \ No newline at end of file +} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java index c53a22f41e..599147c040 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java @@ -125,4 +125,6 @@ public interface SysStaffinfoMapper extends BaseMapper { List selectStaffLists(); List selectStaffListss(); -} \ No newline at end of file + + List getStaffNameByRoleCode(@Param("orgSidPath") String orgSidPath, @Param("list") List list); +} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml index 59a0beca8d..2fd255c867 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml @@ -395,4 +395,20 @@ from sys_user su left join sys_staffinfo si on su.staffSid = si.sid where su.isAdmin is NULL and si.personTypeKey != '01' - \ No newline at end of file + + diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java index ccdfa8209f..1bef81a8de 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java @@ -142,6 +142,13 @@ public class SysStaffinfoRest implements SysStaffinfoFeign { return rb.success().setData(staffNameList); } + @Override + public ResultBean> getStaffNameByRoleCode(RoleCodeListQuery query) { + ResultBean rb = ResultBean.fireFail(); + List list = sysStaffinfoService.getStaffNameByRoleCode(query); + return rb.success().setData(list); + } + @Override public ResultBean>> getStaffNameByDeptSid(String staffName, String deptSid) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java index 2f0749c7ca..6c386a9566 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java @@ -233,9 +233,9 @@ public class SysStaffinfoService extends MybatisBaseService 0) { sysStaffOrgService.deleteByStaffSidAndType(sysStaffOrgDto.getOrgSidPath(), sid, "2"); } - SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSidAndPath(sid,sysStaffOrgDto.getOrgSidPath()); - if(sysStaffOrg == null){ + SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSidAndPath(sid, sysStaffOrgDto.getOrgSidPath()); + if (sysStaffOrg == null) { ResultBean staffOrgResultBean = sysStaffOrgService.selectAllByStaffSid(sid); sysStaffOrg = staffOrgResultBean.getData(); - if(sysStaffOrg == null){ + if (sysStaffOrg == null) { sysStaffOrg = new SysStaffOrg(); sysStaffOrg.setStaffSid(sid); - BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg); + BeanUtil.copyProperties(sysStaffOrgDto, sysStaffOrg); sysStaffOrg.setManageType("3"); sysStaffOrgService.insert(sysStaffOrg); - }else{ - BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg); + } else { + BeanUtil.copyProperties(sysStaffOrgDto, sysStaffOrg); sysStaffOrg.setManageType("3"); sysStaffOrgService.updateById(sysStaffOrg); } - }else{ - BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg); + } else { + BeanUtil.copyProperties(sysStaffOrgDto, sysStaffOrg); sysStaffOrg.setManageType("3"); sysStaffOrgService.updateById(sysStaffOrg); } @@ -660,19 +660,18 @@ public class SysStaffinfoService extends MybatisBaseService> getStaffName(String staffName,String deptSid) { + public List> getStaffName(String staffName, String deptSid) { QueryWrapper> qw = new QueryWrapper<>(); if (StringUtils.isNotBlank(staffName)) { qw.like("ss.name", staffName); } qw.eq("ss.isDelete", 0); qw.ne("sso.orgSid", deptSid); - qw.ne("ss.personTypeKey","01"); + qw.ne("ss.personTypeKey", "01"); return baseMapper.getStaffName(qw); } @@ -747,7 +746,7 @@ public class SysStaffinfoService extends MybatisBaseService qw = new QueryWrapper<>(); String orgSid = ""; if (params != null) { - if(StringUtils.isNotBlank(params.getOrgPath())){ + if (StringUtils.isNotBlank(params.getOrgPath())) { String orgPath = params.getOrgPath(); orgSid = sysStaffOrgService.getOrgSidByPath(orgPath).getData(); } if (StringUtils.isNotBlank(params.getName())) { qw.like("si.name", params.getName()); } - if (params.getSelectSid() != null && params.getSelectSid().size() > 0){ - qw.notIn("su.sid",params.getSelectSid()); + if (params.getSelectSid() != null && params.getSelectSid().size() > 0) { + qw.notIn("su.sid", params.getSelectSid()); } - if(params.getState() == 0){ - qw.eq("si.personTypeKey","02"); + if (params.getState() == 0) { + qw.eq("si.personTypeKey", "02"); } } IPage pagging = baseMapper.getUserList(page, qw, orgSid); @@ -789,12 +788,12 @@ public class SysStaffinfoService extends MybatisBaseService> getGressionUserList(String userSid,String orgPath) { + public ResultBean> getGressionUserList(String userSid, String orgPath) { ResultBean> rb = ResultBean.fireFail(); String useOrgSid = ""; - if(StringUtils.isNotBlank(orgPath)){ + if (StringUtils.isNotBlank(orgPath)) { useOrgSid = sysStaffOrgService.getOrgSidByPath(orgPath).getData(); - }else{ + } else { useOrgSid = sysStaffOrgService.getPathSidByUserSid(userSid).getData(); } List list = baseMapper.getGressionUserList(useOrgSid); @@ -814,4 +813,13 @@ public class SysStaffinfoService extends MybatisBaseService getStaffNameByRoleCode(RoleCodeListQuery query) { + String createOrgSid = query.getCreateOrgSid(); + List roleCode = query.getRoleCode(); + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(createOrgSid); + String orgSidPath = sysOrganization.getOrgSidPath(); + List list = baseMapper.getStaffNameByRoleCode(orgSidPath,roleCode); + return list; + } +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.java index ef3cd0e4ce..325121e1e3 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.java @@ -25,7 +25,7 @@ public interface AsServiceItemMapper extends BaseMapper { int updateBySidIsDelete(List list); - AsServiceItem checkForInsert(@Param("sitemName")String sitemName, @Param("useOrgSid")String useOrgSid); + AsServiceItem checkForInsert(@Param("sitemName") String sitemName, @Param("useOrgSid") String useOrgSid, @Param("subjectSid") String subjectSid); - AsServiceItem checkForUpdate(@Param("sitemName")String sitemName, @Param("useOrgSid")String useOrgSid, @Param("sid")String sid); + AsServiceItem checkForUpdate(@Param("sitemName") String sitemName, @Param("useOrgSid") String useOrgSid, @Param("sid") String sid, @Param("subjectSid") String subjectSid); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.xml index e686877530..747e49c33c 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemMapper.xml @@ -32,6 +32,7 @@ from as_service_item where sitemName = #{sitemName} and useOrgSid = #{useOrgSid} + and subjectSid = #{subjectSid} and isDelete = 0 diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java index 2c671f882d..cc69e0bed4 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java @@ -46,6 +46,7 @@ public class AsServiceItemService extends MybatisBaseService createQueryWrapper(AsServiceItemQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -125,7 +126,7 @@ public class AsServiceItemService extends MybatisBaseService wrapper.like("a.sitemName", query.getSitemName()).or().like("a.sitemCode", query.getSitemName())); @@ -165,18 +166,18 @@ public class AsServiceItemService extends MybatisBaseService wmsWarehouseAreaAllVos = wmsWarehouseService.selectAll(); return rb.success().setData(wmsWarehouseAreaAllVos); } + + + @ApiOperation("查询仓库管理员") + @GetMapping("/selMangerByRole") + public ResultBean> selMangerByRole(@RequestParam("createOrgSid") String createOrgSid){ + ResultBean rb = ResultBean.fireFail(); + List vos = wmsWarehouseService.selMangerByRole(createOrgSid); + return rb.success().setData(vos); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java index e6a03fcbca..df6530605d 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.java @@ -27,4 +27,6 @@ public interface WmsWarehouseAreaMapper extends BaseMapper { WmsWarehouseArea checkForUpdate(@Param("areaCode")String areaCode,@Param("warehouseSid") String warehouseSid, @Param("sid")String sid); List listAll(@Param("useOrgSid") String useOrgSid); + + int selectNum(@Param("warehouseCode") String warehouseCode); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml index 93db164e60..746b56e503 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaMapper.xml @@ -48,6 +48,11 @@ where b.useOrgSid = #{useOrgSid} and a.isDelete = 0 + UPDATE wms_warehouse_area SET isDelete=1 diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java index ae9eab453e..4559d7db94 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousearea/WmsWarehouseAreaService.java @@ -11,12 +11,14 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo; +import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService; import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoVo; import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.wms.feign.portal.sysuser.SysUserFeign; import com.yxt.wms.utils.OrgPathQuery; +import com.yxt.wms.utils.Rule; import lombok.experimental.Accessors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -37,6 +39,8 @@ public class WmsWarehouseAreaService extends MybatisBaseService> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); @@ -122,25 +126,33 @@ public class WmsWarehouseAreaService extends MybatisBaseService { @Select("select * from wms_warehouse_info where useOrgSid =#{useOrgSid} and isDelete = 0 and usageStatus = '1' ") List listAll(@Param("useOrgSid") String useOrgSid); + + int selectNum(@Param("billCode") String billCode); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml index 61a0862c11..90f16bd89d 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.xml @@ -21,6 +21,11 @@ + UPDATE wms_warehouse_info SET isDelete=1 diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java index 4e2a65dcde..d29926deb9 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java @@ -17,9 +17,14 @@ import com.yxt.wms.biz.base.wmswarehouseextend.WmsWarehouseExtendVo; import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.wms.feign.portal.sysstaffinfo.RoleCodeListQuery; +import com.yxt.wms.feign.portal.sysstaffinfo.StaffByRole; +import com.yxt.wms.feign.portal.sysstaffinfo.SysStaffinfoFeign; import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.wms.feign.portal.sysuser.SysUserFeign; +import com.yxt.wms.utils.BillNo; import com.yxt.wms.utils.OrgPathQuery; +import com.yxt.wms.utils.Rule; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -45,6 +50,8 @@ public class WmsWarehouseInfoService extends MybatisBaseService> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); @@ -131,18 +138,7 @@ public class WmsWarehouseInfoService extends MybatisBaseService split = Arrays.asList(orgPath.split("/")); if (split.size() > 1) { @@ -161,11 +159,13 @@ public class WmsWarehouseInfoService extends MybatisBaseService organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); if (organizationResultBean.getData() != null) { wmsWarehouse.setCreateOrgSid(createOrgSid); + useOrgNo = organizationResultBean.getData().getOrgCode(); } - } - WmsWarehouseInfo warehouseInfo = baseMapper.checkCode(dto.getWarehouseCode(), deptSid); - if (warehouseInfo != null) { - return rb.setMsg("仓库编码重复"); + //生成编码 + String billCode = useOrgNo + deptNo; + String applyCode = getApplyCode(billCode); + wmsWarehouse.setWarehouseCode(applyCode); } baseMapper.insert(wmsWarehouse); -// for (WmsWarehouseExtendDto wmsWarehouseExtendDto : dto.getWmsWarehouseExtendDtos()) { -// wmsWarehouseExtendDto.setWarehouseSid(wmsWarehouse.getSid()); -// } -// if(dto.getWmsWarehouseExtendDto()!=null){ -// dto.getWmsWarehouseExtendDto().setWarehouseSid(wmsWarehouse.getSid()); -// wmsWarehouseExtendService.saveOrUpdate(dto.getWmsWarehouseExtendDto()); -// } - } return rb.success().setMsg("成功"); } + /** + * 生成单据编号 + * + * @param billCode + * @return + */ + public String getApplyCode(String billCode) { + int i = baseMapper.selectNum(billCode); + String billNo = Rule.getBillNo3(billCode, i); + return billNo; + } + public ResultBean initialization(String sid) { ResultBean rb = ResultBean.fireFail(); WmsWarehouseInfoVo vo = new WmsWarehouseInfoVo(); @@ -237,4 +242,24 @@ public class WmsWarehouseInfoService extends MybatisBaseService selectAll() { return baseMapper.selectAll(); } + + public List selMangerByRole(String createOrgSid) { + RoleCodeListQuery query = new RoleCodeListQuery(); + List roleCode = new ArrayList<>(); + List list = new ArrayList<>(); + roleCode.add("74"); + roleCode.add("75"); + roleCode.add("76"); + query.setCreateOrgSid(createOrgSid); + List data = sysStaffinfoFeign.getStaffNameByRoleCode(query).getData(); + if (!data.isEmpty()) { + for (StaffByRole datum : data) { + MangerVo vo = new MangerVo(); + vo.setName(datum.getManager()); + vo.setSid(datum.getManagerSid()); + list.add(vo); + } + } + return list; + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoVo.java index 21a32ef693..6dcebeca04 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoVo.java @@ -28,9 +28,9 @@ public class WmsWarehouseInfoVo implements Vo { private String isDelete; private String warehouseName;//仓库名称 private String warehouseCode;//仓库编码 - private String contacts;//联系人 - private String mob;//手机 - private String telephone;//联系电话 +// private String contacts;//联系人 +// private String mob;//手机 +// private String telephone;//联系电话 private String manager;//主管 private String areaSid;//地区sid private String address;//地址 diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/RoleCodeListQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/RoleCodeListQuery.java new file mode 100644 index 0000000000..85ecb17cae --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/RoleCodeListQuery.java @@ -0,0 +1,20 @@ +package com.yxt.wms.feign.portal.sysstaffinfo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/7/10 16:53 + */ +@Data +public class RoleCodeListQuery { + @ApiModelProperty("分公司sid") + private String createOrgSid; + @ApiModelProperty("角色编码") + private List roleCode; + +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/StaffByRole.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/StaffByRole.java new file mode 100644 index 0000000000..dff1db8686 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/StaffByRole.java @@ -0,0 +1,17 @@ +package com.yxt.wms.feign.portal.sysstaffinfo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/10 16:50 + */ +@Data +public class StaffByRole { + @ApiModelProperty("姓名") + private String manager; + @ApiModelProperty("userSid") + private String managerSid; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java new file mode 100644 index 0000000000..9733826c47 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java @@ -0,0 +1,40 @@ +package com.yxt.wms.feign.portal.sysstaffinfo; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffinfoFeign.java
+ * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign
+ * Description: 人员基础信息表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "人员基础信息表") +@FeignClient( + contextId = "anrui-portal-SysStaffinfo", + name = "anrui-portal", + path = "v1/sysstaffinfo" + ) +public interface SysStaffinfoFeign { + + @ApiOperation("根据角色编码获取分公司下人员") + @PostMapping("/getStaffNameByRole") + public ResultBean> getStaffNameByRoleCode(@RequestBody RoleCodeListQuery query); +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/utils/Rule.java b/yxt-wms-biz/src/main/java/com/yxt/wms/utils/Rule.java index bd59eea9b2..b51dace970 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/utils/Rule.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/utils/Rule.java @@ -27,4 +27,10 @@ public class Rule { bill = bill + date; return bill; } + + public static String getBillNo3(String bill, int i) { + String num = String.format("%03d", i + 1); // 不足4位补0 + String billNo = bill + num; + return billNo; + } } From 95a1b680336cb3ce404a6da752f46e8b5fb6ba85 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 10 Jul 2024 17:44:28 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=AE=A1=E7=90=862.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bussalesorder/BusSalesOrderFeignFallback.java | 8 +++++++- .../anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml | 4 ++-- .../saleOrders/AppBusSalesOrderFeignFallback.java | 7 ++++++- .../wms/biz/base/wmswarehouseinfo/WmsWarehouseInfo.java | 1 + .../biz/base/wmswarehouseinfo/WmsWarehouseInfoDto.java | 1 + .../base/wmswarehouseinfo/WmsWarehouseInfoService.java | 1 + .../wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoVo.java | 1 + 7 files changed, 19 insertions(+), 4 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index 2aa320d2fe..45dd5aa58b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java @@ -375,5 +375,11 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { @Override public void saveList(List orders){ - }; + } + + @Override + public ResultBean> getSaleOrdersWx(PagerQuery pq) { + return null; + } + } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml index 2fd255c867..a746d0df92 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml @@ -397,8 +397,8 @@