jiezhoufg/yc_fdjyfluru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

审批+待办交互修改版本3.3(零部件树新增TC)

Browse Source
This commit is contained in:
ys.git 2025-12-26 11:18:56 +08:00
parent 6594fdcf1a
commit 47f5e9df7f
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/xdap/self_development/controller/EngineParamDetailController.java
View File

@ -33,8 +33,8 @@ public class EngineParamDetailController {
//参数列表查询 //参数列表查询
@GetMapping("/selectParamList") @GetMapping("/selectParamList")
public Response selectParamList(@RequestParam(value = "modelID", required = false) String modelID) { public Response selectParamList(@RequestParam(value = "modelID", required = false) String modelID,@RequestParam(value = "tcData", required = false) String tcData) {
Map<String, List<String>> list = engineParamDetailService.selectParamList(modelID); Map<String, List<String>> list = engineParamDetailService.selectParamList(modelID,tcData);
return Response.ok().data(list); return Response.ok().data(list);
} }
//参数列表查询 //参数列表查询

2
src/main/java/com/xdap/self_development/service/EngineParamDetailService.java
View File

@ -23,7 +23,7 @@ import java.util.Map;
public interface EngineParamDetailService { public interface EngineParamDetailService {
HashMap<String, List<String>> selectParamList(String modelID); HashMap<String, List<String>> selectParamList(String modelID,String tcData);
void excelImport(MultipartFile file,String modelId); void excelImport(MultipartFile file,String modelId);

12
src/main/java/com/xdap/self_development/service/impl/EngineParamDetailServiceImpl.java
View File

@ -78,8 +78,13 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
* @return * @return
*/ */
@Override @Override
public HashMap<String, List<String>> selectParamList(String modelID) { public HashMap<String, List<String>> selectParamList(String modelID, String tcData) {
List<Parameter> parameters = selectAllByNewVersion(); List<Parameter> parameters = new ArrayList<>();
if (ObjectUtils.isNotEmpty(tcData) && "tc".equals(tcData)) {
parameters = selectAllAndTcByNewVersion();
} else {
parameters = selectAllByNewVersion();
}
List<Template> templates = List<Template> templates =
sw.buildFromDatasource("xdap_app_223770822127386625") sw.buildFromDatasource("xdap_app_223770822127386625")
@ -175,7 +180,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
HashMap<String, HashMap<String, List<String>>> map = new HashMap<>(); HashMap<String, HashMap<String, List<String>>> map = new HashMap<>();
DataEntryEngineModelPojo dataEntryEngineModelPojo = dataEntryEngineModelService.selectBymodelId(modelID); DataEntryEngineModelPojo dataEntryEngineModelPojo = dataEntryEngineModelService.selectBymodelId(modelID);
String s = dataEntryEngineModelPojo.getProductNumber(); String s = dataEntryEngineModelPojo.getProductNumber();
HashMap<String, List<String>> stringListMap = selectParamList(modelID); HashMap<String, List<String>> stringListMap = selectParamList(modelID,null);
map.put(s, stringListMap); map.put(s, stringListMap);
return map; return map;
} }
@ -616,6 +621,7 @@ public class EngineParamDetailServiceImpl implements EngineParamDetailService {
public void batchInsertTodoTask(List<TodoTaskPojo> todoTaskPojos) { public void batchInsertTodoTask(List<TodoTaskPojo> todoTaskPojos) {
sw.buildFromDatasource("xdap_app_223770822127386625").doBatchInsert(todoTaskPojos); sw.buildFromDatasource("xdap_app_223770822127386625").doBatchInsert(todoTaskPojos);
} }
@Transactional(rollbackFor = Exception.class) // 发生任何异常都回滚 @Transactional(rollbackFor = Exception.class) // 发生任何异常都回滚
public void batchInsertInitiatedTask(List<InitiatedTaskPojo> taskPojos) { public void batchInsertInitiatedTask(List<InitiatedTaskPojo> taskPojos) {
sw.buildFromDatasource("xdap_app_223770822127386625").doBatchInsert(taskPojos); sw.buildFromDatasource("xdap_app_223770822127386625").doBatchInsert(taskPojos);