提交代码

projects-service/src/main/java/com/rtrh/projects/baseConfig/MyBatisConfig.java

@@ -1,36 +0,0 @@
-package com.rtrh.projects.baseConfig;
-
-import com.github.pagehelper.PageHelper;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionFactoryBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import javax.sql.DataSource;
-import java.util.Properties;
-
-@Configuration
-public class MyBatisConfig {
-
-    @Bean
-    public PageHelper pageHelper() {
-        PageHelper pageHelper = new PageHelper();
-        Properties properties = new Properties();
-        properties.setProperty("dialect", "mysql"); // 数据库方言
-        properties.setProperty("reasonable", "true"); // 启用合理化分页
-        properties.setProperty("offsetAsPageNum", "true");
-        properties.setProperty("rowBoundsWithCount", "true");
-        pageHelper.setProperties(properties);
-        return pageHelper;
-    }
-
-    @Bean
-    public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception {
-        SqlSessionFactoryBean factoryBean = new SqlSessionFactoryBean();
-        factoryBean.setDataSource(dataSource);
-        factoryBean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:mapper/*.xml"));
-        // 添加分页插件
-        factoryBean.setPlugins(new org.apache.ibatis.plugin.Interceptor[]{pageHelper()});
-        return factoryBean.getObject();
-    }
-}

projects-service/src/main/java/com/rtrh/projects/modules/projects/dto/BasePage.java

@@ -0,0 +1,11 @@
+package com.rtrh.projects.modules.projects.dto;
+
+import lombok.Data;
+
+@Data
+public class BasePage {
+
+    private int pageNo = 1; // 当前页码
+
+    private int pageSize = 10; // 每页显示条数
+}

projects-service/src/main/java/com/rtrh/projects/modules/projects/dto/SubFixCbSearch.java

@@ -0,0 +1,25 @@
+package com.rtrh.projects.modules.projects.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+// 重点项目-储备库查询参数
+@Data
+public class SubFixCbSearch extends BasePage{
+
+    private String year;    // 年份
+
+    private String subName; // 项目名称
+
+    private String subjectId; // 项目属地
+
+    private String indusKind; // 行业类别
+
+    private BigDecimal startAmt;    // 资金区间开始
+
+    private BigDecimal endAmt;  // 资金区间结束
+
+    private String sbdw;    // 申报单位
+
+}

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

@@ -2,7 +2,9 @@ package com.rtrh.projects.modules.projects.mapper;
 
 import java.util.List;
 
+import com.rtrh.projects.modules.projects.dto.SubFixCbSearch;
 import com.rtrh.projects.modules.projects.po.SubInfo;
+import com.rtrh.projects.modules.projects.vo.SubFixCbVo;
 import org.apache.ibatis.annotations.Param;
 
 import com.rtrh.core.repository.mybatis.MyBatisRepository;
@@ -28,4 +30,6 @@ public interface SubInfoMapper {
 
     @Select("SELECT sub_id FROM sub_info where logic_delete_flag = 0 ")
     List<String> selectAllSubInfoIds();
+
+//    List<SubFixCbVo> subFixCbAll(@Param("subFixCbSearch")SubFixCbSearch subFixCbSearch);
 }

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

@@ -72,4 +72,35 @@
             si.id
     </select>
 
+<!--    <select id="subFixCbAll" resultType="com.rtrh.projects.modules.projects.vo.SubFixCbVo">-->
+<!--        SELECT sub_info.sub_name as subName,sub_info.subject_id as subjectId,sub_info.content as content,sub_info.amt_total as amtTotal,-->
+<!--               sub_info.progress as progress,sub_info.remark as remark-->
+<!--        FROM sub_fix-->
+<!--        LEFT JOIN sub_info ON sub_fix.sub_id = sub_info.id-->
+<!--        WHERE sub_fix.status = 1-->
+<!--        AND sub_fix.logic_delete_flag = 0-->
+<!--        AND sub_info.logic_delete_flag = 0-->
+<!--        <if test="subKeyCbSearch.year != null and subKeyCbSearch.year != ''">-->
+<!--            AND sub_fix.year = #{subKeyCbSearch.year}-->
+<!--        </if>-->
+<!--        <if test="subKeyCbSearch.subName != null and subKeyCbSearch.subName != ''">-->
+<!--            AND sub_info.sub_name LIKE CONCAT('%', #{subKeyCbSearch.subName}, '%')-->
+<!--        </if>-->
+<!--        <if test="subKeyCbSearch.subjectId != null and subKeyCbSearch.subjectId != ''">-->
+<!--            AND sub_info.subject_id = #{subKeyCbSearch.subjectId}-->
+<!--        </if>-->
+<!--        <if test="subKeyCbSearch.indusKind != null and subKeyCbSearch.indusKind != ''">-->
+<!--            AND sub_info.indus_kind = #{subKeyCbSearch.indusKind}-->
+<!--        </if>-->
+<!--        <if test="subKeyCbSearch.startAmt != null">-->
+<!--            AND sub_fix.amt_total >= #{subKeyCbSearch.startAmt}-->
+<!--        </if>-->
+<!--        <if test="subKeyCbSearch.endAmt != null">-->
+<!--            AND sub_fix.amt_total <= #{subKeyCbSearch.endAmt}-->
+<!--        </if>-->
+<!--        <if test="subKeyCbSearch.sbdw != null and subKeyCbSearch.sbdw != ''">-->
+<!--            AND sub_fix.sbdw LIKE CONCAT('%', #{subKeyCbSearch.sbdw}, '%')-->
+<!--        </if>-->
+<!--    </select>-->
+
 </mapper>

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

@@ -4,7 +4,9 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
+import com.github.pagehelper.PageInfo;
 import com.rtrh.core.repository.Page;
+import com.rtrh.projects.modules.projects.dto.SubFixCbSearch;
 import com.rtrh.projects.modules.projects.vo.*;
 import com.rtrh.projects.modules.projects.vo.export.ExportQueryVO;
 import com.rtrh.projects.modules.projects.vo.export.SubInfoExportVO;
@@ -324,4 +326,6 @@ public interface SubInfoQueryService {
 	List<Map<String, Object>> queryPreNew(LoginUserVO loginUser, OtherQueryVO queryVO);
 
 	Map<String, Integer> getWarningBySubId(String subId);
+
+	PageInfo<SubFixCbVo> subFixCbAll(SubFixCbSearch subFixCbSearch);
 }

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

@@ -9,10 +9,13 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.google.common.base.Strings;
 import com.rtrh.projects.modules.projects.dao.SubAmtPlanDao;
 import com.rtrh.projects.modules.projects.dao.SubLabelDao;
 import com.rtrh.projects.modules.projects.dao.SubSourceDao;
+import com.rtrh.projects.modules.projects.dto.SubFixCbSearch;
 import com.rtrh.projects.modules.projects.po.SubAmtPlan;
 import com.rtrh.projects.modules.projects.po.SubInfo;
 import com.rtrh.projects.modules.projects.service.SubRptContService;
@@ -142,6 +145,14 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
         return map;
     }
 
+    @Override
+    public PageInfo<SubFixCbVo> subFixCbAll(SubFixCbSearch subFixCbSearch) {
+        // 启动分页查询，pageNum 是当前页，pageSize 是每页大小
+        PageHelper.startPage(subFixCbSearch.getPageNo(), subFixCbSearch.getPageSize());
+//        List<SubFixCbVo> subFixCbVoList = subInfoMapper.subFixCbAll(subFixCbSearch);
+        return new PageInfo<>(new ArrayList<>());
+    }
+
     @Override
     public Page pageAll(Page page, LoginUserVO loginUserVO, SubInfoQueryTzVO queryTzVO) {
         StringBuffer sql = new StringBuffer();

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

@@ -0,0 +1,25 @@
+package com.rtrh.projects.modules.projects.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+// 重点项目-储备库
+@Data
+public class SubFixCbVo {
+
+    private  String id;     // id
+
+    private  String subName;    //项目名称
+
+    private  String subjectId;      //项目所在地
+
+    private  String content;   //项目建设内容
+
+    private BigDecimal amtTotal;  //计划总投资(万元)
+
+    private  String progress;     //项目进展情况
+
+    private  String remark;   //项目备注
+
+}

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

@@ -3,11 +3,14 @@ package com.rtrh.projects.web.controller.subject.api;
 import java.math.BigDecimal;
 import java.util.*;
 
+import com.github.pagehelper.PageInfo;
 import com.rtrh.common.util.StringUtil;
 import com.rtrh.projects.modules.projects.dao.SubCompletedPicDao;
 import com.rtrh.projects.modules.projects.dao.SubSourceDao;
+import com.rtrh.projects.modules.projects.dto.SubFixCbSearch;
 import com.rtrh.projects.modules.projects.po.SubCompletedPic;
 import com.rtrh.projects.modules.projects.po.SubSource;
+import com.rtrh.projects.modules.projects.vo.SubFixCbVo;
 import com.rtrh.projects.modules.projects.vo.SubSourceVO;
 import com.rtrh.projects.modules.system.enums.SysTableKind;
 import com.rtrh.projects.modules.system.po.TSystable;
@@ -88,6 +91,22 @@ public class SubInfoQueryApiController extends BaseController {
         return message;
     }
 
+
+    // 获取重点项目-储备库列表数据
+    @PostMapping("subFixCbAll")
+    public ListMessage subFixCbAll(@RequestBody SubFixCbSearch subFixCbSearch) {
+        ListMessage message = new ListMessage();
+        try {
+            PageInfo<SubFixCbVo> pageData = subInfoQueryService.subFixCbAll(subFixCbSearch);
+            message.add(pageData.getList(), pageData.getTotal());
+        } catch (Exception e) {
+            logger.error("", e);
+            message.add("查询失败");
+        }
+        return message;
+    }
+
+
     @PostMapping("getSubCompletedPicBySubId")
     public ListMessage getSubCompletedPicBySubId(@RequestBody List<String> subIds) {
         ListMessage message = new ListMessage();

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

@@ -89,6 +89,15 @@
                             <input type="hidden" name="fixCat" value="3">
                             <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" id="year" readonly="readonly" name="year"
+                                                   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>
@@ -98,6 +107,55 @@
                                         </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 ">
+                                    <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>
+
+                                <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 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 ">
+                                    <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 hiddenParam">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label label-longers">领导</label>
@@ -187,14 +245,7 @@
                                         </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">
@@ -208,30 +259,6 @@
                                         </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">
@@ -278,33 +305,6 @@
                                     </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>
@@ -318,13 +318,13 @@
                                             <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>
+<%--                                            <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>
@@ -1070,7 +1070,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/subFixCbAll", param, function (res) {
                         self.dataList = res.rows;
                         self.loadPage(res.total);
                         self.loadTable(param);
@@ -1173,25 +1173,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: 'subjectId', fixed: 'left', title: '建设地点', minWidth: 200},
+                            {field: 'content', fixed: 'left', title: '建设内容', minWidth: 200},
                             {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: 'progress', fixed: 'left', title: '项目进度', minWidth: 200},
+                            {field: 'remark', fixed: 'left', title: '备注', minWidth: 200},
                             {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},
                         ]],
                         fixed: true,