Browse Source

合同修改:添加中标通知书文件上传功能

user5 2 years ago
parent
commit
e3fd02bb0f

+ 27 - 27
src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -4071,19 +4071,19 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             companyAction.setType("CORPORATE");
             companyAction.setType("CORPORATE");
             companyAction.setName("公司印章");
             companyAction.setName("公司印章");
             companyAction.setSerialNo("1");
             companyAction.setSerialNo("1");
-            //公司圆章
-            serialIdSet.add(COMPANYROUNDSEALID);
+            //公司圆章(竖)
+            serialIdSet.add(COMPANYROUNDSEALIDVERTICAL);
             //添加盖章位置
             //添加盖章位置
             List<Location> locations = Lists.newArrayList();
             List<Location> locations = Lists.newArrayList();
             for (String documentId: documentList) {
             for (String documentId: documentList) {
                 Location location = new Location();
                 Location location = new Location();
-                location.setSealId(COMPANYROUNDSEALID);
+                location.setSealId(COMPANYROUNDSEALIDVERTICAL);
                 location.setDocumentId(documentId);
                 location.setDocumentId(documentId);
                 location.setPage("0");
                 location.setPage("0");
                 location.setRectType("SEAL_CORPORATE");
                 location.setRectType("SEAL_CORPORATE");
                 location.setKeywordIndex(-1);
                 location.setKeywordIndex(-1);
-                location.setOffsetX("0.6787");
-                location.setOffsetY("0.4664");
+                location.setOffsetX("0.3787");
+                location.setOffsetY("0.6664");
                 locations.add(location);
                 locations.add(location);
             }
             }
 
 
@@ -4093,7 +4093,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                 User user = UserUtils.get(principalUserId);
                 User user = UserUtils.get(principalUserId);
                 if(null != user){
                 if(null != user){
                     //获取成员印章id信息
                     //获取成员印章id信息
-                    String userSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(),"",user.getName() + "一级注册造价工程师章");
+                    String userSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(),"",user.getName() + "一级注册造价工程师章-竖");
                     if(StringUtils.isNotBlank(userSealId)){
                     if(StringUtils.isNotBlank(userSealId)){
                         for (String documentId: documentList) {
                         for (String documentId: documentList) {
                             //添加盖章位置
                             //添加盖章位置
@@ -4104,8 +4104,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                             principalLocation.setPage("0");
                             principalLocation.setPage("0");
                             principalLocation.setRectType("SEAL_CORPORATE");
                             principalLocation.setRectType("SEAL_CORPORATE");
                             principalLocation.setKeywordIndex(-1);
                             principalLocation.setKeywordIndex(-1);
-                            principalLocation.setOffsetX("0.5376");
-                            principalLocation.setOffsetY("0.2771");
+                            principalLocation.setOffsetX("0.5776");
+                            principalLocation.setOffsetY("0.5171");
                             locations.add(principalLocation);
                             locations.add(principalLocation);
                         }
                         }
                     }else{
                     }else{
@@ -4115,7 +4115,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                     }
                     }
 
 
                     //获取成员个人签名章印章id信息
                     //获取成员个人签名章印章id信息
-                    String userSignatureSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(),"",user.getName() + "个人签名章");
+                    String userSignatureSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(),"",user.getName() + "个人签名章-竖");
                     if(StringUtils.isNotBlank(userSignatureSealId)){
                     if(StringUtils.isNotBlank(userSignatureSealId)){
                         for (String documentId: documentList) {
                         for (String documentId: documentList) {
                             //添加盖章位置
                             //添加盖章位置
@@ -4126,8 +4126,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                             principalLocation.setPage("0");
                             principalLocation.setPage("0");
                             principalLocation.setRectType("SEAL_CORPORATE");
                             principalLocation.setRectType("SEAL_CORPORATE");
                             principalLocation.setKeywordIndex(-1);
                             principalLocation.setKeywordIndex(-1);
-                            principalLocation.setOffsetX("0.6476");
-                            principalLocation.setOffsetY("0.2671");
+                            principalLocation.setOffsetX("0.5776");
+                            principalLocation.setOffsetY("0.5671");
                             locations.add(principalLocation);
                             locations.add(principalLocation);
                         }
                         }
                     }else{
                     }else{
@@ -4145,7 +4145,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             User technologyPrincipalUser = UserUtils.getByLoginName("陈红星");
             User technologyPrincipalUser = UserUtils.getByLoginName("陈红星");
             if(null != technologyPrincipalUser){
             if(null != technologyPrincipalUser){
                 //获取成员印章id信息
                 //获取成员印章id信息
-                String userSealId = SignaturePostUtil.getUserSealByMobile(technologyPrincipalUser.getMobile(),"","陈红星个人签名章");
+                String userSealId = SignaturePostUtil.getUserSealByMobile(technologyPrincipalUser.getMobile(),"","陈红星个人签名章-竖");
                 if(StringUtils.isNotBlank(userSealId)){
                 if(StringUtils.isNotBlank(userSealId)){
                     for (String documentId: documentList) {
                     for (String documentId: documentList) {
                         //添加盖章位置
                         //添加盖章位置
@@ -4156,8 +4156,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                         principalLocation.setPage("0");
                         principalLocation.setPage("0");
                         principalLocation.setRectType("SEAL_CORPORATE");
                         principalLocation.setRectType("SEAL_CORPORATE");
                         principalLocation.setKeywordIndex(-1);
                         principalLocation.setKeywordIndex(-1);
-                        principalLocation.setOffsetX("0.6958");
-                        principalLocation.setOffsetY("0.4009");
+                        principalLocation.setOffsetX("0.4958");
+                        principalLocation.setOffsetY("0.7009");
                         locations.add(principalLocation);
                         locations.add(principalLocation);
                     }
                     }
 
 
@@ -4183,18 +4183,18 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             companyAction.setName("公司印章");
             companyAction.setName("公司印章");
             companyAction.setSerialNo("1");
             companyAction.setSerialNo("1");
             //公司圆章
             //公司圆章
-            serialIdSet.add(COMPANYROUNDSEALID);
+            serialIdSet.add(COMPANYROUNDSEALIDVERTICAL);
             //添加盖章位置
             //添加盖章位置
             List<Location> locations = Lists.newArrayList();
             List<Location> locations = Lists.newArrayList();
             for (String documentId: documentList) {
             for (String documentId: documentList) {
                 Location location = new Location();
                 Location location = new Location();
-                location.setSealId(COMPANYROUNDSEALID);
+                location.setSealId(COMPANYROUNDSEALIDVERTICAL);
                 location.setDocumentId(documentId);
                 location.setDocumentId(documentId);
                 location.setPage("0");
                 location.setPage("0");
                 location.setRectType("SEAL_CORPORATE");
                 location.setRectType("SEAL_CORPORATE");
                 location.setKeywordIndex(-1);
                 location.setKeywordIndex(-1);
-                location.setOffsetX("0.6787");
-                location.setOffsetY("0.3064");
+                location.setOffsetX("0.5187");
+                location.setOffsetY("0.6664");
                 locations.add(location);
                 locations.add(location);
             }
             }
 
 
@@ -4204,7 +4204,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                 User user = UserUtils.get(principalUserId);
                 User user = UserUtils.get(principalUserId);
                 if(null != user){
                 if(null != user){
                     //获取成员印章id信息
                     //获取成员印章id信息
-                    String userSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(),"",user.getName() + "一级注册造价工程师章");
+                    String userSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(),"",user.getName() + "一级注册造价工程师章-竖");
                     if(StringUtils.isNotBlank(userSealId)){
                     if(StringUtils.isNotBlank(userSealId)){
                         for (String documentId: documentList) {
                         for (String documentId: documentList) {
                             //添加盖章位置
                             //添加盖章位置
@@ -4215,8 +4215,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                             principalLocation.setPage("0");
                             principalLocation.setPage("0");
                             principalLocation.setRectType("SEAL_CORPORATE");
                             principalLocation.setRectType("SEAL_CORPORATE");
                             principalLocation.setKeywordIndex(-1);
                             principalLocation.setKeywordIndex(-1);
-                            principalLocation.setOffsetX("0.1376");
-                            principalLocation.setOffsetY("0.1371");
+                            principalLocation.setOffsetX("0.7276");
+                            principalLocation.setOffsetY("0.1571");
                             locations.add(principalLocation);
                             locations.add(principalLocation);
                         }
                         }
                     }else{
                     }else{
@@ -4226,7 +4226,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                     }
                     }
 
 
                     //获取成员个人签名章印章id信息
                     //获取成员个人签名章印章id信息
-                    String userSignatureSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(),"",user.getName() + "个人签名章");
+                    String userSignatureSealId = SignaturePostUtil.getUserSealByMobile(user.getMobile(),"",user.getName() + "个人签名章-竖");
                     if(StringUtils.isNotBlank(userSignatureSealId)){
                     if(StringUtils.isNotBlank(userSignatureSealId)){
                         for (String documentId: documentList) {
                         for (String documentId: documentList) {
                             //添加盖章位置
                             //添加盖章位置
@@ -4237,8 +4237,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                             principalLocation.setPage("0");
                             principalLocation.setPage("0");
                             principalLocation.setRectType("SEAL_CORPORATE");
                             principalLocation.setRectType("SEAL_CORPORATE");
                             principalLocation.setKeywordIndex(-1);
                             principalLocation.setKeywordIndex(-1);
-                            principalLocation.setOffsetX("0.2476");
-                            principalLocation.setOffsetY("0.1671");
+                            principalLocation.setOffsetX("0.6876");
+                            principalLocation.setOffsetY("0.1771");
                             locations.add(principalLocation);
                             locations.add(principalLocation);
                         }
                         }
                     }else{
                     }else{
@@ -4256,7 +4256,7 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
             User technologyPrincipalUser = UserUtils.getByLoginName("陈红星");
             User technologyPrincipalUser = UserUtils.getByLoginName("陈红星");
             if(null != technologyPrincipalUser){
             if(null != technologyPrincipalUser){
                 //获取成员印章id信息
                 //获取成员印章id信息
-                String userSealId = SignaturePostUtil.getUserSealByMobile(technologyPrincipalUser.getMobile(),"","陈红星个人签名章");
+                String userSealId = SignaturePostUtil.getUserSealByMobile(technologyPrincipalUser.getMobile(),"","陈红星个人签名章-竖");
                 if(StringUtils.isNotBlank(userSealId)){
                 if(StringUtils.isNotBlank(userSealId)){
                     for (String documentId: documentList) {
                     for (String documentId: documentList) {
                         //添加盖章位置
                         //添加盖章位置
@@ -4267,8 +4267,8 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
                         principalLocation.setPage("0");
                         principalLocation.setPage("0");
                         principalLocation.setRectType("SEAL_CORPORATE");
                         principalLocation.setRectType("SEAL_CORPORATE");
                         principalLocation.setKeywordIndex(-1);
                         principalLocation.setKeywordIndex(-1);
-                        principalLocation.setOffsetX("0.7958");
-                        principalLocation.setOffsetY("0.2909");
+                        principalLocation.setOffsetX("0.6258");
+                        principalLocation.setOffsetY("0.7809");
                         locations.add(principalLocation);
                         locations.add(principalLocation);
                     }
                     }
 
 

+ 1 - 0
src/main/java/com/jeeplus/modules/tools/utils/HttpPostTool.java

@@ -205,6 +205,7 @@ public class HttpPostTool {
             jsonObject = JSONObject.fromObject(buffer.toString());
             jsonObject = JSONObject.fromObject(buffer.toString());
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
+            System.out.println("上报接口错误:" + e);
         } finally {
         } finally {
             System.out.println(jsonObject.toString());
             System.out.println(jsonObject.toString());
         }
         }

+ 9 - 0
src/main/java/com/jeeplus/modules/workcontractinfo/entity/WorkContractInfo.java

@@ -111,6 +111,7 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	private AlterInfo alterInfo;
 	private AlterInfo alterInfo;
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
 	private List<WorkClientAttachment> workAttachmentAlters = Lists.newArrayList();
 	private List<WorkClientAttachment> workAttachmentAlters = Lists.newArrayList();
+	private List<WorkClientAttachment> workAttachmentLetterOfAcceptances = Lists.newArrayList();	//中标通知书文件
 	private String invalidateProcessInstanceId; //合同作废流程id
 	private String invalidateProcessInstanceId; //合同作废流程id
 	private String invalidateStatus ; //合同作废状态(invalidate_status:0未开启,1进行中,2已作废3驳回4撤回)
 	private String invalidateStatus ; //合同作废状态(invalidate_status:0未开启,1进行中,2已作废3驳回4撤回)
 	private String invalidateUserId ; //合同作废发起人id
 	private String invalidateUserId ; //合同作废发起人id
@@ -1236,4 +1237,12 @@ public class WorkContractInfo extends ActEntity<WorkContractInfo> {
 	public void setCreateId(String createId) {
 	public void setCreateId(String createId) {
 		this.createId = createId;
 		this.createId = createId;
 	}
 	}
+
+	public List<WorkClientAttachment> getWorkAttachmentLetterOfAcceptances() {
+		return workAttachmentLetterOfAcceptances;
+	}
+
+	public void setWorkAttachmentLetterOfAcceptances(List<WorkClientAttachment> workAttachmentLetterOfAcceptances) {
+		this.workAttachmentLetterOfAcceptances = workAttachmentLetterOfAcceptances;
+	}
 }
 }

+ 9 - 1
src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -165,6 +165,10 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 			workClientAttachment.setAttachmentId(id);
 			workClientAttachment.setAttachmentId(id);
 			workClientAttachment.setAttachmentFlag("44");
 			workClientAttachment.setAttachmentFlag("44");
 			workContractInfo.setWorkAttachments(workattachmentService.getAttachmentList(workClientAttachment));
 			workContractInfo.setWorkAttachments(workattachmentService.getAttachmentList(workClientAttachment));
+			WorkClientAttachment workClientAttachmentLetterOfAcceptance = new WorkClientAttachment();
+			workClientAttachmentLetterOfAcceptance.setAttachmentId(id);
+			workClientAttachmentLetterOfAcceptance.setAttachmentFlag("45");
+			workContractInfo.setWorkAttachmentLetterOfAcceptances(workattachmentService.getAttachmentList(workClientAttachmentLetterOfAcceptance));
 			WorkClientAttachment workClientAttachment2 = new WorkClientAttachment();
 			WorkClientAttachment workClientAttachment2 = new WorkClientAttachment();
 			workClientAttachment2.setAttachmentId(id);
 			workClientAttachment2.setAttachmentId(id);
 			workClientAttachment2.setAttachmentFlag("81");
 			workClientAttachment2.setAttachmentFlag("81");
@@ -586,7 +590,11 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 			}
 			}
 			if (WorkClientAttachment.DEL_FLAG_NORMAL.equals(workClientAttachment.getDelFlag())){
 			if (WorkClientAttachment.DEL_FLAG_NORMAL.equals(workClientAttachment.getDelFlag())){
 				workClientAttachment.setAttachmentId(workContractInfo.getId());
 				workClientAttachment.setAttachmentId(workContractInfo.getId());
-				workClientAttachment.setAttachmentFlag("44");
+				if(StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag())){
+					workClientAttachment.setAttachmentFlag(workClientAttachment.getAttachmentFlag());
+				}else{
+					workClientAttachment.setAttachmentFlag("44");
+				}
 				workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
 				workClientAttachment.setAttachmentUser(UserUtils.getUser().getId());
 				if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())){
 				if (StringUtils.isBlank(workClientAttachment.getId()) || "null".equals(workClientAttachment.getId())){
 					workattachmentService.insertOnWorkClientAttachment(workClientAttachment);
 					workattachmentService.insertOnWorkClientAttachment(workClientAttachment);

+ 7 - 7
src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -957,7 +957,7 @@ public class WorkContractInfoController extends BaseController {
                 List<WorkClientAttachment> list1 = new ArrayList<>();
                 List<WorkClientAttachment> list1 = new ArrayList<>();
                 List<WorkClientAttachment> list2 = new ArrayList<>();
                 List<WorkClientAttachment> list2 = new ArrayList<>();
                 for (WorkClientAttachment workClientAttachment:list){
                 for (WorkClientAttachment workClientAttachment:list){
-                    if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && workClientAttachment.getAttachmentFlag().equals("44")){
+                    if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && (workClientAttachment.getAttachmentFlag().equals("44") || workClientAttachment.getAttachmentFlag().equals("45"))){
                         list1.add(workClientAttachment);
                         list1.add(workClientAttachment);
                     }else {
                     }else {
                         list2.add(workClientAttachment);
                         list2.add(workClientAttachment);
@@ -1009,7 +1009,7 @@ public class WorkContractInfoController extends BaseController {
                 List<WorkClientAttachment> list1 = new ArrayList<>();
                 List<WorkClientAttachment> list1 = new ArrayList<>();
                 List<WorkClientAttachment> list2 = new ArrayList<>();
                 List<WorkClientAttachment> list2 = new ArrayList<>();
                 for (WorkClientAttachment workClientAttachment:list){
                 for (WorkClientAttachment workClientAttachment:list){
-                    if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && workClientAttachment.getAttachmentFlag().equals("44")){
+                    if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && (workClientAttachment.getAttachmentFlag().equals("44") || workClientAttachment.getAttachmentFlag().equals("45"))){
                         //  flag = 44 代表合同附件 ,
                         //  flag = 44 代表合同附件 ,
                         list1.add(workClientAttachment);
                         list1.add(workClientAttachment);
                     }else {
                     }else {
@@ -1078,7 +1078,7 @@ public class WorkContractInfoController extends BaseController {
                 List<WorkClientAttachment> list1 = new ArrayList<>();
                 List<WorkClientAttachment> list1 = new ArrayList<>();
                 List<WorkClientAttachment> list2 = new ArrayList<>();
                 List<WorkClientAttachment> list2 = new ArrayList<>();
                 for (WorkClientAttachment workClientAttachment:list){
                 for (WorkClientAttachment workClientAttachment:list){
-                    if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && workClientAttachment.getAttachmentFlag().equals("44")){
+                    if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && (workClientAttachment.getAttachmentFlag().equals("44") || workClientAttachment.getAttachmentFlag().equals("45"))){
                         list1.add(workClientAttachment);
                         list1.add(workClientAttachment);
                     }else {
                     }else {
                         list2.add(workClientAttachment);
                         list2.add(workClientAttachment);
@@ -1130,7 +1130,7 @@ public class WorkContractInfoController extends BaseController {
                 List<WorkClientAttachment> list1 = new ArrayList<>();
                 List<WorkClientAttachment> list1 = new ArrayList<>();
                 List<WorkClientAttachment> list2 = new ArrayList<>();
                 List<WorkClientAttachment> list2 = new ArrayList<>();
                 for (WorkClientAttachment workClientAttachment:list){
                 for (WorkClientAttachment workClientAttachment:list){
-                    if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && workClientAttachment.getAttachmentFlag().equals("44")){
+                    if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && (workClientAttachment.getAttachmentFlag().equals("44") || workClientAttachment.getAttachmentFlag().equals("45"))){
                         //  flag = 44 代表合同附件 ,
                         //  flag = 44 代表合同附件 ,
                         list1.add(workClientAttachment);
                         list1.add(workClientAttachment);
                     }else {
                     }else {
@@ -1213,7 +1213,7 @@ public class WorkContractInfoController extends BaseController {
             List<WorkClientAttachment> list1 = new ArrayList<>();
             List<WorkClientAttachment> list1 = new ArrayList<>();
             List<WorkClientAttachment> list2 = new ArrayList<>();
             List<WorkClientAttachment> list2 = new ArrayList<>();
             for (WorkClientAttachment workClientAttachment:list){
             for (WorkClientAttachment workClientAttachment:list){
-                if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && workClientAttachment.getAttachmentFlag().equals("44")){
+                if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && (workClientAttachment.getAttachmentFlag().equals("44") || workClientAttachment.getAttachmentFlag().equals("45"))){
                     list1.add(workClientAttachment);
                     list1.add(workClientAttachment);
                 }else {
                 }else {
                     list2.add(workClientAttachment);
                     list2.add(workClientAttachment);
@@ -1259,7 +1259,7 @@ public class WorkContractInfoController extends BaseController {
             List<WorkClientAttachment> list1 = new ArrayList<>();
             List<WorkClientAttachment> list1 = new ArrayList<>();
             List<WorkClientAttachment> list2 = new ArrayList<>();
             List<WorkClientAttachment> list2 = new ArrayList<>();
             for (WorkClientAttachment workClientAttachment:list){
             for (WorkClientAttachment workClientAttachment:list){
-                if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && workClientAttachment.getAttachmentFlag().equals("44")){
+                if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && (workClientAttachment.getAttachmentFlag().equals("44") || workClientAttachment.getAttachmentFlag().equals("45"))){
                     list1.add(workClientAttachment);
                     list1.add(workClientAttachment);
                 }else {
                 }else {
                     list2.add(workClientAttachment);
                     list2.add(workClientAttachment);
@@ -1306,7 +1306,7 @@ public class WorkContractInfoController extends BaseController {
         List<WorkClientAttachment> list = workContractInfo.getWorkAttachments();
         List<WorkClientAttachment> list = workContractInfo.getWorkAttachments();
         List<WorkClientAttachment> list1 = new ArrayList<>();
         List<WorkClientAttachment> list1 = new ArrayList<>();
         for (WorkClientAttachment workClientAttachment:list){
         for (WorkClientAttachment workClientAttachment:list){
-            if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && workClientAttachment.getAttachmentFlag().equals("44")){
+            if (StringUtils.isNotBlank(workClientAttachment.getAttachmentFlag()) && (workClientAttachment.getAttachmentFlag().equals("44") || workClientAttachment.getAttachmentFlag().equals("45"))){
                 list1.add(workClientAttachment);
                 list1.add(workClientAttachment);
             }
             }
         }
         }

+ 3 - 3
src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -6816,9 +6816,9 @@ public class WorkProjectNotifyController extends BaseController {
 						}
 						}
 						return "modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit";
 						return "modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordAudit";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
-						projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileAttachmentList()));
-						projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileGistdataList()));
-						projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectcontentinfo.getFileOtherList()));
+						projectReportRecord.setFileAttachmentList(projectcontentinfo.getFileAttachmentList());
+						projectReportRecord.setFileGistdataList(projectcontentinfo.getFileGistdataList());
+						projectReportRecord.setFileOtherList(projectcontentinfo.getFileOtherList());
 						if("1".equals(ruralProjectRecords.getEmergencyProject())){
 						if("1".equals(ruralProjectRecords.getEmergencyProject())){
 							//List<RuralReportConsultant> consultants=reConsultants(ruralProjectRecords,projectReportData);
 							//List<RuralReportConsultant> consultants=reConsultants(ruralProjectRecords,projectReportData);
 
 

+ 65 - 0
src/main/webapp/WEB-INF/tags/sys/collectSelectTwo.tag

@@ -0,0 +1,65 @@
+<%@ tag language="java" pageEncoding="UTF-8"%>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ attribute name="id" type="java.lang.String" required="true" description="编号"%>
+<%@ attribute name="name" type="java.lang.String" required="false" description="隐藏域名称(ID)"%>
+<%@ attribute name="value" type="java.lang.String" required="false" description="隐藏域值(ID)"%>
+<%@ attribute name="labelName" type="java.lang.String" required="false" description="输入框名称(Name)"%>
+<%@ attribute name="labelValue" type="java.lang.String" required="false" description="输入框值(Name)"%>
+<%@ attribute name="fieldLabels" type="java.lang.String" required="true" description="表格Th里显示的名字"%>
+<%@ attribute name="fieldKeys" type="java.lang.String" required="true" description="表格Td里显示的值"%>
+<%@ attribute name="searchLabel" type="java.lang.String" required="true" description="表格Td里显示的值"%>
+<%@ attribute name="searchKey" type="java.lang.String" required="true" description="表格Td里显示的值"%>
+<%@ attribute name="floorLabel" type="java.lang.String" required="false" description="表格Td里显示的值"%>
+<%@ attribute name="floorKey" type="java.lang.String" required="false" description="表格Td里显示的值"%>
+<%@ attribute name="housenumberLabel" type="java.lang.String" required="false" description="表格Td里显示的值"%>
+<%@ attribute name="housenumberKey" type="java.lang.String" required="false" description="表格Td里显示的值"%>
+<%@ attribute name="title" type="java.lang.String" required="true" description="选择框标题"%>
+<%@ attribute name="url" type="java.lang.String" required="true" description="数据地址"%>
+<%@ attribute name="cssClass" type="java.lang.String" required="false" description="css样式"%>
+<%@ attribute name="cssStyle" type="java.lang.String" required="false" description="css样式"%>
+<%@ attribute name="disabled" type="java.lang.String" required="false" description="是否限制选择,如果限制,设置为disabled"%>
+<script type="text/javascript">
+function searchGrid${id}(clientId){
+	var uri;
+	var length = $("#workClientLinkmanList tr").length;
+	uri = "${ctx}/projectAccessory/projectAccessory/getCollectList";
+	top.layer.open({
+	    type: 2,
+	    area: ['90%','90%'],
+	    title:"${title}",
+		skin:"two-btns",
+	    name:'friend',
+	    content: encodeURI(uri+"?fieldLabels=${fieldLabels}&fieldKeys=${fieldKeys}&url="+uri+"&searchLabel=${searchLabel}&searchKey=${searchKey}&floorLabel=${floorLabel}&floorKey=${floorKey}&housenumberLabel=${housenumberLabel}&housenumberKey=${housenumberKey}") ,
+	    btn: ['确定', '关闭'],
+	    yes: function(index, layero){
+	    	 var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
+	    	 var item = iframeWin.getSelectedItem();
+
+	    	 if(item == "-1"){
+		    	 return;
+	    	 }
+	    	 console.log(item)
+			 /*if (item.length>1){
+			 	console.log(item)
+				 top.layer.msg("不能进行多选,请重新选择。", {icon: 0});
+				 return false;
+			 }*/
+			 top.layer.close(index);//关闭对话框。
+           	 // setValuee(item);
+			insertTitleCollectionTwo(item)
+		  },
+		  cancel: function(index){
+	       }
+	});
+
+}
+</script>
+	<input id="${id}Id"  type="hidden" value="${value}"/>
+	<div class="input-group" style="float: left;width: 30px;">
+       		 <span class="input-group-btn">
+	       		 <a href=javascript:void(0); style="font-size:14px;" onclick="searchGridlinkmanLetterOfAcceptance($('#linkmanLetterOfAcceptanceId').val())" id="linkmanButton" class="nav-btn nav-btn-add"><i class="fa fa-search-plus"></i>
+	              收藏调用</a>
+       		 </span>
+
+    </div>
+	 <label id="${id}Name-error" class="error" for="${id}Name" style="display:none"></label>

+ 207 - 0
src/main/webapp/webpage/modules/workcontractinfo/newWorkContract/workContractAudit.jsp

@@ -349,6 +349,213 @@
                                     </table>
                                     </table>
                                 </div>
                                 </div>
                             </div>
                             </div>
+
+                            <div class="form-group layui-row">
+                                <div class="form-group-label"><h2>中标通知书信息</h2><span style="color: red;">注:有中标通知书必填,否则无法纸质归档。</span></div>
+                                <div class="layui-item layui-col-xs12 form-table-container" >
+                                    <table id="contentTable" class="table table-bordered table-condensed no-bottom-margin details">
+                                        <thead>
+                                        <tr>
+
+                                            <th>文件</th>
+                                            <th>上传人</th>
+                                            <th>上传时间</th>
+                                            <th width="180px">操作</th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        <c:choose>
+                                            <c:when test="${not empty workContractInfo.workAttachmentLetterOfAcceptances}">
+                                                <c:forEach items="${workContractInfo.workAttachmentLetterOfAcceptances}" var="workClientAttachment" varStatus="status">
+                                                    <tr>
+                                                            <%--<td>${status.index + 1}</td>--%>
+                                                        <c:choose>
+                                                            <c:when test="${workContractInfo.uploadMode == 2}">
+                                                                <c:choose>
+                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                                        <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                                    </c:when>
+                                                                    <c:otherwise>
+                                                                        <c:choose>
+                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                                            </c:when>
+                                                                            <c:otherwise>
+                                                                                <c:choose>
+                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:when>
+                                                                                    <c:otherwise>
+                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                                    </c:otherwise>
+                                                                                </c:choose>
+                                                                            </c:otherwise>
+                                                                        </c:choose>
+                                                                    </c:otherwise>
+                                                                </c:choose>
+                                                            </c:when>
+                                                            <c:otherwise>
+                                                                <c:choose>
+                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                                        <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                                    </c:when>
+                                                                    <c:otherwise>
+                                                                        <c:choose>
+                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                                            </c:when>
+                                                                            <c:otherwise>
+                                                                                <c:choose>
+                                                                                    <c:when test="${workReimbursement.uploadMode == 2}">
+                                                                                        <c:choose>
+                                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                                                                <td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                                                            </c:when>
+                                                                                            <c:otherwise>
+                                                                                                <c:choose>
+                                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                                                                        <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                                                                    </c:when>
+                                                                                                    <c:otherwise>
+                                                                                                        <c:choose>
+                                                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                                                            </c:when>
+                                                                                                            <c:otherwise>
+                                                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                                                            </c:otherwise>
+                                                                                                        </c:choose>
+                                                                                                    </c:otherwise>
+                                                                                                </c:choose>
+                                                                                            </c:otherwise>
+                                                                                        </c:choose>
+                                                                                    </c:when>
+                                                                                    <c:otherwise>
+                                                                                        <c:choose>
+                                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+                                                                                                <td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+                                                                                            </c:when>
+                                                                                            <c:otherwise>
+                                                                                                <c:choose>
+                                                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                                                                        <td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+                                                                                                    </c:when>
+                                                                                                    <c:otherwise>
+                                                                                                        <c:choose>
+                                                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+                                                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+                                                                                                            </c:when>
+                                                                                                            <c:otherwise>
+                                                                                                                <td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+                                                                                                            </c:otherwise>
+                                                                                                        </c:choose>
+                                                                                                    </c:otherwise>
+                                                                                                </c:choose>
+                                                                                            </c:otherwise>
+                                                                                        </c:choose>
+                                                                                    </c:otherwise>
+                                                                                </c:choose>
+                                                                            </c:otherwise>
+                                                                        </c:choose>
+                                                                    </c:otherwise>
+                                                                </c:choose>
+                                                            </c:otherwise>
+                                                        </c:choose>
+                                                        <td>${workClientAttachment.createBy.name}</td>
+                                                        <td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>
+                                                        <td  class="op-td">
+                                                            <div class="op-btn-box" >
+                                                                <c:set var="signflag" value="${fns:getSysParam('sign_flag',fns:getUser())}"/>
+                                                                <c:choose>
+                                                                    <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'doc')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'docx')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'xls')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'xlsx')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ppt')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'pptx')}">
+                                                                        <c:choose>
+                                                                            <c:when test="${signflag == '是'}">
+                                                                                <a href="javascript:void(0);" onclick="openDialogView('查看电子签章信息', '${ctx}/isignature/iSignatureDocument/form?recordId=${workClientAttachment.id}','95%', '95%')" class="op-btn op-btn-view" ><i class="fa fa-search-plus"></i> 查看</a>
+                                                                                <a href="javascript:location.href='${ctx}/isignature/iSignatureDocument/download?recordId=${workClientAttachment.id}'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                                            </c:when>
+                                                                            <c:otherwise>
+                                                                                <%--附件下载删除--%>
+                                                                                <c:choose>
+                                                                                    <c:when test="${workContractInfo.uploadMode == 2}">
+                                                                                        <c:choose>
+                                                                                            <c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+                                                                                                <a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                                                            </c:when>
+                                                                                            <c:otherwise>
+                                                                                                <a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                                                            </c:otherwise>
+                                                                                        </c:choose>
+                                                                                    </c:when>
+                                                                                    <c:otherwise>
+                                                                                        <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                                                    </c:otherwise>
+                                                                                </c:choose>
+                                                                            </c:otherwise>
+                                                                        </c:choose>
+                                                                    </c:when>
+                                                                    <c:otherwise>
+                                                                        <%--附件下载删除--%>
+                                                                        <c:choose>
+                                                                            <c:when test="${workContractInfo.uploadMode == 2}">
+                                                                                <a href="javascript:location.href='${workClientAttachment.temporaryUrl}'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                                            </c:when>
+                                                                            <c:otherwise>
+                                                                                <a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+                                                                            </c:otherwise>
+                                                                        </c:choose>
+                                                                    </c:otherwise>
+                                                                </c:choose>
+                                                                <c:if test="${workClientAttachment.collectFlag != 1}">
+                                                                    <a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+                                                                </c:if>
+                                                            </div>
+                                                        </td>
+                                                    </tr>
+                                                </c:forEach>
+                                            </c:when>
+                                            <c:otherwise>
+                                                <tr>
+                                                    <td colspan="4" align="center">暂无数据</td>
+                                                </tr>
+                                            </c:otherwise>
+                                        </c:choose>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+
+
                         </div>
                         </div>
 
 
 
 

+ 215 - 4
src/main/webapp/webpage/modules/workcontractinfo/newWorkContract/workContractInfoFormAdd.jsp

@@ -156,6 +156,12 @@
                 $("#attachment_review_file").click();
                 $("#attachment_review_file").click();
             });
             });
 
 
+
+			$("#attachment_btn_letterOfAcceptance").click(function () {
+				$("#attachment_file_letterOfAcceptance").click();
+			});
+
+
             laydate.render({
             laydate.render({
                 elem: '#contractDate',
                 elem: '#contractDate',
                 event: 'focus',
                 event: 'focus',
@@ -277,19 +283,33 @@
 				multipartUploadWithStsCollection('', file, attachmentId, attachmentFlag, '', divId, 0);
 				multipartUploadWithStsCollection('', file, attachmentId, attachmentFlag, '', divId, 0);
 			}
 			}
 		}
 		}
-        function insertTitleReview(tValue){
-            var files = $("#attachment_review_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
+        function insertTitleLetterOfAcceptance(tValue){
+            var files = $("#attachment_file_letterOfAcceptance")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
             var attachmentId = "";
             var attachmentId = "";
-            var attachmentFlag = "80";
+            var attachmentFlag = "45";
             console.log(file);
             console.log(file);
             var timestamp=new Date().getTime();
             var timestamp=new Date().getTime();
 
 
             var storeAs = "workContractInfo";
             var storeAs = "workContractInfo";
             var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
             var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
-            var divId = "_attachment_review";
+            var divId = "_attachment_letterOfAcceptance";
             $("#addFile"+divId).show();
             $("#addFile"+divId).show();
             multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,0);}
             multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,0);}
         }
         }
+		function insertTitleCollectionTwo(tValue){
+			var files = tValue;
+			for(var i = 0;i<files.length;i++) {
+				var file = files[i];
+				var attachmentId = "";
+				var attachmentFlag = "45";
+				console.log(file);
+				var timestamp = new Date().getTime();
+				/*将这段字符串存到数据库即可*/
+				var divId = "_attachment_letterOfAcceptance";
+				$("#addFile" + divId).show();
+				multipartUploadWithStsCollection('', file, attachmentId, attachmentFlag, '', divId, 0);
+			}
+		}
 
 
 
 
         function openBill(title,url,width,height,target,formId){
         function openBill(title,url,width,height,target,formId){
@@ -1025,6 +1045,197 @@
 								</table>
 								</table>
 							</div>
 							</div>
 						</div>
 						</div>
+
+
+						<div class="form-group layui-row">
+							<div class="form-group-label"><h2>中标通知书信息</h2><span style="color: red;">注:有中标通知书必填,否则无法纸质归档。</span></div>
+							<div class="layui-item nav-btns">
+								<a id="attachment_btn_letterOfAcceptance" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
+								<sys:collectSelectTwo  id="linkmanLetterOfAcceptance" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
+													name="linkman.id"  title="选择资料库"
+													cssClass="form-control judgment" fieldLabels="资料库" fieldKeys="name"
+													searchLabel="资料库" searchKey="fileName"></sys:collectSelectTwo>
+							</div>
+							<div id="addFile_attachment_letterOfAcceptance" style="display: none" class="upload-progress">
+								<span id="fileName_attachment_letterOfAcceptance" ></span>
+								<b><span id="baifenbi_attachment_letterOfAcceptance" ></span></b>
+								<div class="progress">
+									<div id="jindutiao_attachment_letterOfAcceptance" class="progress-bar" style="width: 0%" aria-valuenow="0">
+									</div>
+								</div>
+							</div>
+							<input id="attachment_file_letterOfAcceptance" type="file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitleLetterOfAcceptance(this.value);"/>
+							<span id="attachment_title"></span>
+							<div class="layui-item layui-col-xs12" style="padding:0 16px;">
+								<table id="listAttachment" class="table table-bordered table-condensed details">
+									<thead>
+									<tr>
+											<%-- <th>序号</th>--%>
+										<th>文件预览</th>
+										<th>上传人</th>
+										<th>上传时间</th>
+										<th width="200px">操作</th>
+									</tr>
+									</thead>
+									<tbody id="file_attachment_letterOfAcceptance">
+									<c:forEach items="${workContractInfo.workAttachmentLetterOfAcceptances}" var = "workClientAttachment" varStatus="status">
+										<tr>
+
+												<%-- <td>${status.index + 1}</td>--%>
+											<c:choose>
+												<c:when test="${workContractInfo.uploadMode == 2}">
+													<c:choose>
+														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+															<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+														</c:when>
+														<c:otherwise>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<c:choose>
+																		<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																			<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																		</c:when>
+																		<c:otherwise>
+																			<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																		</c:otherwise>
+																	</c:choose>
+																</c:otherwise>
+															</c:choose>
+														</c:otherwise>
+													</c:choose>
+												</c:when>
+												<c:otherwise>
+													<c:choose>
+														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+															<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+														</c:when>
+														<c:otherwise>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<c:choose>
+																		<c:when test="${workReimbursement.uploadMode == 2}">
+																			<c:choose>
+																				<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+																					<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+																				</c:when>
+																				<c:otherwise>
+																					<c:choose>
+																						<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																							<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+																						</c:when>
+																						<c:otherwise>
+																							<c:choose>
+																								<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																									<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																								</c:when>
+																								<c:otherwise>
+																									<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																								</c:otherwise>
+																							</c:choose>
+																						</c:otherwise>
+																					</c:choose>
+																				</c:otherwise>
+																			</c:choose>
+																		</c:when>
+																		<c:otherwise>
+																			<c:choose>
+																				<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+																					<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+																				</c:when>
+																				<c:otherwise>
+																					<c:choose>
+																						<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																							<td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+																						</c:when>
+																						<c:otherwise>
+																							<c:choose>
+																								<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																									<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																								</c:when>
+																								<c:otherwise>
+																									<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																								</c:otherwise>
+																							</c:choose>
+																						</c:otherwise>
+																					</c:choose>
+																				</c:otherwise>
+																			</c:choose>
+																		</c:otherwise>
+																	</c:choose>
+																</c:otherwise>
+															</c:choose>
+														</c:otherwise>
+													</c:choose>
+												</c:otherwise>
+											</c:choose>
+
+											<td>${workClientAttachment.createBy.name}</td>
+											<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+											<td class="op-td">
+												<div class="op-btn-box" >
+														<%--附件下载删除--%>
+													<c:choose>
+														<c:when test="${workContractInfo.uploadMode == 2}">
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																	<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																</c:when>
+																<c:otherwise>
+																	<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																</c:otherwise>
+															</c:choose>
+														</c:when>
+														<c:otherwise>
+															<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+														</c:otherwise>
+													</c:choose>
+													<c:if test="${workClientAttachment.collectFlag != 1}">
+														<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+													</c:if>
+													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
+														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
+													</c:if>
+
+												</div>
+											</td>
+										</tr>
+									</c:forEach>
+									</tbody>
+								</table>
+							</div>
+						</div>
+
 						<div class="form-group layui-row page-end"></div>
 						<div class="form-group layui-row page-end"></div>
 					</div>
 					</div>
 				</div>
 				</div>

+ 226 - 1
src/main/webapp/webpage/modules/workcontractinfo/newWorkContract/workContractInfoFormEdit.jsp

@@ -87,6 +87,10 @@
                 $("#attachment_file").click();
                 $("#attachment_file").click();
             });
             });
 
 
+			$("#attachment_btn_letterOfAcceptance").click(function () {
+				$("#attachment_file_letterOfAcceptance").click();
+			});
+
             $("input[name='ext']").on('ifChecked', function(event){
             $("input[name='ext']").on('ifChecked', function(event){
                 var radioVal = $(this).val();
                 var radioVal = $(this).val();
                 if(radioVal == 0){
                 if(radioVal == 0){
@@ -234,7 +238,7 @@
 			var files = tValue;
 			var files = tValue;
 			for(var i = 0;i<files.length;i++) {
 			for(var i = 0;i<files.length;i++) {
 				var file = files[i];
 				var file = files[i];
-				var attachmentId = "";
+				var attachmentId  = $("#id").val();
 				var attachmentFlag = "44";
 				var attachmentFlag = "44";
 				console.log(file);
 				console.log(file);
 				var timestamp = new Date().getTime();
 				var timestamp = new Date().getTime();
@@ -244,6 +248,37 @@
 				multipartUploadWithStsCollection('', file, attachmentId, attachmentFlag, '', divId, 0);
 				multipartUploadWithStsCollection('', file, attachmentId, attachmentFlag, '', divId, 0);
 			}
 			}
 		}
 		}
+
+		function insertTitleLetterOfAcceptance(tValue){
+			console.log("insertTitleLetterOfAcceptance")
+			var files = $("#attachment_file_letterOfAcceptance")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
+				var attachmentId  = $("#id").val();
+				var attachmentFlag = "45";
+				console.log(file);
+				var timestamp=new Date().getTime();
+
+				var storeAs = "workContractInfo";
+				var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
+				var divId = "_attachment_letterOfAcceptance";
+				$("#addFile"+divId).show();
+				multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,0);}
+		}
+		function insertTitleCollectionTwo(tValue){
+        	console.log("insertTitleCollectionTwo")
+			var files = tValue;
+			for(var i = 0;i<files.length;i++) {
+				var file = files[i];
+				var attachmentId  = $("#id").val();
+				var attachmentFlag = "45";
+				console.log(file);
+				var timestamp = new Date().getTime();
+				/*将这段字符串存到数据库即可*/
+				var divId = "_attachment_letterOfAcceptance";
+				$("#addFile" + divId).show();
+				multipartUploadWithStsCollection('', file, attachmentId, attachmentFlag, '', divId, 0);
+			}
+		}
+
         function insertTitleReview(tValue){
         function insertTitleReview(tValue){
             var files = $("#attachment_file_review")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
             var files = $("#attachment_file_review")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
             var attachmentId = "";
             var attachmentId = "";
@@ -967,6 +1002,196 @@
 						</table>
 						</table>
 					</div>
 					</div>
 				</div>
 				</div>
+
+					<div class="form-group layui-row">
+						<div class="form-group-label"><h2>中标通知书信息</h2><span style="color: red;">注:有中标通知书必填,否则无法纸质归档。</span></div>
+						<div class="layui-item nav-btns">
+							<a id="attachment_btn_letterOfAcceptance" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
+							<sys:collectSelectTwo  id="linkmanLetterOfAcceptance" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
+												   name="linkman.id"  title="选择资料库"
+												   cssClass="form-control judgment" fieldLabels="资料库" fieldKeys="name"
+												   searchLabel="资料库" searchKey="fileName"></sys:collectSelectTwo>
+						</div>
+						<div id="addFile_attachment_letterOfAcceptance" style="display: none" class="upload-progress">
+							<span id="fileName_attachment_letterOfAcceptance" ></span>
+							<b><span id="baifenbi_attachment_letterOfAcceptance" ></span></b>
+							<div class="progress">
+								<div id="jindutiao_attachment_letterOfAcceptance" class="progress-bar" style="width: 0%" aria-valuenow="0">
+								</div>
+							</div>
+						</div>
+						<input id="attachment_file_letterOfAcceptance" type="file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitleLetterOfAcceptance(this.value);"/>
+						<span id="attachment_title"></span>
+						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
+							<table id="listAttachment" class="table table-bordered table-condensed details">
+								<thead>
+								<tr>
+										<%-- <th>序号</th>--%>
+									<th>文件预览</th>
+									<th>上传人</th>
+									<th>上传时间</th>
+									<th width="200px">操作</th>
+								</tr>
+								</thead>
+								<tbody id="file_attachment_letterOfAcceptance">
+								<c:forEach items="${workContractInfo.workAttachmentLetterOfAcceptances}" var = "workClientAttachment" varStatus="status">
+									<tr>
+
+											<%-- <td>${status.index + 1}</td>--%>
+										<c:choose>
+											<c:when test="${workContractInfo.uploadMode == 2}">
+												<c:choose>
+													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+														<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+													</c:when>
+													<c:otherwise>
+														<c:choose>
+															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+															</c:when>
+															<c:otherwise>
+																<c:choose>
+																	<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																		<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																	</c:when>
+																	<c:otherwise>
+																		<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																	</c:otherwise>
+																</c:choose>
+															</c:otherwise>
+														</c:choose>
+													</c:otherwise>
+												</c:choose>
+											</c:when>
+											<c:otherwise>
+												<c:choose>
+													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+														<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+													</c:when>
+													<c:otherwise>
+														<c:choose>
+															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+															</c:when>
+															<c:otherwise>
+																<c:choose>
+																	<c:when test="${workReimbursement.uploadMode == 2}">
+																		<c:choose>
+																			<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+																				<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+																			</c:when>
+																			<c:otherwise>
+																				<c:choose>
+																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+																					</c:when>
+																					<c:otherwise>
+																						<c:choose>
+																							<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																								<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																							</c:when>
+																							<c:otherwise>
+																								<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																							</c:otherwise>
+																						</c:choose>
+																					</c:otherwise>
+																				</c:choose>
+																			</c:otherwise>
+																		</c:choose>
+																	</c:when>
+																	<c:otherwise>
+																		<c:choose>
+																			<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+																				<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+																			</c:when>
+																			<c:otherwise>
+																				<c:choose>
+																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																						<td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+																					</c:when>
+																					<c:otherwise>
+																						<c:choose>
+																							<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																								<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																							</c:when>
+																							<c:otherwise>
+																								<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																							</c:otherwise>
+																						</c:choose>
+																					</c:otherwise>
+																				</c:choose>
+																			</c:otherwise>
+																		</c:choose>
+																	</c:otherwise>
+																</c:choose>
+															</c:otherwise>
+														</c:choose>
+													</c:otherwise>
+												</c:choose>
+											</c:otherwise>
+										</c:choose>
+
+										<td>${workClientAttachment.createBy.name}</td>
+										<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+										<td class="op-td">
+											<div class="op-btn-box" >
+													<%--附件下载删除--%>
+												<c:choose>
+													<c:when test="${workContractInfo.uploadMode == 2}">
+														<c:choose>
+															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															</c:when>
+															<c:otherwise>
+																<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															</c:otherwise>
+														</c:choose>
+													</c:when>
+													<c:otherwise>
+														<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+													</c:otherwise>
+												</c:choose>
+												<c:if test="${workClientAttachment.collectFlag != 1}">
+													<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+												</c:if>
+												<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
+													<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
+												</c:if>
+
+											</div>
+										</td>
+									</tr>
+								</c:forEach>
+								</tbody>
+							</table>
+						</div>
+					</div>
+
 					<div class="form-group layui-row page-end"></div>
 					<div class="form-group layui-row page-end"></div>
 				</div>
 				</div>
 <%--				<div id="tab-2" class="tab-pane">
 <%--				<div id="tab-2" class="tab-pane">

+ 226 - 0
src/main/webapp/webpage/modules/workcontractinfo/workContractInfoAdminForm.jsp

@@ -101,6 +101,11 @@
             $("#attachment_btn").click(function () {
             $("#attachment_btn").click(function () {
                 $("#attachment_file").click();
                 $("#attachment_file").click();
             });
             });
+
+			$("#attachment_btn_letterOfAcceptance").click(function () {
+				$("#attachment_file_letterOfAcceptance").click();
+			});
+
             $("#attachment_review_btn").click(function () {
             $("#attachment_review_btn").click(function () {
                 $("#attachment_review_file").click();
                 $("#attachment_review_file").click();
             });
             });
@@ -224,6 +229,37 @@
             $("#addFile"+divId).show();
             $("#addFile"+divId).show();
             multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,0);}
             multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,0);}
         }
         }
+
+		function insertTitleLetterOfAcceptance(tValue){
+			console.log("insertTitleLetterOfAcceptance")
+			var files = $("#attachment_file_letterOfAcceptance")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
+				var attachmentId  = "";
+				var attachmentFlag = "45";
+				console.log(file);
+				var timestamp=new Date().getTime();
+
+				var storeAs = "workContractInfo";
+				var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
+				var divId = "_attachment_letterOfAcceptance";
+				$("#addFile"+divId).show();
+				multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,0);}
+		}
+		function insertTitleCollectionTwo(tValue){
+			console.log("insertTitleCollectionTwo")
+			var files = tValue;
+			for(var i = 0;i<files.length;i++) {
+				var file = files[i];
+				var attachmentId  = "";
+				var attachmentFlag = "45";
+				console.log(file);
+				var timestamp = new Date().getTime();
+				/*将这段字符串存到数据库即可*/
+				var divId = "_attachment_letterOfAcceptance";
+				$("#addFile" + divId).show();
+				multipartUploadWithStsCollection('', file, attachmentId, attachmentFlag, '', divId, 0);
+			}
+		}
+
         function insertTitleReview(tValue){
         function insertTitleReview(tValue){
             var files = $("#attachment_review_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
             var files = $("#attachment_review_file")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
             var attachmentId = "";
             var attachmentId = "";
@@ -953,6 +989,196 @@
 								</table>
 								</table>
 							</div>
 							</div>
 						</div>
 						</div>
+
+						<div class="form-group layui-row">
+							<div class="form-group-label"><h2>中标通知书信息</h2><span style="color: red;">注:有中标通知书必填,否则无法纸质归档。</span></div>
+							<div class="layui-item nav-btns">
+								<a id="attachment_btn_letterOfAcceptance" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
+								<sys:collectSelectTwo  id="linkmanLetterOfAcceptance" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
+													   name="linkman.id"  title="选择资料库"
+													   cssClass="form-control judgment" fieldLabels="资料库" fieldKeys="name"
+													   searchLabel="资料库" searchKey="fileName"></sys:collectSelectTwo>
+							</div>
+							<div id="addFile_attachment_letterOfAcceptance" style="display: none" class="upload-progress">
+								<span id="fileName_attachment_letterOfAcceptance" ></span>
+								<b><span id="baifenbi_attachment_letterOfAcceptance" ></span></b>
+								<div class="progress">
+									<div id="jindutiao_attachment_letterOfAcceptance" class="progress-bar" style="width: 0%" aria-valuenow="0">
+									</div>
+								</div>
+							</div>
+							<input id="attachment_file_letterOfAcceptance" type="file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitleLetterOfAcceptance(this.value);"/>
+							<span id="attachment_title"></span>
+							<div class="layui-item layui-col-xs12" style="padding:0 16px;">
+								<table id="listAttachment" class="table table-bordered table-condensed details">
+									<thead>
+									<tr>
+											<%-- <th>序号</th>--%>
+										<th>文件预览</th>
+										<th>上传人</th>
+										<th>上传时间</th>
+										<th width="200px">操作</th>
+									</tr>
+									</thead>
+									<tbody id="file_attachment_letterOfAcceptance">
+									<c:forEach items="${workContractInfo.workAttachmentLetterOfAcceptances}" var = "workClientAttachment" varStatus="status">
+										<tr>
+
+												<%-- <td>${status.index + 1}</td>--%>
+											<c:choose>
+												<c:when test="${workContractInfo.uploadMode == 2}">
+													<c:choose>
+														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+															<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+														</c:when>
+														<c:otherwise>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<c:choose>
+																		<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																			<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																		</c:when>
+																		<c:otherwise>
+																			<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																		</c:otherwise>
+																	</c:choose>
+																</c:otherwise>
+															</c:choose>
+														</c:otherwise>
+													</c:choose>
+												</c:when>
+												<c:otherwise>
+													<c:choose>
+														<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+															<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+														</c:when>
+														<c:otherwise>
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																	<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+																</c:when>
+																<c:otherwise>
+																	<c:choose>
+																		<c:when test="${workReimbursement.uploadMode == 2}">
+																			<c:choose>
+																				<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+																					<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+																				</c:when>
+																				<c:otherwise>
+																					<c:choose>
+																						<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																							<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+																						</c:when>
+																						<c:otherwise>
+																							<c:choose>
+																								<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																									<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																								</c:when>
+																								<c:otherwise>
+																									<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																								</c:otherwise>
+																							</c:choose>
+																						</c:otherwise>
+																					</c:choose>
+																				</c:otherwise>
+																			</c:choose>
+																		</c:when>
+																		<c:otherwise>
+																			<c:choose>
+																				<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+																					<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+																				</c:when>
+																				<c:otherwise>
+																					<c:choose>
+																						<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																							<td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+																						</c:when>
+																						<c:otherwise>
+																							<c:choose>
+																								<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																									<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																								</c:when>
+																								<c:otherwise>
+																									<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																								</c:otherwise>
+																							</c:choose>
+																						</c:otherwise>
+																					</c:choose>
+																				</c:otherwise>
+																			</c:choose>
+																		</c:otherwise>
+																	</c:choose>
+																</c:otherwise>
+															</c:choose>
+														</c:otherwise>
+													</c:choose>
+												</c:otherwise>
+											</c:choose>
+
+											<td>${workClientAttachment.createBy.name}</td>
+											<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+											<td class="op-td">
+												<div class="op-btn-box" >
+														<%--附件下载删除--%>
+													<c:choose>
+														<c:when test="${workContractInfo.uploadMode == 2}">
+															<c:choose>
+																<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																	<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																</c:when>
+																<c:otherwise>
+																	<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																</c:otherwise>
+															</c:choose>
+														</c:when>
+														<c:otherwise>
+															<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+														</c:otherwise>
+													</c:choose>
+													<c:if test="${workClientAttachment.collectFlag != 1}">
+														<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+													</c:if>
+													<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
+														<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
+													</c:if>
+
+												</div>
+											</td>
+										</tr>
+									</c:forEach>
+									</tbody>
+								</table>
+							</div>
+						</div>
+
 						<div class="form-group layui-row page-end"></div>
 						<div class="form-group layui-row page-end"></div>
 					</div>
 					</div>
 				</div>
 				</div>

+ 228 - 2
src/main/webapp/webpage/modules/workcontractinfo/workContractInfoFormEdit.jsp

@@ -87,6 +87,10 @@
                 $("#attachment_file").click();
                 $("#attachment_file").click();
             });
             });
 
 
+			$("#attachment_btn_letterOfAcceptance").click(function () {
+				$("#attachment_file_letterOfAcceptance").click();
+			});
+
             $("input[name='ext']").on('ifChecked', function(event){
             $("input[name='ext']").on('ifChecked', function(event){
                 var radioVal = $(this).val();
                 var radioVal = $(this).val();
                 if(radioVal == 0){
                 if(radioVal == 0){
@@ -234,7 +238,7 @@
 			var files = tValue;
 			var files = tValue;
 			for(var i = 0;i<files.length;i++) {
 			for(var i = 0;i<files.length;i++) {
 				var file = files[i];
 				var file = files[i];
-				var attachmentId = "";
+				var attachmentId  = $("#id").val();
 				var attachmentFlag = "44";
 				var attachmentFlag = "44";
 				console.log(file);
 				console.log(file);
 				var timestamp = new Date().getTime();
 				var timestamp = new Date().getTime();
@@ -244,9 +248,39 @@
 				multipartUploadWithStsCollection('', file, attachmentId, attachmentFlag, '', divId, 0);
 				multipartUploadWithStsCollection('', file, attachmentId, attachmentFlag, '', divId, 0);
 			}
 			}
 		}
 		}
+
+		function insertTitleLetterOfAcceptance(tValue){
+			console.log("insertTitleLetterOfAcceptance")
+			var files = $("#attachment_file_letterOfAcceptance")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
+				var attachmentId  = $("#id").val();
+				var attachmentFlag = "45";
+				console.log(file);
+				var timestamp=new Date().getTime();
+
+				var storeAs = "workContractInfo";
+				var uploadPath="http://gangwan-app.oss-cn-hangzhou.aliyuncs.com/"+storeAs;/*将这段字符串存到数据库即可*/
+				var divId = "_attachment_letterOfAcceptance";
+				$("#addFile"+divId).show();
+				multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,divId,0);}
+		}
+		function insertTitleCollectionTwo(tValue){
+			console.log("insertTitleCollectionTwo")
+			var files = tValue;
+			for(var i = 0;i<files.length;i++) {
+				var file = files[i];
+				var attachmentId  = $("#id").val();
+				var attachmentFlag = "45";
+				console.log(file);
+				var timestamp = new Date().getTime();
+				/*将这段字符串存到数据库即可*/
+				var divId = "_attachment_letterOfAcceptance";
+				$("#addFile" + divId).show();
+				multipartUploadWithStsCollection('', file, attachmentId, attachmentFlag, '', divId, 0);
+			}
+		}
         function insertTitleReview(tValue){
         function insertTitleReview(tValue){
             var files = $("#attachment_file_review")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
             var files = $("#attachment_file_review")[0].files;            for(var i = 0;i<files.length;i++) {                var file = files[i];
-            var attachmentId = "";
+				var attachmentId  = $("#id").val();
             var attachmentFlag = "80";
             var attachmentFlag = "80";
             console.log(file);
             console.log(file);
             var timestamp=new Date().getTime();
             var timestamp=new Date().getTime();
@@ -967,6 +1001,198 @@
 						</table>
 						</table>
 					</div>
 					</div>
 				</div>
 				</div>
+
+					<div class="form-group layui-row">
+						<div class="form-group-label"><h2>中标通知书信息</h2><span style="color: red;">注:有中标通知书必填,否则无法纸质归档。</span></div>
+						<div class="layui-item nav-btns">
+							<a id="attachment_btn_letterOfAcceptance" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
+							<sys:collectSelectTwo  id="linkmanLetterOfAcceptance" url="${ctx}/workclientinfo/workClientInfo/linkmanList"
+												   name="linkman.id"  title="选择资料库"
+												   cssClass="form-control judgment" fieldLabels="资料库" fieldKeys="name"
+												   searchLabel="资料库" searchKey="fileName"></sys:collectSelectTwo>
+						</div>
+						<div id="addFile_attachment_letterOfAcceptance" style="display: none" class="upload-progress">
+							<span id="fileName_attachment_letterOfAcceptance" ></span>
+							<b><span id="baifenbi_attachment_letterOfAcceptance" ></span></b>
+							<div class="progress">
+								<div id="jindutiao_attachment_letterOfAcceptance" class="progress-bar" style="width: 0%" aria-valuenow="0">
+								</div>
+							</div>
+						</div>
+						<input id="attachment_file_letterOfAcceptance" type="file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitleLetterOfAcceptance(this.value);"/>
+						<span id="attachment_title"></span>
+						<div class="layui-item layui-col-xs12" style="padding:0 16px;">
+							<table id="listAttachment" class="table table-bordered table-condensed details">
+								<thead>
+								<tr>
+										<%-- <th>序号</th>--%>
+									<th>文件预览</th>
+									<th>上传人</th>
+									<th>上传时间</th>
+									<th width="200px">操作</th>
+								</tr>
+								</thead>
+								<tbody id="file_attachment_letterOfAcceptance">
+								<c:forEach items="${workContractInfo.workAttachmentLetterOfAcceptances}" var = "workClientAttachment" varStatus="status">
+									<tr>
+
+											<%-- <td>${status.index + 1}</td>--%>
+										<c:choose>
+											<c:when test="${workContractInfo.uploadMode == 2}">
+												<c:choose>
+													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+														<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+													</c:when>
+													<c:otherwise>
+														<c:choose>
+															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+															</c:when>
+															<c:otherwise>
+																<c:choose>
+																	<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																		<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																	</c:when>
+																	<c:otherwise>
+																		<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																	</c:otherwise>
+																</c:choose>
+															</c:otherwise>
+														</c:choose>
+													</c:otherwise>
+												</c:choose>
+											</c:when>
+											<c:otherwise>
+												<c:choose>
+													<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+														<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+													</c:when>
+													<c:otherwise>
+														<c:choose>
+															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+															</c:when>
+															<c:otherwise>
+																<c:choose>
+																	<c:when test="${workReimbursement.uploadMode == 2}">
+																		<c:choose>
+																			<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+																				<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+																			</c:when>
+																			<c:otherwise>
+																				<c:choose>
+																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																						<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+																					</c:when>
+																					<c:otherwise>
+																						<c:choose>
+																							<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																								<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																							</c:when>
+																							<c:otherwise>
+																								<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																							</c:otherwise>
+																						</c:choose>
+																					</c:otherwise>
+																				</c:choose>
+																			</c:otherwise>
+																		</c:choose>
+																	</c:when>
+																	<c:otherwise>
+																		<c:choose>
+																			<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+																				<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+																			</c:when>
+																			<c:otherwise>
+																				<c:choose>
+																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																						<td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+																					</c:when>
+																					<c:otherwise>
+																						<c:choose>
+																							<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																								<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																							</c:when>
+																							<c:otherwise>
+																								<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																							</c:otherwise>
+																						</c:choose>
+																					</c:otherwise>
+																				</c:choose>
+																			</c:otherwise>
+																		</c:choose>
+																	</c:otherwise>
+																</c:choose>
+															</c:otherwise>
+														</c:choose>
+													</c:otherwise>
+												</c:choose>
+											</c:otherwise>
+										</c:choose>
+
+										<td>${workClientAttachment.createBy.name}</td>
+										<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
+										<td class="op-td">
+											<div class="op-btn-box" >
+													<%--附件下载删除--%>
+												<c:choose>
+													<c:when test="${workContractInfo.uploadMode == 2}">
+														<c:choose>
+															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															</c:when>
+															<c:otherwise>
+																<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+															</c:otherwise>
+														</c:choose>
+													</c:when>
+													<c:otherwise>
+														<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+													</c:otherwise>
+												</c:choose>
+												<c:if test="${workClientAttachment.collectFlag != 1}">
+													<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+												</c:if>
+												<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
+													<a href="javascript:void(0)" onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i>&nbsp;删除</a>
+												</c:if>
+
+											</div>
+										</td>
+									</tr>
+								</c:forEach>
+								</tbody>
+							</table>
+						</div>
+					</div>
+
+
+
 					<div class="form-group layui-row page-end"></div>
 					<div class="form-group layui-row page-end"></div>
 				</div>
 				</div>
 <%--				<div id="tab-2" class="tab-pane">
 <%--				<div id="tab-2" class="tab-pane">

+ 205 - 0
src/main/webapp/webpage/modules/workcontractinfo/workContractInfoLookForm.jsp

@@ -577,6 +577,211 @@
 							</table>
 							</table>
 						</div>
 						</div>
 					</div>
 					</div>
+
+					<div class="form-group layui-row">
+						<div class="form-group-label"><h2>中标通知书信息</h2><span style="color: red;">注:有中标通知书必填,否则无法纸质归档。</span></div>
+						<div class="layui-item layui-col-xs12 form-table-container" >
+							<table id="contentTable" class="table table-bordered table-condensed no-bottom-margin details">
+								<thead>
+								<tr>
+
+									<th>文件</th>
+									<th>上传人</th>
+									<th>上传时间</th>
+									<th width="180px">操作</th>
+								</tr>
+								</thead>
+								<tbody>
+								<c:choose>
+									<c:when test="${not empty workContractInfo.workAttachmentLetterOfAcceptances}">
+										<c:forEach items="${workContractInfo.workAttachmentLetterOfAcceptances}" var="workClientAttachment" varStatus="status">
+											<tr>
+													<%--<td>${status.index + 1}</td>--%>
+												<c:choose>
+													<c:when test="${workContractInfo.uploadMode == 2}">
+														<c:choose>
+															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+																<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+															</c:when>
+															<c:otherwise>
+																<c:choose>
+																	<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																		<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+																	</c:when>
+																	<c:otherwise>
+																		<c:choose>
+																			<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																				<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																			</c:when>
+																			<c:otherwise>
+																				<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																			</c:otherwise>
+																		</c:choose>
+																	</c:otherwise>
+																</c:choose>
+															</c:otherwise>
+														</c:choose>
+													</c:when>
+													<c:otherwise>
+														<c:choose>
+															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+																<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+															</c:when>
+															<c:otherwise>
+																<c:choose>
+																	<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																		<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+																	</c:when>
+																	<c:otherwise>
+																		<c:choose>
+																			<c:when test="${workReimbursement.uploadMode == 2}">
+																				<c:choose>
+																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+																						<td><img src="${workClientAttachment.temporaryUrl}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.temporaryUrl}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+																					</c:when>
+																					<c:otherwise>
+																						<c:choose>
+																							<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																								<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',1)">${workClientAttachment.attachmentName}</a></td>
+																							</c:when>
+																							<c:otherwise>
+																								<c:choose>
+																									<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																										<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',3)">${workClientAttachment.attachmentName}</a></td>
+																									</c:when>
+																									<c:otherwise>
+																										<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.temporaryUrl}',2)">${workClientAttachment.attachmentName}</a></td>
+																									</c:otherwise>
+																								</c:choose>
+																							</c:otherwise>
+																						</c:choose>
+																					</c:otherwise>
+																				</c:choose>
+																			</c:when>
+																			<c:otherwise>
+																				<c:choose>
+																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpg')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'png')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'gif')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'bmp')
+                                                   or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jpeg')}">
+																						<td><img src="${workClientAttachment.url}" width="50" height="50" onclick="openDialogView('预览','${ctx}/sys/picturepreview/picturePreview?url=${workClientAttachment.url}','90%','90%')" alt="${workClientAttachment.attachmentName}">
+																					</c:when>
+																					<c:otherwise>
+																						<c:choose>
+																							<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																								<td><a href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',1)">${workClientAttachment.attachmentName}</a></td>
+																							</c:when>
+																							<c:otherwise>
+																								<c:choose>
+																									<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'rar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'zip')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'jar')
+                                                       or fn:containsIgnoreCase(workClientAttachment.attachmentName,'7z')}">
+																										<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',3)">${workClientAttachment.attachmentName}</a></td>
+																									</c:when>
+																									<c:otherwise>
+																										<td><a class="attention-info" href="javascript:void(0)" onclick="openPreview('${workClientAttachment.url}',2)">${workClientAttachment.attachmentName}</a></td>
+																									</c:otherwise>
+																								</c:choose>
+																							</c:otherwise>
+																						</c:choose>
+																					</c:otherwise>
+																				</c:choose>
+																			</c:otherwise>
+																		</c:choose>
+																	</c:otherwise>
+																</c:choose>
+															</c:otherwise>
+														</c:choose>
+													</c:otherwise>
+												</c:choose>
+												<td>${workClientAttachment.createBy.name}</td>
+												<td><fmt:formatDate value="${workClientAttachment.createDate}" pattern="yyyy-MM-dd"/></td>
+												<td  class="op-td">
+													<div class="op-btn-box" >
+														<c:set var="signflag" value="${fns:getSysParam('sign_flag',fns:getUser())}"/>
+														<c:choose>
+															<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'doc')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'docx')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'xls')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'xlsx')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'ppt')
+                                                           or fn:containsIgnoreCase(workClientAttachment.attachmentName,'pptx')}">
+																<c:choose>
+																	<c:when test="${signflag == '是'}">
+																		<a href="javascript:void(0);" onclick="openDialogView('查看电子签章信息', '${ctx}/isignature/iSignatureDocument/form?recordId=${workClientAttachment.id}','95%', '95%')" class="op-btn op-btn-view" ><i class="fa fa-search-plus"></i> 查看</a>
+																		<a href="javascript:location.href='${ctx}/isignature/iSignatureDocument/download?recordId=${workClientAttachment.id}'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																	</c:when>
+																	<c:otherwise>
+																		<%--附件下载删除--%>
+																		<c:choose>
+																			<c:when test="${workContractInfo.uploadMode == 2}">
+																				<c:choose>
+																					<c:when test="${fn:containsIgnoreCase(workClientAttachment.attachmentName,'pdf')}">
+																						<a href="${workClientAttachment.temporaryUrl}" target="_blank" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																					</c:when>
+																					<c:otherwise>
+																						<a href="${workClientAttachment.temporaryUrl}" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																					</c:otherwise>
+																				</c:choose>
+																			</c:when>
+																			<c:otherwise>
+																				<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																			</c:otherwise>
+																		</c:choose>
+																	</c:otherwise>
+																</c:choose>
+															</c:when>
+															<c:otherwise>
+																<%--附件下载删除--%>
+																<c:choose>
+																	<c:when test="${workContractInfo.uploadMode == 2}">
+																		<a href="javascript:location.href='${workClientAttachment.temporaryUrl}'" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																	</c:when>
+																	<c:otherwise>
+																		<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+																	</c:otherwise>
+																</c:choose>
+															</c:otherwise>
+														</c:choose>
+														<c:if test="${workClientAttachment.collectFlag != 1}">
+															<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i>&nbsp;收藏</a>
+														</c:if>
+													</div>
+												</td>
+											</tr>
+										</c:forEach>
+									</c:when>
+									<c:otherwise>
+										<tr>
+											<td colspan="4" align="center">暂无数据</td>
+										</tr>
+									</c:otherwise>
+								</c:choose>
+								</tbody>
+							</table>
+						</div>
+					</div>
 				</div>
 				</div>
 
 
 		</div>
 		</div>