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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java

@@ -83,7 +83,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
 		// 处理 状态 中英文
 		Map<String, String> stateMap = ManifestStateEnum.toMap(cut);
 		rows.forEach(manifestEO -> {
-			manifestEO.setProjectName(paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion()).getProjectName());
+			manifestEO.setProjectName(paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion(),paramsManifestEO.getCut()).getProjectName());
 			manifestEO.setState(stateMap.get(manifestEO.getState()));
 		});
 		return Result.OK(cut, pageList);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml

@@ -203,7 +203,8 @@
         select tmp_tb.* from(
         select
             plb.id as project_id,
-            concat(pni.project_name,'-',pyni.year_name,'-',target_market) as project_name
+            target_market as targetMarket,
+            concat(pni.project_name,'-',pyni.year_name) as project_name
         from project_library_base plb
         left join project_name_info as pni on plb.project_name_id = pni.id
         left join project_year_name_info as pyni on plb.year_name_id = pyni.id

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java

@@ -89,7 +89,7 @@ public interface IParamsManifestEOService extends IService<ParamsManifestEO> {
 
 	ParamsManifestEO copy(ParamsManifestEO paramsManifestEO, String sourceManifestId);
 
-	ParamsManifestVO getProjectById(String projectId, String projectVersion);
+	ParamsManifestVO getProjectById(String projectId, String projectVersion,String cut);
 
 	List<Map<String, String>> labelListForProjectDetails(String projectId);
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -1836,7 +1836,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				//日期
 				String deadline = new SimpleDateFormat("yyyy-MM-dd").format(paramsCollectManifestEO.getDeadline());
 				//项目名称
-				ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(paramsManifestEO.getProjectId(), paramsManifestEO.getProjectVersion()); // 获取项目信息
+				ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(paramsManifestEO.getProjectId(),
+						paramsManifestEO.getProjectVersion(),paramsCollectManifestVO.getCut()); // 获取项目信息
 				//url
 				String urlParamsStr = parseUrlParams(paramsManifestEO);
 				String hrefFeishu = backUrl + "/ParameterItemCollection" + urlParamsStr;
@@ -2055,7 +2056,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
 		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId); // 获取清单信息
-		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId, paramsManifestEO.getProjectVersion()); // 获取项目信息
+		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId,
+				paramsManifestEO.getProjectVersion(),paramsCollectManifestVO.getCut()); // 获取项目信息
 		paramsManifestEO.setProjectName(projectInfo.getProjectName());
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -2211,7 +2213,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
 		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId); // 获取清单信息
-		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId, paramsManifestEO.getProjectVersion()); // 获取项目信息
+		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId, paramsManifestEO.getProjectVersion(),paramsCollectManifestVO.getCut()); // 获取项目信息
 		paramsManifestEO.setProjectName(projectInfo.getProjectName());
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -2385,7 +2387,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
 		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId); // 获取清单信息
-		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId, paramsManifestEO.getProjectVersion()); // 获取项目信息
+		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId, paramsManifestEO.getProjectVersion(),paramsCollectManifestVO.getCut()); // 获取项目信息
 		paramsManifestEO.setProjectName(projectInfo.getProjectName());
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -5261,7 +5263,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		List<ParamsManifestEO> manifestEOS = paramsManifestEOService.list(queryWrapper);
 		for (ParamsManifestEO manifestEO : manifestEOS) {
 			//项目名称
-			ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion());
+			ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion(),null);
 			if (ObjectUtils.isNotEmpty(projectInfo)) {
 				//url
 				String urlParamsStr = parseUrlParams(manifestEO);
@@ -5707,7 +5709,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
 
 		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId); // 获取清单信息
-		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId, paramsManifestEO.getProjectVersion()); // 获取项目信息
+		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId, paramsManifestEO.getProjectVersion(),paramsCollectManifestVO.getCut()); // 获取项目信息
 		paramsManifestEO.setProjectName(projectInfo.getProjectName());
 
 		String[] paramsCollectManifestIdArr = paramsCollectManifestIds.split(",");

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java

@@ -19,7 +19,11 @@ import com.jero.modules.cert.collect.enums.ManifestStateEnum;
 import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper;
 import com.jero.modules.cert.collect.mapper.ParamsConfigEOMapper;
 import com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper;
-import com.jero.modules.cert.collect.service.*;
+import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
+import com.jero.modules.cert.collect.service.IParamsConfigDataEOService;
+import com.jero.modules.cert.collect.service.IParamsConfigEOService;
+import com.jero.modules.cert.collect.service.IParamsManifestEOService;
+import com.jero.modules.cert.collect.service.IParamsManifestHistoryEOService;
 import com.jero.modules.cert.collect.vo.ParamsManifestHistoryVO;
 import com.jero.modules.cert.collect.vo.ParamsManifestVO;
 import com.jero.modules.cert.report.entity.ParamsReportEO;
@@ -35,7 +39,9 @@ import com.jero.modules.project.service.IProjectLibraryBaseService;
 import com.jero.modules.project.service.IProjectRelatedPersonnelService;
 import com.jero.modules.project.service.IProjectUserPermissionService;
 import com.jero.modules.system.entity.SysUser;
+import com.jero.modules.system.enums.DicCodeEnum;
 import com.jero.modules.system.mapper.SysDictMapper;
+import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.service.ISysUserService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -45,7 +51,14 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.NumberFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**
@@ -107,6 +120,9 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 	@Autowired
 	private IProjectUserPermissionService projectUserPermissionService;
 
+	@Autowired
+	private ISysDictService sysDictService;
+
 	/**
 	 * 保存
 	 *
@@ -751,12 +767,45 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 	}
 
 	@Override
-	public ParamsManifestVO getProjectById(String projectId, String projectVersion) {
+	public ParamsManifestVO getProjectById(String projectId, String projectVersion,String cut) {
 		ParamsManifestVO paramsManifestVO = paramsManifestEOMapper.getProjectById(projectId);
-		paramsManifestVO.setProjectName(paramsManifestVO.getProjectName() + "-" + projectVersion); // 项目名称加上 相关项目版本
+		String targetMarket = paramsManifestVO.getTargetMarket();//目标市场
+		if(StringUtils.isNotEmpty(targetMarket)){
+			List<DictModel> regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
+			targetMarket = getTargetMarket(cut, regionList, targetMarket);
+		}
+		paramsManifestVO.setProjectName(paramsManifestVO.getProjectName()+"-"+ targetMarket + "-" + projectVersion); // 项目名称加上 相关项目版本
 		return paramsManifestVO;
 	}
 
+	private String getTargetMarket(String cut, List<DictModel> regionList, String targetMarket) {
+		//适用地区
+		List<DictModel> dictModelList = new ArrayList<>();
+		String region = "";
+		if(com.jero.modules.system.util.StringUtils.isNotBlank(targetMarket)){
+			for (String s : targetMarket.split(",")) {
+				List<DictModel> dictModelListTemp = regionList.stream()
+						.filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
+				dictModelList.addAll(dictModelListTemp);
+			}
+
+			if(dictModelList.size() != 0){
+				StringBuilder sb = new StringBuilder();
+				for (DictModel dictModel : dictModelList) {
+					if(CutEnum.CN.getValue().equals(cut)){
+						sb.append(dictModel.getText()+",");
+					}else{
+						sb.append(dictModel.getTextEn()+",");
+					}
+				}
+				if(com.jero.modules.system.util.StringUtils.isNotBlank(sb)){
+					region = sb.substring(0,sb.length()-1);
+				}
+			}
+		}
+		return region;
+	}
+
 	@Override
 	public List<Map<String, String>> labelListForProjectDetails(String projectId) {
 		return paramsManifestEOMapper.labelListForProjectDetails(projectId);

jero-web/src/components/tableCollection/index.vue

@@ -479,8 +479,6 @@
         this.areaVisibleView = true
         let url = ''
         if (this.$route.query.it === undefined) {
-          console.log(val)
-          console.log(val.db_field_name)
           if(val.db_field_name == 'referencesCol') {
             url = `/jero-boot/params/report/queryParamsReportConfigById?id=${val.db_field_id}`
           }else{
@@ -698,6 +696,11 @@
         getAction('paramsCollectManifestLog/paramsCollectManifestLogEO/page', query).then((res) => {
           if (res.success) {
             this.dataSourcehistory = res.result.records
+            if(this.dataSourcehistory && this.dataSourcehistory.length > 0){
+              this.dataSourcehistory.forEach(val=>{
+                  val.logContent = val.logContent.replace(/\"/g,"“")
+              })
+            }
             this.total = res.result.total
             this.loading = false
           } else {

jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue

@@ -90,15 +90,16 @@
             <!--                 style="float: left;font-size: 16px;font-weight: 400;color: #040B29;">-->
             <!--              {{$t('DocumentStandard')}}-->
             <!--            </div>-->
-
-            <div class="operator-text" v-has="'dummyInventoryInfo:importData'" v-if="isTrue">
+<!--            v-if="isTrue"-->
+            <div class="operator-text" v-has="'dummyInventoryInfo:importData'" >
               <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" @getList="getPersonnelList"
                           :accept="'.zip'"/>
             </div>
             <!--            模板下载-->
+<!--            v-if="isTrue"-->
             <div @click="handleModule"
                  v-has="'dummyInventoryInfo:exportTemplate'"
-                 class="operator-text" v-if="isTrue">
+                 class="operator-text" >
               <a-icon type="download"/>
               {{$t('templateDownload')}}
             </div>
@@ -110,37 +111,42 @@
               {{$t('export')}}
             </div>
             <!--            复制-->
+<!--            v-if="isTrue"-->
             <div @click="copyClick"
                  v-has="'dummyInventoryInfo:copyInfoByIds'"
-                 class="operator-text" v-if="isTrue">
+                 class="operator-text" >
               <a-icon type="copy"/>
               {{$t('copy')}}
             </div>
             <!--            批量设置-->
+<!--            v-if="isTrue"-->
             <div @click="batSettingClick"
                  v-has="'dummyInventoryInfo:setBatch'"
-                 class="operator-text" v-if="isTrue">
+                 class="operator-text" >
               <a-icon type="setting"/>
               {{$t('batSetting')}}
             </div>
             <!--            调取-->
+<!--            v-if="isTrue"-->
             <div @click="transferClick"
                  v-has="'dummyInventoryInfo:copyInfoByIds'"
-                 class="operator-text" v-if="isTrue">
+                 class="operator-text" >
               <a-icon type="profile"/>
               {{$t('Transfer')}}
             </div>
             <!--            添加-->
+<!--            v-if="isTrue"-->
             <div @click="handleAdd"
                  v-has="'dummyInventoryInfo:add'"
-                 class="operator-text" v-if="isTrue">
+                 class="operator-text" >
               <a-icon type="plus"/>
               {{$t('add')}}
             </div>
             <!--            删除-->
+<!--            v-if="isTrue"-->
             <div @click="handleDel"
                  v-has="'dummyInventoryInfo:deleteBatch'"
-                 class="operator-text" v-if="isTrue">
+                 class="operator-text" >
               <a-icon type="delete"/>
               {{$t('BatchDelete')}}
             </div>

jero-web/src/views/documentTools/virtualList/index.vue

@@ -64,18 +64,18 @@
           <a @click="VirtualListNameClick(record)">{{text}}</a>
         </span>
         <span slot="operation" slot-scope="text,record">
+<!--          v-if="record.createBy == userData.username || administrators"-->
            <a class="text-operation" @click="edit(record)"
               v-has="'dummyInventoryBase:deleteBatch'"
-              v-if="record.createBy == userData.username || administrators"
               :disabled="record.state == 1?true:false">{{$t('edit')}}</a>
+<!--          v-if="record.createBy == userData.username || administrators"-->
            <a class="text-operation"
-              v-if="record.createBy == userData.username || administrators"
               v-has="'dummyInventoryBase:issue'"
               @click="withdraw(record)">
              {{record.state == 2 ? $t('release') : $t('withdraw')}}
            </a>
+<!--          v-if="record.createBy == userData.username || administrators"-->
            <a class="text-operation" :disabled="record.state == 1?true:false"
-              v-if="record.createBy == userData.username || administrators"
               v-has="'dummyInventoryBase:deleteBatch'"
               @click="maintenanceList(record)">{{$t('maintenanceList')}}</a>
            <a class="text-operation"
@@ -83,9 +83,9 @@
               :disabled="record.state == 2?true:false" @click="subscribe(record)">
                {{!record.readFlag || record.readFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}}
            </a>
+<!--          v-if="record.createBy == userData.username || administrators"-->
            <a class="text-operation" :disabled="record.state == 1?true:false"
               v-has="'dummyInventoryBase:deleteBatch'"
-              v-if="record.createBy == userData.username || administrators"
               @click="deleteLib(record)">{{$t('deleteLib')}}</a>
         </span>
       </a-table>

jero-web/src/views/projectManagement/dialog/parametercolumn.vue

@@ -1,6 +1,6 @@
 <template>
   <div class='diolag-area'>
-    <a-spin :spinning='spinLoading'>
+    <a-spin :spinning='spinLoading' @keyup.enter.native="searchQuery">
       <a-form-model
         class='tag-module'
         ref='ruleForm'
@@ -245,6 +245,7 @@
         })
       },
       searchQuery() {
+        this.pageNo = 1
         this.loadData()
       },
       searchReset() {

jero-web/src/views/system/modules/UserModal.vue

@@ -59,6 +59,7 @@
         <!--        v-show="!roleDisabled"-->
         <a-form-item :label="$t('RoleAssignment')" :labelCol="labelCol" :wrapperCol="wrapperCol"
         >
+
           <a-select
             mode="multiple"
             style="width: 100%"
@@ -303,7 +304,7 @@
         roleList: [],
         selectedRole: [],
         dutyTerritories: '',
-        brands: '',
+        brands: null,
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 }
@@ -418,6 +419,7 @@
         })
       },
       selectChange(value){
+        console.log(value,"value",this.roleList)
         value.map((item,index) => {
           this.roleList.map((val,index) => {
             if(val.roleCode == 'Viewer' && item == val.id){
@@ -427,6 +429,7 @@
               })
               return
             } else if(val.roleCode == 'BrandAdministrator' && item == val.id) {
+              this.brands = []
               this.$nextTick(() => {
                 this.viewshowbrand = true
               })