第二次雷鑫系统管理部分周报月报提交

projects-service/src/main/java/com/rtrh/projects/modules/msglog/service/impl/PhoneMsgLogServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Pattern;
 
+import com.rtrh.projects.util.TargetDataSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,6 +36,7 @@ public class PhoneMsgLogServiceImpl implements IPhoneMsgLogService {
 	private static Pattern TEL_PATTERN = Pattern.compile("^1[3-9]\\d{9}$");
 
 	@Override
+	@TargetDataSource("secondary")
 	public Page pageQueryLog(Page page, String tel, String subName, String userName) {
 		StringBuffer sql = new StringBuffer();
 		sql.append(" SELECT a.id, a.sub_id,a.content,a.success, a.tel, a.user_name userName, b.sub_name subName, ");

projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/WorkbenchMapper.java

@@ -36,8 +36,8 @@ public interface WorkbenchMapper {
 			@Param("type")String type, @Param("beginDate")Date beginDate, @Param("endDate")Date endDate,
 			@Param("subName")String subName,@Param("currStage")String currStage, @Param("loginName")String loginName);
 
-	List<Map<String,Object>> getYbList(@Param("queryVO")RptContQueryVO queryVO, @Param("yearStr")String yearStr, @Param("startMonthStr")String startMonthStr,
-									   @Param("endMonthStr")String endMonthStr, @Param("pageNo")Integer pageNo, @Param("pageSize") Integer pageSize, @Param("order") String order);
+	List<Map<String,Object>> getYbList(@Param("varkind")String varkind,@Param("varbegin")String varbegin,@Param("varend")String varend,@Param("vardesc")String vardesc,@Param("varstatus")String varstatus
+	,@Param("varjsdd")String varjsdd,@Param("varlogin")String varlogin,@Param("varpage")Integer varpage,@Param("varnum")Integer varnum,@Param("outtotal")Integer outtotal);
 
 
 	List<Map<String,Object>> getWeekAndMonthAlarm( @Param("loginName")String loginName);

projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/WorkbenchMapper.xml

@@ -12,8 +12,10 @@
 		call total_get_list1(#{kind},#{status},#{type},#{beginDate},#{endDate},#{subName},#{loginName},#{currStage})
 	</select>
 
-	<select id="getYbList" parameterType="com.rtrh.projects.modules.projects.vo.RptContQueryVO" resultType="java.util.Map" statementType="CALLABLE" useCache="false">
-		call total_get_yb_list(#{queryVO.status},#{yearStr}, #{startMonthStr},#{endMonthStr},#{queryVO.subName},#{queryVO.loginName},#{queryVO.isDo},#{queryVO.startAmt},#{queryVO.endAmt},#{queryVO.hyfl}, #{queryVO.amtSj}, #{queryVO.amtYc}, #{queryVO.jsdd}, #{pageNo}, #{pageSize}, #{order}, #{queryVO.totalCount,mode=OUT,jdbcType=INTEGER })
+	<select id="getYbList"  resultType="java.util.Map" statementType="CALLABLE" useCache="false">
+	call total_get_yb_g_list(
+			#{varkind},#{varbegin},#{varend},#{vardesc},#{varstatus},#{varjsdd},#{varlogin},#{varpage},#{varnum},#{outtotal}
+			)
 	</select>
 
 	<select id="getWeekAndMonthAlarm" resultType="java.util.Map" statementType="CALLABLE" useCache="false">

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/SubRptContService.java

@@ -16,7 +16,7 @@ public interface SubRptContService {
 
 	List<RptCont> getListBySubId(String subId, RptContKindEnum kind,Date startDate,Date endDate);
 
-	Page ListQuery(Page page, RptContQueryVO queryVO);
+	List<Map<String, Object>> ListQuery(String varkind, String varbegin, String varend, String vardesc, String varstatus, String varjsdd, String varlogin,Integer varpage, Integer varnum, Integer outtotal);
 	List<Map<String,Object>> ListQueryWeekAndMonthAlarm(String loginName);
 
 	void saveReport(WeekContentVO vo, LoginUserVO loginUserVO, RptContKindEnum contKindEnum);

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubRptContServiceImpl.java

@@ -20,6 +20,7 @@ import com.rtrh.projects.modules.system.po.SecUser;
 import com.rtrh.projects.modules.system.service.SecUserService;
 import com.rtrh.projects.modules.utils.DateUtils;
 import com.rtrh.projects.util.TargetDataSource;
+import org.apache.ibatis.annotations.Param;
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.DetachedCriteria;
@@ -88,38 +89,11 @@ public class SubRptContServiceImpl implements SubRptContService {
 	}
 
 	@Override
-	public Page ListQuery(Page page, RptContQueryVO queryVO) {
-		String year = String.valueOf(DateUtil.year(queryVO.getStartMonth()));
-		String startStr = null;
-		String endStr = null;
-		switch (RptContKindEnum.findByCode(queryVO.getContKindEnum())) {
-		case WEEK:
-			startStr = DateUtil.formatDate(queryVO.getStartMonth());
-			endStr = DateUtil.formatDate(queryVO.getEndMonth());
-			break;
-		case MONTH:
-			startStr = DateUtil.format(queryVO.getStartMonth(), MONTH_FORMAT);
-			endStr = DateUtil.format(queryVO.getEndMonth(), MONTH_FORMAT);
-			break;
-		default:
-			break;
-		}
-		if(StringUtil.isEmpty(queryVO.getIsDo())) {
-			queryVO.setIsDo("0");
-		}
-		String order = "";
-		if(page.getOrderType() != null) {
-			if(OrderType.asc.name().equals(page.getOrderType().name())) {
-				order = "1";
-			} else {
-				order = "2";
-			}
-		}
+	@TargetDataSource("secondary")
+	public List<Map<String, Object>> ListQuery(String varkind, String varbegin, String varend, String vardesc, String varstatus, String varjsdd, String varlogin,Integer varpage, Integer varnum, Integer outtotal) {
 
-		List<Map<String, Object>> list = workbenchMapper.getYbList(queryVO, year, startStr, endStr, page.getPageNo(), page.getPageSize(), order);
-		page.setList(list);
-		page.setTotalCount(queryVO.getTotalCount());
-		return page;
+		List<Map<String, Object>> data = workbenchMapper.getYbList(varkind, varbegin, varend, vardesc, varstatus, varjsdd, varlogin, varpage,  varnum, outtotal);
+		return data;
 	}
 
 	@Override

projects-service/src/main/java/com/rtrh/projects/modules/projects/vo/RptContQueryVO.java

@@ -9,21 +9,16 @@ import lombok.Setter;
 @Setter
 @Getter
 public class RptContQueryVO {
+	private String varkind;
+	private String varbegin;
+	private String varend;
+	private String vardesc;
+	private String varstatus;
+	private String varjsdd;
+	private String varlogin;
+	private Integer varpage;
+	private Integer varnum;
+	private Integer outtotal;
 
-	private Date startMonth;
-	private Date endMonth;
-	private Date month;
-	private String status;
-	private String subName;
-	private String loginName;
-	private String contKindEnum;
-	private String isDo;
-	private BigDecimal startAmt;
-	private BigDecimal endAmt;
-	private String hyfl;
-	private String amtSj;
-	private String amtYc;
-	private String jsdd;
-	private Integer totalCount;
 
 }

projects/src/main/java/com/rtrh/projects/outapi/controller/MonthReportApiController.java

@@ -8,10 +8,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import com.rtrh.core.vo.ListMessage;
 import com.rtrh.projects.modules.projects.vo.SubInfoQueryTzVO;
 import com.rtrh.projects.modules.utils.DateUtils;
-import com.rtrh.projects.web.log.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -85,31 +83,19 @@ public class MonthReportApiController extends BaseOutApiController {
         LoginUserVO loginUserVO = jwtUtils.getUserInfo(getToken());
         try {
             RptContQueryVO queryVO = new RptContQueryVO();
-            queryVO.setIsDo(StringUtil.isEmpty(vo.getStatus()) ? "0" : vo.getStatus());
-            queryVO.setStatus("0");
-            queryVO.setHyfl(StringUtil.isEmpty(vo.getHyfl()) ? "" : vo.getHyfl());
-            queryVO.setSubName(StringUtil.isEmpty(vo.getSubName()) ? "" : vo.getSubName());
-            queryVO.setLoginName(loginUserVO.getLoginName());
-            queryVO.setStartMonth(vo.getStartMonth());
-            queryVO.setEndMonth(vo.getEndMonth());
-            queryVO.setContKindEnum(RptContKindEnum.MONTH.getCode());
-            queryVO.setAmtSj("");
-            queryVO.setAmtYc("");
-            queryVO.setJsdd("");
+
 
             String currUserUnitId = loginUserVO.getUnitId();
             Boolean checkEdit = loginUserVO.getEdit();
-            Page pageData = subRptContService.ListQuery(page, queryVO);
-            List<Map<String, Object>> list = pageData.getList();
-            for (Map<String, Object> map : list) {
+            List<Map<String, Object>> data = subRptContService.ListQuery(queryVO.getVarkind(),queryVO.getVarbegin(),queryVO.getVarend(),queryVO.getVardesc(),queryVO.getVarstatus(),queryVO.getVarjsdd(),queryVO.getVarlogin(),queryVO.getVarpage(),queryVO.getVarnum(),queryVO.getOuttotal());
+            for (Map<String, Object> map : data) {
                 if (currUserUnitId.equals(map.get("unit_id") == null ? "" : map.get("unit_id")) || checkEdit == true) {
                     map.put("checkedit", "1");
                 } else {
                     map.put("checkedit", "0");
                 }
             }
-            result.setData("list", list);
-            result.setData("totalCount", pageData.getTotalCount());
+            result.setData("list", data);
         } catch (Exception e) {
             logger.error("", e);
             result.setCode(ResultCode.SYSTEM_ERROR, e.getMessage());

projects/src/main/java/com/rtrh/projects/outapi/controller/WeekReportApiController.java

@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import com.rtrh.projects.web.log.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -88,22 +87,11 @@ public class WeekReportApiController extends BaseOutApiController {
 
     @TokenAuthenticate
     @PostMapping("getList")
-    public JsonResult queryReport(@RequestBody Page page, @RequestBody ListQueryVO vo) {
+    public JsonResult queryReport( @RequestBody ListQueryVO vo) {
         JsonResult result = new JsonResult();
         LoginUserVO loginUserVO = jwtUtils.getUserInfo(getToken());
         try {
         	RptContQueryVO queryVO = new RptContQueryVO();
-            queryVO.setIsDo(StringUtil.isEmpty(vo.getStatus())?"0":vo.getStatus());
-            queryVO.setStatus("0");
-            queryVO.setHyfl(StringUtil.isEmpty(vo.getHyfl())?"":vo.getHyfl());
-            queryVO.setSubName(StringUtil.isEmpty(vo.getSubName())?"":vo.getSubName());
-            queryVO.setLoginName(loginUserVO.getLoginName());
-            queryVO.setStartMonth(vo.getStartMonth());
-            queryVO.setEndMonth(vo.getEndMonth());
-            queryVO.setContKindEnum(RptContKindEnum.WEEK.getCode());
-            queryVO.setAmtSj("");
-            queryVO.setAmtYc("");
-            queryVO.setJsdd("");
             String currUserUnitId = loginUserVO.getUnitId();
             Boolean checkEdit = loginUserVO.getEdit();
             String status = vo.getStatus();
@@ -118,8 +106,7 @@ public class WeekReportApiController extends BaseOutApiController {
             if(StringUtil.isEmpty(subName)) {
             	subName="";
             }
-            Page pageData = subRptContService.ListQuery(page, queryVO);
-            List<Map<String,Object>> list= pageData.getList();
+            List<Map<String,Object>> list= subRptContService.ListQuery(queryVO.getVarkind(),queryVO.getVarbegin(),queryVO.getVarend(),queryVO.getVardesc(),queryVO.getVarstatus(),queryVO.getVarjsdd(),queryVO.getVarlogin(),queryVO.getVarpage(),queryVO.getVarnum(),queryVO.getOuttotal());
             for (Map<String,Object> map:list) {
                 if (currUserUnitId.equals(map.get("unit_id") == null ? "" : map.get("unit_id")) || checkEdit == true) {
                     map.put("checkedit", "1");
@@ -128,7 +115,6 @@ public class WeekReportApiController extends BaseOutApiController {
                 }
             }
             result.setData("list",list);
-            result.setData("totalCount", pageData.getTotalCount());
         } catch (Exception e) {
             logger.error("",e);
             result.setCode(ResultCode.SYSTEM_ERROR, e.getMessage());

projects/src/main/java/com/rtrh/projects/web/controller/projects/ProWeekReportController.java

@@ -109,22 +109,17 @@ public class ProWeekReportController extends BaseController {
 
 
 	@GetMapping("exportExcel")
-	public void exportExcel(RptContQueryVO queryVO, Date startMonth, Date endMonth, String status, String subName, String isDo, BigDecimal startAmt, BigDecimal endAmt, String hyfl, String jsdd) {
+	public void exportExcel(RptContQueryVO queryVO) {
 		try {
 			Page page = new Page();
 			page.setPageNo(1);
 			page.setPageSize(0);//每页记录数为0为查所有
-			queryVO.setLoginName(getCurUser().getLoginName());
-			queryVO.setAmtSj("");
-			queryVO.setAmtYc("");
-			queryVO.setContKindEnum(RptContKindEnum.WEEK.getCode());
+
 			//获取数据
-			page = subRptContService.ListQuery(page, queryVO);
-			List<Map<String, Object>> list = page.getList();
+			List<Map<String, Object>> list= subRptContService.ListQuery(queryVO.getVarkind(),queryVO.getVarbegin(),queryVO.getVarend(),queryVO.getVardesc(),queryVO.getVarstatus(),queryVO.getVarjsdd(),queryVO.getVarlogin(),queryVO.getVarpage(),queryVO.getVarnum(),queryVO.getOuttotal());
 			XSSFWorkbook workbook = new XSSFWorkbook();
 			ExcelExportService service = new ExcelExportService();
 			List<ExcelExportEntity> headers = new ArrayList<>();
-			headers.add(new ExcelExportEntity("年度", "year"));
 			headers.add(new ExcelExportEntity("周报期间", "kj_month", 30));
 			headers.add(new ExcelExportEntity("项目名称", "sub_name", 30));
 			headers.add(new ExcelExportEntity("项目进展情况", "content", 20));

projects/src/main/java/com/rtrh/projects/web/controller/projects/ProjMonthReportController.java

@@ -96,18 +96,14 @@ public class ProjMonthReportController extends BaseController {
 			page.setPageNo(1);
 			page.setPageSize(0);//每页记录数为0为查所有数据
 			//获取数据
-			queryVO.setContKindEnum(RptContKindEnum.MONTH.getCode());
-			queryVO.setLoginName(getCurUser().getLoginName());
-			page = subRptContService.ListQuery(page, queryVO);
-			List<Map<String,Object>> list = page.getList();
+
+			List<Map<String,Object>> list = subRptContService.ListQuery(queryVO.getVarkind(),queryVO.getVarbegin(),queryVO.getVarend(),queryVO.getVardesc(),queryVO.getVarstatus(),queryVO.getVarjsdd(),queryVO.getVarlogin(),queryVO.getVarpage(),queryVO.getVarnum(),queryVO.getOuttotal());
 			XSSFWorkbook workbook = new XSSFWorkbook();
 			ExcelExportService service = new ExcelExportService();
 			List<ExcelExportEntity> headers = new ArrayList<>();
-			headers.add(new ExcelExportEntity("年度","year"));
 			headers.add(new ExcelExportEntity("月报期间","kj_month",20));
 			headers.add(new ExcelExportEntity("项目名称","sub_name",30));
 			headers.add(new ExcelExportEntity("本月实际投资(万元)","amt",20));
-			headers.add(new ExcelExportEntity("下月预测投资(万元)","amt_last",20));
 			headers.add(new ExcelExportEntity("项目进展情况","content",20));
 			headers.add(new ExcelExportEntity("完成比例(%)","num_bl"));
 			headers.add(new ExcelExportEntity("项目延期原因","reason",20));

projects/src/main/java/com/rtrh/projects/web/controller/projects/api/ProWeekReportApiController.java

@@ -2,10 +2,7 @@ package com.rtrh.projects.web.controller.projects.api;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 import com.rtrh.projects.web.log.Log;
 import org.slf4j.Logger;
@@ -57,15 +54,11 @@ public class ProWeekReportApiController extends BaseController {
 	private WeekAndMonthFileService weekAndMonthFileService;
 
 	@PostMapping(value="/queryReport")
-	public ListMessage queryReport(@RequestBody Page page, @RequestBody RptContQueryVO queryVO) {
+	public ListMessage queryReport( @RequestBody RptContQueryVO queryVO) {
 		ListMessage message = new ListMessage();
 		try {
-			queryVO.setLoginName(getCurUser().getLoginName());
-			queryVO.setAmtSj("");
-			queryVO.setAmtYc("");
-			queryVO.setContKindEnum(RptContKindEnum.WEEK.getCode());
-			Page pageData = subRptContService.ListQuery(page, queryVO);
-			message.add(pageData.getList(), pageData.getTotalCount());
+			List<Map<String, Object>> data = subRptContService.ListQuery(queryVO.getVarkind(),queryVO.getVarbegin(),queryVO.getVarend(),queryVO.getVardesc(),queryVO.getVarstatus(),queryVO.getVarjsdd(),queryVO.getVarlogin(),queryVO.getVarpage(),queryVO.getVarnum(),queryVO.getOuttotal());
+			message.setData(data);
 		} catch (Exception e) {
 			logger.error("",e);
 			message.add(e.getMessage());

projects/src/main/java/com/rtrh/projects/web/controller/projects/api/ProjMonthReportApiController.java

@@ -2,6 +2,7 @@ package com.rtrh.projects.web.controller.projects.api;
 
 import java.text.SimpleDateFormat;
 import java.util.List;
+import java.util.Map;
 
 import com.rtrh.projects.modules.projects.po.SubInfo;
 import com.rtrh.projects.modules.projects.service.SubInfoService;
@@ -61,10 +62,8 @@ public class ProjMonthReportApiController extends BaseController {
 	public ListMessage queryReport(@RequestBody Page page, @RequestBody RptContQueryVO queryVO) {
 		ListMessage message = new ListMessage();
 		try {
-			queryVO.setContKindEnum(RptContKindEnum.MONTH.getCode());
-			queryVO.setLoginName(getCurUser().getLoginName());
-			Page pageData = subRptContService.ListQuery(page, queryVO);
-			message.add(pageData.getList(), pageData.getTotalCount());
+			List<Map<String, Object>> data  = subRptContService.ListQuery(queryVO.getVarkind(),queryVO.getVarbegin(),queryVO.getVarend(),queryVO.getVardesc(),queryVO.getVarstatus(),queryVO.getVarjsdd(),queryVO.getVarlogin(),queryVO.getVarpage(),queryVO.getVarnum(),queryVO.getOuttotal());
+			message.setData(data);
 		} catch (Exception e) {
 			logger.error("",e);
 			message.add(e.getMessage());

projects/src/main/webapp/vmodules/project/monthReport.jsp

@@ -192,25 +192,6 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label   ">行业类别</label>
-                                            <div class="layui-input-block">
-                                                <select name="hyfl" lay-search="">
-                                                    <option value="">请选择</option>
-                                                    <c:forEach items="${HYFL }" var="hy">
-                                                        <c:if test="${indusKind == hy.title}">
-                                                            <option value="${hy.id }"
-                                                                    selected="selected">${hy.title }</option>
-                                                        </c:if>
-                                                        <c:if test="${indusKind != hy.title}">
-                                                            <option value="${hy.id }">${hy.title }</option>
-                                                        </c:if>
-                                                    </c:forEach>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
 
                                     <div class="layui-col-xs6 layui-col-sm6 layui-col-md5">
                                         <div class="layui-form-item">
@@ -767,17 +748,16 @@
                     amtYc=this.amtYc
                 }
                 var param = {
-                    startMonth: this.startMonth + "-01",
-                    endMonth: this.endMonth + "-01",
-                    status: $("[name='projStatus']").val(),
-                    subName: $("[name='proName']").val(),
-                    isDo: $("[name='isDo']").val(),
-                    startAmt: startAmt,
-                    endAmt: endAmt,
-                    hyfl: $("[name='hyfl']").val(),
-                    amtSj: amtSj,
-                    amtYc: amtYc,
-                    jsdd: $("[name='jsdd']").val()
+                    varkind:$("[name='projStatus']").val(),
+                    varbegin:"202410",
+                    varend:"202411",
+                    vardesc:$("[name='proName']").val(),
+                    varstatus:$("[name='isDo']").val(),
+                    varjsdd: $("[name='jsdd']").val(),
+                    varlogin:"admin",
+                    varpage: 1,
+                    varnum: 10000,
+                    outtotal: 1,
                 };
                 App.common.utils.downFile(App.getUrl("/monthReport/exportExcel"), "GET", param, "项目月报.xlsx", "项目月报导出失败");
                 //window.location.href=App.getUrl("/monthReport/exportExcel?startMonth="+param.startMonth+"&endMonth="+param.endMonth+"&status="+param.status+"&subName="+param.subName+"&isDo="+param.isDo+"&startAmt="+param.startAmt+"&endAmt="+param.endAmt+"&hyfl="+param.hyfl);
@@ -1071,25 +1051,22 @@
                     return;
                 }
                 var param = {
-                    pageNo: this.pageNo,
-                    pageSize: this.pageSize,
-                    startMonth: this.startMonth + "-01",
-                    endMonth: this.endMonth + "-01",
-                    status: $("[name='projStatus']").val(),
-                    subName: $("[name='proName']").val(),
-                    isDo: $("[name='isDo']").val(),
-                    startAmt: $("[name='startAmt']").val(),
-                    endAmt: $("[name='endAmt']").val(),
-                    hyfl: $("[name='hyfl']").val(),
-                    amtSj: $("[name='amtSj']").val(),
-                    amtYc: $("[name='amtYc']").val(),
-                    jsdd: $("[name='jsdd']").val(),
-                    orderType: this.orderType || null
+
+                    varkind:$("[name='projStatus']").val(),
+                    varbegin:"202410",
+                    varend:"202411",
+                    vardesc:$("[name='proName']").val(),
+                    varstatus:$("[name='isDo']").val(),
+                    varjsdd: $("[name='jsdd']").val(),
+                    varlogin:"admin",
+                    pageNo: 1,
+                    pageSize: 10000,
+                    outtotal: 1,
                 };
 
                 App.postJson("/api/monthReport/queryReport", param, function (res) {
                     if (res.success) {
-                        self.loadTable(res.rows);
+                        self.loadTable(res.data);
                         self.loadPage(res.total);
                     }
                 });

projects/src/main/webapp/vmodules/project/weekReport.jsp

@@ -103,21 +103,14 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
+                                    <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
                                         <div class="layui-form-item">
-                                            <label class="layui-form-label ">行业类别</label>
+                                            <label class="layui-form-label">项目状态</label>
                                             <div class="layui-input-block">
-                                                <select name="hyfl" lay-search="">
-                                                    <option value="">请选择</option>
-                                                    <c:forEach items="${HYFL }" var="hy">
-                                                        <c:if test="${indusKind == hy.title}">
-                                                            <option value="${hy.id }"
-                                                                    selected="selected">${hy.title }</option>
-                                                        </c:if>
-                                                        <c:if test="${indusKind != hy.title}">
-                                                            <option value="${hy.id }">${hy.title }</option>
-                                                        </c:if>
-                                                    </c:forEach>
+                                                <select name="projStatus" lay-verify="required">
+                                                    <option value="0">所有</option>
+                                                    <option value="1">已开工</option>
+                                                    <option value="2">已停工</option>
                                                 </select>
                                             </div>
                                         </div>
@@ -135,18 +128,7 @@
                                         </div>
                                     </div>
 
-                                    <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label">项目状态</label>
-                                            <div class="layui-input-block">
-                                                <select name="projStatus" lay-verify="required">
-                                                    <option value="0">所有</option>
-                                                    <option value="1">已开工</option>
-                                                    <option value="2">已停工</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
+
 
                                     <div class="layui-col-xs6 layui-col-sm6 layui-col-md3">
                                         <div class="layui-form-item">
@@ -284,6 +266,8 @@
             tabActive: 1,
             startMonth: "",
             endMonth: "",
+            startAmt: "",
+            endAmt: "",
             currPlan: [],
             yuebaoInfo: {},
             active: 7, // 左侧菜单选中项
@@ -678,23 +662,23 @@
                 /* var sm = this.startMonth.replace(/\-/g, "");
                 var em = this.endMonth.replace(/\-/g, ""); */
                 var param = {
-                    pageNo: this.pageNo,
-                    pageSize: this.pageSize,
-                    startMonth: this.startMonth,
-                    endMonth: this.endMonth,
-                    status: $("[name='projStatus']").val(),
-                    subName: $("[name='proName']").val(),
-                    isDo: $("[name='isDo']").val(),
-                    startAmt: $("[name='startAmt']").val(),
-                    endAmt: $("[name='endAmt']").val(),
-                    hyfl: $("[name='hyfl']").val(),
-                    jsdd: $("[name='jsdd']").val(),
-                    orderType: this.orderType || null
+
+                    varkind:$("[name='projStatus']").val(),
+                    varbegin:"2024-10-21",
+                    varend:"2024-10-21",
+                    vardesc:$("[name='proName']").val(),
+                    varstatus:$("[name='isDo']").val(),
+                    varjsdd: $("[name='jsdd']").val(),
+                    varlogin:"admin",
+                    varpage: 1,
+                    varnum: 10000,
+                    outtotal: 1,
+
                 };
                 App.postJson("/api/weekReport/queryReport", param, function (res) {
                     if (res.success) {
-                        console.log(res.rows);
-                        self.loadTable(res.rows);
+                        console.log(res.data);
+                        self.loadTable(res.data);
                         self.loadPage(res.total);
                     }
                 });
@@ -738,15 +722,16 @@
                 /* var sm = this.startMonth.replace(/\-/g, "");
                 var em = this.endMonth.replace(/\-/g, ""); */
                 var param = {
-                    startMonth: this.startMonth,
-                    endMonth: this.endMonth,
-                    status: $("[name='projStatus']").val(),
-                    subName: $("[name='proName']").val(),
-                    isDo: $("[name='isDo']").val(),
-                    startAmt: startAmt,
-                    endAmt: endAmt,
-                    hyfl: $("[name='hyfl']").val(),
-                    jsdd: $("[name='jsdd']").val()
+                    varkind:$("[name='projStatus']").val(),
+                    varbegin:"2024-10-21",
+                    varend:"2024-10-21",
+                    vardesc:$("[name='proName']").val(),
+                    varstatus:$("[name='isDo']").val(),
+                    varjsdd: $("[name='jsdd']").val(),
+                    varlogin:"admin",
+                    varpage: 1,
+                    varnum: 10000,
+                    outtotal: 1,
                 };
                 App.common.utils.downFile(App.getUrl("/weekReport/exportExcel"), "GET", param, "项目周报.xlsx", "项目周报导出失败");
                 //window.location.href=App.getUrl("?startMonth="+param.startMonth+"&endMonth="+param.endMonth+"&status="+param.status+"&subName="+param.subName+"&isDo="+param.isDo+"&startAmt="+param.startAmt+"&endAmt="+param.endAmt+"&hyfl="+param.hyfl);