Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java

@@ -198,7 +198,7 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
 		if(dictModelList.size() != 0){
 			StringBuilder sb = new StringBuilder();
 			for (DictModel dictModel : dictModelList) {
-				if(CutEnum.CN.getValue().equals(paramsReportEO)){
+				if(CutEnum.CN.getValue().equals(paramsReportEO.getCut())){
 					sb.append(dictModel.getText()+",");
 				}else{
 					sb.append(dictModel.getTextEn()+",");

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectUserPermissionController.java

@@ -52,4 +52,16 @@ public class ProjectUserPermissionController extends JeroController<ProjectUserP
      }
 
 
+     /**
+      * 判断当前用户是否拥有法规技术评估/法规意见收集中结束流程或发起补充流程的操作按钮
+      * @param type
+      * @param id
+      * @return
+      */
+     @GetMapping(value = "/hasProcessControlButton")
+     public boolean hasProcessControlButton(@RequestParam(name="type",required=true)String type,
+                                            @RequestParam(name="id",required=true)String id){
+         return projectUserPermissionService.hasProcessControlButton(type,id);
+     }
+
  }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java

@@ -140,6 +140,8 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
 
     @TableField(exist = false)
     private String brandText;
+    @TableField(exist = false)
+    private String brandTextEn;
 
     @Override
     public int compareTo(ProjectLibraryBase o) {

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProcessControlButtonTypeEnum.java

@@ -0,0 +1,34 @@
+package com.jero.modules.project.enums;
+
+public enum ProcessControlButtonTypeEnum {
+
+    LawsOpinionGather("法规意见收集","LawsOpinionGather"),
+    LawsTechnologyEvaluation("法规技术评估","LawsTechnologyEvaluation");
+
+    String label;
+    String value;
+
+    ProcessControlButtonTypeEnum() {
+    }
+
+    ProcessControlButtonTypeEnum(String label, String value) {
+        this.label = label;
+        this.value = value;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml

@@ -52,7 +52,8 @@
             plb.sort,
             plb.flag,
             plb.brand,
-            sdi.item_text brandText
+            sdi.item_text brandText,
+            sdi.en_name brandTextEn
         from project_library_base as plb
         left join project_name_info as pni on  plb.project_name_id=pni.id
         left join sys_user as studiouser on plb.studio_engineer=studiouser.id
@@ -227,6 +228,11 @@
                 and plb.project_status like concat('%',#{projectLibraryBase.projectStatus},'%')
             </if>
 
+            <!--搜索条件:品牌-->
+            <if test="projectLibraryBase.brand != null and projectLibraryBase.brand != '' ">
+                and plb.brand = #{projectLibraryBase.brand}
+            </if>
+
             <if test="projectLibraryBase.studioEngineer != null and projectLibraryBase.studioEngineer != ''">
                 <!--搜索条件:studio工程师,包含%,单独搜索-->
                 <choose>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectUserPermissionService.java

@@ -73,4 +73,11 @@ public interface IProjectUserPermissionService extends IService<ProjectUserPermi
 	 */
 	void sync();
 
+	/**
+	 * 判断当前用户是否拥有法规技术评估/法规意见收集中结束流程或发起补充流程的操作按钮
+	 * @param type
+	 * @param id
+	 * @return
+	 */
+    boolean hasProcessControlButton(String type, String id);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java

@@ -142,7 +142,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
         for (NcrTrackVO trackVO : infoList) {
             String projectName = trackVO.getProjectName();
             String yearName = trackVO.getYearName();
-            String market = getMarket(targetMarketList, trackVO);
+            String market = getMarket(targetMarketList, trackVO,ncrTrackVO.getCut());
             String projectVersion = trackVO.getProjectVersion();
             if(StringUtils.isNotBlank(projectVersion)){
                 trackVO.setProjectName(projectName+"-"+yearName+"-"+market+"-"+projectVersion);
@@ -296,7 +296,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
         }
     }
 
-    private String getMarket(List<DictModel> targetMarketList, NcrTrackVO trackVO) {
+    private String getMarket(List<DictModel> targetMarketList, NcrTrackVO trackVO,String cut) {
         //目标市场
         List<DictModel> dictModelList = new ArrayList<>();
         for (String s : trackVO.getTargetMarket().split(",")) {
@@ -308,7 +308,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
         if(dictModelList.size() != 0){
             StringBuilder sb = new StringBuilder();
             for (DictModel dictModel : dictModelList) {
-                if(CutEnum.CN.getValue().equals(trackVO.getCut())){
+                if(CutEnum.CN.getValue().equals(cut)){
                     sb.append(dictModel.getText()+",");
                 }else{
                     sb.append(dictModel.getTextEn()+",");

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java

@@ -4,23 +4,25 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.project.entity.ConditionAssessmentEO;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.entity.ProjectLibraryBase;
 import com.jero.modules.project.entity.ProjectTaskInventoryEO;
-import com.jero.modules.project.enums.CertificationProgressEnum;
+import com.jero.modules.project.enums.*;
-import com.jero.modules.project.enums.CurrentProjectStatusEnum;
+import com.jero.modules.project.mapper.ProjectUserPermissionMapper;
-import com.jero.modules.project.enums.InventoryAffirmStatusEnum;
-import com.jero.modules.project.enums.ReviewResultEnum;
-import com.jero.modules.project.enums.TaskAffirmStatusEnum;
 import com.jero.modules.project.service.IConditionAssessmentEOService;
 import com.jero.modules.project.service.IProjectStatusBoardService;
 import com.jero.modules.project.vo.TimeNodeVO;
 import com.jero.modules.system.entity.SysDictItem;
+import com.jero.modules.system.mapper.SysRoleMapper;
+import com.jero.modules.system.service.IProjectUserBrandService;
+import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -49,6 +51,14 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
     private ProjectTaskInventoryEOServiceImpl projectTaskInventoryEOService;
     @Autowired
     private SysDictItemServiceImpl sysDictItemServiceImpl;
+    @Autowired
+    private SysRoleMapper sysRoleMapper;
+    @Autowired
+    private ProjectUserPermissionMapper projectUserPermissionMapper;
+    @Autowired
+    private IProjectUserBrandService projectUserBrandService;
+    @Autowired
+    private ISysUserService sysUserService;
 
 
     /**
@@ -153,6 +163,26 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
      */
     @Override
     public List<Map<String,Object>> scheduleInfoList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) {
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        Integer isViewer = sysRoleMapper.queryUserRoleByCode(ProjectRoleEnum.VIEWER.getName(), loginUser.getId());
+        Set<String> projectIds = new HashSet<>();
+        //根据项目用户权限表筛选有权访问的项目
+        Set<String> permissionProjectIds = projectUserPermissionMapper.queryProjectIdsByUserId(loginUser.getId());
+        if (ObjectUtils.isNotEmpty(permissionProjectIds)) {
+            projectIds.addAll(permissionProjectIds);
+        }
+        if (isViewer > 0) {
+            //如果是Viewer，根据配置的品牌筛选可访问的项目
+            List<String> brandTypes = projectUserBrandService.queryBrandByUserId(loginUser.getId());
+            if (ObjectUtils.isNotEmpty(brandTypes)) {
+                QueryWrapper<ProjectLibraryBase> queryWrapper = new QueryWrapper<>();
+                queryWrapper.in("brand",brandTypes);
+                if (ObjectUtils.isNotEmpty(projectLibraryBaseService.list(queryWrapper))) {
+                    projectIds.addAll(projectLibraryBaseService.list(queryWrapper).stream().map(ProjectLibraryBase::getId).collect(Collectors.toSet()));
+                }
+            }
+        }
+
        if(StringUtils.isNotBlank(projectLibraryBase.getProjectName())){
            projectLibraryBase.setProjectName(projectLibraryBase.getProjectName().replace("*",""));
        }
@@ -163,6 +193,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
 //        //项目库信息
 //        List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseService.list(queryWrapper);
         List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseService.getList(projectLibraryBase);
+        if (!sysUserService.isAdministrator()) {
+            projectLibraryBaseList = projectLibraryBaseList.stream().filter(project -> projectIds.contains(project.getId())).collect(Collectors.toList());
+        }
 
         List<Map<String,Object>> result = new ArrayList<>();
         if(projectLibraryBaseList.size() != 0){

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectUserPermissionServiceImpl.java

@@ -3,10 +3,18 @@ package com.jero.modules.project.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.common.api.vo.Result;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper;
+import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO;
+import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
+import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService;
+import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService;
 import com.jero.modules.project.entity.*;
 import com.jero.modules.project.enums.PermissionDescriptionEnum;
+import com.jero.modules.project.enums.ProcessControlButtonTypeEnum;
 import com.jero.modules.project.enums.ProjectUserLocationEnum;
 import com.jero.modules.project.mapper.ProjectUserPermissionMapper;
 import com.jero.modules.project.service.*;
@@ -16,6 +24,7 @@ import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum;
 import com.jero.modules.wkflow.enums.FlowTypeEnum;
 import com.jero.modules.wkflow.feginClient.WorkFlowFeignClient;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -49,7 +58,12 @@ public class ProjectUserPermissionServiceImpl extends ServiceImpl<ProjectUserPer
     private IProjectTaskInventoryDetailEOService projectTaskInventoryDetailEOService;
     @Autowired
     private WorkFlowFeignClient workFlowFeignClient;
-
+    @Autowired
+    private ILawsOpinionGatherEOService lawsOpinionGatherEOService;
+    @Autowired
+    private ILawsTechnologyEvaluationEOService lawsTechnologyEvaluationEOService;
+    @Autowired
+    private ILawsTechnologyEvaluationFlowDetailEOService lawsTechnologyEvaluationFlowDetailEOService;
 
 	/**
 	 * 保存
@@ -309,4 +323,65 @@ public class ProjectUserPermissionServiceImpl extends ServiceImpl<ProjectUserPer
         permissionList.add(permission);
     }
 
+    /**
+     * 判断当前用户是否拥有法规技术评估/法规意见收集中结束流程或发起补充流程的操作按钮
+     * @param type
+     * @param id
+     * @return
+     */
+    @Override
+    public boolean hasProcessControlButton(String type, String id) {
+        boolean hasProcessControlButton = true;
+        LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        //是否是管理员
+        boolean administrator = sysUserService.isAdministrator();
+        //是否是viewer
+        boolean viewer = sysUserService.isViewer(currentUser.getId());
+        if (administrator || !viewer) {
+            return true;
+        }
+        if (ProcessControlButtonTypeEnum.LawsOpinionGather.getValue().equals(type)) {
+            //法规意见收集
+            LawsOpinionGatherEO lawsOpinionGatherEO = lawsOpinionGatherEOService.queryById(id);
+            if (ObjectUtils.isEmpty(lawsOpinionGatherEO)) {
+                return false;
+            }
+            boolean eva = true;
+            if (ObjectUtils.isEmpty(lawsOpinionGatherEO.getEvaluatorIds()) || (ObjectUtils.isNotEmpty(lawsOpinionGatherEO.getEvaluatorIds()) && !lawsOpinionGatherEO.getEvaluatorIds().contains(currentUser.getId()))) {
+                eva = false;
+            }
+            if (!lawsOpinionGatherEO.getCreateBy().equals(currentUser.getUsername())
+                    && !eva
+                    && viewer) {
+                hasProcessControlButton = false;
+            }
+
+        } else if (ProcessControlButtonTypeEnum.LawsTechnologyEvaluation.getValue().equals(type)) {
+            //法规技术评估
+            LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO = lawsTechnologyEvaluationEOService.queryById(id);
+            if (ObjectUtils.isEmpty(lawsTechnologyEvaluationEO)) {
+                return false;
+            }
+            QueryWrapper<LawsTechnologyEvaluationFlowDetailEO> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("laws_technology_evaluation_id", id);
+            List<LawsTechnologyEvaluationFlowDetailEO> flowDetailEOS = lawsTechnologyEvaluationFlowDetailEOService.list(queryWrapper);
+            if (ObjectUtils.isEmpty(flowDetailEOS)) {
+                return false;
+            }
+            boolean eva = true;
+            if (ObjectUtils.isEmpty(flowDetailEOS.get(0).getEvaluatorId()) || (ObjectUtils.isNotEmpty(flowDetailEOS.get(0).getEvaluatorId()) && !flowDetailEOS.get(0).getEvaluatorId().contains(currentUser.getId()))) {
+                eva = false;
+            }
+            if (!lawsTechnologyEvaluationEO.getCreateBy().equals(currentUser.getUsername())
+                    && !eva
+                    && viewer) {
+                hasProcessControlButton = false;
+            }
+
+        } else {
+            hasProcessControlButton = false;
+        }
+        return hasProcessControlButton;
+    }
+
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java

@@ -40,5 +40,6 @@ public class SarFileSplitItemsEO implements Serializable {
     private String sMenuId;
 
     List<String> itemsCondi;
+    private String zhan3Shi4Shun4Xu4;// 展示顺序字段
 
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml

@@ -105,7 +105,7 @@
         insert into sar_file_split_items
         (id, info_id, items_num, items_name, menu_id,
         creation_user, creation_time, modify_time,
-        modify_user, iterms_conditions)
+        modify_user, iterms_conditions,zhan3_shi4_shun4_xu4)
         values
         <foreach collection="list" item="item" index="index" separator=",">(
             #{item.id, jdbcType=VARCHAR}, #{item.infoId, jdbcType=VARCHAR}, #{item.itemsNum, jdbcType=VARCHAR},
@@ -113,7 +113,7 @@
             #{item.menuId, jdbcType=VARCHAR},
             #{item.creationUser, jdbcType=VARCHAR},
             #{item.creationTime, jdbcType=TIMESTAMP}, #{item.modifyTime, jdbcType=TIMESTAMP},
-            #{item.modifyUser, jdbcType=VARCHAR}, #{item.itermsConditions, jdbcType=CLOB}
+            #{item.modifyUser, jdbcType=VARCHAR}, #{item.itermsConditions, jdbcType=CLOB},#{item.zhan3Shi4Shun4Xu4, jdbcType=VARCHAR}
             )
         </foreach>
     </insert>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java

@@ -409,6 +409,9 @@ public class FileSpiltService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
 //            sarFileSplitMenuEODao.insertForeach(treeList);
@@ -674,6 +677,9 @@ public class FileSpiltService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -906,6 +912,9 @@ public class FileSpiltService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -1110,6 +1119,9 @@ public class FileSpiltService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -1311,6 +1323,9 @@ public class FileSpiltService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -1570,6 +1585,9 @@ public class FileSpiltService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -1762,6 +1780,9 @@ public class FileSpiltService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -2001,6 +2022,9 @@ public class FileSpiltService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitPdfService.java

@@ -240,6 +240,9 @@ public class FileSplitPdfService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -461,6 +464,9 @@ public class FileSplitPdfService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -687,6 +693,9 @@ public class FileSplitPdfService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -889,6 +898,9 @@ public class FileSplitPdfService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -1062,6 +1074,9 @@ public class FileSplitPdfService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -1284,6 +1299,9 @@ public class FileSplitPdfService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -1476,6 +1494,9 @@ public class FileSplitPdfService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {
@@ -1663,6 +1684,9 @@ public class FileSplitPdfService {
         }
         if (treeList.size() > 0 && messageList.size() > 0) {
             sarFileSplitMenuEOMapper.insertForeach(treeList);
+            for (int i = 0; i < messageList.size(); i++) {
+                messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1));
+            }
             iSarFileSplitItemsEOService.insertForeach(messageList);
             iSarFileSplitItemsValEOService.insertForeach(itemValList);
         } else {

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue

@@ -8,7 +8,7 @@
           <!--          </span>-->
           {{$route.query.serialNumber +' '+$t('evaluationResults')}}
         </div>
-        <div class="doc-detail-right" v-if='!this.flag'>
+        <div class="doc-detail-right" v-if='flag'>
           <div @click="endProcessClick"
                v-if="(formInline.createBy == this.userInfoQuery.username || administrators) && formInline.gatherResult == 'Underway'"
                class="operator-text-text" :title="$t('endProcess')">
@@ -92,7 +92,7 @@
         total: 0,
         pageSize: 10,
         pageNo: 1,
-        flag:'',
+        flag:false,
         dataSource: [],
         formInline: {},
         administrators:false,
@@ -163,10 +163,7 @@
         })
       }
       getAction('/project/projectUserPermission/hasProcessControlButton', {type: 'LawsOpinionGather',id : this.$route.query.id}).then((res) => {
-        if (res.success) {
           this.flag = res
-        } else {
-        }
       })
     },
     methods: {

jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue

@@ -8,7 +8,7 @@
           <!--          </span>-->
           {{$route.query.serialNumber +' '+$t('regulatoryTechnicalEvaluationResults')}}
         </div>
-        <div class="doc-detail-right" v-if='!this.flag'>
+        <div class="doc-detail-right" v-if='flag'>
           <div @click="CurrentStandard" class="operator-text-text" :title="$t('initiateSupplementaryProcess')">
             <a-icon type="profile"/>
             {{$t('initiateSupplementaryProcess')}}
@@ -96,7 +96,7 @@
       return {
         queryParam: {},
         dataSource: [],
-        flag:'',
+        flag:false,
         userInfoQuery: {},
         administrators: false,
         url: {
@@ -182,10 +182,7 @@
         })
       }
       getAction('/project/projectUserPermission/hasProcessControlButton', {type: 'LawsTechnologyEvaluation',id : this.$route.query.id}).then((res) => {
-        if (res.success) {
           this.flag = res
-        } else {
-        }
       })
     },
     methods: {

jero-web/src/views/regulationsKanban/index.vue

@@ -298,10 +298,11 @@ export default {
     },
     //虚拟清单名称事件
     entryNameClick(item) {
-      this.$router.push({
+      let newUrl = this.$router.resolve({
-        path: '/ParameterTemplateList',
+        path: '/docManage/library/detail',
         query: item
       })
+      window.open(newUrl.href, '_blank')
     },
     searchQuery() {
       this.pageNo = 1

jero-web/src/views/system/UserAnnouncementList.vue

@@ -145,13 +145,13 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
             ellipsis: true,
             scopedSlots: { customRender: 'msgTitile' }
           },
-          {
+          // {
-            title: this.$t('Sponsor'),
+          //   title: this.$t('Sponsor'),
-            align: 'left',
+          //   align: 'left',
-            ellipsis: true,
+          //   ellipsis: true,
-            dataIndex: 'initiator',
+          //   dataIndex: 'initiator',
-            width: 200
+          //   width: 200
-          },
+          // },
           {
             title: this.$t('MessageType'),
             align: 'left',