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

合并分支 'dev_20230216' 到 'master'

Browse Source 
优化企标导入

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!28
This commit is contained in:
高嵩
2023-03-28 18:23:07 +08:00
parent 3d05df1055 fdbd2a3336
commit 2ca755d253
3 changed files with 51 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
+31 -38
View File
@@ -193,13 +193,6 @@ public class ActSarItemsEOService {
String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
sarStandardsInfoEO.setSarStandAttrEOStr(resData); sarStandardsInfoEO.setSarStandAttrEOStr(resData);
QueryWrapper<SarStandardsInfo> wrapper=new QueryWrapper<>();
wrapper.eq(null!=sarStandardsInfoEO.getStandName(),"STAND_NAME",sarStandardsInfoEO.getStandName())
.eq(null!=sarStandardsInfoEO.getStandNumber(),"STAND_NUMBER",sarStandardsInfoEO.getStandNumber());
Integer s=sarStandardsInfoEOService.count(wrapper);
if (s>0){
throw new AdcDaBaseException("当前标准编号和中文名称已存在");
}
// 根据标准号判断数据是否已存在 // 根据标准号判断数据是否已存在
//2021年4月9日 此处检查当前是否存在standId //2021年4月9日 此处检查当前是否存在standId
String standnumber = ""; String standnumber = "";
@@ -254,37 +247,37 @@ public class ActSarItemsEOService {
sarStandAttrInfoEOService.updateStandInfo(sarStandardsInfoEO.getId(),"XGLC",relatePro); sarStandAttrInfoEOService.updateStandInfo(sarStandardsInfoEO.getId(),"XGLC",relatePro);
String content = "新增一条相关流程:" +prcName+" "+prcNum; String content = "新增一条相关流程:" +prcName+" "+prcNum;
sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(),standType+"_STAND",content); sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(),standType+"_STAND",content);
}else if (standlist != null && !standlist.isEmpty()) {//Id不存在，但是标准号存在的情况 // }else if (standlist != null && !standlist.isEmpty()) {//Id不存在，但是标准号存在的情况
String standId = standlist.get(0).getId(); // String standId = standlist.get(0).getId();
SarStandardsInfo query = new SarStandardsInfo(); // SarStandardsInfo query = new SarStandardsInfo();
query.setId(standId); // query.setId(standId);
sarStandardsInfoEOService.attrInfoDetails(query); // sarStandardsInfoEOService.attrInfoDetails(query);
Map<String, Object> attrInfoMap = query.getAttrInfoMap(); // Map<String, Object> attrInfoMap = query.getAttrInfoMap();
if(attInfoMap!=null && !attInfoMap.isEmpty()){ // if(attInfoMap!=null && !attInfoMap.isEmpty()){
updateStandFileFieldData(attInfoMap,attrInfoMap); // updateStandFileFieldData(attInfoMap,attrInfoMap);
resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); // resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
sarStandardsInfoEO.setSarStandAttrEOStr(resData); // sarStandardsInfoEO.setSarStandAttrEOStr(resData);
} // }
// 查询原相关流程 // // 查询原相关流程
String relatePro = sarStandAttrInfoEOService.selectFieldValByStandId("XGLC",standId); // String relatePro = sarStandAttrInfoEOService.selectFieldValByStandId("XGLC",standId);
if (StringUtils.isNotBlank(relatePro)) { // if (StringUtils.isNotBlank(relatePro)) {
String[] processSplit = relatePro.split(","); // String[] processSplit = relatePro.split(",");
Set<String> processSet = new HashSet<>(); // Set<String> processSet = new HashSet<>();
for(String sData:processSplit){ // for(String sData:processSplit){
processSet.add(sData); // processSet.add(sData);
} // }
processSet.add(prcNum); // processSet.add(prcNum);
relatePro = StringUtils.join(processSet.toArray(), ","); // relatePro = StringUtils.join(processSet.toArray(), ",");
} else { // } else {
relatePro = prcNum; // relatePro = prcNum;
} // }
// 编辑标准 // // 编辑标准
sarStandardsInfoEO.setId(standId); // sarStandardsInfoEO.setId(standId);
sarStandardsInfoEOService.updateSarStandardsInfo(sarStandardsInfoEO); // sarStandardsInfoEOService.updateSarStandardsInfo(sarStandardsInfoEO);
// 编辑相关流程 // // 编辑相关流程
sarStandAttrInfoEOService.updateStandInfo(standId,"XGLC",relatePro); // sarStandAttrInfoEOService.updateStandInfo(standId,"XGLC",relatePro);
String content = "新增一条相关流程:" +prcName+" "+prcNum; // String content = "新增一条相关流程:" +prcName+" "+prcNum;
sarUpdLogEOService.createBaseLog(standId,standType+"_STAND",content); // sarUpdLogEOService.createBaseLog(standId,standType+"_STAND",content);
} else {//标准号、ID都不存在的情况 } else {//标准号、ID都不存在的情况
// 新增方法 // 新增方法
sarStandardsInfoEOService.createSarStandardsInfo(sarStandardsInfoEO); sarStandardsInfoEOService.createSarStandardsInfo(sarStandardsInfoEO);
adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java
+7
View File
@@ -6,6 +6,7 @@ import com.adc.da.slrs.StandardQA.entity.*;
import com.adc.da.slrs.StandardQA.service.Impl.AskQuestionsServiceImpl; import com.adc.da.slrs.StandardQA.service.Impl.AskQuestionsServiceImpl;
import com.adc.da.slrs.StandardQA.service.Impl.AskUserServiceImpl; import com.adc.da.slrs.StandardQA.service.Impl.AskUserServiceImpl;
import com.adc.da.slrs.StandardQA.service.Impl.SubscriptionServiceImpl; import com.adc.da.slrs.StandardQA.service.Impl.SubscriptionServiceImpl;
import com.adc.da.slrs.sarStandardsInfo.service.impl.SarStandardsInfoServiceImpl;
import com.adc.da.util.LoginUserUtil; import com.adc.da.util.LoginUserUtil;
import com.adc.da.util.UUIDUtils; import com.adc.da.util.UUIDUtils;
import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.ResponseMessage;
@@ -16,6 +17,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -41,6 +44,9 @@ public class AskQuestionsController extends BaseController<AskQuestions> {
@Autowired @Autowired
private SubscriptionServiceImpl subscriptionService; private SubscriptionServiceImpl subscriptionService;
private static final Logger logger = LoggerFactory.getLogger(SarStandardsInfoServiceImpl.class);
@GetMapping("/getAskQuestionsPage") @GetMapping("/getAskQuestionsPage")
public ResponseMessage<IPage<AskQuestions>> getAskQuestionsPage(AskQuestionsPage askQuestions){ public ResponseMessage<IPage<AskQuestions>> getAskQuestionsPage(AskQuestionsPage askQuestions){
IPage<AskQuestions> iPage = new Page<>(); IPage<AskQuestions> iPage = new Page<>();
@@ -175,6 +181,7 @@ public class AskQuestionsController extends BaseController<AskQuestions> {
List<String> askUserListUser = new ArrayList<>(); List<String> askUserListUser = new ArrayList<>();
for (AskUser user: askUserList){ for (AskUser user: askUserList){
askUserListUser.add(user.getUsid()); askUserListUser.add(user.getUsid());
logger.info("问答中心分配人员"+user.getUsid()+"===="+user.getAsdId()+"总人数："+askUserList.size());
} }
JSONArray jsonArray = JSONArray.fromObject(askUserListUser); JSONArray jsonArray = JSONArray.fromObject(askUserListUser);
objectObjectHashMap.put("questioner",jsonArray); objectObjectHashMap.put("questioner",jsonArray);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+13 -26
View File
@@ -75,7 +75,9 @@ import com.adc.da.slrs.sarUser.service.ITsUserService;
import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
import com.adc.da.sys.constant.ValueStateEnum; import com.adc.da.sys.constant.ValueStateEnum;
import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.sys.dao.DicTypeEODao;
import com.adc.da.sys.dao.UserEODao;
import com.adc.da.sys.entity.DicTypeEO; import com.adc.da.sys.entity.DicTypeEO;
import com.adc.da.sys.entity.UserEO;
import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard;
import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService; import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService;
import com.adc.da.sys.util.LoginUserUtil; import com.adc.da.sys.util.LoginUserUtil;
@@ -253,6 +255,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
@Autowired @Autowired
private SarStandardsInfoDao sarStandardsInfoDao; private SarStandardsInfoDao sarStandardsInfoDao;
@Override @Override
public SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort,String taskId){ public SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort,String taskId){
SarBussionessStand bussionessStand = new SarBussionessStand(); SarBussionessStand bussionessStand = new SarBussionessStand();
@@ -2111,6 +2114,14 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
} }
} }
} }
String fields = StringUtils.join(headerExcel);
String excelHeader = sb.toString();
if (!fields.equals(excelHeader)) {
workbook.close();
//删除原上传文件
FileUnZip.deleteDir(saveDirectory);
return Result.error("fail", "读取失败，请严格按照模板文件导入数据");
}
SarBussStandAttrInfoExecl sarBussStandAttrInfo = new SarBussStandAttrInfoExecl(); SarBussStandAttrInfoExecl sarBussStandAttrInfo = new SarBussStandAttrInfoExecl();
if (i != 0) { if (i != 0) {
@@ -2294,14 +2305,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
} }
} }
} }
String fields = StringUtils.join(headerExcel);
String excelHeader = sb.toString();
if (!fields.equals(excelHeader)) {
workbook.close();
//删除原上传文件
FileUnZip.deleteDir(saveDirectory);
return Result.error("fail", "读取失败，请严格按照模板文件导入数据");
}
} }
} }
}catch (Exception e){ }catch (Exception e){
@@ -2403,24 +2406,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
// 编辑标准 // 编辑标准
iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand); iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand);
}else if (lawsList != null && !lawsList.isEmpty()) {//Id不存在，但是标准号存在的情况
String standId = lawsList.get(0).getId();
bussId = lawsList.get(0).getId();
SarBussionessStand query = new SarBussionessStand();
query.setId(standId);
iSarBussionessStandService.attrInfoDetails(query);
Map<String, Object> attrInfoMap = query.getAttrInfoMap();
if(attInfoMap!=null && !attInfoMap.isEmpty()){
// updateStandFileFieldData(attInfoMap,attrInfoMap);
resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
sarBussionessStand.setSarStandAttrEOStr(resData);
}
// 编辑标准
sarBussionessStand.setId(standId);
iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand);
} else {//标准号、ID都不存在的情况 } else {//标准号、ID都不存在的情况
// 新增方法 // 新增方法
sarBussionessStand.setStandCode(standCode); sarBussionessStand.setStandCode(standCode);
@@ -3875,12 +3860,14 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
String str = updateInfo(asList, data.getStandId(), data.getAttfid()); String str = updateInfo(asList, data.getStandId(), data.getAttfid());
if(StringUtils.isNotBlank(str)){ if(StringUtils.isNotBlank(str)){
objects.add(str); objects.add(str);
logger.info("产品附件的修改数据==========="+str);
} }
} }
} }
} }
} }
} }
logger.info("产品附件结束完成！==========="+objects.toString());
return Result.success(objects); return Result.success(objects);
} }