Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectConstruction/dao/ContractDao.java

@@ -6,6 +6,7 @@ package com.jeeplus.modules.projectConstruction.dao;
 import com.jeeplus.common.persistence.CrudDao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.projectConstruction.entity.ConstructionContract;
+import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 
@@ -35,4 +36,6 @@ public interface ContractDao extends CrudDao<ConstructionContract> {
      * @return
      */
     List<ConstructionContract> getConstructionContractList(ConstructionContract constructionContract);
+
+    ProjectRecords getRecords(String projectId);
 }

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

@@ -10,6 +10,7 @@ import com.jeeplus.common.service.CrudService;
 import com.jeeplus.common.utils.SpringContextHolder;
 import com.jeeplus.modules.projectConstruction.dao.ContractDao;
 import com.jeeplus.modules.projectConstruction.entity.ConstructionContract;
+import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.serialnum.service.SerialNumTplService;
 import com.jeeplus.modules.sys.dao.AreaDao;
 import com.jeeplus.modules.sys.dao.MainDictDetailDao;
@@ -146,4 +147,8 @@ public class ContractService extends CrudService<ContractDao,ConstructionContrac
             return null;
         }
     }
+
+    public ProjectRecords getRecords(String projectId) {
+        return contractDao.getRecords(projectId);
+    }
 }

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

@@ -262,8 +262,10 @@ public class ContractController extends BaseController {
             List<WorkClientAttachment> attachments = workClientAttachmentDao.findList(attchment);
             constructionContract.setWorkAttachments(attachments);
         }else {
+            ProjectRecords records =contractService.getRecords(constructionContract.getProjectId());
             constructionContract.setCreateBy(UserUtils.getUser());
             constructionContract.setCreateDate(new Date());
+            constructionContract.setProjectName(records.getProjectName());
         }
         model.addAttribute("constructionContract", constructionContract);
         return "modules/projectConstruction/projectConstructionForm";

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

@@ -251,18 +251,18 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 		WorkClientInfo workClientInfo = new WorkClientInfo();
 		Office company= new Office();
 		Office office =  new Office();
-		if (null != projectRecords.getWorkContractInfo()){
-			if(StringUtils.isNotBlank((projectRecords.getWorkContractInfo().getId()))){
+		if (null != projectRecords.getWorkContractInfo()) {
+			if (StringUtils.isNotBlank((projectRecords.getWorkContractInfo().getId()))) {
 				//有合同状态
 				workContractInfo = workContractInfoDao.get(projectRecords.getWorkContractInfo().getId());
 				company.setId(workContractInfo.getCompanyId());
-	//			office.setId(workContractInfo.getChargeCompany());
+				//			office.setId(workContractInfo.getChargeCompany());
+				office.setId(UserUtils.getUser().getOffice().getId());
+			} else {
+				//无合同
+				company.setId(UserUtils.getUser().getCompany().getId());
 				office.setId(UserUtils.getUser().getOffice().getId());
 			}
-		}else{
-        	//无合同
-			company.setId(UserUtils.getUser().getCompany().getId());
-			office.setId(UserUtils.getUser().getOffice().getId());
 		}
 		projectRecords.setCompany(company);
 		projectRecords.setOffice(office);

src/main/java/com/jeeplus/modules/projectrecord/web/Early/ProjectEarlyReviewController.java

@@ -220,7 +220,6 @@ public class ProjectEarlyReviewController extends BaseController {
         List<ProjectBasedData> projectBasedDataList =  projectTypeService.getAccrdingDataList(typeId);
         for (ProjectBasedData projectBasedData: projectBasedDataList) {
             ProjectBasedData contentAttachmentData =  projectTypeService.getBasedData(projectContentDataList.get(0).getId(),projectBasedData.getId());
-
             if (null != contentAttachmentData) {
                 try {
                     MyBeanUtils.copyBeanNotNull2Bean(contentAttachmentData, projectBasedData);

src/main/resources/mappings/modules/constructionContract/contractDao.xml

@@ -254,4 +254,18 @@
 			and a.project_id=#{id} ORDER BY a.update_date DESC
 		</where>
 	</select>
+
+	<select id="getRecords" resultType="com.jeeplus.modules.projectrecord.entity.ProjectRecords">
+		SELECT
+		a.id AS "id",
+				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.contract_id AS "workContractInfo.id",
+				a.project_id AS "projectId",
+				a.project_name AS "projectName"
+		from project_records a where a.id=#{projectId} and a.del_flag=0
+	</select>
 </mapper>

src/main/webapp/webpage/modules/projectConstruction/projectConstructionForm.jsp

@@ -229,15 +229,21 @@
         <sys:message content="${message}"/>
         <form:form id="inputForm" modelAttribute="constructionContract" action="${ctx}/project/constructionContract/save" method="post" class="form-horizontal">
             <form:hidden path="id"/>
-            <%--<form:hidden path="projectId"/>--%>
+            <form:hidden path="projectId"/>
         <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:gridselectProjcontent url="${ctx}/project/constructionContract/selectcontent" id="projectId" name="projectId"  value="${constructionContract.projectId}"  title="选择项目名称" labelName="projectName"
                                                    labelValue="${constructionContract.projectName}" cssClass="form-control layui-input required" projectId="${constructionContract.projectId}" type="31" fieldLabels="" fieldKeys="" searchLabel="${fns:urlEncode('项目名称')}" searchKey="" ></sys:gridselectProjcontent>
                     </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">
+                        <form:input  readonly="true" path="projectName" htmlEscape="false"    class="form-control layui-input required"/>
+                    </div>
                 </div>
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label"><span class="require-item">*</span>合同名称：</label>