重点项目四库列表查询接口重写

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

@@ -76,4 +76,6 @@ public interface SubInfoMapper {
     List<SubInfoFixTcDetail> exportFixTcDetailExcel(@Param("stateFix") String stateFix,@Param("year") String year);
 
     List<SubFixGetBeginRateVo> subFixGetBeginRate(@Param("queryVO")SubInfoQueryTzVO queryVO,@Param("indusKinds") List<String> indusKinds);
+
+    List<SubFixListVo> subFixGetAll(@Param("queryVO")SubInfoQueryTzVO queryVO,@Param("indusKinds") List<String> indusKinds);
 }

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

@@ -549,7 +549,43 @@
         <if test="queryVO.subjectId != null and queryVO.subjectId != ''">
             AND sub_info.subject_id = #{queryVO.subjectId}
         </if>
-        <if test="queryVO.indusKind != null and queryVO.indusKind != ''">
+        <if test="indusKinds != null and indusKinds.size() &gt; 0">
+            AND sub_info.indus_kind IN
+            <foreach collection="indusKinds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="queryVO.sbdw != null and queryVO.sbdw != ''">
+            AND sub_info.unit_desc LIKE CONCAT('%', #{queryVO.sbdw}, '%')
+        </if>
+        <if test="queryVO.startAmt != null and queryVO.startAmt != ''">
+            AND sub_info.amt_total &gt;= #{queryVO.startAmt}
+        </if>
+        <if test="queryVO.endAmt != null and queryVO.endAmt != ''">
+            AND sub_info.amt_total &lt;= #{queryVO.endAmt}
+        </if>
+    </select>
+    <select id="subFixGetAll" resultType="com.rtrh.projects.modules.projects.vo.SubFixListVo">
+        select
+            b.id as id,
+            b.sub_name as subName,
+            b.subject_id as subjectId,
+            b.content as content,
+            b.amt_total as amtTotal,
+            b.progress as progress,
+            b.remark as remark,
+            b.begin_date as beginDate,
+            b.end_date as endDate,
+            b.rt_date as rtDate
+        from sub_fix a left join sub_info b on a.sub_id = b.id
+        where a.cat = #{queryVO.stateFix} and a.year = #{queryVO.year} and b.logic_delete_flag = 0
+        <if test="queryVO.subName != null and queryVO.subName != ''">
+            AND sub_info.sub_name LIKE CONCAT('%', #{queryVO.subName}, '%')
+        </if>
+        <if test="queryVO.subjectId != null and queryVO.subjectId != ''">
+            AND sub_info.subject_id = #{queryVO.subjectId}
+        </if>
+        <if test="indusKinds != null and indusKinds.size() &gt; 0">
             AND sub_info.indus_kind IN
             <foreach collection="indusKinds" item="item" separator="," open="(" close=")">
                 #{item}

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

@@ -343,4 +343,12 @@ public interface SubInfoQueryService {
 	 * @return
 	 */
     List<SubFixGetBeginRateVo> subFixGetBeginRate(SubInfoQueryTzVO queryVO,List<String> indusKinds);
+
+	/**
+	 * 查询重点库项目列表
+	 * @param page
+	 * @param queryVO
+	 * @return
+	 */
+	Page subFixGetAll(Page page, SubInfoQueryTzVO queryVO,List<String> indusKinds);
 }

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

@@ -20,6 +20,7 @@ import com.rtrh.projects.modules.projects.enums.*;
 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;
@@ -27,6 +28,7 @@ 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.vo.projects.SubFixGetBeginRateVo;
 import com.rtrh.projects.vo.statics.OtherQueryVO;
@@ -355,6 +357,74 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
         return subInfoMapper.subFixGetBeginRate(queryVO, indusKinds);
     }
 
+    @Override
+    public Page subFixGetAll(Page page, SubInfoQueryTzVO queryVO,List<String> indusKinds) {
+        PageHelper.startPage(page.getPageNo(), page.getPageSize());
+        List<SubFixListVo> list = subInfoMapper.subFixGetAll(queryVO, indusKinds);
+
+        //获取项目地点
+        List<TSystable> jsddDict = tSysTableService.getByKind(SysTableKind.JSDD);
+        Map<String, String> jsddNameMap = jsddDict.stream().collect(Collectors.toMap(TSystable::getCode, TSystable::getTitle));
+
+        // 收集所有重点项目信息的ID
+        List<String> subIdList = list.stream()
+                .map(SubFixListVo::getId)
+                .filter(StringUtils::isNotBlank)
+                .collect(Collectors.toList());
+
+        // 查询前期手续办理情况表中的数据，获取所有重点项目的前期手续信息
+        List<SubInfoFixDetailPreNew> preNewList = Optional.ofNullable(
+                subInfoMapper.selectSubPreNewBySubIds(subIdList)
+        ).orElse(Collections.emptyList());
+
+        //对手续信息按照id进行分组
+        Map<String, List<SubInfoFixDetailPreNew>> preNewMap = preNewList.stream().collect(Collectors.groupingBy(SubInfoFixDetailPreNew::getSubId));
+
+        // 遍历重点项目信息，找到对应的前期手续信息，然后拼接手续完成情况为字符串，拼接到对应的重点项目信息中
+        list.forEach(e->{
+            List<SubInfoFixDetailPreNew> subInfoFixDetailPreNewList = preNewMap.get(e.getId());
+            StringBuilder sb = new StringBuilder();
+            if (com.rtrh.common.util.CollectionUtil.isNotEmpty(subInfoFixDetailPreNewList)){
+                //已经完成的手续
+                StringBuilder end = new StringBuilder("已完成：");
+                //正在办理的手续
+                StringBuilder yellow = new StringBuilder("进行中：");
+                //判断是否有已完成手续
+                boolean endBoolean = subInfoFixDetailPreNewList.stream().anyMatch(f->"2".equals(f.getStatusConf()));
+                //判断是否有正在进行手续
+                boolean yellowBoolean = subInfoFixDetailPreNewList.stream().anyMatch(f->"1".equals(f.getStatusConf()));
+                subInfoFixDetailPreNewList.forEach(f->{
+                    if ("1".equals(f.getStatusConf())){
+                        yellow.append(f.getTitle()).append("，");
+                    }else if ("2".equals(f.getStatusConf())){
+                        end.append(f.getTitle()).append("，");
+                    }
+                });
+                if (endBoolean){
+                    sb.append(end, 0, end.length()-1).append("。");
+                }
+                if (yellowBoolean){
+                    sb.append(yellow, 0, yellow.length()-1).append("。");
+                }
+                if (!endBoolean && !yellowBoolean){
+                    sb.append("暂无手续办理情况！");
+                }
+            }
+            e.setQqsxblqk(sb.toString());
+            if (StringUtils.isNotBlank(e.getSubjectId())){
+                e.setSubjectId(jsddNameMap.getOrDefault(e.getSubjectId(),""));
+            }
+
+            //遍历subInfoTotalExcel将万元转换为亿元
+            e.setAmtTotal(e.getAmtTotal().divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP));
+        });
+
+        PageInfo<SubFixListVo> pageInfo = new PageInfo<SubFixListVo>(list);
+        page.setList(list);
+        page.setTotalCount(pageInfo.getTotal());
+        return page;
+    }
+
     @Override
     public Page pageAll(Page page, LoginUserVO loginUserVO, SubInfoQueryTzVO queryTzVO) {
         StringBuffer sql = new StringBuffer();

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

@@ -85,6 +85,51 @@ public class SubInfoQueryApiController extends BaseController {
         return message;
     }
 
+    /**
+     * 项目台账
+     *
+     * @param page
+     * @param queryVO
+     * @return
+     */
+    @PostMapping("subFixGetAll")
+    public ListMessage subFixGetAll(@RequestBody Page page, @RequestBody SubInfoQueryTzVO queryVO) {
+        ListMessage message = new ListMessage();
+        try {
+
+            //查询出行业分类
+            List<SubIndu> subInduList = subInduService.selectAllSubIndu();
+
+            //保存行业code
+            List<String> indusKinds = new ArrayList<>();
+            //判断搜索条件中是否有行业分类条件
+            if (StringUtils.isNotBlank(queryVO.getIndusKinds())) {
+                //在subInduList中找到code=queryVO.getIndusKinds()的数据
+                SubIndu subIndu = subInduList.stream().filter(item -> item.getCode().equals(queryVO.getIndusKinds())).findFirst().orElse(null);
+
+                if (subIndu != null){
+                    //判断这个行业是不是上级行业
+                    if (StringUtils.isBlank(subIndu.getLastId())){
+                        // 这个行业是上级行业，需要找到所有下级行业的code
+                        indusKinds = subInduList.stream().filter(item -> item.getLastId().equals(subIndu.getId())).map(SubIndu::getCode).collect(Collectors.toList());
+                    }else {
+                        indusKinds.add(subIndu.getCode());
+                    }
+                }
+            }
+
+            Page pageData = subInfoQueryService.subFixGetAll(page, queryVO, indusKinds);
+            message.add(pageData.getList(), pageData.getTotalCount());
+
+        } catch (Exception e) {
+            logger.error("", e);
+            message.add("查询失败");
+        }
+        return message;
+    }
+
+
+
     // 查询项目
     @PostMapping("queryPage")
     public ListMessage queryPage(@RequestBody Page page, @RequestBody SubInfoQueryTzVO queryVO) {

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_extend.jsp

@@ -854,7 +854,7 @@
                     param.orderType = this.sort.type || null;
                     param.queryType = null;
                     console.log(param);
-                    App.postJson("/api/subInfo/query/all", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetAll", param, function (res) {
                         self.dataList = res.rows;
                         self.loadPage(res.total);
                         self.loadTable(param);
@@ -917,37 +917,13 @@
                                     }
                                 }
                             },
-                            {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 200, templet: '#subName'},
-                            {
-                                field: 'subjectId',
-                                fixed: 'left',
-                                title: '项目所在地',
-                                minWidth: 200,
-                                templet: '#subjectId' // 指定模板
-                            },
-                            {field: 'content', fixed: 'left', title: '项目建设内容', minWidth: 200, templet: '#content'},
-                            // {field: 'abc',type:'string', title: 'ABC',fixed: 'left', align:'center', width: 60, templet: "#abcSpan"},
-                            /*                 {field: 'offset', title: '偏离状态', fixed: 'left', minWidth: 150},*/
-                            // {
-                            //     field: 'offsetLight',
-                            //     title: '偏离状态',
-                            //     type: 'string',
-                            //     align: 'center',
-                            //     fixed: 'left',
-                            //     width: 100,
-                            //     templet: '#offsetLight'
-                            // },
-                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 250, templet: '#amt', sort: true},
-                            // {field: 'fileId', title: '现场影像', width: 90, templet: '#imageDiv'},
-                            // {field: 'state', title: '计划时间', width: 140, templet: '#date'},
-                            // {field: 'leaderName', title: '分管领导', minWidth: 180, templet: '#leaderInfo'},
+                            {field: 'subName', title: '项目名称', minWidth: 200},
+                            {field: 'subjectId', title: '项目所在地', minWidth: 200},
+                            {field: 'content', title: '项目建设内容', minWidth: 200},
+                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 200},
                             {field: 'endDate', title: '建成投产时间', minWidth: 200},
-                            {field: 'yeatAmtTotal', title: '年度投资', minWidth: 200},
                             {field: 'progress', title: '进展情况', minWidth: 200},
                             {field: 'remark', title: '备注', minWidth: 200},
-                            // {field: 'mainName', title: '日常责任监管单位', minWidth: 100},
-                            // {field: 'unitName', title: '项目单位', minWidth: 110},
-                            // { field: 'openLight', title: '开工红黄灯', minWidth: 150, templet: '#openLight' },
                             {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},
                         ]],
                         fixed: true,

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_extend_sum.jsp

@@ -368,23 +368,6 @@
                                 </div>
                             </div>
                         </label>
-                        <%--  <label class="juli">
-                              已竣工项目数<span class="lanse-first">{{beginRate.endNum}}</span>
-                              <div class="progress-div">
-                                  <div class="layui-progress">
-                                      <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>
-                                  </div>
-                              </div>
-                          </label>
-                          <label class="juli">
-                              停工项目数<span class="lanse-first">{{beginRate.stopNum}}</span>
-                              <div class="progress-div">
-                                  <div class="layui-progress" lay-filter="layui-progress-bar">
-                                      <div class="layui-progress-bar" :style="'width:'+beginRate.stopRate"></div>
-                                  </div>
-                              </div>
-                          </label>
-  --%>
                         <label class="juli">
                             开工率<span class="lanse-first">{{beginRate.beginRate}}</span>
                             <div class="progress-div">
@@ -393,55 +376,8 @@
                                 </div>
                             </div>
                         </label>
-                        <%-- <label class="juli">
-                             竣工率<span class="lanse-first">{{beginRate.endRate}}</span>
-                             <div class="progress-div">
-                                 <div class="layui-progress">
-                                     <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>
-                                 </div>
-                             </div>
-                         </label>--%>
-                    </div>
-                    <div style="display: flex">
-                        <label class="juli">
-                            投资进度<span class="lanse-first">{{beginRate.amtRate}}%</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.amtRate+'%'"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <label class="juli">
-                            年初计划<span class="lanse-first">{{beginRate.yearAmt}}亿元</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <label class="juli">
-                            月实际<span class="lanse-first">{{beginRate.yearAmtSj}}亿元</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <label class="juli">
-                            月任务<span class="lanse-first">{{beginRate.yearAmtAssign}}亿元</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar"></div>
-                                </div>
-                            </div>
-                        </label>
                     </div>
                     <div style="display: flex;margin-bottom: 3px">
-
-                        <label @click="levelList('kindNatures',item.split(',')[1],item.split(',')[0])" class="juli"
-                               v-for="(item, index) in beginRate.tzlxList" :key="index">
-                            {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
-                        </label>
                         <label class="juli" @click="levelList('subjects',item.split(',')[1],item.split(',')[0])"
                                v-for="(item, index) in beginRate.jsddList" :key="index">
                             {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
@@ -1179,25 +1115,11 @@
                                 }
                             },
                             {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 200, templet: '#subName'},
-                            // {field: 'abc',type:'string', title: 'ABC',fixed: 'left', align:'center', width: 60, templet: "#abcSpan"},
-                            /*                 {field: 'offset', title: '偏离状态', fixed: 'left', minWidth: 150},*/
-                            {
-                                field: 'offsetLight',
-                                title: '偏离状态',
-                                type: 'string',
-                                align: 'center',
-                                fixed: 'left',
-                                width: 100,
-                                templet: '#offsetLight'
-                            },
-                            {field: 'amtTotal', title: '投资金额', minWidth: 250, templet: '#amt', sort: true},
-                            {field: 'fileId', title: '现场影像', width: 90, templet: '#imageDiv'},
-                            {field: 'state', title: '计划时间', width: 140, templet: '#date'},
-                            // {field: 'leaderName', title: '分管领导', minWidth: 180, templet: '#leaderInfo'},
-                            {field: 'statusName', title: '项目进度', width: 60},
-                            {field: 'mainName', title: '日常责任监管单位', minWidth: 100},
-                            {field: 'unitName', title: '项目单位', minWidth: 110},
-                            // { field: 'openLight', title: '开工红黄灯', minWidth: 150, templet: '#openLight' },
+                            {field: 'subjectId', fixed: 'left', title: '项目所在地', minWidth: 200, templet: '#subjectId'},
+                            {field: 'content', fixed: 'left', title: '项目基本情况', minWidth: 200, templet: '#content'},
+                            {field: 'rgDate', title: '升规入统时间', minWidth: 200},
+                            {field: 'progress', title: '进展情况', minWidth: 200},
+                            {field: 'remark', title: '备注', minWidth: 200},
                             {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},
                         ]],
                         fixed: true,

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_new.jsp

@@ -850,7 +850,7 @@
                     param.orderType = this.sort.type || null;
                     param.queryType = null;
                     console.log(param);
-                    App.postJson("/api/subInfo/query/all", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetAll", param, function (res) {
                         self.dataList = res.rows;
                         self.loadPage(res.total);
                         self.loadTable(param);
@@ -913,36 +913,13 @@
                                     }
                                 }
                             },
-                            {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 200, templet: '#subName'},
-                            {
-                                field: 'subjectId',
-                                fixed: 'left',
-                                title: '项目所在地',
-                                minWidth: 200,
-                                templet: '#subjectId' // 指定模板
-                            },
-                            {field: 'content', fixed: 'left', title: '项目建设内容', minWidth: 200, templet: '#content'},
-                            // {field: 'abc',type:'string', title: 'ABC',fixed: 'left', align:'center', width: 60, templet: "#abcSpan"},
-                            /*                 {field: 'offset', title: '偏离状态', fixed: 'left', minWidth: 150},*/
-                            // {
-                            //     field: 'offsetLight',
-                            //     title: '偏离状态',
-                            //     type: 'string',
-                            //     align: 'center',
-                            //     fixed: 'left',
-                            //     width: 100,
-                            //     templet: '#offsetLight'
-                            // },
-                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 250, templet: '#amt', sort: true},
-                            // {field: 'fileId', title: '现场影像', width: 90, templet: '#imageDiv'},
-                            // {field: 'state', title: '计划时间', width: 140, templet: '#date'},
-                            // {field: 'leaderName', title: '分管领导', minWidth: 180, templet: '#leaderInfo'},
+                            {field: 'subName', title: '项目名称', minWidth: 200},
+                            {field: 'subjectId', title: '项目所在地', minWidth: 200},
+                            {field: 'content', title: '项目建设内容', minWidth: 200},
+                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 200},
                             {field: 'beginDate', title: '预计开工时间', minWidth: 200},
                             {field: 'qqsxblqk', title: '前期手续办理情况', minWidth: 200},
                             {field: 'remark', title: '备注', minWidth: 200},
-                            // {field: 'mainName', title: '日常责任监管单位', minWidth: 100},
-                            // {field: 'unitName', title: '项目单位', minWidth: 110},
-                            // { field: 'openLight', title: '开工红黄灯', minWidth: 150, templet: '#openLight' },
                             {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},
                         ]],
                         fixed: true,

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_new_sum.jsp

@@ -402,46 +402,7 @@
                              </div>
                          </label>--%>
                     </div>
-                    <div style="display: flex">
-                        <label class="juli">
-                            投资进度<span class="lanse-first">{{beginRate.amtRate}}%</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.amtRate+'%'"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <label class="juli">
-                            年初计划<span class="lanse-first">{{beginRate.yearAmt}}亿元</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <label class="juli">
-                            月实际<span class="lanse-first">{{beginRate.yearAmtSj}}亿元</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <label class="juli">
-                            月任务<span class="lanse-first">{{beginRate.yearAmtAssign}}亿元</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar"></div>
-                                </div>
-                            </div>
-                        </label>
-                    </div>
                     <div style="display: flex;margin-bottom: 3px">
-
-                        <label @click="levelList('kindNatures',item.split(',')[1],item.split(',')[0])" class="juli"
-                               v-for="(item, index) in beginRate.tzlxList" :key="index">
-                            {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
-                        </label>
                         <label class="juli" @click="levelList('subjects',item.split(',')[1],item.split(',')[0])"
                                v-for="(item, index) in beginRate.jsddList" :key="index">
                             {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
@@ -1179,25 +1140,12 @@
                                 }
                             },
                             {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 200, templet: '#subName'},
-                            // {field: 'abc',type:'string', title: 'ABC',fixed: 'left', align:'center', width: 60, templet: "#abcSpan"},
-                            /*                 {field: 'offset', title: '偏离状态', fixed: 'left', minWidth: 150},*/
-                            {
-                                field: 'offsetLight',
-                                title: '偏离状态',
-                                type: 'string',
-                                align: 'center',
-                                fixed: 'left',
-                                width: 100,
-                                templet: '#offsetLight'
-                            },
-                            {field: 'amtTotal', title: '投资金额', minWidth: 250, templet: '#amt', sort: true},
-                            {field: 'fileId', title: '现场影像', width: 90, templet: '#imageDiv'},
-                            {field: 'state', title: '计划时间', width: 140, templet: '#date'},
-                            // {field: 'leaderName', title: '分管领导', minWidth: 180, templet: '#leaderInfo'},
-                            {field: 'statusName', title: '项目进度', width: 60},
-                            {field: 'mainName', title: '日常责任监管单位', minWidth: 100},
-                            {field: 'unitName', title: '项目单位', minWidth: 110},
-                            // { field: 'openLight', title: '开工红黄灯', minWidth: 150, templet: '#openLight' },
+                            {field: 'subjectId', fixed: 'left', title: '项目所在地', minWidth: 200, templet: '#subjectId'},
+                            {field: 'content', fixed: 'left', title: '项目建设内容', minWidth: 200, templet: '#content'},
+                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 250, templet: '#amt', sort: true},
+                            {field: 'beginDate', title: '预计开工时间', minWidth: 200},
+                            {field: 'qqsxblqk', title: '前期手续办理情况', minWidth: 200},
+                            {field: 'remark', title: '备注', minWidth: 200},
                             {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},
                         ]],
                         fixed: true,

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_reserve.jsp

@@ -683,7 +683,7 @@
                         theme: layDateTheme,
                         value: formatwdate
                     });
-                    /*   $("#month").val(new Date().getMonth() + 1);*/
+
                     var xmlx = [];
                     <c:forEach items="${XMLX}" var="xm">
                     xmlx.push({value: "${xm.code}", name: "${xm.title}"});
@@ -698,12 +698,6 @@
                     indusKindData.push({value: "${xm.id}", name: "${xm.title}"});
                     </c:forEach>
 
-                    // this.indusKind = layui.xmSelect.render({
-                    //     el: "#indusKind",
-                    //     language: 'zn',
-                    //     data: indusKindData
-                    // });
-
                     layui.laydate.render({
                         elem: '#year',
                         type: 'year',
@@ -758,28 +752,6 @@
                 showMore: function () {
                     this.showMoreFlag = !this.showMoreFlag;
                     $(".hiddenParam").toggle();
-                    /*  var self = this;
-                      layer.open({
-                          title: "查询条件",
-                          type: 1,
-                          area: ['800px', ''],
-                          content: $("#searchForm"),
-                          btn: ["查询"],
-                          yes: function (index) {
-                              self.search();
-                              layer.close(index);
-                          },
-                          success: function () {
-                              self.setQueryForm2();
-                              $(".hiddenParam").show();
-                              $(".hiddenParams").hide();
-                          },
-                          end: function () {
-                              self.setQueryForm4();
-                              $(".hiddenParam").hide();
-                              $(".hiddenParams").show();
-                          }
-                      })*/
                 },
                 levelList: function (field, title, val) {
                     //详情
@@ -791,21 +763,10 @@
                         area: ['90%', '90%'],
                         content: App.getUrl("/subject/subInfo/levelList?layer=true&type=" + this.getSearchParams().queryType + "&curParam=" + param + "&params=" + params),
                     });
-                    //top.layer.full(index);
                 },
                 showImage: function (that) {
                     var imageUrl = $(that).find("img").eq(0).attr("realUrl");
                     if (imageUrl) {
-                        // layer.open({
-                        //   type: 2,
-                        //   content: imageUrl,
-                        //   area: ['500px', '1000px'],
-                        //   offset: 'auto',
-                        //
-                        //   success: function (obj, index) {
-                        //     layer.full(index);
-                        //   }
-                        // })
                         layer.photos({
                             photos: {
                                 "title": "",
@@ -884,7 +845,7 @@
                     param.orderType = this.sort.type || null;
                     param.queryType = null;
                     console.log(param);
-                    App.postJson("/api/subInfo/query/all", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetAll", param, function (res) {
                         self.dataList = res.rows;
                         self.loadPage(res.total);
                         self.loadTable(param);
@@ -900,29 +861,6 @@
                     for (var i = 0; i < this.dataList.length; i++) {
                         var tem = this.dataList[i];
                         tem.queryYear = params.year;
-                        switch (tem.status) {
-                            case '0':
-                                tem.statusName = '暂存';
-                                break;
-                            case '1':
-                                tem.statusName = '项目前期';
-                                break;
-                            case '6':
-                                tem.statusName = '待开工';
-                                break;
-                            case '7':
-                                tem.statusName = '施工中';
-                                break;
-                            /* case '9':
-                              tem.statusName = '年度竣工';
-                              break; */
-                            case '8':
-                                tem.statusName = '暂停施工';
-                                break;
-                            case 'A':
-                                tem.statusName = '已竣工';
-                                break;
-                        }
                     }
                     var self = this;
                     layui.table.render({
@@ -946,27 +884,12 @@
                                     }
                                 }
                             },
-                            {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 200, templet: '#subName'},
-                            {
-                                field: 'subjectId',
-                                fixed: 'left',
-                                title: '项目所在地',
-                                minWidth: 200,
-                                templet: '#subjectId' // 指定模板
-                            },
-                            {field: 'content', fixed: 'left', title: '项目建设内容', minWidth: 200, templet: '#content'},
-                            // {field: 'abc',type:'string', title: 'ABC',fixed: 'left', align:'center', width: 60, templet: "#abcSpan"},
-                            /*                 {field: 'offset', title: '偏离状态', fixed: 'left', minWidth: 150},*/
-                            // {field: 'offsetLight', title: '偏离状态', type: 'string', align: 'center', fixed: 'left', width: 100, templet: '#offsetLight'},
-                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 250, templet: '#amt', sort: true},
+                            {field: 'subName', title: '项目名称', minWidth: 200},
+                            {field: 'subjectId', title: '项目所在地', minWidth: 200},
+                            {field: 'content', title: '项目建设内容', minWidth: 200},
+                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 200},
                             {field: 'progress', title: '进展情况', minWidth: 200},
                             {field: 'remark', title: '备注', minWidth: 200},
-                            // {field: 'fileId', title: '现场影像', width: 90, templet: '#imageDiv'},
-                            // {field: 'state', title: '计划时间', width: 140, templet: '#date'},
-                            // {field: 'leaderName', title: '分管领导', minWidth: 180, templet: '#leaderInfo'},
-                            // {field: 'mainName', title: '日常责任监管单位', minWidth: 100},
-                            // {field: 'unitName', title: '项目单位', minWidth: 110},
-                            // { field: 'openLight', title: '开工红黄灯', minWidth: 150, templet: '#openLight' },
                             {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},
                         ]],
                         fixed: true,

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_reserve_sum.jsp

@@ -77,268 +77,8 @@
     <div class="layui-layout layui-layout-admin">
         <!-- 内容区域 -->
         <div class="right_title">
-            <%--            <span class="txt">重点项目信息台账</span>--%>
-  <%--          <span class="txt">储备项目库</span>--%>
                 <div class="txt" style="width: 100%;text-align: center">储备项目库</div>
             <div style="width: 100%;text-align: center">${tips}</div>
-    <%--        <div class="layui-collapse">
-                <div class="layui-colla-item">
-                    &lt;%&ndash;                    <h2 class="layui-colla-title">筛选</h2>&ndash;%&gt;
-                    <div class="layui-colla-content layui-show">
-                        <form class="layui-form" lay-filter="searchForm" id="searchForm">
-                            <input type="hidden" name="queryType" value="yearNew">
-                            <input type="hidden" name="fixCat" value="1">
-                            <input type="hidden" name="isFix" value="1">
-                            <div class="layui-row">
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">项目名称</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" name="subName" placeholder="请输入" autocomplete="off"
-                                                   class="layui-input">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers">领导</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" name="leaderName" placeholder="请输入领导姓名"
-                                                   autocomplete="off"
-                                                   class="layui-input">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">投资类型</label>
-                                        <div class="layui-input-block">
-                                            <select name="kindNature">
-                                                <option value="">请选择</option>
-                                                <c:forEach items="${TZXZ }" 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-md3" style="display:none;">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">项目类型</label>
-                                        <div class="layui-input-block">
-                                            <div id="kind" name="kind"></div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">月份</label>
-                                        <div class="layui-input-block">
-                                            <select id="month" name="month">
-                                                <option value="">请选择</option>
-                                                <option value="1">1月</option>
-                                                <option value="2">2月</option>
-                                                <option value="3">3月</option>
-                                                <option value="4">4月</option>
-                                                <option value="5">5月</option>
-                                                <option value="6">6月</option>
-                                                <option value="7">7月</option>
-                                                <option value="8">8月</option>
-                                                <option value="9">9月</option>
-                                                <option value="10">10月</option>
-                                                <option value="11">11月</option>
-                                                <option value="12">12月</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-                                <c:if test="${isHydw}">
-                                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label label-longers required">预警灯</label>
-                                            <div class="layui-input-block">
-                                                <div id="light"></div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </c:if>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">建设性质</label>
-                                        <div class="layui-input-block">
-                                            <select name="propKind">
-                                                <option value="">请选择</option>
-                                                <c:forEach items="${JSXZ}" var="js">
-                                                    <option value="${js.code }">${js.title }</option>
-                                                </c:forEach>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">资金来源</label>
-                                        <div class="layui-input-block">
-                                            <select name="zjly" lay-search="">
-                                                <option value="">请选择</option>
-                                                <c:forEach items="${ZJLY }" var="zj">
-                                                    <option value="${zj.id }">${zj.title }</option>
-                                                </c:forEach>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 ">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">所属行业</label>
-                                        <div class="layui-input-block">
-                                            <div id="indusKind"></div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <c:if test="${isHydw }">
-                                    <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                        <div class="layui-form-item">
-                                            <label class="layui-form-label label-longers">是否分管</label>
-                                            <div class="layui-input-block">
-                                                <select name="blSub">
-                                                    <option value="false">所有项目</option>
-                                                    <option value="true">是</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </c:if>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 ">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers">项目单位</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" name="sbdw" placeholder="请输入项目项目单位名称"
-                                                   autocomplete="off"
-                                                   class="layui-input">
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers 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-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers">项目状态</label>
-                                        <div class="layui-input-block">
-                                            <select name="status">
-                                                <option value="">请选择</option>
-                                                <option value="1">项目前期</option>
-                                                <option value="6">待开工</option>
-                                                <option value="7">施工中</option>
-                                                <option value="8">暂停施工</option>
-                                                <option value="A">已竣工</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-                                &lt;%&ndash;                   <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                                       <div class="layui-form-item">
-                                                           <label class="layui-form-label label-longers required">资金来源</label>
-                                                           <div class="layui-input-block">
-                                                               <select name="zjly" lay-search="">
-                                                                   <option value="">请选择</option>
-                                                                   <c:forEach items="${ZJLY }" var="zj">
-                                                                       <option value="${zj.id }">${zj.title }</option>
-                                                                   </c:forEach>
-                                                               </select>
-                                                           </div>
-                                                       </div>
-                                                   </div>&ndash;%&gt;
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers ">偏离度</label>
-                                        <div class="layui-input-block time_box">
-                                            <input type="text" id="offsetMin" name="offsetMin"
-                                                   placeholder="请输入最小偏离度"
-                                                   autocomplete="off"
-                                                   class="layui-input" value="${offsetMin}">
-                                            <span class="split_txt">至</span>
-                                            <input type="text" id="offsetMax" name="offsetMax"
-                                                   placeholder="请输入最大偏离度"
-                                                   autocomplete="off"
-                                                   class="layui-input" value="${offsetMax}">
-                                        </div>
-                                    </div>
-                                </div>
-
-
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 ">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">年份</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" id="year" readonly="readonly" name="year"
-                                                   class="layui-input">
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label label-longers required">金额(万元)</label>
-                                        <div class="layui-input-block time_box">
-                                            <input type="text" id="startAmt" name="startAmt"
-                                                   placeholder="请输入最小金额"
-                                                   autocomplete="off"
-                                                   class="layui-input" value="${minAmt}">
-                                            <span class="split_txt">至</span>
-                                            <input type="text" id="endAmt" name="endAmt" placeholder="请输入最大金额"
-                                                   autocomplete="off"
-                                                   class="layui-input" value="${maxAmt}">
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParams">
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label"></label>
-                                        <div class="layui-input-block" style="width: 600px">
-                                            <button type="button" class="layui-btn layui-btn-normal"
-                                                    style="margin-left: 50px" @click="search">查询
-                                            </button>
-                                            <span class="morePan" @click="showMore"><a
-                                                    v-if="!showMoreFlag">更多 </a><a
-                                                    v-if="showMoreFlag">收起 V</a></span>
-                                            <button type="button" class="layui-btn layui-btn-normal"
-                                                    style="margin-left: 80px" @click="intoSub">纳入
-                                            </button>
-                                            <button type="button" class="layui-btn layui-btn-norma"
-                                                    style="margin-left: 20px"
-                                                    @click="downLoadTemplate">模板下载
-                                            </button>
-                                            <button type="button" class="layui-btn layui-btn-norma"
-                                                    style="margin-left: 20px" @click="uploadProject">导入
-                                            </button>
-                                        </div>
-                                    </div>
-                                </div>
-                                &lt;%&ndash;                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md6">&ndash;%&gt;
-                                &lt;%&ndash;                                    <span style="color: red;float: right;">带*号的条件可在导出时使用，其中年份及月份仅限导出使用，年份不选择默认为当前年份</span>&ndash;%&gt;
-                                &lt;%&ndash;                                </div>&ndash;%&gt;
-
-                            </div>
-                        </form>
-
-                    </div>
-                </div>
-            </div>--%>
         </div>
         <div>
             <div class="layui-row">
@@ -393,55 +133,8 @@
                                 </div>
                             </div>
                         </label>
-                        <%-- <label class="juli">
-                             竣工率<span class="lanse-first">{{beginRate.endRate}}</span>
-                             <div class="progress-div">
-                                 <div class="layui-progress">
-                                     <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>
-                                 </div>
-                             </div>
-                         </label>--%>
-                    </div>
-                    <div style="display: flex">
-                        <label class="juli">
-                            投资进度<span class="lanse-first">{{beginRate.amtRate}}%</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.amtRate+'%'"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <label class="juli">
-                            年初计划<span class="lanse-first">{{beginRate.yearAmt}}亿元</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <label class="juli">
-                            月实际<span class="lanse-first">{{beginRate.yearAmtSj}}亿元</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <label class="juli">
-                            月任务<span class="lanse-first">{{beginRate.yearAmtAssign}}亿元</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar"></div>
-                                </div>
-                            </div>
-                        </label>
                     </div>
                     <div style="display: flex;margin-bottom: 3px">
-
-                        <label @click="levelList('kindNatures',item.split(',')[1],item.split(',')[0])" class="juli"
-                               v-for="(item, index) in beginRate.tzlxList" :key="index">
-                            {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
-                        </label>
                         <label class="juli" @click="levelList('subjects',item.split(',')[1],item.split(',')[0])"
                                v-for="(item, index) in beginRate.jsddList" :key="index">
                             {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
@@ -638,13 +331,7 @@
 
     <script type="text/html" id="subName">
         <div style="display: flex;flex-direction: column;justify-content: center;height: 100%">
-            <%--	{{# if(d.usersub == "1") { }}--%>
             <span title="{{d.subName}}" style="white-space: normal;line-height: 1.25">{{d.subName}}</span>
-            <%--        <div title="{{d.subName}}">分管领导： {{d.leaderName||'--'}}</div>--%>
-            <%--	{{# }else { }}--%>
-            <%--	<span title="{{d.subName}}">{{d.subName}}</span>--%>
-            <%--	{{#}}}--%>
-
         </div>
     </script>
     <script type="text/html" id="abcSpan">
@@ -666,12 +353,6 @@
         }}
         <span title="">
         <span class="qianse">总投资：</span><strong class="lanse">{{d.amtTotal}}</strong> 万元 <br/>
-		 <span class="qianse">已完成投资：</span><strong class="lanse">{{d.allAmt}}</strong>			万元(<i
-                class="lanse">{{computedPer(d.amtTotal, d.allAmt)}} %</i> )<br/>
-		<span class="qianse">年度计划投资：</span><strong class="lanse">{{d.yearPlanAmt}}</strong> 万元 <br/>
-		<span class="qianse">年度完成投资：</span><strong class="lanse">{{d.yearEndAmt}}</strong>			万元(<i
-                class="lanse">{{computedPer(d.yearPlanAmt, d.yearEndAmt)}} %</i> )
-
     </span>
     </script>
 
@@ -942,28 +623,6 @@
                 showMore: function () {
                     this.showMoreFlag = !this.showMoreFlag;
                     $(".hiddenParam").toggle();
-                    /*  var self = this;
-                      layer.open({
-                          title: "查询条件",
-                          type: 1,
-                          area: ['800px', ''],
-                          content: $("#searchForm"),
-                          btn: ["查询"],
-                          yes: function (index) {
-                              self.search();
-                              layer.close(index);
-                          },
-                          success: function () {
-                              self.setQueryForm2();
-                              $(".hiddenParam").show();
-                              $(".hiddenParams").hide();
-                          },
-                          end: function () {
-                              self.setQueryForm4();
-                              $(".hiddenParam").hide();
-                              $(".hiddenParams").show();
-                          }
-                      })*/
                 },
                 levelList: function (field, title, val) {
                     //详情
@@ -982,16 +641,6 @@
                 showImage: function (that) {
                     var imageUrl = $(that).find("img").eq(0).attr("realUrl");
                     if (imageUrl) {
-                        // layer.open({
-                        //   type: 2,
-                        //   content: imageUrl,
-                        //   area: ['500px', '1000px'],
-                        //   offset: 'auto',
-                        //
-                        //   success: function (obj, index) {
-                        //     layer.full(index);
-                        //   }
-                        // })
                         layer.photos({
                             photos: {
                                 "title": "",
@@ -1166,7 +815,6 @@
                         cols: [[ // 设置表头
                             {
                                 type: 'numbers',
-                                fixed: 'left',
                                 align: 'center',
                                 title: '序号',
                                 width: 50,
@@ -1178,27 +826,13 @@
                                     }
                                 }
                             },
-                            {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 200, templet: '#subName'},
-                            // {field: 'abc',type:'string', title: 'ABC',fixed: 'left', align:'center', width: 60, templet: "#abcSpan"},
-                            /*                 {field: 'offset', title: '偏离状态', fixed: 'left', minWidth: 150},*/
-                            {
-                                field: 'offsetLight',
-                                title: '偏离状态',
-                                type: 'string',
-                                align: 'center',
-                                fixed: 'left',
-                                width: 100,
-                                templet: '#offsetLight'
-                            },
+                            {field: 'subName', title: '项目名称', minWidth: 200},
+                            {field: 'subjectId', title: '项目所在地', minWidth: 200, templet: '#subjectId'},
+                            {field: 'content', title: '项目建设内容', minWidth: 200, templet: '#content'},
                             {field: 'amtTotal', title: '投资金额', minWidth: 250, templet: '#amt', sort: true},
-                            {field: 'fileId', title: '现场影像', width: 90, templet: '#imageDiv'},
-                            {field: 'state', title: '计划时间', width: 140, templet: '#date'},
-                            // {field: 'leaderName', title: '分管领导', minWidth: 180, templet: '#leaderInfo'},
-                            {field: 'statusName', title: '项目进度', width: 60},
-                            {field: 'mainName', title: '日常责任监管单位', minWidth: 100},
-                            {field: 'unitName', title: '项目单位', minWidth: 110},
-                            // { field: 'openLight', title: '开工红黄灯', minWidth: 150, templet: '#openLight' },
-                            {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},
+                            {field: 'progress', title: '进展情况', minWidth: 200},
+                            {field: 'remark', title: '备注', minWidth: 200},
+                            {title: '操作', width: 180, toolbar: '#toolBar'},
                         ]],
                         fixed: true,
                         height: window.screen.availHeight - 470,

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_sum.jsp

@@ -866,7 +866,7 @@
                     param.orderType = this.sort.type || null;
                     param.queryType = null;
                     console.log(param);
-                    App.postJson("/api/subInfo/query/all", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetAll", param, function (res) {
                         self.dataList = res.rows;
                         self.loadPage(res.total);
                         self.loadTable(param);
@@ -929,36 +929,12 @@
                                     }
                                 }
                             },
-                            {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 200, templet: '#subName'},
-                            {
-                                field: 'subjectId',
-                                fixed: 'left',
-                                title: '项目所在地',
-                                minWidth: 200,
-                                templet: '#subjectId' // 指定模板
-                            },
-                            // {field: 'abc',type:'string', title: 'ABC',fixed: 'left', align:'center', width: 60, templet: "#abcSpan"},
-                            /*                 {field: 'offset', title: '偏离状态', fixed: 'left', minWidth: 150},*/
-                            // {
-                            //     field: 'offsetLight',
-                            //     title: '偏离状态',
-                            //     type: 'string',
-                            //     align: 'center',
-                            //     fixed: 'left',
-                            //     width: 100,
-                            //     templet: '#offsetLight'
-                            // },
-                            {field: 'content', fixed: 'left', title: '项目基本情况', minWidth: 200, templet: '#content'},
-                            // {field: 'amtTotal', title: '投资金额', minWidth: 250, templet: '#amt', sort: true},
-                            // {field: 'fileId', title: '现场影像', width: 90, templet: '#imageDiv'},
-                            // {field: 'state', title: '计划时间', width: 140, templet: '#date'},
-                            // {field: 'leaderName', title: '分管领导', minWidth: 180, templet: '#leaderInfo'},
+                            {field: 'subName', title: '项目名称', minWidth: 200},
+                            {field: 'subjectId', title: '项目所在地', minWidth: 200},
+                            {field: 'content', title: '项目基本情况', minWidth: 200},
                             {field: 'rgDate', title: '升规入统时间', minWidth: 200},
                             {field: 'progress', title: '进展情况', minWidth: 200},
                             {field: 'remark', title: '备注', minWidth: 200},
-                            // {field: 'mainName', title: '日常责任监管单位', minWidth: 100},
-                            // {field: 'unitName', title: '项目单位', minWidth: 110},
-                            // { field: 'openLight', title: '开工红黄灯', minWidth: 150, templet: '#openLight' },
                             {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},
                         ]],
                         fixed: true,