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

Merge branch 'develop_master' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-01-20 20:44:29 +08:00
parent 4e61e5c077 0c387355b4
commit 1cab47439c
10 changed files with 93 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class WorkGroupController extends BaseController<WorkGroup> {
@ApiModelProperty("删除工作组")
@ApiModelProperty("批量删除工作组")
@DeleteMapping
public ResponseMessage deleteWorkGroup(String id){
boolean delete = iWorkGroupService.delete(id);
adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java
+5 -1
View File
@@ -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;
/**
* <p>
* 服务实现类
@@ -36,7 +39,8 @@ public class WorkGroupServiceImpl extends ServiceImpl<WorkGroupDao, WorkGroup> i
@Override
public boolean delete(String workGroupId) {
return this.removeById(workGroupId);
List<String> idList = Arrays.asList(workGroupId.split(","));
return this.removeByIds(idList);
}
@Override
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java
+3
View File
@@ -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; // 标准状态下拉框 --单选
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
+15
View File
@@ -343,4 +343,19 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
.build();
return Result.success(querySelectRspDTO);
}
//标准评估流程 查询项目群接口
@GetMapping("/queryProjectGroup")
@ApiOperation("查询项目群")
public ResponseMessage queryProjectGroup(SarStandProjectLibrary sarStandProjectLibrary){
return Result.success( sarStandProjectLibraryService.queryProjectGroup(sarStandProjectLibrary));
}
//标准评估流程根据项目群查项目接口
@GetMapping("/queryProjects")
@ApiOperation("查询项目群下的项目")
public ResponseMessage queryProjects(SarStandProjectLibrary sarStandProjectLibrary){
return Result.success( sarStandProjectLibraryService.queryProjects(sarStandProjectLibrary));
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java
+3
View File
@@ -33,4 +33,7 @@ public interface SarStandProjectLibraryDao extends BaseMapper<SarStandProjectLib
void deleteByProjectId(@Param("projectId")String projectId);
List<String> selectListByids(@Param("ids") List<String> ids);
List<SarStandProjectLibrary> queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
List<SarStandProjectLibrary> queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary,@Param("groups")List<String> strings);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java
+3
View File
@@ -29,5 +29,8 @@ public interface SarStandProjectLibraryService {
void batchInsertAdd(@Param("ids") List<StandProjectRelationDto> list);
List<StandAttrInfoDto> exportStandAttrInfoExcel(StandAttrInfoExcelDto standAttrInfoExcelDto,String standId);
public Head AnalysisJsonAndStorage(String jsonStr);
public List<SarStandProjectLibrary> queryProjectGroup(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
public List<SarStandProjectLibrary> queryProjects(@Param("sarStandProjectLibrary") SarStandProjectLibrary sarStandProjectLibrary);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+18
View File
@@ -128,6 +128,24 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
return head;
}
@Override
public List<SarStandProjectLibrary> queryProjectGroup(SarStandProjectLibrary sarStandProjectLibrary) {
return sarStandProjectLibraryDao.queryProjectGroup(sarStandProjectLibrary);
}
@Override
public List<SarStandProjectLibrary> queryProjects(SarStandProjectLibrary sarStandProjectLibrary) {
List<String> 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<SarStandProjectLibrary> queryMaintenanceProject(int current, int pageSize,
SarStandProjectLibraryDto sarDto) {
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+3 -1
View File
@@ -21,6 +21,7 @@
<result column="stand_sort" property="standSort" />
<result column="stand_year" property="standYear" />
<result column="text_status_buss" property="textStatusBuss" />
<result column="text_status_buss_show" property="textStatusBussShow"/>
</resultMap>
<resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand" >
@@ -748,12 +749,13 @@
<!-- 根据id查询 SAR_BUSSIONESS_STAND 的详细信息-->
<select id="selectStandardsInfoByKey" resultMap="BaseResultMap" parameterType="java.lang.String">
select <include refid="Base_Column_List_show" />
select <include refid="Base_Column_List_show" />,dictextstatus.DIC_TYPE_NAME as text_status_buss_show
from SAR_BUSSIONESS_STAND
left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0)
left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0)
left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
left join TS_DICTYPE dictextstatus ON ( dictextstatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandSort.dic_id IS NOT NULL and dictextstatus.valid_flag = 0)
left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id
left join TS_RESOURCE on SAR_BUSS_STAND_MENU.menu_id = TS_RESOURCE.id
where SAR_BUSSIONESS_STAND.id = #{id}
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml
+38
View File
@@ -368,4 +368,42 @@
#{item}
</foreach>
</select>
<select id="queryProjectGroup"
resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
select distinct sar_stand_project_library.project_group,sar_stand_project_library.management_host_name,sar_stand_project_library.category_name,sar_stand_project_library.development_host_name from sar_stand_project_library
where 1=1
<if test="sarStandProjectLibrary.managementHostName != null and sarStandProjectLibrary.managementHostName != ''">
and sar_stand_project_library.management_host_name=#{sarStandProjectLibrary.managementHostName}
</if>
<if test="sarStandProjectLibrary.developmentHostName != null and sarStandProjectLibrary.developmentHostName != ''">
and sar_stand_project_library.development_host_name=#{sarStandProjectLibrary.developmentHostName}
</if>
<if test="sarStandProjectLibrary.categoryName != null and sarStandProjectLibrary.categoryName != ''">
and sar_stand_project_library.category_name=#{sarStandProjectLibrary.categoryName}
</if>
</select>
<select id="queryProjects"
resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
select sar_stand_project_library.* , ts_user.UNAME as uName from sar_stand_project_library
left join ts_user on ts_user.USID = sar_stand_project_library.project_manager
where 1=1
<if test="sarStandProjectLibrary.managementHostName != null and sarStandProjectLibrary.managementHostName != ''">
and sar_stand_project_library.management_host_name=#{sarStandProjectLibrary.managementHostName}
</if>
<if test="sarStandProjectLibrary.developmentHostName != null and sarStandProjectLibrary.developmentHostName != ''">
and sar_stand_project_library.development_host_name=#{sarStandProjectLibrary.developmentHostName}
</if>
<if test="sarStandProjectLibrary.categoryName != null and sarStandProjectLibrary.categoryName != ''">
and sar_stand_project_library.category_name=#{sarStandProjectLibrary.categoryName}
</if>
<if test="sarStandProjectLibrary.projectStatus != null and sarStandProjectLibrary.projectStatus != ''">
and sar_stand_project_library.project_status=#{sarStandProjectLibrary.projectStatus}
</if>
<if test="null != groups and groups.size()>0">
and sar_stand_project_library.project_group in
<foreach collection="groups" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
</mapper>
adc-da-sys/src/main/java/com/adc/da/sys/controller/DicTypeEORestController.java
+4 -2
View File
@@ -340,8 +340,10 @@ public class DicTypeEORestController extends BaseController<DicTypeEO> {
@GetMapping("/getDicTypeListCode")
//@RequiresPermissions("sys:dicType:getDicTypeListCode")
public ResponseMessage<Map<String, Object>> getDicTypeListCode() throws Exception {
Map<String, Object> dicTypeEO = dicTypeEOService.getDicTypeListCode();
return Result.success(dicTypeEO);
return Result.success("1","hello");
// Map<String, Object> dicTypeEO = dicTypeEOService.getDicTypeListCode();
// return Result.success(dicTypeEO);
}
/**