合并分支 'fix_20230508' 到 'master'

Fix 20230508

查看合并请求 laws-nio/laws-weilai!323

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java

@@ -128,8 +128,8 @@ public class SysUserController {
      * @return
      */
     @ApiOperation(value = "用户管理-分页查询")
-    @RequiresPermissions("sys:user:list")
+//    @RequiresPermissions("sys:user:list")
-    @PermissionData(pageComponent = "system/UserList")
+//    @PermissionData(pageComponent = "system/UserList")
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     public Result<IPage<SysUser>> queryPageList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {

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

@@ -226,6 +226,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
                         target.setControlValues(source.getControlValues());
                         target.setControlVerify(source.getControlVerify());
                         target.setFileTemplateConnectId(source.getFileTemplateConnectId());
+                        break;
                     }
                 }
                 if(!isHave){
@@ -248,6 +249,21 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
                 }
             }
             paramsCollectManifestEOService.saveOrUpdateBatch(paramsCollectManifestEOList);
+
+            List<String> delList = new ArrayList<>();
+            for (ParamsCollectManifestEO target : paramsCollectManifestEOList) {
+                boolean isHave = false;
+                for (ParamsInfoPublishEO source : paramsInfoPublishEOList) {
+                    if (target.getNioNumber().equals(source.getNioNumber())) {
+                        isHave = true;
+                        break;
+                    }
+                }
+                if(!isHave){
+                    delList.add(target.getId());
+                }
+            }
+            paramsCollectManifestEOService.deleteByIds(delList);
         }catch (Exception e){
             e.printStackTrace();
             return false;

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

@@ -259,6 +259,10 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		String projectId = UUID.randomUUID().toString().replace("-", "");
 		//主表中添加数据
 		ProjectLibraryBase projectLibraryBaseTemp = this.getById(id);
+		projectLibraryBaseTemp.setCreateBy(null);
+		projectLibraryBaseTemp.setCreateTime(null);
+		projectLibraryBaseTemp.setUpdateBy(null);
+		projectLibraryBaseTemp.setUpdateTime(null);
 		projectLibraryBaseTemp.setId(projectId);
 		projectLibraryBaseTemp.setParentId(id);
 		projectLibraryBaseTemp.setProjectVersion(projectLibraryBase.getProjectVersion());

jero-web/src/views/otamanagement/upgradeactivity/index.vue

@@ -255,6 +255,13 @@ export default {
           ellipsis: true,
           width: 170
         },
+        {
+          title: this.$t('taskname'),
+          align: 'left',
+          dataIndex: 'rwmc',
+          ellipsis: true,
+          width: 170
+        },
         {
           title: this.$t('noticebatch'),
           align: 'left',

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue

@@ -105,15 +105,24 @@
       </tr>
       <tr>
         <td colspan="2" align="left" height="50px">{{$t('upgradefailureorinterruption')}}</td>
-        <td height="50px" style='position: relative'>
+        <td :height="this.flag == true ? '100px' : '50px'" style='position: relative'>
-          <j-multi-select-tag class="box-input1"
+            <div>
-                              v-model="form.aqjz"
+              <j-multi-select-tag class="box-input1"
-                              style='margin-top: 2px'
+                                  v-model="form.aqjz"
-                              :disabled="disable"
+                                  style='margin-top: 2px'
-                              dictCode="upgrade_failed"
+                                  :disabled="disable"
-                              :placeholder="$t('PleaseSelect')"
+                                  dictCode="upgrade_failed"
-                              :type="'select'"
+                                  :placeholder="$t('PleaseSelect')"
-                              :triggerChange="false"/>
+                                  :type="'select'"
+                                  @changeQuery='changeQuery'
+                                  :triggerChange="false"/>
+            </div>
+            <div v-if='flag'>
+              <a-input class="box-input2"
+                       v-model="form.wbk"
+                       :title="form.wbk ? form.wbk : $t('PleaseEnter')"
+                       :placeholder="$t('PleaseEnter')"></a-input>
+            </div>
         </td>
       </tr>
       <tr>
@@ -190,6 +199,7 @@ export default {
         exportData: '/ota/otaBaSjSjyxpg/exportData',
         importZipUrl: '/ota/otaBaSjSjyxpg/importData?otaId=' + localStorage.getItem('otaId'),//导入
       },
+      flag:false,
       loading: false,
       disable:false,
       columns: [
@@ -379,18 +389,14 @@ this.$forceUpdate()
             if(res.result.zxsj==null){
               res.result.zxsj=undefined
             }
-            this.form=res.result==null ? {
+            this.form=res.result==null ? { sjmd:'' } : res.result
-        sjmd:'',
-        // fhgd:1,
-        // zdjsxg:2,
-        // sfyxaq:2,
-        // yhqr:1,
-        // aqkkx:1,
-        // zxsj:2,
-        // aqjz:'2',
-        // sjbcs:'3,4'
-      } : res.result
            }
+          console.log(this.form.aqjz)
+          if(this.form.aqjz == '2'){
+            this.flag = true
+          }else{
+            this.flag = false
+          }
         })
     },
     save(){
@@ -417,6 +423,13 @@ this.$forceUpdate()
       this.save()
       this.$emit('safetyPrecautionsdown')
     },
+    changeQuery(val) {
+      if(val.indexOf('将车辆置于安全状态') != -1 || val.indexOf('Put the vehicle in a safe position') != -1){
+        this.flag = true
+      }else{
+        this.flag = false
+      }
+    },
   }
 }
 </script>
@@ -446,13 +459,21 @@ this.$forceUpdate()
   margin-left: 40px;
 }
 .box-input1 {
-  display: inline-block;
+  //display: inline-block;
   width: calc(100% - 80px);
   position: absolute;
   height: 38px;
   margin-left: 40px;
   top: 4px;
 }
+.box-input2 {
+  //display: inline-block;
+  width: calc(100% - 80px);
+  position: absolute;
+  height: 38px;
+  margin-left: 40px;
+  top: 50px;
+}
 ::v-deep .ant-table-row-cell-ellipsis .ant-table-column-title {
   white-space: pre-wrap!important;
 }

jero-web/src/views/otamanagement/upgradeactivityrecord/index.vue

@@ -59,7 +59,7 @@
                 <a-input
                   class="box-input"
                   :placeholder="$t('PleaseEnter')+$t('contentsearch')"
-                  v-model='queryParam.realname' />
+                  v-model='queryParam.context' />
               </div>
             </a-col>
             <a-col :md="12" :sm="8">

jero-web/src/views/otamanagement/vehicleinformation/index.vue

@@ -59,7 +59,7 @@
                 <a-input
                   class="box-input"
                   :placeholder="$t('PleaseEnter')+$t('contentsearch')"
-                  v-model='queryParam.realname' />
+                  v-model='queryParam.context' />
               </div>
             </a-col>
             <a-col :md="12" :sm="8">