diff --git a/project/src/main/java/com/sdm/project/controller/SimulationDemandController.java b/project/src/main/java/com/sdm/project/controller/SimulationDemandController.java index 1182d821..c91e7122 100644 --- a/project/src/main/java/com/sdm/project/controller/SimulationDemandController.java +++ b/project/src/main/java/com/sdm/project/controller/SimulationDemandController.java @@ -128,13 +128,12 @@ public class SimulationDemandController { /** * 给 MES系统使用 查询是否开模件的待办列表 - * @param req * @return */ @GetMapping("/queryTodoList") @Operation(summary = "条件查询待办(需求)列表", description = "条件查询待办(需求)列表") - public SdmResponse queryTodoList(@RequestBody DemandQryReq req) { - return demandService.queryTodoList(req); + public SdmResponse queryTodoList(@RequestParam String isMoldMaking) { + return demandService.queryTodoList(isMoldMaking); } /** diff --git a/project/src/main/java/com/sdm/project/dao/SimulationDemandMapper.java b/project/src/main/java/com/sdm/project/dao/SimulationDemandMapper.java index dab862ce..3108ab47 100644 --- a/project/src/main/java/com/sdm/project/dao/SimulationDemandMapper.java +++ b/project/src/main/java/com/sdm/project/dao/SimulationDemandMapper.java @@ -45,7 +45,7 @@ public interface SimulationDemandMapper extends BaseMapper { Set getAllCodeList(); - List getDemandListWithCondition(@Param("req") DemandQryReq req); + List getDemandListWithCondition(@Param("isMoldMaking") String isMoldMaking); List getDemandListByProjectId(@Param("nodeId") String nodeId); diff --git a/project/src/main/java/com/sdm/project/model/req/DemandQryReq.java b/project/src/main/java/com/sdm/project/model/req/DemandQryReq.java index 8f756284..80ebd8fa 100644 --- a/project/src/main/java/com/sdm/project/model/req/DemandQryReq.java +++ b/project/src/main/java/com/sdm/project/model/req/DemandQryReq.java @@ -8,8 +8,5 @@ public class DemandQryReq { * 是否开模件 Y/N */ private String isMoldMaking; - /** - * 物料号 - */ - private String materialNo; + } diff --git a/project/src/main/java/com/sdm/project/model/vo/SpdmDemandVo.java b/project/src/main/java/com/sdm/project/model/vo/SpdmDemandVo.java index e5d78274..3d76a0e0 100644 --- a/project/src/main/java/com/sdm/project/model/vo/SpdmDemandVo.java +++ b/project/src/main/java/com/sdm/project/model/vo/SpdmDemandVo.java @@ -178,6 +178,10 @@ public class SpdmDemandVo extends BaseEntity { * 物料号 */ private String materialNo; + /** + * 是否开模件 + */ + private String isMoldMaking; /** * 需求附件id列表 */ diff --git a/project/src/main/java/com/sdm/project/service/IDemandService.java b/project/src/main/java/com/sdm/project/service/IDemandService.java index 16459390..a95471fc 100644 --- a/project/src/main/java/com/sdm/project/service/IDemandService.java +++ b/project/src/main/java/com/sdm/project/service/IDemandService.java @@ -45,7 +45,7 @@ public interface IDemandService { SdmResponse>> queryDemandFiles(QueryDirReq req); - SdmResponse queryTodoList(DemandQryReq req); + SdmResponse queryTodoList(String isMoldMaking); SdmResponse addDemandNoPermission(SpdmAddDemandReq req); diff --git a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java index e2dd5772..3c2024d0 100644 --- a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java @@ -1250,8 +1250,8 @@ public class DemandServiceImpl extends BaseService implements IDemandService { } @Override - public SdmResponse queryTodoList(DemandQryReq req) { - List demandVoList = mapper.getDemandListWithCondition(req); + public SdmResponse queryTodoList(String isMoldMaking) { + List demandVoList = mapper.getDemandListWithCondition(isMoldMaking); if (CollectionUtils.isNotEmpty(demandVoList)) { for (SpdmDemandVo demandVo : demandVoList) { QueryDirReq dirReq = new QueryDirReq(); diff --git a/project/src/main/resources/mapper/SimulationDemandMapper.xml b/project/src/main/resources/mapper/SimulationDemandMapper.xml index 8774c7fa..e40ad44e 100644 --- a/project/src/main/resources/mapper/SimulationDemandMapper.xml +++ b/project/src/main/resources/mapper/SimulationDemandMapper.xml @@ -187,13 +187,14 @@