|
@@ -15,7 +15,10 @@ import com.ruoyi.project.plant.domain.TStaffmgr;
|
|
|
import com.ruoyi.project.plant.service.ITStaffmgrService;
|
|
|
import com.ruoyi.project.production.controller.vo.SaiExportVO;
|
|
|
import com.ruoyi.project.production.controller.vo.SaiQueryVO;
|
|
|
+import com.ruoyi.project.production.domain.TSaiCategory;
|
|
|
+import com.ruoyi.project.production.service.ITSaiCategoryService;
|
|
|
import com.ruoyi.project.system.domain.SysDept;
|
|
|
+import com.ruoyi.project.system.domain.SysDictData;
|
|
|
import com.ruoyi.project.system.mapper.SysDeptMapper;
|
|
|
import com.ruoyi.project.system.service.ISysDeptService;
|
|
|
import com.ruoyi.project.system.service.ISysDictTypeService;
|
|
@@ -62,6 +65,9 @@ public class TSaiController extends BaseController
|
|
|
@Autowired
|
|
|
private SysDeptMapper sysDeptMapper;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ITSaiCategoryService saiCategoryService;
|
|
|
+
|
|
|
@Autowired
|
|
|
private ITStaffmgrService staffmgrService;
|
|
|
|
|
@@ -288,6 +294,7 @@ public class TSaiController extends BaseController
|
|
|
{
|
|
|
List<TSai> list = tSaiService.selectTSaiList(tSai);
|
|
|
List<SysDept> sysDepts = sysDeptMapper.selectDeptList(new SysDept());
|
|
|
+ List<TSaiCategory> saiCategories = saiCategoryService.selectTSaiCategoryList(null);
|
|
|
for (TSai sai : list) {
|
|
|
for (SysDept sysDept : sysDepts) {
|
|
|
if (sysDept.getDeptId().toString().equals(sai.getPlantId())) {
|
|
@@ -311,7 +318,13 @@ public class TSaiController extends BaseController
|
|
|
saiExportVO.setDificiency(entity.getDificiency());
|
|
|
saiExportVO.setActions(entity.getActions());
|
|
|
saiExportVO.setSaiLevel(entity.getSaiLevel());
|
|
|
- saiExportVO.setCategory(entity.getCategory());
|
|
|
+ if (entity.getCategory() != null) {
|
|
|
+ for (TSaiCategory saiCategory : saiCategories) {
|
|
|
+ if ((saiCategory.getSaiCategoryId() + "").equals(entity.getCategory())) {
|
|
|
+ saiExportVO.setCategory(saiCategory.getSaiCategoryName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
saiExportVO.setApplicant(entity.getApplicantName());
|
|
|
saiExportVOList.add(saiExportVO);
|
|
|
}
|