Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.算法bug修改，部分占比*100，计算展示

Browse Source 
2.pmsbug解决
3.增加根据字典类型code和字典数据code接口
This commit is contained in:
wr
2024-02-26 18:08:09 +08:00
parent 5577757d2e
commit c682b7f198
34 changed files with 244 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java
View File

@@ -176,6 +176,18 @@ public class DictDataController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@GetMapping("/getDicDataByCodeAndType")
@ApiOperation("根据字典Code和字典类型查询字典数据")
@ApiImplicitParams({
@ApiImplicitParam(name = "dicDataCode", value = "查询参数", required = true),
@ApiImplicitParam(name = "dicTypeCode", value = "查询参数", required = true)
})
public HttpResult<DictData> getDicDataByCodeAndType(@RequestParam("dicDataCode") String dicCode,@RequestParam("dicTypeCode") String typeCode) {
String methodDescribe = getMethodDescribe("getDicDataByCodeAndType");
DictData result = dictDataService.getDicDataByCodeAndType(dicCode,typeCode);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@GetMapping("/getDicDataByCode")
@ApiOperation("根据字典code查询字典数据")

2
pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DictDataMapper.java
View File

@@ -39,6 +39,8 @@ public interface DictDataMapper extends BaseMapper<DictData> {
DictData getDicDataByNameAndType(@Param("dicName") String dicName, @Param("typeName") String typeName);
DictData getDicDataByCodeAndType(@Param("dicCode") String dicCode, @Param("typeCode") String typeCode);
DictData getDicDataByCode(@Param("code") String code);
/**

9
pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml
View File

@@ -75,4 +75,13 @@
and sys_dict_data.state = 1
order by sort
</select>
<select id="getDicDataByCodeAndType" resultType="com.njcn.system.pojo.po.DictData">
SELECT sys_dict_data.*
FROM sys_dict_data sys_dict_data
LEFT JOIN sys_dict_type sdt ON sdt.Id = sys_dict_data.Type_Id
WHERE sys_dict_data.code = #{dicCode}
and sys_dict_data.state = 1
and sdt.`code`= #{typeCode}
order by sys_dict_data.sort
</select>
</mapper>

6
pqs-system/system-boot/src/main/java/com/njcn/system/service/IDictDataService.java
View File

@@ -90,6 +90,12 @@ public interface IDictDataService extends IService<DictData> {
*/
DictData getDicDataByNameAndType(String dicName,String typeName);
/**
*
* @param dicCode 字典Code,类型名称
* @return 根据字典Code查询字典数据
*/
DictData getDicDataByCodeAndType(String dicCode,String typeCode);
/**
*
* @param code 字典code

5
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DictDataServiceImpl.java
View File

@@ -149,6 +149,11 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
return this.baseMapper.getDicDataByNameAndType(dicName,typeName);
}
@Override
public DictData getDicDataByCodeAndType(String dicCode, String typeCode) {
return this.baseMapper.getDicDataByCodeAndType(dicCode,typeCode);
}
@Override
public DictData getDicDataByCode(String code) {
return this.baseMapper.getDicDataByCode(code);