新增档案修改查询数据接口

@@ -11,8 +11,7 @@ import java.util.List;
 public class SysCodeUtil {
     @Autowired
     private SysCodeMapper sysCodeMapper;
-    @Autowired
-    private SysCodeConverter  converter;
+
     /**
      * 编号生成规则
      * @param sysCodeVO
@@ -23,16 +22,22 @@ public class SysCodeUtil {
         SysCodeDO sysCodeDO=queryInfoByCondition(sysCodeVO);
         String  taskvalue="";
         if(sysCodeDO!=null){
+            String lastString=sysCodeDO.getTaskvalue().substring(sysCodeDO.getTaskvalue().length()-Integer.valueOf(sysCodeDO.getTaskchild()));
+            String firstString=sysCodeDO.getTaskvalue().substring(0,(sysCodeDO.getTaskvalue().length()-Integer.valueOf(sysCodeDO.getTaskchild())));
             //2、如果存在在修改编号值
-            taskvalue=Integer.valueOf(sysCodeDO.getTaskvalue())+1+"";
+            taskvalue=firstString+Integer.valueOf(lastString)+1;
             sysCodeDO.setTaskvalue(taskvalue);
             sysCodeMapper.updateById(sysCodeDO);
         }else {
             //3、不存在则新增
+            SysCodeDO sysCodeDO1=new SysCodeDO();
+            sysCodeDO1.setCtype(sysCodeVO.getCtype());
+            sysCodeDO1.setState("1");
+            sysCodeDO1.setTaskno(sysCodeVO.getTaskno());
+            sysCodeDO1.setTaskname(sysCodeVO.getTaskname());
             taskvalue= getTaskValue(Integer.valueOf(sysCodeVO.getTaskchild()));
-           sysCodeVO.setTaskvalue(taskvalue);
-           sysCodeVO.setTaskname("自动生成序列号");
-           SysCodeDO sysCodeDO1=converter.addRequest2DO(sysCodeVO);
+            sysCodeDO1.setTaskvalue(sysCodeVO.getTaskno()+taskvalue);
+            sysCodeDO1.setTaskchild(sysCodeVO.getTaskchild()+"");
            sysCodeMapper.insert(sysCodeDO1);
         }
         return taskvalue;

@@ -40,5 +40,5 @@ public class SysCodeVO implements Serializable {
      * 任务子类
      */
     @ApiModelProperty(name = "taskchild", value = "任务子类")
-    private String taskchild;
+    private Integer taskchild;
 }

@@ -7,6 +7,7 @@ import java.util.List;
 
 import com.pashanhoo.bdcdy.entity.vo.AddDgBdcdyRequest;
 import com.pashanhoo.business.entity.vo.AddDgBusinessRequest;
+import com.pashanhoo.catalog.entity.vo.AddDgArchivesCatalogRequest;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -119,8 +120,20 @@ public class AddDgReceiveRequest implements Serializable {
     /**
      * 不动产单元信息
      */
-    @ApiModelProperty(name = "businessRequest", value = "推送业务信息")
+    @ApiModelProperty(name = "businessRequest", value = "推送不动产单元信息")
     private List<AddDgBdcdyRequest> bdcdyRequestList;
+    /**
+     * 目录信息列表
+     */
+    @ApiModelProperty(name = "catalogRequests", value = "推送目录信息列表")
+    private List<AddDgArchivesCatalogRequest> catalogRequests;
+    /**
+     * 文件访问地址列表
+     */
+    @ApiModelProperty(name = "fileList", value = "文件访问地址列表")
+    private List<String> fileList;
+
+
 
 
 }