FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 企标计划excel导入修改

Browse Source
This commit is contained in:
wxyclub
2023-12-05 13:35:56 +08:00
parent 89c108ec06
commit 9b6da7cd0f
1 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
+32 -7
View File
@@ -313,6 +313,14 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
@Override
public ResponseMessage<?> importEsRevisePlan(MultipartFile file) throws Exception {
String userId = LoginUserUtil.getUserId();
LambdaQueryWrapper<TsUser> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TsUser::getUserId, userId);
List<TsUser> currentLoginUserList = tsUserService.list(queryWrapper);
if (currentLoginUserList.size() < 1) {
return Result.error("请先登录");
}
TsUser userInfo = currentLoginUserList.get(0);
//获取文件全称
String fileNameStr = file.getOriginalFilename();
//获取最后.的位置
@@ -497,6 +505,7 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
return Result.error("第" + index + "条记录的起草责任单位不能为空");
}
if (StringUtils.isNotBlank(esRevisePlan.getDrafter())) {
List<String> drafterNameList = new ArrayList<>();
int tempCount = 1;
for (String drafter : esRevisePlan.getDrafter().split(",")) {
LambdaQueryWrapper<TsUser> wrapper = new LambdaQueryWrapper<>();
@@ -504,16 +513,20 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
wrapper.eq(TsUser::getState, "1");
wrapper.eq(TsUser::getValidFlag, "0");
wrapper.eq(TsUser::getDisableFlag,"0");
int count = tsUserService.count(wrapper);
if (count < 1) {
List<TsUser> list = tsUserService.list(wrapper);
if (list.size() < 1) {
return Result.error("第" + index + "条记录的第"+tempCount+"个起草人不存在");
}
String drafterName = list.get(0).getUname() + "(" + list.get(0).getAccount() + ")";
drafterNameList.add(drafterName);
tempCount++;
}
esRevisePlan.setDrafterName(String.join(",",drafterNameList));
}else {
return Result.error("第" + index + "条记录的起草人不能为空");
}
if (StringUtils.isNotBlank(esRevisePlan.getResPerson())) {
List<String> resPersonNameList = new ArrayList<>();
int tempCount = 1;
for (String resPerson : esRevisePlan.getResPerson().split(",")) {
LambdaQueryWrapper<TsUser> wrapper = new LambdaQueryWrapper<>();
@@ -521,11 +534,14 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
wrapper.eq(TsUser::getState, "1");
wrapper.eq(TsUser::getValidFlag, "0");
wrapper.eq(TsUser::getDisableFlag,"0");
int count = tsUserService.count(wrapper);
if (count < 1) {
List<TsUser> list = tsUserService.list(wrapper);
if (list.size() < 1) {
return Result.error("第" + index + "条记录的第"+tempCount+"个内部评审责任人不存在");
}
String resPersonName = list.get(0).getUname() + "(" + list.get(0).getAccount() + ")";
resPersonNameList.add(resPersonName);
}
esRevisePlan.setResPersonName(String.join(",",resPersonNameList));
}else {
return Result.error("第" + index + "条记录的内部评审责任人不能为空");
}
@@ -535,10 +551,12 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
wrapper.eq(TsUser::getState, "1");
wrapper.eq(TsUser::getValidFlag, "0");
wrapper.eq(TsUser::getDisableFlag,"0");
int count = tsUserService.count(wrapper);
if (count < 1) {
List<TsUser> list = tsUserService.list(wrapper);
if (list.size() < 1) {
return Result.error("第" + index + "条记录的技术委员会评审负责人不存在");
}
String wgLeaderName = list.get(0).getUname() + "(" + list.get(0).getAccount() + ")";
esRevisePlan.setWgLeaderName(wgLeaderName);
}else {
return Result.error("第" + index + "条记录的技术委员会评审负责人不能为空");
}
@@ -615,7 +633,14 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
ProcessRollBackEO rollBackEO=new ProcessRollBackEO();
rollBackEO.setType("25");
rollBackEO.setId("enterpriseStandardSystemRevisionPlan");
String jsonString = JSONObject.toJSONString(esRevisePlan);
JSONObject jsonObject =(JSONObject) JSONObject.toJSON(esRevisePlan);
jsonObject.put("addFlag",1);
jsonObject.put("esId",objectResponseMessage.getData().toString());
jsonObject.put("prcCreateUser",userId);
jsonObject.put("prcCreateUserName",userInfo.getUname());
jsonObject.put("nowEsId",objectResponseMessage.getData().toString());
jsonObject.put("type","5");
String jsonString = JSONObject.toJSONString(jsonObject);
rollBackEO.setJson(jsonString);
rollBackEO.setUserId(userId);
Wrapper<String> stringWrapper = workFlowFeignClient.activiti_define_start_rollBack(rollBackEO);