feat: There is no way the, bug #52284 #52278

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoExport.java

@@ -0,0 +1,298 @@
+package com.adc.da.slrs.sarLawsStandInfo.entity;
+
+import com.adc.da.att.vo.AttFileVo;
+import com.adc.da.base.entity.BaseEntity;
+import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
+import com.adc.da.slrs.standardSplit.entity.SarStandAttrDetailsEO;
+import com.adc.da.sys.entity.DicTypeEO;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.*;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-10-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarLawsStandInfo对象", description="")
+public class SarLawsStandInfoExport extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId("ID")
+    private String id;
+
+    @ApiModelProperty(value = "政策分类 共四级，逐级选择-配置管理中维护")
+    @TableField("LAWS_TYPE")
+    private String lawsType;
+
+    @ApiModelProperty(value = "政策编号")
+    @TableField("LAWS_NUMBER")
+    private String lawsNumber;
+
+    @ApiModelProperty(value = "中文名称")
+    @TableField("LAWS_NAME")
+    private String lawsName;
+
+    @ApiModelProperty(value = "英文名称")
+    @TableField("LAWS_EN_NAME")
+    private String lawsEnName;
+
+    @ApiModelProperty(value = "政策文号")
+    @TableField("LAWS_NO")
+    private String lawsNo;
+
+    @ApiModelProperty(value = "发文日期")
+    @TableField("ISSUE_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String issueTime;
+
+    @ApiModelProperty(value = "发文单位")
+    @TableField("ISSUE_COMPANY")
+    private String issueCompany;
+
+    @ApiModelProperty(value = "征集意见周期-起始时间")
+    @TableField("COMMENT_CYCLE_START")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String commentCycleStart;
+
+    @ApiModelProperty(value = "征集意见周期-结束时间")
+    @TableField("COMMENT_CYCLE_END")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String commentCycleEnd;
+
+    @ApiModelProperty(value = "文件状态-配置管理中维护")
+    @TableField("LAWS_TEXT_STATE")
+    private String lawsTextState;
+
+    @ApiModelProperty(value = "适用区域-配置管理中维护")
+    @TableField("LAWS_SYQY")
+    private String lawsSyqy;
+
+    @ApiModelProperty(value = "适用车型-配置管理中维护")
+    @TableField("LAWS_SYCX")
+    private String lawsSycx;
+
+    @ApiModelProperty(value = "是/否（选择否，只有政策、政策中文名称是必填项目）")
+    @TableField("IS_RELATE_ACCESS")
+    private String isRelateAccess;
+
+    @ApiModelProperty(value = "年度-可在配置管理中维护，根据发布日期自动带入可手动修改")
+    @TableField("LAWS_YEAR")
+    private String lawsYear;
+
+    @ApiModelProperty(value = "福田转发通知文号")
+    @TableField("LAWS_NOTISYNC_NUM")
+    private String lawsNotisyncNum;
+
+    @ApiModelProperty(value = "信息简报 xxx期次xxx板块")
+    @TableField("LAWS_BULLETIN")
+    private String lawsBulletin;
+
+    @ApiModelProperty(value = "标签-可在配置管理中维护")
+    @TableField("LAWS_LABEL")
+    private String lawsLabel;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("LAWS_REMARK")
+    private String lawsRemark;
+
+    @ApiModelProperty(value = "国家地区")
+    @TableField("COUNTRY")
+    private String country;
+
+    @TableField("CREATION_USER")
+    private String creationUser;
+
+    @ApiModelProperty(value = "是否有效")
+    @TableField("VALID_FLAG")
+    private Integer validFlag;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATION_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date creationTime;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("MODIFY_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date modifyTime;
+
+    @ApiModelProperty(value = "参数1")
+    @TableField("PARAM1")
+    private Long param1;
+
+    @ApiModelProperty(value = "参数2")
+    @TableField("PARAM2")
+    private String param2;
+
+    // 非表字段
+    @ApiModelProperty(value = "代替文件号")
+    @TableField(exist = false)
+    private String replaceFileNum;
+
+    @ApiModelProperty(value = "被代替文件号")
+    @TableField(exist = false)
+    private String replacedFileNum;
+
+    @TableField(exist = false)
+    private String processNum;//流程编号
+
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private String firstPutTime;
+
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String putTimeShow;
+
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String issueTimeShow;
+
+    @TableField(exist = false)
+    private String issueTimeStr;
+
+    @TableField(exist = false)
+    private String putTimeStr;
+
+    //目录ID   非标准信息表中的字段
+    @TableField(exist = false)
+    private String  menuId;
+
+    @TableField(exist = false)
+    private String menuParentId;
+
+    @TableField(exist = false)
+    private String standStatusShow; // 标准状态下拉框   --单选
+
+    @TableField(exist = false)
+    private String standNatrueShow;
+
+    @TableField(exist = false)
+    private String standSortShow;
+
+    @TableField(exist = false)
+    private String applyCountryShow;
+
+    @TableField(exist = false)
+    private List<AttFileVo> standFileList = new ArrayList<AttFileVo>();
+
+    @TableField(exist = false)
+    private List<AttFileVo> opinionFilesList = new ArrayList<AttFileVo>();
+
+    @TableField(exist = false)
+    private List<AttFileVo> relevanceFileList = new ArrayList<AttFileVo>();
+
+    @TableField(exist = false)
+    private String collectId;
+
+    //文件的类型
+    @TableField(exist = false)
+    private String standFileClassify;
+
+    //文件的下载id
+    @TableField(exist = false)
+    private String attId;
+
+    //记录是否修改了替代文件号
+    @TableField(exist = false)
+    private int upReplaceNumFlag;
+    //记录是否修改了文件号
+    @TableField(exist = false)
+    private int upNumFlag;
+    // 数据库新加的字段
+
+    @TableField(exist = false)
+    private String remark;//备注
+
+    @TableField(exist = false)
+    private Map<String, Object> attrInfoMap = new LinkedHashMap<>(); //属性表字段与值
+
+    @TableField(exist = false)
+    private Map<String, Object> attrInfoCaseMap = new LinkedHashMap<>(); //属性表字段与值小写前端带入渲染
+
+    @TableField(exist = false)
+    private String sarStandAttrEOStr; //新增修改时属性表信息
+
+    @TableField(exist = false)
+    private String fileIds; //全部文件ID
+
+    @TableField(exist = false)
+    private List<SarStandAttrDetailsEO> attrInfoList = new ArrayList<>();
+
+    @TableField(exist = false)
+    private String standTextStatusShow; // 标准文本状态显示名称
+    // 以下为非表中字段
+    @TableField(exist = false)
+    private String countryShow;  //国家地区显示名称
+    @TableField(exist = false)
+    private String standStateShow; // 标准状态显示名称
+    @TableField(exist = false)
+    private String standNatureShow; // 标准性质显示名称
+    @TableField(exist = false)
+    private List<DicTypeEO> dicTypeList = new ArrayList(); // 记录标准涉及到的所有数据字典数据
+
+    @TableField(exist = false)
+    private List<SarStandItems> itemsList = new ArrayList<>();
+    @ApiModelProperty(value = "分解单条款内容")
+    @TableField(exist = false)
+    private Map<String,String> mapItems = new TreeMap<>();
+
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String XCXSSRQLAWS; // 新车实施日期
+
+    @TableField(exist = false)
+    private String SSRQLAWS;
+    @TableField(exist = false)
+    private String ZCXSSRQLAWS;
+    @TableField(exist = false)
+    private String ZCWBLAWS;
+    @TableField(exist = false)
+    private String GCWBLAWS;
+    @TableField(exist = false)
+    private String JDWJLAWS;
+    @TableField(exist = false)
+    private String CYSDLAWS;
+    @TableField(exist = false)
+    private String TGRLAWS;
+    @TableField(exist = false)
+    private String TGDWLAWS;
+    @TableField(exist = false)
+    private String NYLXLAWS;
+    @TableField(exist = false)
+    private String YYRZLAWS;
+    @TableField(exist = false)
+    private String ZRBMLAWS;
+    @TableField(exist = false)
+    private String ZRGCSLAWS;
+    @TableField(exist = false)
+    private String DTWJHLAWS;
+    @TableField(exist = false)
+    private String BDTWJHLAWS;
+    @TableField(exist = false)
+    private String YYBZZCLAWS;
+    @TableField(exist = false)
+    private String XGLC;
+    @TableField(exist = false)
+    private String CHJLLAWS;
+    @TableField(exist = false)
+    private String GLWJLAWS;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/entity/SarLawsStandInfoPage.java

@@ -274,4 +274,9 @@ public class SarLawsStandInfoPage extends BasePage {
     @TableField(exist = false)
     private String order1 = "";
 
+    @TableField(exist = false)
+    private String exportAllAttrInfo;
+    @TableField(exist = false)
+    private String exportAllResult;
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java

@@ -145,8 +145,11 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
     @Override
     public List<SarLawsStandInfo> getSarStandardsInfoPage(SarLawsStandInfoPage page) throws Exception {
         //查询当前登录人角色拥有权限的菜单
-        String userId = UserUtils.getUserId();
+        if(page.getUserId() == null || page.getUserId().equals("")){
-        if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(userId)){
+            page.setUserId(LoginUserUtil.getUserId());
+        }
+
+        if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
             QueryWrapper<TsResource> qw = new QueryWrapper<>();
             qw.eq("ID",page.getMenuId());
             qw.isNull("PARENT_ID");
@@ -486,6 +489,20 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
             nowOrderFunc(page);
         }
 
+        String fieldInfo = InitStandAttrUtil.queryFieldBuss;
+
+        List<String> list = Arrays.asList(fieldInfo.split(",")).stream().map(s -> String.format("SAR_BUSS_STAND_ATTR_INFO."+s.trim())).collect(Collectors.toList());
+        List<String> listSelect = Arrays.asList(fieldInfo.split(",")).stream().map(s -> String.format("tmp_tb."+s.trim())).collect(Collectors.toList());
+        String exportAllAttrInfo = list.stream().collect(Collectors.joining(","));
+        String exportAllResult = listSelect.stream().collect(Collectors.joining(","));
+        if(StringUtils.isNotBlank(exportAllAttrInfo)){
+            page.setExportAllAttrInfo(exportAllAttrInfo);
+        }
+
+        if(StringUtils.isNotBlank(exportAllResult)){
+            page.setExportAllResult(exportAllResult);
+        }
+
         List<SarLawsStandInfo> rows = this.baseMapper.getSarStandardsExportInfo(page);
         attrInfoShowExport(rows);
         return rows;

adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml

@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfo" >
     </resultMap>
 
-    <resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfo" >
+    <resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoExport" >
     </resultMap>
 
     <sql id="Base_Where_Clause">
@@ -178,7 +178,7 @@
             <if test="collectMenuId != null and collectMenuId != ''">
                 and SAR_LAWS_STAND_INFO.id in (
                 select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0
-                and (collect_type='INLAND_STAND' or collect_type='FOREIGN_STAND')
+                and (collect_type='FOREIGN_LAWS')
                 and TS_PERSON_COLLECT.user_id=#{userId}
                 )
             </if>
@@ -280,9 +280,7 @@
         GROUP BY SAR_LAWS_STAND_INFO.id) a
     </select>
 
-    <select id="getSarStandardsExportInfo" resultMap="BaseResultMapExcel"
+    <sql id="Base_Column_List_show_Export" >
-            parameterType="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage">
-        select
         DISTINCT SAR_LAWS_STAND_INFO.ID,
         laws_type_show.DIC_TYPE_NAME as LAWS_TYPE,
         SAR_LAWS_STAND_INFO.LAWS_NUMBER,
@@ -305,13 +303,52 @@
         SAR_LAWS_STAND_INFO.COUNTRY,
         SAR_LAWS_STAND_INFO.MODIFY_TIME,
         dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow
-        from SAR_LAWS_STAND_INFO
+  </sql>
-        <include refid="export_condition"/>
+
+    <sql id="Base_Column_List_show_ExportResult" >
+        DISTINCT SAR_LAWS_STAND_INFO.ID,
+        laws_type_show.DIC_TYPE_NAME as LAWS_TYPE,
+        SAR_LAWS_STAND_INFO.LAWS_NUMBER,
+        SAR_LAWS_STAND_INFO.LAWS_NAME,
+        SAR_LAWS_STAND_INFO.LAWS_EN_NAME,
+        SAR_LAWS_STAND_INFO.LAWS_NO,
+        SAR_LAWS_STAND_INFO.ISSUE_TIME,
+        SAR_LAWS_STAND_INFO.ISSUE_COMPANY,
+        SAR_LAWS_STAND_INFO.COMMENT_CYCLE_START,
+        SAR_LAWS_STAND_INFO.COMMENT_CYCLE_END,
+        SAR_LAWS_STAND_INFO.LAWS_TEXT_STATE,
+        laws_sycx_show.DIC_TYPE_NAME as LAWS_SYCX,
+        laws_syqy_show.DIC_TYPE_NAME as LAWS_SYQY,
+        SAR_LAWS_STAND_INFO.IS_RELATE_ACCESS,
+        SAR_LAWS_STAND_INFO.LAWS_YEAR,
+        SAR_LAWS_STAND_INFO.LAWS_NOTISYNC_NUM,
+        SAR_LAWS_STAND_INFO.LAWS_BULLETIN,
+        SAR_LAWS_STAND_INFO.LAWS_LABEL,
+        SAR_LAWS_STAND_INFO.LAWS_REMARK,
+        SAR_LAWS_STAND_INFO.COUNTRY,
+        SAR_LAWS_STAND_INFO.MODIFY_TIME,
+        dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow
+  </sql>
+
+    <select id="getSarStandardsExportInfo" resultMap="BaseResultMapExcel"
+            parameterType="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage">
+        SELECT <include refid="Base_Column_List_show_ExportResult" />
+        <if test="exportAllResult != null">
+            , ${exportAllResult}
+        </if>
+        FROM (
+            select <include refid="Base_Column_List_show_Export" />
+            <if test="exportAllAttrInfo != null">
+                , ${exportAllAttrInfo}
+            </if>
+            from SAR_LAWS_STAND_INFO
+            <include refid="export_condition"/>
+        ) tmp_tb
         order by
         <if test='orderByA != null and orderByA != "" and order1 != null and order1 != ""'>
             ${orderByA} ${order1},
         </if>
-        SAR_LAWS_STAND_INFO.id
+        tmp_tb.issue_time is null,tmp_tb.issue_time desc,tmp_tb.id
     </select>
 
 
@@ -433,7 +470,7 @@
             <if test="collectMenuId != null and collectMenuId != ''">
                 and SAR_LAWS_STAND_INFO.id in (
                 select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0
-                and (collect_type='INLAND_STAND' or collect_type='FOREIGN_STAND')
+                and (collect_type='FOREIGN_LAWS')
                 and TS_PERSON_COLLECT.user_id=#{userId}
                 )
             </if>

adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -137,8 +138,9 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
         if (collectTitle != null && !collectTitle.equals("")){
             wrapper.like("collect_title",collectTitle);
         }
-        if (modeType != null && !modeType.equals("")){
+        if (StringUtils.isNotBlank(modeType)){
-            wrapper.eq("collect_type",modeType);
+            List<String> ids = new ArrayList<>(Arrays.asList(modeType.split(",")));
+            wrapper.in("collect_type",ids);
         }
 
         if (pageNo != null) {