公司级报表项目信息查询修改

src/main/java/com/jeeplus/modules/statement/controller/StatementCompanyComprehensiveController.java

@@ -132,59 +132,6 @@ public class StatementCompanyComprehensiveController extends BaseController {
         //获取项目信息
         Page<RuralProjectRecords> page = projectRecordsService.findReportPage(new Page<RuralProjectRecords>(request, response), projectRecords,officeId,grade,bigDateType,smallDateType,recordState,reportedState);
 
-        //查询所有和当前登陆人有关的项目的审核
-        WorkProjectNotify workProjectNotify = new WorkProjectNotify();
-        workProjectNotify.setUser(UserUtils.getUser());
-        workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
-        workProjectNotify.setRemarks("待审批");
-        //添加项目对应编号
-        workProjectNotify.setType("39");
-        //查询所有需要当前登录人进行处理的项目信息
-        List<WorkProjectNotify> notifyList = workProjectNotifyService.findList(workProjectNotify);
-
-        //无合同状态下，获取委托方的名称
-        List<RuralProjectRecords> list = page.getList();
-        for (int i = 0; i < list.size(); i++) {
-            RuralProjectRecords records1 = list.get(i);
-            if (records1.getWorkContractInfo() == null) {
-                projectRecordsService.queryLinkmanInfos(records1);
-                if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
-                    WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
-                    WorkContractInfo contractInfo = new WorkContractInfo();
-                    contractInfo.setClient(linkman.getClientId());
-                    records1.setWorkContractInfo(contractInfo);
-                }
-            }
-            //获取项目报告号
-            if(records1.getReportData()==null){
-                ruralProjectMessageService.queryReportData(records1);
-                if (records1.getProjectReportData() != null && records1.getProjectReportData().size() > 0) {
-                    ProjectReportData reportData = records1.getProjectReportData().get(0);
-                    ProjectReportData projectReportData = new ProjectReportData();
-                    projectReportData.setNumber(reportData.getNumber());
-//					records1.setReportData(projectReportData);
-                    records1.setProjectReportNumber(reportData.getNumber());
-                }
-            }
-            //判断是否为admin
-            if (UserUtils.isManager()){
-                records1.setFlagAdmin("1");
-            }else{
-                records1.setFlagAdmin("0");
-            }
-
-            //处理需要审批的项目信息
-            records1.setNotifyFlag(null);
-            for (WorkProjectNotify notify: notifyList) {
-                if(notify.getNotifyId().equals(records1.getId())){
-                    records1.setNotifyId(notify.getId());
-                    if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
-                        records1.setNotifyFlag(1);
-                    }
-                    break;
-                }
-            }
-        }
         //查询工程类型
         if (projectRecords.getEngineeringType()!=null){
             ProjectEngineeringInfo engineeringInfo=engineeringService.get(projectRecords.getEngineeringType());

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

@@ -435,12 +435,7 @@
 								<form:input path="workContractInfo.name" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
 						</div>
-						<div class="layui-item query athird ">
-							<label class="layui-form-label">委托方：</label>
-							<div class="layui-input-block">
-								<form:input path="workContractInfo.client.name" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
-							</div>
-						</div>
+
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">创建时间：</label>
 							<div class="layui-input-block readOnlyFFF">
@@ -547,9 +542,6 @@
 				,{field:'projMaster', align:'center',title: '责任人', width:100,templet:function(d){
 						return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
 					}}
-				,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){
-						return "<span title=\"" + d.client + "\">" + d.client + "</span>";
-					}}
 				,{field:'createDate',align:'center', title: '创建日期',  width:80}
 				,{field: 'submitMoneyStr', align:'center', title: '项目等级',width:100,templet: function(d){
 						return "<font style = 'font-size:14px;'>"+d.submitMoneyStr+"</font>";