FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

先跑项目评估流程，假如归档A标准，再跑标准评估流程，假如归档B标准，查看项目清单，对应项目下的A标准被替换了

Browse Source
This commit is contained in:
zhangjun
2022-09-08 18:49:10 +08:00
parent d63ec599cc
commit afdc003aa2
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+2 -2
View File
@@ -18,8 +18,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
@FeignClient(value = "bat-wkflow-test")
//@FeignClient(value = "bat-wkflow")
//@FeignClient(value = "bat-wkflow-test")
@FeignClient(value = "bat-wkflow")
//@FeignClient(value = "shan6")
public interface workFlowFeignClient {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java
+3
View File
@@ -31,8 +31,11 @@ public interface SarStandProjectLibraryDao extends BaseMapper<SarStandProjectLib
List<String> getAllStand();
void updateByProjectId(@Param("id")String id, @Param("version")String version);
List<SarStandProjectLibrary> updateByProjectIdBath(@Param("id")List<String> id, @Param("version")String version);
void deleteByProjectId(@Param("projectId")String projectId);
void deleteByProjectIdAndStandId(@Param("projectId")String projectId,@Param("standId")String standId);
List<String> selectListByids(@Param("ids") List<String> ids);
List<SarStandProjectLibrary> queryProjectGroup(@Param("current")int current,@Param("size")int size,@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
Integer queryProjectGroupCount(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+7 -1
View File
@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.mysql.cj.x.protobuf.MysqlxDatatypes;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
@@ -138,6 +139,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
@Override
public IPage<SarStandProjectLibrary> queryProjectGroup(int current,int size,SarStandProjectLibrary sarStandProjectLibrary) {
size = 10000;
List<SarStandProjectLibrary> sarStandProjectLibraries=sarStandProjectLibraryDao.queryProjectGroup(current,size,sarStandProjectLibrary);
Integer total=sarStandProjectLibraryDao.queryProjectGroupCount(sarStandProjectLibrary);
Page<SarStandProjectLibrary> page=new Page<>();
@@ -599,7 +601,11 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
StandProjectRelationDto standProjectRelationDto = list.get(0);
if(standProjectRelationDto!=null && StringUtils.isNotBlank(standProjectRelationDto.getProjectId())){
sarStandProjectLibraryDao.updateFlag(standProjectRelationDto.getProjectId());
sarStandProjectLibraryDao.deleteByProjectId(standProjectRelationDto.getProjectId());
}
for (StandProjectRelationDto relationDto : list){
if (StringUtils.isNotBlank(relationDto.getStandId())) {
sarStandProjectLibraryDao.deleteByProjectIdAndStandId(relationDto.getProjectId(), relationDto.getStandId());
}
}
sarStandProjectLibraryDao.batchInsert(list);
if(standProjectRelationDto!=null && StringUtils.isNotBlank(standProjectRelationDto.getProjectId())){
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
+8 -2
View File
@@ -32,6 +32,12 @@
project_id= #{projectId}
</delete>
<delete id="deleteByProjectIdAndStandId">
delete from sar_stand_project_relation where
project_id= #{projectId}
and stand_id = #{standId}
</delete>
<update id="updateByProjectId">
update sar_stand_project_library
<if test="id != null">
@@ -420,8 +426,8 @@
</select>
<select id="queryProjectGroup"
resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
select distinct sar_stand_project_library.project_group,ANY_VALUE(sar_stand_project_library.management_host_name),
ANY_VALUE(sar_stand_project_library.category_name),ANY_VALUE(sar_stand_project_library.development_host_name)
select distinct sar_stand_project_library.project_group,ANY_VALUE(sar_stand_project_library.management_host_name) as management_host_name,
ANY_VALUE(sar_stand_project_library.category_name) as category_name,ANY_VALUE(sar_stand_project_library.development_host_name) as development_host_name
from sar_stand_project_library
where 1=1
<if test="sarStandProjectLibrary.managementHostName != null and sarStandProjectLibrary.managementHostName != ''">