总库word分析报告导出

projects-service/src/main/java/com/rtrh/projects/modules/projects/po/SubInfoGxj.java

@@ -166,4 +166,8 @@ public class SubInfoGxj extends TableBaseColomn implements Serializable {
     private String preContent;
 
     private String filingDate;
+
+    public BigDecimal getAmtTotal() {
+        return amtTotal == null ? BigDecimal.ZERO : amtTotal;
+    }
 }

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

@@ -10,6 +10,11 @@ import java.math.BigDecimal;
 @EqualsAndHashCode(callSuper = true)
 public class SubHisVO extends SubHis {
     private BigDecimal amtTotal;
+
+    public BigDecimal getAmtTotal() {
+        return amtTotal == null ? BigDecimal.ZERO : amtTotal;
+    }
+
     private String indusKind;
     private String subjectId;
 }

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

@@ -1378,11 +1378,6 @@ public class SubInfoExportController extends BaseController {
                     })
                 );
             Map<String, List<SubInfoGxj>> currScaleGroups = currSubInfoList.stream()
-                    .peek(t->{
-                        if (t.getAmtTotal() == null) {
-                            t.setAmtTotal(BigDecimal.ZERO);
-                        }
-                    })
                 .collect(Collectors.groupingBy(transaction -> {
                         for (Map.Entry<String, BigDecimal> entry : groupBoundaries.entrySet()) {
                             if (transaction.getAmtTotal().compareTo(entry.getValue()) < 0) {
@@ -1535,23 +1530,6 @@ public class SubInfoExportController extends BaseController {
         return zhStrBuilder.append(preText).append(mainText).append(postText).append("\n");
     }
 
-    private StringBuilder buildZhParagraph(String preText, List<LogOperateVO> value, int month) {
-        StringBuilder zhStrBuilder = new StringBuilder().append("\t");
-        StatusChangeCountersVO tempVo = new StatusChangeCountersVO();
-        addNum(value, tempVo);
-        List<LogOperateVO> currList = value.stream().filter(logOperate -> DateUtil.month(logOperate.getCreateTime()) == DateUtil.month(new Date())).collect(Collectors.toList());
-        StatusChangeCountersVO currTempVo = new StatusChangeCountersVO();
-        addNum(currList, currTempVo);
-
-        String mainText = String.format("储备项目转新建%s个、新建项目转在建%s个、在建项目转投产%s个、投产项目转入规%s个，新建项目降级为储备%s个、入规项目转为在建%s个。" +
-                        "其中，%s月当月，储备项目转新建%s个、新建项目转在建%s个、在建项目转投产%s个、投产项目转入规%s个，新建项目降级为储备%s个、入规项目转为在建%s个。 "
-                , tempVo.cbToXjNum, tempVo.xjToZjNum, tempVo.zjToTcNum, tempVo.tcToRgNum, tempVo.xjToCbNum, tempVo.rgToZjNum,
-                month, currTempVo.cbToXjNum, currTempVo.xjToZjNum, currTempVo.zjToTcNum, currTempVo.tcToRgNum, currTempVo.xjToCbNum, currTempVo.rgToZjNum
-        );
-        String postText = "1-%s月，项目开工率%s、投产率%s、入规率%s，较1-（%s）月，分别增长%s、%s、%s个百分点。";
-        return zhStrBuilder.append(preText).append(mainText).append(postText).append("\n");
-    }
-
     private void addNum(List<LogOperateVO> lastLogList, StatusChangeCountersVO vo) {
         for (LogOperate logOperate : lastLogList) {
             if (SubInfoStatusEnum.CB.getCode().equals(logOperate.getStatusFirst()) && SubInfoStatusEnum.XJ.getCode().equals(logOperate.getStatusAfter())) {

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

@@ -232,40 +232,39 @@
                             code: '303',
                             url: 'subject/subInfo/pre'/* ?type=qx */
                         },
-
-                    ]
-                },
-                {
-                    icon: 'icon_zjfwk_active',
-                    activeIcon: 'icon_zjfwk_active',
-                    txt: '智联工地',
-                    code: '7',
-                    child: [
-                        {
-                            code: '702',
-                            txt: '项目地图',
-                            url: 'smart/query'
-                            //url: 'register/underConstruction'
-                        },
                         {
-                            code: '703',
-                            txt: '实时视频',
-                            url: 'smart/vedio'
-                            //url: 'register/underConstruction'
-                        },
-                        {
-                            txt: '周调度图片',
-                            code: '706',
-                            url: 'graphicProgress/list'
-                            // url: 'register/underConstruction'
-                        },
-                        {
-                            txt: '月航拍全景',
-                            code: '707',
-                            url: 'aerial/list'
-                            // url: 'register/underConstruction'
-                        }
+                            icon: 'icon_zjfwk_active',
+                            activeIcon: 'icon_zjfwk_active',
+                            txt: '智联工地',
+                            code: '7',
+                            child: [
+                                {
+                                    code: '702',
+                                    txt: '项目地图',
+                                    url: 'smart/query'
+                                    //url: 'register/underConstruction'
+                                },
+                                {
+                                    code: '703',
+                                    txt: '实时视频',
+                                    url: 'smart/vedio'
+                                    //url: 'register/underConstruction'
+                                },
+                                {
+                                    txt: '周调度图片',
+                                    code: '706',
+                                    url: 'graphicProgress/list'
+                                    // url: 'register/underConstruction'
+                                },
+                                {
+                                    txt: '月航拍全景',
+                                    code: '707',
+                                    url: 'aerial/list'
+                                    // url: 'register/underConstruction'
+                                }
 
+                            ]
+                        },
                     ]
                 },
                 {

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

@@ -335,6 +335,7 @@
         <span title="编辑" lay-event="toEditSubInfo" class="no-wrap">&nbsp;编辑</span>
         {{#} }}
         <span title="转库" lay-event="move" class="no-wrap">转库</span>
+        <span title="移出4库" lay-event="removeFour" class="no-wrap">移出4库</span>
     </div>
 </script>
 
@@ -602,7 +603,7 @@
                                 return row.progress ? '<span class="cut" title="' + row.progress + '">' + row.progress + '</span>' : '';
                             }},
                         {field: 'remark', title: '备注', minWidth: 200},
-                        {title: '操作', width: 150, toolbar: '#toolBar', fixed: 'right'},
+                        {title: '操作', width: 200, toolbar: '#toolBar', fixed: 'right'},
                     ]],
                     fixed: true,
                     height: $(window).height() - $('#table1').offset().top - 50,
@@ -733,6 +734,19 @@
                     $(".top-breadcrumb").html(e.data.topBreadcrumb)
                 }
             },
+            removeFour(obj){
+                let self = this;
+                App.msg.confirm(`是否移除`, () => {
+                    App.postJson("/api/subject/subInfo/removeFour", {id: obj.data.id}, (res) => {
+                        if (res.success) {
+                            App.msg.success("移除成功");
+                            self.getData()
+                        } else {
+                            App.msg.error(res.message || "移除失败，请重试");
+                        }
+                    })
+                })
+            },
         }
     });
 </script>

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

@@ -542,6 +542,7 @@
         <span title="编辑" lay-event="toEditSubInfo" class="no-wrap">&nbsp;编辑</span>
         {{#} }}
         <span title="入规" lay-event="rg" class="no-wrap">入规</span>
+        <span title="移出4库" lay-event="removeFour" class="no-wrap">移出4库</span>
     </div>
 </script>
 <script>
@@ -896,7 +897,7 @@
                                 return row.progress ? '<span class="cut" title="' + row.progress + '">' + row.progress + '</span>' : '';
                             }},
                         {field: 'remark', title: '备注', minWidth: 150},
-                        {title: '操作', width: 150, toolbar: '#toolBar', fixed: 'right'},
+                        {title: '操作', width: 200, toolbar: '#toolBar', fixed: 'right'},
                     ]],
                     fixed: true,
                     height: window.screen.availHeight - 470,
@@ -1188,7 +1189,20 @@
                 if (e.data.topBreadcrumb) {
                     $(".top-breadcrumb").html(e.data.topBreadcrumb)
                 }
-            }
+            },
+            removeFour(obj){
+                let self = this;
+                App.msg.confirm(`是否移除`, () => {
+                    App.postJson("/api/subject/subInfo/removeFour", {id: obj.data.id}, (res) => {
+                        if (res.success) {
+                            App.msg.success("移除成功");
+                            self.getData()
+                        } else {
+                            App.msg.error(res.message || "移除失败，请重试");
+                        }
+                    })
+                })
+            },
         }
     });
 </script>

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

@@ -696,6 +696,7 @@
         <span title="编辑" lay-event="toEditSubInfo" class="no-wrap">&nbsp;编辑</span>
         {{#} }}
         <span title="转库" lay-event="move" class="no-wrap">转库</span>
+        <span title="移出4库" lay-event="removeFour" class="no-wrap">移出4库</span>
     </div>
 </script>
 <script type="text/html" id="moveForm">
@@ -1167,7 +1168,7 @@
                                 return row.progress ? '<span class="cut" title="' + row.progress + '">' + row.progress + '</span>' : '';
                             }},
                         {field: 'remark', title: '备注', width: 200},
-                        {title: '操作', width: 150, toolbar: '#toolBar', fixed: 'right'},
+                        {title: '操作', width: 200, toolbar: '#toolBar', fixed: 'right'},
                     ]],
                     fixed: true,
                     height: window.screen.availHeight - 470,
@@ -1493,7 +1494,20 @@
                 if (e.data.topBreadcrumb) {
                     $(".top-breadcrumb").html(e.data.topBreadcrumb)
                 }
-            }
+            },
+            removeFour(obj){
+                let self = this;
+                App.msg.confirm(`是否移除`, () => {
+                    App.postJson("/api/subject/subInfo/removeFour", {id: obj.data.id}, (res) => {
+                        if (res.success) {
+                            App.msg.success("移除成功");
+                            self.getData()
+                        } else {
+                            App.msg.error(res.message || "移除失败，请重试");
+                        }
+                    })
+                })
+            },
         }
     });
 </script>

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

@@ -474,6 +474,7 @@
         <span title="编辑" lay-event="toEditSubInfo" class="no-wrap">&nbsp;编辑</span>
         {{#} }}
         <span title="转库" lay-event="move" class="no-wrap">转库</span>
+        <span title="移出4库" lay-event="removeFour" class="no-wrap">移出4库</span>
     </div>
 </script>
 
@@ -1001,7 +1002,7 @@
                         {field: 'preProceNum', title: '预计开工时间', width: 100, templet: '#date'},
                           {field: 'xmbaStatus', title: '前期手续办理情况', width: 160, templet: '#preInfo'},
                         {field: 'remark', title: '备注', width: 245, templet: '#remark'},
-                        {title: '操作', width: 150, toolbar: '#toolBar', fixed: 'right'},
+                        {title: '操作', width: 200, toolbar: '#toolBar', fixed: 'right'},
                     ]],
                     fixed: true,
                     height: window.screen.availHeight - 450,
@@ -1288,7 +1289,20 @@
                 if (e.data.topBreadcrumb) {
                     $(".top-breadcrumb").html(e.data.topBreadcrumb)
                 }
-            }
+            },
+            removeFour(obj){
+                let self = this;
+                App.msg.confirm(`是否移除`, () => {
+                    App.postJson("/api/subject/subInfo/removeFour", {id: obj.data.id}, (res) => {
+                        if (res.success) {
+                            App.msg.success("移除成功");
+                            self.getData()
+                        } else {
+                            App.msg.error(res.message || "移除失败，请重试");
+                        }
+                    })
+                })
+            },
         }
     });
 </script>

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

@@ -993,7 +993,7 @@
                         {field: 'endDate', title: '计划完工日期', minWidth: 100,
                             templet: (d)=> `<span class="new-roman">` +  d.endDate + `</span>`
                         },
-                        {title: '操作', minWidth: 150, toolbar: '#toolBar', fixed: 'right'},
+                        {title: '操作', width: 200, toolbar: '#toolBar', fixed: 'right'},
                     ]],
                     fixed: true,
                     height: $(window).height() - $('#table1').offset().top - 50,