大屏

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

@@ -195,7 +195,6 @@
         s.last_update_user_name AS lastUpdateUserName,
         s.last_update_time AS lastUpdateTime,
         s.logic_delete_flag AS logicDeleteFlag,
-        s.status_lamp AS statusLamp,
         s.kind_nature AS kindNature,
         s.addre AS addre,
         s.filing_date AS filingDate
@@ -220,7 +219,7 @@
             </if>
             <if test="vo.statusRed!=null and vo.statusRed!=''">
                 <choose>
-                    <when test='vo.statusRed == "0"'>
+                    <when test="vo.statusRed.toString() == '0'">
                         and (s.status_red is null or s.status_red = '0')
                     </when>
                     <otherwise>
@@ -332,7 +331,7 @@
             </if>
             <if test="vo.statusRed!=null and vo.statusRed!=''">
                 <choose>
-                    <when test='vo.statusRed == "0"'>
+                    <when test="vo.statusRed.toString() == '0'">
                         and (s.status_red is null or s.status_red = '0')
                     </when>
                     <otherwise>

projects/src/main/java/com/rtrh/projects/web/controller/statics/api/AnalysisScreenApiController.java

@@ -560,7 +560,8 @@ public class AnalysisScreenApiController extends BaseController {
 	public Message getDPGxjQtData(@RequestBody QTDTO qtdto) {
 		Message message = new Message();
 		try {
-			System.out.println("getDPGxjQtData"+qtdto);
+			qtdto.setVaryear(String.valueOf(DateUtil.thisYear()));
+			qtdto.setVarlogin(getCurUser().getLoginName());
 			List<Map<String, Object>> data = qtService.getDPGxjQtData(qtdto);
 			message.setData(data);
 		} catch (Exception e) {
@@ -574,6 +575,8 @@ public class AnalysisScreenApiController extends BaseController {
 	public Message getDPGxjAddreData(@RequestBody QTDTO qtdto) {
 		Message message = new Message();
 		try {
+			qtdto.setVaryear(String.valueOf(DateUtil.thisYear()));
+			qtdto.setVarlogin(getCurUser().getLoginName());
 			List<Map<String, Object>> data = qtService.getDPGxjAddreData(qtdto);
 			message.setData(data);
 		} catch (Exception e) {
@@ -587,6 +590,8 @@ public class AnalysisScreenApiController extends BaseController {
 	public Message getDPGxjGmData(@RequestBody QTDTO qtdto) {
 		Message message = new Message();
 		try {
+			qtdto.setVaryear(String.valueOf(DateUtil.thisYear()));
+			qtdto.setVarlogin(getCurUser().getLoginName());
 			List<Map<String, Object>> data = qtService.getDPGxjGmData(qtdto);
 			message.setData(data);
 		} catch (Exception e) {
@@ -600,6 +605,8 @@ public class AnalysisScreenApiController extends BaseController {
 	public Message getDPGxjHyData(@RequestBody QTDTO qtdto) {
 		Message message = new Message();
 		try {
+			qtdto.setVaryear(String.valueOf(DateUtil.thisYear()));
+			qtdto.setVarlogin(getCurUser().getLoginName());
 			List<Map<String, Object>> data = qtService.getDPGxjHyData(qtdto);
 			message.setData(data);
 		} catch (Exception e) {

projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoExportController.java

@@ -1011,39 +1011,24 @@ public class SubInfoExportController extends BaseController {
                 vo.setIndex(i + 1 + "");
 
                 // 每月完成工程量
-                List<RptCont> subRptConts = rptContGroup.get(subInfoGxj.getSubId());
-                if (CollUtil.isNotEmpty(subRptConts)) {
-                    SubInfoZjVO.MonthNumBl monthNumBl = new SubInfoZjVO.MonthNumBl();
-                    Map<String, BigDecimal> map = subRptConts.stream().collect(Collectors.toMap(RptCont::getKjMonth, RptCont::getNumBl, (a, b) -> a));
-                    monthNumBl.setMonth1(map.getOrDefault(DateUtil.thisYear() + "01", BigDecimal.ZERO) + "%");
-                    monthNumBl.setMonth2(map.getOrDefault(DateUtil.thisYear() + "02", BigDecimal.ZERO) + "%");
-                    monthNumBl.setMonth3(map.getOrDefault(DateUtil.thisYear() + "03", BigDecimal.ZERO) + "%");
-                    monthNumBl.setMonth4(map.getOrDefault(DateUtil.thisYear() + "04", BigDecimal.ZERO) + "%");
-                    monthNumBl.setMonth5(map.getOrDefault(DateUtil.thisYear() + "05", BigDecimal.ZERO) + "%");
-                    monthNumBl.setMonth6(map.getOrDefault(DateUtil.thisYear() + "06", BigDecimal.ZERO) + "%");
-                    monthNumBl.setMonth7(map.getOrDefault(DateUtil.thisYear() + "07", BigDecimal.ZERO) + "%");
-                    monthNumBl.setMonth8(map.getOrDefault(DateUtil.thisYear() + "08", BigDecimal.ZERO) + "%");
-                    monthNumBl.setMonth9(map.getOrDefault(DateUtil.thisYear() + "09", BigDecimal.ZERO) + "%");
-                    monthNumBl.setMonth10(map.getOrDefault(DateUtil.thisYear() + "10", BigDecimal.ZERO) + "%");
-                    monthNumBl.setMonth11(map.getOrDefault(DateUtil.thisYear() + "11", BigDecimal.ZERO) + "%");
-                    monthNumBl.setMonth12(map.getOrDefault(DateUtil.thisYear() + "12", BigDecimal.ZERO) + "%");
-                    vo.setMonthNumBlList(Collections.singletonList(monthNumBl));
-                } else {
-                    SubInfoZjVO.MonthNumBl monthNumBl = new SubInfoZjVO.MonthNumBl();
-                    monthNumBl.setMonth1(BigDecimal.ZERO + "%");
-                    monthNumBl.setMonth2(BigDecimal.ZERO + "%");
-                    monthNumBl.setMonth3(BigDecimal.ZERO + "%");
-                    monthNumBl.setMonth4(BigDecimal.ZERO + "%");
-                    monthNumBl.setMonth5(BigDecimal.ZERO + "%");
-                    monthNumBl.setMonth6(BigDecimal.ZERO + "%");
-                    monthNumBl.setMonth7(BigDecimal.ZERO + "%");
-                    monthNumBl.setMonth8(BigDecimal.ZERO + "%");
-                    monthNumBl.setMonth9(BigDecimal.ZERO + "%");
-                    monthNumBl.setMonth10(BigDecimal.ZERO + "%");
-                    monthNumBl.setMonth11(BigDecimal.ZERO + "%");
-                    monthNumBl.setMonth12(BigDecimal.ZERO + "%");
-                    vo.setMonthNumBlList(Collections.singletonList(monthNumBl));
-                }
+                List<RptCont> subRptConts = rptContGroup.getOrDefault(subInfoGxj.getSubId(),new ArrayList<>());
+
+                SubInfoZjVO.MonthNumBl monthNumBl = new SubInfoZjVO.MonthNumBl();
+                Map<String, BigDecimal> map = subRptConts.stream().collect(Collectors.toMap(RptCont::getKjMonth, RptCont::getNumBl, (a, b) -> a));
+                monthNumBl.setMonth1(map.getOrDefault(DateUtil.thisYear() + "01", BigDecimal.ZERO) + "%");
+                monthNumBl.setMonth2(map.getOrDefault(DateUtil.thisYear() + "02", BigDecimal.ZERO) + "%");
+                monthNumBl.setMonth3(map.getOrDefault(DateUtil.thisYear() + "03", BigDecimal.ZERO) + "%");
+                monthNumBl.setMonth4(map.getOrDefault(DateUtil.thisYear() + "04", BigDecimal.ZERO) + "%");
+                monthNumBl.setMonth5(map.getOrDefault(DateUtil.thisYear() + "05", BigDecimal.ZERO) + "%");
+                monthNumBl.setMonth6(map.getOrDefault(DateUtil.thisYear() + "06", BigDecimal.ZERO) + "%");
+                monthNumBl.setMonth7(map.getOrDefault(DateUtil.thisYear() + "07", BigDecimal.ZERO) + "%");
+                monthNumBl.setMonth8(map.getOrDefault(DateUtil.thisYear() + "08", BigDecimal.ZERO) + "%");
+                monthNumBl.setMonth9(map.getOrDefault(DateUtil.thisYear() + "09", BigDecimal.ZERO) + "%");
+                monthNumBl.setMonth10(map.getOrDefault(DateUtil.thisYear() + "10", BigDecimal.ZERO) + "%");
+                monthNumBl.setMonth11(map.getOrDefault(DateUtil.thisYear() + "11", BigDecimal.ZERO) + "%");
+                monthNumBl.setMonth12(map.getOrDefault(DateUtil.thisYear() + "12", BigDecimal.ZERO) + "%");
+                vo.setMonthNumBlList(Collections.singletonList(monthNumBl));
+
                 hyList.add(vo);
             }
             // 添加前计算合并行

projects/src/main/webapp/vmodules/statics/analysisScreen_four.jsp

@@ -155,14 +155,14 @@
                             </div>
                             <div class="data-container">
                                 <div class="data-content">
-                                    <p class="data">0</p>
+                                    <p class="data" id="left-data7">0</p>
                                     <p class="data-des">项目数(个)</p>
                                 </div>
                                 <img class="data-img" src="${WebSite.asset}/images/static/left-img2.png" alt="">
                             </div>
                             <div class="data-container">
                                 <div class="data-content">
-                                    <p class="data">0</p>
+                                    <p class="data" id="left-data8">0</p>
                                     <p class="data-des">投资金额(亿元)</p>
                                 </div>
                                 <img class="data-img" src="${WebSite.asset}/images/static/left-img2.png" alt="">
@@ -177,11 +177,11 @@
             <div class="main-center">
                 <div class="main-center-top">
                     <div class="main-total-data">
-                        <p class="data" id="main-top-data1">228</p>
+                        <p class="data" id="main-top-data1">0</p>
                         <p class="data-des">项目数(个)</p>
                     </div>
                     <div class="main-money-data">
-                        <p class="data" id="main-data2">2282.34</p>
+                        <p class="data" id="main-data2">0</p>
                         <p class="data-des">总投资金额(亿元)</p>
                     </div>
                     <img class="center-img" src="${WebSite.asset}/images/static/main.png" alt="">
@@ -195,17 +195,17 @@
                         </div>
                         <div class="main-detail-bottom">
                             <div class="main-detail-bottom-top" onclick="projDetailNew('','2','','','','')">
-                                <p class="data" id="center-center-data1">121</p>
+                                <p class="data" id="center-center-data1">0</p>
                                 <p class="data-des">项目数(个)</p>
                             </div>
                             <div class="line"></div>
                             <div class="main-detail-bottom-top">
-                                <p class="data" id="center-center-data2">7238</p>
+                                <p class="data" id="center-center-data2">0</p>
                                 <p class="data-des">总投资(亿元)</p>
                             </div>
                             <div class="main-detail-bottom-bottom" onclick="projDetailNew('','2','','','1','')">
                                 <div class="left">
-                                    <span id="center-center-light-data1">63</span>
+                                    <span id="center-center-light-data1">0</span>
                                     <span>个</span>
                                 </div>
                                 <div class="right">
@@ -216,7 +216,7 @@
                             </div>
                             <div class="main-detail-bottom-bottom" onclick="projDetailNew('','2','','','2','')">
                                 <div class="left">
-                                    <span id="center-center-light-data2">63</span>
+                                    <span id="center-center-light-data2">0</span>
                                     <span>个</span>
                                 </div>
                                 <div class="right">
@@ -235,17 +235,17 @@
                         </div>
                         <div class="main-detail-bottom">
                             <div class="main-detail-bottom-top" onclick="projDetailNew('','3','','','','')">
-                                <p class="data" id="center-center-data3">87</p>
+                                <p class="data" id="center-center-data3">0</p>
                                 <p class="data-des">项目数(个)</p>
                             </div>
                             <div class="line"></div>
                             <div class="main-detail-bottom-top">
-                                <p class="data" id="center-center-data4">7238</p>
+                                <p class="data" id="center-center-data4">0</p>
                                 <p class="data-des">总投资(亿元)</p>
                             </div>
                             <div class="main-detail-bottom-bottom" onclick="projDetailNew('','3','','','1','')">
                                 <div class="left">
-                                    <span id="center-center-light-data3">63</span>
+                                    <span id="center-center-light-data3">0</span>
                                     <span>个</span>
                                 </div>
                                 <div class="right">
@@ -256,7 +256,7 @@
                             </div>
                             <div class="main-detail-bottom-bottom" onclick="projDetailNew('','3','','','2','')">
                                 <div class="left">
-                                    <span id="center-center-light-data4">63</span>
+                                    <span id="center-center-light-data4">0</span>
                                     <span>个</span>
                                 </div>
                                 <div class="right">
@@ -275,17 +275,17 @@
                         </div>
                         <div class="main-detail-bottom">
                             <div class="main-detail-bottom-top" onclick="projDetailNew('','4','','','','')">
-                                <p class="data" id="center-center-data5">133</p>
+                                <p class="data" id="center-center-data5">0</p>
                                 <p class="data-des">项目数(个)</p>
                             </div>
                             <div class="line"></div>
                             <div class="main-detail-bottom-top">
-                                <p class="data" id="center-center-data6">345</p>
+                                <p class="data" id="center-center-data6">0</p>
                                 <p class="data-des">总投资(亿元)</p>
                             </div>
                             <div class="main-detail-bottom-bottom" onclick="projDetailNew('','4','','','1','')">
                                 <div class="left">
-                                    <span id="center-center-light-data5">63</span>
+                                    <span id="center-center-light-data5">0</span>
                                     <span>个</span>
                                 </div>
                                 <div class="right">
@@ -296,7 +296,7 @@
                             </div>
                             <div class="main-detail-bottom-bottom" onclick="projDetailNew('','4','','','2','')">
                                 <div class="left">
-                                    <span id="center-center-light-data6">63</span>
+                                    <span id="center-center-light-data6">0</span>
                                     <span>个</span>
                                 </div>
                                 <div class="right">
@@ -325,7 +325,7 @@
                             </div>
                             <div class="main-detail-bottom-bottom"  onclick="projDetailNew('','5','','','1','')">
                                 <div class="left">
-                                    <span id="center-center-light-data7">63</span>
+                                    <span id="center-center-light-data7">0</span>
                                     <span>个</span>
                                 </div>
                                 <div class="right">
@@ -336,7 +336,7 @@
                             </div>
                             <div class="main-detail-bottom-bottom"  onclick="projDetailNew('','5','','','2','')">
                                 <div class="left">
-                                    <span id="center-center-light-data8">63</span>
+                                    <span id="center-center-light-data8">0</span>
                                     <span>个</span>
                                 </div>
                                 <div class="right">
@@ -569,7 +569,7 @@
                 </div>
                 <div class="flooter-bottom-item">
                     <div class="title">投产项目库</div>
-                    <div class="main-detail-bottom-bottom" onclick="projDetailNew(4,'','','','1','')">
+                    <div class="main-detail-bottom-bottom" onclick="projDetailNew(9,'','','','1','')">
                         <div class="left">
                             <span id="bottom-light-data10">123</span>
                             <span>个</span>
@@ -580,7 +580,7 @@
                         </div>
                         <img class="bottom-img" src="${WebSite.asset}/images/static/main-red-bgc.png" alt="">
                     </div>
-                    <div class="main-detail-bottom-bottom" onclick="projDetailNew(4,'','','','2','')">
+                    <div class="main-detail-bottom-bottom" onclick="projDetailNew(9,'','','','2','')">
                         <div class="left">
                             <span id="bottom-light-data11">123</span>
                             <span>个</span>
@@ -591,7 +591,7 @@
                         </div>
                         <img class="bottom-img" src="${WebSite.asset}/images/static/main-yellow-bgc.png" alt="">
                     </div>
-                    <div class="main-detail-bottom-bottom" onclick="projDetailNew(4,'','','','0','')">
+                    <div class="main-detail-bottom-bottom" onclick="projDetailNew(9,'','','','0','')">
                         <div class="left">
                             <span id="bottom-light-data12">123</span>
                             <span>个</span>
@@ -699,7 +699,8 @@
                 document.querySelector('#center-center-data7').textContent =  addreData[4].num
                 document.querySelector('#center-center-data8').textContent =  addreData[4].amt
                 document.querySelector('#center-center-light-data7').textContent = addreData[3].num_r
-                document.querySelector('#center-center-light-data8').textContent =  addreData[3].num_hs
+                document.querySelector('#center-center-light-data8').textContent =  addreData[3].num_h
+                console.log(addreData[3].num_h+'=====',)
                 // 更新中间总投资数据
                 const totalAmount = (addreData[1].amt)+(addreData[2].amt)+(addreData[3].amt)+(addreData[4].amt);
                 document.querySelector('#main-data2').textContent =  totalAmount.toFixed(2)
@@ -860,6 +861,9 @@
                 document.querySelector('#left-data5').textContent = qtData.num_zj;
                 document.querySelector('#left-data6').textContent = qtData.amt_zj;
 
+                document.querySelector('#left-data7').textContent = qtData.num_tc;
+                document.querySelector('#left-data8').textContent = qtData.amt_tc;
+
                 //给各项目库灯赋值
                 document.querySelector('#bottom-light-data1').textContent = qtData.num_cq_2_r;
                 document.querySelector('#bottom-light-data2').textContent = qtData.num_cq_2_h;

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

@@ -593,7 +593,7 @@
                 App.openLayer({
                     title: "红黄灯设置",
                     content: App.getUrl("/subject/subInfo/light?subId=" + obj.data.id),
-                    width: 400,
+                    width: 500,
                     height: 400
                 })
             },

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

@@ -823,7 +823,7 @@
                 App.openLayer({
                     title: "红黄灯设置",
                     content: App.getUrl("/subject/subInfo/light?subId=" + obj.data.id),
-                    width: 400,
+                    width: 500,
                     height: 400
                 })
             },

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

@@ -635,7 +635,7 @@
                 App.openLayer({
                     title: "红黄灯设置",
                     content: App.getUrl("/subject/subInfo/light?subId=" + obj.data.id),
-                    width: 400,
+                    width: 500,
                     height: 400
                 })
             },

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

@@ -571,7 +571,7 @@
                 App.openLayer({
                     title: "红黄灯设置",
                     content: App.getUrl("/subject/subInfo/light?subId=" + obj.data.id),
-                    width: 400,
+                    width: 500,
                     height: 400
                 })
             },