From da3f684f9ee5a3bc6dd0e7e0e3ee86103ce0852f Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 14 Jul 2022 10:08:40 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95=E5=A2=9E=E5=8A=A0=E9=AB=98=E7=BA=A7?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tableCollection/index.vue  |   7 +-
 .../ParameterItemCollectionList.vue           | 129 ++++++++++++------
 2 files changed, 93 insertions(+), 43 deletions(-)

diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 1399e3518..fb66f9bdc 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -161,6 +161,10 @@
         type: Object,
         default: true
       },
+      queryParamQuery: {
+        type: Object,
+        default: true
+      },
       currentPersonRole: {
         type: String,
         default: true
@@ -591,7 +595,8 @@
           pageSize: this.pageSize,
           userTypes: this.currentPersonRole || currentPersonRole,
           paramsManifestId: paramsManifestid,
-          ...this.formInline
+          ...this.formInline,
+          ...currentPersonRole
         }
         this.loading = true
         getAction(url, params).then((res) => {
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index a81744a55..99c19a08b 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -33,17 +33,17 @@
                                v-model="formInline.paramsName"></a-input>
                     </div>
                   </a-col>
-                  <a-col :md="6" :sm="8">
-                    <div class="box-title-text">
-                      <div class="title-text" :title="$t('certificationCategory')">
-                        <span>{{$t('certificationCategory')}}</span>
-                      </div>
-                      <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
-                                         :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
-                                         :type="'select'"
-                                         :triggerChange="false" :dictCode="'cert_category'"/>
-                    </div>
-                  </a-col>
+<!--                  <a-col :md="6" :sm="8">-->
+<!--                    <div class="box-title-text">-->
+<!--                      <div class="title-text" :title="$t('certificationCategory')">-->
+<!--                        <span>{{$t('certificationCategory')}}</span>-->
+<!--                      </div>-->
+<!--                      <j-dict-select-tag class="box-input" v-model="formInline.certCategory"-->
+<!--                                         :placeholder="$t('PleaseSelect')+$t('certificationCategory')"-->
+<!--                                         :type="'select'"-->
+<!--                                         :triggerChange="false" :dictCode="'cert_category'"/>-->
+<!--                    </div>-->
+<!--                  </a-col>-->
                   <a-col :md="6" :sm="8">
                     <div class="box-title-text">
                       <div class="title-text" :title="$t('areaOfResponsibility')">
@@ -64,29 +64,32 @@
                                v-model="formInline.dre"></a-input>
                     </div>
                   </a-col>
-                  <a-col :md="6" :sm="8">
-                    <div class="box-title-text">
-                      <div class="title-text" :title="$t('status')">
-                        <span>{{$t('status')}}</span>
-                      </div>
-                      <a-select :placeholder="$t('PleaseSelect')+$t('status')"
-                                class="box-input"
-                                allowClear
-                                :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                                v-model="formInline.state">
-                        <a-select-option v-for="(item, key) in statusList"
-                                         :key="key"
-                                         :value="item.value">
-                     <span style="display: inline-block;width: 100%" :title=" item.name ">
-                           {{ item.name}}
-                     </span>
-                        </a-select-option>
-                      </a-select>
-                    </div>
-                  </a-col>
+<!--                  <a-col :md="6" :sm="8">-->
+<!--                    <div class="box-title-text">-->
+<!--                      <div class="title-text" :title="$t('status')">-->
+<!--                        <span>{{$t('status')}}</span>-->
+<!--                      </div>-->
+<!--                      <a-select :placeholder="$t('PleaseSelect')+$t('status')"-->
+<!--                                class="box-input"-->
+<!--                                allowClear-->
+<!--                                :getPopupContainer="triggerNode=> triggerNode.parentNode"-->
+<!--                                v-model="formInline.state">-->
+<!--                        <a-select-option v-for="(item, key) in statusList"-->
+<!--                                         :key="key"-->
+<!--                                         :value="item.value">-->
+<!--                     <span style="display: inline-block;width: 100%" :title=" item.name ">-->
+<!--                           {{ item.name}}-->
+<!--                     </span>-->
+<!--                        </a-select-option>-->
+<!--                      </a-select>-->
+<!--                    </div>-->
+<!--                  </a-col>-->
                   <span style="float: right;overflow: hidden;margin-right: 11px"
                         class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
+                 <globalAdvancedQuery ref="globalAdvancedQueryRef"
+                                      @handleSuperQuery="handleSuperQuery"
+                                      :fieldList="fieldList"/>
                   <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                   <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
                </a-col>
@@ -187,7 +190,7 @@
           <div style="width: 100%">
             <!-- 表格-10控件-->
             <table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue'
-                              :formInline='formInline' :currentPersonRole='currentPersonRole'
+                              :formInline='formInline' :queryParamQuery='queryParamQuery' :currentPersonRole='currentPersonRole'
                               @getDataSource="getDataSource"
                               @handlePreservation="handlePreservation"
                               @value='value'
@@ -391,6 +394,7 @@
   import TableCollection from '@/components/tableCollection/index'
   import { getAction, postAction } from '../../../api/manage'
   import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index'
+  import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
   import SynchronousSubmissionLibrary from '@/components/SynchronousSubmissionLibrary/index'
   import TaskCutOffTime from '@/components/TaskCutOffTime/index'
   import ReferenceParameter from '@/components/ReferenceParameter/index'
@@ -408,45 +412,55 @@
       AssignedBy,
       TaskCutOffTime,
       ReferenceParameter,
-      SynchronousSubmissionLibrary
+      SynchronousSubmissionLibrary,
+      globalAdvancedQuery
     },
     data() {
       this.statusList = [
         {
           value: '1',
-          name: this.$t('CollectionInitiated')
+          title: this.$t('CollectionInitiated'),
+          key:'1',
         },
         {
           value: '2',
-          name: this.$t('handledInterface')
+          title: this.$t('handledInterface'),
+          key:'2',
         },
         {
           value: '3',
-          name: this.$t('ReturnedPerson')
+          title: this.$t('ReturnedPerson'),
+          key:'3',
         },
         {
           value: '4',
-          name: this.$t('completed')
+          title: this.$t('completed'),
+          key:'4',
         },
         {
           value: '5',
-          name: this.$t('Filledreturn')
+          title: this.$t('Filledreturn'),
+          key:'5',
         },
         {
           value: '6',
-          name: this.$t('Submitted')
+          title: this.$t('Submitted'),
+          key:'6',
         },
         {
           value: '7',
-          name: this.$t('ReturnedEngineer')
+          title: this.$t('ReturnedEngineer'),
+          key:'7',
         },
         {
           value: '8',
-          name: this.$t('SynchronizedLibrary')
+          title: this.$t('SynchronizedLibrary'),
+          key:'8',
         },
         {
           value: '9',
-          name: this.$t('alteration')
+          title: this.$t('alteration'),
+          key:'9',
         }
       ]
       return {
@@ -502,9 +516,24 @@
             scopedSlots: { customRender: 'operation' }
           }
         ],
+        fieldList: [
+          {
+            type: '',
+            value: 'attestationType',
+            text: this.$t('certificationCategory'),
+            dictCode: 'cert_category'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          },
+          {
+            type: '',
+            value: 'attestationRank',
+            text: this.$t('status'),
+            options: this.statusList//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
+          },
+        ],
         selectedRowKeys: [],
         textLoading: false,
         formInline: {},
+        queryParamQuery:{},
         url: {
           tableHeader: 'params/collectManifest/getHeader',
           tableList: 'params/collectManifest/list',
@@ -740,6 +769,20 @@
           return flag
         }
       },
+      // 高级搜索
+      handleSuperQuery(params, matchType) {
+        let sqp = {}
+        if (!params || (params && params.length == 0)) {
+          sqp['superQueryParams'] = ''
+          this.$refs.globalAdvancedQueryRef.superQueryFlag = false
+        } else {
+          this.$refs.globalAdvancedQueryRef.superQueryFlag = true
+          sqp['superQueryParams'] = encodeURI(JSON.stringify(params))
+          sqp['superQueryMatchType'] = matchType
+        }
+        this.queryParamQuery = sqp
+        this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+      },
       // 认证工程师 批量删除 权限
       // 仅仅状态为 待发起收集 工程接口人退回 变更 可以批量删除
       homoJurisdictionBatchdelete() {
@@ -1392,6 +1435,8 @@
       },
       searchReset() {
         this.$refs.CollectionTabel.getTableListReset()
+        this.$refs.globalAdvancedQueryRef.resetLine()
+        this.$refs.globalAdvancedQueryRef.emitCallback()
       },
       // 批量删除 -- 与下发收集一致
       handleDelJurisdiction() {

From 51977b5214611da309980d54ab53ca4edff582b2 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 14 Jul 2022 10:20:18 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=8F=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOController.java    | 22 ++++++++++++--
 .../IParamsCollectManifestEOService.java      |  4 ++-
 .../ParamsCollectManifestEOServiceImpl.java   | 30 +++++++++++++++++++
 3 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
index aed81c064..3020e8abf 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
@@ -5,20 +5,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
-import com.jero.common.aspect.annotation.PermissionData;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
 import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
-import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -279,6 +276,25 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 		}
 	}
 
+	/**
+	 *  修改责任领域
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-修改责任领域")
+	@ApiOperation(value="参数项收集清单-修改责任领域", notes="参数项收集清单-修改责任领域")
+	@PostMapping(value = "/updateDutyTerritory")
+//	@RequiresPermissions("params:collectManifest:sdt")
+	public Result<?> updateDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.updateDutyTerritory(paramsCollectManifestVO);
+		if (isSuccess) {
+			return Result.OK("修改责任领域成功！");
+		} else {
+			return Result.error("修改责任领域失败！");
+		}
+	}
+
 	/**
 	 *  分配工程接口人
 	 *
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
index fce085305..d41c37cf2 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
-import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
 
 import java.util.List;
 import java.util.Map;
@@ -116,6 +115,9 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 	// 批量设置截止时间
 	boolean updateDeadlineBatch(ParamsCollectManifestVO paramsCollectManifestVO);
 
+	// 修改责任领域
+	boolean updateDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO);
+
 	// 修改工程接口人
 	boolean updateSdt(ParamsCollectManifestVO paramsCollectManifestVO);
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 10ea4fc41..f44f6b9f1 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1178,6 +1178,36 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		return updateBatchById(updateEOList);
 	}
 
+	@Override
+	public boolean updateDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO) {
+		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getProjectId())
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getDutyTerritory())) {
+			throw new JeroBootException("参数不能为空！");
+		}
+		String paramsCollectManifestId = paramsCollectManifestVO.getIds();
+		String projectId = paramsCollectManifestVO.getProjectId();
+		String dutyTerritory = paramsCollectManifestVO.getDutyTerritory();
+
+		ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
+		updateEO.setId(paramsCollectManifestId);
+		updateEO.setDutyTerritory(dutyTerritory);
+
+		// 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段
+		ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(projectId, dutyTerritory);
+		if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) {
+			String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson();
+			if (org.apache.commons.lang.StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段
+				SysUser sysUser = sysUserService.getById(sdtId);
+				if (ObjectUtil.isNotEmpty(sysUser)) {
+					updateEO.setSdt(sysUser.getUsername()); // 设置工程接口人
+				}
+			}
+		}
+
+		return updateById(updateEO);
+	}
+
 	@Override
 	public boolean updateSdt(ParamsCollectManifestVO paramsCollectManifestVO) {
 		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds()) || StringUtils.isEmpty(paramsCollectManifestVO.getSdt())) {

From 4b47cce99820c4a2fce1e19bd3b973dfba4a4635 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 14 Jul 2022 10:36:27 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=8F=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsCollectManifestEOServiceImpl.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index f44f6b9f1..651291499 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -641,6 +641,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			if ("description".equals(dbFieldName)) {
 				indexOfDescription = i;
 			}
+			if ("duty_territory".equals(dbFieldName)) {
+				map.put("type", true);
+			}
 			if ("sdt".equals(dbFieldName)) {
 				map.put("click", true);
 			}

From 5df29212273b489e571a2c3504c1c7f227795302 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 14 Jul 2022 10:49:31 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=8F=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsCollectManifestEOServiceImpl.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 651291499..ffaca6260 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -642,7 +642,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				indexOfDescription = i;
 			}
 			if ("duty_territory".equals(dbFieldName)) {
-				map.put("type", true);
+				map.put("click1", true);
 			}
 			if ("sdt".equals(dbFieldName)) {
 				map.put("click", true);

From d6c1da31529a0b82cd929320c0d5aa7c45bc495f Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 14 Jul 2022 11:02:04 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=8F=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsCollectManifestEOServiceImpl.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index ffaca6260..5f77dae15 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1184,13 +1184,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	@Override
 	public boolean updateDutyTerritory(ParamsCollectManifestVO paramsCollectManifestVO) {
 		if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())
-				|| StringUtils.isEmpty(paramsCollectManifestVO.getProjectId())
+				|| StringUtils.isEmpty(paramsCollectManifestVO.getParamsManifestId())
 				|| StringUtils.isEmpty(paramsCollectManifestVO.getDutyTerritory())) {
 			throw new JeroBootException("参数不能为空！");
 		}
 		String paramsCollectManifestId = paramsCollectManifestVO.getIds();
-		String projectId = paramsCollectManifestVO.getProjectId();
 		String dutyTerritory = paramsCollectManifestVO.getDutyTerritory();
+		ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsCollectManifestVO.getParamsManifestId());
+		String projectId = paramsManifestEO.getProjectId();
 
 		ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
 		updateEO.setId(paramsCollectManifestId);

From 860270eba81c5d262c08bc4d110d929e838aef59 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 14 Jul 2022 11:05:33 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |   2 +
 jero-web/src/common/lang/zh-cn.js             |   2 +
 .../components/TermInformation.vue            |   1 -
 .../components/standardDecompositionSheet.vue |   1 -
 .../components/evaluatorFeedbackList.vue      | 223 ++++++++++++++++--
 .../processForm/evaluationProcess/index.vue   |  60 ++++-
 6 files changed, 265 insertions(+), 24 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 1dc0d3d5c..ff30c7a53 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1132,4 +1132,6 @@ module.exports = {
   standardDocuments:'Standard documents',
   pleaseCompleteTheEvaluationMethodorEvaluator:'Please complete the evaluation method or evaluator in the list',
   reviewComments:'Review comments',
+  PleaseCompleteList:'Please complete the compliance results in the list',
+  sponsorFeedback:'Sponsor feedback',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 4c6a71b22..6325d941d 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1136,4 +1136,6 @@ module.exports = {
   standardDocuments:'标准文件',
   pleaseCompleteTheEvaluationMethodorEvaluator:'请补全列表中评估方式或评估人',
   reviewComments:'审核意见',
+  PleaseCompleteList:'请补全列表中符合性结果',
+  sponsorFeedback:'发起人反馈',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
index 620a72018..8233a6a36 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
@@ -87,7 +87,6 @@
             title: this.$t('clauseContent'),
             dataIndex: 'itemContent',
             align: 'center',
-            ellipsis: true,
             scopedSlots: { customRender: 'clauseContent' }
           },
           {
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
index d7d0a0c65..0496bf0a7 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue
@@ -123,7 +123,6 @@
             title: this.$t('clauseContent'),
             dataIndex: 'iterms_conditions',
             align: 'center',
-            ellipsis: true,
             scopedSlots: { customRender: 'clauseContent' }
           },
           {
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
index bd94d2b08..c8365ad06 100644
--- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
@@ -22,21 +22,81 @@
             <div class="clauseContent-text" v-html="text"></div>
           </a-tooltip>
         </div>
+
+        <span slot="nameTechnicalDocument" slot-scope="text,result">
+              <a-input class="box-input"
+                       :maxLength="100"
+                       v-model="result.technicalFileName"
+                       :placeholder="$t('PleaseEnter')+$t('nameTechnicalDocument')"/>
+        </span>
+        <span slot="chapter" slot-scope="text,result">
+           <a-textarea :placeholder="$t('pleaseEnter')+$t('chapter')"
+                       v-model="result.section"
+                       :maxLength="300"
+                       :rows="2"/>
+        </span>
+        <span slot="opinion" slot-scope="text,result">
+          <a-textarea :placeholder="$t('pleaseEnter')+$t('opinion')"
+                      v-model="result.opinion"
+                      :maxLength="300"
+                      :rows="2"/>
+        </span>
+        <span slot="enclosure" slot-scope="text,result,index">
+                    <a-button type="primary" class="button-text"
+                              @click="clickButtonToUpload('accessoryFile',index)">
+                    {{ (result.accessoryFile === 'null' || result.accessoryFile === '' ||
+                    result.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                    }}
+                  </a-button>
+        </span>
+        <span slot="complianceResults" slot-scope="text,result">
+              <a-select :placeholder="$t('PleaseSelect')+$t('complianceResults')"
+                        class="box-input"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                        allowClear
+                        v-model="result.complianceResult">
+                  <a-select-option v-for="(item, key) in complianceResultsList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title="item.name ">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
+        </span>
+        <span slot="accessoryFile" slot-scope="text,result">
+               <a v-if="text" @click="accessoryFileClick(text)">
+                    {{ $t('viewFile') }}
+               </a>
+               <span v-else>--</span>
+        </span>
+        <span slot="Results" slot-scope="text,result">
+           {{text == 'Compliance' ? $t('accord'):$t('nonConformity')}}
+        </span>
+        <span slot="sponsorFeedback" slot-scope="text,result">
+             <a-textarea :placeholder="$t('pleaseEnter')+$t('sponsorFeedback')"
+                         v-model="result.sponsorFeedback"
+                         :maxLength="300"
+                         :rows="2"/>
+        </span>
       </a-table>
     </div>
     <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
+    <viewFileModel ref="viewFileModelRef"/>
   </div>
 </template>
 
 <script>
   import { getAction, postAction } from '@/api/manage'
   import uploadFile from '@/components/uploadFile/file'
+  import viewFileModel from '@/components/viewFileModel/index'
 
   export default {
     name: 'evaluatorFeedback',
 
     components: {
-      uploadFile
+      uploadFile,
+      viewFileModel
     },
     props: {
       title: {
@@ -56,61 +116,154 @@
         loading: false,
         uploadIndex: '',
         dataSource: [],
-        columns: [
+        complianceResultsList: [
+          {
+            name: this.$t('accord'),
+            value: 'Compliance'
+          },
+          {
+            name: this.$t('nonConformity'),
+            value: 'Non-Compliance'
+          }
+        ],
+        columnsTwo: [
           {
             title: this.$t('clauseNo'),
             dataIndex: 'itemNum',
             align: 'center',
+            width: 180,
             ellipsis: true
           },
           {
             title: this.$t('clauseName'),
             dataIndex: 'itemName',
             align: 'center',
+            width: 180,
             ellipsis: true
           },
           {
             title: this.$t('clauseContent'),
             dataIndex: 'itemContent',
             align: 'center',
-            ellipsis: true,
+            width: 280,
             scopedSlots: { customRender: 'clauseContent' }
           },
           {
             title: this.$t('evaluationMethod'),
-            dataIndex: 'evaluationMethod',
+            dataIndex: 'evaluationMethodsName',
             align: 'center',
+            width: 180,
             ellipsis: true
           },
           {
             title: this.$t('nameTechnicalDocument'),
-            dataIndex: 'nameTechnicalDocument',
+            dataIndex: 'technicalFileName',
             align: 'center',
+            width: 280,
+            scopedSlots: { customRender: 'nameTechnicalDocument' }
+          },
+          {
+            title: this.$t('chapter'),
+            dataIndex: 'section',
+            align: 'center',
+            width: 180,
+            scopedSlots: { customRender: 'chapter' }
+          },
+          {
+            title: this.$t('opinion'),
+            dataIndex: 'opinion',
+            align: 'center',
+            width: 180,
+            scopedSlots: { customRender: 'opinion' }
+          },
+          {
+            title: this.$t('enclosure'),
+            dataIndex: 'accessoryFile',
+            align: 'center',
+            width: 180,
+            scopedSlots: { customRender: 'enclosure' }
+          },
+          {
+            title: this.$t('complianceResults'),
+            dataIndex: 'complianceResult',
+            align: 'center',
+            width: 180,
+            scopedSlots: { customRender: 'complianceResults' }
+          }
+        ],
+        columnsThree: [
+          {
+            title: this.$t('clauseNo'),
+            dataIndex: 'itemNum',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseName'),
+            dataIndex: 'itemName',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('clauseContent'),
+            dataIndex: 'itemContent',
+            align: 'center',
+            width: 280,
+            scopedSlots: { customRender: 'clauseContent' }
+          },
+          {
+            title: this.$t('evaluationMethod'),
+            dataIndex: 'evaluationMethodsName',
+            align: 'center',
+            width: 180,
+            ellipsis: true
+          },
+          {
+            title: this.$t('nameTechnicalDocument'),
+            dataIndex: 'technicalFileName',
+            align: 'center',
+            width: 280,
             ellipsis: true
           },
           {
             title: this.$t('chapter'),
-            dataIndex: 'chapter',
+            dataIndex: 'section',
             align: 'center',
+            width: 180,
             ellipsis: true
           },
           {
             title: this.$t('opinion'),
             dataIndex: 'opinion',
             align: 'center',
+            width: 180,
             ellipsis: true
           },
           {
             title: this.$t('enclosure'),
-            dataIndex: 'enclosure',
+            dataIndex: 'accessoryFile',
             align: 'center',
-            ellipsis: true
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'accessoryFile' }
           },
           {
             title: this.$t('complianceResults'),
-            dataIndex: 'complianceResults',
+            dataIndex: 'complianceResult',
             align: 'center',
-            ellipsis: true
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'Results' }
+          },
+          {
+            title: this.$t('sponsorFeedback'),
+            dataIndex: 'sponsorFeedback',
+            align: 'center',
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'sponsorFeedback' }
           }
         ]
       }
@@ -118,6 +271,21 @@
     mounted() {
       if (this.evaluatorFeedbackList && this.evaluatorFeedbackList.length > 0) {
         this.dataSource = this.evaluatorFeedbackList
+        if (this.$route.query.taskDefinitionKey != 'pgrqr') {
+          this.dataSource.forEach(res => {
+            res.sponsorFeedback = ''
+          })
+          this.dataSource = [...this.dataSource]
+        }
+      }
+    },
+    computed: {
+      columns() {
+        if (this.$route.query.taskDefinitionKey == 'pgrqr') {
+          return this.columnsTwo
+        } else {
+          return this.columnsThree
+        }
       }
     },
     methods: {
@@ -126,7 +294,7 @@
         this.$refs.uploadFile.visible = true
         this.uploadName = item
         this.uploadIndex = index
-        getAction('sys/common/getFileInfos', { id: this.dataList[this.uploadIndex][this.uploadName] }).then((res) => {
+        getAction('sys/common/getFileInfos', { id: this.dataSource[this.uploadIndex][this.uploadName] }).then((res) => {
           if (res.success) {
             this.$refs.uploadFile.perentHandleFunc(res.result)
           } else {
@@ -143,8 +311,23 @@
           })
         }
         /** 赋值给当前对应的表单文件 */
-        this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
-        this.dataList = [...this.dataList]
+        this.dataSource[this.uploadIndex][this.uploadName] = attIdList.join(',')
+        this.dataSource = [...this.dataSource]
+      },
+      submitData(callBack) {
+        for (let i = 0; i < this.dataSource.length; i++) {
+          if (!this.dataSource[i].complianceResult) {
+            this.$message.warning(this.$t('PleaseCompleteList'))
+            return
+          }
+        }
+        callBack && callBack(this.dataSource)
+      },
+      preservationData(callBack) {
+        callBack && callBack(this.dataSource)
+      },
+      accessoryFileClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
       }
     }
   }
@@ -214,7 +397,7 @@
 
   .button-text {
     height: 38px;
-    width: calc(100% - 100px);
+    width: calc(100%);
     line-height: 38px;
     background: #fff;
     border: 1px #00B3BE solid;
@@ -233,6 +416,7 @@
     margin-left: 8px;
     cursor: pointer;
   }
+
   .clauseContent-text {
     width: 100%;
     overflow: hidden;
@@ -245,4 +429,15 @@
     text-justify: inter-ideograph;
     word-break: break-all
   }
+
+</style>
+<style>
+  .box-input .ant-select-selection--single {
+    height: 38px;
+  }
+
+  .box-input .ant-select-selection__rendered {
+    line-height: 38px;
+    height: 38px;
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
index b7769855b..9a9aadbb3 100644
--- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
@@ -78,7 +78,7 @@
         isPreservation: false,
         isSendBack: false,
         isTrue: false,
-        standardContentList:[],
+        standardContentList: [],
         standardContent: [
           {
             title: this.$t('standard'),
@@ -110,7 +110,7 @@
             value: 'processBackground'
           }
         ],
-        evaluatorFeedback:[
+        evaluatorFeedback: [
           {
             title: this.$t('standard'),
             value: 'serialNumber'
@@ -137,7 +137,7 @@
             title: this.$t('processBackground'),
             value: 'processBackground'
           }
-        ],
+        ]
       }
     },
     mounted() {
@@ -174,7 +174,7 @@
       lawsTechnologyEvaluationItem() {
         getAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/list', {
           lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,
-          actiProcInstId: this.$route.query.prcId,
+          actiProcInstId: this.$route.query.prcId
         }).then((res) => {
           if (res.success) {
             this.evaluatorFeedbackList = res.result || []
@@ -206,8 +206,39 @@
       },
       preservation() {
         this.loading = true
-        this.$refs.evaluatorFeedbackRef.preservationData((res) => {
-          this.insertBatch(res, 1)
+        if (this.isTrue) {
+          this.$refs.evaluatorFeedbackListRef.preservationData((res) => {
+            this.batchUpdate(res, 1)
+          })
+        } else {
+          this.$refs.evaluatorFeedbackRef.preservationData((res) => {
+            this.insertBatch(res, 1)
+          })
+        }
+      },
+      batchUpdate(val, num) {
+        let query = {
+          actiProcInstId: this.$route.query.prcId,
+          lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,
+          itemResultList: val
+        }
+        postAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/batchUpdate', query).then((res) => {
+          if (res.success) {
+            if (num == 1) {
+              this.$message.success(this.$t('OperationSuccessful'))
+              this.loading = false
+            } else {
+              if (this.queryProject.msg) {
+                delete this.queryProject.msg
+              }
+              this.completeTask()
+            }
+          } else {
+            if (num == 1) {
+              this.loading = false
+              this.$message.warning(this.$t('operationFailed'))
+            }
+          }
         })
       },
       insertBatch(val, num) {
@@ -235,7 +266,11 @@
       },
       sendBack() {
         if (this.isTrue) {
-
+          this.$refs.evaluatorFeedbackListRef.preservationData((res) => {
+            this.loading = true
+            this.queryProject.flag = '2'
+            this.batchUpdate(res, 2)
+          })
         } else {
           this.$refs.evaluatorFeedbackRef.preservationData((res) => {
             this.loading = true
@@ -247,7 +282,16 @@
       },
       submit() {
         if (this.isTrue) {
-
+          this.$refs.evaluatorFeedbackListRef.submitData((res) => {
+            if (this.$route.query.taskDefinitionKey == 'pgrqr') {
+              this.loading = true
+              this.batchUpdate(res, 2)
+            } else {
+              this.loading = true
+              this.queryProject.flag = '1'
+              this.batchUpdate(res, 2)
+            }
+          })
         } else {
           this.$refs.evaluatorFeedbackRef.submitData((res) => {
             if (this.$route.query.taskDefinitionKey == 'pgrqr') {