diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java index 7685ce67..a138ed68 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java @@ -57,7 +57,7 @@ public class WorkGroupController extends BaseController { - @ApiModelProperty("删除工作组") + @ApiModelProperty("批量删除工作组") @DeleteMapping public ResponseMessage deleteWorkGroup(String id){ boolean delete = iWorkGroupService.delete(id); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java index ae37be0d..297b092a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java @@ -12,6 +12,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; +import java.util.List; + /** *

* 服务实现类 @@ -36,7 +39,8 @@ public class WorkGroupServiceImpl extends ServiceImpl i @Override public boolean delete(String workGroupId) { - return this.removeById(workGroupId); + List idList = Arrays.asList(workGroupId.split(",")); + return this.removeByIds(idList); } @Override diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java index 7b663965..2d6502fe 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java @@ -153,6 +153,9 @@ public class SarBussionessStand extends BaseEntity { @TableField(exist = false) private String menuParentId; + @TableField(exist = false) + private String textStatusBussShow; + @TableField(exist = false) private String standStatusShow; // 标准状态下拉框 --单选 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 02888d99..0cd08aa5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -343,4 +343,19 @@ public class SarStandProjectLibraryController extends BaseController selectListByids(@Param("ids") List ids); + List queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); + + List queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary,@Param("groups")List strings); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index 85ed659b..72f916ab 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -29,5 +29,8 @@ public interface SarStandProjectLibraryService { void batchInsertAdd(@Param("ids") List list); List exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId); public Head AnalysisJsonAndStorage(String jsonStr); + public List queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary); + + public List queryProjects(@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 293ed9fd..63c7cddc 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 @@ -128,6 +128,24 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectGroup(SarStandProjectLibrary sarStandProjectLibrary) { + return sarStandProjectLibraryDao.queryProjectGroup(sarStandProjectLibrary); + } + + @Override + public List queryProjects(SarStandProjectLibrary sarStandProjectLibrary) { + List ids=new ArrayList<>(); + if (null!=sarStandProjectLibrary.getProjectGroup() && !"".equals(sarStandProjectLibrary.getProjectGroup())){ + if (sarStandProjectLibrary.getProjectGroup().contains(",")){ + ids.addAll(new ArrayList<>(Arrays.asList(sarStandProjectLibrary.getProjectGroup().split(",")))); + }else { + ids.add(sarStandProjectLibrary.getProjectGroup()); + } + } + return sarStandProjectLibraryDao.queryProjects(sarStandProjectLibrary,ids); + } + @Override public IPage queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) { diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 38a70316..7abb5fd4 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -21,6 +21,7 @@ + @@ -748,12 +749,13 @@ + + diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java index 3f1560e4..e58f8e60 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java @@ -340,8 +340,10 @@ public class DicTypeEORestController extends BaseController { @GetMapping("/getDicTypeListCode") //@RequiresPermissions("sys:dicType:getDicTypeListCode") public ResponseMessage> getDicTypeListCode() throws Exception { - Map dicTypeEO = dicTypeEOService.getDicTypeListCode(); - return Result.success(dicTypeEO); + + return Result.success("1","hello"); +// Map dicTypeEO = dicTypeEOService.getDicTypeListCode(); +// return Result.success(dicTypeEO); } /**