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

2022-07-04 13:59:50 +08:00
parent 7d2998cd52 06877cf2c8
commit 1a813cc0dd
11 changed files with 162 additions and 51 deletions
@@ -76,7 +76,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 //	@RequiresPermissions("params:collectManifest:list")
 	public Result<?> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
 							   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-							   @RequestParam(name="pageSize", defaultValue="500") Integer pageSize,
+							   @RequestParam(name="pageSize", defaultValue="100") Integer pageSize,
 							   @RequestParam(name = "cut") String cut) {
 		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
 			paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%"));
@@ -487,7 +487,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 	 */
 	@AutoLog(value = "参数项收集清单-带入工程接口人")
 	@ApiOperation(value="参数项收集清单-带入工程接口人", notes="参数项收集清单-带入工程接口人")
-	@PostMapping(value = "/bringSdtInto")
+	@GetMapping(value = "/bringSdtInto")
 //	@RequiresPermissions("params:collectManifest:bring")
 	public Result<?> bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO) {
 		paramsCollectManifestEOService.bringSdtInto(paramsCollectManifestVO);
@@ -1,6 +1,8 @@
 package com.jero.modules.cert.report.controller;

 import com.alibaba.fastjson.JSONObject;
+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.system.base.controller.JeroController;
@@ -62,8 +64,10 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
 	@ApiOperation(value="上报库参数项-列表查询", notes="上报库参数项-列表查询")
 	@GetMapping(value = "/list")
 //	@RequiresPermissions("report:detail:list")
-	public Result<List<Map<String, Object>>> queryList(ParamsReportDetailEO paramsReportDetailEO,
-													   @RequestParam(name = "cut") String cut) {
+	public Result<?> queryList(ParamsReportDetailEO paramsReportDetailEO,
+							   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+							   @RequestParam(name="pageSize", defaultValue="100") Integer pageSize,
+							   @RequestParam(name = "cut") String cut) {
 		if (StringUtils.isNotEmpty(paramsReportDetailEO.getNioNumber())) {
 			paramsReportDetailEO.setNioNumber(paramsReportDetailEO.getNioNumber().replace("%","\\%"));
 		}
@@ -77,7 +81,8 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
 			paramsReportDetailEO.setDre(paramsReportDetailEO.getDre().replace("%","\\%"));
 		}

-		List<Map<String, Object>> list = paramsReportDetailEOService.queryList(paramsReportDetailEO, cut);
+		IPage page = new Page(pageNo, pageSize);
+		IPage list = paramsReportDetailEOService.queryList(page, paramsReportDetailEO, cut);
 		return Result.OK(list);
 	}

@@ -1,6 +1,7 @@
 package com.jero.modules.cert.report.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
 import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
 import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
@@ -19,6 +20,8 @@ public interface ParamsReportDetailEOMapper extends BaseMapper<ParamsReportDetai

    List<ParamsReportDetailEO> listInfo(@Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO);

+    IPage pageInfo(@Param("page") IPage page, @Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO);
+
    List<Map<String, Object>> listInfoForExport(@Param("idList") List<String> idList,
                                                @Param("paramsReportDetailVO") ParamsReportDetailVO paramsReportDetailVO);

@@ -91,6 +91,13 @@
        order by nio_number asc, sync_time desc
    </select>

+    <select id="pageInfo" resultMap="ParamsReportDetailEOResultMap">
+        select *
+        from params_report_detail
+        <include refid="BaseQuerySql"/>
+        order by nio_number asc, sync_time desc
+    </select>
+
    <select id="listInfoForExport" resultType="java.util.LinkedHashMap">
        select
        prd.id as id,
@@ -1,5 +1,6 @@
 package com.jero.modules.cert.report.service;

+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
 import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
@@ -19,11 +20,12 @@ public interface IParamsReportDetailEOService extends IService<ParamsReportDetai

 	/**
 	 * 列表查询
+	 * @param page
 	 * @param paramsReportDetailEO
 	 * @param cut
 	 * @return
 	 */
-	List<Map<String, Object>> queryList(ParamsReportDetailEO paramsReportDetailEO, String cut);
+	IPage queryList(IPage page, ParamsReportDetailEO paramsReportDetailEO, String cut);

 	/**
 	 * 列表表头中英文切换
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ZipUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.jero.common.constant.enums.CutEnum;
@@ -101,10 +102,11 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 	 * @return
 	 */
 	@Override
-	public List<Map<String, Object>> queryList(ParamsReportDetailEO paramsReportDetailEO, String cut) {
+	public IPage queryList(IPage page, ParamsReportDetailEO paramsReportDetailEO, String cut) {
 		String paramsManifestId = paramsReportDetailEO.getParamsManifestId();

-		List<ParamsReportDetailEO> list = paramsReportDetailEOMapper.listInfo(paramsReportDetailEO); // 查询固定列
+		IPage pageInfo = paramsReportDetailEOMapper.pageInfo(page, paramsReportDetailEO); // 查询固定列
+		List<ParamsReportDetailEO> list = pageInfo.getRecords(); // 查询固定列
 		List<ParamsReportConfigEO> paramsConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); // 查询配置列

 		// 普通数据字典
@@ -193,7 +195,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 			listMap.add(manifestMap);
 		});

-		return listMap;
+		pageInfo.setRecords(listMap);
+		return pageInfo;
 	}

 	/**
@@ -942,14 +942,14 @@ module.exports = {
  reportNotUploaded: 'Report not uploaded',
  position: 'position',
 //  认证权限状态
-  CollectionInitiated: 'Collection to be initiated',
-  handledInterface: 'To be handled by the project interface',
-  ReturnedPerson: 'Returned by project contact person',
-  completed: 'To be completed',
-  Filledreturn: 'Filled by return',
-  Submitted: 'Submitted',
-  ReturnedEngineer: 'Returned by Certification Engineer',
-  SynchronizedLibrary: 'Synchronized to the upper reporting Library',
+  CollectionInitiated: 'Wait Collect',
+  handledInterface: 'Wait Sdt',
+  ReturnedPerson: 'Sdt Back',
+  completed: 'Wait Fill',
+  Filledreturn: 'Dre Back',
+  Submitted: 'Submit',
+  ReturnedEngineer: 'Cert Back',
+  SynchronizedLibrary: 'Sync Report',
  Statusis: 'Statusis',
  toHavePermission: 'To Have Permission',
  and: 'and',
@@ -1073,4 +1073,6 @@ module.exports = {
  theProjectContactEmpty:'The project contact person of cannot be empty',
  pleaseSelectinitiatedOrRejected:'Please select the data whose list confirmation status is not initiated or rejected',
  TheEngineerAndCertification:'The regulatory engineer and Certification Engineer of cannot be empty',
+  bringInTheProjectInterface:'Bring in the project interface',
+  theCurrentListSaved:'The current list data has been submitted and cannot be temporarily saved',
 }
@@ -1077,4 +1077,6 @@ module.exports = {
  newNiONumber: 'NIO编号',
  English:'英文',
  requiredParametersEmpty:'必填参数不能为空',
+  bringInTheProjectInterface:'带入工程接口人',
+  theCurrentListSaved:'当前列表数据已全部提交，无法进行暂存',
 }
@@ -28,7 +28,8 @@
              <a-input class="box-input inputWid"
                       :disabled="item.isLock == '1' ? true: false"
                       :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       event.returnValue="false"
+                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
                       v-model="item.dataValue"/>
            </div>
            <!--         正整数  -->
@@ -179,9 +180,10 @@
            <div v-else-if="item.controlVerify == '2'">
              <a-input class="box-input inputWid"
                       :maxLength="1000"
+                       event.returnValue="false"
                       :disabled="item.isLock == '1' ? true: false"
                       :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
                       v-model="item.dataValue"/>
            </div>
            <!--         正整数  -->
@@ -274,9 +276,10 @@
            <div v-else-if="item.controlVerify == '2'">
              <a-input class="box-input inputWid"
                       :maxLength="1000"
+                       event.returnValue="false"
                       :disabled="item.isLock == '1' ? true: false"
                       :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
                       v-model="item.dataValue"/>
            </div>
            <!--         正整数  -->
@@ -381,9 +384,10 @@
            <div v-else-if="item.controlVerify == '2'">
              <a-input class="box-input inputWid"
                       :maxLength="1000"
+                       event.returnValue="false"
                       :disabled="item.isLock == '1' ? true: false"
                       :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
                       v-model="item.dataValue"/>
            </div>
            <!--         正整数  -->
@@ -544,8 +548,9 @@
              <a-input class="box-input inputWid"
                       :disabled="item.isLock == '1' ? true: false"
                       :maxLength="1000"
+                       event.returnValue="false"
                       :placeholder="$t('pleaseEnter')+$t('chinese')"
-                       onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
+                       onkeyup="(this.a=function(){this.value=this.value.replace(/[^\u4e00-\u9fa5]/g,'');}).call(this)"
                       v-model="item.dataValue"/>
            </div>
            <!--         正整数  -->
@@ -81,7 +81,7 @@
        </a-row>
      </a-form-model>
    </a-spin>
-    <div class='drawer-bootom-button'>
+    <div class='drawer-bootom-button' style="margin-top: 4px">
      <a-button style='margin-right: .8rem' @click='handleCancel'>{{ $t('cancel') }}</a-button>
      <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>{{ $t('submit') }}</a-button>
    </div>
@@ -284,9 +284,9 @@
 <style lang='less' scoped>
  @import '~@assets/less/common.less';

-  /deep/ .ant-form-explain {
-    padding-left: 62px;
-  }
+  /*/deep/ .ant-form-explain {*/
+  /*  padding-left: 62px;*/
+  /*}*/

  .diolag-area {
    .table-area {
@@ -64,6 +64,26 @@
                               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>
                  <span style="float: right;overflow: hidden;margin-right: 11px"
                        class="table-page-search-submitButtons">
               <a-col :md="6" :sm="24">
@@ -115,6 +135,10 @@
                  <a-icon type="delete"/>
                  {{$t('BatchDelete')}}
                </div>
+                <div @click="bringInTheProjectInterfaceClick" class="operator-text-title">
+                  <a-icon type="profile"/>
+                  {{$t('bringInTheProjectInterface')}}
+                </div>
              </template>
              <div class="operator-text" style="position: relative">
                <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
@@ -180,29 +204,29 @@
    <!--  冻结配置--->
    <a-modal v-model="areaVisibleFreeze" :title="$t('FreezeConfiguration')" width='600px' :footer="null">
      <a-spin :spinning="confirmLoading">
-      <a-form-model
-        class='tag-module'
-        ref='ruleForm'
-        :model='Dateline'
-        :rules='rules'
-        :label-col='labelCol'
-        :wrapper-col='wrapperCol'
-      >
-        <a-row :gutter='24'>
-          <a-col :span='24'>
-            <a-form-model-item ref='region' :label="$t('FreezeConfiguration')" prop='region'>
-              <a-select :placeholder="$t('PleaseSelect')+$t('FreezeConfiguration')" v-model="Dateline.paramsConfig"
-                        allowClear mode="multiple">
-                <a-select-option v-for="(item, key) in FreezeList" :key="key" :value="item.value">
+        <a-form-model
+          class='tag-module'
+          ref='ruleForm'
+          :model='Dateline'
+          :rules='rules'
+          :label-col='labelCol'
+          :wrapper-col='wrapperCol'
+        >
+          <a-row :gutter='24'>
+            <a-col :span='24'>
+              <a-form-model-item ref='region' :label="$t('FreezeConfiguration')" prop='region'>
+                <a-select :placeholder="$t('PleaseSelect')+$t('FreezeConfiguration')" v-model="Dateline.paramsConfig"
+                          allowClear mode="multiple">
+                  <a-select-option v-for="(item, key) in FreezeList" :key="key" :value="item.value">
                    <span style="display: inline-block;width: 100%" :title=" item.label ">
                      {{ item.label }}
                    </span>
-                </a-select-option>
-              </a-select>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+        </a-form-model>
      </a-spin>
      <div style='padding-left: 60px;color: red'>
        {{$t('Attentionfreeze')}}
@@ -387,6 +411,44 @@
      SynchronousSubmissionLibrary
    },
    data() {
+      this.statusList = [
+        {
+          value: '1',
+          name: this.$t('CollectionInitiated')
+        },
+        {
+          value: '2',
+          name: this.$t('handledInterface')
+        },
+        {
+          value: '3',
+          name: this.$t('ReturnedPerson')
+        },
+        {
+          value: '4',
+          name: this.$t('completed')
+        },
+        {
+          value: '5',
+          name: this.$t('Filledreturn')
+        },
+        {
+          value: '6',
+          name: this.$t('Submitted')
+        },
+        {
+          value: '7',
+          name: this.$t('ReturnedEngineer')
+        },
+        {
+          value: '8',
+          name: this.$t('SynchronizedLibrary')
+        },
+        {
+          value: '9',
+          name: this.$t('alteration')
+        }
+      ]
      return {
        // 认证工程师 homo
        // 工程接口人 sdt
@@ -464,7 +526,7 @@
        templatetitleId: '',
        rowId: '',
        version: 0,
-        confirmLoading:false,
+        confirmLoading: false,
        itemId: '',
        selectedRowKeysValue: [], // table列表所选得数据
        token: Vue.ls.get(ACCESS_TOKEN),
@@ -528,6 +590,22 @@
      handleCancelRoleSwitching() {
        this.visibleRoleSwitching = false
      },
+      bringInTheProjectInterfaceClick() {
+        let query = {
+          paramsManifestId: this.paramsManifest.id,
+          projectId: this.$route.query.projectId
+        }
+        this.textLoading = true
+        getAction('/params/collectManifest/bringSdtInto', query).then((res) => {
+          if (res.success) {
+            this.$message.success(this.$t('OperationSuccessful'))
+            this.$refs.CollectionTabel.getTableList()
+          } else {
+            this.$message.warning(this.$t('operationFailed'))
+          }
+          this.textLoading = false
+        })
+      },
      handleOkRoleSwitching() {
        this.$refs.ruleFormRoleSwitching.validate(valid => {
          if (valid) {
@@ -856,7 +934,7 @@
        this.Dateline = {}
        //  获取冻结配置数据
        this.confirmLoading = true
-        this.getFreeze(()=> {
+        this.getFreeze(() => {
          this.getLockedConfigIdList()
        })
      },
@@ -865,8 +943,8 @@
          { paramsManifestId: this.paramsManifest.id }).then((res) => {
          if (res.success) {
            this.Dateline.paramsConfig = res.result
-            this.Dateline = {...this.Dateline}
-          }else{
+            this.Dateline = { ...this.Dateline }
+          } else {
            this.Dateline.paramsConfig = []
          }
          this.confirmLoading = false
@@ -1094,6 +1172,10 @@
              }
            }
          })
+        } else {
+          if (num && num == 1) {
+            this.$message.warning(this.$t('theCurrentListSaved'))
+          }
        }
      },
      // 提交数据
@@ -1342,7 +1424,7 @@
                  if (res.data.success) {
                    _this.$message.success(_this.$t('OperationSuccessful'))
                    _this.selectedRowKeys = []
-                    _this.$refs.CollectionTabel.getData()
+                    // _this.$refs.CollectionTabel.getData()
                    _this.$refs.CollectionTabel.getTableList()
                    _this.textLoading = false
                  } else {