diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index 388aba37..7e8446b5 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -19,6 +19,7 @@ public class ActDefineStartMap { map.put("3","standardCommentProcessWorkFlow"); map.put("4","standardregulatoryinventory"); + map.put("5","projectEvaluationProcess"); return map.get(type); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 54094522..30fd670d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -37,18 +37,18 @@ public class SarStandItemsController extends BaseController { @ApiOperation(value = "分解单查询") @GetMapping("/findAllItems") - public ResponseMessage findAllItems(@RequestParam(defaultValue = "1")int Page, @RequestParam(defaultValue = "10") int Size,String type,String ids){ + public ResponseMessage findAllItems( String type,String ids){ if (!StringUtils.isEmpty(ids) && ids.contains(",")){ String[] Sids=ids.split(","); - List ItemDto = ServiceImpl.findAllItems(Page,Size,type,Sids); + List ItemDto = ServiceImpl.findAllItems(type,Sids); return Result.success("200",ItemDto); }else if (!StringUtils.isEmpty(ids)){ String[] Sids=new String[1]; Sids[0]=ids; - List ItemDto = ServiceImpl.findAllItems(Page,Size,type,Sids); + List ItemDto = ServiceImpl.findAllItems(type,Sids); return Result.success("200",ItemDto); }else { - List ItemDto = ServiceImpl.findAllItems(Page,Size,type,null); + List ItemDto = ServiceImpl.findAllItems(type,null); return Result.success("200",ItemDto); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java index d2af513f..99539e9c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java @@ -53,5 +53,5 @@ public interface SarStandItemsDao extends BaseMapper { List selectAllItemsSvpps(SarStandItems sarStandItemsEO); - List selectAllItemsByIds(@Param("page") int Page, @Param("size") int Size,@Param("type") String type,@Param("ids") String[] ids); + List selectAllItemsByIds(@Param("type") String type,@Param("ids") String[] ids); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 3de73d3d..9f4c2df3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -58,7 +58,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl findAllItems(int Page,int Size,String type,String[] ids){ - return dao.selectAllItemsByIds((Page-1)*Size,Size*Page,type,ids); + public List findAllItems(String type,String[] ids){ + return dao.selectAllItemsByIds(type,ids); } } 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 39cb0fb4..3f4e51a5 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 @@ -7,6 +7,8 @@ import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto; import com.adc.da.slrs.sarStandProjectLibrary.entity.productLineDto; import com.adc.da.slrs.sarStandProjectLibrary.service.impl.SarStandProjectLibraryServiceImpl; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; @@ -84,7 +86,7 @@ public class SarStandProjectLibraryController extends BaseController - - LIMIT #{page} , #{size};