diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/dao/SarBussStandFileDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/dao/SarBussStandFileDao.java index e99f9834..f6a592ea 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/dao/SarBussStandFileDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandFile/dao/SarBussStandFileDao.java @@ -34,6 +34,4 @@ public interface SarBussStandFileDao extends BaseMapper { int insertSelective(SarBussStandFile sarBussStandFile); int updateByPrimaryKeySelective(SarBussStandFile sarBussStandFile); - - int deleteByPrimaryKey(String value); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandItems/dao/SarBussStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandItems/dao/SarBussStandItemsDao.java index 5b7b2661..179e15a2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandItems/dao/SarBussStandItemsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandItems/dao/SarBussStandItemsDao.java @@ -2,8 +2,6 @@ package com.adc.da.slrs.sarBussStandItems.dao; import com.adc.da.slrs.sarBussStandItems.entity.SarBussStandItems; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; /** *

@@ -13,9 +11,6 @@ import org.springframework.stereotype.Repository; * @author super_liu * @since 2021-07-25 */ -@Repository public interface SarBussStandItemsDao extends BaseMapper { - int deleteByStandIdAndFileType(@Param("standId") String standId, @Param("fileType") String fileType); - } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandItems/page/SarBussStandItemsEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandItems/page/SarBussStandItemsEOPage.java deleted file mode 100644 index c5908268..00000000 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandItems/page/SarBussStandItemsEOPage.java +++ /dev/null @@ -1,338 +0,0 @@ -package com.adc.da.slrs.sarBussStandItems.page; - -import com.adc.da.sys.common.BasePage; - -/** - * 功能：SAR_BUSS_STAND_ITEMS SarBussStandItemsEOPage
- * 作者：code generator
- * 日期： 2018-09-03
- * 版权所有：版权归北京卡达克数据技术中心所有。
- */ -public class SarBussStandItemsEOPage extends BasePage { - - private String modifyTime; - private String modifyTime1; - private String modifyTime2; - private String modifyTimeOperator = "="; - private String creationTime; - private String creationTime1; - private String creationTime2; - private String creationTimeOperator = "="; - private String validFlag; - private String validFlagOperator = "="; - private String remarks; - private String remarksOperator = "="; - private String responsibleUnit; - private String responsibleUnitOperator = "="; - private String energyKind; - private String energyKindOperator = "="; - private String applyArctic; - private String applyArcticOperator = "="; - private String tackTime; - private String tackTime1; - private String tackTime2; - private String tackTimeOperator = "="; - private String parts; - private String partsOperator = "="; - private String itemsName; - private String itemsNameOperator = "="; - private String itemsNum; - private String itemsNumOperator = "="; - private String standId; - private String standIdOperator = "="; - private String id; - private String idOperator = "="; - - private String processFlag; - private String nameOrRequest; - private String[] idlist; - private String fileType; - - public String getModifyTime() { - return this.modifyTime; - } - - public void setModifyTime(String modifyTime) { - this.modifyTime = modifyTime; - } - - public String getModifyTime1() { - return this.modifyTime1; - } - - public void setModifyTime1(String modifyTime1) { - this.modifyTime1 = modifyTime1; - } - - public String getModifyTime2() { - return this.modifyTime2; - } - - public void setModifyTime2(String modifyTime2) { - this.modifyTime2 = modifyTime2; - } - - public String getModifyTimeOperator() { - return this.modifyTimeOperator; - } - - public void setModifyTimeOperator(String modifyTimeOperator) { - this.modifyTimeOperator = modifyTimeOperator; - } - - public String getCreationTime() { - return this.creationTime; - } - - public void setCreationTime(String creationTime) { - this.creationTime = creationTime; - } - - public String getCreationTime1() { - return this.creationTime1; - } - - public void setCreationTime1(String creationTime1) { - this.creationTime1 = creationTime1; - } - - public String getCreationTime2() { - return this.creationTime2; - } - - public void setCreationTime2(String creationTime2) { - this.creationTime2 = creationTime2; - } - - public String getCreationTimeOperator() { - return this.creationTimeOperator; - } - - public void setCreationTimeOperator(String creationTimeOperator) { - this.creationTimeOperator = creationTimeOperator; - } - - public String getValidFlag() { - return this.validFlag; - } - - public void setValidFlag(String validFlag) { - this.validFlag = validFlag; - } - - public String getValidFlagOperator() { - return this.validFlagOperator; - } - - public void setValidFlagOperator(String validFlagOperator) { - this.validFlagOperator = validFlagOperator; - } - - public String getRemarks() { - return this.remarks; - } - - public void setRemarks(String remarks) { - this.remarks = remarks; - } - - public String getRemarksOperator() { - return this.remarksOperator; - } - - public void setRemarksOperator(String remarksOperator) { - this.remarksOperator = remarksOperator; - } - - public String getResponsibleUnit() { - return this.responsibleUnit; - } - - public void setResponsibleUnit(String responsibleUnit) { - this.responsibleUnit = responsibleUnit; - } - - public String getResponsibleUnitOperator() { - return this.responsibleUnitOperator; - } - - public void setResponsibleUnitOperator(String responsibleUnitOperator) { - this.responsibleUnitOperator = responsibleUnitOperator; - } - - public String getEnergyKind() { - return this.energyKind; - } - - public void setEnergyKind(String energyKind) { - this.energyKind = energyKind; - } - - public String getEnergyKindOperator() { - return this.energyKindOperator; - } - - public void setEnergyKindOperator(String energyKindOperator) { - this.energyKindOperator = energyKindOperator; - } - - public String getApplyArctic() { - return this.applyArctic; - } - - public void setApplyArctic(String applyArctic) { - this.applyArctic = applyArctic; - } - - public String getApplyArcticOperator() { - return this.applyArcticOperator; - } - - public void setApplyArcticOperator(String applyArcticOperator) { - this.applyArcticOperator = applyArcticOperator; - } - - public String getTackTime() { - return this.tackTime; - } - - public void setTackTime(String tackTime) { - this.tackTime = tackTime; - } - - public String getTackTime1() { - return this.tackTime1; - } - - public void setTackTime1(String tackTime1) { - this.tackTime1 = tackTime1; - } - - public String getTackTime2() { - return this.tackTime2; - } - - public void setTackTime2(String tackTime2) { - this.tackTime2 = tackTime2; - } - - public String getTackTimeOperator() { - return this.tackTimeOperator; - } - - public void setTackTimeOperator(String tackTimeOperator) { - this.tackTimeOperator = tackTimeOperator; - } - - public String getParts() { - return this.parts; - } - - public void setParts(String parts) { - this.parts = parts; - } - - public String getPartsOperator() { - return this.partsOperator; - } - - public void setPartsOperator(String partsOperator) { - this.partsOperator = partsOperator; - } - - public String getItemsName() { - return this.itemsName; - } - - public void setItemsName(String itemsName) { - this.itemsName = itemsName; - } - - public String getItemsNameOperator() { - return this.itemsNameOperator; - } - - public void setItemsNameOperator(String itemsNameOperator) { - this.itemsNameOperator = itemsNameOperator; - } - - public String getItemsNum() { - return this.itemsNum; - } - - public void setItemsNum(String itemsNum) { - this.itemsNum = itemsNum; - } - - public String getItemsNumOperator() { - return this.itemsNumOperator; - } - - public void setItemsNumOperator(String itemsNumOperator) { - this.itemsNumOperator = itemsNumOperator; - } - - public String getStandId() { - return this.standId; - } - - public void setStandId(String standId) { - this.standId = standId; - } - - public String getStandIdOperator() { - return this.standIdOperator; - } - - public void setStandIdOperator(String standIdOperator) { - this.standIdOperator = standIdOperator; - } - - public String getId() { - return this.id; - } - - public void setId(String id) { - this.id = id; - } - - public String getIdOperator() { - return this.idOperator; - } - - public void setIdOperator(String idOperator) { - this.idOperator = idOperator; - } - - public String getProcessFlag() { - return processFlag; - } - - public void setProcessFlag(String processFlag) { - this.processFlag = processFlag; - } - - public String getNameOrRequest() { - return nameOrRequest; - } - - public void setNameOrRequest(String nameOrRequest) { - this.nameOrRequest = nameOrRequest; - } - - public String[] getIdlist() { - return idlist; - } - - public void setIdlist(String[] idlist) { - this.idlist = idlist; - } - - public String getFileType() { - return fileType; - } - - public void setFileType(String fileType) { - this.fileType = fileType; - } -} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/dao/SarBussStandValDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/dao/SarBussStandValDao.java index 986f4737..e03fc1cd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/dao/SarBussStandValDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandVal/dao/SarBussStandValDao.java @@ -21,5 +21,4 @@ public interface SarBussStandValDao extends BaseMapper { int deleteDataByStandId(String standId); int insertForeach(List list); //批量新增 - } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index edc3bb3b..c6a92e00 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -1,7 +1,6 @@ package com.adc.da.slrs.sarBussionessStand.controller; -import com.adc.da.common.ReadExcel; import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarResource.entity.TsResource; @@ -15,27 +14,17 @@ import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.util.LoginUserUtil; -import com.adc.da.util.exception.AdcDaBaseException; -import com.adc.da.util.utils.IOUtils; import com.adc.da.util.utils.StringUtils; -import com.adc.da.utils.util.BussStandExportUtil; import com.adc.da.utils.util.SarAdvanceSearchUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; -import org.apache.poi.ss.usermodel.Workbook; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.OutputStream; import java.util.Date; import java.util.List; @@ -52,8 +41,6 @@ import java.util.List; @RequestMapping("/${restPath}/lawss/sarBussionessStand") public class SarBussionessStandController extends BaseController { - private static final Logger logger = LoggerFactory.getLogger(SarBussionessStandController.class); - @Autowired private ISarBussionessStandService sarBussionessStandEOService; @@ -70,54 +57,6 @@ public class SarBussionessStandController extends BaseController result = sarBussionessStandEOService.deleteSarBussionessStand(sarBussionessStandEOPage); - logger.info("delete from SAR_BUSSIONESS_STAND where id = {}", ids); - return result; - } - - /** - * 将查询出来的数据导出到EXCEL表格中 - * @param - * @return - * @author gaoyan - * date 2018-09-04 - */ - @ApiOperation(value = "|SarBussionessStandEO|导出excel") - @GetMapping(value = "/exportSarBussionessStand") - public void exportSarBussionessStand(String exportContent, String exportType, String exportName,String userId, HttpServletResponse response, HttpServletRequest request)throws Exception { - OutputStream os = null; - Workbook workbook = null; - try { - if(StringUtils.isEmpty(exportName)||exportName.equals("null")){ - exportName="企业标准库"; - } - response.setHeader("Content-Disposition", - "attachment; filename=" + ReadExcel.encodeFileName(exportName+".xlsx",request)); - response.setContentType("application/force-download"); - //导出数据 - List datas = sarBussionessStandEOService.getSarBussionessStand(exportType,exportContent,userId); - workbook = BussStandExportUtil.exportDatas(datas); - os = response.getOutputStream(); - workbook.write(os); - os.flush(); - } catch (IOException e) { - logger.error(e.getMessage(), e); - throw new AdcDaBaseException("下载文件失败，请重试"); - } finally { - IOUtils.closeQuietly(os); - if (workbook != null) { - workbook.close(); - } - } - } - @ApiOperation(value = "|SarBussionessStandEO|企业标准修改") @PostMapping(value = "/updateSarBussionessStand") //401问题2021-03-31暂时注释掉 liuhuiwen diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index 940158c6..79a5af4f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -95,7 +95,5 @@ public interface SarBussionessStandDao extends BaseMapper { int updateByPrimaryKeySelectiveTimeNotNull(SarBussionessStand sarBussionessStandEO); - int updateByPrimaryKeySelective(SarBussionessStand sarBussionessStandEO); - } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index ed9f6855..08cf908a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -1,6 +1,5 @@ package com.adc.da.slrs.sarBussionessStand.service; -import com.adc.da.http.ResponseMessage; import com.adc.da.search.entity.SarBussionessStandEO; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; @@ -18,10 +17,6 @@ import java.util.List; */ public interface ISarBussionessStandService extends IService { - ResponseMessage deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception; - - List getSarBussionessStand(String exportType, String exportContent,String userId) throws Exception; - SarBussionessStand updateSarBussionessStand(SarBussionessStand sarBussionessStandEO) throws Exception; List selectStandardsByStandNumber(String replaceStandNum); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 4b486b60..2a65a976 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -6,22 +6,16 @@ import com.adc.da.common.ConvertMqEO; import com.adc.da.common.SarTypeEnum; import com.adc.da.common.SelectionTypeEnum; import com.adc.da.common.UseModuleEnum; -import com.adc.da.http.ResponseMessage; -import com.adc.da.http.Result; import com.adc.da.mq.CreateMQService; import com.adc.da.mq.CreateStandMQService; -import com.adc.da.person.dao.PersonCollectEODao; import com.adc.da.person.entity.TsPersonCollect; import com.adc.da.person.page.PersonCollectEOPage; import com.adc.da.person.service.IPersonCollectEOService; -import com.adc.da.search.entity.StandLawsEO; -import com.adc.da.search.service.StandLawsSearchService; import com.adc.da.slrs.otConvertMq.dao.OtConvertMqDao; import com.adc.da.slrs.otConvertMq.entity.OtConvertMq; import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; import com.adc.da.slrs.sarBussStandFile.dao.SarBussStandFileDao; import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile; -import com.adc.da.slrs.sarBussStandItems.dao.SarBussStandItemsDao; import com.adc.da.slrs.sarBussStandMenu.dao.SarBussStandMenuDao; import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu; import com.adc.da.slrs.sarBussStandVal.dao.SarBussStandValDao; @@ -33,7 +27,6 @@ import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; -import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.slrs.sarUser.service.ITsUserService; @@ -45,7 +38,6 @@ import com.adc.da.sys.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; import com.adc.da.utils.util.FieldConvertUtil; import com.adc.da.utils.util.InitStandAttrUtil; -import com.adc.da.utils.util.SarAdvanceSearchUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.sf.json.JSONObject; @@ -128,169 +120,9 @@ public class SarBussionessStandServiceImpl extends ServiceImpl deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception { - SarBussionessStand sarStandardsInfoEO = new SarBussionessStand(); - sarStandardsInfoEO.setValidFlag(1); - sarStandardsInfoEO.setModifyTime(new Date()); - for (String id : page.getIdlist()) { - //删除标准表 - sarStandardsInfoEO.setId(id); - sarBussionessStandEODao.updateByPrimaryKeySelective(sarStandardsInfoEO); - // 删除标准属性表 - sarBussStandAttrInfoEODao.deleteStandAttrByStandId(id); - // 删除条款 - sarBussStandItemsEODao.deleteByStandIdAndFileType(id,null); - // 删除标准台账表 -// sarBusSarCompileEODao.deleteByBussStandId(id); - //删除收藏表中数据 - personCollectEODao.deleteByResId(id); - // 删除分享表中数据 -// personShareEODao.deleteByResId(id); - //删除标准关联的value表 - sarBussStandValEODao.deleteDataByStandId(id); - List listFile = sarBussStandFileEODao.selectFileByStandId(id); - if (listFile != null) { - if (!listFile.isEmpty()) { - for (int f = 0; f < listFile.size(); f++) { - sarBussStandFileEODao.deleteByPrimaryKey(listFile.get(f).getId()); - //删除文件信息表数据 -// sarFileInfoEODao.deleteByfileId(listFile.get(f).getId()); - //删除转换表ot_convert数据 - otConvertEODao.deleteByAttId(listFile.get(f).getAttId()); - } - } - } - if(elasflag) { - //删除成功后，将索引中对应数据删除 - StandLawsEO standLawsEO = new StandLawsEO(); - standLawsEO.setId(sarStandardsInfoEO.getId()); - standLawsEO.setType("bussstand"); - standLawsSearchService.deleteStandLawsSearch(standLawsEO); - } - - } - return Result.success("0", "删除成功", sarStandardsInfoEO); - } - - - @Override - public List getSarBussionessStand(String exportType, String exportContent,String userId) throws Exception { - SarBussionessStandEOPage page = new SarBussionessStandEOPage(); - if ("apart".equals(exportType)) { - page.setIdlist(exportContent.split(",")); - } else { - JSONObject jsonObject = JSONObject.fromObject(exportContent); - page = (SarBussionessStandEOPage)JSONObject.toBean(jsonObject, SarBussionessStandEOPage.class); - page.setPage(1); - page.setPageSize(10000); - if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { - List searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createSql(searchList); - if (com.adc.da.util.utils.StringUtils.isNotBlank(advanceStr)) { - page.setAdvanceSearchStr(advanceStr); - } else { - page.setAdvanceSearchStr(null); - } - } - } - page.setOrderBy("SAR_BUSSIONESS_STAND.issue_time is null,SAR_BUSSIONESS_STAND.issue_time desc,SAR_BUSSIONESS_STAND.id"); - List getMenuIdList = new ArrayList<>(); - if(userId != null){ - getMenuIdList= tsUserService.getResourceUserId(userId); - } - // List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); - if (getMenuIdList != null && !getMenuIdList.isEmpty()) { - page.setMenuRoleList(getMenuIdList); - } else { - page.setMenuRoleList(null); - } -// List getMenuIdList = sarMenuEOService.queryRoleMenuIdList("BUSINESS_STAND",page.getMenuId()); - if(getMenuIdList != null && !getMenuIdList.isEmpty()) { - page.setMenuRoleList(getMenuIdList); - } - List ids = sarMenuEOService.getChildMenuList(page.getMenuId()); - if (ids != null && !ids.isEmpty()) { - page.setMenuAllChildrenIdList(ids); - } - if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { - List searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(), SarAdvanceSearchVO.class); - String advanceStr = SarAdvanceSearchUtil.createSql(searchList); - if (StringUtils.isNotBlank(advanceStr)) { - page.setAdvanceSearchStr(advanceStr); - } else { - page.setAdvanceSearchStr(null); - } - } - page.setUserId(userId); - List getList = sarBussionessStandEODao.getSarBussionessStand(page); - attrInfoShow(getList); - return getList; - } - - public void attrInfoShow (List sarlist) throws Exception { - for(SarBussionessStand row : sarlist){ - attrInfoDetails(row); - Map getAttrMap = row.getAttrInfoMap(); - Map getNewMap = new LinkedHashMap<>(); - if (getAttrMap != null && getAttrMap.size() > 0) { - String svppsTip = ""; - for (Map.Entry entry : getAttrMap.entrySet()) { - String name = entry.getKey(); - String value = ""; - if ("SVPPS".equals(name)) { - Object svpps = entry.getValue(); - if (svpps != null && StringUtils.isNotBlank(svpps.toString())) { - svppsTip = svpps.toString(); - } - if (StringUtils.isNotBlank(svppsTip)) { - svppsTip = sysInfoEOService.getSvppsNamesTipByIds(svppsTip); - } - value = String.valueOf(getAttrMap.get("SVPPSName")); - entry.setValue(value); - } else if (entry.getValue() != null && InitStandAttrUtil.fileFieldListBuss != null && InitStandAttrUtil.fileFieldListBuss.size() > 0 && InitStandAttrUtil.fileFieldListBuss.contains(name)) { - value = entry.getValue().toString(); - if (StringUtils.isNotBlank(value)) { - List fileObj = attFileEOService.getMultiFileInfos(value); - entry.setValue(fileObj); - } - } else if (entry.getValue() != null && InitStandAttrUtil.selectionFieldListBuss != null && InitStandAttrUtil.selectionFieldListBuss.size() > 0 && InitStandAttrUtil.selectionFieldListBuss.contains(name)) { - value = entry.getValue().toString(); - String selVal = InitStandAttrUtil.selectFieldMapBuss.get(name); - if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal) || SelectionTypeEnum.USERLIST.getValue().equals(selVal) || SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) { - if("ZYQCR".equals(name)||"QTQCR".equals(name)){ - if(getAttrMap.get(name + "Name")!=null && !getAttrMap.get(name + "Name").equals("")){ - value = String.valueOf(getAttrMap.get(name + "Name")); - } - }else{ - value = String.valueOf(getAttrMap.get(name + "Name")); - } - } else { - List valArr = Arrays.asList(value.split(",")); - value = dicTypeEODao.getDicNamesByCodes(valArr); - } - entry.setValue(value); - } - } - getAttrMap.put("SVPPSTips",svppsTip); - } - } - } - public SarBussionessStand updateSarBussionessStand(SarBussionessStand sarBussionessStandEO) throws Exception { String standId = sarBussionessStandEO.getId(); SarBussionessStand beforeStandEO = this.baseMapper.selectByPrimaryKey(standId); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java index 7d7a8e18..af745434 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java @@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -152,7 +153,13 @@ public class SarLawsDetailedListController extends BaseController listFile = sarStandFileEODao.selectFileByStandId(id); - if (listFile != null) { - if (!listFile.isEmpty()) { - for (int f = 0; f < listFile.size(); f++) { - //删除文件信息表数据 +// List listFile = sarStandFileEODao.selectFileByStandId(id); +// if (listFile != null) { +// if (!listFile.isEmpty()) { +// for (int f = 0; f < listFile.size(); f++) { +// //删除文件信息表数据 // sarFileInfoEODao.deleteByfileId(listFile.get(f).getId()); - //删除转换表ot_convert数据 - otConvertEODao.deleteByAttId(listFile.get(f).getAttId()); - } - } - } +// //删除转换表ot_convert数据 +// otConvertEODao.deleteByAttId(listFile.get(f).getAttId()); +// } +// } +// } //删除代替关系 updateStandReplaceConnect(getDelStandInfoList); //删除收藏表中数据 personCollectEODao.deleteByResId(id); // 删除分享表中数据 personShareEODao.deleteByResId(id); - if(elasflag) { - //删除成功后，将索引中对应数据删除 - StandLawsEO standLawsEO = new StandLawsEO(); - standLawsEO.setId(sarStandardsInfoEO.getId()); - standLawsEO.setType("stand"); - standLawsSearchService.deleteStandLawsSearch(standLawsEO); - } +// if(elasflag) { +// //删除成功后，将索引中对应数据删除 +// StandLawsEO standLawsEO = new StandLawsEO(); +// standLawsEO.setId(sarStandardsInfoEO.getId()); +// standLawsEO.setType("stand"); +// sarStandAndLawsEOService.deleteFomrIndex(standLawsEO); +// } } return countResult; } @@ -1398,11 +1397,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getList = dao.getSarStandardsExportInfo(page); attrInfoShow(getList); return getList; diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java deleted file mode 100644 index 0e8f8207..00000000 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.adc.da.utils.util; - -import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; -import com.adc.da.slrs.sarStandAttrDetails.entity.SarStandAttrDetails; -import org.apache.commons.lang.StringUtils; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.text.SimpleDateFormat; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @Description: 标准导出工具 - * @Author: yangxuenan - * date: 2020/9/16 14:09 - */ -public class BussStandExportUtil { - - private static final Logger logger = LoggerFactory.getLogger(BussStandExportUtil.class); - - - public static Workbook exportDatas (List datas) { - Workbook workbook = new XSSFWorkbook(); - try { - StringBuilder attrBud = new StringBuilder(); - List detailsEOList = InitStandAttrUtil.bussAttrFieldList; - Map attrInfoMap = new HashMap<>(); - for (SarStandAttrDetails detailsEO : detailsEOList) { - if (!InitStandAttrUtil.fileFieldListBuss.contains(detailsEO.getAttrField())) { - attrBud.append(detailsEO.getAttrName() + ","); - attrInfoMap.put(detailsEO.getAttrName(),detailsEO.getAttrField()); - } - } - String header = FieldConvertUtil.exportBaseFieldNamesBuss + "," + attrBud.toString(); - //创建工作表对象 - Sheet sheet = workbook.createSheet(); - // 创建头部 - createHeader(workbook,sheet,header); - // 创建数据 - createDatas(workbook,sheet,datas,header,attrInfoMap); - } catch (Exception e) { - logger.error(e.getMessage(), e); - } - return workbook; - } - - public static void createHeader(Workbook workbook,Sheet sheet,String header){ - CellStyle cellStyle = workbook.createCellStyle();//初始化单元格格式对象 - cellStyle.setAlignment(HorizontalAlignment.CENTER); - Row rowHeader = sheet.createRow(0);//开始创建标题行 - if (StringUtils.isNotBlank(header)) { - String[] headerArr = header.split(","); - for (int i=0;i < headerArr.length; i++) { - rowHeader.createCell(i).setCellValue(headerArr[i]); -// rowHeader.createCell(i).setCellStyle(cellStyle); - } - } - } - - public static void createDatas(Workbook workbook,Sheet sheet,List datas, - String header,Map attrInfoMap) throws Exception{ - CellStyle cellStyle = workbook.createCellStyle();//初始化单元格格式对象 - cellStyle.setAlignment(HorizontalAlignment.CENTER); - if (datas != null && !datas.isEmpty()) { - for (int i=0;i < datas.size(); i++) { - SarBussionessStand sarStandardsInfoEO = datas.get(i); - Row row = sheet.createRow(i+1); - String[] headerArr = header.split(","); - int sheetNum = 0; - for (String headerName : headerArr) { - String value = getValueByName(headerName,sarStandardsInfoEO,attrInfoMap); - if (StringUtils.isBlank(value) || "null".equals(value)) { - value = ""; - } - row.createCell(sheetNum).setCellValue(value); - sheetNum++; - } - } - } - } - - // 根据表头返回相应值 - public static String getValueByName (String name,SarBussionessStand sarStandardsInfoEO,Map attrInfoMap) throws Exception{ - String value = ""; - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - Map attrValueMap = sarStandardsInfoEO.getAttrInfoMap(); - switch (name) { - case "企标类别": - value = sarStandardsInfoEO.getStandSortShow(); - break; - case "企标编号": - value = sarStandardsInfoEO.getStandCode(); - break; - case "中文名称": - value = sarStandardsInfoEO.getStandName(); - break; - case "英文名称": - value = sarStandardsInfoEO.getStandEnName(); - break; - case "标准状态": - value = sarStandardsInfoEO.getStandStatusShow(); - break; - case "标准实施日期": - if (sarStandardsInfoEO.getPutTime() != null) { - String issueTime = sdf.format(sarStandardsInfoEO.getPutTime()); - value = issueTime; - } - break; - case "代替企标编号": - value = sarStandardsInfoEO.getReplaceStandNum(); - break; - case "被代替企标编号": - value = sarStandardsInfoEO.getReplacedStandNum(); - break; - case "发布日期": - if (sarStandardsInfoEO.getIssueTime() != null) { - String issueTime = sdf.format(sarStandardsInfoEO.getIssueTime()); - value = issueTime; - } - break; - case "复审日期": - String field1 = attrInfoMap.get(name); - if (attrValueMap != null) { - value = String.valueOf(attrValueMap.get(field1)); - if (value.length()>10){ - value = value.substring(0,10); - } - } - break; - default: - String field = attrInfoMap.get(name); - if (attrValueMap != null) { - value = String.valueOf(attrValueMap.get(field)); - } - break; - } - return value; - } - -} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandItems/SarBussStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandItems/SarBussStandItemsMapper.xml index 106689f5..da27f80e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandItems/SarBussStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandItems/SarBussStandItemsMapper.xml @@ -1,385 +1,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SAR_BUSS_STAND_ITEMS.modify_time, SAR_BUSS_STAND_ITEMS.creation_time, SAR_BUSS_STAND_ITEMS.valid_flag, SAR_BUSS_STAND_ITEMS.remarks, responsible_unit, energy_kind, apply_arctic, tack_time, parts, items_name, items_num, SAR_BUSS_STAND_ITEMS.stand_id, SAR_BUSS_STAND_ITEMS.id,SAR_BUSS_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_BUSS_STAND_ITEMS.TERMS_CONDITIONS, - tsFo.UNAME as foShow,SAR_BUSS_STAND_ITEMS.duty_engineer,SAR_BUSS_STAND_ITEMS.svpps, - SAR_BUSS_STAND_ITEMS.claim_type,SAR_BUSS_STAND_ITEMS.bus_stand_cover,SAR_BUSS_STAND_ITEMS.file_type,dicClaimType.DIC_TYPE_NAME as claimTypeShow,tsdutyEngineer.UNAME as dutyEngineerShow - - - - - left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_BUSS_STAND_ITEMS.claim_type and dicClaimType.dic_id is - not null and dicClaimType.valid_flag = 0) - left join TS_USER tsdutyEngineer on (tsdutyEngineer.USID = SAR_BUSS_STAND_ITEMS.duty_engineer and tsdutyEngineer.valid_flag=0 - and tsdutyEngineer.DISABLE_FLAG=0) - left join TS_USER tsFo on (tsFo.USID = SAR_BUSS_STAND_ITEMS.fo and tsFo.valid_flag=0 - and tsFo.DISABLE_FLAG=0) - where 1=1 - - - and modify_time ${modifyTimeOperator} #{modifyTime} - - - and modify_time >= #{modifyTime1} - - - and modify_time <= #{modifyTime2} - - - and creation_time ${creationTimeOperator} #{creationTime} - - - and creation_time >= #{creationTime1} - - - and creation_time <= #{creationTime2} - - - and SAR_BUSS_STAND_ITEMS.valid_flag ${validFlagOperator} #{validFlag} - - - and remarks ${remarksOperator} #{remarks} - - - and responsible_unit ${responsibleUnitOperator} #{responsibleUnit} - - - and energy_kind ${energyKindOperator} #{energyKind} - - - and apply_arctic ${applyArcticOperator} #{applyArctic} - - - and tack_time ${tackTimeOperator} #{tackTime} - - - and tack_time >= #{tackTime1} - - - and tack_time <= #{tackTime2} - - - and SAR_BUSS_STAND_ITEMS.parts like concat(concat('%', #{parts}),'%') - - - and (SAR_BUSS_STAND_ITEMS.items_name like concat(concat('%', #{nameOrRequest}),'%') or SAR_BUSS_STAND_ITEMS.TERMS_CONDITIONS like concat(concat('%', #{nameOrRequest}),'%')) - - - and items_name ${itemsNameOperator} #{itemsName} - - - and items_num ${itemsNumOperator} #{itemsNum} - - - and SAR_BUSS_STAND_ITEMS.stand_id ${standIdOperator} #{standId} - - - and SAR_BUSS_STAND_ITEMS.id ${idOperator} #{id} - - - and SAR_BUSS_STAND_ITEMS.id in - - #{item} - - - - and SAR_BUSS_STAND_ITEMS.file_type = #{fileType} - - - - - - - - insert into SAR_BUSS_STAND_ITEMS() - values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{validFlag, jdbcType=INTEGER}, #{remarks, jdbcType=CLOB}, #{responsibleUnit, jdbcType=VARCHAR}, #{energyKind, jdbcType=VARCHAR}, #{applyArctic, jdbcType=VARCHAR}, #{tackTime, jdbcType=TIMESTAMP}, #{parts, jdbcType=VARCHAR}, #{itemsName, jdbcType=VARCHAR}, #{itemsNum, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}) - - - - - - insert into SAR_BUSS_STAND_ITEMS - - modify_time, - creation_time, - valid_flag, - remarks, - responsible_unit, - energy_kind, - apply_arctic, - tack_time, - parts, - items_name, - items_num, - stand_id, - id, - MAINPOINTS_IMPEMENTATION, - TERMS_CONDITIONS, - - fo, - duty_engineer, - svpps, - claim_type, - bus_stand_cover, - file_type - - - #{modifyTime, jdbcType=TIMESTAMP}, - #{creationTime, jdbcType=TIMESTAMP}, - #{validFlag, jdbcType=INTEGER}, - #{remarks, jdbcType=CLOB}, - #{responsibleUnit, jdbcType=VARCHAR}, - #{energyKind, jdbcType=VARCHAR}, - #{applyArctic, jdbcType=VARCHAR}, - #{tackTime, jdbcType=TIMESTAMP}, - #{parts, jdbcType=VARCHAR}, - #{itemsName, jdbcType=VARCHAR}, - #{itemsNum, jdbcType=VARCHAR}, - #{standId, jdbcType=VARCHAR}, - #{id, jdbcType=VARCHAR}, - #{mainPointImplementation, jdbcType=VARCHAR}, - #{termsConditions, jdbcType=VARCHAR}, - - #{fo, jdbcType=VARCHAR}, - #{dutyEngineer, jdbcType=VARCHAR}, - #{svpps, jdbcType=VARCHAR}, - #{claimType, jdbcType=VARCHAR}, - #{busStandCover, jdbcType=VARCHAR}, - #{fileType, jdbcType=VARCHAR} - - - - - - update SAR_BUSS_STAND_ITEMS - set modify_time = #{modifyTime}, - creation_time = #{creationTime}, - valid_flag = #{validFlag}, - remarks = #{remarks}, - responsible_unit = #{responsibleUnit}, - energy_kind = #{energyKind}, - apply_arctic = #{applyArctic}, - tack_time = #{tackTime}, - parts = #{parts}, - items_name = #{itemsName}, - items_num = #{itemsNum}, - stand_id = #{standId} - where id = #{id} - - - - - update SAR_BUSS_STAND_ITEMS - - - modify_time = #{modifyTime}, - - - creation_time = #{creationTime}, - - - valid_flag = #{validFlag}, - - - remarks = #{remarks}, - - - responsible_unit = #{responsibleUnit}, - - - energy_kind = #{energyKind}, - - - apply_arctic = #{applyArctic}, - - - tack_time = #{tackTime}, - - - tack_time = null, - - - parts = #{parts}, - - - items_name = #{itemsName}, - - - items_num = #{itemsNum}, - - - stand_id = #{standId}, - - - MAINPOINTS_IMPEMENTATION = #{mainPointImplementation}, - - - TERMS_CONDITIONS = #{termsConditions}, - - - - fo = #{fo}, - - - duty_engineer = #{dutyEngineer}, - - - svpps = #{svpps}, - - - claim_type = #{claimType}, - - - bus_stand_cover = #{busStandCover}, - - - file_type = #{fileType}, - - - where id = #{id} - - - - - - - - delete from SAR_BUSS_STAND_ITEMS - where id = #{value} - - - - - - - - - - - - - - - - - - delete from SAR_BUSS_STAND_ITEMS - where stand_id = #{standId} - - and file_type = #{fileType} - - diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index bfce5e43..f67877f2 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -249,6 +249,6 @@ ) diff --git a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java index db55614f..59ddd12e 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/dao/PersonCollectEODao.java @@ -5,7 +5,6 @@ import com.adc.da.person.entity.TsPersonCollect; import com.adc.da.person.page.PersonCollectEOPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; import java.util.List; @@ -17,7 +16,6 @@ import java.util.List; * 日期： 2018-09-03
* 版权所有：版权归北京卡达克数据技术中心所有。
*/ -@Repository public interface PersonCollectEODao extends BaseMapper { public List queryByList(BasePage page);