bonus
/
smart-bid-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工器具库修改

This commit is contained in:
cwchen 2025-10-31 14:16:31 +08:00
parent af7d7d61bf
commit a39fd4c68a
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-admin/src/main/java/com/bonus/web/controller/enterprise/ToolController.java
View File

@ -32,7 +32,7 @@ public class ToolController extends BaseController {
@ApiOperation(value = "工器具库", notes = "查询数据列表")
@GetMapping("getList")
@SysLog(title = "工器具库", module = "企业知识库->工器具库->查询数据列表", businessType = OperaType.QUERY, details = "查询数据列表", logType = 1)
@RequiresPermissions("enterpriseLibrary:technical:list")
@RequiresPermissions("enterpriseLibrary:tool:list")
public TableDataInfo getList(ToolDto dto) {
startPage();
List<ToolVo> list = toolService.getList(dto);
@ -64,10 +64,10 @@ public class ToolController extends BaseController {
}
@ApiOperation(value = "工器具库", notes = "工器具详情")
@PostMapping("detailData")
@GetMapping("detailData")
@SysLog(title = "工器具库", module = "企业知识库->工器具库->工器具详情", businessType = OperaType.QUERY, details = "工器具详情", logType = 1)
@RequiresPermissions("enterpriseLibrary:tool:detail")
public AjaxResult detailData(@RequestBody ToolDto dto) {
public AjaxResult detailData(ToolDto dto) {
return toolService.detailData(dto);
}
}

5
bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/impl/MDTechnicalService.java
View File

@ -31,6 +31,7 @@ public class MDTechnicalService implements IMDTechnicalService {
try {
return imdTechnicalMapper.getTypeList(dto);
} catch (Exception e) {
log.error(e.toString(),e);
return Collections.emptyList();
}
}
@ -40,6 +41,7 @@ public class MDTechnicalService implements IMDTechnicalService {
try {
return imdTechnicalMapper.isRepeat(dto);
} catch (Exception e) {
log.error(e.toString(),e);
return 0;
}
}
@ -54,6 +56,7 @@ public class MDTechnicalService implements IMDTechnicalService {
try {
return imdTechnicalMapper.hasChildData(dto);
} catch (Exception e) {
log.error(e.toString(),e);
return 0;
}
}
@ -63,6 +66,7 @@ public class MDTechnicalService implements IMDTechnicalService {
try {
return imdTechnicalMapper.getList(dto);
} catch (Exception e) {
log.error(e.toString(),e);
return Collections.emptyList();
}
}
@ -77,6 +81,7 @@ public class MDTechnicalService implements IMDTechnicalService {
try {
return Optional.ofNullable(imdTechnicalMapper.getDetailData(dto)).orElse(new TechnicalVo.Technical());
} catch (Exception e) {
log.error(e.toString(),e);
return new TechnicalVo.Technical();
}
}

2
bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/impl/MDToolServiceImpl.java
View File

@ -32,6 +32,7 @@ public class MDToolServiceImpl implements IMDToolService {
try {
return imdToolMapper.getList(dto);
} catch (Exception e) {
log.error(e.toString(),e);
return Collections.emptyList();
}
}
@ -46,6 +47,7 @@ public class MDToolServiceImpl implements IMDToolService {
try {
return Optional.ofNullable(imdToolMapper.isRepeat(dto)).orElse(0);
} catch (Exception e) {
log.error(e.toString(),e);
return 0;
}
}

17
bonus-mainDatabase/src/main/resources/mapper/TechnicalMapper.xml
View File

@ -48,7 +48,8 @@
create_user_id,
create_user_name,
update_user_id,
update_user_name
update_user_name,
technical_solution_state
)
VALUES
<foreach collection="list" item="item" separator=",">
@ -62,7 +63,8 @@
#{item.createUserId},
#{item.createUserName},
#{item.updateUserId},
#{item.updateUserName}
#{item.updateUserName},
#{item.technicalSolutionState}
)
</foreach>
</if>
@ -137,7 +139,16 @@
LEFT JOIN sys_dict_data sdd4 ON FIND_IN_SET(sdd4.dict_value, tets.nature_construction) AND sdd4.dict_type = 'construction_nature'
<where>
<if test="technicalName!=null and technicalName!=''">
AND INSTR(tets.technical_name,#{technicalName}) > 0
INSTR(tets.technical_name,#{technicalName}) > 0
</if>
<if test="natureConstruction!=null and natureConstruction!=''">
AND tets.nature_construction = #{natureConstruction}
</if>
<if test="structuralForm!=null and structuralForm!=''">
AND tets.structural_form = #{structuralForm}
</if>
<if test="basicForm!=null and basicForm!=''">
AND tets.basic_form = #{basicForm}
</if>
AND tets.technical_solution_type_id = #{technicalSolutionTypeId}
AND tets.del_flag = '0'