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

合并分支 'fix_bug_first_stage' 到 'master'

Browse Source 
Fix bug first stage

查看合并请求 laws-nio/laws-weilai!55
This commit is contained in:
肖文钰
2022-07-08 14:31:20 +08:00
parent 16a6c729f1 e5518f0590
commit fd4cf09b6a
20 changed files with 385 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+10
View File
@@ -67,6 +67,7 @@ import com.jero.modules.system.service.ISysDepartService;
import com.jero.modules.system.service.ISysUserService;
import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
import com.jero.modules.system.util.PDFUtils;
import com.jero.modules.system.util.StringUtils;
import com.jero.modules.tag.entity.OnlCgformArea;
import com.jero.modules.tag.service.impl.OnlCgformAreaServiceImpl;
@@ -3882,6 +3883,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
*/
@Override
public void exportExcel(Map<String, Object> map, HttpServletResponse response, HttpServletRequest request) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String cut = (String) map.get("cut");
//String flag = "file"为带文件导出标识
String flag = (String) map.get("flag");
@@ -3997,6 +3999,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
boolean b = CosBootUtil.doesObjectExist(url);
if(b){
InputStream download = CosBootUtil.download(url);
if(url.endsWith(".pdf") || url.endsWith(".PDF")){
String currentTime = sdf.format(new Date());
String waterContent = loginUser.getUsername() + " " + currentTime;
File newFile = PDFUtils.PDFWatermark(download,uploadpath,ossFile.getFileName(),waterContent);
download = new FileInputStream(newFile.getPath());
}
copyFile(download, fileNowPath + File.separator + ossFile.getFileName());
}
}
@@ -4026,6 +4034,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
IOUtils.closeQuietly(os);
File file = new File(uploadpath + "/tempZip");
FileUtil.deleteContents(file);
File fileTemp = new File(uploadpath + "/tempZip.zip");
FileUtil.deleteContents(fileTemp);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java
+3
View File
@@ -284,6 +284,9 @@ public class DummyInventoryInfoEO implements Serializable {
@TableField(exist = false)
private Integer pageSize;
//文档库id
private String bussDocumentLibraryId;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml
+1
View File
@@ -40,5 +40,6 @@
<result column="verify_remark" property="verifyRemark" />
<result column="prehomo_remark" property="prehomoRemark" />
<result column="design_remark" property="designRemark" />
<result column="buss_document_library_id" property="bussDocumentLibraryId" />
</resultMap>
</mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+1
View File
@@ -156,6 +156,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
dummyInventoryInfoEOTemp.setDummyInventoryBaseId(dummyInventoryInfoEO.getDummyInventoryBaseId());
dummyInventoryInfoEOTemp.setCreateTime(new Date());
dummyInventoryInfoEOTemp.setUpdateTime(new Date());
dummyInventoryInfoEOTemp.setBussDocumentLibraryId(bussDocumentLibraryEO.getId());
list.add(dummyInventoryInfoEOTemp);
}
this.saveBatch(list);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
+2
View File
@@ -465,5 +465,7 @@ public class ProjectLawsInventoryEO implements Serializable {
@ApiModelProperty(value = "报告id")
private String fileId;
@ApiModelProperty(value = "文档库id/标准id")
private String standId;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java
+8
View File
@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -307,4 +308,11 @@ public class ProjectTaskInventoryEO implements Serializable {
/**法规清单创建日期，任务清单中需要根据此字段进行倒序排序**/
@TableField(exist = false)
private Date lawsInventoryCreateTime;
@ApiModelProperty(value = "文档库id/标准id")
private String standId;
/**法规清单id数组 查询使用**/
@TableField(exist = false)
private List<String> projectLawsInventoryIdList;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectTaskInventoryEOMapper.java
+7
View File
@@ -76,4 +76,11 @@ public interface ProjectTaskInventoryEOMapper extends BaseMapper<ProjectTaskInve
*/
List<Map<String, Object>> getCertificationProgressStatisticsGroupByTerritory(@Param("projectLawsInventoryIdList") List<String> projectLawsInventoryIdList,
@Param("certificationProgress") String certificationProgress);
/**
* 查询任务清单列表
* @param projectTaskInventoryEO
* @return
*/
List<ProjectTaskInventoryEO> selectProjectTaskInventoryList(@Param("projectTaskInventoryEO") ProjectTaskInventoryEO projectTaskInventoryEO);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskInventoryEOMapper.xml
+30
View File
@@ -19,6 +19,13 @@
<result column="project_status_assess" property="projectStatusAssess" />
</resultMap>
<sql id="Base_Column_List" >
pti.id, pti.create_by,pti.create_time,pti.update_by,pti.update_time,pti.sys_org_code,pti.project_laws_inventory_id,pti.design_status,pti.design_flow_task_status,pti.design_p_id,pti.prehomo_status,
pti.prehomo_flow_task_status,pti.prehomo_p_id,pti.verify_status,pti.verify_flow_task_status,pti.verify_p_id,pti.certification_progress,pti.certification_progress_remark,pti.project_status_assess,
pti.design_send_msg_flag,pti.design_send_msg_current_flag,pti.prehomo_send_msg_flag,pti.prehomo_send_msg_current_flag,pti.verify_send_msg_flag,pti.verify_send_msg_current_flag,
pti.design_person_charge_feedback,pti.prehomo_person_charge_feedback,pti.verify_person_charge_feedback,pti.process_end_time
</sql>
<select id="getCertificationProgressStatistics" resultType="hashmap">
select
count(certification_progress) as "certificationProgressCount",
@@ -150,4 +157,27 @@
and pti.certification_progress = #{certificationProgress}
group by pli.duty_territory;
</select>
<select id="selectProjectTaskInventoryList" resultMap="ProjectTaskInventoryEOResultMap">
select
<include refid="Base_Column_List"/>
from
project_task_inventory pti
left join
project_task_inventory_condition_assessment ptica on pti.id = ptica.project_laws_inventory_id
<where>
<if test="projectTaskInventoryEO.certificationProgress != null and projectTaskInventoryEO.certificationProgress != '' ">
pti.certification_progress = #{projectTaskInventoryEO.certificationProgress}
</if>
<if test="projectTaskInventoryEO.projectLawsInventoryIdList != null ">
and pti.project_laws_inventory_id in
<foreach collection="projectTaskInventoryEO.projectLawsInventoryIdList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="projectTaskInventoryEO.projectStatusAssess != null and projectTaskInventoryEO.projectStatusAssess != '' ">
ptica.condition_assessment = #{projectTaskInventoryEO.projectStatusAssess}
</if>
</where>
</select>
</mapper>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java
+3 -1
View File
@@ -5,6 +5,8 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.modules.project.entity.ConditionAssessmentEO;
import com.jero.modules.project.entity. ConditionAssessmentEO;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.project.entity.ProjectTaskInventoryEO;
import java.util.List;
import java.util.Map;
@@ -75,7 +77,7 @@ public interface IConditionAssessmentEOService extends IService<ConditionAssessm
* @param roleCode
* @return
*/
ConditionAssessmentEO getProjectStatusAssess(String projectLawsInventoryId, String roleCode, LoginUser currentUser);
ConditionAssessmentEO getProjectStatusAssess(String projectLawsInventoryId, String roleCode, LoginUser currentUser, ProjectTaskInventoryEO projectTaskInventory);
/**
* studio视角下获取项目状态评估
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java
+5 -1
View File
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.api.vo.Result;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.project.entity.ConditionAssessmentEO;
import com.jero.modules.project.entity.ProjectTaskInventoryEO;
import com.jero.modules.project.enums.ProjectRoleEnum;
import com.jero.modules.project.mapper.ConditionAssessmentEOMapper;
import com.jero.modules.project.service.IConditionAssessmentEOService;
@@ -144,11 +145,14 @@ public class ConditionAssessmentEOServiceImpl extends ServiceImpl<ConditionAsses
* @return
*/
@Override
public ConditionAssessmentEO getProjectStatusAssess(String projectLawsInventoryId, String roleCode,LoginUser currentUser) {
public ConditionAssessmentEO getProjectStatusAssess(String projectLawsInventoryId, String roleCode, LoginUser currentUser, ProjectTaskInventoryEO projectTaskInventory) {
ConditionAssessmentEO result = null;
QueryWrapper<ConditionAssessmentEO> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryId);
if(StringUtils.isNotEmpty(projectTaskInventory.getProjectStatusAssess())){
queryWrapper.lambda().eq(ConditionAssessmentEO::getConditionAssessment,projectTaskInventory.getProjectStatusAssess());
}
if(StringUtils.equals(roleCode,ProjectRoleEnum.REGULATI_ENGINEER.getValue()) || StringUtils.equals(roleCode,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){
queryWrapper.lambda().eq(ConditionAssessmentEO::getCreateBy,currentUser.getUsername());
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+52 -29
View File
@@ -245,6 +245,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectLawsInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", ""));
projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
projectLawsInventoryEOTemp.setStandId(dummyInventoryInfoEO.getBussDocumentLibraryId());
projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
}
}else{
@@ -266,6 +267,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectLawsInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", ""));
projectLawsInventoryEOTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
projectLawsInventoryEOTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
projectLawsInventoryEOTemp.setStandId(dummyInventoryInfoEO.getBussDocumentLibraryId());
projectLawsInventoryEOS.add(projectLawsInventoryEOTemp);
}
}
@@ -280,6 +282,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
projectTaskInventoryEO.setId(projectTaskInventoryId);
projectTaskInventoryEO.setProjectLawsInventoryId(lawsInventory.getId());
projectTaskInventoryEO.setStandId(lawsInventory.getStandId());
projectTaskInventoryEOList.add(projectTaskInventoryEO);
});
@@ -334,6 +337,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
List<ProjectLawsInventoryEO> list = new ArrayList<>();
for (BussDocumentLibraryEO bussDocumentLibraryEO : bussDocumentLibraryEOList) {
String standId = bussDocumentLibraryEO.getId();
ProjectLawsInventoryEO projectLawsInventoryTemp = new ProjectLawsInventoryEO();
BeanUtils.copyProperties(bussDocumentLibraryEO, projectLawsInventoryTemp);
String projectLawsInventoryId = UUID.randomUUID().toString().replace("-", "");
@@ -343,12 +348,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectLawsInventoryTemp.setUpdateTime(new Date());
projectLawsInventoryTemp.setTaskAffirmStatus(TaskAffirmStatusEnum.NOT_STARTED.getValue());
projectLawsInventoryTemp.setInventoryAffirmStatus(InventoryAffirmStatusEnum.NOT_STARTED.getValue());
projectLawsInventoryTemp.setStandId(standId);
list.add(projectLawsInventoryTemp);
ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
projectTaskInventoryEO.setId(projectTaskInventoryId);
projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventoryId);
projectTaskInventoryEO.setStandId(standId);
projectTaskInventoryEOList.add(projectTaskInventoryEO);
}
super.saveBatch(list);
@@ -2001,6 +2008,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
int isProjectRole = checkUserRole(byId.getProjectLibraryId(), currentUser.getId(), id);
dataDispose(projectLawsInventoryEOList,currentUser,isProjectRole,cut);
dataDictDispose(projectLawsInventoryEOList,cut);
//result.put("projectLawsInventory",projectLawsInventoryEOList.get(0));
/*if (StringUtils.equals(operatorType, OperatorTypeEnum.TASK_AFFIRM_QUERY.getValue())) {
@@ -3856,13 +3864,22 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
List<ProjectTaskInventoryEO> projectTaskInventoryEOList = new ArrayList<>();
idList.forEach(id -> {
List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.baseMapper.selectList(updateLawsInventoryWrapper);
projectLawsInventoryEOList.forEach(projectLawsInventory -> {
ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
projectTaskInventoryEO.setId(projectTaskInventoryId);
projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventory.getId());
projectTaskInventoryEO.setStandId(projectLawsInventory.getStandId());
projectTaskInventoryEOList.add(projectTaskInventoryEO);
});
/*idList.forEach(id -> {
ProjectTaskInventoryEO projectTaskInventoryEO = new ProjectTaskInventoryEO();
String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
projectTaskInventoryEO.setId(projectTaskInventoryId);
projectTaskInventoryEO.setProjectLawsInventoryId(id);
projectTaskInventoryEOList.add(projectTaskInventoryEO);
});
});*/
//项目任务清单数据初始化。
this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(idList);
this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
@@ -4992,14 +5009,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
List<String> listEn = Arrays.asList(infoDiffEn.get("subtitle").split(","));
String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
}
}
List<String> listEn = Arrays.asList(infoDiffEn.get("subtitle").split(","));
if(listEn.size() > 1){
String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
}
}
//WVTA ID
if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) {
List<String> list = Arrays.asList(infoDiff.get("wvtaId").split(","));
@@ -5007,13 +5024,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
List<String> listEn = Arrays.asList(infoDiffEn.get("wvtaId").split(","));
String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
}
}
}
List<String> listEn = Arrays.asList(infoDiffEn.get("wvtaId").split(","));
if(listEn.size() > 1){
String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
}
}
//实施类别
if (StringUtils.isNotBlank(infoDiff.get("implementType"))) {
@@ -5022,25 +5040,30 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
List<String> listEn = Arrays.asList(infoDiffEn.get("implementType").split(","));
String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
}
}
}
List<String> listEn = Arrays.asList(infoDiffEn.get("implementType").split(","));
if(listEn.size() > 1){
String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
}
}
//在产车实施日期
if (StringUtils.isNotBlank(infoDiff.get("implementTimeString"))) {
List<String> list = Arrays.asList(infoDiff.get("implementTimeString").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if(list.size() > 1){
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
}
List<String> listEn = Arrays.asList(infoDiffEn.get("implementTimeString").split(","));
String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + "</br>";
enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
if(listEn.size() > 1){
String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + "</br>";
}
}
//新车型实施日期
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+37 -7
View File
@@ -181,6 +181,12 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
List<String> projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();
taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getProjectLawsInventoryId,projectLawsInventoryIdList);
if(StringUtils.isNotEmpty(projectTaskInventoryEO.getCertificationProgress())){
taskInventoryQueryWrapper.lambda().in(ProjectTaskInventoryEO::getCertificationProgress,projectTaskInventoryEO.getCertificationProgress());
}
/*projectTaskInventoryEO.setProjectLawsInventoryIdList(projectLawsInventoryIdList);
List<ProjectTaskInventoryEO> projectTaskInventoryEOList = this.baseMapper.selectProjectTaskInventoryList(projectTaskInventoryEO);*/
List<ProjectTaskInventoryEO> projectTaskInventoryEOList = this.baseMapper.selectList(taskInventoryQueryWrapper);
//验证当前用户在该项目中是什么角色
@@ -207,7 +213,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
});
});
result = createTaskInventoryEOList(projectTaskInventoryEOList,projectTaskInventoryDetailEOList,isProjectRole,currentUser);
result = createTaskInventoryEOList(projectTaskInventoryEOList,projectTaskInventoryDetailEOList,isProjectRole,currentUser,projectTaskInventoryEO);
}
}
if(CollectionUtils.isNotEmpty(result)){
@@ -422,7 +428,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
public List<ProjectTaskInventoryEO> createTaskInventoryEOList(List<ProjectTaskInventoryEO> projectTaskInventoryEOList,
List<ProjectTaskInventoryDetailEO> projectTaskInventoryDetailEOList,
Integer isProjectRole,
LoginUser currentUser)
LoginUser currentUser,
ProjectTaskInventoryEO projectTaskInventory)
{
List<ProjectTaskInventoryEO> result = new ArrayList<>();
for (ProjectTaskInventoryEO projectTaskInventoryEO : projectTaskInventoryEOList) {
@@ -449,7 +456,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
roleCode = ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue();
}
ConditionAssessmentEO projectStatusAssess = conditionAssessmentEOService.getProjectStatusAssess(projectTaskInventoryEO.getProjectLawsInventoryId(),roleCode,currentUser);
ConditionAssessmentEO projectStatusAssess = conditionAssessmentEOService.getProjectStatusAssess(projectTaskInventoryEO.getProjectLawsInventoryId(),roleCode,currentUser,projectTaskInventory);
if(projectStatusAssess != null){
projectTaskInventoryEO.setProjectStatusAssess(projectStatusAssess.getConditionAssessment());
projectTaskInventoryEO.setProjectStatusAssessRemark(projectStatusAssess.getRemark());
@@ -481,8 +488,14 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
* studio：查询所有（已启动流程的数据） ， 包含自己待办、已办
* 法规工程师 / 认证工程师： 查询跟自己有关系的数据 ， 包含自己待办、已办
* 其他人：查询自己待办、已办数据。
*/
if(isStudio || (isRegulationOwner || isHomologationEngineer)){
*/
/**
* 2022-07-07修改禅道 55588问题。 只有studio可以查看所有已经启动了的流程
* studio：查询所有（已启动流程的数据） ， 包含自己待办、已办
*/
if(isStudio){
actiProcInstId = projectTaskInventoryDetailEO.getActiProcInstId();
if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){
designPid = actiProcInstId;
@@ -570,8 +583,14 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
projectTaskInventoryEO.setCertificationProgress(projectTaskInventoryEO.getCertificationProgress());
projectTaskInventoryEO.setCertificationProgressRemark(projectTaskInventoryEO.getCertificationProgressRemark());
}else {
projectTaskInventoryEO.setCertificationProgress("");
projectTaskInventoryEO.setCertificationProgressRemark("");
if((isRegulationOwner || isHomologationEngineer)){
projectTaskInventoryEO.setCertificationProgress(projectTaskInventoryEO.getCertificationProgress());
projectTaskInventoryEO.setCertificationProgressRemark(projectTaskInventoryEO.getCertificationProgressRemark());
}else {
projectTaskInventoryEO.setCertificationProgress("");
projectTaskInventoryEO.setCertificationProgressRemark("");
}
if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
actiProcInstId = projectTaskInventoryDetailEO.getActiProcInstId();
if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.SJFHXSHLC.getValue())){
@@ -599,7 +618,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
}
}
if(StringUtils.isNotEmpty(actiProcInstId) && (isRegulationOwner || isHomologationEngineer || isStudio)){
/*if(StringUtils.isNotEmpty(actiProcInstId) && (isRegulationOwner || isHomologationEngineer || isStudio)){*/
if(StringUtils.isNotEmpty(actiProcInstId) && (isStudio)){
projectTaskInventoryEO.setShowFlag(TaskStatusEnum.SHOW_FLAG.getValue());
}
@@ -608,6 +628,16 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
if(CollectionUtils.isNotEmpty(result)){
result = result.stream().filter(e -> (StringUtils.equals(e.getShowFlag(),TaskStatusEnum.SHOW_FLAG.getValue()))).collect(Collectors.toList());
//根据当前项目状态筛选一次。
if(StringUtils.isNotEmpty(projectTaskInventory.getProjectStatusAssess())){
result = result.stream().filter(e -> {
boolean flag = false;
if(StringUtils.equals(e.getProjectStatusAssess(),projectTaskInventory.getProjectStatusAssess())){
flag = true;
}
return flag;
}).collect(Collectors.toList());
}
}
return result;
}