|
@@ -2087,7 +2087,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
|
|
ruralProjectRecordsReported.setReportedConsultantList(reportedConsultants);
|
|
ruralProjectRecordsReported.setReportedConsultantList(reportedConsultants);
|
|
|
|
|
|
WorkClientAttachment workClientAttachment = new WorkClientAttachment();
|
|
WorkClientAttachment workClientAttachment = new WorkClientAttachment();
|
|
- workClientAttachment.setAttachmentId(id);
|
|
|
|
|
|
+ workClientAttachment.setAttachmentId(ruralProjectRecordsReported.getId());
|
|
|
|
+ workClientAttachment.setAttachmentFlag("95");
|
|
List<WorkClientAttachment> attachmentList = workattachmentService.getAttachmentList(workClientAttachment);
|
|
List<WorkClientAttachment> attachmentList = workattachmentService.getAttachmentList(workClientAttachment);
|
|
workattachmentService.clientAttachmentManageOnUrl(attachmentList);
|
|
workattachmentService.clientAttachmentManageOnUrl(attachmentList);
|
|
ruralProjectRecordsReported.setWorkAttachments(attachmentList);
|
|
ruralProjectRecordsReported.setWorkAttachments(attachmentList);
|
|
@@ -2226,6 +2227,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
|
|
}
|
|
}
|
|
if (WorkClientAttachment.DEL_FLAG_NORMAL.equals(workClientAttachment.getDelFlag())){
|
|
if (WorkClientAttachment.DEL_FLAG_NORMAL.equals(workClientAttachment.getDelFlag())){
|
|
workClientAttachment.setAttachmentId(reported.getId());
|
|
workClientAttachment.setAttachmentId(reported.getId());
|
|
|
|
+ workClientAttachment.setAttachmentFlag("95");
|
|
workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
|
|
workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
|
|
if (com.jeeplus.common.utils.StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())){
|
|
if (com.jeeplus.common.utils.StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())){
|
|
workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
|
|
workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
|