7/26

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

@@ -2784,8 +2784,11 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 			}
 
 			synchronized (SYN_BYTE) {
+				String contractNo = contractInfoService.getContractByProjectId(projectRecords.getId());
 				String reportNo = createReportNo(projectReportData.getConditionType());
-				projectReportData.setNumber(reportNo);
+				reportNo = reportNo.substring(5);
+				StringBuffer reportNoNew =new StringBuffer("【"+contractNo+"】"+"-"+reportNo);
+				projectReportData.setNumber(reportNoNew.toString());
 				ProjectRecords project = new ProjectRecords();
 				project.setId(projectRecords.getId());
 				projectReportData.setProject(project);

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

@@ -146,4 +146,7 @@ public interface WorkContractInfoDao extends CrudDao<WorkContractInfo> {
     List<WorkContractInfo> findDepartmentContractStatementPageOverdue(@Param("workContractInfo")WorkContractInfo workContractInfo, @Param("statementCompanyComprehensiveInfo")StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo,@Param("officeIdd")String officeIdd,@Param("beginDate")String beginDate,@Param("endDate") String endDate);
     //部门级 查询超期合同信息的条数
     Integer findDepartmentContractStatementPageOverdueCount(StatementCompanyComprehensiveInfo statementCompanyComprehensiveInfo);
+
+//    根据项目id获取合同编号
+    String selectContractNum(String projectId);
 }

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

@@ -66,6 +66,7 @@ import org.activiti.engine.history.HistoricTaskInstance;
 import org.activiti.engine.history.HistoricTaskInstanceQuery;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -4010,4 +4011,8 @@ public class WorkContractInfoService extends CrudService<WorkContractInfoDao, Wo
 		page.setList(list);
 		return page;
 	}
+
+	public String getContractByProjectId(@Param("projectId") String projectId){
+		return workContractInfoDao.selectContractNum(projectId);
+	}
 }

src/main/resources/mappings/modules/sealMaterial/sealMaterialDao.xml

@@ -43,10 +43,12 @@
 	</select>
 
 	<select id="findExportList" resultType="com.jeeplus.modules.sealMaterial.entity.SealMaterialInfoExport">
-		select seal_material_name as "sealMaterialName",amount as "amount",main_contents as "mainContents",
-		 as "agent",use_seal_time as "useSealTime",seal_contents_remarks as "sealMaterialImportRemarks"
-		from seal_material_info
-		where project_id = #{projectId}
+		select s.seal_material_name as "sealMaterialName",s.amount as "amount",s.main_contents as "mainContents",
+		u.name as "agent",s.use_seal_time as "useSealTime",s.seal_contents_remarks as "sealMaterialImportRemarks"
+		from seal_material_info s
+		left join sys_user  u
+		on s.agent = u.id
+		where s.project_id = #{projectId}
 	</select>
 
 	<update id="updateById">

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

@@ -2545,5 +2545,9 @@ UPDATE work_client_linkman SET
 
 	</select>
 
-
+	<select id="selectContractNum" resultType="string">
+		select c.contract_num from rural_project_records r
+		left join work_contract_info c on r.contract_id = c.id
+		where r.id = #{projectId}
+	</select>
 </mapper>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp

@@ -1281,7 +1281,7 @@
                                         <input id="reportedConsultantList{{idx}}_costNum" name="reportedConsultantList[{{idx}}].costNum" readonly="readonly" style="text-align: center"  value="{{idx}}" type="text" class="form-control contentDetail"/>
                                     </td>
                                     <td>
-                                        <sys:treeselectt id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
+                                        <sys:reimburtreeselectUserNotRequiredZXY id="reportedConsultantList{{idx}}_zixunyuan" name="reportedConsultantList[{{idx}}].zixunyuan" value="{{row.zixunyuan}}" labelName="workAccountList[{{idx}}].zixunyuan" labelValue="{{row.zixunyuanName}}"
                                             title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
                                     </td>
 
@@ -1289,10 +1289,10 @@
 										<input id="reportedConsultantList{{idx}}_role" readonly="true" name="reportedConsultantList[{{idx}}].role" value="咨询员" readonly="true" class="form-control"/>
 									</td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID"  name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_zhucezigezhID" readonly="true" name="reportedConsultantList[{{idx}}].zhucezigezhID" value="{{row.zhucezigezhID}}" class="form-control "/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_major"   name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_major" readonly="true"  name="reportedConsultantList[{{idx}}].major" value="{{row.major}}" class="form-control "/>
                                     </td>
                                     <td>
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control judgment"/>