外部单位-附件存放位置调整

src/main/java/com/jeeplus/modules/externalUnit/entity/ExternalUnitCapitalDemand.java

@@ -18,7 +18,7 @@ public class ExternalUnitCapitalDemand extends ActEntity<ExternalUnitCapitalDema
     private String status; //状态
     private String remarks; //备注
     private String examiner; //审核人
-    private List<WorkClientAttachment> workAttachments; //文件管理
+    private List<ExternalUnitWorkClientAttachment> workAttachments; //文件管理
     private ExternalUnitProjectRecords project;
     private List<User> projectMembers;
 
@@ -116,11 +116,11 @@ public class ExternalUnitCapitalDemand extends ActEntity<ExternalUnitCapitalDema
         this.project = project;
     }
 
-    public List<WorkClientAttachment> getWorkAttachments() {
+    public List<ExternalUnitWorkClientAttachment> getWorkAttachments() {
         return workAttachments;
     }
 
-    public void setWorkAttachments(List<WorkClientAttachment> workAttachments) {
+    public void setWorkAttachments(List<ExternalUnitWorkClientAttachment> workAttachments) {
         this.workAttachments = workAttachments;
     }
 

src/main/java/com/jeeplus/modules/externalUnit/entity/ExternalUnitFeedback.java

@@ -15,7 +15,7 @@ public class ExternalUnitFeedback extends ActEntity<ExternalUnitFeedback> {
     private String remarks; //备注
     private String examiner; //审核人
     private String applyView; //审核意见
-    private List<WorkClientAttachment> workAttachments; //文件管理
+    private List<ExternalUnitWorkClientAttachment> workAttachments; //文件管理
 
     private ExternalUnitProjectRecords project;
     private String officeId;
@@ -94,11 +94,11 @@ public class ExternalUnitFeedback extends ActEntity<ExternalUnitFeedback> {
         this.office = office;
     }
 
-    public List<WorkClientAttachment> getWorkAttachments() {
+    public List<ExternalUnitWorkClientAttachment> getWorkAttachments() {
         return workAttachments;
     }
 
-    public void setWorkAttachments(List<WorkClientAttachment> workAttachments) {
+    public void setWorkAttachments(List<ExternalUnitWorkClientAttachment> workAttachments) {
         this.workAttachments = workAttachments;
     }
 

src/main/java/com/jeeplus/modules/externalUnit/entity/ExternalUnitProjectRecords.java

@@ -38,7 +38,7 @@ public class ExternalUnitProjectRecords extends DataEntity<ExternalUnitProjectRe
 
     private String isProjectMember;
 
-    private List<WorkClientAttachment> workAttachments; //文件管理
+    private List<ExternalUnitWorkClientAttachment> workAttachments; //文件管理
     private List<ExternalUnitCapitalDemand> capitalDemandList; //提资需求
     private List<ExternalUnitFeedback> feedbackList; //意见反馈
 
@@ -93,11 +93,11 @@ public class ExternalUnitProjectRecords extends DataEntity<ExternalUnitProjectRe
         this.fileEndDate = fileEndDate;
     }
 
-    public List<WorkClientAttachment> getWorkAttachments() {
+    public List<ExternalUnitWorkClientAttachment> getWorkAttachments() {
         return workAttachments;
     }
 
-    public void setWorkAttachments(List<WorkClientAttachment> workAttachments) {
+    public void setWorkAttachments(List<ExternalUnitWorkClientAttachment> workAttachments) {
         this.workAttachments = workAttachments;
     }
 

src/main/java/com/jeeplus/modules/externalUnit/entity/ExternalUnitWorkClientAttachment.java

@@ -0,0 +1,215 @@
+/**
+ * Copyright &copy; 2015-2020 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.modules.externalUnit.entity;
+
+
+import com.jeeplus.common.persistence.DataEntity;
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 添加附件Entity
+ * @author mapengbo
+ * @version 2017-10-12
+ */
+public class ExternalUnitWorkClientAttachment extends DataEntity<ExternalUnitWorkClientAttachment> {
+
+	private static final long serialVersionUID = 1L;
+	private String url;		// 附件地址
+	private String type;		// 附件类型
+	private String attachmentUser;		// 上传人
+	private String attachmentUserName;		// 上传人
+	private String attachmentName;		// 文件名
+	private String attachmentId; //外联 客户编号
+	private List<String> attachmentIdList; //外联 客户编号
+	private String attachmentFlag; //附件类别
+	private String companyId; //附件类别
+	private String projectId; //项目id
+	private String temporaryUrl;		// 附件地址(临时地址)
+	private String collectFlag;		// 收藏判定
+	private String fileSize;	//文件大小
+	private String fileSizeFlag;	//文件大小(已处理状态)
+	private String createName;	//创建人
+	private String sort;	//排序
+	private String description;	//说明
+	private String divIdType;//判定条件
+
+	private Date beginDate;
+	private Date endDate;
+
+	public String getAttachmentUserName() {
+		return attachmentUserName;
+	}
+
+	public void setAttachmentUserName(String attachmentUserName) {
+		this.attachmentUserName = attachmentUserName;
+	}
+
+	public Date getBeginDate() {
+		return beginDate;
+	}
+
+	public void setBeginDate(Date beginDate) {
+		this.beginDate = beginDate;
+	}
+
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+
+	public ExternalUnitWorkClientAttachment() {
+		super();
+	}
+
+	public ExternalUnitWorkClientAttachment(String id){
+		super(id);
+	}
+
+	@ExcelField(title="附件地址", align=2, sort=7)
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	@ExcelField(title="附件类型", align=2, sort=8)
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	@ExcelField(title="上传人", align=2, sort=10)
+	public String getAttachmentUser() {
+		return attachmentUser;
+	}
+
+	public void setAttachmentUser(String attachmentUser) {
+		this.attachmentUser = attachmentUser;
+	}
+
+	@ExcelField(title="文件名", align=2, sort=11)
+	public String getAttachmentName() {
+		return attachmentName;
+	}
+
+
+    public void setAttachmentName(String attachmentName) {
+		this.attachmentName = attachmentName;
+	}
+
+	public String getAttachmentId() {
+		return attachmentId;
+	}
+
+	public void setAttachmentId(String attachmentId) {
+		this.attachmentId = attachmentId;
+	}
+
+	public String getAttachmentFlag() {
+		return attachmentFlag;
+	}
+
+	public void setAttachmentFlag(String attachmentFlag) {
+		this.attachmentFlag = attachmentFlag;
+	}
+
+	public String getCompanyId() {
+		return companyId;
+	}
+
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+
+	public String getProjectId() {
+		return projectId;
+	}
+
+	public void setProjectId(String projectId) {
+		this.projectId = projectId;
+	}
+
+	public String getTemporaryUrl() {
+		return temporaryUrl;
+	}
+
+	public void setTemporaryUrl(String temporaryUrl) {
+		this.temporaryUrl = temporaryUrl;
+	}
+
+	public String getCollectFlag() {
+		return collectFlag;
+	}
+
+	public void setCollectFlag(String collectFlag) {
+		this.collectFlag = collectFlag;
+	}
+
+	public String getFileSize() {
+		return fileSize;
+	}
+
+	public void setFileSize(String fileSize) {
+		this.fileSize = fileSize;
+	}
+
+	public String getCreateName() {
+		return createName;
+	}
+
+	public void setCreateName(String createName) {
+		this.createName = createName;
+	}
+
+	public String getSort() {
+		return sort;
+	}
+
+	public void setSort(String sort) {
+		this.sort = sort;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getDivIdType() {
+		return divIdType;
+	}
+
+	public void setDivIdType(String divIdType) {
+		this.divIdType = divIdType;
+	}
+
+	public List<String> getAttachmentIdList() {
+		return attachmentIdList;
+	}
+
+	public void setAttachmentIdList(List<String> attachmentIdList) {
+		this.attachmentIdList = attachmentIdList;
+	}
+
+	public String getFileSizeFlag() {
+		return fileSizeFlag;
+	}
+
+	public void setFileSizeFlag(String fileSizeFlag) {
+		this.fileSizeFlag = fileSizeFlag;
+	}
+}

src/main/java/com/jeeplus/modules/externalUnit/service/ExternalUnitCapitalDemandService.java

@@ -10,6 +10,7 @@ import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.externalUnit.dao.ExternalUnitCapitalDemandDao;
 import com.jeeplus.modules.externalUnit.entity.ExternalUnitCapitalDemand;
 import com.jeeplus.modules.externalUnit.entity.ExternalUnitProjectRecords;
+import com.jeeplus.modules.externalUnit.entity.ExternalUnitWorkClientAttachment;
 import com.jeeplus.modules.signatureManagement.electronicSignature.entity.DistrictDirectorApplication;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
@@ -91,12 +92,12 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
             ExternalUnitProjectRecords externalUnitProjectRecords = projectRecordsService.get(capitalDemand.getProjectId());
             capitalDemand.setProject(externalUnitProjectRecords);
             //查询附件
-            WorkClientAttachment workClientAttachment = new WorkClientAttachment();
+            ExternalUnitWorkClientAttachment workClientAttachment = new ExternalUnitWorkClientAttachment();
             workClientAttachment.setAttachmentId(capitalDemand.getId());
             workClientAttachment.setAttachmentFlag("160");
             workClientAttachment.setDivIdType("_exterProcess");
-            List<WorkClientAttachment> attachmentList = workattachmentService.getAttachmentList(workClientAttachment);
-            workattachmentService.clientAttachmentManageOnUrl(attachmentList);
+            List<ExternalUnitWorkClientAttachment> attachmentList = workattachmentService.getAttachmentListExter(workClientAttachment);
+            workattachmentService.exterunitAttachmentManageOnUrl(attachmentList);
             capitalDemand.setWorkAttachments(attachmentList);
         }
         return capitalDemand;
@@ -576,7 +577,7 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
         dao.update(capitalDemand);
         //上传附件
         if (CollectionUtils.isNotEmpty(capitalDemand.getWorkAttachments())){
-            for (WorkClientAttachment workClientAttachment : capitalDemand.getWorkAttachments()){
+            for (ExternalUnitWorkClientAttachment workClientAttachment : capitalDemand.getWorkAttachments()){
                 if (workClientAttachment.getId() == null){
                     continue;
                 }
@@ -586,12 +587,12 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
                     workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
                     workClientAttachment.setProjectId(capitalDemand.getProject().getId());
                     if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())){
-                        workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
+                        workattachmentService.insertOnExterWorkAttachment(workClientAttachment);
                     }else{
-                        workattachmentService.updateOnWorkClientAttachment(workClientAttachment);
+                        workattachmentService.updateOnExterWorkAttachment(workClientAttachment);
                     }
                 }else{
-                    workClientAttachmentDao.delete(workClientAttachment);
+                    workClientAttachmentDao.deleteExterunit(workClientAttachment);
                 }
             }
         }
@@ -903,7 +904,7 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
         dao.update(capitalDemand);
         //上传附件
         if (CollectionUtils.isNotEmpty(capitalDemand.getWorkAttachments())){
-            for (WorkClientAttachment workClientAttachment : capitalDemand.getWorkAttachments()){
+            for (ExternalUnitWorkClientAttachment workClientAttachment : capitalDemand.getWorkAttachments()){
                 if (workClientAttachment.getId() == null){
                     continue;
                 }
@@ -913,12 +914,12 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
                     workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
                     workClientAttachment.setProjectId(capitalDemand.getProject().getId());
                     if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())){
-                        workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
+                        workattachmentService.insertOnExterWorkAttachment(workClientAttachment);
                     }else{
-                        workattachmentService.updateOnWorkClientAttachment(workClientAttachment);
+                        workattachmentService.updateOnExterWorkAttachment(workClientAttachment);
                     }
                 }else{
-                    workClientAttachmentDao.delete(workClientAttachment);
+                    workClientAttachmentDao.deleteExterunit(workClientAttachment);
                 }
             }
         }
@@ -1255,7 +1256,7 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
         dao.update(capitalDemand);
         //上传附件
         if (CollectionUtils.isNotEmpty(capitalDemand.getWorkAttachments())){
-            for (WorkClientAttachment workClientAttachment : capitalDemand.getWorkAttachments()){
+            for (ExternalUnitWorkClientAttachment workClientAttachment : capitalDemand.getWorkAttachments()){
                 if (workClientAttachment.getId() == null){
                     continue;
                 }
@@ -1265,12 +1266,12 @@ public class ExternalUnitCapitalDemandService extends CrudService<ExternalUnitCa
                     workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
                     workClientAttachment.setProjectId(capitalDemand.getProject().getId());
                     if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())){
-                        workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
+                        workattachmentService.insertOnExterWorkAttachment(workClientAttachment);
                     }else{
-                        workattachmentService.updateOnWorkClientAttachment(workClientAttachment);
+                        workattachmentService.updateOnExterWorkAttachment(workClientAttachment);
                     }
                 }else{
-                    workClientAttachmentDao.delete(workClientAttachment);
+                    workClientAttachmentDao.deleteExterunit(workClientAttachment);
                 }
             }
         }

src/main/java/com/jeeplus/modules/externalUnit/service/ExternalUnitFeedbackService.java

@@ -9,6 +9,7 @@ import com.jeeplus.modules.externalUnit.dao.ExternalUnitFeedbackDao;
 import com.jeeplus.modules.externalUnit.entity.ExternalUnitCapitalDemand;
 import com.jeeplus.modules.externalUnit.entity.ExternalUnitFeedback;
 import com.jeeplus.modules.externalUnit.entity.ExternalUnitProjectRecords;
+import com.jeeplus.modules.externalUnit.entity.ExternalUnitWorkClientAttachment;
 import com.jeeplus.modules.signatureManagement.electronicSignature.entity.DistrictDirectorApplication;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
@@ -85,12 +86,12 @@ public class ExternalUnitFeedbackService extends CrudService<ExternalUnitFeedbac
             ExternalUnitProjectRecords externalUnitProjectRecords = projectRecordsService.get(capitalDemand.getProjectId());
             capitalDemand.setProject(externalUnitProjectRecords);
             //查询附件
-            WorkClientAttachment workClientAttachment = new WorkClientAttachment();
+            ExternalUnitWorkClientAttachment workClientAttachment = new ExternalUnitWorkClientAttachment();
             workClientAttachment.setAttachmentId(capitalDemand.getId());
             workClientAttachment.setAttachmentFlag("160");
             workClientAttachment.setDivIdType("_exterFeedback");
-            List<WorkClientAttachment> attachmentList = workattachmentService.getAttachmentList(workClientAttachment);
-            workattachmentService.clientAttachmentManageOnUrl(attachmentList);
+            List<ExternalUnitWorkClientAttachment> attachmentList = workattachmentService.getAttachmentListFeedback(workClientAttachment);
+            workattachmentService.exterunitAttachmentManageOnUrl(attachmentList);
             capitalDemand.setWorkAttachments(attachmentList);
             //审核人
             ArrayList<String> strings = new ArrayList<>();
@@ -150,7 +151,7 @@ public class ExternalUnitFeedbackService extends CrudService<ExternalUnitFeedbac
         super.save(feedback);
         //保存附件
         if (CollectionUtils.isNotEmpty(feedback.getWorkAttachments())){
-            for (WorkClientAttachment workClientAttachment : feedback.getWorkAttachments()){
+            for (ExternalUnitWorkClientAttachment workClientAttachment : feedback.getWorkAttachments()){
                 if (workClientAttachment.getId() == null){
                     continue;
                 }
@@ -159,12 +160,12 @@ public class ExternalUnitFeedbackService extends CrudService<ExternalUnitFeedbac
                     workClientAttachment.setAttachmentFlag("160");
                     workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
                     if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())){
-                        workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
+                        workattachmentService.insertOnExterWorkAttachment(workClientAttachment);
                     }else{
-                        workattachmentService.updateOnWorkClientAttachment(workClientAttachment);
+                        workattachmentService.updateOnExterWorkAttachment(workClientAttachment);
                     }
                 }else{
-                    workClientAttachmentDao.delete(workClientAttachment);
+                    workClientAttachmentDao.deleteExterunit(workClientAttachment);
                 }
             }
         }
@@ -324,7 +325,7 @@ public class ExternalUnitFeedbackService extends CrudService<ExternalUnitFeedbac
         }
         //保存附件
         if (CollectionUtils.isNotEmpty(feedback.getWorkAttachments())){
-            for (WorkClientAttachment workClientAttachment : feedback.getWorkAttachments()){
+            for (ExternalUnitWorkClientAttachment workClientAttachment : feedback.getWorkAttachments()){
                 if (workClientAttachment.getId() == null){
                     continue;
                 }
@@ -333,12 +334,12 @@ public class ExternalUnitFeedbackService extends CrudService<ExternalUnitFeedbac
                     workClientAttachment.setAttachmentFlag("160");
                     workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
                     if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())){
-                        workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
+                        workattachmentService.insertOnExterWorkAttachment(workClientAttachment);
                     }else{
-                        workattachmentService.updateOnWorkClientAttachment(workClientAttachment);
+                        workattachmentService.updateOnExterWorkAttachment(workClientAttachment);
                     }
                 }else{
-                    workClientAttachmentDao.delete(workClientAttachment);
+                    workClientAttachmentDao.deleteExterunit(workClientAttachment);
                 }
             }
         }
@@ -722,7 +723,7 @@ public class ExternalUnitFeedbackService extends CrudService<ExternalUnitFeedbac
         dao.update(feedback);
         //保存附件
         if (CollectionUtils.isNotEmpty(feedback.getWorkAttachments())){
-            for (WorkClientAttachment workClientAttachment : feedback.getWorkAttachments()){
+            for (ExternalUnitWorkClientAttachment workClientAttachment : feedback.getWorkAttachments()){
                 if (workClientAttachment.getId() == null){
                     continue;
                 }
@@ -731,12 +732,12 @@ public class ExternalUnitFeedbackService extends CrudService<ExternalUnitFeedbac
                     workClientAttachment.setAttachmentFlag("160");
                     workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
                     if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())){
-                        workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
+                        workattachmentService.insertOnExterWorkAttachment(workClientAttachment);
                     }else{
-                        workattachmentService.updateOnWorkClientAttachment(workClientAttachment);
+                        workattachmentService.updateOnExterWorkAttachment(workClientAttachment);
                     }
                 }else{
-                    workClientAttachmentDao.delete(workClientAttachment);
+                    workClientAttachmentDao.deleteExterunit(workClientAttachment);
                 }
             }
         }

src/main/java/com/jeeplus/modules/externalUnit/service/ExternalUnitProjectRecordsService.java

@@ -11,10 +11,7 @@ import com.jeeplus.modules.externalUnit.dao.ExternalUnitCapitalDemandDao;
 import com.jeeplus.modules.externalUnit.dao.ExternalUnitFeedbackDao;
 import com.jeeplus.modules.externalUnit.dao.ExternalUnitProjectRecordsDao;
 import com.jeeplus.modules.externalUnit.dao.ExternalUnitProjectUserDao;
-import com.jeeplus.modules.externalUnit.entity.ExternalUnitCapitalDemand;
-import com.jeeplus.modules.externalUnit.entity.ExternalUnitFeedback;
-import com.jeeplus.modules.externalUnit.entity.ExternalUnitProjectRecords;
-import com.jeeplus.modules.externalUnit.entity.ExternalUnitProjectUser;
+import com.jeeplus.modules.externalUnit.entity.*;
 
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.User;
@@ -170,9 +167,9 @@ public class ExternalUnitProjectRecordsService extends CrudService<ExternalUnitP
      * @param projectRecords
      * @return
      */
-    public Page<WorkClientAttachment> getProjectFile(Page<WorkClientAttachment> page, ExternalUnitProjectRecords projectRecords) {
+    public Page<ExternalUnitWorkClientAttachment> getProjectFile(Page<ExternalUnitWorkClientAttachment> page, ExternalUnitProjectRecords projectRecords) {
         //获取文件管理
-        WorkClientAttachment workClientAttachment = new WorkClientAttachment();
+        ExternalUnitWorkClientAttachment workClientAttachment = new ExternalUnitWorkClientAttachment();
         workClientAttachment.setProjectId(projectRecords.getId());
         workClientAttachment.setAttachmentFlag("160");
         workClientAttachment.setAttachmentUser(projectRecords.getFileSubmiter());
@@ -184,9 +181,9 @@ public class ExternalUnitProjectRecordsService extends CrudService<ExternalUnitP
         page.setCount(count);
         page.setCountFlag(false);
         workClientAttachment.setPage(page);
-        List<WorkClientAttachment> attachmentList = workattachmentService.getAttachmentListExter(workClientAttachment);
+        List<ExternalUnitWorkClientAttachment> attachmentList = workattachmentService.getAttachmentListExter(workClientAttachment);
 
-        workattachmentService.clientAttachmentManageOnUrl(attachmentList);
+        workattachmentService.exterunitAttachmentManageOnUrl(attachmentList);
 
         page.setList(attachmentList);
 
@@ -198,11 +195,11 @@ public class ExternalUnitProjectRecordsService extends CrudService<ExternalUnitP
      * @param projectRecords
      */
     public void getNoProcessFile(ExternalUnitProjectRecords projectRecords) {
-        WorkClientAttachment workClientAttachment = new WorkClientAttachment();
+        ExternalUnitWorkClientAttachment workClientAttachment = new ExternalUnitWorkClientAttachment();
         workClientAttachment.setAttachmentId(projectRecords.getId());
         workClientAttachment.setAttachmentFlag("160");
         workClientAttachment.setDivIdType("_exterNoProcess");
-        List<WorkClientAttachment> attachmentList = workattachmentService.getAttachmentListExter(workClientAttachment);
+        List<ExternalUnitWorkClientAttachment> attachmentList = workattachmentService.getAttachmentListExter(workClientAttachment);
         projectRecords.setWorkAttachments(attachmentList);
     }
 
@@ -213,7 +210,7 @@ public class ExternalUnitProjectRecordsService extends CrudService<ExternalUnitP
     @Transactional(readOnly = false)
     public void saveFile(ExternalUnitProjectRecords projectRecords) {
         if (CollectionUtils.isNotEmpty(projectRecords.getWorkAttachments())){
-            for (WorkClientAttachment workClientAttachment : projectRecords.getWorkAttachments()){
+            for (ExternalUnitWorkClientAttachment workClientAttachment : projectRecords.getWorkAttachments()){
                 if (workClientAttachment.getId() == null){
                     continue;
                 }
@@ -223,12 +220,12 @@ public class ExternalUnitProjectRecordsService extends CrudService<ExternalUnitP
                     workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
                     workClientAttachment.setProjectId(projectRecords.getId());
                     if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())){
-                        workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
+                        workattachmentService.insertOnExterWorkAttachment(workClientAttachment);
                     }else{
-                        workattachmentService.updateOnWorkClientAttachment(workClientAttachment);
+                        workattachmentService.updateOnExterWorkAttachment(workClientAttachment);
                     }
                 }else{
-                    workClientAttachmentDao.delete(workClientAttachment);
+                    workClientAttachmentDao.deleteExterunit(workClientAttachment);
                 }
             }
         }
@@ -271,11 +268,11 @@ public class ExternalUnitProjectRecordsService extends CrudService<ExternalUnitP
     public String deleteById(ExternalUnitProjectRecords projectRecords) {
         //根据id查询项目下午其他关联
         //文件信息
-        WorkClientAttachment workClientAttachment = new WorkClientAttachment();
+        ExternalUnitWorkClientAttachment workClientAttachment = new ExternalUnitWorkClientAttachment();
         workClientAttachment.setAttachmentId(projectRecords.getId());
         workClientAttachment.setAttachmentFlag("160");
         workClientAttachment.setDivIdType("_exterNoProcess");
-        List<WorkClientAttachment> attachmentList = workattachmentService.getAttachmentListExter(workClientAttachment);
+        List<ExternalUnitWorkClientAttachment> attachmentList = workattachmentService.getAttachmentListExter(workClientAttachment);
         //提资需求
         ExternalUnitCapitalDemand capitalDemand = new ExternalUnitCapitalDemand();
         capitalDemand.setProjectId(projectRecords.getId());

src/main/java/com/jeeplus/modules/externalUnit/web/ExternalUnitProjectRecordsController.java

@@ -13,6 +13,7 @@ import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.disputeMediation.entity.ProjectPrelitigationMediation;
 import com.jeeplus.modules.externalUnit.entity.ExternalUnitCapitalDemand;
 import com.jeeplus.modules.externalUnit.entity.ExternalUnitProjectRecords;
+import com.jeeplus.modules.externalUnit.entity.ExternalUnitWorkClientAttachment;
 import com.jeeplus.modules.externalUnit.service.ExternalUnitCapitalDemandService;
 import com.jeeplus.modules.externalUnit.service.ExternalUnitProjectRecordsService;
 
@@ -232,7 +233,7 @@ public class ExternalUnitProjectRecordsController extends BaseController {
                 model.addAttribute("searchProjectRecord", externalUnitProjectRecords);
             }
         }
-        Page<WorkClientAttachment> page = unitProjectRecordsService.getProjectFile(new Page<WorkClientAttachment>(request, response),projectRecords);
+        Page<ExternalUnitWorkClientAttachment> page = unitProjectRecordsService.getProjectFile(new Page<ExternalUnitWorkClientAttachment>(request, response),projectRecords);
 
         model.addAttribute("page", page);
         return "modules/externalUnit/externalUnitProjectFile";

src/main/java/com/jeeplus/modules/sys/service/WorkattachmentService.java

@@ -9,6 +9,7 @@ import com.jeeplus.common.oss.OSSClientUtil;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.service.CrudService;
 import com.jeeplus.common.utils.StringUtils;
+import com.jeeplus.modules.externalUnit.entity.ExternalUnitWorkClientAttachment;
 import com.jeeplus.modules.isignature.service.ISignatureDocumentService;
 import com.jeeplus.modules.projectAccessory.dao.ProjectAccessoryDao;
 import com.jeeplus.modules.projectAccessory.entity.CollectAccessoryInfo;
@@ -346,6 +347,27 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 		workClientAttachmentDao.insert(workattachment);
 	}
 
+	/**
+	 * 新增附件(外部单位)
+	 * @param workattachment
+	 */
+	@Transactional(readOnly = false)
+	public void insertOnExterWorkAttachment(ExternalUnitWorkClientAttachment workattachment) {
+		//字符处理
+		workattachment.setUrl(decodeHtmlEntities(workattachment.getUrl()));
+		workattachment.setAttachmentName(decodeHtmlEntities(workattachment.getAttachmentName()));
+		switch (uploadMode){
+			case "1":
+				workattachment.setUrl(workattachment.getUrl().replace(bosUrl,""));
+				break;
+			case "2":
+				workattachment.setUrl(workattachment.getUrl().replace(aliyunUrl,""));
+				break;
+		}
+		workattachment.preInsert();
+		workClientAttachmentDao.insertExterUnit(workattachment);
+	}
+
 	private String decodeHtmlEntities(String input) {
 		if (input == null) {
 			return null;
@@ -466,6 +488,29 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 	}
 
 	/**
+	 * 修改附件
+	 * @param workattachment
+	 */
+	@Transactional(readOnly = false)
+	public void updateOnExterWorkAttachment(ExternalUnitWorkClientAttachment workattachment) {
+		//字符处理
+		workattachment.setUrl(decodeHtmlEntities(workattachment.getUrl()));
+		workattachment.setAttachmentName(decodeHtmlEntities(workattachment.getAttachmentName()));
+		if(StringUtils.isNotBlank(workattachment.getUrl())){
+			switch (uploadMode){
+				case "1":
+					workattachment.setUrl(workattachment.getUrl().replace(bosUrl,""));
+					break;
+				case "2":
+					workattachment.setUrl(workattachment.getUrl().replace(aliyunUrl,""));
+					break;
+			}
+		}
+		workattachment.preUpdate();
+		workClientAttachmentDao.updateExterunit(workattachment);
+	}
+
+	/**
 	 * 获取附件信息
 	 * @param workClientAttachment
 	 * @return
@@ -495,12 +540,41 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 	}
 
 	/**
+	 * 获取附件信息(外部单位-意见反馈)
+	 * @param workClientAttachment
+	 * @return
+	 */
+	public List<ExternalUnitWorkClientAttachment> getAttachmentListFeedback(ExternalUnitWorkClientAttachment workClientAttachment){
+		List<ExternalUnitWorkClientAttachment> list = workClientAttachmentDao.findListFeedback(workClientAttachment);
+		CollectAccessoryInfo cAInfo = new CollectAccessoryInfo();
+		User loginUser = UserUtils.getUser();
+		if(StringUtils.isNotBlank(loginUser.getId())){
+			cAInfo.setOfficeId(loginUser.getOffice().getId());
+			cAInfo.setCompanyId(loginUser.getCompany().getId());
+			cAInfo.setCreateBy(loginUser);
+		}
+		//遍历附件信息，判定改附件信息是否被收藏
+		for (ExternalUnitWorkClientAttachment info: list) {
+			cAInfo.setUrl(info.getUrl());
+			CollectAccessoryInfo collectAccessoryInfo = projectAccessoryDao.getCollectAccessoryInfo1(cAInfo);
+			if(null != collectAccessoryInfo){
+				info.setCollectFlag("1");
+			}else{
+				info.setCollectFlag("0");
+			}
+		}
+		//数据处理
+		workClientAttachmentExter(list);
+		return list;
+	}
+
+	/**
 	 * 获取附件信息
 	 * @param workClientAttachment
 	 * @return
 	 */
-	public List<WorkClientAttachment> getAttachmentListExter(WorkClientAttachment workClientAttachment){
-		List<WorkClientAttachment> list = workClientAttachmentDao.getFileList(workClientAttachment);
+	public List<ExternalUnitWorkClientAttachment> getAttachmentListExter(ExternalUnitWorkClientAttachment workClientAttachment){
+		List<ExternalUnitWorkClientAttachment> list = workClientAttachmentDao.getFileList(workClientAttachment);
 		CollectAccessoryInfo cAInfo = new CollectAccessoryInfo();
 		User loginUser = UserUtils.getUser();
 		if(StringUtils.isNotBlank(loginUser.getId())){
@@ -509,7 +583,7 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 			cAInfo.setCreateBy(loginUser);
 		}
 		//遍历附件信息，判定改附件信息是否被收藏
-		for (WorkClientAttachment info: list) {
+		for (ExternalUnitWorkClientAttachment info: list) {
 			cAInfo.setUrl(info.getUrl());
 			CollectAccessoryInfo collectAccessoryInfo = projectAccessoryDao.getCollectAccessoryInfo1(cAInfo);
 			if(null != collectAccessoryInfo){
@@ -519,7 +593,7 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 			}
 		}
 		//数据处理
-		workClientAttachmentManage(list);
+		workClientAttachmentExter(list);
 		return list;
 	}
 
@@ -672,16 +746,16 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 	 * 数据处理
 	 * @param list
 	 */
-	public static void workClientAttachmentExter(List<WorkClientAttachment> list){
+	public static void workClientAttachmentExter(List<ExternalUnitWorkClientAttachment> list){
 		ViewFileUtil viewFileUtil = new ViewFileUtil();
 		// 判断文件存储方式（0：本地服务器存储。1：云端存储）
-		for (WorkClientAttachment info : list) {
+		for (ExternalUnitWorkClientAttachment info : list) {
 			switch (uploadMode){
 				case "1":
-					info.setTemporaryUrl(bosUrl + info.getUrl());
+					info.setUrl(bosUrl + info.getUrl());
 					break;
 				case "2":
-					info.setTemporaryUrl(aliyunUrl + info.getUrl());
+					info.setUrl(aliyunUrl + info.getUrl());
 					break;
 				default:
 					//获取本地服务器ip和端口号
@@ -779,6 +853,55 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 	 * 数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
 	 * @param list
 	 */
+	public static void exterunitAttachmentManageOnUrl(List<ExternalUnitWorkClientAttachment> list){
+		// 判断文件存储方式（0：本地服务器存储。1：云端存储）
+		for (ExternalUnitWorkClientAttachment info : list) {
+			switch (uploadMode){
+				case "1":
+
+					break;
+				case "2":
+					if(StringUtils.isBlank(info.getFileSize())){
+						Long fileSizeBytes = null;
+						//从阿里云获取文件大小
+						if(info.getUrl().contains("/xg-qz")){
+							String url = info.getUrl().replace("/xg-qz","");
+							fileSizeBytes = new OSSClientUtil().getQzSimplifiedObjectMeta(url);
+						}else{
+							fileSizeBytes = new OSSClientUtil().getSimplifiedObjectMeta(info.getUrl());
+						}
+						if(null != fileSizeBytes){
+							Double fileSize = (double)fileSizeBytes/1024/1024;
+							info.setFileSize(String.format("%.2f", fileSize));
+							info.setFileSizeFlag("1");
+						}else{
+							info.setFileSize("");
+						}
+					}else{
+						if(StringUtils.isNotBlank(info.getFileSizeFlag()) && "1".equals(info.getFileSizeFlag())){
+
+						}else{
+							Double fileSize = Double.valueOf(info.getFileSize())/1024/1024;
+							info.setFileSize(String.format("%.2f", fileSize));
+							info.setFileSizeFlag("1");
+						}
+					}
+					if(info.getUrl().contains("/xg-qz")){
+						String url = info.getUrl().replace("/xg-qz","");
+						info.setTemporaryUrl(new OSSClientUtil().getQzFileTemporaryLookUrl(url));
+					}else{
+						info.setTemporaryUrl(new OSSClientUtil().getFileTemporaryLookUrl(info.getUrl()));
+					}
+					break;
+
+			}
+		}
+	}
+
+	/**
+	 * 数据处理（如果为阿里云文件服务器，则对查看的路径进行处理）
+	 * @param list
+	 */
 	public static void attachmentManageOnUrl(List<Workattachment> list){
 		// 判断文件存储方式（0：本地服务器存储。1：云端存储）
 		for (Workattachment info : list) {

src/main/java/com/jeeplus/modules/workclientinfo/dao/WorkClientAttachmentDao.java

@@ -5,6 +5,7 @@ package com.jeeplus.modules.workclientinfo.dao;
 
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
+import com.jeeplus.modules.externalUnit.entity.ExternalUnitWorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 
 import java.util.List;
@@ -51,7 +52,15 @@ public interface WorkClientAttachmentDao extends CrudDao<WorkClientAttachment> {
     /*8
     查询外部单位文件管理中的文件信息
      */
-    int queryFileCount(WorkClientAttachment workClientAttachment);
+    int queryFileCount(ExternalUnitWorkClientAttachment workClientAttachment);
 
-    List<WorkClientAttachment> getFileList(WorkClientAttachment workClientAttachment);
+    List<ExternalUnitWorkClientAttachment> getFileList(ExternalUnitWorkClientAttachment workClientAttachment);
+
+    void insertExterUnit(ExternalUnitWorkClientAttachment workattachment);
+
+    void updateExterunit(ExternalUnitWorkClientAttachment workattachment);
+
+    void deleteExterunit(ExternalUnitWorkClientAttachment workClientAttachment);
+
+    List<ExternalUnitWorkClientAttachment> findListFeedback(ExternalUnitWorkClientAttachment workClientAttachment);
 }

src/main/resources/mappings/modules/workclientinfo/WorkClientAttachmentDao.xml

@@ -68,6 +68,37 @@
         </choose>
     </select>
 
+
+    <select id="findListFeedback" resultType="ExternalUnitWorkClientAttachment" >
+        SELECT
+        <include refid="workClientAttachmentColumns"/>
+        FROM exterunit_work_attachment a
+        <include refid="workClientAttachmentJoins"/>
+        <where>
+            a.del_flag = #{DEL_FLAG_NORMAL}
+            <if test="attachmentId != null and attachmentId != ''">
+                AND a.attachment_id = #{attachmentId}
+            </if>
+            <if test="attachmentFlag != null and attachmentFlag != ''">
+                AND attachment_flag = #{attachmentFlag}
+            </if>
+            <if test="divIdType != null and divIdType != ''">
+                AND div_id_type = #{divIdType}
+            </if>
+            <if test="projectId != null and projectId != ''">
+                and project_id = #{projectId}
+            </if>
+        </where>
+        <choose>
+            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
+                ORDER BY ${page.orderBy}
+            </when>
+            <otherwise>
+                ORDER BY a.update_date DESC
+            </otherwise>
+        </choose>
+    </select>
+
     <select id="findAllList" resultType="WorkClientAttachment" >
         SELECT
         <include refid="workClientAttachmentColumns"/>
@@ -147,6 +178,67 @@
         )
     </insert>
 
+
+    <insert id="insertExterUnit">
+        INSERT INTO exterunit_work_attachment(
+        id,
+        create_by,
+        create_date,
+        update_by,
+        update_date,
+        remarks,
+        del_flag,
+        url,
+        type,
+        attachment_id,
+        attachment_user,
+        attachment_name,
+        company_id,
+        attachment_flag
+        <if test="projectId != null and projectId != ''">
+            ,project_id
+        </if>
+        <if test="sort != null and sort != ''">
+            ,sort
+        </if>
+        <if test="description != null and description != ''">
+            ,description
+        </if>
+        <if test="divIdType != null and divIdType != ''">
+            ,div_id_type
+        </if>
+        ,file_size
+        ) VALUES (
+        #{id},
+        #{createBy.id},
+        #{createDate},
+        #{updateBy.id},
+        #{updateDate},
+        #{remarks},
+        #{delFlag},
+        #{url},
+        #{type},
+        #{attachmentId},
+        #{attachmentUser},
+        #{attachmentName},
+        #{companyId},
+        #{attachmentFlag}
+        <if test="projectId != null and projectId != ''">
+            ,#{projectId}
+        </if>
+        <if test="sort != null and sort != ''">
+            ,#{sort}
+        </if>
+        <if test="description != null and description != ''">
+            ,#{description}
+        </if>
+        <if test="divIdType != null and divIdType != ''">
+            ,#{divIdType}
+        </if>
+        ,#{fileSize}
+        )
+    </insert>
+
     <update id="update">
         UPDATE work_attachment SET
         update_by = #{updateBy.id}
@@ -186,11 +278,55 @@
     </update>
 
 
+    <update id="updateExterunit">
+        UPDATE exterunit_work_attachment SET
+        update_by = #{updateBy.id}
+        ,update_date = #{updateDate}
+        ,remarks = #{remarks}
+        <if test="url != null and url != ''">
+            ,url = #{url}
+        </if>
+        <if test="type != null and type != ''">
+            ,type = #{type}
+        </if>
+        <if test="attachmentFlag != null and attachmentFlag != ''">
+            ,attachment_flag = #{attachmentFlag}
+        </if>
+        <if test="attachmentId != null and attachmentId != ''">
+            ,attachment_id = #{attachmentId}
+        </if>
+        <if test="attachmentUser != null and attachmentUser != ''">
+            ,attachment_user = #{attachmentUser}
+        </if>
+        <if test="attachmentName != null and attachmentName != ''">
+            ,attachment_name = #{attachmentName}
+        </if>
+        <if test="companyId != null and companyId != ''">
+            ,company_id = #{companyId}
+        </if>
+        <if test="sort != null and sort != ''">
+            ,sort = #{sort}
+        </if>
+        <if test="description != null and description != ''">
+            ,description = #{description}
+        </if>
+        <if test="divIdType != null and divIdType != ''">
+            ,div_id_type = #{divIdType}
+        </if>
+        WHERE id = #{id}
+    </update>
+
+
     <!--物理删除-->
     <update id="delete">
         DELETE FROM work_attachment
         WHERE id = #{id}
     </update>
+
+    <update id="deleteExterunit">
+        DELETE FROM exterunit_work_attachment
+        WHERE id = #{id}
+    </update>
     <!--物理删除-->
     <update id="deleteCase">
         DELETE FROM work_attachment
@@ -278,7 +414,7 @@
 
     <select id="queryFileCount" resultType="int" >
         SELECT count(distinct a.id)
-        FROM work_attachment a
+        FROM exterunit_work_attachment a
         <include refid="workClientAttachmentJoins"/>
         <where>
             a.del_flag = #{DEL_FLAG_NORMAL}
@@ -313,10 +449,10 @@
         </where>
     </select>
 
-    <select id="getFileList" resultType="WorkClientAttachment" >
+    <select id="getFileList" resultType="ExternalUnitWorkClientAttachment" >
         SELECT
         <include refid="workClientAttachmentColumns"/>
-        FROM work_attachment a
+        FROM exterunit_work_attachment a
         <include refid="workClientAttachmentJoins"/>
         <where>
             a.del_flag = #{DEL_FLAG_NORMAL}