第一次雷鑫，智联工地部分月调度图片和月航拍全景提交

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

@@ -0,0 +1,17 @@
+package com.rtrh.projects.modules.projects.mapper;
+
+import com.rtrh.core.repository.Page;
+import com.rtrh.core.repository.mybatis.MyBatisRepository;
+import com.rtrh.projects.modules.projects.vo.SubInfoQueryTzVO;
+import com.rtrh.projects.modules.system.vo.LoginUserVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@MyBatisRepository
+public interface SubInfoQueryMapper {
+    List<Map<String, Object>> pageGraphicProgress(Map<String,Object> params);
+
+    List<Map<String, Object>> selectPageZk(Map<String, Object> map);
+}

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

@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.rtrh.projects.modules.projects.mapper.SubInfoQueryMapper">
+
+    <select id="pageGraphicProgress" resultType="map" parameterType="map">
+        select
+            *
+        from
+            (
+                select a.id, a.is_hide as isHide, sa.yearAmt, src2.yearAmtSj,
+                       a.prop_kind AS propKind, a.indus_kind as indusKind, a.status_fgw, a.sub_name as subName,
+                       a.amt_total as amtTotal, DATE_FORMAT(a.begin_date, '%Y-%m-%d') AS beginDate, DATE_FORMAT(a.end_date, '%Y-%m-%d') AS endDate,
+                       a.`status`, b.title as unitName,
+                       (SELECT num_bl FROM sub_rpt_cont src WHERE src.sub_id = a.id AND src.logic_delete_flag = 0 ORDER BY last_update_time DESC, create_time DESC LIMIT 1) as num_bl
+            from week_and_month_file wamf
+            LEFT JOIN sub_rpt_cont src ON src.id = wamf.main_id
+            LEFT JOIN sub_info a ON a.id = src.sub_id
+            LEFT JOIN j_unit b ON a.unit_id = b.id
+            LEFT JOIN sub_manage d ON a.id = d.sub_id AND d.logic_delete_flag = 0
+            LEFT JOIN sub_verify e ON a.id = e.sub_id AND e.logic_delete_flag = 0
+
+            LEFT JOIN (SELECT sum(amt) as yearAmt, sa.sub_id FROM sub_amtplan sa WHERE sa.logic_delete_flag = 0 AND sa.y_month like CONCAT('',#{year}, '%') GROUP BY sa.sub_id) sa ON sa.sub_id = a.id
+            LEFT JOIN (SELECT sum(amt) as yearAmtSj, src.sub_id FROM sub_rpt_cont src WHERE src.logic_delete_flag = 0 AND src.kj_month like CONCAT('',#{year}, '%') GROUP BY src.sub_id) src2 ON src2.sub_id = a.id
+
+        WHERE wamf.logic_delete_flag = 0 and src.logic_delete_flag = 0
+          AND (wamf.file_type = '101' or wamf.file_type = '102' or wamf.file_type = '203')
+          AND a.status != '0'
+        group by
+            a.id  ) t
+
+    </select>
+    <select id="selectPageZk" resultType="map" parameterType="map">
+      <![CDATA[
+        SELECT
+            (SELECT COUNT(*)
+             FROM sub_pre_new spn3
+             WHERE a.id = spn3.sub_id
+               AND spn3.logic_delete_flag = 0) AS preTotal,
+            ts1.title AS indusKindName,
+            a.content,
+            a.end_date,
+            ts.title AS subjectName,
+            a.amt_year,
+            b.title AS unitTitle,
+            c.title AS mainTitle,
+            a.create_user_id,
+            a.abc,
+            a.score,
+            a.assess_reason AS assessReason,
+            spn.status AS xmbaIs,
+            spn2.status AS yjbgIs,
+            spn.status_conf AS xmbaStatus,
+            spn2.status_conf AS yjbgStatus,
+            CASE WHEN sa.yearAmt!= 0 THEN ROUND((src.yearAmtSj - sa.yearAmt) * 100 / sa.yearAmt, 2) ELSE NULL END AS offset,
+            CASE WHEN sa.yearAmt!= 0 THEN ROUND((src.yearAmtSj) * 100 / sa.yearAmt, 2) ELSE NULL END AS monthAmtRate,
+            su.title AS leaderName,
+            su.sim_code AS leaderPhone,
+            su.job AS leaderJob,
+            COALESCE(us.id, 0) AS usersub,
+            sa.yearAmt AS yearAmt,
+            src.yearAmtSj AS yearAmtSj,
+            src.yearAmtRt AS yearAmtRt,
+            a.id,
+            a.is_hide AS isHide,
+            a.status_fgw,
+            CASE WHEN a.status_fgw = '2' THEN 1 ELSE 0 END AS redNum,
+            CASE WHEN a.status_fgw = '1' THEN 1 ELSE 0 END AS yellowNum,
+            a.date_fgw,
+            a.indus_kind AS indusKind,
+            a.subject_id,
+            a.name_lead,
+            a.tel_lead,
+            a.name_zrr,
+            a.tel,
+            a.sub_name AS subName,
+            a.yb_content AS ybContent,
+            a.kind,
+            a.prop_kind AS propKind,
+            a.amt_total AS amtTotal,
+            a.reason,
+            a.unit_id AS unitId,
+            a.create_time,
+            COALESCE((
+                         SELECT GROUP_CONCAT(
+                                        CONCAT(
+                                                sa.y_month, 'nbsk', sa.assign_amt, 'nbsk', COALESCE(sa.remark, ' ')
+                                        ) SEPARATOR 'nbsy'
+                                )
+                         FROM sub_amtplan sa
+                         WHERE sa.sub_id = a.id AND sa.y_month LIKE '2025%' AND sa.amt IS NOT NULL
+                         GROUP BY sa.sub_id
+                     ), 0) AS assignAmt,
+            COALESCE((
+                         SELECT GROUP_CONCAT(b.title SEPARATOR '</br>')
+                         FROM sub_source g
+                                  LEFT JOIN t_systable b ON g.source_id = b.id
+                         WHERE g.sub_id = a.id AND g.logic_delete_flag = 0
+                         GROUP BY g.sub_id
+                     ), '--') AS zjlyName,
+            COALESCE((
+                         SELECT content
+                         FROM sub_rpt_cont src
+                         WHERE src.sub_id = a.id
+                         ORDER BY id DESC
+                     LIMIT 1
+                ), ' ') AS subEvolve,
+            a.begin_date,
+            a.reason_no_rk AS reasonNoRk,
+            a.sort1,
+            a.sort,
+            a.reason_no_amt AS reasonNoAmt,
+            a.reason_no_kg AS reasonNoKg,
+            a.reason_q AS reasonq,
+            a.reason_jd AS reasonJd,
+            a.is_rk AS isRk,
+            a.kind_nature,
+            COALESCE(a.amt_comp, 0) AS amtComp,
+            COALESCE(num_total, 0) AS numTotal,
+            COALESCE(a.num_comp, 0) AS numComp,
+            DATE_FORMAT(a.end_date, '%Y-%m-%d') AS endDate,
+            b.title AS unitName,
+            c.title AS mainName,
+            DATE_FORMAT(a.begin_date, '%Y-%m-%d') AS beginDate,
+            a.status,
+            a.status_jh AS statusJh,
+            a.status_sp AS statusSp,
+            a.work_space_img AS fileId,
+            COALESCE((
+                         SELECT SUM(amt)
+                         FROM sub_amtplan sa
+                         WHERE sa.sub_id = a.id AND sa.y_month LIKE '2025%' AND sa.amt IS NOT NULL
+                         GROUP BY sa.sub_id
+                     ), 0) AS yearPlanAmt,
+            COALESCE((
+                         SELECT SUM(amt)
+                         FROM sub_rpt_cont src
+                         WHERE src.sub_id = a.id AND src.kj_month LIKE '2025%' AND src.amt IS NOT NULL
+                         GROUP BY src.sub_id
+                     ), 0) AS yearEndAmt,
+            COALESCE((
+                         SELECT SUM(amt)
+                         FROM sub_rpt_cont src3
+                         WHERE src3.sub_id = a.id AND src3.amt IS NOT NULL
+                         GROUP BY src3.sub_id
+                     ), 0) AS allAmt
+        FROM sub_info a
+                 LEFT JOIN j_unit b ON a.unit_id = b.id
+                 LEFT JOIN j_unit c ON a.main_id = c.id
+                 LEFT JOIN t_systable ts ON ts.`code` = a.subject_id AND ts.kind = 'JSDD'
+                 LEFT JOIN t_systable ts1 ON ts1.id = a.indus_kind
+                 LEFT JOIN sub_label sla ON sla.sub_id = a.id AND sla.logic_delete_flag = 0
+                 LEFT JOIN (
+            SELECT SUM(amt) AS yearAmt, sa.sub_id
+            FROM sub_amtplan sa
+            WHERE sa.logic_delete_flag = 0 AND sa.y_month >= '202501'
+            GROUP BY sa.sub_id
+        ) sa ON sa.sub_id = a.id
+                 LEFT JOIN (
+            SELECT SUM(amt) AS yearAmtSj, SUM(src.amt_rt) AS yearAmtRt, src.sub_id
+            FROM sub_rpt_cont src
+            WHERE src.logic_delete_flag = 0 AND src.kj_month >= '202501'
+            GROUP BY src.sub_id
+        ) src ON src.sub_id = a.id
+                 LEFT JOIN sub_verify e ON a.id = e.sub_id AND e.logic_delete_flag = 0
+                 LEFT JOIN sub_manage d ON a.id = d.sub_id AND d.logic_delete_flag = 0
+                 LEFT JOIN sec_user_sub us ON a.id = us.sub_id AND us.logic_delete_flag = 0
+                 LEFT JOIN sub_pre_new spn ON spn.sub_id = a.id AND spn.pre_flow_id = '3' AND spn.logic_delete_flag = 0
+                 LEFT JOIN sub_pre_new spn2 ON spn2.sub_id = a.id AND spn2.pre_flow_id = '4' AND spn2.logic_delete_flag = 0
+                 LEFT JOIN sec_user su ON su.id = us.user_id AND su.logic_delete_flag = 0
+                 LEFT JOIN sub_major mar ON mar.sub_id = a.id
+        WHERE a.logic_delete_flag = 0
+          AND a.status IN ('1', '6', '7', '8', 'A')
+        GROUP BY a.id
+        ORDER BY sort1 DESC, usersub DESC, a.begin_date, a.create_time DESC
+        ]]>
+    </select>
+
+</mapper>

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

@@ -351,4 +351,6 @@ public interface SubInfoQueryService {
 	 * @return
 	 */
 	Page subFixGetAll(Page page, SubInfoQueryTzVO queryVO,List<String> indusKinds, List<String> subjectIds);
+
+	Page pageZkTwo(Page page, LoginUserVO loginUser, SubInfoQueryTzVO queryVO);
 }

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

@@ -13,14 +13,13 @@ import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
 import com.rtrh.projects.modules.projects.dao.*;
 import com.rtrh.projects.modules.projects.dto.SubFixCbSearch;
 import com.rtrh.projects.modules.projects.enums.*;
+import com.rtrh.projects.modules.projects.mapper.SubInfoQueryMapper;
 import com.rtrh.projects.modules.projects.po.*;
 import com.rtrh.projects.modules.projects.service.SubPreNewService;
 import com.rtrh.projects.modules.projects.vo.*;
-import com.rtrh.projects.modules.projects.vo.export.SubInfoFixDetail;
 import com.rtrh.projects.modules.projects.vo.export.SubInfoFixVO;
 import com.rtrh.projects.modules.system.dao.JUnitDao;
 import com.rtrh.projects.modules.system.enums.SysTableKind;
@@ -28,14 +27,12 @@ import com.rtrh.projects.modules.system.po.JUnit;
 import com.rtrh.projects.modules.system.po.TSystable;
 import com.rtrh.projects.modules.system.service.ISubInduService;
 import com.rtrh.projects.modules.system.service.TSysTableService;
-import com.rtrh.projects.modules.system.vo.PersonInfoVO;
 import com.rtrh.projects.modules.utils.DateUtils;
 import com.rtrh.projects.util.TargetDataSource;
 import com.rtrh.projects.vo.projects.SubFixGetBeginRateVo;
 import com.rtrh.projects.vo.statics.OtherQueryVO;
 import com.rtrh.projects.vo.statics.ProjectQueryVO;
 import org.apache.commons.lang3.StringUtils;
-import org.hibernate.Query;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -80,6 +77,9 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
     @Autowired
     private JUnitDao jUnitDao;
 
+    @Autowired
+    private SubInfoQueryMapper subInfoQueryMapper;
+
     @Autowired
     private TSysTableService tSysTableService;
     @Autowired
@@ -1377,9 +1377,23 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
         page.setList(subInfoDao.queryForObjListBySql(sql.toString()));
         return page;
     }
+    @Override
+    @TargetDataSource("secondary")
+    public Page pageZkTwo(Page page, LoginUserVO loginUserVO, SubInfoQueryTzVO queryTzVO) {
+        PageHelper.startPage(page.getPageNo(), page.getPageSize());
+        // 使用 MyBatis 进行查询
+        Map<String, Object> map = new HashMap<>();
+        map.put("subName","");
+        List<Map<String, Object>> data = subInfoQueryMapper.selectPageZk(map);
 
+        PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(data);
+        page.setList(data);
+        page.setTotalCount(pageInfo.getTotal());
+        return page;
+    }
 
     @Override
+    @TargetDataSource("secondary")
     public Page pageZk(Page page, LoginUserVO loginUserVO, SubInfoQueryTzVO queryTzVO) {
         StringBuffer paramSql = new StringBuffer();
         paramSql.append(" and (a.`status` = '1' or a.`status` = 6 or a.`status` = 7 or a.`status` = 8 or  a.`status` = 'A' ) ");
@@ -1426,6 +1440,7 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
     }
 
 
+
     @Override
     public Page pageEnd(Page page, LoginUserVO loginUserVO, SubInfoQueryTzVO queryTzVO) {
         StringBuffer sql = buildSql(loginUserVO, queryTzVO);
@@ -2596,113 +2611,30 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
     }
 
 
+
     @Override
+    @TargetDataSource(value = "secondary")
     public Page pageGraphicProgress(Page page, LoginUserVO loginUserVO, SubInfoQueryTzVO queryTzVO) {
 
-        StringBuffer sql = new StringBuffer();
-        sql.append(" select *   from (   select a.id,  a.is_hide isHide,sa.yearAmt yearAmt,src2.yearAmtSj yearAmtSj, ");
-        sql.append(" a.prop_kind AS propKind,a.indus_kind indusKind,a.status_fgw,a.sub_name subName,");
-        sql.append(" a.amt_total amtTotal, DATE_FORMAT(a.begin_date, '%Y-%m-%d') AS beginDate, DATE_FORMAT(a.end_date, '%Y-%m-%d') AS endDate,");
-        sql.append(" a.`status` ,b.title unitName ");
-        sql.append(" ,(SELECT num_bl\tFROM\tsub_rpt_cont src\tWHERE \tsrc.sub_id = a.id\tAND src.logic_delete_flag = 0\tORDER BY\t\t last_update_time DESC,create_time DESC\tLIMIT 1  ) num_bl");
-        sql.append(" from week_and_month_file wamf ");
-        sql.append(" LEFT JOIN sub_rpt_cont src ON src.id=wamf.main_id ");
-        sql.append(" LEFT JOIN sub_info a ON a.id=src.sub_id ");
-        sql.append(" LEFT JOIN j_unit b ON a.unit_id = b.id ");
-        sql.append(" LEFT JOIN sub_manage d ON a.id = d.sub_id AND d.logic_delete_flag = 0 ");
-        sql.append(" LEFT JOIN sub_verify e ON a.id = e.sub_id AND e.logic_delete_flag = 0 ");
-
-        //20231205  增加项目 今年  年度计划投资，年度实际投资
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy");
-        Date date = new Date();
-        String year = simpleDateFormat.format(date);
-
-        sql.append(" LEFT JOIN ( SELECT sum(amt) yearAmt, sa.sub_id FROM sub_amtplan sa WHERE sa.logic_delete_flag = 0 AND sa.y_month like '" + year + "%'  GROUP BY sa.sub_id ) sa ON sa.sub_id=a.id   ");
-        sql.append(" LEFT JOIN ( SELECT sum(amt) yearAmtSj, src.sub_id FROM sub_rpt_cont src WHERE src.logic_delete_flag = 0 AND src.kj_month like '" + year + "%' GROUP BY src.sub_id ) src2 ON src2.sub_id=a.id    ");
-
-        sql.append("  WHERE wamf.logic_delete_flag=0 and src.logic_delete_flag = 0 ");
-        //限制文件只查图片101-jpg，102-png,视频203-MP4
-        sql.append(" AND (wamf.file_type = '101' or wamf.file_type='102' or wamf.file_type='203') ");
-
-        if (Objects.equals(loginUserVO.getKindUnit(), UserKindUnitEnum.SBDW.getCode())) {
-            //项目单位
-            sql.append(" AND a.unit_id = '" + loginUserVO.getUnitId() + "' ");
-            if (Boolean.TRUE.equals(loginUserVO.getIsUnit())) {
-                //单位用户，看单位全部的
-            } else {
-                //个人用户，看自己申报的
-                sql.append(" AND a.create_user_id = '" + loginUserVO.getId() + "' ");
-            }
-        } else if (Objects.equals(loginUserVO.getKindUnit(), UserKindUnitEnum.ZFDW.getCode())) {
-            //政府单位
-            if (Objects.equals("0", loginUserVO.getStatusProj())) {
-                //看自己部门监管的或者监管单位或审批的
-                //sql.append(" AND ( a.unit_id = '"+ vo.getUnitId()+"' or a.main_id = '"+vo.getUnitId()+"' or d.depart_id = '"+vo.getDepartId()+"' or e.depart_id = '"+vo.getDepartId()+"' ) ");
-                sql.append(" AND ( a.unit_id = '" + loginUserVO.getUnitId() + "' or a.main_id = '" + loginUserVO.getUnitId() + "' or d.manage_id = '" + loginUserVO.getUnitId() + "' or e.unit_id = '" + loginUserVO.getUnitId() + "' ) ");
-            } else {
-                //看所有的
-                if (StringUtil.isNotEmpty(queryTzVO.getHydw())) {
-                    sql.append(" AND ( a.unit_id = '" + queryTzVO.getHydw() + "' or a.main_id = '" + queryTzVO.getHydw() + "' or d.manage_id = '" + queryTzVO.getHydw() + "' or e.unit_id = '" + queryTzVO.getHydw() + "' ) ");
-                }
-            }
-        }
-        if (StringUtil.isNotEmpty(queryTzVO.getKindNature())) {
-            sql.append(" AND a.kind_nature  = '" + queryTzVO.getKindNature() + "' ");
+        // 设置 ProjectStatusEnum.TEMPSAVE 的值
+        if (queryTzVO.getStatus() == null) {
+            queryTzVO.setStatus(ProjectStatusEnum.TEMPSAVE.getKey());
         }
-        if (StringUtil.isNotEmpty(queryTzVO.getStatus())) {
-            sql.append(" and a.`status` = '" + queryTzVO.getStatus() + "' ");
-        } else {
-            sql.append(" AND a.status != '" + ProjectStatusEnum.TEMPSAVE.getKey() + "' ");
-        }
-        if (StringUtil.isNotEmpty(queryTzVO.getSubName())) {
-            sql.append(" and a.sub_name like '%" + queryTzVO.getSubName() + "%' ");
-        }
-
-        if (StringUtil.isNotEmpty(queryTzVO.getKind())) {
-            //遍历
-            String[] kinds = queryTzVO.getKind().split(",");
-            String sqlTemp = "";
-            for (String temp : kinds) {
-
-                sqlTemp = sqlTemp + " INSTR (a.kind,'" + temp + "')>0  OR ";
-            }
-            //去掉最后的 OR
-            String sqlCheck = sqlTemp.substring(0, sqlTemp.length() - 3);
+        queryTzVO.setYear("2025");
+        queryTzVO.setStatus(null);
+        PageHelper.startPage(page.getPageNo(), page.getPageSize());
+        // 使用 MyBatis 进行查询
+        Map<String, Object> map = new HashMap<>();
+        map.put("year","2025");
+        List<Map<String, Object>> data = subInfoQueryMapper.pageGraphicProgress(map);
 
-            sql.append(" AND ( " + sqlCheck + " )");
-        }
-        if (StringUtil.isNotEmpty(queryTzVO.getIndusKind())) {
-            sql.append(" and a.indus_kind = '" + queryTzVO.getIndusKind() + "' ");
-        }
+        PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(data);
+        page.setList(data);
+        page.setTotalCount(pageInfo.getTotal());
+        return page;
+    }
 
-        if (StringUtil.isNotEmpty(queryTzVO.getSubjectId())) {
-            sql.append(" and a.subject_id = '" + queryTzVO.getSubjectId() + "' ");
-        }
-        if (StringUtil.isNotEmpty(queryTzVO.getSbdw())) {
-            sql.append(" AND b.title like '%" + queryTzVO.getSbdw() + "%' ");
-        }
-        if (StringUtil.isNotEmpty(queryTzVO.getPropKind())) {
-            sql.append(" AND a.prop_kind = '" + queryTzVO.getPropKind() + "' ");
-        }
-        sql.append(" group by a.id ");
-        if (page.getOrderType() != null) {
-            if ("asc".equals(page.getOrderType().name())) {
-                sql.append(" ORDER BY yearAmt ");
-            } else if ("desc".equals(page.getOrderType().name())) {
-                sql.append(" ORDER BY yearAmt desc ");
-            }
-        }
 
-        sql.append(" ) t  where 1= 1 ");
-        if (queryTzVO.getNumBlMin() != null) {
-            sql.append(" and num_bl >= '" + queryTzVO.getNumBlMin() + "' ");
-        }
-        if (queryTzVO.getNumBlMax() != null) {
-            sql.append(" and num_bl <= '" + queryTzVO.getNumBlMax() + "' ");
-        }
-        Page pageData = subInfoDao.queryForListBySql(sql.toString(), page);
-        return pageData;
-    }
 
     @Override
     public Map<String, Object> getAllAmtRt(LoginUserVO loginUserVO, SubInfoQueryTzVO queryTzVO) {

projects/src/main/java/com/rtrh/projects/web/controller/subject/api/SubInfoQueryApiController.java

@@ -419,7 +419,8 @@ public class SubInfoQueryApiController extends BaseController {
     public ListMessage querZk(@RequestBody Page page, @RequestBody SubInfoQueryTzVO queryVO) {
         ListMessage message = new ListMessage();
         try {
-            Page pageData = subInfoQueryService.pageZk(page, getCurUser().getLoginUser(), queryVO);
+//            Page pageData = subInfoQueryService.pageZk(page, getCurUser().getLoginUser(), queryVO);
+            Page pageData = subInfoQueryService.pageZkTwo(page, getCurUser().getLoginUser(), queryVO);
             message.add(pageData.getList(), pageData.getTotalCount());
         } catch (Exception e) {
             logger.error("", e);

projects/src/main/webapp/vmodules/graphic/list.jsp

@@ -47,6 +47,32 @@
 										    </div>
 										</div>
 									</div>
+									<div class="layui-col-xs3 layui-col-sm3 layui-col-md4">
+										<div class="layui-form-item">
+											<label class="layui-form-label required">项目属地</label>
+											<div class="layui-input-block">
+												<select name="subjectId">
+													<option value="">请选择</option>
+													<c:forEach items="${JSDD }" var="hy">
+														<option value="${hy.code }">${hy.title }</option>
+													</c:forEach>
+												</select>
+											</div>
+										</div>
+									</div>
+									<div class="layui-col-xs3 layui-col-sm3 layui-col-md4">
+										<div class="layui-form-item">
+											<label class="layui-form-label required">行业类别</label>
+											<div class="layui-input-block">
+												<select name="indusKind" lay-search="">
+													<option value="">请选择</option>
+													<c:forEach items="${HYFL }" var="hy">
+														<option value="${hy.id }">${hy.title }</option>
+													</c:forEach>
+												</select>
+											</div>
+										</div>
+									</div>
 									<div class="layui-col-xs3 layui-col-sm3 layui-col-md4">
 										<div class="layui-form-item" style="height:28px;">
 											<label class="layui-form-label required">项目类型</label>
@@ -81,32 +107,8 @@
 										    </div>
 										</div>
 									</div>
-									<div class="layui-col-xs3 layui-col-sm3 layui-col-md4">
-										<div class="layui-form-item">
-										    <label class="layui-form-label required">所属行业</label>
-										    <div class="layui-input-block">
-												<select name="indusKind" lay-search="">
-													<option value="">请选择</option>
-													<c:forEach items="${HYFL }" var="hy">
-														<option value="${hy.id }">${hy.title }</option>
-													</c:forEach>
-												</select>
-										    </div>
-										</div>
-									</div>
-									<div class="layui-col-xs3 layui-col-sm3 layui-col-md4">
-										<div class="layui-form-item">
-										    <label class="layui-form-label required">建设地点</label>
-										    <div class="layui-input-block">
-												<select name="subjectId">
-													<option value="">请选择</option>
-													<c:forEach items="${JSDD }" var="hy">
-														<option value="${hy.code }">${hy.title }</option>
-													</c:forEach>
-												</select>
-										    </div>
-										</div>
-									</div>
+
+
 								</div>
 								<div class="layui-row">
 									<div class="layui-col-xs4 layui-col-sm4 layui-col-md4">

projects/src/main/webapp/vmodules/leftMenu.jsp

@@ -219,14 +219,14 @@
                         {
                             txt: '周调度图片',
                             code: '706',
-                            // url: 'graphicProgress/list'
-                            url: 'register/underConstruction'
+                            url: 'graphicProgress/list'
+                            // url: 'register/underConstruction'
                         },
                         {
                             txt: '月航拍全景',
                             code: '707',
-                            // url: 'aerial/list'
-                            url: 'register/underConstruction'
+                            url: 'aerial/list'
+                            // url: 'register/underConstruction'
                         }
 
                     ]