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

修改UAT问题清单，122条，法规工程师复制，将流程状态设置为 待校核 -> 对应现在的 任务待发起

Browse Source
This commit is contained in:
wangzhijiang
2023-04-17 16:32:39 +08:00
parent a05015e730
commit 6a1b044acd
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
+3 -2
View File
@@ -272,9 +272,10 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
@ApiOperation(value="复制", notes="复制") @ApiOperation(value="复制", notes="复制")
@GetMapping(value = "/copyInfoByIds") @GetMapping(value = "/copyInfoByIds")
public Result<?> copyInfoByIds(@RequestParam(name="ids",required=true) String ids, public Result<?> copyInfoByIds(@RequestParam(name="ids",required=true) String ids,
@RequestParam(name="cut",required=true) String cut) { @RequestParam(name="cut",required=true) String cut,
@RequestParam(name="operateType",required=true) String operateType) {
try { try {
projectLawsInventoryEOService.copyInfoByIds(ids); projectLawsInventoryEOService.copyInfoByIds(ids,operateType);
} catch (Exception e) { } catch (Exception e) {
if(CutEnum.CN.getValue().equals(cut)){ if(CutEnum.CN.getValue().equals(cut)){
return Result.error("复制失败"); return Result.error("复制失败");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java
+2
View File
@@ -83,6 +83,8 @@ public enum OperatorTypeEnum {
LAWS_INVENTORY_VERIFY_UPDATE_FLOW_STATUS("法规清单-更新验证符合性流程状态","lawsInventoryVerifyUpdateFlowStatus"), LAWS_INVENTORY_VERIFY_UPDATE_FLOW_STATUS("法规清单-更新验证符合性流程状态","lawsInventoryVerifyUpdateFlowStatus"),
LAWS_INVENTORY_DESIGN_CITE_DELIVERABLE("法规清单-设计-引用交付物","lawsInventoryDesignCiteDeliverable"), LAWS_INVENTORY_DESIGN_CITE_DELIVERABLE("法规清单-设计-引用交付物","lawsInventoryDesignCiteDeliverable"),
LAWS_INVENTORY_VERIFY_CITE_DELIVERABLE("法规清单-验证-引用交付物","lawsInventoryVerifyCiteDeliverable"), LAWS_INVENTORY_VERIFY_CITE_DELIVERABLE("法规清单-验证-引用交付物","lawsInventoryVerifyCiteDeliverable"),
LAWS_INVENTORY_STUDIO_COPY("法规清单-studio复制","lawsInventoryStudioCopy"),
LAWS_INVENTORY_REGULATION_OWNER_COPY("法规清单-法规工程师复制","lawsInventoryRegulationOwnerCopy"),
/** /**
* 待办中心-将法规工程师的法规清单确认待办任务转为已办 * 待办中心-将法规工程师的法规清单确认待办任务转为已办
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
+1 -1
View File
@@ -104,7 +104,7 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
List<ProjectLawsInventoryEO> queryProjectLawsInventoryInfoById(Map<String, Object> params); List<ProjectLawsInventoryEO> queryProjectLawsInventoryInfoById(Map<String, Object> params);
void copyInfoByIds(String ids); void copyInfoByIds(String ids,String operateType);
/** /**
* 批量设置 * 批量设置
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+11 -3
View File
@@ -4163,7 +4163,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
@Override @Override
public void copyInfoByIds(String ids) { public void copyInfoByIds(String ids,String operateType) {
if(org.apache.commons.lang3.StringUtils.isNotBlank(ids)){ if(org.apache.commons.lang3.StringUtils.isNotBlank(ids)){
LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ProjectLawsInventoryEO> wrapper = new LambdaQueryWrapper<>();
wrapper.in(ProjectLawsInventoryEO::getId,Arrays.asList(ids.split(","))); wrapper.in(ProjectLawsInventoryEO::getId,Arrays.asList(ids.split(",")));
@@ -4185,8 +4185,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectLawsInventoryEO.setVerifyDueDate(null);*/ projectLawsInventoryEO.setVerifyDueDate(null);*/
projectLawsInventoryEO.setInventoryAffirmDueDate(null); projectLawsInventoryEO.setInventoryAffirmDueDate(null);
projectLawsInventoryEO.setTaskAffirmDueDate(null); projectLawsInventoryEO.setTaskAffirmDueDate(null);
projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()); // 修改UAT问题清单，122条，法规工程师复制，将流程状态设置为 待校核 -> 对应现在的 任务待发起
if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_STUDIO_COPY.getValue())){
projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
}else if(StringUtils.equals(operateType,OperatorTypeEnum.LAWS_INVENTORY_REGULATION_OWNER_COPY.getValue())){
projectLawsInventoryEO.setDesignFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
projectLawsInventoryEO.setVerifyFlowStatus(ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
}
ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO(); ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", ""); String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");