实施前期和竣工阶段项目复核展示状态信息

src/main/resources/mappings/modules/projectcontentinfo/ProjectContentDataDao.xml

@@ -304,7 +304,7 @@
 	<select id="getProjectContentReportDataList" resultType="com.jeeplus.modules.projectrecord.entity.ProjectRecordTreeData">
 		select a.id as "id", a.create_by as "createBy.id", a.create_date as "createDate", a.project_id as "pid",
 		a.name as "projectName", "" as projectId, "0" as projectStatus,su.name as "projectRegistrant" ,
-		pt.type_name as projectLeader, ppt.type_name as clientName,prd.status as status,prd.id as reportId,ifnull(prd.name,'') as reportName
+		pt.type_name as projectLeader, ppt.type_name as clientName,ifnull(prd.status,'10') as status,prd.id as reportId,ifnull(prd.name,'') as reportName
 		from project_content_data a
 		left join sys_user su on su.id = a.create_by
 		left join project_type pt on a.type = pt.type_id

src/main/resources/mappings/modules/projectcontentinfo/ProjectReportDataDao.xml

@@ -753,75 +753,7 @@
 		LEFT JOIN work_contract_info wci on r.contract_id = wci.id
 		LEFT JOIN work_client_info wct on wci.client_id = wct.id
 		<where>
-			a.del_flag = #{DEL_FLAG_NORMAL}
-			<if test="project != null and project.id != null and project.id != ''">
-				AND a.project_id = #{project.id}
-			</if>
-			<if test="type != null and type != ''">
-				AND a.type = #{type}
-			</if>
-			<if test="name != null and name != ''">
-				AND a.name like
-				<if test="dbName == 'oracle'">'%'||#{name}||'%'</if>
-				<if test="dbName == 'mysql'">CONCAT('%', #{name}, '%')</if>
-			</if>
-			<if test="number != null and number != ''">
-				AND a.number like
-				<if test="dbName == 'oracle'">'%'||#{number}||'%'</if>
-				<if test="dbName == 'mysql'">CONCAT('%', #{number}, '%')</if>
-			</if>
-			<if test="achievementType != null and achievementType != ''">
-				AND a.achievement_type = #{achievementType}
-			</if>
-			<if test="signCostOne!=null and signCostOne.id != null and signCostOne.id != ''">
-				AND a.sign_cost_one = #{signCostOne.id}
-			</if>
-			<if test="signCostTwo!=null and signCostTwo.id != null and signCostTwo.id != ''">
-				AND a.sign_cost_two = #{signCostTwo.id}
-			</if>
-			<if test="master!=null and master.id != null and master.id != ''">
-				AND a.master = #{master.id}
-			</if>
-			<if test="reviewStandard != null and reviewStandard != ''">
-				AND a.review_standard = #{reviewStandard}
-			</if>
-
-			<if test="startDate != null and startDate != ''">
-				AND a.report_date &gt;= #{startDate}
-			</if>
-			<if test="endDate != null and endDate != ''">
-				AND a.report_date &lt;= #{endDate}
-			</if>
-			<if test="fileStatus != null and fileStatus != ''">
-				AND a.file_status = #{fileStatus}
-			</if>
-			<if test="officeId != null and officeId != ''">
-				AND a.office_id = #{officeId}
-			</if>
-			<if test="createStartDate != null and createStartDate != ''">
-				AND a.create_date &gt;= #{createStartDate}
-			</if>
-			<if test="createEndDate != null and createEndDate != ''">
-				AND a.create_date &lt;= #{createEndDate}
-			</if>
-			<if test="project!=null and project.projectName != null and project.projectName != ''">
-				AND r.project_name like
-				<if test="dbName == 'oracle'">'%'||#{project.projectName}||'%'</if>
-				<if test="dbName == 'mysql'">CONCAT('%', #{project.projectName}, '%')</if>
-			</if>
-			<if test="contractNum != null and contractNum != ''">
-				AND wci.contract_num like
-				<if test="dbName == 'oracle'">'%'||#{contractNum}||'%'</if>
-				<if test="dbName == 'mysql'">CONCAT('%', #{contractNum}, '%')</if>
-			</if>
-			<if test="clientName != null and clientName != ''">
-				AND wct.name like
-				<if test="dbName == 'oracle'">'%'||#{clientName}||'%'</if>
-				<if test="dbName == 'mysql'">CONCAT('%', #{clientName}, '%')</if>
-			</if>
-			<if test="projectMasterId != null and projectMasterId != ''">
-				AND #{projectMasterId} in (select user_id from work_project_user pm WHERE pm.project_id = a.project_id AND is_master = '1' AND pm.del_flag = '0')
-			</if>
+			a.del_flag = 0 and a.file_status in(1,2)
 			AND a.status in ('5','7')
 			and a. id =#{id}
 		</where>

src/main/webapp/static/common/jeeplus.js

@@ -433,6 +433,7 @@ function getAuditState(id)
         case "6":result.label = "discarding";result.status="作废中";break;
         case "7":result.label = "discarded";result.status="已作废";break;
         case "8":result.label = "changing";result.status="变更中";break;
+        case "10":result.label = "unknown";result.status="待发起";break;
         default:
             result.label = "unknown";result.status="未知";break;
     }

src/main/webapp/webpage/modules/projectrecord/implementCompletion/projectCompletionReviewList.jsp

@@ -327,6 +327,25 @@
 								return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
 							}
 						}},
+					{align:'center', title: '状态',  width:70,templet:function(d){
+							var st = getAuditState(""+d.projectStatus);
+							if(d.pid ==0){
+								if(st.action)
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/project/projectRecords/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								else
+									var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								return xml;
+							}else if(d.pid !=0){
+								st = getAuditState(""+d.status);
+								if(st.action)
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + d.id + "&projectReportData.id="+ d.reportId + "&type="+d.status+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								else
+									var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								return xml;
+							}else{
+								return '';
+							}
+						}},
                     {templet: complain, align:'center', title: '操作',width:130}
                 ]],
                 done: function () {
@@ -380,9 +399,9 @@
 					].join('');
 				}else if(d.status == 5){
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogres(\'报告作废\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportInvalid&dictType=${dictType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="op-btn op-btn-invalid" ><i class="fa fa-trash-o"></i> 作废</a>',
+						/*'<a href="javascript:void(0)" onclick="openDialogres(\'报告作废\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportInvalid&dictType=${dictType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="op-btn op-btn-invalid" ><i class="fa fa-trash-o"></i> 作废</a>',*/
 					].join('');
-				}else if(d.status == null || d.status == ''){
+				}else if(d.status == null || d.status == '' || d.status == 10){
 					return [
 						'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/projectCompletionReview/reviewForm?view=report&dictType='+d.dictType+'&project.id='+d.pid+'&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
 					].join('');

src/main/webapp/webpage/modules/projectrecord/implementEarly/projectEarlyReviewList.jsp

@@ -348,6 +348,25 @@
 								return "<font>"+layui.util.toDateString(date,'yyyy-MM-dd')+"</font>";
 							}
 						}},
+					{align:'center', title: '状态',  width:70,templet:function(d){
+							var st = getAuditState(""+d.projectStatus);
+							if(d.pid ==0){
+								if(st.action)
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/project/projectRecords/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								else
+									var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								return xml;
+							}else if(d.pid !=0){
+								st = getAuditState(""+d.status);
+								if(st.action)
+									var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/projectcontentinfo/projectcontentinfo/getProcessOne?id=" + d.id + "&projectReportData.id="+ d.reportId + "&type="+d.status+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								else
+									var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+								return xml;
+							}else{
+								return '';
+							}
+						}},
                     {templet: complain, align:'center', title: '操作',width:130}
                 ]],
                 done: function () {
@@ -401,9 +420,9 @@
 					].join('');
 				}else if(d.status == 5){
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogres(\'报告作废\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportInvalid&dictType=${dictType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="op-btn op-btn-invalid" ><i class="fa fa-trash-o"></i> 作废</a>',
+						/*'<a href="javascript:void(0)" onclick="openDialogres(\'报告作废\', \'${ctx}/projectcontentinfo/projectcontentinfo/form?view=reportInvalid&dictType=${dictType}&id='+d.contentPId+'&parentIds=${parentIds}&projectReportData.id='+d.reportId+'\',\'95%\',\'95%\')" class="op-btn op-btn-invalid" ><i class="fa fa-trash-o"></i> 作废</a>',*/
 					].join('');
-				}else if(d.status == null || d.status == ''){
+				}else if(d.status == null || d.status == '' || d.status == 10){
 					return [
 						'<a href="javascript:void(0)" onclick="openDialogres(\'复核\', \'${ctx}/project/projectEarlyReview/reviewForm?view=report&dictType='+d.dictType+'&project.id='+d.pid+'&id='+d.contentPId+'&parentIds='+d.parentIds+'&infoId='+d.id+'\',\'95%\',\'95%\')" class="op-btn op-btn-edit" ><i class="fa fa-plus"></i> 复核</a>',
 					].join('');