WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'dev_2nd_20230213' 到 'master'

Browse Source 
Dev 2nd 20230213

查看合并请求 laws-nio/laws-weilai!294
This commit is contained in:
高嵩
2023-02-27 18:11:03 +08:00
parent c4522229e1 3dedbf3de1
commit 97334963cf
7 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+9
View File
@@ -201,3 +201,12 @@ ADD COLUMN `msg_content_info_cn` text NULL COMMENT '消息内容（中文）' AF
-- 上报库-参数项查看页表头 责任领域更新为展示列表sql 2023-02-17 未同步生产环境
UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 1 WHERE `id` = 'c31d68e204960c073b1fb8126a443492';
-- 任务清单-初始化 认证进度状态sql 2023-02-20 未同步生产环境
UPDATE `laws_weilai`.`project_task_inventory`
SET `certification_progress` = 'Not start'
WHERE
`id` IN ( select temp.temp_id from (
SELECT id as temp_id FROM `laws_weilai`.`project_task_inventory` WHERE certification_progress IS NULL
) temp
);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+2 -2
View File
@@ -2310,9 +2310,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
exportFile(dataList,fileInfos);
String excelName = "";
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
excelName = "虚拟清单.xlsx";
excelName = baseList.get(0).getName() + " 虚拟清单.xlsx";
}else{
excelName = "Virtual list.xlsx";
excelName = baseList.get(0).getName() + " Virtual list.xlsx";
}
//excel
OutputStream excelOS = new FileOutputStream(path + File.separator + excelName);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+5
View File
@@ -348,6 +348,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectTaskInventoryEO.setId(projectTaskInventoryId);
projectTaskInventoryEO.setProjectLawsInventoryId(lawsInventory.getId());
projectTaskInventoryEO.setStandId(lawsInventory.getStandId());
projectTaskInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
projectTaskInventoryEOList.add(projectTaskInventoryEO);
});
@@ -420,6 +421,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectTaskInventoryEO.setId(projectTaskInventoryId);
projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventoryId);
projectTaskInventoryEO.setStandId(standId);
projectTaskInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
projectTaskInventoryEOList.add(projectTaskInventoryEO);
//添加权限
@@ -3450,6 +3452,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectTaskInventoryEO.setId(projectTaskInventoryId);
projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventoryId);
projectTaskInventoryEO.setStandId(projectLawsInventoryEO.getStandId());
projectTaskInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
projectTaskInventoryEOList.add(projectTaskInventoryEO);
}
this.saveBatch(projectLawsInventoryEOList);
@@ -5743,6 +5746,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectTaskInventoryEO.setId(projectTaskInventoryId);
projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventory.getId());
projectTaskInventoryEO.setStandId(projectLawsInventory.getStandId());
projectTaskInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
projectTaskInventoryEOList.add(projectTaskInventoryEO);
});
/*idList.forEach(id -> {
@@ -5837,6 +5841,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectTaskInventoryEO.setId(projectTaskInventoryId);
projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId());
projectLawsInventoryEO.setStandId(projectLawsInventoryEO.getStandId());
projectTaskInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
projectTaskInventoryEOList.add(projectTaskInventoryEO);
//设置权限
if (ObjectUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+2 -1
View File
@@ -747,7 +747,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
}
if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){
projectLibraryBase.setProjectName(projectLibraryBase.getProjectName()
+ "-" + projectLibraryBase.getYearName());
+ "-" + projectLibraryBase.getYearName()
+ "-" + targetMarket);
// projectLibraryBase.setProjectName(projectLibraryBase.getProjectName()
// + "-" + projectLibraryBase.getYearName()
// + "-" + targetMarket
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+1
View File
@@ -1807,6 +1807,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
projectTaskInventoryEO.setStandId(lawsInventoryEO.getStandId());
projectTaskInventoryEO.setCreateBy("admin");
projectTaskInventoryEO.setSysOrgCode("A01");
projectTaskInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
if(CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOS)){
//获取当前法规清单数据 启动的符合性流程数据
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+7 -2
View File
@@ -463,7 +463,7 @@
</span>
<!-- 分配填写人 -->
<span v-else-if='jurisdiction === "SDTFPTXRHOMO"' class="text-wraning">
'{{$t('completed')}}'
'{{$t('completed')}}''{{$t('or')}}'{{$t('Filledreturn')}}''{{$t('or')}}'{{$t('ReturnedEngineer')}}'
</span>
<!-- 引用参数-->
<span v-else-if='jurisdiction === "DREYYCS"' class="text-wraning">
@@ -1285,7 +1285,7 @@
} else {
this.selectedRowKeysValue.forEach((item, index) => {
console.log(item.state)
if (item.state !== '待填写' && item.state !== 'To be filled') {
if (item.state !== '待填写' && item.state !== 'To be filled' && item.state !== '填写人退回' && item.state !== 'Rejected by the applicant' && item.state !== '认证工程师退回' && item.state !== 'Rejected by homo engineer') {
this.NotSelectedRowKeysValue.push(item)
flag = 0
}
@@ -1774,15 +1774,20 @@
this.returnData()
} else if (homoJurisdictionReturn == 0) {
this.visibleoperationFailed = true
this.returnData()
}
},
// 退回
returnData() {
// todo 退回没有选择数据
let _array = []
this.selectedRowKeysValue = this.selectedRowKeysValue.filter(item => item.state == '已提交' || item.state == 'Submitted')
this.selectedRowKeysValue.forEach((item, index) => {
_array.push(item.id)
})
if(_array.length == 0){
return
}
let _this = this
let param = { ids: _array.join(','),
currentPersonRole: this.currentPersonRole,
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+2 -6
View File
@@ -1950,14 +1950,10 @@ export default {
this.columnsAll = this.column
}
this.columnsAll.forEach((item, index) => {
if (item.title != '设计符合性确认' && item.title != 'Pre-Homo确认' && item.title != '验证符合性确认') {
if (item.title != '设计符合性确认' && item.title != 'Pre-Homo确认' && item.title != '验证符合性确认' && item.title != '操作') {
item.width = 180
item.align = 'left'
if (item.title == '操作') {
item.scopedSlots = {
customRender: 'operationOne'
}
} else if (item.title == '编号') {
if (item.title == '编号') {
item.sorter = true
item.scopedSlots = {
customRender: 'standard'