WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_20230912_Platform' into dev_20230912_Platform

Browse Source
This commit is contained in:
zyx.net
2023-09-20 13:44:08 +08:00
parent acee333cc8 a0a0fb8950
commit 6b910b34a4
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsInventoryPlatformEOController.java
+12 -3
View File
@@ -1,5 +1,7 @@
package com.jero.modules.project.controller; package com.jero.modules.project.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,6 +29,7 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@@ -96,14 +99,20 @@ public class LawsInventoryPlatformEOController extends JeroController<LawsInvent
/** /**
* 批量添加 * 批量添加
* *
* @param lawsInventoryPlatformEOList * @param json
* @return * @return
*/ */
@AutoLog(value = "车型项目库法规清单关联平台件表-批量添加") @AutoLog(value = "车型项目库法规清单关联平台件表-批量添加")
@ApiOperation(value="车型项目库法规清单关联平台件表-批量添加", notes="车型项目库法规清单关联平台件表-批量添加") @ApiOperation(value="车型项目库法规清单关联平台件表-批量添加", notes="车型项目库法规清单关联平台件表-批量添加")
@PostMapping(value = "/addBatch") @PostMapping(value = "/addBatch")
public Result<?> addBatch(@Validated @RequestBody List<LawsInventoryPlatformEO> lawsInventoryPlatformEOList) { public Result<?> addBatch(@Validated @RequestBody JSONObject json) {
lawsInventoryPlatformEOService.addBatch(lawsInventoryPlatformEOList); JSONArray dataList = json.getJSONArray("list");
List<LawsInventoryPlatformEO> lawsInventoryPlatformEOS = new ArrayList<>();
for (Object data : dataList) {
LawsInventoryPlatformEO inventoryPlatformEO = JSONObject.parseObject(JSONObject.toJSONString(data), LawsInventoryPlatformEO.class);
lawsInventoryPlatformEOS.add(inventoryPlatformEO);
}
lawsInventoryPlatformEOService.addBatch(lawsInventoryPlatformEOS);
return Result.OK("添加成功！"); return Result.OK("添加成功！");
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+1 -1
View File
@@ -1268,7 +1268,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
*/ */
@Override @Override
public List<Map<String,Object>> listPlatform(Map<String,Object> params) { public List<Map<String,Object>> listPlatform(Map<String,Object> params) {
String cut = (String) params.get("cut");//法规清单id String cut = (String) params.get("cut");//
String ids = (String) params.get("ids");//法规清单id String ids = (String) params.get("ids");//法规清单id
String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件项目id String projectLibraryIds = (String) params.get("projectLibraryIds");//平台件项目id