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

src/main/java/com/xjrsoft/module/material/controller/MaterialTaskController.java

@@ -154,10 +154,9 @@ public class MaterialTaskController {
     @PostMapping
     @ApiOperation(value = "新增材料提交任务")
     @SaCheckPermission("materialtask:add")
-    public RT<Boolean> add(@Valid @RequestBody AddMaterialTaskDto dto) {
+    public RT<Long> add(@Valid @RequestBody AddMaterialTaskDto dto) {
         MaterialTask materialTask = BeanUtil.toBean(dto, MaterialTask.class);
-        boolean isSuccess = materialTaskService.add(materialTask);
-        return RT.ok(isSuccess);
+        return RT.ok(materialTaskService.add(materialTask));
     }
 
     @PutMapping

src/main/java/com/xjrsoft/module/material/service/IMaterialTaskService.java

@@ -21,7 +21,7 @@ public interface IMaterialTaskService extends MPJBaseService<MaterialTask> {
     * @param materialTask
     * @return
     */
-    Boolean add(MaterialTask materialTask);
+    Long add(MaterialTask materialTask);
 
     /**
     * 更新

src/main/java/com/xjrsoft/module/material/service/impl/MaterialTaskServiceImpl.java

@@ -39,7 +39,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean add(MaterialTask materialTask) {
+    public Long add(MaterialTask materialTask) {
         materialTaskMaterialTaskMapper.insert(materialTask);
         if (materialTask.getMaterialTaskAssignList() != null && materialTask.getMaterialTaskAssignList().size() > 0) {
             for (MaterialTaskAssign materialTaskAssign : materialTask.getMaterialTaskAssignList()) {
@@ -52,7 +52,7 @@ public class MaterialTaskServiceImpl extends MPJBaseServiceImpl<MaterialTaskMapp
             materialTaskMaterialTaskAppendixMapper.insert(materialTaskAppendix);
         }
 
-        return true;
+        return materialTask.getId();
     }
 
     @Override