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

67723 法规清单-定版修改。

Browse Source
This commit is contained in:
wangzhijiang
2023-03-31 16:34:46 +08:00
parent d4fac643cf
commit 690cb5afae
4 changed files with 84 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+13 -1
View File
@@ -436,4 +436,16 @@ ALTER TABLE `project_task_planning`
-- 项目库-认证清单-认证目录 说明字段长度修改 2023-3-30 未同步生产环境
ALTER TABLE `project_certification_directory`
MODIFY COLUMN `explain_info` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '说明' AFTER `detection_report_location`;
MODIFY COLUMN `explain_info` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '说明' AFTER `detection_report_location`;
-- 项目库-法规清单-定版表增加字段 2023-3-30 未同步生产环境
ALTER TABLE `project_version_info`
MODIFY COLUMN `inventory_affirm_status` varchar(100) CHARACTER SET utf32 NULL DEFAULT NULL COMMENT '清单确认状态' AFTER `task_affirm_status`,
ADD COLUMN `design_flow_status` varchar(255) NULL COMMENT '设计符合性确认-流程状态' AFTER `inventory_affirm_status`,
ADD COLUMN `verify_flow_status` varchar(255) NULL COMMENT '验证符合性确认-流程状态' AFTER `design_flow_status`;
-- 项目库-法规清单-定版表增加字段 2023-3-30 未同步生产环境
ALTER TABLE `project_version_info`
ADD COLUMN `project_laws_inventory_id` varchar(255) NULL COMMENT '法规清单数据id' AFTER `verify_flow_status`;
ALTER TABLE `project_version_info`
ADD COLUMN `applicable_supplement` varchar(255) NULL COMMENT '适用增补件' AFTER `project_laws_inventory_id`;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectVersionInfoEO.java
+30 -2
View File
@@ -271,7 +271,7 @@ public class ProjectVersionInfoEO implements Serializable {
/**设计符合性确认-责任人名称*/
@TableField(exist = false)
private String designDutyName;
private String designDutyIdName;
/**prehomo确认-发起人名称*/
@@ -288,7 +288,7 @@ public class ProjectVersionInfoEO implements Serializable {
/**验证符合性确认-责任人名称*/
@TableField(exist = false)
private String verifyDutyName;
private String verifyDutyIdName;
@@ -329,4 +329,32 @@ public class ProjectVersionInfoEO implements Serializable {
private String verifyDeliverableTemplateName;
/**设计符合性确认-流程状态*/
@ApiModelProperty(value = "设计符合性确认-流程状态")
private String designFlowStatus;
@TableField(exist = false)
@Excel(name = "流程状态", width = 20,groupName = "设计符合性确认")
private String designFlowStatusName;
/**验证符合性确认-流程状态*/
@ApiModelProperty(value = "验证符合性确认-流程状态")
private String verifyFlowStatus;
@TableField(exist = false)
@Excel(name = "流程状态", width = 20,groupName = "验证符合性确认")
private String verifyFlowStatusName;
/**验证符合性确认-流程实例id*/
@TableField(exist = false)
private String verifyPId;
/**设计符合性确认-流程实例id*/
@TableField(exist = false)
private String designPId;
@ApiModelProperty(value = "法规清单数据id")
private String projectLawsInventoryId;
/**适用增补件*/
@ApiModelProperty(value = "适用增补件")
private java.lang.String applicableSupplement;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectHistoryVersionsEOServiceImpl.java
+1
View File
@@ -56,6 +56,7 @@ public class ProjectHistoryVersionsEOServiceImpl extends ServiceImpl<ProjectHist
BeanUtils.copyProperties(projectLawsInventoryEO, projectVersionInfoEO);
projectVersionInfoEO.setId(UUID.randomUUID().toString().replace("-", ""));
projectVersionInfoEO.setHistoryVersionsId(projectHistoryVersionsEO.getId());
projectVersionInfoEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId());
projectVersionInfoEOS.add(projectVersionInfoEO);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectVersionInfoEOServiceImpl.java
+40 -2
View File
@@ -7,6 +7,7 @@ import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import com.jero.modules.project.entity.ProjectVersionInfoEO;
import com.jero.modules.project.enums.ComplianceFlowStatusEnum;
import com.jero.modules.project.enums.InventoryAffirmStatusEnum;
import com.jero.modules.project.mapper.ProjectVersionInfoEOMapper;
import com.jero.modules.project.service.IProjectVersionInfoEOService;
@@ -14,6 +15,9 @@ import com.jero.modules.system.entity.SysCategory;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.mapper.SysUserMapper;
import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
import com.jero.modules.wkflow.enums.FlowTypeEnum;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +43,9 @@ public class ProjectVersionInfoEOServiceImpl extends ServiceImpl<ProjectVersionI
private SysCategoryServiceImpl sysCategoryService;
@Autowired
private SysUserMapper sysUserMapper;
@Autowired
private IProcessInfoDetailEOService processInfoDetailEOService;
/**
* 保存
*
@@ -208,6 +215,37 @@ public class ProjectVersionInfoEOServiceImpl extends ServiceImpl<ProjectVersionI
deliverableList.addAll(Arrays.asList(projectVersionInfoEO.getVerifyDeliverableTemplate().split(",")));
}
// 处理符合性流程状态。
if(StringUtils.isNotEmpty(projectVersionInfoEO.getDesignFlowStatus())){
String designFlowStatusName = ComplianceFlowStatusEnum.getTextByValue(projectVersionInfoEO.getDesignFlowStatus(), cut);
projectVersionInfoEO.setDesignFlowStatusName(designFlowStatusName);
}
if(StringUtils.isNotEmpty(projectVersionInfoEO.getVerifyFlowStatus())){
String verifyFlowStatusName = ComplianceFlowStatusEnum.getTextByValue(projectVersionInfoEO.getVerifyFlowStatus(), cut);
projectVersionInfoEO.setVerifyFlowStatusName(verifyFlowStatusName);
}
// 返回符合性流程的流程实例id
if(!StringUtils.equals(projectVersionInfoEO.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
||!StringUtils.equals(projectVersionInfoEO.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())){
QueryWrapper<ProcessInfoDetailEO> processInfoDetailEOQueryWrapper = new QueryWrapper<>();
processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,projectVersionInfoEO.getProjectLawsInventoryId());
processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType, FlowTypeEnum.YZFHXSCLC.getValue());
List<ProcessInfoDetailEO> processInfoDetailEOS = this.processInfoDetailEOService.list(processInfoDetailEOQueryWrapper);
if(CollectionUtils.isNotEmpty(processInfoDetailEOS)){
projectVersionInfoEO.setVerifyPId(processInfoDetailEOS.get(0).getActiProcInstId());
}
}
if(!StringUtils.equals(projectVersionInfoEO.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
||!StringUtils.equals(projectVersionInfoEO.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())){
QueryWrapper<ProcessInfoDetailEO> processInfoDetailEOQueryWrapper = new QueryWrapper<>();
processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,projectVersionInfoEO.getProjectLawsInventoryId());
processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.SJFHXSHLC.getValue());
List<ProcessInfoDetailEO> processInfoDetailEOS = this.processInfoDetailEOService.list(processInfoDetailEOQueryWrapper);
if(CollectionUtils.isNotEmpty(processInfoDetailEOS)){
projectVersionInfoEO.setDesignPId(processInfoDetailEOS.get(0).getActiProcInstId());
}
}
}
List<SysUser> sysUsers = new ArrayList<>();
@@ -259,7 +297,7 @@ public class ProjectVersionInfoEOServiceImpl extends ServiceImpl<ProjectVersionI
if(StringUtils.isNotEmpty(designDutyId)){
String designDutyName = sysUsers.stream().filter(e -> designDutyId.equals(e.getId())).
map(SysUser::getUsername).collect(Collectors.joining(","));
projectVersionInfoEO.setDesignDutyName(designDutyName);
projectVersionInfoEO.setDesignDutyIdName(designDutyName);
}
//prehomo确认
@@ -291,7 +329,7 @@ public class ProjectVersionInfoEOServiceImpl extends ServiceImpl<ProjectVersionI
if(StringUtils.isNotEmpty(verifyDutyId)){
String verifyDutyName = sysUsers.stream().filter(e -> verifyDutyId.equals(e.getId())).
map(SysUser::getUsername).collect(Collectors.joining(","));
projectVersionInfoEO.setVerifyDutyName(verifyDutyName);
projectVersionInfoEO.setVerifyDutyIdName(verifyDutyName);
}
}