浏览代码

储备项目库

JiangPengLi 4 月之前
父节点
当前提交
ec834cc7f5

+ 3 - 0
projects-service/src/main/java/com/rtrh/projects/modules/system/po/TSystable.java

@@ -1,9 +1,12 @@
 package com.rtrh.projects.modules.system.po;
 
+import lombok.ToString;
+
 import javax.persistence.Column;
 import java.io.Serializable;
 
 @SuppressWarnings("serial")
+@ToString(callSuper = true)
 public class TSystable extends TableBaseColomn implements Serializable {
 
 	private String id;

+ 41 - 0
projects/src/main/java/com/rtrh/projects/web/controller/subject/api/DictApiController.java

@@ -0,0 +1,41 @@
+package com.rtrh.projects.web.controller.subject.api;
+
+import com.rtrh.projects.modules.system.enums.SysTableKind;
+import com.rtrh.projects.modules.system.service.TSysTableService;
+import com.rtrh.projects.outapi.result.JsonResult;
+import com.rtrh.projects.outapi.result.ResultCode;
+import com.rtrh.projects.web.controller.BaseController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 项目台账查询
+ *
+ * @author PENG
+ */
+@RestController
+@RequestMapping("/api/dict/query")
+
+public class DictApiController extends BaseController {
+    @Autowired
+    private TSysTableService tSysTableService;
+    private Logger logger = LoggerFactory.getLogger(this.getClass());
+    @PostMapping("index")
+    public JsonResult index(){
+        JsonResult jsonResult = new JsonResult();
+        try {
+            jsonResult.setData("HYFL", tSysTableService.getByKind(SysTableKind.HYFL));
+            jsonResult.setData("XMLX", tSysTableService.getByKind(SysTableKind.XMLX));
+            jsonResult.setData("JSXZ", tSysTableService.getByKind(SysTableKind.JSXZ));
+            jsonResult.setData("JSDD", tSysTableService.getByKind(SysTableKind.JSDD));
+        } catch (Exception e) {
+            logger.error("", e);
+            jsonResult.setCode(ResultCode.SYSTEM_ERROR, e.getMessage());
+        }
+        return jsonResult;
+    }
+}

+ 0 - 11
projects/src/main/java/com/rtrh/projects/web/controller/subject/api/SubInfoQueryApiController.java

@@ -530,17 +530,6 @@ public class SubInfoQueryApiController extends BaseController {
         //queryVO.setMonth(null);
         Map<String, BigDecimal> map = subInfoQueryService.beginRate(queryVO, getCurUser().getLoginUser());
 
-        // abc 类占比
-        BigDecimal aNum = map.get("aNum");
-        BigDecimal bNum = map.get("bNum");
-        BigDecimal cNum = map.get("cNum");
-        BigDecimal abcTotal = aNum.add(bNum).add(cNum);
-        if (abcTotal.compareTo(BigDecimal.ZERO) != 0) {
-            map.put("aRate", aNum.divide(abcTotal, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)));
-            map.put("bRate", bNum.divide(abcTotal, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)));
-            map.put("cRate", cNum.divide(abcTotal, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)));
-        }
-
         queryVO.setQueryType("0");
         Map<String, BigDecimal> mapRate = subInfoQueryService.sumRate(queryVO, getCurUser().getLoginUser());
         map.put("yearAmt", map.get("yearAmt").divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP));

+ 24 - 21
projects/src/main/webapp/vmodules/project/projInfo_yb.jsp

@@ -296,13 +296,13 @@
                 </form>
             </div>
         </div>
-        <div class="process-content-right">
-            <div class="year-choose">
+<%--        <div class="process-content-right">
+&lt;%&ndash;            <div class="year-choose">
                 <button type="button" class="button-item" :class="item.id==reportItem?'button-active':''"
                         v-for="(item,index) in reportArray" :key="index" @click="clickReport(item)">{{item.label}}
                 </button>
-            </div>
-            <div class="table-box" id="divWeek" style="margin-top: 20px">
+            </div>&ndash;%&gt;
+    &lt;%&ndash;        <div class="table-box" id="divWeek" style="margin-top: 20px">
                 <div id="popInfo">
                     <div class="pop_con_form" style="width:100%;padding:0 40px;box-sizing:border-box;">
                         <form class="layui-form">
@@ -326,7 +326,7 @@
                                     <ul class="img_ls">
                                         <li v-for="(item, index) in images" :key="index">
                                             <div class="img" :title="showTitle(item)">
-                                                <%--									//:layer-src="picShow1(item.fileAddre)"--%>
+                                                &lt;%&ndash;									//:layer-src="picShow1(item.fileAddre)"&ndash;%&gt;
                                                 <img :id="item.fileAddre" :src="picShow(item.fileAddre,item.fileType)"
                                                      @click="showImage(item.fileAddre,item.fileType, item.createTime)"
                                                      :alt="item.fileName"/>
@@ -335,30 +335,30 @@
                                             </div>
                                             {{item.fileName}}
                                         </li>
-                                        <%--           <li class="add" id="addPic">
+                                        &lt;%&ndash;           <li class="add" id="addPic">
                                                        <div class="bg"><i class="layui-icon layui-icon-add-circle"></i></div>
-                                                   </li>--%>
+                                                   </li>&ndash;%&gt;
                                     </ul>
                                 </div>
                             </div>
                         </form>
                     </div>
                 </div>
-            </div>
+            </div>&ndash;%&gt;
 
-            <div class="table-box" id="divMonth" style="margin-top: 20px;display: none">
+            &lt;%&ndash;<div class="table-box" id="divMonth" style="margin-top: 20px;display: none">
                 <div>
                     <div class="pop_con_form" style="width:100%;padding:0 40px;box-sizing:border-box;">
                         <form class="layui-form">
                             <div class="layui-form-item">
                                 <label class="layui-form-label" style="width:95px;">请选择月</label>
                                 <div class="layui-input-block">
-                                    <%--   <input class="layui-input" readonly="readonly" id="year">--%>
+                                    &lt;%&ndash;   <input class="layui-input" readonly="readonly" id="year">&ndash;%&gt;
                                     <select name="month" id="month" lay-filter="month">
                                         <option value="">--请选择--</option>
-                                        <%--                 <template v-for="(item, index) in weekData">
+                                        &lt;%&ndash;                 <template v-for="(item, index) in weekData">
                                                              <option value="item.kjMonth">{{item.kjMonth}}</option>
-                                                         </template>--%>
+                                                         </template>&ndash;%&gt;
                                     </select>
                                 </div>
                             </div>
@@ -374,7 +374,7 @@
                                     <ul class="img_ls">
                                         <li v-for="(item, index) in monthImages" :key="index">
                                             <div class="img" id="attachDiv" :title="showTitle(item)">
-                                                <%--									//:layer-src="picShow1(item.fileAddre)"--%>
+                                                &lt;%&ndash;									//:layer-src="picShow1(item.fileAddre)"&ndash;%&gt;
                                                 <img :id="item.fileAddre" :src="picShow(item.fileAddre,item.fileType)"
                                                      @click="showImage(item.fileAddre,item.fileType, item.createTime)"
                                                      :alt="item.fileName"/>
@@ -383,18 +383,18 @@
                                             </div>
                                             {{item.fileName}}
                                         </li>
-                                        <%--           <li class="add" id="addPic">
+                                        &lt;%&ndash;           <li class="add" id="addPic">
                                                        <div class="bg"><i class="layui-icon layui-icon-add-circle"></i></div>
-                                                   </li>--%>
+                                                   </li>&ndash;%&gt;
                                     </ul>
                                 </div>
                             </div>
                         </form>
                     </div>
                 </div>
-            </div>
+            </div>&ndash;%&gt;
 
-        </div>
+        </div>--%>
     </div>
 </template>
 <script>
@@ -459,19 +459,22 @@
                     even: true,
                     limit: 12,
                     cols: [[ // 设置表头
+                        {type: 'numbers', title: '序号', width: '50'},
                         {field: 'kjMonth', title: '月份', width: '80', totalRowText: '合计'},
-                        {
+                        {field: 'kjMonth', title: '进度比例-%', width: '200'},
+                        {field: 'kjMonth', title: '进度说明', width: '200'},
+/*                        {
                             field: 'amtPlan',
                             totalRow: true,
                             title: '年初计划投资(万元)<br><span style="font-size: 12px;">项目单位填写</span>',
                             width: '15%',
-                /*            templet: function (row) {
+                /!*            templet: function (row) {
                                 if (row.amtPlan != null && row.amtPlan != 'undefined') {
                                     return "<span>" + row.amtPlan + "</span>";
                                 } else {
                                     return "";
                                 }
-                            }*/
+                            }*!/
                             <c:choose>
                             <c:when  test="${admin || roleCode=='004'}">
                             edit: 'text'
@@ -605,7 +608,7 @@
                             </c:otherwise>
                             </c:choose>
                         }
-                        </c:if>
+                        </c:if>*/
                     ]],
                     totalRow: true, //开启合计行
                     fixed: true,

+ 13 - 13
projects/src/main/webapp/vmodules/project/projectInfo.jsp

@@ -138,7 +138,7 @@
 					<tr>
 						<td class="label" style="display: none">项目类型</td>
 						<td style="display: none">${sunInfo.kindName }</td>
-						<td class="label">建设地点</td>
+						<td class="label">项目所在地</td>
 						<td>${sunInfo.subjectName }</td>
 					</tr>
 					<tr>
@@ -147,7 +147,7 @@
 						<td class="label">备注</td>
 						<td>${sunInfo.remark }</td>
 					</tr>
-					<tr>
+					<%--<tr>
 						<td class="label">监管单位</td>
 						<td>${sunInfo.mainName }</td>
 						<td class="label">项目单位</td>
@@ -156,29 +156,29 @@
 								${sunInfo.unitName }
 							</a>
 						</td>
-					</tr>
+					</tr>--%>
 					<tr>
 						<td class="label">创建用户</td>
 						<td>${sunInfo.createUserName }</td>
 						<td class="label">创建时间</td>
 						<td><fmt:formatDate value="${sunInfo.create_time }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 					</tr>
-					<tr>
+<%--					<tr>
 						<td class="label">带动就业人数</td>
 						<td>${sunInfo.employ_numbers }</td>
 
-					</tr>
+					</tr>--%>
 				</table>
 
 				<div class="table-title">资金信息</div>
 				<table class="table1 page-table">
 					<tr>
-						<td class="label">投资类型</td>
-						<td>${sunInfo.kindNature }</td>
+<%--						<td class="label">投资类型</td>
+						<td>${sunInfo.kindNature }</td>--%>
 						<td class="label" style="width:20%">总投资金额</td>
 						<td style="width: 40%">${sunInfo.amt_total }万元</td>
 					</tr>
-					<tr>
+<%--					<tr>
 						<td class="label" rowspan="${rowNum }">资金来源</td>
 						<c:if test="${rowNum == 1 }">
 						<td colspan="3"></td>
@@ -202,7 +202,7 @@
 						<td style="width: 40%;">${currYearAmtPlan }万元</td>
 						<td class="label" >实际完成资金</td>
 						<td style="width: 40%">${sunInfo.yearAmtSj }万元</td>
-					</tr>
+					</tr>--%>
 				</table>
 
 				<div class="table-title">项目进度</div>
@@ -240,12 +240,12 @@
 <%--					<table id="table1" lay-filter="test"></table>--%>
 <%--				</div>--%>
 <%--			</div> --%>
-			<div class="table_box">
+<%--			<div class="table_box">
 				<div class="table-title">监管单位</div>
 				<div class="table_process">
 					<table id="jgdw" lay-filter="jgdw"></table>
 				</div>
-			</div>
+			</div>--%>
 			<!-- <div class="table_box" style="border-radius: 5px;">
 				<div class="table_title">
 					<div class="left">
@@ -266,12 +266,12 @@
 					<table id="kgsp" lay-filter="kgsp"></table>
 				</div>
 			</div> -->
-			<div class="table_box" style="margin-top: 20px">
+<%--			<div class="table_box" style="margin-top: 20px">
 				<div class="table-title">审核过程</div>
 				<div class="table_process">
 					<table id="shgc" lay-filter="shgc"></table>
 				</div>
-			</div>
+			</div>--%>
 			<div style="height: 20px;">
 				<c:if test="${canPrint}">
 				<div class="table_box">

+ 3 - 3
projects/src/main/webapp/vmodules/subject/subInfo/detailView.jsp

@@ -176,7 +176,7 @@
 		<input type="hidden" id="projectName" value="${sunInfo.sub_name }"/>
 		<input type="hidden" id="unitName" value="${sunInfo.unitName }"/>
 		<!-- 内容区域 -->
-			<div class="right_title">
+<%--			<div class="right_title">
 				<div class="project-title">
 					<c:choose>
 						<c:when test="${sunInfo.isBl == '1'}">
@@ -230,7 +230,7 @@
 						<div class="light-name">竣工警示灯</div>
 					</div>
 					<div class="light-item" @click="onChangeActive(2)">
-						<%-- 偏离度显示 --%>
+						&lt;%&ndash; 偏离度显示 &ndash;%&gt;
 						<c:choose>
 							<c:when test="${sunInfo.status_fgw == '2'}">
 								<img class="light-rgb-red"   src="${WebSite.asset}/css/images/light-red.png" title="${not empty sunInfo.problemReason ? sunInfo.problemReason : '暂无描述'}"></img>
@@ -246,7 +246,7 @@
 					</div>
 				</div>
 
-			</div>
+			</div>--%>
 			<div class="tab-group" style="position: relative;">
 				<button class="btn btn1" :class="{active: tabActive === 1}" @click="onChangeActive(1)">项目信息</button>
 				<button class="btn btn2" :class="{active: tabActive === 2}" @click="onChangeActive(2)">项目进度</button>

+ 69 - 55
projects/src/main/webapp/vmodules/subject/subInfo/tz/cb.jsp

@@ -11,7 +11,6 @@
     <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
     <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
-
     <style type="text/css">
         .layui-table-view .layui-table td {
             border-right: 1px solid #DDD !important;
@@ -374,10 +373,11 @@
                             <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 required label-longers">项目总投资</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" name="totalInvest" placeholder="请输入" autocomplete="off"
-                                                   class="layui-input">
+                                        <label class="layui-form-label required label-longers" style="width: 100px;">项目总投资</label>
+                                        <div class="layui-input-block time_box">
+                                            <input type="number" name="totalInvestMin" placeholder="最小值" autocomplete="off" class="layui-input">
+                                            <span class="split_txt">至</span>
+                                            <input type="number" name="totalInvestMax" placeholder="最大值" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
                                 </div>
@@ -483,11 +483,11 @@
                     <%--                    </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 @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>
@@ -881,6 +881,7 @@
         el: "#app",
         template: "#template",
         data: {
+            JSDD: [],
             winH: 0,
             dataList: [],
             startDate: "",
@@ -901,6 +902,11 @@
         },
         methods: {
             init: function () {
+                let self = this;
+                App.postJson("/api/dict/query/index",{}, function (res) {
+                    self.JSDD = res.data.JSDD;
+                })
+
                 this.winH = document.body.clientHeight;
                 var nowdate = new Date();
                 nowdate.setMonth(nowdate.getMonth() + 1);
@@ -1115,7 +1121,6 @@
                 // 查询 table 数据列表
                 App.postJson("/api/subInfo/query/all", param, function (res) {
                     self.dataList = res.rows;
-                    console.log(res.rows)
                     self.loadPage(res.total);
                     self.loadTable();
                 });
@@ -1197,50 +1202,58 @@
                     cols: [[ // 设置表头
                         {type: 'numbers', fixed: 'left', align: 'center', width: 44, title: '序号'},
                         {field: 'subName', fixed: 'left', title: '项目名称', width: 200, templet: '#subName'},
-                        {field: 'subName', fixed: 'left', title: '项目所在地', width: 200},
-                        {field: 'subName', fixed: 'left', title: '项目建设内容(亿元)', width: 200},
-                        {field: 'subName', fixed: 'left', title: '进展情况', width: 200},
-                        {field: 'subName', fixed: 'left', title: '备注', width: 200},
-
-                       /* // {
-                        //     field: 'abc',
-                        //     type: 'string',
-                        //     title: 'ABC',
-                        //     fixed: 'left',
-                        //     align: 'center',
-                        //     width: 60,
-                        //     templet: "#abcSpan"
-                        // },
-                        // {field: 'offsetLight', title: '偏离状态', fixed: 'left', minWidth: 150, templet: '#offsetLight'},
-                        // {field: 'statusName', title: '项目进度', width: 200},
-                        // {field: 'amtTotal', title: '投资金额', minWidth: 250, templet: '#amt', sort:"amtTotal"},
-                        // {field: 'offset', title: '偏离度-%', width: 100},
-                        // {field: 'fileId', title: '现场影像', width: 150, templet:'#imageDiv'},
-                        /!*   {field: 'xmbaStatus', title: '前期手续办理情况', width: 160, templet: '#preInfo'},*!/
-                        {field: 'xmbaStatus', title: '计划时间', width: 160, templet: '#date'},
-                        {field: 'xmbaStatus', title: '总投资', width: 245, templet: '#amtTotal'},
-                        {field: 'indusKindName', title: '所属行业', width: 115},
-                        {field: 'zjly', title: '资金来源', width: 115, templet: '#zjly'},
-                        {field: 'mainName', title: '日常责任监管单位', width: 115, templet: '#mainName'},
-                        // {field: 'unitName', title: '项目单位', minWidth: 150},
-                        {field: 'unitName', title: '项目单位', minWidth: 150, templet: '#unitName'},
-                        // {field: 'openLight', title: '开工红黄灯', minWidth: 150, templet: '#openLight'},
-                        // {field: 'statusName', title: '项目进度', width: 200},
-                        /!*  {
-                              field: 'isHide',
-                              type: 'string',
-                              title: '在建库',
-                              align: 'center',
-                              width: 70,
-                              templet: function (row) {
-                                  if (row.isHide == "1") {
-                                      return '<span style="color: #08AF00">是</span>';
-                                  } else {
-                                      return '<span style="color: #666666">否</span>';
-                                  }
-                                  return "";
-                              }
-                          },*!/*/
+                        {field: 'subject_id', fixed: 'left', title: '项目所在地', width: 200, templet: function (d) {
+                                let item = self.JSDD.find(item => item.code === d.subject_id)
+                                return item ? item.title: ""
+                            }
+                        },
+                        {
+                            field: 'amtTotal', fixed: 'left', title: '项目建设内容(亿元)', width: 200, templet: function (d) {
+                                return (d.amtTotal / 10000).toFixed(2) + "亿元";
+                            }
+                        },
+                        {field: 'progress', fixed: 'left', title: '进展情况', width: 200},
+                        {field: 'remark', fixed: 'left', title: '备注', width: 200},
+
+                        /* // {
+                         //     field: 'abc',
+                         //     type: 'string',
+                         //     title: 'ABC',
+                         //     fixed: 'left',
+                         //     align: 'center',
+                         //     width: 60,
+                         //     templet: "#abcSpan"
+                         // },
+                         // {field: 'offsetLight', title: '偏离状态', fixed: 'left', minWidth: 150, templet: '#offsetLight'},
+                         // {field: 'statusName', title: '项目进度', width: 200},
+                         // {field: 'amtTotal', title: '投资金额', minWidth: 250, templet: '#amt', sort:"amtTotal"},
+                         // {field: 'offset', title: '偏离度-%', width: 100},
+                         // {field: 'fileId', title: '现场影像', width: 150, templet:'#imageDiv'},
+                         /!*   {field: 'xmbaStatus', title: '前期手续办理情况', width: 160, templet: '#preInfo'},*!/
+                         {field: 'xmbaStatus', title: '计划时间', width: 160, templet: '#date'},
+                         {field: 'xmbaStatus', title: '总投资', width: 245, templet: '#amtTotal'},
+                         {field: 'indusKindName', title: '所属行业', width: 115},
+                         {field: 'zjly', title: '资金来源', width: 115, templet: '#zjly'},
+                         {field: 'mainName', title: '日常责任监管单位', width: 115, templet: '#mainName'},
+                         // {field: 'unitName', title: '项目单位', minWidth: 150},
+                         {field: 'unitName', title: '项目单位', minWidth: 150, templet: '#unitName'},
+                         // {field: 'openLight', title: '开工红黄灯', minWidth: 150, templet: '#openLight'},
+                         // {field: 'statusName', title: '项目进度', width: 200},
+                         /!*  {
+                               field: 'isHide',
+                               type: 'string',
+                               title: '在建库',
+                               align: 'center',
+                               width: 70,
+                               templet: function (row) {
+                                   if (row.isHide == "1") {
+                                       return '<span style="color: #08AF00">是</span>';
+                                   } else {
+                                       return '<span style="color: #666666">否</span>';
+                                   }
+                                   return "";
+                               }
+                           },*!/*/
                         {title: '操作', width: 225, toolbar: '#toolBar', fixed: 'right'},
                     ]],
                     fixed: true,
@@ -1520,5 +1533,6 @@
         }
     });
 </script>
+
 </body>
 </html>