diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java index b00dd8f7..7f51d8e0 100644 --- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java +++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java @@ -32,6 +32,7 @@ public class LawsConformityAssessmentLibrary implements Serializable { * 来源 */ @ApiModelProperty(value = "来源") + @TableField(exist = false) private String source; /** @@ -89,4 +90,4 @@ public class LawsConformityAssessmentLibrary implements Serializable { @TableField(exist = false) private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java index e921b211..4fea85dc 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java @@ -116,6 +116,7 @@ public class LawsStandardMasterPlanServiceImpl queryWrapper.eq(StringUtils.isNotBlank(lawsStandardMasterPlanVO.getId()), "lsmp.id", lawsStandardMasterPlanVO.getId()); queryWrapper.eq("lsmp.del_flag", CommonConstant.DEL_FLAG_0); + queryWrapper.orderByDesc("lsmp.create_time"); return queryWrapper; } @@ -137,20 +138,12 @@ public class LawsStandardMasterPlanServiceImpl String type = lawsStandardMasterPlanSublist.getType(); switch (type) { case LawsStandardMasterPlanCommon.INTERPRETATION_OF_REGULATIONS: - // 查询标准第一次发起并结束的法规解读流程 - ProcessStandardInterpret processStandardInterpret = processStandardInterpretService.getOne( - new LambdaQueryWrapper() - .eq(ProcessStandardInterpret::getStandardId, - lawsStandardMasterPlan.getStandardId()) - .orderByAsc(ProcessStandardInterpret::getCreateTime) - .last("limit 1")); - if (!Objects.isNull(processStandardInterpret)){ - ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper() - .eq(ProcessAll::getProjectId, processStandardInterpret.getProjectId()) - .eq(ProcessAll::getPrcStatus, ProcessStatusEnum.COMPLETED.getValue())); - if (!Objects.isNull(processAll)){ - lawsStandardMasterPlanSublist.setAssociationId(processAll.getId()); - } + ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper() + .eq(ProcessAll::getPrcType, "2") + .eq(ProcessAll::getPrcStatus, ProcessStatusEnum.COMPLETED.getValue()) + .orderByAsc(ProcessAll::getCreateTime).last("limit 1")); + if (!Objects.isNull(processAll)){ + lawsStandardMasterPlanSublist.setAssociationId(processAll.getId()); } break; case LawsStandardMasterPlanCommon.MARKET_REGULATION_LIST_UPDATE: @@ -243,7 +236,9 @@ public class LawsStandardMasterPlanServiceImpl case LawsStandardMasterPlanCommon.TEXT_STORAGE: if (!Objects.isNull(lawsDomesticStandard)){ SysUser sysUser = sysUserService.getUserByName(lawsDomesticStandard.getCreateBy()); - lawsStandardMasterPlanSublist.setResponsiblePerson(sysUser.getId()); + if (!Objects.isNull(sysUser)){ + lawsStandardMasterPlanSublist.setResponsiblePerson(sysUser.getId()); + } lawsStandardMasterPlanSublist.setActualCompletionDate(lawsDomesticStandard.getCreateTime()); } break; @@ -323,8 +318,10 @@ public class LawsStandardMasterPlanServiceImpl lawsStandardMasterPlanSublist.setPcrCode(pcrNos); LawsEvaluationNotMetLibrary lawsEvaluationNotMetLibrary = list.get(0); SysUser sysUser = sysUserService.getUserByName(lawsEvaluationNotMetLibrary.getUpdateBy()); - lawsStandardMasterPlanSublist.setResponsiblePerson(sysUser.getId()); - lawsStandardMasterPlanSublist.setActualCompletionDate( + if (!Objects.isNull(sysUser)){ + lawsStandardMasterPlanSublist.setResponsiblePerson(sysUser.getId()); + } + lawsStandardMasterPlanSublist.setCompletionAccomplishDate( lawsEvaluationNotMetLibrary.getUpdateTime()); } break; @@ -417,13 +414,13 @@ public class LawsStandardMasterPlanServiceImpl @Override public void syncInterpretationOfRegulations(String id, String standardId) { - ProcessStandardInterpret processStandardInterpret = processStandardInterpretService.getOne( + int count = processStandardInterpretService.count( new LambdaQueryWrapper() .eq(ProcessStandardInterpret::getStandardId, standardId) - .orderByAsc(ProcessStandardInterpret::getCreateTime) - .last("limit 1")); - if (!Objects.isNull(processStandardInterpret) && processStandardInterpret.getId().equals(id)){ - // 标准第一次发布解读流程,则同步 + .ne(ProcessStandardInterpret::getId, id)); + if (count == 0){ + // 标准第一次发布解读流程结束,则同步 + ProcessStandardInterpret processStandardInterpret = processStandardInterpretService.getById(id); ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper() .eq(ProcessAll::getProjectId, processStandardInterpret.getProjectId()) .eq(ProcessAll::getPrcStatus, ProcessStatusEnum.COMPLETED.getValue()));