项目库相关人员
This commit is contained in:
+12
-23
@@ -13,7 +13,6 @@ import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
|
||||
import com.jero.modules.project.service.IProjectRelatedPersonnelService;
|
||||
import com.jero.modules.project.util.ExcelLangUtils;
|
||||
import com.jero.modules.system.entity.SysUser;
|
||||
import com.jero.modules.system.mapper.SysDictItemMapper;
|
||||
import com.jero.modules.system.mapper.SysDictMapper;
|
||||
import com.jero.modules.system.mapper.SysUserMapper;
|
||||
import com.jero.modules.system.service.ISysDictService;
|
||||
@@ -60,8 +59,6 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
|
||||
|
||||
@Autowired
|
||||
private SysDictMapper sysDictMapper;
|
||||
@Autowired
|
||||
private SysDictItemMapper sysDictItemMapper;
|
||||
|
||||
/**
|
||||
* 保存
|
||||
@@ -382,11 +379,11 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
|
||||
try {
|
||||
//中英切换
|
||||
if(CutEnum.CN.getValue().equals(cut)) {
|
||||
exportParams=new ExportParams(title , "导出人:" + sysUser.getUsername(), title);
|
||||
exportParams=new ExportParams(title , null, title);
|
||||
mv.addObject(NormalExcelConstants.CLASS, ExcelLangUtils.chooseLang(clazz, CutEnum.CN.getValue()));
|
||||
}
|
||||
else {
|
||||
exportParams=new ExportParams(title , "Exporter:" + sysUser.getUsername(), title);
|
||||
exportParams=new ExportParams(title , null, title);
|
||||
mv.addObject(NormalExcelConstants.CLASS, ExcelLangUtils.chooseLang(clazz, CutEnum.EN.getValue()));
|
||||
}
|
||||
|
||||
@@ -408,30 +405,23 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
|
||||
*/
|
||||
@Override
|
||||
public ModelAndView setExporTemplate(HttpServletRequest request, Class<ProjectRelatedPersonnel> clazz, String title,String cut){
|
||||
List<ProjectRelatedPersonnel> records = new ArrayList<>();;
|
||||
|
||||
List<ProjectRelatedPersonnel> records=new ArrayList<>();
|
||||
// ProjectRelatedPersonnel projectRelatedPersonnel=new ProjectRelatedPersonnel();
|
||||
// Step.1 组装查询条件
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
ExportParams exportParams=null;
|
||||
// Step.2 AutoPoi 导出Excel
|
||||
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
|
||||
try {
|
||||
String fillingExplanationCN="填写说明\n" +
|
||||
"1.导入数据从第三行开始,第一行为表头,第二行为填写说明,第三行是正式数据\n" +
|
||||
"2.所有带*号的字段必须填写\n" +
|
||||
"3.填写人员时,必须使用人员账号进行填写。\n" +
|
||||
"4.填写的人员账号必须与系统中账号保持一致";
|
||||
//中英切换模板
|
||||
/* if(CutEnum.CN.getValue().equals(cut)) {
|
||||
|
||||
exportParams=new ExportParams(title , fillingExplanationCN, title);
|
||||
if(CutEnum.CN.getValue().equals(cut)) {
|
||||
//projectRelatedPersonnel.setDutyTerritory(ExportTemplateEnum.DUTY_TERRITORY_FIELD_of_PRODUCTION.getName());
|
||||
exportParams=new ExportParams(title , null, title);
|
||||
}else{
|
||||
|
||||
exportParams=new ExportParams(title , ExportTemplateEnum.FILLING_EXPLANATION_EN.getName(), title);
|
||||
}*/
|
||||
exportParams=new ExportParams();
|
||||
exportParams.setSheetName(title);
|
||||
//查标签内容里的责任领域数据
|
||||
//projectRelatedPersonnel.setDutyTerritory(ExportTemplateEnum.DUTY_TERRITORY_FIELD_of_PRODUCTION.getValue());
|
||||
exportParams=new ExportParams(title , null, title);
|
||||
}
|
||||
//查标签内容里的责任领域数据
|
||||
List<String> dictItemNameList = sysDictMapper.queryDictNameByCode(DictCodeEnum.DUTY_TERRITORY.getValue());
|
||||
//新建相关人员表里的责任领域数据
|
||||
if (CollectionUtils.isNotEmpty(dictItemNameList)) {
|
||||
@@ -441,7 +431,6 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
|
||||
records.add(projectRelatedPersonnel);
|
||||
}
|
||||
}
|
||||
|
||||
mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下
|
||||
mv.addObject(NormalExcelConstants.CLASS, clazz);//!!!!这里设置中英切换
|
||||
mv.addObject(NormalExcelConstants.PARAMS,exportParams);
|
||||
@@ -466,7 +455,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
|
||||
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
|
||||
MultipartFile file = entity.getValue();// 获取上传文件对象
|
||||
ImportParams params = new ImportParams();
|
||||
params.setTitleRows(2);
|
||||
params.setTitleRows(1);
|
||||
params.setHeadRows(1);
|
||||
params.setNeedSave(true);
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user