合并分支 'dev_2nd_20230213' 到 'master'

Dev 2nd 20230213

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

jero-boot/db/蔚来标准sql/dev_2nd_period.sql

@@ -197,3 +197,7 @@ MODIFY COLUMN `msg_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_c
 MODIFY COLUMN `msg_content_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '消息详情（英文）' AFTER `msg_content`,
 ADD COLUMN `msg_content_cn` text NULL COMMENT '消息内容（中文）' AFTER `msg_content_info`,
 ADD COLUMN `msg_content_info_cn` text NULL COMMENT '消息内容（中文）' AFTER `msg_content_cn`;
+
+
+-- 上报库-参数项查看页表头  责任领域更新为展示列表sql  2023-02-17 未同步生产环境
+UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 1 WHERE `id` = 'c31d68e204960c073b1fb8126a443492';

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

@@ -1430,6 +1430,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 					|| StringUtils.equals(dbFieldName,"dre")
 					|| StringUtils.equals(dbFieldName,"deadline")
 					|| StringUtils.equals(dbFieldName,"report_time")
+					|| StringUtils.equals(dbFieldName,"state")
 			){
 				map.put("sort", "true");
 			}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java

@@ -594,10 +594,23 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 				map.put("orderNum",4);
 			}else if(StringUtils.equals("description",dbFieldName)){
 				map.put("orderNum",5);
-			}else {
+			}else if(StringUtils.equals("duty_territory",dbFieldName)){
-				map.put("orderNum",orderNumStart);
+				map.put("orderNum",orderNumStart + 1);
-				orderNumStart ++;
+			}else if(StringUtils.equals("sdt",dbFieldName)){
+				map.put("orderNum",orderNumStart + 2);
+			}else if(StringUtils.equals("dre",dbFieldName)){
+				map.put("orderNum",orderNumStart + 3);
+			}else if(StringUtils.equals("version",dbFieldName)){
+				map.put("orderNum",orderNumStart + 4);
+			}else if(StringUtils.equals("sync_time",dbFieldName)){
+				map.put("orderNum",orderNumStart + 5);
+			}else if(StringUtils.equals("remarks",dbFieldName)){
+				map.put("orderNum",orderNumStart + 6);
 			}
+//			else {
+//				map.put("orderNum",orderNumStart);
+//				orderNumStart ++;
+//			}
 
 			if(StringUtils.equals(dbFieldName,"nio_number")
 					||StringUtils.equals(dbFieldName,"sdt")
@@ -618,7 +631,7 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 			map.put("db_field_txt","Operator");
 		}
 		map.put("click4", true);
-		map.put("orderNum", orderNumStart);
+		map.put("orderNum", orderNumStart + 7);
 		list.add(map);
 
 		list = list.stream().sorted(

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -2216,7 +2216,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         //文档动态,  文档库中新增了标准XXXX  homeDocumentDynamicEOService
         //The standard GB 7258-2017 Technical specifications  has been added to the document library.
         String msgContentCn = "文档库中新增了"+categoryCn+" "+serialNumber+" "+title;
-        String msgContentInfoCn = "文档中库新增了"+hrefCn;
+        String msgContentInfoCn = "文档库中新增了"+hrefCn;
         HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO();
         homeDocumentDynamicEO.setMsgContent("The " + category + " " + serialNumber + " " + titleEn + " has been added to the document library.");
         homeDocumentDynamicEO.setMsgContentInfo("The " + href + " has been added to the document library.");

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java

@@ -168,15 +168,15 @@ public class PrehomoJob implements Job {
                                         }
                                     }
                                     //如果prehomo - 结束日期是一周后的日期
-                                    if(StringUtils.equals(oneWeekLaterDaysStr,sdf.format(projectLawsInventoryEO.getDesignDueDate()))){
+                                    if(StringUtils.equals(oneWeekLaterDaysStr,sdf.format(projectLawsInventoryEO.getPrehomoDueDate()))){
-                                        if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())){
+                                        if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())){
-                                            oneWeeksLaterUserIdList.add(projectLawsInventoryEO.getDesignDutyId());
+                                            oneWeeksLaterUserIdList.add(projectLawsInventoryEO.getPrehomoDutyId());
                                         }
                                     }
                                     //如果prehomo - 逾期后每天通知
-                                    if (!StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getPrehomoDueDate()))&&projectLawsInventoryEO.getDesignDueDate().before(currentDate)) {
+                                    if (!StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getPrehomoDueDate()))&&projectLawsInventoryEO.getPrehomoDueDate().before(currentDate)) {
-                                        if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())){
+                                        if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())){
-                                            dueUserIdList.add(projectLawsInventoryEO.getDesignDutyId());
+                                            dueUserIdList.add(projectLawsInventoryEO.getPrehomoDutyId());
                                         }
                                     }
                                 }
@@ -202,12 +202,12 @@ public class PrehomoJob implements Job {
                                     feishuMsgVo.setCnContentLower("项目: " + projectName +
                                             "\n法规: " + LAW_CN +
                                             "\n发起人: 系统通知"+
-                                            "\n截止时间: "+ sdf.format(projectLawsInventoryEO.getDesignDueDate()));
+                                            "\n截止时间: "+ sdf.format(projectLawsInventoryEO.getPrehomoDueDate()));
                                     feishuMsgVo.setEnContentUpper("Hello! Your task is overdue. Please check and address it ASAP");
                                     feishuMsgVo.setEnContentLower("Project: " + projectName +
                                             "\nRegulation No: " + LAW_EN +
                                             "\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()+
-                                            "\nDue Date: "+ sdf.format(projectLawsInventoryEO.getDesignDueDate()));
+                                            "\nDue Date: "+ sdf.format(projectLawsInventoryEO.getPrehomoDueDate()));
                                     feishuMsgVo.setUrl(hrefFeishu);
                                     feishuMsgVo.setColor(MsgColorEnum.YELLOW.getValue()); // 颜色
                                     feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java

@@ -201,12 +201,12 @@ public class VerifyComplianceJob implements Job {
                                     feishuMsgVo.setCnContentLower("项目: " + projectName +
                                             "\n法规: " + LAW_CN +
                                             "\n发起人: 系统通知"+
-                                            "\n截止时间: "+ sdf.format(projectLawsInventoryEO.getDesignDueDate()));
+                                            "\n截止时间: "+ sdf.format(projectLawsInventoryEO.getVerifyDueDate()));
                                     feishuMsgVo.setEnContentUpper("Hello! Your task is overdue. Please check and address it ASAP");
                                     feishuMsgVo.setEnContentLower("Project: " + projectName +
                                             "\nRegulation No: " + LAW_EN +
                                             "\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName()+
-                                            "\nDue Date: "+ sdf.format(projectLawsInventoryEO.getDesignDueDate()));
+                                            "\nDue Date: "+ sdf.format(projectLawsInventoryEO.getVerifyDueDate()));
                                     feishuMsgVo.setUrl(hrefFeishu);
                                     feishuMsgVo.setColor(MsgColorEnum.YELLOW.getValue()); // 颜色
                                     feishuService.sendCard(thirdIdList.toArray(new String[thirdIdList.size()]), feishuMsgVo);

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

@@ -3206,12 +3206,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			cnContentLower = "项目: " + PRN +
 					"\n法规: " + LAW_CN +
 					"\n发起人: " + sysUser.getUsername() +
-					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate());
+					"\n截止时间: " + sdf.format(projectLawsInventoryEO.getPrehomoDueDate());
             enContentUpper = "Hello! "+ sysUser.getUsername() +" has completed the task. Please check and review it";
             enContentLower = "Project: " + PRN +
                     "\nRegulation No: " + LAW_EN +
                     "\nInitiator: " + sysUser.getUsername() +
-                    "\nDue Date: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate());
+                    "\nDue Date: " + sdf.format(projectLawsInventoryEO.getPrehomoDueDate());
             color = MsgColorEnum.GREEN.getValue();
 
 			//feishuMsgVo.setAssignee(sysUser.getUsername());

jero-web/src/assets/less/common.less

@@ -113,14 +113,14 @@
   right: 0;
   top: 0;
   height: 100%;
-  width: 1px;
+  width: 5px;
   z-index: 1;
-  border-left: 1px #e8e8e8 solid;
+  border-right: 1px #e8e8e8 solid;
 }
 .nio-drag-handler:hover,
 .nio-drag-handler:focus{
   cursor: col-resize!important;
-  border: 1px solid #0bd9d9!important;
+  border-right: 2px solid #0bd9d9!important;
 }
 
 .ant-table-column-title {

jero-web/src/common/lang/en-us.js

@@ -1378,5 +1378,9 @@ module.exports = {
   columnforced:'Confirm a forced retraction?',
   customize:'List setting',
   customColumn:'Custom column',
-
+  afterdate:'In... After the date',
+  afterdatein:'In... After date (inclusive)',
+  beforedate:'In... Before  date',
+  beforedatein:'In... Before  date (inclusive)',
+  inRecentMonthsin6:'Within 6 months (implemented)',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1479,4 +1479,9 @@ module.exports = {
   contactTheFounder:'联系作者',
   customize:'列表设置',
   customColumn:'自定义列',
+  afterdate:'在...日期之后',
+  afterdatein:'在...日期之后（包含）',
+  beforedate:'在...日期之前',
+  beforedatein:'在...日期之前（包含）',
+  inRecentMonthsin6:'近6个月内（已实施）',
 }

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

@@ -96,7 +96,7 @@
                 <a-select :placeholder="$t('matchRules')" :value="item.rule"
                           :getPopupContainer="node=>node.parentNode" @change="handleRuleChange(item,$event)">
                    <!--                  等于-->
-                  <a-select-option value="eq">{{$t('beEqualTo')}}</a-select-option>
+                  <a-select-option v-if="item.type != 'date'" value="eq">{{$t('beEqualTo')}}</a-select-option>
                    <!--                  包含-->
                   <a-select-option v-if="item.type != 'date'" value="like">{{$t('contain')}}</a-select-option>
                   <!--                  以..开始-->
@@ -106,15 +106,15 @@
                   <!--                  在...中-->
                   <a-select-option v-if="item.type == 'string'" value="in">{{$t('in')}}</a-select-option>
                   <!--                  不等于-->
-                  <a-select-option value="ne">{{$t('notEqual')}}</a-select-option>
+                  <a-select-option v-if="item.type != 'date'" value="ne">{{$t('notEqual')}}</a-select-option>
-                  <!--                  大于-->
+                  <!--                  在...日期之后-->
-                  <a-select-option v-if="item.type == 'date'" value="gt">{{$t('granter')}}</a-select-option>
+                  <a-select-option v-if="item.type == 'date'" value="gt">{{$t('afterdate')}}</a-select-option>
-                  <!--                  大于等于-->
+                  <!--                  在...日期之后（包含）-->
-                  <a-select-option v-if="item.type == 'date'" value="ge">{{$t('greaterOrEqual')}}</a-select-option>
+                  <a-select-option v-if="item.type == 'date'" value="ge" :title="$t('afterdatein')">{{$t('afterdatein')}}</a-select-option>
-                  <!--                  小于-->
+                  <!--                  在...日期之前-->
-                  <a-select-option v-if="item.type == 'date'" value="lt">{{$t('less')}}</a-select-option>
+                  <a-select-option v-if="item.type == 'date'" value="lt">{{$t('beforedate')}}</a-select-option>
-                  <!--                  小于等于-->
+                  <!--                  在...日期之前（包含）-->
-                  <a-select-option v-if="item.type == 'date'" value="le">{{$t('lessOrEqual')}}</a-select-option>
+                  <a-select-option v-if="item.type == 'date'" value="le" :title="$t('beforedatein')">{{$t('beforedatein')}}</a-select-option>
                 </a-select>
               </a-col>
 

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

@@ -231,7 +231,11 @@
           // }
           let startTime = moment(new Date()).format('YYYY-MM-DD')
           let endTime = this.getNowdate()
-          this.queryParam['WarnTime'] = [startTime, endTime]
+          if(this.queryParam['WarnTimeText'] == '5'){
+            this.queryParam['WarnTime'] = [endTime, startTime]
+          }else{
+            this.queryParam['WarnTime'] = [startTime, endTime]
+          }
           this.queryParam = { ...this.queryParam }
         }
         eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
@@ -288,30 +292,69 @@
         } else if (this.queryParam['WarnTimeText'] == '4') {
           monthData = 25
           yearData = 2
+        }else if (this.queryParam['WarnTimeText'] == '5') {
+          monthData = 7
+          yearData = -1
         }
-        var date_now = new Date()//获取当前时间
+        if(this.queryParam['WarnTimeText'] == '5'){
-        var year = date_now.getFullYear()//获取当前时间的年份
+          var time = new Date();
-        var month = date_now.getMonth()//获取当前时间的月份
+          time.setTime(time.getTime());
-        var day = date_now.getDate()//获取当前时间的日
+          var s2 = time.getFullYear()+"-" + (time.getMonth()+1) + "-" + time.getDate();
-        var days = new Date(year, month, 0)//将获取到的年月赋值给days
+          var monthNum=6; //要减的月数(6)自己定义
-        days = days.getDate()//获取当前年月的日
+          var dateArr = s2.split('-'); //s2当前时间
-        var year2 = year
+          var year = dateArr[0]; //获取当前日期的年份
-        var month2 = parseInt(month + monthData)//获取当前月份的1一个月以后的月份
+          var month = dateArr[1]; //获取当前日期的月份
-        if (month2 > 12) {
+          var day = dateArr[2]; //获取当前日期的日
-          year2 = parseInt(year2) + yearData
+          var days = new Date(year, month, 0);
-          month2 = parseInt(month2) % 12
+          days = days.getDate(); //获取当前日期中月的天数
-        }//考虑到12月要是获取一个月以后，就是一月，年份需要加一 ，一年没有13月，所以%12，取得来年1月
+          var year2;
-        var day2 = day
+          if(month <6){
-        var days2 = new Date(year2, month2, 0)
+            year2 = year -1;
-        days2 = days2.getDate()
+          }else{
-        if (day2 > days2) {
+            year2 = year;
-          day2 = days2
+          }
-        }//获取了当前年份的日和6个月以后的日，为的就是判断如果前一个月是有31号，后一个月没有，就将一个月以后的日期取到，赋值给day2
+          var month2 = parseInt(month) - monthNum;
-        if (month2 < 10) {
+          if (month2 <=0) {
-          month2 = '0' + month2
+            year2 = parseInt(year2) - parseInt(month2 / 12 == 0 ? 1 : parseInt(month2) / 12);
+            month2 = 12 - (Math.abs(month2) % 12);
+          }
+          var day2 = day;
+          var days2 = new Date(year2, month2, 0);
+          days2 = days2.getDate();
+          if (day2 > days2) {
+            day2 = days2;
+          }
+          if (month2 < 10) {
+            month2 = '0' + month2;
+          }
+          var t2 = year2 + '-' + month2 + '-' + day2;
+          return t2
+        }else{
+          var date_now = new Date()//获取当前时间
+          var year = date_now.getFullYear()//获取当前时间的年份
+          var month = date_now.getMonth()//获取当前时间的月份
+          var day = date_now.getDate()//获取当前时间的日
+          var days = new Date(year, month, 0)//将获取到的年月赋值给days
+          days = days.getDate()//获取当前年月的日
+          var year2 = year
+          var month2 = parseInt(month + monthData)//获取当前月份的1一个月以后的月份
+          if (month2 > 12) {
+            year2 = parseInt(year2) + yearData
+            month2 = parseInt(month2) % 12
+          }//考虑到12月要是获取一个月以后，就是一月，年份需要加一 ，一年没有13月，所以%12，取得来年1月
+          var day2 = day
+          var days2 = new Date(year2, month2, 0)
+          days2 = days2.getDate()
+          if (day2 > days2) {
+            day2 = days2
+          }//获取了当前年份的日和6个月以后的日，为的就是判断如果前一个月是有31号，后一个月没有，就将一个月以后的日期取到，赋值给day2
+          if (month2 < 10) {
+            month2 = '0' + month2
+          }
+          var time = year2 + '-' + month2 + '-' + day2
+          return time
         }
-        var time = year2 + '-' + month2 + '-' + day2
+
-        return time
       },
       dateChange(item) {
         this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD')

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

@@ -143,6 +143,10 @@
                 value: '2',
                 name: this.$t('inRecentMonths6')
               },
+              {
+                value: '5',
+                name: this.$t('inRecentMonthsin6')
+              },
               {
                 value: '3',
                 name: this.$t('inRecentYear1')
@@ -150,7 +154,8 @@
               {
                 value: '4',
                 name: this.$t('inRecentYear2')
-              }
+              },
+
             ]
           }
         ],