diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java index 4ca8c427..24bed50b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java @@ -49,8 +49,10 @@ public class DataSyncController { //存放岗位信息 Map positionMap = new HashMap<>(); Map useDistinct = new HashMap<>(); - - IPage iPage = tsPositionService.getPosition(new TsPosition()); + TsPosition position = new TsPosition(); + position.setCurrent(1); + position.setPageSize(100000); + IPage iPage = tsPositionService.getPosition(position); List positions=iPage.getRecords(); if (!positions.isEmpty()) { positions.forEach(tsPosition -> { @@ -134,7 +136,10 @@ public class DataSyncController { tsInstitution.setName(jsonObject.getString("orgName")); tsInstitution.setHasChild(strings.contains(jsonObject.getString("orgNumber"))?"1":"0"); tsInstitution.setParentId(jsonObject.getString("parentOrgNumber")); - tsInstitutions.add(tsInstitution); + //部门为"null"的数据不保存 + if (!"null".equals(jsonObject.getString("orgName"))){ + tsInstitutions.add(tsInstitution); + } }); tsInstitutionService.saveBatch(tsInstitutions); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java index dcc7ff49..0ea1a63b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java @@ -54,7 +54,7 @@ public interface TsInstitutionDao extends BaseMapper { * 查询根机构 * @return List */ - @Select("select * from ts_institution where parent_id not in (select id from ts_institution)") + @Select("select * from ts_institution where parent_id not in (select id from ts_institution) order by name") List selectRoot(); @Select("select * from ts_institution order by rand() limit 1") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java index c1268581..0d90b32d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItemsDto.java @@ -48,4 +48,8 @@ public class SarStandItemsDto { private String zccssrq; + private String technicalRequir; + + private String changePoint; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index 291327f1..ec5291e7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -155,6 +155,8 @@ public class SarStandardsInfo extends BaseEntity { @TableField(exist = false) private String standNatureShow; // 标准性质显示名称 @TableField(exist = false) + private String standTextStatusShow; // 标准文本状态显示名称 + @TableField(exist = false) private String sychronId; // 同步数据ID @TableField(exist = false) private List dicTypeList = new ArrayList(); // 记录标准涉及到的所有数据字典数据 @@ -607,5 +609,13 @@ public class SarStandardsInfo extends BaseEntity { public void setStandSystemName(String standSystemName) { this.standSystemName = standSystemName; } + + public String getStandTextStatusShow() { + return standTextStatusShow; + } + + public void setStandTextStatusShow(String standTextStatusShow) { + this.standTextStatusShow = standTextStatusShow; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java index fbe98449..300b63ab 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java @@ -9,10 +9,12 @@ import com.adc.da.slrs.sarMenu.entity.SarMenu; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarUrl.dao.TsUrlDao; import com.adc.da.slrs.sarUser.dao.TsUserDao; +import com.adc.da.slrs.sarUser.entity.UpDTO; import com.adc.da.slrs.sarUser.entity.UserPositionVO; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -80,5 +82,12 @@ public class TsUserController extends BaseController { } + @ApiOperation("查询人接口悬浮窗") + @GetMapping("/selectUp") + public ResponseMessage> selectUp(@Param("uname") String uname) throws Exception { + return Result.success(tsUserService.selectByName(uname)); + } + + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java index d3da5143..40166850 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java @@ -143,9 +143,11 @@ public class TsUser extends BaseEntity { private List positions; @ApiModelProperty("当前页") + @TableField(exist = false) private Integer current; @ApiModelProperty("每页条数") + @TableField(exist = false) private Integer size; public TsUser() { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/UpDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/UpDTO.java new file mode 100644 index 00000000..730b9910 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/UpDTO.java @@ -0,0 +1,13 @@ +package com.adc.da.slrs.sarUser.entity; + +import lombok.Data; + +@Data +public class UpDTO { + + + + private String value; + + private String id; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java index 7501950f..af98fb3d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java @@ -4,6 +4,7 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.slrs.sarMenu.entity.SarMenu; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarUser.entity.TsUser; +import com.adc.da.slrs.sarUser.entity.UpDTO; import com.adc.da.slrs.sarUser.entity.UserPositionVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -74,4 +75,6 @@ public interface ITsUserService extends IService { void parseUser() throws Exception; List getSecondMenusByUserId(String userId); + + List selectByName(String name); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java index 900ec013..06e78407 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java @@ -14,6 +14,7 @@ import com.adc.da.slrs.sarRole.service.ITsRoleService; import com.adc.da.slrs.sarUser.entity.SyncUser; import com.adc.da.slrs.sarUser.entity.TsUser; import com.adc.da.slrs.sarUser.dao.TsUserDao; +import com.adc.da.slrs.sarUser.entity.UpDTO; import com.adc.da.slrs.sarUser.entity.UserPositionVO; import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.sync.service.SyncUserService; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -273,4 +275,20 @@ public class TsUserServiceImpl extends ServiceImpl implements List menuIds=tsRoleService.getMenuIdsByRoleIds(roleIds); return sarMenuService.getSecondMenuByIds(menuIds); } + + @Override + public List selectByName(String name) { + QueryWrapper tsUserQueryWrapper=new QueryWrapper<>(); + tsUserQueryWrapper.like("ACCOUNT",name); + tsUserQueryWrapper.or().like("UNAME",name); + List res= tsUserDao.selectList(tsUserQueryWrapper); + List result=new ArrayList<>(); + res.forEach(tsUser -> { + UpDTO upDTO=new UpDTO(); + upDTO.setValue(tsUser.getUname()+"("+tsUser.getAccount()+")"); + upDTO.setId(tsUser.getUserId()); + result.add(upDTO); + }); + return result; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index 29d2813a..6c6bf9ca 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.standardSplit.service.impl; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.person.entity.PersonMsgEO; +import com.adc.da.slrs.sarStandAttrDetails.service.ISarStandAttrDetailsService; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.standardSplit.dao.*; import com.adc.da.slrs.standardSplit.service.SarLawsInfoEOService; @@ -10,8 +11,11 @@ import com.adc.da.base.page.BasePage; import com.adc.da.common.ReadWordTable; import com.adc.da.slrs.standardSplit.entity.*; import com.adc.da.slrs.standardSplit.service.SarFileSplitInfoEOService; +import com.adc.da.sys.common.SelectionResult; import com.adc.da.sys.util.LoginUserUtil; import com.adc.da.sys.util.UUIDUtils; +import com.adc.da.utils.util.InitStandAttrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.poi.xwpf.usermodel.*; @@ -46,6 +50,9 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport; public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService { private static final Logger logger = LoggerFactory.getLogger(SarFileSplitInfoEOServiceImpl.class); + @Autowired + private ISarStandAttrDetailsService sarStandAttrDetailsEOService; + @Autowired private IAttFileEOService attFileEOService; @Value("${file.path}") @@ -588,11 +595,11 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService page.getPager().setRowCount(rowCount); List rows = sarFileSplitInfoEODao.queryByPageOwn(page); Map map = new HashMap<>(); - map.put("CA", "草稿"); - map.put("ZQYJG", "征求意见稿"); - map.put("BPG", "报批稿"); - map.put("SSG", "送审稿"); - map.put("FBGBJBD", "发布稿（必读）"); + + List selectionResults = sarStandAttrDetailsEOService.selectFileFieldForSel(null); + selectionResults.forEach(detailsEO->{ + map.put(detailsEO.getValue(),detailsEO.getLabel()); + }); if (rows != null && !rows.isEmpty()) { for (SarFileSplitInfoEO infoEO : rows) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index 4895a277..1625cb2f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -31,7 +31,7 @@ public class FieldConvertUtil { "文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28 public static String exportBaseFieldNamesForeign = "标准类别,标准编号,标准年份,中文名称,英文名称," + - "文本状态,发布日期,文本说明,是否纳入认证清单,体系类别,标签,适用产品线,适用认证,能源类型,责任工程师," + + "文本状态,发布日期,文本说明,是否纳入认证清单,体系类别,标签,适用认证,能源类型," + "关联文件,发布稿,增补件,勘误件,草案"; // 导出基础表字段 public static String exportAttrFieldNamesInland = "归口管理部门,发布机构,工作组信息,我司参与深度,适用车辆类型,要求类型," + diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java index 7cd978cf..47f597c1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java @@ -101,10 +101,14 @@ public class StandExportUtil { Map attrValueMap = sarStandardsInfoEO.getAttrInfoMap(); switch (name) { case "标准性质": - value = sarStandardsInfoEO.getStandNature(); + value = sarStandardsInfoEO.getStandNatureShow(); break; case "是否纳入认证清单": - value = sarStandardsInfoEO.getIsRelateAccess(); + switch (sarStandardsInfoEO.getIsRelateAccess()){ + case "0": value="否"; break; + case "1": value="是"; break; + default:value=""; + } break; case "标准体系": value = sarStandardsInfoEO.getStandSystem(); @@ -137,8 +141,8 @@ public class StandExportUtil { case "英文名称": value = sarStandardsInfoEO.getStandEnName(); break; - case "标准状态": - value = sarStandardsInfoEO.getStandStateShow(); + case "文本状态": + value = sarStandardsInfoEO.getStandTextStatusShow(); break; case "发布日期": if (sarStandardsInfoEO.getIssueTime() != null) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index 32a31e9c..72b72ba9 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -731,7 +731,7 @@