批量归档

src/main/java/com/jeeplus/common/bos/BosController.java

@@ -35,6 +35,9 @@ public class BosController {
                 BOSClientUtil bosClientUtil = new BOSClientUtil();
                 InputStream inputStream = file.getInputStream();
                 String upload = bosClientUtil.upload(path, inputStream);
+                if(srcFile.exists()){
+                    srcFile.delete();
+                }
                 map.put("msg","上传成功");
                 map.put("code","1");
                 map.put("url",upload);
@@ -50,6 +53,9 @@ public class BosController {
                 SftpClientUtil fileUploadUtil = new SftpClientUtil();
                 String uploadPath = "/" + storeAs + datePath();
                 String uploadFile = fileUploadUtil.uploadFile(uploadPath, srcFile, srcFile.getName());
+                if(srcFile.exists()){
+                    srcFile.delete();
+                }
                 map.put("msg","上传成功");
                 map.put("code","1");
                 map.put("url","/a/workfullmanage/workFullManage/downLoadAttach?file=" + uploadFile);

src/main/java/com/jeeplus/common/utils/MenuStatusEnum.java

@@ -74,6 +74,7 @@ public enum MenuStatusEnum {
     WORK_SALARYITEM("608b03d7c081465789be7f80993b4869","工资项"),
     WORK_WAGE("2215996d069d435ea3a673e0ae2beb3a","单笔工资项"),
     WORK_CONTRACT_LIST_INFO("4650ceada41d46b382dc81f8980fda66","合同明细一览表"),
+    FILING_BATCH ("e7ac5a36777e4dbfb1ca9fec1d2f5d1b","批量归档"),
     END("19940722131313","废弃");
 
     private String value;

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -161,6 +161,8 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String boxNum; //案卷号
 	private String reBoxNum;//确认案卷号
 	private String information; //归档批次信息
+	private String url; //链接
+	private String parentId; //父借点
 
 	private List<String> civilProjectList = Lists.newArrayList();
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
@@ -1104,4 +1106,20 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setFileNumTow(String fileNumTow) {
 		this.fileNumTow = fileNumTow;
 	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getParentId() {
+		return parentId;
+	}
+
+	public void setParentId(String parentId) {
+		this.parentId = parentId;
+	}
 }

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -1785,7 +1785,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	public Page<RuralProjectRecords> projectFind(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords) {
 		//设置数据权限
 		if(!UserUtils.getUser().isAdmin()) {
-			String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
+			String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.FILING_BATCH.getValue());
 			projectRecords.getSqlMap().put("dsf", dataScopeSql);
 		}
 		projectRecords.setCreateBy(UserUtils.getUser());

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -68,10 +68,7 @@ import com.jeeplus.modules.ruralprojectrecords.service.*;
 import com.jeeplus.modules.serialnum.service.SerialNumTplService;
 import com.jeeplus.modules.sys.dao.RoleDao;
 import com.jeeplus.modules.sys.entity.*;
-import com.jeeplus.modules.sys.service.CompanyService;
-import com.jeeplus.modules.sys.service.OfficeService;
-import com.jeeplus.modules.sys.service.RoleService;
-import com.jeeplus.modules.sys.service.UserService;
+import com.jeeplus.modules.sys.service.*;
 import com.jeeplus.modules.sys.utils.DictUtils;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.sysuseroffice.entity.Useroffice;
@@ -465,6 +462,8 @@ public class WorkProjectNotifyController extends BaseController {
 	private ProjectFilingBatchService projectFilingBatchService;
 	@Autowired
 	private ProjectFilingbatchRelationDao projectFilingbatchRelationDao;
+	@Autowired
+	private WorkattachmentService workattachmentService;
 
 	@ModelAttribute
 	public WorkProjectNotify get(@RequestParam(required=false) String id) {
@@ -2739,7 +2738,28 @@ public class WorkProjectNotifyController extends BaseController {
 						RuralProjectRecords ruralProjectRecords = ruralProjectRecordsService.get(filingBatch.getProjectId());
 						ruralProjectRecords.setProjectReportNumber(filingBatch.getNumber());
 						ruralProjectRecords.setId(filingBatch.getRelationId());
+						ruralProjectRecords.setParentId("0");
 						ruralProjectRecordsList.add(ruralProjectRecords);
+						//获取子项目信息
+						Workattachment workattachmentInfo = new Workattachment();
+						workattachmentInfo.setAttachmentId(filingBatch.getProjectId());
+						workattachmentInfo.setDivIdType("_filingBatch");
+						//查询对应子项目数据
+						List<Workattachment> attachmentList = workattachmentService.findList(workattachmentInfo);
+						for (Workattachment attachment:attachmentList) {
+							//查询附件信息
+							RuralProjectRecords workattachment = new RuralProjectRecords();
+							//附件文件类型
+							workattachment.setProjectId(attachment.getRemarks());
+							//附件文件名称
+							workattachment.setProjectReportNumber(attachment.getAttachmentName());
+							//文件路径
+							workattachment.setUrl(attachment.getUrl());
+							//项目名称
+							workattachment.setFilingName("");
+							workattachment.setParentId(ruralProjectRecords.getId());
+							ruralProjectRecordsList.add(workattachment);
+						}
 					}
 					List<ProjectFilingbatchRelation> projectFilingbatchRelations=projectFilingbatchRelationDao.getProjectRelation(projectFilingBatch.getId());
 					projectFilingBatch.setProjectFilingbatchRelations(projectFilingbatchRelations);