feat: There is no way the
This commit is contained in:
super_liu
+66
@@ -1,10 +1,14 @@
|
||||
package com.adc.da.slrs.sarBussionessStand.dao;
|
||||
|
||||
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
|
||||
import com.adc.da.slrs.sarStandardsInfo.entity.RecommendVO;
|
||||
import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
|
||||
import com.adc.da.sys.entity.UserEO;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@@ -30,4 +34,66 @@ public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
|
||||
|
||||
List<SarBussionessStand> getBussionessStandInfoPage(SarBussionessStandEOPage page);
|
||||
|
||||
List<SarBussionessStand> getBussionessStandInfoPageByRole(SarBussionessStandEOPage page);
|
||||
|
||||
//企标复审使用
|
||||
List<SarBussionessStand> getBussionessStandInfoQbfs(SarBussionessStandEOPage page);
|
||||
|
||||
int getBussionessStandInfoCountByRole(SarBussionessStandEOPage page);
|
||||
|
||||
List<SarBussionessStand> getSarBussionessStand(SarBussionessStandEOPage page);
|
||||
//liwenxuan:标准法规更新数量及清单:企业标准
|
||||
Integer selectBussionessStandardsCount(Date visitTime);
|
||||
//liwenxuan:标准法规更新数量及清单:企业标准All
|
||||
Integer selectBussionessStandardsCountAll();
|
||||
|
||||
|
||||
List<SarBussionessStand> selectSarBussionesDownloadFileInfo(String id);
|
||||
|
||||
List<SarBussionessStand> selectStandardsByStandnumber(SarBussionessStand sarStandardsInfoEO);
|
||||
|
||||
List<SarBussionessStand> selectStandByStandNumber(@Param("standCode") String standCode);
|
||||
|
||||
/**
|
||||
* 搜索中心查询相关推荐
|
||||
*
|
||||
* @param:
|
||||
* @auther: gaoyan
|
||||
* @date: 2018/11/10 9:22
|
||||
*/
|
||||
List<RecommendVO> selectRecommendStand(SarBussionessStandEOPage pagenew);
|
||||
|
||||
List<RecommendVO> selectCloseStand(SarBussionessStandEOPage pagenew);
|
||||
|
||||
List<SarBussionessStand> queryByPutTimeList(SarBussionessStand sarBussionessStandEO);
|
||||
|
||||
int updateByStandNum(SarBussionessStand s);
|
||||
|
||||
/**
|
||||
* 根据唯一的标准code，修改标准的被代替标准号
|
||||
* @param:
|
||||
* @auther: gaoyan
|
||||
* @date: 2018/11/10 9:22
|
||||
*/
|
||||
int updateRelacedNumByNumber(SarBussionessStandEOPage pagenew);
|
||||
|
||||
int updateRelaceNumByNumber(SarBussionessStandEOPage pagenew);
|
||||
|
||||
List<SarBussionessStand> selectBussStandByIdAndRole(SarBussionessStandEOPage pagenew);
|
||||
|
||||
void updateReplacedNumById(SarBussionessStand sarBussionessStandEO);
|
||||
|
||||
Integer selectStandColumn(@Param("columnName") String columnName);
|
||||
|
||||
List<SarBussionessStand> standRemindInfo(@Param("standCode") String standCode, @Param("standName") String standName);
|
||||
|
||||
int selectIsExit(@Param("id") String id);
|
||||
|
||||
List<String> selectPerson(String qbid);
|
||||
|
||||
List<UserEO> selectPersonAll(String qbid);
|
||||
|
||||
int updateByPrimaryKeySelectiveTimeNotNull(SarBussionessStand sarBussionessStandEO);
|
||||
|
||||
|
||||
}
|
||||
|
||||
+165
-8
@@ -8,6 +8,11 @@ import com.adc.da.common.SelectionTypeEnum;
|
||||
import com.adc.da.common.UseModuleEnum;
|
||||
import com.adc.da.mq.dao.OtConvertEODao;
|
||||
import com.adc.da.mq.service.CreateMQService;
|
||||
import com.adc.da.mq.service.CreateStandMQService;
|
||||
import com.adc.da.person.entity.PersonShareEO;
|
||||
import com.adc.da.person.entity.TsPersonCollect;
|
||||
import com.adc.da.person.page.PersonCollectEOPage;
|
||||
import com.adc.da.person.page.PersonShareEOPage;
|
||||
import com.adc.da.person.service.IPersonCollectEOService;
|
||||
import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao;
|
||||
import com.adc.da.slrs.sarBussStandFile.dao.SarBussStandFileDao;
|
||||
@@ -27,10 +32,12 @@ import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao;
|
||||
import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
|
||||
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
|
||||
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage;
|
||||
import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService;
|
||||
import com.adc.da.slrs.sarUser.service.ITsUserService;
|
||||
import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
|
||||
import com.adc.da.sys.constant.ValueStateEnum;
|
||||
import com.adc.da.sys.dao.DicTypeEODao;
|
||||
import com.adc.da.sys.entity.DicTypeEO;
|
||||
import com.adc.da.sys.util.LoginUserUtil;
|
||||
import com.adc.da.util.UUIDUtils;
|
||||
import com.adc.da.utils.util.FieldConvertUtil;
|
||||
@@ -38,10 +45,14 @@ import com.adc.da.utils.util.InitStandAttrUtil;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import net.sf.json.JSONObject;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.sql.Clob;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
@@ -55,6 +66,17 @@ import java.util.*;
|
||||
@Service
|
||||
public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStandDao, SarBussionessStand> implements ISarBussionessStandService {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(SarBussionessStandServiceImpl.class);
|
||||
|
||||
@Value("${elas.flag}")
|
||||
private boolean elasflag; //ES是否启用
|
||||
|
||||
@Value("${file.path}")
|
||||
private String filePath;//文件存储路径
|
||||
|
||||
@Autowired
|
||||
private SarBussionessStandDao sarBussionessStandEODao;
|
||||
|
||||
@Autowired
|
||||
private ITsUserService tsUserService;
|
||||
|
||||
@@ -91,6 +113,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
|
||||
@Autowired
|
||||
private SarStandardsInfoDao sarStandardsInfoEODao;
|
||||
|
||||
@Autowired
|
||||
private CreateStandMQService createStandMQService;
|
||||
|
||||
@Autowired
|
||||
private ISarUpdLogService sarUpdLogEOService;
|
||||
|
||||
@Autowired
|
||||
private SarBussStandAttrInfoDao sarBussStandAttrInfoEODao;
|
||||
|
||||
@@ -126,18 +154,147 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
|
||||
}
|
||||
createStandAttrInfo(sarBussionessStandEO);
|
||||
// 根据代替标准号 ，修改代替标准号标准中的，被代替标准号
|
||||
// updateReplaceConnect(sarBussionessStandEO);
|
||||
// //修改收藏分享编号名称
|
||||
// updateCollectAndShare(sarBussionessStandEO);
|
||||
// // 记录修改日志
|
||||
// saveUpdateLog(sarBussionessStandEO,beforeStandEO);
|
||||
// if (elasflag) {
|
||||
// createStandMQService.sendBussStandMQ(sarBussionessStandEO, "update");
|
||||
// }
|
||||
updateReplaceConnect(sarBussionessStandEO);
|
||||
//修改收藏分享编号名称
|
||||
updateCollectAndShare(sarBussionessStandEO);
|
||||
// 记录修改日志
|
||||
saveUpdateLog(sarBussionessStandEO,beforeStandEO);
|
||||
if (elasflag) {
|
||||
createStandMQService.sendBussStandMQ(sarBussionessStandEO, "update");
|
||||
}
|
||||
}
|
||||
return sarBussionessStandEO;
|
||||
}
|
||||
|
||||
public void saveUpdateLog(SarBussionessStand sarStandardsInfoEO,SarBussionessStand beforeSarStandardsInfo) throws Exception{
|
||||
Map<String,Object> newMap = new HashMap<>();
|
||||
Map<String,Object> oldMap = beforeSarStandardsInfo.getAttrInfoMap();
|
||||
String attrStr = sarStandardsInfoEO.getSarStandAttrEOStr();
|
||||
if (StringUtils.isNotBlank(attrStr)) {
|
||||
newMap = JSONObject.fromObject(attrStr);
|
||||
}
|
||||
newMap = changeMap(sarStandardsInfoEO,newMap);
|
||||
oldMap = changeMap(beforeSarStandardsInfo,oldMap);
|
||||
String sortName = sysInfoEOService.getDicNamesByCodes(sarStandardsInfoEO.getStandSort());
|
||||
String number = sortName + " " + sarStandardsInfoEO.getStandCode();
|
||||
if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) {
|
||||
number += "-" + sarStandardsInfoEO.getStandYear();
|
||||
}
|
||||
String content = number + " 《" + sarStandardsInfoEO.getStandName() + "》";
|
||||
sarUpdLogEOService.createUpdateLog(SarTypeEnum.BUSINESS.getValue(),sarStandardsInfoEO.getId(),oldMap,newMap,content);
|
||||
}
|
||||
|
||||
public Map<String,Object> changeMap (SarBussionessStand sarStandardsInfoEO,Map<String,Object> map) {
|
||||
map.put("country",sarStandardsInfoEO.getApplyCountry());
|
||||
map.put("standSort",sarStandardsInfoEO.getStandSort());
|
||||
map.put("standNumber",sarStandardsInfoEO.getStandCode());
|
||||
map.put("standYear",sarStandardsInfoEO.getStandYear());
|
||||
map.put("standName",sarStandardsInfoEO.getStandName());
|
||||
map.put("standEnName",sarStandardsInfoEO.getStandEnName());
|
||||
map.put("standNature",sarStandardsInfoEO.getStandNature());
|
||||
map.put("standState",sarStandardsInfoEO.getStandStatus());
|
||||
if (sarStandardsInfoEO.getIssueTime() != null) {
|
||||
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
|
||||
String issueStr = format.format(sarStandardsInfoEO.getIssueTime());
|
||||
map.put("issueTime",issueStr);
|
||||
}
|
||||
if (sarStandardsInfoEO.getPutTime() != null) {
|
||||
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
|
||||
String issueStr = format.format(sarStandardsInfoEO.getPutTime());
|
||||
map.put("putTime",issueStr);
|
||||
}
|
||||
map.put("replaceStandNum",sarStandardsInfoEO.getReplaceStandNum());
|
||||
map.put("replacedStandNum",sarStandardsInfoEO.getReplacedStandNum());
|
||||
return map;
|
||||
}
|
||||
|
||||
public void updateCollectAndShare(SarBussionessStand sarBussionessStandEO) throws Exception {
|
||||
//修改收藏表中
|
||||
String number = sarBussionessStandEO.getStandCode()+ "）";
|
||||
PersonCollectEOPage personCollectEOPage = new PersonCollectEOPage();
|
||||
personCollectEOPage.setValidFlag("0");
|
||||
personCollectEOPage.setCollectResId(sarBussionessStandEO.getId());
|
||||
List<TsPersonCollect> listCollect = personCollectEOService.queryByList(personCollectEOPage);
|
||||
if (listCollect != null && listCollect.size() > 0) {
|
||||
for (TsPersonCollect getCollect : listCollect) {
|
||||
TsPersonCollect collectEO = new TsPersonCollect();
|
||||
collectEO.setId(getCollect.getId());
|
||||
collectEO.setCollectTitle(sarBussionessStandEO.getStandName() + " " + "（ 编号:" + number);
|
||||
personCollectEOService.updateByPrimaryKeySelective(collectEO);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void updateReplaceConnect(SarBussionessStand sarBussionessStandEO) throws Exception{
|
||||
if(StringUtils.isNotEmpty(sarBussionessStandEO.getReplaceStandNum())){
|
||||
SarBussionessStandEOPage sarStandardsInfoEOPage = new SarBussionessStandEOPage();
|
||||
//当前代替标准号的标准类别为类别name，需修改为code
|
||||
String[] replaceList = sarBussionessStandEO.getReplaceStandNum().trim().split(",");
|
||||
String replaceListNew[];
|
||||
int countre = 0;
|
||||
// List<String> newReplaceList = new ArrayList<>();
|
||||
if (replaceList!=null && replaceList.length>0) {
|
||||
for(String replaceNum : replaceList){
|
||||
if(replaceNum.indexOf(" ")!=-1){
|
||||
String dicName = replaceNum.substring(0,replaceNum.lastIndexOf(" "));
|
||||
DicTypeEO dicTypeEO = new DicTypeEO();
|
||||
dicTypeEO.setDicTypeName(dicName);
|
||||
dicTypeEO.setDicTypeCode("BUSSSTANDCLASS");
|
||||
List<DicTypeEO> getDicCode = dicTypeEODao.getDicTypeByDicTypeName(dicTypeEO);
|
||||
if(getDicCode!= null && getDicCode.size()>0){
|
||||
replaceNum = replaceNum.replaceFirst(dicName,getDicCode.get(0).getDicTypeCode());
|
||||
replaceList[countre] = replaceNum;
|
||||
countre++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
sarStandardsInfoEOPage.setReplaceStandNumList(replaceList);
|
||||
// 2021/03/30 刘慧文修改 标准类别已不存在
|
||||
if(StringUtils.isNotEmpty(sarBussionessStandEO.getStandYear())){
|
||||
sarStandardsInfoEOPage.setReplacedStandNum(sarBussionessStandEO.getStandCode()+"-"+sarBussionessStandEO.getStandYear());
|
||||
} else {
|
||||
sarStandardsInfoEOPage.setReplacedStandNum(sarBussionessStandEO.getStandCode());
|
||||
}
|
||||
int updateResult = sarBussionessStandEODao.updateRelacedNumByNumber(sarStandardsInfoEOPage);
|
||||
|
||||
//编写预警信息
|
||||
// writeWarnings(sarBussionessStandEO);
|
||||
}
|
||||
if (StringUtils.isNotEmpty(sarBussionessStandEO.getReplacedStandNum())) {
|
||||
SarBussionessStandEOPage sarStandardsInfoEOPage = new SarBussionessStandEOPage();
|
||||
//当前代替标准号的标准类别为类别name，需修改为code
|
||||
String[] replaceList = sarBussionessStandEO.getReplacedStandNum().trim().split(",");
|
||||
int countre = 0;
|
||||
// List<String> newReplaceList = new ArrayList<>();
|
||||
if (replaceList!=null && replaceList.length>0) {
|
||||
for(String replaceNum : replaceList){
|
||||
if(replaceNum.indexOf(" ")!=-1){
|
||||
String dicName = replaceNum.substring(0,replaceNum.lastIndexOf(" "));
|
||||
DicTypeEO dicTypeEO = new DicTypeEO();
|
||||
dicTypeEO.setDicTypeName(dicName);
|
||||
dicTypeEO.setDicTypeCode("BUSSSTANDCLASS");
|
||||
List<DicTypeEO> getDicCode = dicTypeEODao.getDicTypeByDicTypeName(dicTypeEO);
|
||||
if(getDicCode!= null && getDicCode.size()>0){
|
||||
replaceNum = replaceNum.replaceFirst(dicName,getDicCode.get(0).getDicTypeCode());
|
||||
replaceList[countre] = replaceNum;
|
||||
countre++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
sarStandardsInfoEOPage.setReplacedStandNumList(replaceList);
|
||||
// 2021/03/30 刘慧文修改 标准类别已不存在
|
||||
if(StringUtils.isNotEmpty(sarBussionessStandEO.getStandYear())){
|
||||
sarStandardsInfoEOPage.setReplaceStandNum(sarBussionessStandEO.getStandCode()+"-"+sarBussionessStandEO.getStandYear());
|
||||
} else {
|
||||
sarStandardsInfoEOPage.setReplaceStandNum(sarBussionessStandEO.getStandCode());
|
||||
}
|
||||
int updateResult = sarBussionessStandEODao.updateRelaceNumByNumber(sarStandardsInfoEOPage);
|
||||
}
|
||||
}
|
||||
|
||||
/***
|
||||
* @Description: 新增属性表数据
|
||||
* @Author: yangxuenan
|
||||
|
||||
Reference in New Issue
Block a user