项目管理页面修改

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

@@ -260,7 +260,8 @@ END) as projectScale*/
 		,ifnull(prd.verify_rate ,"") as "verifyRate"
 		,prd.audit_pass_date as "reportAuditDate"
 		,prdt.audit_pass_date as "reportTwoAuditDate"
-		,SUM(wi.money) as "money"
+		/*,SUM(wi.money) as "money"*/
+		,prd.ZiXunShouRu as "money"
 		FROM rural_project_records a
 		LEFT JOIN sys_area area ON area.id = a.area_id
 		left join rural_project_records_reported rprr on rprr.id = a.id
@@ -283,8 +284,8 @@ END) as projectScale*/
 		LEFT JOIN project_material_defect_record pmdr on prd.id = pmdr.report_id
 		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
 		left join project_paper_filing ppf on ppf.project_id = a.id
-		LEFT JOIN work_invoice_project_relation wip ON wip.project_id = a.id
-		LEFT JOIN work_invoice wi ON wi.id = wip.invoice_id
+		/*LEFT JOIN work_invoice_project_relation wip ON wip.project_id = a.id
+		LEFT JOIN work_invoice wi ON wi.id = wip.invoice_id*/
 		<where>
 			a.status = 5
 			<if test="bzshbUserId!=null and bzshbUserId!=''">
@@ -1076,182 +1077,162 @@ END) as projectScale*/
 		</where>
 	</select>
 	<select id="getListMoney" resultType="java.lang.String">
-		SELECT
-		format(sum( wii.money ),2)
-		FROM
-			work_invoice wii
-		WHERE
-				wii.id IN (
-				SELECT DISTINCT
-					wi.id
-				FROM
-					rural_project_records a
-					LEFT JOIN sys_area area ON area.id = a.area_id
-					left join rural_project_records_reported rprr on rprr.id = a.id
-					LEFT JOIN project_flingbatch_relation pfp on pfp.project_id=a.id
-					LEFT JOIN project_filingbatch pfb on pfb.id=pfp.filing_batch
-					LEFT JOIN sys_user sua on a.create_by = sua.id
-					<if test="leaderNameStr !=null and leaderNameStr !=''">
-						LEFT JOIN work_project_user w on a.id = w.project_id
-						LEFT JOIN sys_user su on w.user_id = su.id
-					</if>
-					LEFT JOIN sys_user sub on a.project_master_id = sub.id
-					LEFT JOIN sys_office sob ON sob.id = sub.office_id
-					LEFT JOIN work_project_user w1 on a.id = w1.project_id
-					LEFT JOIN work_contract_info wci on a.contract_id = wci.id
-					LEFT JOIN work_client_info wct on wci.client_id = wct.id
-					LEFT JOIN sys_office o ON o.id = a.office_id
-					left join project_report_data prd on prd.project_id = a.id
-					left join project_report_data_two prdt on prdt.project_id = a.id
-					left join rural_project_report_record prr on prr.report_id = prd.id
-					LEFT JOIN project_material_defect_record pmdr on prd.id = pmdr.report_id
-					left join rural_project_report_record_down prrd on prrd.report_id = prd.id
-					left join project_paper_filing ppf on ppf.project_id = a.id
-						LEFT JOIN work_invoice_project_relation wip ON wip.project_id = a.id
-						LEFT JOIN work_invoice wi ON wi.id = wip.invoice_id
-				WHERE
-					a.STATUS = 5
-				  AND a.project_type IN ( 1, 2 )
-				  AND a.STATUS != 7
-				  AND a.del_flag = 0
-				  AND wip.is_project = 1
-					<if test="bzshbUserId!=null and bzshbUserId!=''">
-						and prd.bzshb_user_id=#{bzshbUserId}
-					</if>
-					<if test="projectId != null and projectId != ''">
-						AND a.project_id like concat('%',#{projectId},'%')
-					</if>
-					<if test="projectName != null and projectName != ''">
-						AND a.project_name like concat(concat('%',#{projectName}),'%')
-					</if>
-					<if test="scaleType != null and scaleType != ''">
-						AND a.scale_type = #{scaleType}
-					</if>
-					<if test="scaleUnit != null and scaleUnit != ''">
-						AND a.scale_unit = #{scaleUnit}
-					</if>
-					<if test="scaleQuantity != null and scaleQuantity != ''">
-						AND a.scale_quantity = #{scaleQuantity}
-					</if>
-					<if test="projectSite != null and projectSite != ''">
-						AND a.project_site LIKE concat('%',#{projectSite},'%')
-					</if>
-					<if test="remarks != null and remarks != ''">
-						AND a.remarks LIKE concat('%',#{remarks},'%')
-					</if>
-					<if test="projectDesc != null and projectDesc != ''">
-						AND a.project_desc LIKE concat('%',#{projectDesc},'%')
-					</if>
-					<if test="area != null and area.id != null and area.id != ''">
-						AND a.area_id = #{area.id}
-					</if>
-					<if test="workContractInfo !=null and workContractInfo.name !=null and workContractInfo.name !=''">
-						AND wci.name like concat(concat('%',#{workContractInfo.name}),'%')
-					</if>
-					<if test="workContractInfo !=null and workContractInfo.contractNum !=null and workContractInfo.contractNum !=''">
-						AND wci.contract_num like concat(concat('%',#{workContractInfo.contractNum}),'%')
-					</if>
-					<if test="workContractInfo !=null and workContractInfo.contractPrice !=null and workContractInfo.contractPrice !=''">
-						AND wci.contract_price = #{workContractInfo.contractPrice}
-					</if>
-					<if test="workContractInfo !=null and workContractInfo.contractType !=null and workContractInfo.contractType !=''">
-						AND wci.contract_type = #{workContractInfo.contractType}
-					</if>
-					<if test="workContractInfo!=null and workContractInfo.client !=null and workContractInfo.client.name !=null and workContractInfo.client.name !=''">
-						AND wct.name like concat(concat('%',#{workContractInfo.client.name}),'%')
-					</if>
-					<!--<if test="leaderNameStr !=null and leaderNameStr !=''">
-						AND su.name like concat(concat('%',#{leaderNameStr}),'%') AND w.is_master = '1' AND w.del_flag='0'
-					</if>-->
-					<if test="(leaderNameStr != null and leaderNameStr != '') or (leaderId != null and leaderId != '')">
-						AND ((w.user_id = #{leaderId}) or su.name like concat('%',#{leaderNameStr},'%')) AND w.is_master = '1' AND w.del_flag='0'
-					</if>
-					<if test="projectStatus !=null">
-						AND a.status = #{projectStatus}
-					</if>
-					<if test="beginDate !=null">
-						AND a.create_date >= #{beginDate}
-					</if>
-					<if test="endDate !=null">
-						AND a.create_date &lt; #{endDate}
-					</if>
-					<if test="emergencyProject !=null and emergencyProject != ''">
-						<choose>
-							<when test="emergencyProject == 0">
-								AND (a.emergency_project = #{emergencyProject} or a.emergency_project is null)
-							</when>
-							<otherwise>
-								AND a.emergency_project = #{emergencyProject}
-							</otherwise>
-						</choose>
-					</if>
-					<!--<if test="createBy != null and createBy.id !=null and createBy.id !=''">
-						AND a.create_by = #{createBy.id}
-					 </if>-->
-					<if test="createBy != null and((createBy.id != null and createBy.id != '') or (createBy.name != null and createBy.name != ''))">
-						AND (a.create_by = #{createBy.id} or sua.name like concat('%',#{createBy.name},'%'))
-					</if>
-					<choose>
-						<when test="downProjectReportRecordStatus == 0">
-							AND( pfp.status is null or ppf.status is null )
-						</when>
-						<otherwise>
-							<if test="downProjectReportRecordStatus!=null and downProjectReportRecordStatus !=''">
-								AND (pfp.status = #{downProjectReportRecordStatus} or ppf.status = #{downProjectReportRecordStatus})
-							</if>
-						</otherwise>
-					</choose>
-					<if test="reportData!=null and reportData.number !=null and reportData.number !=''">
-						and prd.number like concat('%',#{reportData.number},'%')
-					</if>
-					<!--<if test="office!=null and office.id!=null and office.id!=''">
-						and  a.office_id = #{office.id}
-					</if>-->
-					<if test="office!=null and office.id=='' and office.name!=null and office.name!='' ">
-						and  o.name like concat('%',#{office.name},'%')
-					</if>
-					<if test="officeIdList!=null and officeIdList.size!=0">
-						and a.office_id in
-						<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">
-							#{officeId}
-						</foreach>
-					</if>
+		SELECT ROUND(sum(if(prd.status = '5',prd.ZiXunShouRu,0)),2) as moneyAll
+		FROM rural_project_records a
 
-					<if test="reportedState !=null and reportedState !=''">
-						<choose>
-							<when test="reportedState == 0">
-								AND a.reported_state is null
-							</when>
-							<otherwise>
-								AND a.reported_state = #{reportedState}
-							</otherwise>
-						</choose>
-					</if>
-					<if test="engineeringType !=null and engineeringType !=''">
-						and a.engineering_type= #{engineeringType}
-					</if>
-					<if test="attachmentProjectSort !=null and attachmentProjectSort !=''">
-						and a.attachment_project_sort= #{attachmentProjectSort}
-					</if>
+		<if test="leaderNameStr !=null and leaderNameStr !=''">
+			LEFT JOIN work_project_user w on a.id = w.project_id
+			LEFT JOIN sys_user su on w.user_id = su.id
+		</if>
+		LEFT JOIN work_project_user w1 on a.id = w1.project_id
+		<if test="workContractInfo !=null">
+			LEFT JOIN work_contract_info wci on a.contract_id = wci.id
+		</if>
+		<if test="workContractInfo!=null and workContractInfo.client !=null and workContractInfo.client.name !=null and workContractInfo.client.name !=''">
+			LEFT JOIN work_client_info wct on wci.client_id = wct.id
+		</if>
+		left join project_report_data prd on prd.project_id = a.id
+		left join project_report_data_two prdt on prdt.project_id = a.id
+		left join rural_project_report_record prr on prr.report_id = prd.id
+		LEFT JOIN project_material_defect_record pmdr on prd.id = pmdr.report_id
+		left join rural_project_report_record_down prrd on prrd.report_id = prd.id
+		LEFT JOIN project_flingbatch_relation pfp on pfp.project_id= a.id
+		LEFT JOIN sys_user sua on a.create_by = sua.id
+		left join project_paper_filing ppf on ppf.project_id = a.id
+		LEFT JOIN sys_office o ON o.id = a.office_id
+		<where>
+			a.status = 5
+			<if test="bzshbUserId!=null and bzshbUserId!=''">
+				and prd.bzshb_user_id=#{bzshbUserId}
+			</if>
+			<if test="projectId != null and projectId != ''">
+				AND a.project_id like concat('%',#{projectId},'%')
+			</if>
+			<if test="projectName != null and projectName != ''">
+				AND a.project_name like concat(concat('%',#{projectName}),'%')
+			</if>
+			<if test="scaleType != null and scaleType != ''">
+				AND a.scale_type = #{scaleType}
+			</if>
+			<if test="scaleUnit != null and scaleUnit != ''">
+				AND a.scale_unit = #{scaleUnit}
+			</if>
+			<if test="scaleQuantity != null and scaleQuantity != ''">
+				AND a.scale_quantity = #{scaleQuantity}
+			</if>
+			<if test="projectSite != null and projectSite != ''">
+				AND a.project_site LIKE concat('%',#{projectSite},'%')
+			</if>
+			<if test="remarks != null and remarks != ''">
+				AND a.remarks LIKE concat('%',#{remarks},'%')
+			</if>
+			<if test="projectDesc != null and projectDesc != ''">
+				AND a.project_desc LIKE concat('%',#{projectDesc},'%')
+			</if>
+			<if test="area != null and area.id != null and area.id != ''">
+				AND a.area_id = #{area.id}
+			</if>
+			<if test="workContractInfo !=null and workContractInfo.name !=null and workContractInfo.name !=''">
+				AND wci.name like concat(concat('%',#{workContractInfo.name}),'%')
+			</if>
+			<if test="workContractInfo !=null and workContractInfo.contractNum !=null and workContractInfo.contractNum !=''">
+				AND wci.contract_num like concat(concat('%',#{workContractInfo.contractNum}),'%')
+			</if>
+			<if test="workContractInfo !=null and workContractInfo.contractPrice !=null and workContractInfo.contractPrice !=''">
+				AND wci.contract_price = #{workContractInfo.contractPrice}
+			</if>
+			<if test="workContractInfo !=null and workContractInfo.contractType !=null and workContractInfo.contractType !=''">
+				AND wci.contract_type = #{workContractInfo.contractType}
+			</if>
+			<if test="workContractInfo!=null and workContractInfo.client !=null and workContractInfo.client.name !=null and workContractInfo.client.name !=''">
+				AND wct.name like concat(concat('%',#{workContractInfo.client.name}),'%')
+			</if>
+			<!--<if test="leaderNameStr !=null and leaderNameStr !=''">
+                AND su.name like concat(concat('%',#{leaderNameStr}),'%') AND w.is_master = '1' AND w.del_flag='0'
+            </if>-->
+			<if test="(leaderNameStr != null and leaderNameStr != '') or (leaderId != null and leaderId != '')">
+				AND ((w.user_id = #{leaderId}) or su.name like concat('%',#{leaderNameStr},'%')) AND w.is_master = '1' AND w.del_flag='0'
+			</if>
+			<if test="projectStatus !=null">
+				AND a.status = #{projectStatus}
+			</if>
+			<if test="beginDate !=null">
+				AND a.create_date >= #{beginDate}
+			</if>
+			<if test="endDate !=null">
+				AND a.create_date &lt; #{endDate}
+			</if>
+			<if test="emergencyProject !=null and emergencyProject != ''">
+				<choose>
+					<when test="emergencyProject == 0">
+						AND (a.emergency_project = #{emergencyProject} or a.emergency_project is null)
+					</when>
+					<otherwise>
+						AND a.emergency_project = #{emergencyProject}
+					</otherwise>
+				</choose>
+			</if>
+			<!--<if test="createBy != null and createBy.id !=null and createBy.id !=''">
+				AND a.create_by = #{createBy.id}
+			</if>-->
+			<if test="createBy != null and((createBy.id != null and createBy.id != '') or (createBy.name != null and createBy.name != ''))">
+				AND (a.create_by = #{createBy.id} or sua.name like concat('%',#{createBy.name},'%'))
+			</if>
 
-					<if test="projectReportStatus != null and projectReportStatus != ''">
-						AND prd.status = #{projectReportStatus}
-					</if>
-					<if test="submitMoney != null and submitMoney != ''">
-						AND a.submit_money = #{submitMoney}
+			<choose>
+				<when test="downProjectReportRecordStatus == 0">
+					AND( pfp.status is null or ppf.status is null )
+				</when>
+				<otherwise>
+					<if test="downProjectReportRecordStatus!=null and downProjectReportRecordStatus !=''">
+						AND (pfp.status = #{downProjectReportRecordStatus} or ppf.status = #{downProjectReportRecordStatus})
 					</if>
+				</otherwise>
+			</choose>
+			<if test="reportData!=null and reportData.number !=null and reportData.number !=''">
+				and prd.number like concat('%',#{reportData.number},'%')
+			</if>
+			<if test="engineeringType !=null and engineeringType !=''">
+				and a.engineering_type= #{engineeringType}
+			</if>
+			<if test="attachmentProjectSort !=null and attachmentProjectSort !=''">
+				and a.attachment_project_sort= #{attachmentProjectSort}
+			</if>
+			<!--<if test="office!=null and office.id!=null and office.id!=''">
+				and  a.office_id = #{office.id}
+			</if>-->
+			<if test="office!=null and office.id=='' and office.name!=null and office.name!='' ">
+				and  o.name like concat('%',#{office.name},'%')
+			</if>
+			<if test="officeIdList!=null and officeIdList.size!=0">
+				and a.office_id in
+				<foreach collection="officeIdList" item="officeId" separator="," open="(" close=")">
+					#{officeId}
+				</foreach>
+			</if>
+			<if test="projectReportStatus != null and projectReportStatus != ''">
+				AND prd.status = #{projectReportStatus}
+			</if>
+			<if test="reportedState !=null and reportedState !=''">
+				<choose>
+					<when test="reportedState == 0">
+						AND a.reported_state is null
+					</when>
+					<otherwise>
+						AND a.reported_state = #{reportedState}
+					</otherwise>
+				</choose>
+			</if>
+			<if test="submitMoney != null and submitMoney != ''">
+				AND a.submit_money = #{submitMoney}
+			</if>
+			<choose>
+				<when test="projectReportRecordStatus != null and projectReportRecordStatus != '' and projectReportRecordStatus != 0">
 					<choose>
-						<when test="projectReportRecordStatus != null and projectReportRecordStatus != '' and projectReportRecordStatus != 0">
+						<when test="projectReportRecordStatus == 6 or projectReportRecordStatus == 7">
 							<choose>
-								<when test="projectReportRecordStatus == 6 or projectReportRecordStatus == 7">
-									<choose>
-										<when test="projectReportRecordStatus == 6">
-											AND a.record_state= #{projectReportRecordStatus} and prr.status is null
-										</when>
-										<otherwise>
-											AND prr.status = #{projectReportRecordStatus}
-										</otherwise>
-									</choose>
+								<when test="projectReportRecordStatus == 6">
+									AND a.record_state= #{projectReportRecordStatus} and prr.status is null
 								</when>
 								<otherwise>
 									AND prr.status = #{projectReportRecordStatus}
@@ -1259,35 +1240,38 @@ END) as projectScale*/
 							</choose>
 						</when>
 						<otherwise>
-							<choose>
-								<when test="projectReportRecordStatus == 0">
-									AND prr.status is null
-								</when>
-							</choose>
+							AND prr.status = #{projectReportRecordStatus}
 						</otherwise>
 					</choose>
-
-					<if test="typeList !=null and typeList !=''">
-						and a.project_type in
-						<foreach collection="typeList" item="id" index="index" open="(" close=")" separator=",">
-							#{id}
-						</foreach>
-					</if>
+				</when>
+				<otherwise>
 					<choose>
-						<when test="projectReportStatusTwo == 0">
-							AND prdt.status is null
+						<when test="projectReportRecordStatus == 0">
+							AND prr.status is null
 						</when>
-						<otherwise>
-							<if test="projectReportStatusTwo!=null and projectReportStatusTwo !=''">
-								AND prdt.status = #{projectReportStatusTwo}
-							</if>
-						</otherwise>
 					</choose>
-					<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
-						AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id})${sqlMap.dsf} )
+				</otherwise>
+			</choose>
+			<choose>
+				<when test="projectReportStatusTwo == 0">
+					AND prdt.status is null
+				</when>
+				<otherwise>
+					<if test="projectReportStatusTwo!=null and projectReportStatusTwo !=''">
+						AND prdt.status = #{projectReportStatusTwo}
 					</if>
-				ORDER BY
-					a.update_date DESC
-			)
+				</otherwise>
+			</choose>
+			<if test="typeList !=null and typeList !=''">
+				and a.project_type in
+				<foreach collection="typeList" item="id" index="index" open="(" close=")" separator=",">
+					#{id}
+				</foreach>
+			</if>
+			AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
+				AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id})${sqlMap.dsf} )
+			</if>
+		</where>
 	</select>
 </mapper>

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

@@ -806,7 +806,7 @@
 						</shiro:hasPermission>
 						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
 						<div class=" layui-btn-sm" style="float: right;width: 300px">
-							<span style="color: red">金额汇总(收费金额)：${moneyAll}(元)</span>
+							<span style="color: red">咨询营业收入：${moneyAll}(万元)</span>
 						</div>
 					</div>
 					<shiro:hasPermission name="ruralProject:ruralCostProjectMessage:reportSwitch">
@@ -873,7 +873,7 @@
 				,{field: 'client', align:'center', title: '委托方',width:200,templet: function(d){
 						return "<font style = 'font-size:14px;font-weight:500;'>"+d.client+"</font>";
 					}}
-                ,{field:'money',align:'center', title: '收费金额',  width:80}
+                ,{field:'money',align:'center', title: '咨询营业收入(万元)',  width:140}
                 ,{field:'createName',align:'center', title: '登记人',  width:80}
                 ,{field: 'createDate', align:'center', title: '创建日期/打包时间',width:100,templet: function(d){
 					var date=d.createDate;