Merge branch 'develop_master' into develop_migration

adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/DataSyncController.java

@@ -49,8 +49,10 @@ public class DataSyncController {
         //存放岗位信息
         Map<String, String> positionMap = new HashMap<>();
         Map<String, String> useDistinct = new HashMap<>();
-
+        TsPosition position = new TsPosition();
-        IPage<TsPosition> iPage = tsPositionService.getPosition(new TsPosition());
+        position.setCurrent(1);
+        position.setPageSize(100000);
+        IPage<TsPosition> iPage = tsPositionService.getPosition(position);
         List<TsPosition> 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);
         }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java

@@ -54,7 +54,7 @@ public interface TsInstitutionDao extends BaseMapper<TsInstitution> {
      * 查询根机构
      * @return List<TsInstitution>
      */
-    @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<TsInstitution> selectRoot();
 
     @Select("select * from ts_institution order by rand() limit 1")

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;
+
 }

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<DicTypeEO> 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;
+    }
 }
 

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<TsUser> {
     }
 
 
+    @ApiOperation("查询人接口悬浮窗")
+    @GetMapping("/selectUp")
+    public ResponseMessage<List<UpDTO>> selectUp(@Param("uname") String uname) throws Exception {
+        return Result.success(tsUserService.selectByName(uname));
+    }
+
+
 
 }

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<TsPosition> positions;
 
     @ApiModelProperty("当前页")
+    @TableField(exist = false)
     private Integer current;
 
     @ApiModelProperty("每页条数")
+    @TableField(exist = false)
     private Integer size;
 
     public TsUser() {

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;
+}

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<TsUser> {
     void parseUser() throws Exception;
 
     List<SarMenu> getSecondMenusByUserId(String userId);
+
+    List<UpDTO> selectByName(String name);
 }

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<TsUserDao, TsUser> implements
         List<String> menuIds=tsRoleService.getMenuIdsByRoleIds(roleIds);
         return sarMenuService.getSecondMenuByIds(menuIds);
     }
+
+    @Override
+    public List<UpDTO> selectByName(String name) {
+        QueryWrapper<TsUser> tsUserQueryWrapper=new QueryWrapper<>();
+        tsUserQueryWrapper.like("ACCOUNT",name);
+        tsUserQueryWrapper.or().like("UNAME",name);
+        List<TsUser> res= tsUserDao.selectList(tsUserQueryWrapper);
+        List<UpDTO> 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;
+    }
 }

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<SarFileSplitInfoEO> rows = sarFileSplitInfoEODao.queryByPageOwn(page);
         Map<String, String> map = new HashMap<>();
-        map.put("CA", "草稿");
+
-        map.put("ZQYJG", "征求意见稿");
+        List<SelectionResult> selectionResults = sarStandAttrDetailsEOService.selectFileFieldForSel(null);
-        map.put("BPG", "报批稿");
+        selectionResults.forEach(detailsEO->{
-        map.put("SSG", "送审稿");
+          map.put(detailsEO.getValue(),detailsEO.getLabel());
-        map.put("FBGBJBD", "发布稿（必读）");
+        });
 
         if (rows != null && !rows.isEmpty()) {
             for (SarFileSplitInfoEO infoEO : rows) {

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 = "归口管理部门,发布机构,工作组信息,我司参与深度,适用车辆类型,要求类型," +

adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java

@@ -101,10 +101,14 @@ public class StandExportUtil {
         Map<String,Object> 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 "标准状态":
+            case "文本状态":
-                value = sarStandardsInfoEO.getStandStateShow();
+                value = sarStandardsInfoEO.getStandTextStatusShow();
                 break;
             case "发布日期":
                 if (sarStandardsInfoEO.getIssueTime() != null) {

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

@@ -731,7 +731,7 @@
 
 
     <select id="selectAllItemsByIds" resultType="com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto">
-        select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer,XCXSSRQ as xcxssrq,ZCCSSRQ as zccssrq
+        select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer,XCXSSRQ as xcxssrq,ZCCSSRQ as zccssrq ,read_content as technicalRequir ,compared_with_previous as changePoint
         from SAR_STAND_ITEMS
         where FILE_TYPE=#{type}
         <if test="ids != null">

adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml

@@ -45,7 +45,7 @@
         left join ts_user u
         on i.id=u.institution_id
         <if test="userName == null">
-            where i.parent_id not in (select id from ts_institution)
+            where i.parent_id not in (select id from ts_institution)  order by i.name
         </if>
 
         <if test="userName != null">

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -61,7 +61,7 @@
      SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time,
      concat(SAR_STANDARDS_INFO.synopsis, '') as synopsis, concat(replace_stand_num, '') as replace_stand_num, replaced_stand_num, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag,
      SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicountry.DIC_TYPE_NAME as countryShow, dicstandSort.DIC_TYPE_NAME as standSortShow,
-     dicstandState.DIC_TYPE_NAME as standStateShow,dicstandNature.DIC_TYPE_NAME as standNatureShow,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM
+     dicstandState.DIC_TYPE_NAME as standStateShow,dicstandNature.DIC_TYPE_NAME as standNatureShow,dicstandTextStatus.DIC_TYPE_NAME as standTextStatusShow,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM
   </sql>
 
     <sql id="Group_Column_List_Show">
@@ -70,7 +70,7 @@
      SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time,
      concat(SAR_STANDARDS_INFO.synopsis, ''), concat(replace_stand_num, ''), replaced_stand_num, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag,
      SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicountry.DIC_TYPE_NAME, dicstandSort.DIC_TYPE_NAME,
-     dicstandState.DIC_TYPE_NAME,dicstandNature.DIC_TYPE_NAME,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM
+     dicstandState.DIC_TYPE_NAME,dicstandNature.DIC_TYPE_NAME,dicstandTextStatus.DIC_TYPE_NAME,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM
   </sql>
 
     <!-- 查询条件 -->
@@ -380,6 +380,11 @@
         dicstandState.dic_id is not null and dicstandState.valid_flag = 0 )
         left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and
         dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 )
+        LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
+        dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status
+        AND dicstandTextStatus.dic_id IS NOT NULL
+        AND dicstandTextStatus.valid_flag = 0
+        )
         left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
         left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id
         left join SAR_STAND_ATTR_INFO on (SAR_STAND_ATTR_INFO.stand_id = SAR_STANDARDS_INFO.id and SAR_STAND_ATTR_INFO.valid_flag=0)
@@ -746,6 +751,11 @@
         dicstandState.dic_id is not null and dicstandState.valid_flag = 0 )
         left join TS_DICTYPE dicstandNature on (dicstandNature.dic_type_code = SAR_STANDARDS_INFO.stand_nature and
         dicstandNature.dic_id is not null and dicstandNature.valid_flag = 0 )
+        LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
+        dicstandTextStatus.dic_type_code = SAR_STANDARDS_INFO.text_status
+        AND dicstandTextStatus.dic_id IS NOT NULL
+        AND dicstandTextStatus.valid_flag = 0
+        )
         left join SAR_STAND_MENU ON SAR_STANDARDS_INFO.id = SAR_STAND_MENU.stand_id
         left join TS_RESOURCE on SAR_STAND_MENU.menu_id = TS_RESOURCE.id
         where SAR_STANDARDS_INFO.id = #{id}