diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 581dd4d9..ff88272a 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -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 { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index 70c7df9a..034aa33e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -31,8 +31,11 @@ public interface SarStandProjectLibraryDao extends BaseMapper getAllStand(); void updateByProjectId(@Param("id")String id, @Param("version")String version); List updateByProjectIdBath(@Param("id")List id, @Param("version")String version); + void deleteByProjectId(@Param("projectId")String projectId); + void deleteByProjectIdAndStandId(@Param("projectId")String projectId,@Param("standId")String standId); + List selectListByids(@Param("ids") List ids); List queryProjectGroup(@Param("current")int current,@Param("size")int size,@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); Integer queryProjectGroupCount(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 99a64b24..26ecbf36 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -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 queryProjectGroup(int current,int size,SarStandProjectLibrary sarStandProjectLibrary) { + size = 10000; List sarStandProjectLibraries=sarStandProjectLibraryDao.queryProjectGroup(current,size,sarStandProjectLibrary); Integer total=sarStandProjectLibraryDao.queryProjectGroupCount(sarStandProjectLibrary); Page page=new Page<>(); @@ -599,7 +601,11 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl + + delete from sar_stand_project_relation where + project_id= #{projectId} + and stand_id = #{standId} + + update sar_stand_project_library @@ -420,8 +426,8 @@