咨询报告签发流程

src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -26,8 +26,10 @@ import com.jeeplus.modules.ruralprojectrecords.entity.RuralReportConsultant;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageNewService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
+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.SystemService;
 import com.jeeplus.modules.sys.service.UserService;
 import com.jeeplus.modules.sys.utils.DictUtils;
@@ -118,6 +120,8 @@ public class WorkFullManageController extends BaseController {
 	private RuralProjectRecordsService ruralProjectRecordsService;
 	@Autowired
 	private RuralProjectRecordsService projectRecordsService;
+	@Autowired
+	private OfficeService officeService;
 
 	@Autowired
 	private WorkFullDesignService workFullDesignService;
@@ -1394,7 +1398,7 @@ public class WorkFullManageController extends BaseController {
 		Map<String,Object> data  = new LinkedHashMap<>();
 		//主送--委托单位
 		if(null != workContractInfo){
-			if (null != workContractInfo.getClient()) {
+			if (null != workContractInfo.getClient() && StringUtils.isNotBlank(workContractInfo.getClient().getName())) {
 				data.put("entrustOrganization",workContractInfo.getClient().getName());
 			}else{
 				data.put("entrustOrganization","");
@@ -1420,12 +1424,16 @@ public class WorkFullManageController extends BaseController {
 		if(StringUtils.isBlank(projectReportData.getNumber())){
 			data.put("projectReportNumber","");
 		}else{
-			data.put("projectReportNumber",projectReportData.getNumber()+" 号");
+			data.put("projectReportNumber",projectReportData.getNumber());
 		}
 		//承办部门
 		User user=UserUtils.get(ruralProjectRecords.getProjectMasterId());
-		if (StringUtils.isNotBlank(user.getOffice().getTopCompany())){
-			data.put("officeName",user.getOffice().getTopCompany());
+		Office userOffice = user.getOffice();
+		while (!"ffe5af5b557e46f28b000c94716e228a".equals(userOffice.getParent().getId())){
+			userOffice = officeService.get(userOffice.getParent().getId());
+		}
+		if (StringUtils.isNotBlank(userOffice.getName())){
+			data.put("officeName",userOffice.getName());
 		}else{
 			data.put("officeName","");
 		}
@@ -1435,34 +1443,6 @@ public class WorkFullManageController extends BaseController {
 		}else{
 			data.put("projectMaster","");
 		}
-		//咨询员信息
-		if(null != consultants){
-			for (int i = 0; i<consultants.size(); i++){
-				if (i >=6){
-					break;
-				}
-				data.put("consultantName"+i,consultants.get(i).getZixunyuanName());
-				if(StringUtils.isBlank(consultants.get(i).getMajor())){
-					data.put("consultantProfession"+i,"");
-				}else{
-					data.put("consultantProfession"+i,consultants.get(i).getMajor());
-				}
-				data.put("consultantQualification"+i,consultants.get(i).getZhucezigezh());
-			}
-			if(consultants.size()<6){
-				for (int i = consultants.size(); i<6; i++){
-					data.put("consultantName"+i,"");
-					data.put("consultantProfession"+i,"");
-					data.put("consultantQualification"+i,"");
-				}
-			}
-		}else{
-			for (int i = 0; i<6; i++){
-				data.put("consultantName"+i,"");
-				data.put("consultantProfession"+i,"");
-				data.put("consultantQualification"+i,"");
-			}
-		}
 		//专业咨询员处理（添加序号）
 		for(int i = 1; i <=consultantList.size();i++){
 			consultantList.get(i-1).setId(i+"");
@@ -1534,8 +1514,8 @@ public class WorkFullManageController extends BaseController {
 			data.put("signRemarks","");
 		}
 		User user1=UserUtils.get(projectReportDataTwo.getBzshbUserId());
-		if (StringUtils.isNotBlank(user1.getUserName())){
-			data.put("signName",user1.getUserName());
+		if (StringUtils.isNotBlank(user1.getName())){
+			data.put("signName",user1.getName());
 		}else{
 			data.put("signName","");
 		}

src/main/resources/freemarker/issueProcess.ftl

@@ -403,7 +403,7 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>（签发日期）</w:t>
+                                        <w:t>  </w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -1140,7 +1140,7 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>（份数暂时空下来）</w:t>
+                                        <w:t>  </w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -1932,4 +1932,4 @@
             </a:theme>
         </pkg:xmlData>
     </pkg:part>
-</pkg:package>
+</pkg:package>

src/main/resources/mappings/modules/sys/OfficeDao.xml

@@ -13,12 +13,12 @@
 		a.sort,
 		a.type,
 		a.grade,
-		a.address, 
-		a.zip_code, 
-		a.master, 
-		a.phone, 
-		a.fax, 
-		a.email, 
+		a.address,
+		a.zip_code,
+		a.master,
+		a.phone,
+		a.fax,
+		a.email,
 		a.remarks,
 		a.create_by AS "createBy.id",
 		a.create_date,
@@ -44,7 +44,7 @@
 		a.is_son AS "isSon",
 		a.wx_office_id AS "wxOfficeId"
 	</sql>
-	
+
 	<sql id="officeJoins">
 		LEFT JOIN sys_office p ON p.id = a.parent_id
     </sql>
@@ -251,7 +251,7 @@
 		where a.del_flag = "0"
 		AND a.name = #{officeName}
 	</select>
-	
+
 	<select id="findListByCompanyName" resultType="Office">
 		SELECT
 			<include refid="officeColumns"/>
@@ -453,30 +453,30 @@
 		<include refid="officeJoins"/>
 		WHERE a.useable = '1' AND  find_in_set(#{id}, a.parent_ids) or a.id = #{id}
 	</select>
-	
+
 	<insert id="insert">
 		INSERT INTO sys_office(
-			id, 
-			parent_id, 
-			parent_ids, 
-			area_id, 
+			id,
+			parent_id,
+			parent_ids,
+			area_id,
 			code,
 			company_qrcode,
 			name,
-			sort, 
-			type, 
-			grade, 
-			address, 
-			zip_code, 
-			master, 
-			phone, 
-			fax, 
-			email, 
-			create_by, 
-			create_date, 
-			update_by, 
-			update_date, 
-			remarks, 
+			sort,
+			type,
+			grade,
+			address,
+			zip_code,
+			master,
+			phone,
+			fax,
+			email,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
 			del_flag,
 			useable,
 			<!-- primary_person,-->
@@ -764,4 +764,4 @@
 	<select id="findWechatId" resultType="java.lang.Integer">
 		SELECT wx_office_id FROM sys_office where id = #{officeId}
 	</select>
-</mapper>
+</mapper>