QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(标准主计划): 完善

Browse Source
This commit is contained in:
yjz
2024-07-18 20:13:07 +08:00
parent 3fbd024862
commit 02c84ca48f
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/assessmentLibrary/entity/LawsConformityAssessmentLibrary.java
+2 -1
View File
@@ -32,6 +32,7 @@ public class LawsConformityAssessmentLibrary implements Serializable {
* 来源 * 来源
*/ */
@ApiModelProperty(value = "来源") @ApiModelProperty(value = "来源")
@TableField(exist = false)
private String source; private String source;
/** /**
@@ -89,4 +90,4 @@ public class LawsConformityAssessmentLibrary implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }
laws-modules/src/main/java/com/jero/modules/laws/standardmasterplan/servicce/impl/LawsStandardMasterPlanServiceImpl.java
+19 -22
View File
@@ -116,6 +116,7 @@ public class LawsStandardMasterPlanServiceImpl
queryWrapper.eq(StringUtils.isNotBlank(lawsStandardMasterPlanVO.getId()), queryWrapper.eq(StringUtils.isNotBlank(lawsStandardMasterPlanVO.getId()),
"lsmp.id", lawsStandardMasterPlanVO.getId()); "lsmp.id", lawsStandardMasterPlanVO.getId());
queryWrapper.eq("lsmp.del_flag", CommonConstant.DEL_FLAG_0); queryWrapper.eq("lsmp.del_flag", CommonConstant.DEL_FLAG_0);
queryWrapper.orderByDesc("lsmp.create_time");
return queryWrapper; return queryWrapper;
} }
@@ -137,20 +138,12 @@ public class LawsStandardMasterPlanServiceImpl
String type = lawsStandardMasterPlanSublist.getType(); String type = lawsStandardMasterPlanSublist.getType();
switch (type) { switch (type) {
case LawsStandardMasterPlanCommon.INTERPRETATION_OF_REGULATIONS: case LawsStandardMasterPlanCommon.INTERPRETATION_OF_REGULATIONS:
// 查询标准第一次发起并结束的法规解读流程 ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper<ProcessAll>()
ProcessStandardInterpret processStandardInterpret = processStandardInterpretService.getOne( .eq(ProcessAll::getPrcType, "2")
new LambdaQueryWrapper<ProcessStandardInterpret>() .eq(ProcessAll::getPrcStatus, ProcessStatusEnum.COMPLETED.getValue())
.eq(ProcessStandardInterpret::getStandardId, .orderByAsc(ProcessAll::getCreateTime).last("limit 1"));
lawsStandardMasterPlan.getStandardId()) if (!Objects.isNull(processAll)){
.orderByAsc(ProcessStandardInterpret::getCreateTime) lawsStandardMasterPlanSublist.setAssociationId(processAll.getId());
.last("limit 1"));
if (!Objects.isNull(processStandardInterpret)){
ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper<ProcessAll>()
.eq(ProcessAll::getProjectId, processStandardInterpret.getProjectId())
.eq(ProcessAll::getPrcStatus, ProcessStatusEnum.COMPLETED.getValue()));
if (!Objects.isNull(processAll)){
lawsStandardMasterPlanSublist.setAssociationId(processAll.getId());
}
} }
break; break;
case LawsStandardMasterPlanCommon.MARKET_REGULATION_LIST_UPDATE: case LawsStandardMasterPlanCommon.MARKET_REGULATION_LIST_UPDATE:
@@ -243,7 +236,9 @@ public class LawsStandardMasterPlanServiceImpl
case LawsStandardMasterPlanCommon.TEXT_STORAGE: case LawsStandardMasterPlanCommon.TEXT_STORAGE:
if (!Objects.isNull(lawsDomesticStandard)){ if (!Objects.isNull(lawsDomesticStandard)){
SysUser sysUser = sysUserService.getUserByName(lawsDomesticStandard.getCreateBy()); SysUser sysUser = sysUserService.getUserByName(lawsDomesticStandard.getCreateBy());
lawsStandardMasterPlanSublist.setResponsiblePerson(sysUser.getId()); if (!Objects.isNull(sysUser)){
lawsStandardMasterPlanSublist.setResponsiblePerson(sysUser.getId());
}
lawsStandardMasterPlanSublist.setActualCompletionDate(lawsDomesticStandard.getCreateTime()); lawsStandardMasterPlanSublist.setActualCompletionDate(lawsDomesticStandard.getCreateTime());
} }
break; break;
@@ -323,8 +318,10 @@ public class LawsStandardMasterPlanServiceImpl
lawsStandardMasterPlanSublist.setPcrCode(pcrNos); lawsStandardMasterPlanSublist.setPcrCode(pcrNos);
LawsEvaluationNotMetLibrary lawsEvaluationNotMetLibrary = list.get(0); LawsEvaluationNotMetLibrary lawsEvaluationNotMetLibrary = list.get(0);
SysUser sysUser = sysUserService.getUserByName(lawsEvaluationNotMetLibrary.getUpdateBy()); SysUser sysUser = sysUserService.getUserByName(lawsEvaluationNotMetLibrary.getUpdateBy());
lawsStandardMasterPlanSublist.setResponsiblePerson(sysUser.getId()); if (!Objects.isNull(sysUser)){
lawsStandardMasterPlanSublist.setActualCompletionDate( lawsStandardMasterPlanSublist.setResponsiblePerson(sysUser.getId());
}
lawsStandardMasterPlanSublist.setCompletionAccomplishDate(
lawsEvaluationNotMetLibrary.getUpdateTime()); lawsEvaluationNotMetLibrary.getUpdateTime());
} }
break; break;
@@ -417,13 +414,13 @@ public class LawsStandardMasterPlanServiceImpl
@Override @Override
public void syncInterpretationOfRegulations(String id, String standardId) { public void syncInterpretationOfRegulations(String id, String standardId) {
ProcessStandardInterpret processStandardInterpret = processStandardInterpretService.getOne( int count = processStandardInterpretService.count(
new LambdaQueryWrapper<ProcessStandardInterpret>() new LambdaQueryWrapper<ProcessStandardInterpret>()
.eq(ProcessStandardInterpret::getStandardId, standardId) .eq(ProcessStandardInterpret::getStandardId, standardId)
.orderByAsc(ProcessStandardInterpret::getCreateTime) .ne(ProcessStandardInterpret::getId, id));
.last("limit 1")); if (count == 0){
if (!Objects.isNull(processStandardInterpret) && processStandardInterpret.getId().equals(id)){ // 标准第一次发布解读流程结束，则同步
// 标准第一次发布解读流程，则同步 ProcessStandardInterpret processStandardInterpret = processStandardInterpretService.getById(id);
ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper<ProcessAll>() ProcessAll processAll = processAllService.getOne(new LambdaQueryWrapper<ProcessAll>()
.eq(ProcessAll::getProjectId, processStandardInterpret.getProjectId()) .eq(ProcessAll::getProjectId, processStandardInterpret.getProjectId())
.eq(ProcessAll::getPrcStatus, ProcessStatusEnum.COMPLETED.getValue())); .eq(ProcessAll::getPrcStatus, ProcessStatusEnum.COMPLETED.getValue()));