实施前期、项目计划附件处理

src/main/java/com/jeeplus/common/persistence/DataEntity.java

@@ -5,6 +5,7 @@ package com.jeeplus.common.persistence;
 
 import java.util.Date;
 
+import com.jeeplus.common.config.Global;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.constraints.Length;
 
@@ -29,7 +30,7 @@ public abstract class DataEntity<T> extends BaseEntity<T> {
 	protected transient User updateBy;	// 更新者
 	protected transient Date updateDate;	// 更新日期
 	protected transient String delFlag; 	// 删除标记（0：正常；1：删除；2：审核）
-	protected transient String uploadMode;
+	protected transient String uploadMode = Global.getConfig("remoteServer.uploadMode");
 
 	public DataEntity() {
 		super();

src/main/java/com/jeeplus/modules/processProjectPlan/service/ProcessProjectPlanService.java

@@ -46,6 +46,7 @@ public class ProcessProjectPlanService extends CrudService<ProcessProjectPlanDao
         attchment.setAttachmentId(projectId);
         attchment.setAttachmentFlag("131");
         List<WorkClientAttachment> attachments = workattachmentService.getAttachmentList(attchment);
+        workattachmentService.clientAttachmentManageOnUrl(attachments);
         return attachments;
     }
 
@@ -123,11 +124,9 @@ public class ProcessProjectPlanService extends CrudService<ProcessProjectPlanDao
                 workClientAttachment.setAttachmentFlag("131");
                 workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
                 if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())){
-                    workClientAttachment.preInsert();
-                    workClientAttachmentDao.insert(workClientAttachment);
+                    workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
                 }else{
-                    workClientAttachment.preUpdate();
-                    workClientAttachmentDao.update(workClientAttachment);
+                    workattachmentService.updateOnWorkClientAttachment(workClientAttachment);
                 }
             }else{
                 workClientAttachmentDao.delete(workClientAttachment);

src/main/java/com/jeeplus/modules/processProjectPlan/web/ProcessProjectPlanController.java

@@ -140,6 +140,7 @@ public class ProcessProjectPlanController extends BaseController {
         List<WorkClientAttachment> workAttachmentList = projectPlanService.getWorkAttachment(projectRecords.getId());
         projectRecords.setProjectPlanList(projectPlanList);
         projectRecords.setWorkAttachments(workAttachmentList);
+        projectRecords.setUploadMode(uploadMode);
         model.addAttribute("projectRecords", projectRecords);
         model.addAttribute("projectTypeList", projectTypeList);
         if(flag){

src/main/java/com/jeeplus/modules/projectConstruction/service/ContractService.java

@@ -21,6 +21,7 @@ import com.jeeplus.modules.sys.entity.MainDict;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.MainDictService;
+import com.jeeplus.modules.sys.service.WorkattachmentService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientAttachmentDao;
 import com.jeeplus.modules.workclientinfo.dao.WorkClientBankDao;
@@ -59,6 +60,9 @@ public class ContractService extends CrudService<ContractDao,ConstructionContrac
     private ContractDao contractDao;
     @Autowired
     private WorkClientAttachmentDao workClientAttachmentDao;
+    @Autowired
+    private WorkattachmentService workattachmentService;
+
 
 
     /**
@@ -133,12 +137,10 @@ public class ContractService extends CrudService<ContractDao,ConstructionContrac
                     workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
                     if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())) {
                         //新增操作
-                        workClientAttachment.preInsert();
-                        workClientAttachmentDao.insert(workClientAttachment);
+                        workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
                     } else {
                         //修改操作
-                        workClientAttachment.preUpdate();
-                        workClientAttachmentDao.update(workClientAttachment);
+                        workattachmentService.updateOnWorkClientAttachment(workClientAttachment);
                     }
                 } else {
                     //删除操作

src/main/java/com/jeeplus/modules/projectConstruction/web/ContractController.java

@@ -267,6 +267,7 @@ public class ContractController extends BaseController {
             WorkClientAttachment attchment = new WorkClientAttachment();
             attchment.setAttachmentId(constructionContract.getId());
             List<WorkClientAttachment> attachments = workattachmentService.getAttachmentList(attchment);
+            workattachmentService.clientAttachmentManageOnUrl(attachments);
             constructionContract.setWorkAttachments(attachments);
         } else {
             //新增
@@ -302,6 +303,7 @@ public class ContractController extends BaseController {
         WorkClientAttachment attchment = new WorkClientAttachment();
         attchment.setAttachmentId(constructionContract.getId());
         List<WorkClientAttachment> attachments = workattachmentService.getAttachmentList(attchment);
+        workattachmentService.clientAttachmentManageOnUrl(attachments);
         constructionContract.setWorkAttachments(attachments);
         model.addAttribute("constructionContract", constructionContract);
         return "modules/projectConstruction/projectConstructionView";

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectContentDataService.java

@@ -57,6 +57,8 @@ public class ProjectContentDataService extends CrudService<ProjectContentDataDao
             Workattachment workattachment = new Workattachment();
             workattachment.setAttachmentId(id);
             projectContentData.setWorkAttachments(workattachmentService.findList(workattachment));
+            workattachmentService.attachmentManageOnUrl(projectContentData.getWorkAttachments());
+            projectContentData.setUploadMode(uploadMode);
         }
         return projectContentData;
     }

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportDataService.java

@@ -125,7 +125,8 @@ public class ProjectReportDataService extends CrudService<ProjectReportDataDao,
 			workattachment.setAttachmentFlag("86");
 			workattachment.setAttachmentId(id);
 			projectReportData.setWorkAttachments(workattachmentService.findList(workattachment));
-
+			workattachmentService.attachmentManageOnUrl(projectReportData.getWorkAttachments());
+			projectReportData.setUploadMode(uploadMode);
 			projectReportData.setProjectContentDataList(projectContentDataDao.findReportContent(projectReportData.getId(),"1"));
 			projectReportData.setProjectBasedDataList(projectBasedDataDao.findReportBased(projectReportData.getId(),"3"));
             WorkReviewAudit workReviewAudit = new WorkReviewAudit();

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectReportRecordService.java

@@ -98,6 +98,7 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 			workattachment.setAttachmentId(id);
 			workattachment.setAttachmentFlag("99");
 			projectReportRecord.setWorkAttachments(workattachmentService.findList(workattachment));
+			workattachmentService.attachmentManageOnUrl(projectReportRecord.getWorkAttachments());
 		}
 		if (projectReportRecord.getSignCostOne()!=null && StringUtils.isNotBlank(projectReportRecord.getSignCostOne().getId())){
 			User signCostOne = UserUtils.get(projectReportRecord.getSignCostOne().getId());
@@ -107,6 +108,7 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 			User signCostTwo = UserUtils.get(projectReportRecord.getSignCostTwo().getId());
 			projectReportRecord.setSignCostTwo(signCostTwo);
 		}
+		projectReportRecord.setUploadMode(uploadMode);
 		return projectReportRecord;
 	}
 
@@ -165,11 +167,9 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 					workattachment.setAttachmentFlag("99");
 					workattachment.setAttachmentUser(UserUtils.getUser().getId());
 					if (StringUtils.isBlank(workattachment.getId()) || "null".equals(workattachment.getId())) {
-						workattachment.preInsert();
-						workattachmentDao.insert(workattachment);
+						workattachmentService.insertOnWorkAttachment(workattachment);
 					} else {
-						workattachment.preUpdate();
-						workattachmentDao.update(workattachment);
+						workattachmentService.updateOnWorkAttachment(workattachment);
 					}
 				} else {
 					workattachmentDao.delete(workattachment);
@@ -197,7 +197,7 @@ public class ProjectReportRecordService extends CrudService<ProjectReportRecordD
 		}
 		saveWorkattachments(projectReportRecord);
 		//获取项目信息
-		RuralProjectRecords record = ruralProjectRecordsService.get(projectReportRecord.getReport().getProject().getId());
+		RuralProjectRecords record = ruralProjectRecordsService.getById(projectReportRecord.getReport().getProject().getId());
 		String title = "项目【"+ record.getProjectName()+"】归档待审批";
 		String str = "项目【"+ record.getProjectName()+"】归档待审批,案卷号：" + projectReportRecord.getFileNum();
 		if("3".equals(record.getProjectType())){

src/main/java/com/jeeplus/modules/projectcontentinfo/service/ProjectcontentinfoService.java

@@ -4,6 +4,7 @@
 package com.jeeplus.modules.projectcontentinfo.service;
 
 import com.google.common.collect.Maps;
+import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.service.CrudService;
 import com.jeeplus.common.utils.MyBeanUtils;
@@ -102,6 +103,17 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 	private WorkContentContractinfoDao workContentContractinfoDao;
 	@Autowired
 	private ProjectImplementEarlyService projectImplementEarlyService;
+	@Autowired
+	private WorkattachmentService workattachmentService;
+
+	/**
+	 * 阿里云文件服务器前缀
+	 */
+	private final static String aliyunUrl = Global.getConfig("aliyunUrl");
+	/**
+	 * 百度云文件服务器前缀
+	 */
+	private final static String bosUrl = Global.getConfig("bosUrl");
 
 	private static MainDictDetailDao mainDictDetailDao = SpringContextHolder.getBean(MainDictDetailDao.class);
 
@@ -558,9 +570,17 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 					if (StringUtils.isBlank(workattachment.getId()) || "null".equals(workattachment.getId())) {
 						workattachment.preInsert();
 						if(StringUtils.isNotBlank(workattachment.getQuoteId())){
+							switch (uploadMode){
+								case "1":
+									workattachment.setUrl(workattachment.getUrl().replace(bosUrl,""));
+									break;
+								case "2":
+									workattachment.setUrl(workattachment.getUrl().replace(aliyunUrl,""));
+									break;
+							}
 							dao.saveBasedDataWorkAttachment(workattachment);
 						}else{
-							workattachmentDao.insert(workattachment);
+							workattachmentService.insertOnWorkAttachment(workattachment);
 						}
 						if (projectcontentinfo.getProjectReportData()!=null && StringUtils.isNotBlank(projectcontentinfo.getProjectReportData().getId())) {
 							try {
@@ -570,8 +590,7 @@ public class ProjectcontentinfoService extends CrudService<ProjectcontentinfoDao
 							}
 						}
 					} else {
-						workattachment.preUpdate();
-						workattachmentDao.update(workattachment);
+						workattachmentService.updateOnWorkAttachment(workattachment);
 					}
 				} else {
 					workattachmentDao.delete(workattachment);

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -1305,6 +1305,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 		attchment.setAttachmentId(projectRecords.getId());
 		attchment.setAttachmentFlag("82");
 		List<WorkClientAttachment> attachments = workattachmentService.getAttachmentList(attchment);
+		workattachmentService.clientAttachmentManageOnUrl(attachments);
 		projectRecords.setWorkAttachments(attachments);
 	}
 

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectRecordsDao.java

@@ -140,4 +140,11 @@ public interface RuralProjectRecordsDao extends CrudDao<RuralProjectRecords> {
      * @param projectRecords
      */
     void updateDate(RuralProjectRecords projectRecords);
+
+    /**
+     * 查询项目信息
+     * @param id
+     * @return
+     */
+    RuralProjectRecords getById(String id);
 }

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

@@ -171,6 +171,11 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		ruralProjectRecords.setUploadMode(uploadMode);
 		return ruralProjectRecords;
 	}
+	public RuralProjectRecords getById(String id) {
+		RuralProjectRecords ruralProjectRecords = dao.getById(id);
+		ruralProjectRecords.setUploadMode(uploadMode);
+		return ruralProjectRecords;
+	}
 	public ProjectRecords getProjectRecords(String id) {
 		return dao.getProjectRecords(id);
 	}

src/main/java/com/jeeplus/modules/sys/web/WorkattachmentController.java

@@ -149,7 +149,12 @@ public class WorkattachmentController extends BaseController {
 			workattachment.setCompanyId(UserUtils.getSelectCompany().getId());
 			workattachment.setUrl(url);
 			if(StringUtils.isNotBlank(workattachment.getAttachmentId())){
-				workattachmentService.save(workattachment);//保存
+				if(StringUtils.isBlank(workattachment.getId())){
+					workattachmentService.insertOnWorkAttachment(workattachment);
+				}else{
+					workattachmentService.updateOnWorkAttachment(workattachment);
+				}
+				//workattachmentService.save(workattachment);//保存
 			}
 			map.put("status","Success");
 			map.put("url",workattachment.getUrl().replace("%","%25")

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -82,6 +82,27 @@
 	</select>
 
 
+	<select id="getById" resultType="RuralProjectRecords" >
+		SELECT
+		<include refid="projectRecordsColumns"/>
+		,a.file_num AS "fileNum"
+		,a.check_process_instance_id AS "checkProcessInstanceId"
+		,su.name AS "createBy.name"
+		,o.top_company AS "office.name"
+		,a.project_master_id as "projectMasterId"
+		,a.submit_money as "submitMoney"
+		,a.engineering_type as "engineeringType"
+		FROM rural_project_records a
+		<include refid="projectRecordsJoins"/>
+		LEFT JOIN sys_user su ON su.id = a.create_by
+		LEFT JOIN sys_user supmi ON supmi.id = a.project_master_id
+		left join project_report_data prd on prd.project_id = a.id
+		LEFT JOIN rural_project_report_record prr on prd.id = prr.report_id
+		LEFT JOIN sys_office o ON o.id = a.office_id
+		WHERE a.id = #{id}
+	</select>
+
+
 	<select id="getProjectRecords" resultType="ProjectRecords" >
 		SELECT
 			<include refid="projectRecordsColumns"/>