合同信息部分修改

src/main/java/com/jeeplus/modules/projectAccessory/service/ProjectTemplateService.java

@@ -332,7 +332,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
             info.setWorkAttachments(attachments);
             //判断是否为必填项，若为必填项则添加必填判定字段
             if(info.getRequiredStage() == projectTemplateInfo.getRequiredStage()){
-                info.setMustFlag(1);
+                //info.setMustFlag(1);
                 //判定必填项的下的是否有附件信息
                 if (attachments.size()!=0){
                     info.setFileFlag(1);
@@ -342,7 +342,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
                 info.setFileFlag(0);
             }
             if (("咨询效果评价表").equals(info.getAttachName()) && projectTemplateInfo.isFlag()){
-                info.setMustFlag(1);
+                //info.setMustFlag(1);
                 //判定必填项的下的是否有附件信息
                 if (attachments.size()!=0){
                     info.setFileFlag(1);
@@ -743,7 +743,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
             }
             //判断是否为必填项，若为必填项则添加必填判定字段
             if(info.getRequiredStage() == projectTemplateInfo.getRequiredStage() || (null != projectTemplateInfo.getRequiredStageList() && projectTemplateInfo.getRequiredStageList().contains(info.getRequiredStage()))){
-                info.setMustFlag(1);
+                //info.setMustFlag(1);
                 //判定必填项的下的是否有附件信息
                 if (attachments.size()!=0){
                     info.setFileFlag(1);
@@ -753,7 +753,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
                 info.setFileFlag(0);
             }
             if (("咨询效果评价表").equals(info.getAttachName()) && projectTemplateInfo.isFlag()){
-                info.setMustFlag(1);
+                //info.setMustFlag(1);
                 //判定必填项的下的是否有附件信息
                 if (attachments.size()!=0){
                     info.setFileFlag(1);
@@ -761,7 +761,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
             }
             if(StringUtils.isNotBlank(screenType) && screenType.contains("其他资料") && "其他资料".equals(info.getAttachName())){
                 if (screenType.contains("其他资料")){
-                    info.setMustFlag(1);
+                    //info.setMustFlag(1);
                     //判定必填项的下的是否有附件信息
                     if (null != info.getWorkAttachments() && info.getWorkAttachments().size()!=0){
                         info.setFileFlag(1);
@@ -984,7 +984,7 @@ public class ProjectTemplateService extends TreeService<ProjectTemplateDao, Proj
             info.setWorkAttachments(attachments);
             //判断是否为必填项，若为必填项则添加必填判定字段
             if(projectTemplateInfo.getRequiredStageList().indexOf(info.getRequiredStage()) != -1){
-                info.setMustFlag(1);
+                //info.setMustFlag(1);
                 //判定必填项的下的是否有附件信息
                 if (attachments.size()!=0){
                     info.setFileFlag(1);

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

@@ -310,6 +310,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String caseStatus;				//案例项目的状态
 	private String caseProcessId;			//案例项目的流程id
 	private String ziXunBDE;			//上报中的咨询标的额
+	private String companyType;			//公司类型（1：赣能；2：东兴）
 
 
 
@@ -2254,4 +2255,12 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	public void setPermissionOfficeIdList(List<String> permissionOfficeIdList) {
 		this.permissionOfficeIdList = permissionOfficeIdList;
 	}
+
+	public String getCompanyType() {
+		return companyType;
+	}
+
+	public void setCompanyType(String companyType) {
+		this.companyType = companyType;
+	}
 }

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

@@ -2003,7 +2003,7 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			info.setWorkAttachments(attachments);
 			//判断是否为必填项，若为必填项则添加必填判定字段
 			if(info.getRequiredStage() == projectTemplateInfo.getRequiredStage()){
-				info.setMustFlag(1);
+				//info.setMustFlag(1);
 			} else {
 				info.setMustFlag(0);
 			}

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewTwoController.java

@@ -161,57 +161,6 @@ public class RuralCostProjectMessageNewTwoController extends BaseController {
         //文件处理
         projectTemplateService.disposeProjectTemplateFile(mainDictDetails,relateInfo,engineeringId,ruralProjectRecords,projectReportRecord,"1000");
 
-        /*for (MainDictDetail mainDict : mainDictDetails) {
-            relateInfo.setAttachType(mainDict.getValue());
-            switch (mainDict.getValue()) {
-                case "11":
-                    List<ProjectTemplateInfo> fileAttachmentList = projectTemplateService.getProjectTemplateList(relateInfo);
-                    for (ProjectTemplateInfo info: fileAttachmentList) {
-                        info.setAttachTypes(info.getAttachTypes().toLowerCase());
-                        if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
-                            if("审定单".equals(info.getAttachName()) || "咨询报告书正文（含附件）  附件一：工程预算或结算汇总表 附件二：编制或审核说明 附件三：工程预算或结算审定单 附件四：工程预算或结算书".equals(info.getAttachName()) ){
-                                if(!info.getAttachTypes().contains("zip")){
-                                    info.setAttachTypes(info.getAttachTypes()+",zip");
-                                }
-                                if(!info.getAttachTypes().contains("rar")){
-                                    info.setAttachTypes(info.getAttachTypes()+",rar");
-                                }
-                            }
-                        }
-                    }
-                    projectReportRecord.setFileAttachmentList(fileAttachmentList);
-                    break;
-                case "12":
-                    List<ProjectTemplateInfo> projectTemplateList = projectTemplateService.getProjectTemplateList(relateInfo);
-                    for (ProjectTemplateInfo info: projectTemplateList) {
-                        info.setAttachTypes(info.getAttachTypes().toLowerCase());
-                        if(engineeringId.equals(ruralProjectRecords.getEngineeringType())){
-                            if("投标文件、中标通知书、工程承包合同（协议书记专用条款部分）、补充协议".equals(info.getAttachName()) || "送审工程预算、结算书".equals(info.getAttachName()) ){
-                                if(!info.getAttachTypes().contains("zip")){
-                                    info.setAttachTypes(info.getAttachTypes()+",zip");
-                                }
-                                if(!info.getAttachTypes().contains("rar")){
-                                    info.setAttachTypes(info.getAttachTypes()+",rar");
-                                }
-                            }
-                        }
-                    }
-                    projectReportRecord.setFileGistdataList(projectTemplateList);
-                    break;
-                case "13":
-                    BigDecimal submitScale = ruralProjectRecords.getSubmitScale();
-                    // 送审金额大于等于1000万时
-                    if(submitScale.compareTo(BigDecimal.valueOf(1000))!=-1){
-                        relateInfo.setFlag(true);
-                    }else {
-                        relateInfo.setFlag(false);
-                    }
-                    projectReportRecord.setFileOtherList(projectTemplateService.getProjectTemplateList(relateInfo));
-                    break;
-            }
-
-        }*/
-
         if(null != projectContractInfo){
             if(projectContractInfo.getWorkClientInfoList().size()>0){
                 model.addAttribute("workClientInfoName", projectContractInfo.getWorkClientInfoList().get(0).getName());

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

@@ -6,10 +6,8 @@ package com.jeeplus.modules.workclientinfo.dao;
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.workbidproject.entity.WorkBidProject;
-import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientJobTypeInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
-import com.jeeplus.modules.workcontent.entity.WorkContentInvestmentCost;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -44,6 +42,8 @@ public interface WorkClientLinkmanDao extends CrudDao<WorkClientLinkman> {
      * @return
      */
     int insertLinkman(WorkClientLinkman workClientLinkman);
+
+    public int deleteContractLinkman(String contractId);
     /**
      * 无合同状态下，添加委托方联系人，查询该公司下所有客户
      * @param workClientLinkman

src/main/java/com/jeeplus/modules/workclientinfo/entity/WorkClientLinkman.java

@@ -31,6 +31,7 @@ public class WorkClientLinkman extends DataEntity<WorkClientLinkman> {
 	private String uscCode;
 	private String createName;   //创建人
 	private  String contractNum;
+	private  String contractId;
 
 
 	public String getContractNum() {
@@ -164,4 +165,12 @@ public class WorkClientLinkman extends DataEntity<WorkClientLinkman> {
 	public void setCreateName(String createName) {
 		this.createName = createName;
 	}
+
+	public String getContractId() {
+		return contractId;
+	}
+
+	public void setContractId(String contractId) {
+		this.contractId = contractId;
+	}
 }

src/main/java/com/jeeplus/modules/workcontractinfo/dao/WorkContractInfoDao.java

@@ -3,7 +3,6 @@
  */
 package com.jeeplus.modules.workcontractinfo.dao;
 
-import afu.org.checkerframework.checker.igj.qual.I;
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.statement.entity.StatementCompanyComprehensiveInfo;
@@ -107,6 +106,8 @@ public interface WorkContractInfoDao extends CrudDao<WorkContractInfo> {
      * @return
      */
     WorkContractInfo getByContractNum(String contractNum);
+
+    WorkContractInfo getContractInfoByNum(WorkContractInfo contract);
     /**
      * 查找联系人
      * @param contractNum

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractBorrowService.java

@@ -257,7 +257,7 @@ public class WorkContractBorrowService extends CrudService<WorkContractBorrowDao
 	public String auditSave(WorkCntractBorrow workCntractBorrow,List<User> auditUsers) {
 			String userName = UserUtils.get(workCntractBorrow.getCreateBy().getId()).getName();
 			Office office = officeService.get(workCntractBorrow.getOfficeId());
-			String str =  "主委托方："+workCntractBorrow.getWorkContractInfo().getClient().getName()+",申请人:"+userName+",所属部门:"+office.getName();
+			String str =  "主委托方："+workCntractBorrow.getWorkContractInfo().getClientName()+",申请人:"+userName+",所属部门:"+office.getName();
 			String title = "合同名称:"+workCntractBorrow.getWorkContractInfo().getName();
 			// 对不同环节的业务逻辑进行操作
 			String taskDefKey = workCntractBorrow.getAct().getTaskDefKey();

src/main/java/com/jeeplus/modules/workcontractinfo/service/WorkContractInfoService.java

@@ -8,7 +8,9 @@ import com.jeeplus.common.config.Global;
 import com.jeeplus.common.oss.OSSClientUtil;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.service.CrudService;
-import com.jeeplus.common.utils.*;
+import com.jeeplus.common.utils.IdGen;
+import com.jeeplus.common.utils.MenuStatusEnum;
+import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.act.utils.ActUtils;
@@ -70,14 +72,15 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.awt.*;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.List;
 
 /**
  * 合同管理Service
@@ -266,6 +269,15 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		WorkContractInfo workContractInfo = super.get(id);
 		return workContractInfo;
 	}
+	/**
+	 * 仅查询合同信息
+	 * @param id
+	 * @return
+	 */
+	public WorkContractInfo getContractInfoByNum(WorkContractInfo contract) {
+		WorkContractInfo workContractInfo = dao.getContractInfoByNum(contract);
+		return workContractInfo;
+	}
 	public String getTotal(String id) {
 		WorkContractInfo workContractInfo = super.get(id);
 		String str = "";
@@ -567,9 +579,17 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		}
 
 		super.save(workContractInfo);
+		//根据合同编号删除所有合同联系人信息
+		workClientLinkmanDao.deleteContractLinkman(workContractInfo.getId());
+
 		List<WorkClientLinkman> linkmanList = workContractInfo.getWorkClientLinkmanList();
+		//添加合同联系人信息
 		for (WorkClientLinkman clientLinkman : linkmanList) {
+			if(StringUtils.isBlank(clientLinkman.getName())){
+				continue;
+			}
 			clientLinkman.setContractNum(workContractInfo.getContractNum());
+			clientLinkman.setContractId(workContractInfo.getId());
 			clientLinkman.preInsert();
 			workClientLinkmanDao.insertLinkman(clientLinkman);
 
@@ -871,201 +891,9 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 			}
 		}
 
-	//添加联系人集合
-		List<WorkClientLinkman> linkmanList = workContractInfo.getWorkClientLinkmanList();
-		for (WorkClientLinkman clientLinkman : linkmanList) {
-			clientLinkman.setContractNum(workContractInfo.getContractNum());
-			clientLinkman.preInsert();
-			workClientLinkmanDao.insertLinkman(clientLinkman);
-
-		}
-
-//		System.out.println("===============================<<<<<<<<<<<<<<<<"+linkmanList);
-		/*if (StringUtils.isBlank(workContractInfo.getContractNum())) {
-			//根据合同类型生成合同编号
-			String type = null;
-			if("100".equals(contractTypeId)){
-				type = WorkContractInfo.SERIAL_CONSULT;
-			}else if("101".equals(contractTypeId)){
-				type = WorkContractInfo.SERIAL_CHECK;
-			}else if("102".equals(contractTypeId)){
-				type = WorkContractInfo.SERIAL_AGENCY;
-			}else if("103".equals(contractTypeId)){
-				type = WorkContractInfo.SERIAL_AUDIT;
-			}else {
-				type = WorkContractInfo.SERIAL_ELST;
-			}
-
-//			synchronized (SYN_BYTE){
-//				workContractInfo.setContractNum(serialNumTplService.genSerialNum(UserUtils.get(workContractInfo.getCreateBy().getId()).getCompany(), type).replace("TYPE",contractType));
-//			}
-
 
-//			//生成合同编号
-//			workContractInfo.setContractNum(serialNumTplService.genSerialNumNotNum(UserUtils.get(workContractInfo.getCreateBy().getId()).getCompany(), WorkContractInfo.SERIAL_CONSULT).replace("TYPE",contractType));
-//			//根据当前合同编号查询对应最后一条合同编号
-//			String contractLastNumStr = dao.getContractLastNum(workContractInfo.getContractNum());
-//			if(StringUtils.isNotBlank(contractLastNumStr)) {
-//				//获取最新的后缀编号
-//				Integer num = Integer.parseInt(contractLastNumStr.substring(workContractInfo.getContractNum().length(), contractLastNumStr.length())) + 1;
-//				//更新合同编号
-//				workContractInfo.setContractNum(workContractInfo.getContractNum() + String.format("%04d", num));
-//			}else {
-//				//更新合同编号
-//				workContractInfo.setContractNum(workContractInfo.getContractNum() + String.format("%04d", 1));
-//			}
-//			long end2 = System.currentTimeMillis();
-//			logger.info("合同送审-项目编码设置任务结束，共耗时：[" + (end2-begin) / 1000 + "]秒");
-//		}
-//		long begin2 = System.currentTimeMillis();
-//		if (StringUtils.isBlank(workContractInfo.getContractNumPath())) {
-//			String num=workContractInfo.getContractNum();
-//			long time = System.currentTimeMillis();
-//			String picNamePhoto = time + ".png";
-//			ByteArrayOutputStream byteArrayOutputStream=new ByteArrayOutputStream();
-//			WordToPic.TextToAliyunPic(num, 500, 80, 25,new Color(0,188,212), byteArrayOutputStream);
-//
-//			byte[] buf = byteArrayOutputStream.toByteArray();
-//			ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(buf);
-//			OSSClientUtil ossUtil = new OSSClientUtil();
-//			ossUtil.uploadFile2OSS(byteArrayInputStream, Global.getContractNumPath(), picNamePhoto);
-//			workContractInfo.setContractNumPath(Global.getAliyunUrl()+"/"+Global.getContractNumPath()+picNamePhoto);
-		}*/
 		workContractInfo.setContractState("5");
 		this.save(workContractInfo);
-//		Office office = UserUtils.getUser().getOffice();
-//		String title = "合同【"+workContractInfo.getName() +"】登记待审批";
-//		String str = "合同【"+workContractInfo.getName() +"】登记待审批，合同编号："+workContractInfo.getContractNum();
-//		identityService.setAuthenticatedUserId(workContractInfo.getCreateBy().getId());
-//		String businessKey = workContractInfo.getId().toString();
-//		WorkActivityMenu workActivityMenu = workActivityMenuService.findByParentAndOffice("zth3125f1f194c82bdea93555c750905", office);
-//		// 启动流程
-//		String processType = workActivityMenu.getProcessType();
-//		StringBuffer buffer = new StringBuffer();
-//		Activity activity = new Activity();
-//		WorkProjectNotify workProjectNotify = UtilNotify
-//				.saveNotify(workContractInfo.getId(),
-//						null,
-//						workContractInfo.getCompanyId(),
-//						title,
-//						str,
-//						"143",
-//						"0",
-//						"待审批",
-//						""
-//				);
-//		List<User> users = new ArrayList<>();
-//		String officeId = UserUtils.getSelectOffice().getId();
-//		List<User>  bmzrs = UserUtils.getByRoleActivityEnname("bmzr",2,office.getId(),"2",workContractInfo.getCreateBy());
-////		List<User>  scyfglbzrs = UserUtils.getByRoleActivityEnname("scyfglbzr",1,office.getId(),"2",workContractInfo.getCreateBy());
-//		//获取总经理人员信息
-//		List<User>  zjls = UserUtils.getByRoleActivityEnname("zjl",3,office.getId(),"2",workContractInfo.getCreateBy());
-//		long end3 = System.currentTimeMillis();
-//		logger.info("合同送审-查找人员审核任务结束，共耗时：[" + (end3-begin2) / 1000 + "]秒");
-//		long begin3 = System.currentTimeMillis();
-//		if (StringUtils.isNotBlank(workActivityMenu.getId())) {
-//			workProjectNotify.setNotifyRole("");
-//			workActivityMenu = workActivityMenuService.get(workActivityMenu.getId());
-//			List<Activity> activities = workActivityMenu.getActivities();
-//			for (Activity a : activities) {
-//				String encount = a.getEncount();
-//				String enlist = a.getEnlist();
-//				if (a.getRole() != null && StringUtils.isNotBlank(a.getRole().getEnname())) {
-//					List enusers = UserUtils.getByRoleActivityEnnames(a.getRole().getEnname(), office.getId(), "2", workContractInfo.getCreateBy());
-//					if (enusers.size() == 0) {
-//						workContractInfo.setContractState("1");
-//						this.save(workContractInfo);
-//						return "流程审批人不能为空,角色部门负责人下无用户,请联系管理员！";
-//					}
-//					variables.put(enlist, enusers);
-//					variables.put(encount, enusers.size());
-//				}
-//				if (a.getDelFlag().equals("0") && a.getCount() == 1) {
-//					activity = a;
-//				}
-//			}
-//			buffer.append(activity.getRole().getEnname());
-//			if (activity != null && StringUtils.isNotBlank(activity.getId())) {
-//				//角色审批
-//				if (StringUtils.isNotBlank(activity.getRole().getEnname())) {
-//					users = UserUtils.getByRoleActivityEnnames(activity.getRole().getEnname(), office.getId(), "2", workContractInfo.getCreateBy());
-//				}
-//				//人员审批
-//				if (StringUtils.isNotBlank(activity.getUser().getId())) {
-//					users.add(activity.getUser());
-//				}
-//			}
-//			workProjectNotify.setId("");
-//		} else {
-//			processType = "newContractAudit";
-//			if(bmzrs==null||bmzrs.size()==0){
-//				workContractInfo.setContractState("1");
-//				this.save(workContractInfo);
-//				return "流程审批人不能为空,角色部门负责人下无用户,请联系管理员！";
-//			}
-//			if(zjls==null||zjls.size()==0){
-//				workContractInfo.setContractState("1");
-//				this.save(workContractInfo);
-//				return "流程总经理审批人不能为空,总经理审批人下无用户,请联系管理员！";
-//			}
-//			variables.put("bmzrList", bmzrs);
-//			variables.put("bmzrCount",bmzrs.size());
-//			users.addAll(bmzrs);
-//		}
-//
-//		for (User u : users) {
-//			workProjectNotify.setUser(u);
-//			workProjectNotify.setId("");
-//			workProjectNotify.setNotifyRole("部门主任审批");
-//			workProjectNotifyService
-//					.save(workProjectNotify);
-//			Map<String,Object> extras = new HashMap<>();
-//			extras.put("type","7002");
-//			extras.put("id",workProjectNotify.getId());
-//			extras.put("procDefKey","143");
-//			UserUtils.pushInfoToApp(title,str,extras,u.getId());
-//			UserUtils.pushIm(u.getId(),str);
-//		}
-//		variables.put("type", processType);
-//		variables.put("busId", businessKey);
-////		variables.put("count",users.size());
-////		variables.put("assigneeList",users);
-//		variables.put("title", "合同名称:" + workContractInfo.getName());//设置标题；
-//		long s1 = System.currentTimeMillis();
-//		ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(processType, businessKey, variables);
-//		long s2 = System.currentTimeMillis();
-//		workContractInfo.setProcessInstance(processInstance);
-//		if (StringUtils.isNotBlank(processInstanceId)) {
-//			workActivityProcessService.updateProcessInstanceId(processInstance.getId(),processInstanceId);
-//			workActivityProcessService.deleteProcessInstanceId(processInstanceId);
-//			workActivityProcessService.deleteProcessIdAuditUsers(processInstanceId);
-//		}
-//		// 更新流程实例ID
-//		workContractInfo.setProcessInstanceId(processInstance.getId());
-//		workContractInfoDao.updateProcessInstanceId(workContractInfo);
-//		//通知添加流程实例ID
-//		workProjectNotify.setProcessInstanceId(processInstance.getId());
-//		workProjectNotify.setWapBeginDate(new Date());
-//		workProjectNotifyService.save(workProjectNotify);
-//
-//		List<Activity> list = workActivityMenu.getActivities();
-//		if (list != null && list.size() != 0) {
-//			workActivityProcessService.saveList(list, processInstance.getId());
-//		} else {
-//			WorkActivityProcess workActivityProcess = new WorkActivityProcess();
-//			workActivityProcess.setProcessKey("newContractAudit");
-//			workActivityProcess.setCount(1);
-//			workActivityProcess.setProcessInstanceId(processInstance.getId());
-//			workActivityProcess.setIsApproval("0");
-//			workActivityProcessService.save(workActivityProcess);
-//			workActivityProcess.setCount(2);
-//			workActivityProcessService.insert(workActivityProcess);
-//			workActivityProcessService.insertAuditsByType(bmzrs,processInstance.getId(),1,1);
-//			workActivityProcessService.insertAuditsByType(zjls,processInstance.getId(),2,0);
-////			workActivityProcessService.insertAuditsByType(fglds,processInstance.getId(),3,0);
-//		}
-//		long end = System.currentTimeMillis();
-//		logger.info("合同送审任务结束，共耗时：[" + (end-begin) / 1000 + "]秒,流程启动时间："+(s2-s1)+"ms");
 		return "";
 	}
 

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -6,37 +6,25 @@ package com.jeeplus.modules.workcontractinfo.web;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.google.zxing.aztec.decoder.Decoder;
 import com.jeeplus.common.beanvalidator.BeanValidators;
 import com.jeeplus.common.bos.BOSClientUtil;
 import com.jeeplus.common.config.Global;
-import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.oss.OSSClientUtil;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.DateUtils;
-import com.jeeplus.common.utils.IdGen;
 import com.jeeplus.common.utils.MyBeanUtils;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.common.web.BaseController;
-import com.jeeplus.common.websocket.onchat.ChatServerPool;
 import com.jeeplus.modules.act.entity.Act;
 import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.act.utils.ActUtils;
 import com.jeeplus.modules.alterinfo.entity.AlterInfo;
 import com.jeeplus.modules.alterinfo.service.AlterInfoService;
-import com.jeeplus.modules.contractclient.entity.WorkContractClient;
-import com.jeeplus.modules.contractclient.service.WorkContractClientService;
-import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
-import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectReportInfo;
-import com.jeeplus.modules.sys.entity.Area;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.entity.User;
-import com.jeeplus.modules.sys.service.OfficeService;
-import com.jeeplus.modules.sys.service.WorkattachmentService;
-import com.jeeplus.modules.sys.utils.RoleActivityEnname;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.sysimportinfo.entity.SysImportInfo;
 import com.jeeplus.modules.sysimportinfo.service.SysImportInfoService;
@@ -50,8 +38,10 @@ import com.jeeplus.modules.workclientinfo.entity.WorkClientAttachment;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
-import com.jeeplus.modules.workcontractinfo.dao.WorkContractInfoCopyDao;
-import com.jeeplus.modules.workcontractinfo.entity.*;
+import com.jeeplus.modules.workcontractinfo.entity.WorkCntractBorrow;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractListInfo;
+import com.jeeplus.modules.workcontractinfo.entity.WorkContractReview;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoTookDisposeService;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractReviewService;
@@ -66,7 +56,6 @@ import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -553,8 +542,10 @@ public class WorkContractInfoController extends BaseController {
         if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
             workContractInfo.setChargeCriterionList(Arrays.asList(workContractInfo.getChargeCriterion().split(",")));
         }
-        workContractInfo.setWorkClientLinkmanList(workContractInfoService.getClientList(workContractInfo.getContractNum()));
-
+        workContractInfo.setWorkClientLinkmanList(workContractInfoService.getClientList(workContractInfo.getId()));
+        if(StringUtils.isBlank(workContractInfo.getCompany())){
+            workContractInfo.setCompany("0");
+        }
 //        workContractInfo.getWorkClientLinkmanList().forEach(w->{
 //            System.out.println(w.getName() + "---" + w.getEmail());
 //        });
@@ -888,8 +879,7 @@ public class WorkContractInfoController extends BaseController {
         if(StringUtils.isNotBlank(workContractInfo.getChargeCriterion())){
             workContractInfo.setChargeCriterionList(Arrays.asList(workContractInfo.getChargeCriterion().split(",")));
         }
-        List<WorkClientLinkman> clientList = workContractInfoService.getClientList(workContractInfo.getContractNum());
-        System.out.println("=================================>>>>>>>>>>>>>>>>"+clientList);
+        List<WorkClientLinkman> clientList = workContractInfoService.getClientList(workContractInfo.getId());
 
         //合同作废信息
         AlterInfo alterInfo = alterInfoService.getByContractInfo(workContractInfo);
@@ -1082,7 +1072,17 @@ public class WorkContractInfoController extends BaseController {
                 workContractInfo.setTotalContractId("0");
                 //workContractInfo.setCommonFlag(IdGen.uuid());
             }
+
+
             if (!workContractInfo.getIsNewRecord()) {
+
+                //查询合同编号是否在数据库中已存在。若存在，则进行抛出
+                WorkContractInfo contractInfoByNum = workContractInfoService.getContractInfoByNum(workContractInfo);//从数据库取出记录的值
+                if(null != contractInfoByNum){
+                    addMessage(redirectAttributes, "合同编号已存在，无法进行添加");
+                    return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
+                }
+
                 List<WorkClientAttachment> list = workContractInfo.getWorkAttachments();
                 List<WorkClientAttachment> list1 = new ArrayList<>();
                 List<WorkClientAttachment> list2 = new ArrayList<>();
@@ -1220,7 +1220,17 @@ public class WorkContractInfoController extends BaseController {
             workContractInfo.setTotalContractId("0");
             //workContractInfo.setCommonFlag(IdGen.uuid());
         }
+
         if(!workContractInfo.getIsNewRecord()){//编辑表单保存
+
+
+            //查询合同编号是否在数据库中已存在。若存在，则进行抛出
+            WorkContractInfo contractInfoByNum = workContractInfoService.getContractInfoByNum(workContractInfo);//从数据库取出记录的值
+            if(null != contractInfoByNum){
+                addMessage(redirectAttributes, "合同编号已存在，无法进行添加");
+                return "redirect:" + Global.getAdminPath() + "/workcontractinfo/workContractInfo/?repage";
+            }
+
             List<WorkClientAttachment> list = workContractInfo.getWorkAttachments();
             List<WorkClientAttachment> list1 = new ArrayList<>();
             List<WorkClientAttachment> list2 = new ArrayList<>();

src/main/java/com/jeeplus/modules/workcontractrecord/service/WorkContractRecordService.java

@@ -480,7 +480,7 @@ public class WorkContractRecordService extends CrudService<WorkContractRecordDao
 	public String auditSave(WorkContractRecord workContractRecord,List<User> auditUsers) {
 			String userName = UserUtils.get(workContractRecord.getCreateBy().getId()).getName();
 			Office office = officeService.get(workContractRecord.getOfficeId());
-			String str =  "归档申请编号："+workContractRecord.getRecordNum()+",主委托方："+workContractRecord.getWorkContractInfo().getClient().getName()+",申请人:"+userName+",所属部门:"+office.getName();
+			String str =  "归档申请编号："+workContractRecord.getRecordNum()+",主委托方："+workContractRecord.getWorkContractInfo().getClientName()+",申请人:"+userName+",所属部门:"+office.getName();
 			String title = "合同名称:"+workContractRecord.getWorkContractInfo().getName();
 			// 对不同环节的业务逻辑进行操作
 			String taskDefKey = workContractRecord.getAct().getTaskDefKey();

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

@@ -393,6 +393,10 @@
 		)
 	</insert>
 
+    <delete id="deleteContractLinkman">
+		delete from work_client_linkman where contract_id =#{contractId}
+	</delete>
+
     <delete id="jobTypeDelete">
 		delete from work_client_job_type_info where work_client_id =#{workClientId}
 	</delete>

src/main/resources/mappings/modules/workcontractinfo/WorkContractInfoDao.xml

@@ -37,6 +37,7 @@
 		a.contract_role AS  "contractRole",
 		a.apply_view AS  "applyView",
 		a.company_id AS "companyId",
+		a.company as company,
 		a.contractFeeDoc AS "contractFeeDoc",
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.process_instance_id AS "processInstanceId",
@@ -115,6 +116,7 @@
 		a.apply_view AS "applyView",
 		a.process_instance_id AS "processInstanceId",
 		a.company_id as companyId,
+		a.company as company,
 		a.contractFeeDoc AS "contractFeeDoc",
 		a.contractTypeDoc AS "contractTypeDoc",
 		a.another_contract_num AS "anotherContractNum",
@@ -1519,6 +1521,84 @@
 		limit 1
 	</select>
 
+
+	<select id="getContractInfoByNum" resultType="WorkContractInfo" >
+		SELECT
+		a.id AS "id",
+		a.project_id AS "project.id",
+		a.ext AS  "ext",
+		u.name AS "createBy.name",
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.del_flag AS "delFlag",
+		a.remarks AS "remarks",
+		a.client_id AS "client.id",
+		a.contract_date AS "contractDate",
+		a.effective_date AS "effectiveDate",
+		a.closing_date AS "closingDate",
+		a.name AS "name",
+		a.contract_num_path AS "contractNumPath",
+		a.create_name AS "createName",
+		a.contract_category AS "contractCategory",
+		a.contract_num AS "contractNum",
+		a.contract_price AS "contractPrice",
+		a.contract_opposite AS "contractOpposite",
+		a.contract_type AS "contractType",
+		a.contract_fee AS "contractFee",
+		a.contract_special AS "contractSpecial",
+		a.contract_state AS "contractState",
+		a.office_id AS "chargeCompany",
+		a.charge_company_name AS "chargeCompanyName",
+		a.contract_file_id AS "contractFileId",
+		a.contract_role AS "contractRole",
+		a.apply_view AS "applyView",
+		a.process_instance_id AS "processInstanceId",
+		a.company_id as companyId,
+		a.contractFeeDoc AS "contractFeeDoc",
+		a.contractTypeDoc AS "contractTypeDoc",
+		a.another_contract_num AS "anotherContractNum",
+		client.name AS "client.name",
+		a.clientName AS "clientName",
+		a.telephone AS "telephone",
+		a.uscCode AS "uscCode",
+		a.hasUscc  AS "hasUscc",
+		a.is_total AS "isTotal",
+		a.total_contract_id AS "totalContractId",
+		a.status AS "status",
+		a.investment_scale AS "investmentScale",
+		a.summary_payment AS "summaryPayment",
+		a.investment_amount AS "investmentAmount",
+		a.create_bys AS "createBys",
+		a.construction_project_type AS "constructionProjectType",
+		a.invalidate_process_instance_id AS "invalidateProcessInstanceId",
+		a.alter_process_instance_id AS "alterProcessInstanceId",
+		a.invalidate_status AS "invalidateStatus",
+		a.invalidate_user AS "invalidateUserId",
+		a.alter_state AS "alterState",
+		a.alter_sign AS "alterSign",
+		a.record_state AS "recordState",
+		a.alterbefore_id AS "alterBeforeId",
+		a.completion_status AS "completionStatus",
+		a.common_flag AS "commonFlag",
+		a.office_id AS "officeId",
+		a.signature_status as "signatureStatus",
+		a.charge_criterion as "chargeCriterion",
+		a.other_details as "otherDetails",
+		a.contract_information as "contractInformation",
+		wcr.file_num as "fileNum",
+		wcr.file_num_tow as "fileNumTow",
+		a.describe_content AS "describeContent"
+		FROM work_contract_info a
+		<include refid="workContractInfoJoins"/>
+		LEFT JOIN work_contract_record wcr ON wcr.contract_info_id = a.id
+		WHERE a.contract_num = #{contractNum}
+		and a.id != #{id}
+		order by a.id
+		limit 1
+	</select>
+
 	<update id="updateContractRecordStatus">
 		UPDATE work_contract_info SET
 		contract_record_state = #{contractRecordState}
@@ -2411,8 +2491,8 @@ UPDATE work_client_linkman SET
 	</select>
 
 	<select id="getList" resultType="com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman">
-SELECT name,position,qq,link_phone,link_mobile,email,office FROM `work_client_linkman`
-where contract_num = #{contractNum}
+		SELECT name,position,qq,link_phone,link_mobile,email,office FROM `work_client_linkman`
+		where contract_id = #{contractId}
 
 	</select>
 

src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowAudit.jsp

@@ -95,7 +95,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">用户名称：</label>
 					<div class="layui-input-block">
-						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractBorrow.workContractInfo.client.name}"/>
+						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractBorrow.workContractInfo.clientName}"/>
 					</div>
 				</div>
 				<%--<div class="layui-item layui-col-sm6">
@@ -191,13 +191,13 @@
 				<h2>审批意见</h2>
 			</div>
 			<iframe id="iframe" src="${ctx}/auditTemplate/auditTemplate/iframeView?identification=${identification}" name="listresult" frameborder="0" align="left" width="100%" height="300" scrolling="value"></iframe>
-			<div class="form-group layui-row">
+			<%--<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >
 					<act:flowChart procInsId="${workContractRecord.act.procInsId}"/>
 					<act:histoicFlow procInsId="${workContractRecord.act.procInsId}"/>
 				</div>
-			</div>
+			</div>--%>
 			<div class="form-group layui-row">
 				<div class="form-group-label"><h2>审批流程</h2></div>
 				<div class="layui-item layui-col-xs12 form-table-container" >

src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowForm.jsp

@@ -93,7 +93,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">客户名称：</label>
 					<div class="layui-input-block">
-						<form:input id="cName" path="workContractInfo.client.name" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
+						<form:input id="cName" path="workContractInfo.clientName" htmlEscape="false" readonly="true" class="form-control  layui-input"/>
 					</div>
 				</div>
 				<%--<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workContractBorrow/workContractBorrowView.jsp

@@ -96,7 +96,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">用户名称：</label>
 					<div class="layui-input-block">
-						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractBorrow.workContractInfo.client.name}"/>
+						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractBorrow.workContractInfo.clientName}"/>
 					</div>
 				</div>
 				<%--<div class="layui-item layui-col-sm6">

src/main/webapp/webpage/modules/workcontractinfo/newWorkContract/workContractInfoFormAdd.jsp

@@ -38,6 +38,13 @@
 						parent.layer.msg("未选择收费标准!", {icon: 5});
 						return false;
 					}
+
+					var leng1 = $("#workClientLinkmanList tr").length;
+					if (leng1<=0 ){
+						top.layer.msg("请添加联系人信息！", {icon: 0});
+						return false;
+					}
+
                     //送审
 					var flags=judgment();
 					if (flags){
@@ -667,7 +674,7 @@
 									<br>
 									<label class="layui-form-label"><span class="require-item">*</span>客户名称：&nbsp;&nbsp;</label>
 									<div class="layui-input-block">
-										<form:input path="clientName" placeholder="请输入客户名称" htmlEscape="false" id=""  class="form-control required layui-input"/>
+										<form:input path="clientName" placeholder="请输入客户名称" htmlEscape="false" id=""  class="form-control judgment layui-input"/>
 										<span id="ph" style="color:#cc5965"></span>
 									</div>
 									<div id="fuzzyQuerySelect"
@@ -679,7 +686,7 @@
 									<br>
 									<label class="layui-form-label"><span class="require-item">*</span>公司电话：</label>
 									<div class="layui-input-block">
-										<form:input path="telephone" placeholder="请输入公司电话" htmlEscape="false" id="telephone" class="form-control required layui-input"/>
+										<form:input path="telephone" placeholder="请输入公司电话" htmlEscape="false" id="telephone" class="form-control judgment layui-input"/>
 
 									</div>
 								</div>
@@ -694,7 +701,7 @@
 									<br>
 									<label class="layui-form-label double-line"><span class="require-item">*</span>统一社会信用代码：</label>
 									<div class="layui-input-block">
-										<form:input path="uscCode" placeholder="请输入统一社会信用代码" htmlEscape="false" id="uscCode"   class="form-control required isUscCode layui-input"/>
+										<form:input path="uscCode" placeholder="请输入统一社会信用代码" htmlEscape="false" id="uscCode"   class="form-control judgment isUscCode layui-input"/>
 										<input type="hidden" id="oldUscCode" value=""/>
 										<span id="uscPh" style="color:#cc5965"></span>
 									</div>
@@ -735,7 +742,7 @@
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label"><span class="require-item">*</span>合同编号：</label>
 								<div class="layui-input-block">
-									<form:input path="contractNum" placeholder="请输入合同编号" htmlEscape="false" class="form-control layui-input"/>
+									<form:input path="contractNum" placeholder="请输入合同编号" htmlEscape="false" class="form-control judgment layui-input"/>
 								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
@@ -772,12 +779,6 @@
 									<input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" checked id="jine" value="0" <c:if test="${workContractInfo.contractInformation=='0'}">checked</c:if>>
 									<input type="radio" title="费率合同" lay-filter="jine" name="contractInformation" id="jine1" value="1" <c:if test="${workContractInfo.contractInformation=='1'}">checked</c:if>>
 								</div>
-								<br>
-								<label class="layui-form-label double-line"><span class="require-item">*</span>单位：</label>
-								<div class="layui-input-block">
-									<input type="radio" name="company" value="0" title="东兴"<c:if test="${workContractInfo.company=='0'}">checked</c:if>>
-									<input type="radio" name="company" value="1" title="赣能"<c:if test="${workContractInfo.company=='1'}">checked</c:if> >
-								</div>
 							</div>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额 (元)<br/>预计金额：</label>
@@ -785,6 +786,14 @@
 									<form:input path="contractPrice" id="contractPrice" htmlEscape="false"  placeholder="请输入合同金额/预计金额"   pattern="#.00" class="form-control judgment number  layui-input"/>
 								</div>
 							</div>
+
+							<div class="layui-item layui-col-sm6">
+								<label class="layui-form-label"><span class="require-item">*</span>单位：</label>
+								<div class="layui-input-block">
+									<input type="radio" name="company" value="0" title="东兴"<c:if test="${workContractInfo.company=='0'}">checked</c:if>>
+									<input type="radio" name="company" value="1" title="赣能"<c:if test="${workContractInfo.company=='1'}">checked</c:if> >
+								</div>
+							</div>
 							<div class="layui-item layui-col-sm6">
 								<label class="layui-form-label">对方合同编号：</label>
 								<div class="layui-input-block">

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoLookForm.jsp

@@ -232,6 +232,14 @@
 <%--								</c:if>--%>
 <%--							</shiro:hasPermission>--%>
 						</div>
+
+						<div class="layui-item layui-col-sm6">
+							<label class="layui-form-label"><span class="require-item">*</span>单位：</label>
+							<div class="layui-input-block">
+								<input type="radio" name="company" value="0" title="东兴" disabled <c:if test="${workContractInfo.company=='0'}">checked</c:if>>
+								<input type="radio" name="company" value="1" title="赣能" disabled <c:if test="${workContractInfo.company=='1'}">checked</c:if> >
+							</div>
+						</div>
 						<div class="layui-item layui-col-sm6">
 							<label class="layui-form-label ">对方合同编号：</label>
 							<div class="layui-input-block">

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordAudit.jsp

@@ -128,7 +128,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">客户名称：</label>
 					<div class="layui-input-block">
-						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.client.name}"/>
+						<input  htmlEscape="false" readonly="true" class="form-control  layui-input" value="${workContractRecord.workContractInfo.clientName}"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
@@ -175,6 +175,13 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label">单位：</label>
+					<div class="layui-input-block">
+						<input type="radio" name="company" value="0" title="东兴" disabled <c:if test="${workContractRecord.workContractInfo.company=='0'}">checked</c:if>>
+						<input type="radio" name="company" value="1" title="赣能" disabled <c:if test="${workContractRecord.workContractInfo.company=='1'}">checked</c:if> >
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label ">对方合同编号：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.anotherContractNum}"/>
@@ -239,7 +246,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label double-line"><span class="require-item">*</span>确认案卷号：</label>
+					<label class="layui-form-label"><span class="require-item">*</span>确认案卷号：</label>
 					<div class="layui-input-block">
 						<input id="fileNumTow" placeholder="请输入确认案卷号" name="fileNumTow" type="text"  class="layui-input form-control" equalTo="#fileNum"/>
 					</div>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordForm.jsp

@@ -198,14 +198,14 @@
 			<input type="hidden" id="chargeCriterionH" value="${workContractRecord.workContractInfo.chargeCriterion}">
 			<div class="form-group layui-row first lw8">
 				<div class="form-group-label"><h2>基础信息</h2></div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>客户名称：</label>
 					<div class="layui-input-block with-icon">
 						<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="workContractInfo.client.id"  value="${workContractRecord.workContractInfo.client.id}"  title="选择客户" labelName="workContractInfo.client.name"
 											  cssStyle="background-color:#fff" labelValue="${workContractRecord.workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
 
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
 					<div class="layui-input-block">
@@ -231,15 +231,6 @@
 						<input placeholder="请输入合同终止日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="closingDate" name="workContractInfo.closingDate" value="<fmt:formatDate value="${workContractRecord.workContractInfo.closingDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 ">
-					<label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>
-					<div class="layui-input-block readOnlyFFF">
-						<form:select path="workContractInfo.contractTypeDoc" id="contractTypeDoc" cssClass="form-control required simple-select">
-							<form:option value="" label=""/>
-							<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-						</form:select>
-					</div>
-				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
 					<div class="layui-input-block">
@@ -254,6 +245,22 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>单位：</label>
+					<div class="layui-input-block">
+						<input type="radio" name="company" value="0" title="东兴" disabled <c:if test="${workContractRecord.workContractInfo.company=='0'}">checked</c:if>>
+						<input type="radio" name="company" value="1" title="赣能" disabled <c:if test="${workContractRecord.workContractInfo.company=='1'}">checked</c:if> >
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 ">
+					<label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>
+					<div class="layui-input-block readOnlyFFF">
+						<form:select path="workContractInfo.contractTypeDoc" id="contractTypeDoc" cssClass="form-control required simple-select">
+							<form:option value="" label=""/>
+							<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+						</form:select>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">对方合同编号：</label>
 					<div class="layui-input-block">
 						<form:input path="workContractInfo.anotherContractNum" placeholder="请输入对方合同编号" htmlEscape="false" class="form-control layui-input"/>

src/main/webapp/webpage/modules/workcontractrecord/workContractRecordModifyApply.jsp

@@ -143,14 +143,14 @@
 			<input type="hidden" id="chargeCriterionH" value="${workContractRecord.workContractInfo.chargeCriterion}">
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>基础信息</h2></div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>客户名称：</label>
 					<div class="layui-input-block with-icon">
 						<sys:gridselectclien1 url="${ctx}/workcontractinfo/workContractInfo/selectclientAhref" id="client" name="workContractInfo.client.id"  value="${workContractRecord.workContractInfo.client.id}"  title="选择客户" labelName="workContractInfo.client.name"
 											  cssStyle="background-color:#fff" labelValue="${workContractRecord.workContractInfo.client.name}" cssClass="form-control layui-input required" fieldLabels="客户名称" fieldKeys="name" searchLabel="客户名称" searchKey="name" searchLabel1="联系人" searchKey1="workLinkName"></sys:gridselectclien1>
 
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>
 					<div class="layui-input-block">
@@ -175,15 +175,6 @@
 						<input placeholder="请输入合同终止日期" style="background-color: #fff" class="laydate-icondate form-control layui-input layer-date laydate-icon" readonly="readonly" id="closingDate" name="workContractInfo.closingDate" value="<fmt:formatDate value="${workContractRecord.workContractInfo.closingDate}" pattern="yyyy-MM-dd"/>">
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 ">
-					<label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>
-					<div class="layui-input-block readOnlyFFF">
-						<form:select path="workContractInfo.contractTypeDoc" id="contractTypeDoc" cssClass="form-control required simple-select">
-							<form:option value="" label=""/>
-							<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-						</form:select>
-					</div>
-				</div>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
 					<div class="layui-input-block">
@@ -198,6 +189,22 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>单位：</label>
+					<div class="layui-input-block">
+						<input type="radio" name="company" value="0" title="东兴" disabled <c:if test="${workContractRecord.workContractInfo.company=='0'}">checked</c:if>>
+						<input type="radio" name="company" value="1" title="赣能" disabled <c:if test="${workContractRecord.workContractInfo.company=='1'}">checked</c:if> >
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6 ">
+					<label class="layui-form-label"><span class="require-item">*</span>合同类型：</label>
+					<div class="layui-input-block readOnlyFFF">
+						<form:select path="workContractInfo.contractTypeDoc" id="contractTypeDoc" cssClass="form-control required simple-select">
+							<form:option value="" label=""/>
+							<form:options items="${fns:getMainDictList('contract_info_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+						</form:select>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line">对方合同编号：</label>
 					<div class="layui-input-block">
 						<form:input path="workContractInfo.anotherContractNum" placeholder="请输入对方合同编号" htmlEscape="false" class="form-control layui-input"/>

src/main/webapp/webpage/modules/workcontractrecord/workContractView.jsp

@@ -93,14 +93,53 @@
 		<form:form id="inputForm" modelAttribute="workContractRecord" action="${ctx}/workcontractrecord/workContractRecord/save" method="post" class="form-horizontal layui-form">
 		<form:hidden path="id"/>
 
+			<div id="tab-12" class="tab-pane active">
+				<div class="form-group-label"><h2>客户基础信息</h2>
+					<div class="layui-item layui-col-sm6 lw7">
+						<br>
+						<label class="layui-form-label">客户名称：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.clientName}"/>
+						</div>
+					</div>
+					<div class="layui-item layui-col-sm6 lw7">
+						<br>
+						<label class="layui-form-label">公司电话：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.telephone}"/>
+						</div>
+					</div>
+					<%--<div class="layui-item layui-col-sm6 lw7">
+						<br>
+						<label class="layui-form-label double-line">拥有统一社会信用代码：</label>
+						<div class="layui-input-block">
+                    <span class="radio-box">&nbsp;&nbsp;
+                        <input type="radio" class="usccClass" name="hasUscc" label="是" disabled="true" <c:if test="${workContractRecord.workContractInfo.hasUscc eq 1}">checked="true"</c:if> />是
+                        &nbsp;&nbsp;
+                        <input type="radio" class="usccClass" name="hasUscc" label="否" disabled="true" <c:if test="${workContractRecord.workContractInfo.hasUscc eq 2}">checked="true"</c:if> />否
+                    </span>
+						</div>
+					</div>--%>
+					<div class="layui-item layui-col-sm6 lw7">
+						<br>
+						<label class="layui-form-label double-line">统一社会信用代码：</label>
+						<div class="layui-input-block">
+							<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.uscCode}"/>
+						</div>
+					</div>
+				</div>
+
+			</div>
+
+
 			<div class="form-group layui-row first lw8">
 				<div class="form-group-label"><h2>基础信息</h2></div>
-				<div class="layui-item layui-col-sm6">
+				<%--<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">客户名称：</label>
 					<div class="layui-input-block">
-						<input  htmlEscape="false" readonly="true" style="background-color: #f1f1f1" class="form-control  layui-input" value="${workContractRecord.workContractInfo.client.name}"/>
+						<input  htmlEscape="false" readonly="true" style="background-color: #f1f1f1" class="form-control  layui-input" value="${workContractRecord.workContractInfo.clientName}"/>
 					</div>
-				</div>
+				</div>--%>
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label">合同名称：</label>
 					<div class="layui-input-block with-icon">
@@ -126,12 +165,6 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
-					<label class="layui-form-label ">合同类型：</label>
-					<div class="layui-input-block">
-						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractRecord.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
-					</div>
-				</div>
-				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>合同金额类别：</label>
 					<div class="layui-input-block">
 						<input type="radio" title="金额合同" lay-filter="jine" name="contractInformation" disabled id="jine" value="0" <c:if test="${workContractRecord.workContractInfo.contractInformation=='0'}">checked</c:if>>
@@ -145,6 +178,19 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label"><span class="require-item">*</span>单位：</label>
+					<div class="layui-input-block">
+						<input type="radio" name="company" value="0" title="东兴" disabled <c:if test="${workContractRecord.workContractInfo.company=='0'}">checked</c:if>>
+						<input type="radio" name="company" value="1" title="赣能" disabled <c:if test="${workContractRecord.workContractInfo.company=='1'}">checked</c:if> >
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
+					<label class="layui-form-label ">合同类型：</label>
+					<div class="layui-input-block">
+						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${fns:getMainDictLabel(workContractRecord.workContractInfo.contractTypeDoc, 'contract_info_type', '')}"/>
+					</div>
+				</div>
+				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label ">对方合同编号：</label>
 					<div class="layui-input-block">
 						<input htmlEscape="false" style="background-color: #f1f1f1" readonly="true" class="form-control layui-input" value="${workContractRecord.workContractInfo.anotherContractNum}"/>