标准 发布搞

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);
     }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java

@@ -37,18 +37,18 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
 
     @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<SarStandItemsDto> ItemDto = ServiceImpl.findAllItems(Page,Size,type,Sids);
+            List<SarStandItemsDto> ItemDto = ServiceImpl.findAllItems(type,Sids);
             return Result.success("200",ItemDto);
         }else if (!StringUtils.isEmpty(ids)){
             String[] Sids=new String[1];
             Sids[0]=ids;
-            List<SarStandItemsDto> ItemDto = ServiceImpl.findAllItems(Page,Size,type,Sids);
+            List<SarStandItemsDto> ItemDto = ServiceImpl.findAllItems(type,Sids);
             return Result.success("200",ItemDto);
         }else {
-            List<SarStandItemsDto> ItemDto = ServiceImpl.findAllItems(Page,Size,type,null);
+            List<SarStandItemsDto> ItemDto = ServiceImpl.findAllItems(type,null);
             return Result.success("200",ItemDto);
         }
     }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java

@@ -53,5 +53,5 @@ public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
 
     List<SelectionResult> selectAllItemsSvpps(SarStandItems sarStandItemsEO);
 
-    List<SarStandItemsDto> selectAllItemsByIds(@Param("page") int Page, @Param("size") int Size,@Param("type") String type,@Param("ids") String[] ids);
+    List<SarStandItemsDto> selectAllItemsByIds(@Param("type") String type,@Param("ids") String[] ids);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java

@@ -58,7 +58,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
         return actitemsEOList;
     }
 
-    public List<SarStandItemsDto> findAllItems(int Page,int Size,String type,String[] ids){
+    public List<SarStandItemsDto> findAllItems(String type,String[] ids){
-        return dao.selectAllItemsByIds((Page-1)*Size,Size*Page,type,ids);
+        return dao.selectAllItemsByIds(type,ids);
     }
 }

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<SarStandPro
             p.setSarStandProjectLibraries(list2);
             listTemp.add(p);
         }
-        System.out.println(listTemp);
+        System.out.println(JSONObject.toJSON(listTemp));
 
         return Result.success("200",listTemp);
     }

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

@@ -653,8 +653,6 @@
             #{item}
         </foreach>
         </if>
-
-        LIMIT #{page} , #{size};
     </select>