1.工程咨询对质量符合页面的成员意见进行区分

2.资料缺失说明流程图页面添加资料缺失说明

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectMessageDao.java

@@ -152,6 +152,13 @@ public interface RuralProjectMessageDao extends CrudDao<RuralProjectRecords> {
     Area getProjectReportedAreaByName(@Param("name") String name,@Param("parentId") String parentId);
 
     /**
+     * 根据报告号查询资料缺失说明信息
+     * @param reportId
+     * @return
+     */
+    ProjectMaterialDefectRecord getDeficiencyRemarks(String reportId);
+
+    /**
      * 查询开票信息
      * @param ruralProjectRecords
      * @return

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

@@ -121,6 +121,7 @@ public class RuralProjectRecordsReported extends ActEntity<RuralProjectRecordsRe
 	private String otherIncome;	//其他收入
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();	//附件信息
 	private Date accomplishDate;	//审核通过时间
+	private String reportId;	//报告id
 
 	public WorkContractInfo getWorkContractInfo() {
 		return workContractInfo;
@@ -801,4 +802,12 @@ public class RuralProjectRecordsReported extends ActEntity<RuralProjectRecordsRe
 	public void setAccomplishDate(Date accomplishDate) {
 		this.accomplishDate = accomplishDate;
 	}
+
+	public String getReportId() {
+		return reportId;
+	}
+
+	public void setReportId(String reportId) {
+		this.reportId = reportId;
+	}
 }

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

@@ -5149,4 +5149,9 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
 
         return hashMap;
     }
+
+    public ProjectMaterialDefectRecord getDeficiencyRemarks(String reportId){
+        ProjectMaterialDefectRecord deficiencyRemarks = dao.getDeficiencyRemarks(reportId);
+        return deficiencyRemarks;
+    }
 }

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

@@ -2004,6 +2004,12 @@ public class RuralCostProjectMessageController extends BaseController {
     @RequestMapping(value = "getReportedProcess")
     public String getReportedProcess(RuralProjectRecordsReported reported,Model model) {
         model.addAttribute("processInstanceId", reported.getProcessInstanceId());
+        //根据报告好查询资料缺失说明
+        ProjectMaterialDefectRecord projectMaterialDefectRecord = new ProjectMaterialDefectRecord();
+        if(StringUtils.isNotBlank(reported.getReportId())){
+            projectMaterialDefectRecord = ruralProjectMessageService.getDeficiencyRemarks(reported.getReportId());
+        }
+        model.addAttribute("projectMaterialDefectRecord", projectMaterialDefectRecord);
         return "modules/workreimbursement/workReimbursementTrack";
     }
 

src/main/resources/mappings/modules/knowledgeSharing/KnowledgeSharingDetailsDao.xml

@@ -28,7 +28,7 @@
 	<select id="findList" resultType="com.jeeplus.modules.knowledgeSharing.entity.KnowledgeSharingInfo" >
 		SELECT
 			<include refid="businessQuestionsColumns"/>
-			,(select sum(ksv.visit_count) from knowledge_sharing_view ksv where a.id = ksv.knowledge_sharing_id) as "readCount"
+			,ifnull((select sum(ksv.visit_count) from knowledge_sharing_view ksv where a.id = ksv.knowledge_sharing_id),0) as "readCount"
 			,(select count(ksc.id) from knowledge_sharing_comment ksc where a.id = ksc.knowledge_sharing_id) as "replyCount"
 		FROM knowledge_sharing_info a
 		left join sys_user su on su.id = a.create_by
@@ -37,6 +37,9 @@
             <if test="columnId != null and columnId != ''">
                 AND a.column_id = #{columnId}
             </if>
+            <if test="subject != null and subject != ''">
+                AND a.subject like concat('%',#{subject})
+            </if>
 			<if test="(jordanswId != null and jordanswId != '') or (jordanswName != null and jordanswName != '')">
 				AND (a.create_by = #{jordanswId} or su.name like concat('%',#{jordanswName},'%'))
 			</if>
@@ -60,6 +63,9 @@
 			<if test="columnId != null and columnId != ''">
 				AND a.column_id = #{columnId}
 			</if>
+			<if test="subject != null and subject != ''">
+				AND a.subject like concat('%',#{subject})
+			</if>
 			<if test="(jordanswId != null and jordanswId != '') or (jordanswName != null and jordanswName != '')">
 				AND (a.create_by = #{jordanswId} or su.name like concat('%',#{jordanswName},'%'))
 			</if>

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml

@@ -1449,4 +1449,26 @@
 			</if>
 		</where>
 	</select>
+
+	<select id="getDeficiencyRemarks" resultType="com.jeeplus.modules.projectcontentinfo.entity.ProjectMaterialDefectRecord">
+		select
+		  id AS "id",
+		  create_by AS "createBy.id",
+		  create_date AS "createDate",
+		  update_by AS "updateBy.id",
+		  update_date AS "updateDate",
+		  del_flag AS "delFlag",
+		  remarks as "remarks",
+		  report_id as "reportId",
+		  company_id as "companyId",
+		  office_id as "officeId",
+		  date as "date",
+		  status as "status",
+		  process_instance_id as "processInstanceId"
+		from
+		  project_material_defect_record
+		where report_id = #{reportId}
+		order by update_date desc
+		limit 1
+	</select>
 </mapper>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/adminReportEditForm.jsp

@@ -1753,11 +1753,25 @@
 										</td>
 										<td>
 											<c:choose>
-												<c:when test="${info.role == '咨询员'}">
-													<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder=""  name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" title="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value,'projectReportDataLeaderConsultant')" class="form-control "/>
+												<c:when test="${projectRecords.projectType == 1}">
+													<c:choose>
+														<c:when test="${info.role == '咨询员'}">
+															<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder=""  name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" title="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value,'consultProjectReportDataLeaderConsultant')" class="form-control "/>
+														</c:when>
+														<c:otherwise>
+															<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder=""  name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" title="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value,'consultProjectReportDataLeaderPrincipal')" class="form-control "/>
+														</c:otherwise>
+													</c:choose>
 												</c:when>
 												<c:otherwise>
-													<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder=""  name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" title="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value,'projectReportDataLeaderPrincipal')" class="form-control "/>
+													<c:choose>
+														<c:when test="${info.role == '咨询员'}">
+															<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder=""  name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" title="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value,'projectReportDataLeaderConsultant')" class="form-control "/>
+														</c:when>
+														<c:otherwise>
+															<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder=""  name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" title="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value,'projectReportDataLeaderPrincipal')" class="form-control "/>
+														</c:otherwise>
+													</c:choose>
 												</c:otherwise>
 											</c:choose>
 

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -1287,7 +1287,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
 						if (d.defectRecordStatus>0){
-							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.pmdrProcessInstanceId + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
+							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.pmdrProcessInstanceId + "&reportId=" + d.bid + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
 						}
                         return xml;
                     }}

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -943,7 +943,7 @@
 						}
 						var de = getdefectRecordState(""+d.defectRecordStatus);
 						if (d.defectRecordStatus>0){
-							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.pmdrProcessInstanceId + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
+							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.pmdrProcessInstanceId + "&reportId=" + d.bid + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
 						}
 						return xml;
                     }}

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/adminReportEditForms.jsp

@@ -1733,7 +1733,16 @@
 											<input id="reportedConsultantList${status.index+1}_wordnr"  placeholder="" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control"/>
 										</td>
 										<td>
-											<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder=""  name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" title="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value,'')" class="form-control"/>
+											<c:if test="${info.role == '负责人'}">
+												<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder=""  name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" title="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value,'consultProjectReportDataLeaderPrincipal')" class="form-control"/>
+											</c:if>
+											<c:if test="${info.role == '咨询员'}">
+												<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder=""  name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" title="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value,'consultProjectReportDataLeaderConsultant')" class="form-control"/>
+											</c:if>
+											<c:if test="${info.role == '技术负责人'}">
+												<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder=""  name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" title="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value,'consultProjectReportDataLeader')" class="form-control"/>
+											</c:if>
+
 										</td>
 										<td class="reportedConsultantList${status.index+1}_caozuo  text-center op-td"  width="10">
 
@@ -1772,7 +1781,7 @@
 											<input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control"/>
 										</td>
 										<td>
-											<input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo('reportedConsultantList{{idx}}',this.value,'')" class="form-control"/>
+											<input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo('reportedConsultantList{{idx}}',this.value,'consultProjectReportDataLeaderConsultant')" class="form-control"/>
 										</td>
 
 										<td class="text-center op-td" width="10">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModify.jsp

@@ -846,7 +846,14 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderConsultant')" class="form-control required"/>
+                                        <c:choose>
+                                            <c:when test="${projectRecords.projectType == 1}">
+                                                <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'consultProjectReportDataLeaderConsultant')" class="form-control required"/>
+                                            </c:when>
+                                            <c:otherwise>
+                                                <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderConsultant')" class="form-control required"/>
+                                            </c:otherwise>
+                                        </c:choose>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -884,7 +891,15 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderPrincipal')" class="form-control required"/>
+                                        <c:choose>
+                                            <c:when test="${projectRecords.projectType == 1}">
+                                                <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'consultProjectReportDataLeaderPrincipal')" class="form-control required"/>
+                                            </c:when>
+                                            <c:otherwise>
+                                                <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderPrincipal')" class="form-control required"/>
+                                            </c:otherwise>
+                                        </c:choose>
+
                                     </td>
 
                                     <td class="text-center op-td" width="10">

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

@@ -1190,7 +1190,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control judgment"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderConsultant')" class="form-control judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'consultProjectReportDataLeaderConsultant')" class="form-control judgment"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -1228,7 +1228,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control judgment"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderPrincipal')" class="form-control judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'consultProjectReportDataLeaderPrincipal')" class="form-control judgment"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -1265,7 +1265,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeader')" class="form-control judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'consultProjectReportDataLeader')" class="form-control judgment"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -861,7 +861,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
 						if (d.defectRecordStatus>0){
-							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.pmdrProcessInstanceId + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
+							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.pmdrProcessInstanceId + "&reportId=" + d.bid + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";
 						}
                         return xml;
                     }}

src/main/webapp/webpage/modules/workreimbursement/workReimbursementTrack.jsp

@@ -4,12 +4,33 @@
 <head>
 	<title>报销流程</title>
 	<meta name="decorator" content="default"/>
+	<script type="text/javascript" src="${ctxStatic}/layui/layui.js"></script>
+	<link rel='stylesheet' type="text/css" href="${ctxStatic}/layui/css/layui.css"/>
 </head>
 <body class="gray-bg">
 <div class="container form layui-form">
 		<act:flowChart procInsId="${processInstanceId}"/>
 		<act:histoicFlow procInsId="${processInstanceId}"/>
 </div>
+<div class="single-form">
+	<div class="container view-form">
+		<form:form id="inputForm" modelAttribute="projectMaterialDefectRecord" class="form-horizontal layui-form">
+		<form:hidden path="id"/>
+		<div class="form-group layui-row first">
+			<div class="layui-item layui-col-sm12  with-textarea">
+				<label class="layui-form-label double-line">资料缺失说明：</label>
+				<div class="layui-input-block">
+					<form:textarea path="remarks" htmlEscape="false" rows="8" maxlength="255" readonly="true" class="form-control"/>
+				</div>
+			</div>
+
+
+
+			<div class="form-group layui-row page-end"></div>
+			</form:form>
+		</div>
+	</div>
+</div>
 	<%--<div class="wrapper wrapper-content">--%>
 		<%--<act:flowChart procInsId="${processInstanceId}"/>--%>
         <%--<act:histoicFlow procInsId="${processInstanceId}"/>--%>