ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 81319 法规合规评估流程-设计工程师补充立项项目号，列表部分数据没有正常回显

Browse Source
This commit is contained in:
lijiarao
2024-02-02 19:43:40 +08:00
parent 011a3316c2
commit 93e34126e7
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTerm.java
+7 -8
View File
@@ -125,6 +125,13 @@ public class ProcessProjectStandardTerm {
@ApiModelProperty(value="拆分单id")
private String splitInfoId;
@ApiModelProperty(value="评估结果")
private String assessResults;
@TableField(exist = false)
@ApiModelProperty(value="评估结果")
private String assessResults_dictText;
/**
* 是否立项
*/
@@ -213,14 +220,6 @@ public class ProcessProjectStandardTerm {
@ApiModelProperty(value="")
private String termUserId;
@TableField(exist = false)
@ApiModelProperty(value="评估结果")
private String assessResults;
@TableField(exist = false)
@ApiModelProperty(value="评估结果")
private String assessResults_dictText;
/**工作令编号*/
@TableField(exist = false)
@ApiModelProperty(value = "工作令编号")
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml
+1
View File
@@ -179,6 +179,7 @@
<select id="getByTermDesignEngineer" resultMap="BaseResultMap">
select
ppst.assess_results,
<include refid="Base_Column_List">
<property name="alias" value="ppst"/>
</include>
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+9 -2
View File
@@ -282,7 +282,11 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
}
}
}
}else if (AssessCommon.NOT_COMPLIANT.equals(assessResults)) {
}
else if (ProcessProjectStandardCommon.SJGCSBCGZLBH.equals(taskDefinitionKey)){
projectApprovalFlag = term.getProjectApprovalFlag();
}
else if (AssessCommon.NOT_COMPLIANT.equals(assessResults)) {
projectApprovalFlag = YesOrNoEnum.YES.getValue();
}else {
projectApprovalFlag = YesOrNoEnum.NO.getValue();
@@ -676,12 +680,15 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
ProcessProjectStandardTerm term1 = new ProcessProjectStandardTerm();
String termId = term.getId();
String assessResults = term.getAssessResults();
String projectApprovalFlag = term.getProjectApprovalFlag();
String designEngineer = term.getDesignEngineer();
if (!pass){
continue;
}
term1.setId(termId);
term1.setDesignEngineer(designEngineer);
term1.setAssessResults(assessResults);
term1.setProjectApprovalFlag(projectApprovalFlag);
updateTermList.add(term1);
LawsSpecialProjectLibrary projectLibrary = new LawsSpecialProjectLibrary();
@@ -717,7 +724,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
ProcessProjectStandardTermUser updateTermUser = new ProcessProjectStandardTermUser();
updateTermUser.setId(termUser.getId());
String designEngineer1 = termUser.getDesignEngineer();
term1.setAssessResults(assessResults);
updateTermUser.setAssessResults(assessResults);
if(StringUtils.isBlank(designEngineer1)){
designEngineer1 = termUser.getModuleOwner();
updateTermUser.setDescription(termUser.getNotInvolved());