新增sop元数据增删改

sop-business/src/main/java/com/qmth/sop/business/activiti/service/impl/ActivitiServiceImpl.java

@@ -137,9 +137,7 @@ public class ActivitiServiceImpl implements ActivitiService {
         DeploymentBuilder builder = repositoryService.createDeployment();
         ZipInputStream zip = new ZipInputStream(file.getInputStream());
         builder.addZipInputStream(zip);
-        Map<String, Object> mapData = formPropertiesGet(builder.deploy().getId(), null, null, true);
-        map.put(file.getName(), mapData);
-        return map;
+        return formPropertiesGet(builder.deploy().getId(), null, null, true);
     }
 
     /**

sop-business/src/main/java/com/qmth/sop/business/service/impl/TDFormWidgetMetadataServiceImpl.java

@@ -17,7 +17,6 @@ import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -75,13 +74,7 @@ public class TDFormWidgetMetadataServiceImpl extends ServiceImpl<TDFormWidgetMet
      */
     @Override
     public List<TDFormWidgetMetadata> selectAll(TFCustomTypeEnum type, Integer version) {
-        QueryWrapper<TDFormWidgetMetadata> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(TDFormWidgetMetadata::getType, type);
-        if (Objects.nonNull(version)) {
-            queryWrapper.lambda().eq(TDFormWidgetMetadata::getVersion, version);
-        }
-        queryWrapper.lambda().orderByAsc(TDFormWidgetMetadata::getSetup);
-        return this.list(queryWrapper);
+        return this.list(new QueryWrapper<TDFormWidgetMetadata>().lambda().eq(TDFormWidgetMetadata::getType, type).eq(TDFormWidgetMetadata::getVersion, version).orderByAsc(TDFormWidgetMetadata::getSetup));
     }
 
     /**

sop-server/src/main/java/com/qmth/sop/server/api/TBSopInfoController.java

@@ -37,7 +37,7 @@ public class TBSopInfoController {
     @RequestMapping(value = "/metadata/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = TDFormWidgetMetadata.class)})
     public Result list(@ApiParam(value = "sop流程类型", required = true) @RequestParam TFCustomTypeEnum type,
-                       @ApiParam(value = "sop流程版本") @RequestParam(required = false) Integer version) {
+                       @ApiParam(value = "sop流程版本", required = true) @RequestParam Integer version) {
         return ResultUtil.ok(tdFormWidgetMetadataService.selectAll(type, version));
     }