root/yiBinGaoCe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
psh
2024-05-06 09:11:11 +08:00
parent d2e51a44e0
commit fed9821279
7 changed files with 86 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml
View File

@@ -73,7 +73,7 @@
left join sys_user_dept on sys_user.user_id = sys_user_dept.user_id
left join sys_users_roles on sys_users_roles.user_id = sys_user.user_id
left join sys_dept on sys_user_dept.dept_id = sys_dept.dept_id
left join sys_role on sys_users_roles.role_id = sys_role.create_id
left join sys_role on sys_users_roles.role_id = sys_role.role_id
<where>
<if test="query.dept_id != null">
and

15
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/ReportController.java
View File

@@ -30,6 +30,21 @@ public class ReportController {
return new ResponseEntity<>(TableDataInfo.build(reportService.queryAll(whereJson,page)),HttpStatus.OK);
}
@GetMapping("/getSupplierNameList")
@Log("查询供应商名称列表")
@ApiOperation("查询供应商名称列表")
//@SaCheckPermission("@el.check('material:list')")
public ResponseEntity<Object> getSupplierNameList(){
return new ResponseEntity<>(TableDataInfo.build(reportService.getSupplierNameList()),HttpStatus.OK);
}
@GetMapping("/getProductDescriptionList")
@Log("查询物料名称列表")
@ApiOperation("查询物料名称列表")
//@SaCheckPermission("@el.check('material:list')")
public ResponseEntity<Object> getProductDescriptionList(){
return new ResponseEntity<>(TableDataInfo.build(reportService.getProductDescriptionList()),HttpStatus.OK);
}
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java
View File

@@ -6,6 +6,8 @@ import org.nl.common.domain.query.PageQuery;
import org.nl.wms.sch.report.service.dto.ReportDto;
import org.nl.wms.sch.report.service.dto.ReportQuery;
import java.util.List;
public interface IReportService extends IService<ReportDto> {
@@ -17,4 +19,8 @@ public interface IReportService extends IService<ReportDto> {
*/
IPage<ReportDto> queryAll(ReportQuery whereJson, PageQuery pageable);
List<String> getSupplierNameList();
List<String> getProductDescriptionList();
}

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.java
View File

@@ -2,6 +2,7 @@ package org.nl.wms.sch.report.service.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Select;
import org.nl.wms.pdm.service.dao.PdmBdWorkorder;
import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery;
import org.nl.wms.sch.report.service.dto.ReportDto;
@@ -20,4 +21,10 @@ public interface ReportMapper extends BaseMapper<ReportDto> {
* @return
*/
IPage<ReportDto> queryReport(IPage<ReportDto> pages, ReportQuery query);
@Select("select supplierName from sch_base_material group by supplierName")
List<String> getSupplierNameList();
@Select("select productDescription from sch_base_material group by productDescription")
List<String> getProductDescriptionList();
}

8
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java
View File

@@ -36,5 +36,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, ReportDto> impl
}
public List<String> getSupplierNameList(){
return reportMapper.getSupplierNameList();
}
public List<String> getProductDescriptionList(){
return reportMapper.getProductDescriptionList();
}
}