镇江本部历年项目建设进度

src/main/java/com/jeeplus/modules/sg/progress/entity/PlanningStatistics.java

@@ -21,6 +21,10 @@ public class PlanningStatistics extends DataEntity<PlanningStatistics> {
     private String approvedNotT;
     //结算未审定
     private String approvedNotF;
+    //未开票
+    private String approvedNotNotT;
+    //已开票
+    private String approvedNotNotF;
 
 
     public String getProjectYear() {
@@ -86,4 +90,20 @@ public class PlanningStatistics extends DataEntity<PlanningStatistics> {
     public void setApprovedNotF(String approvedNotF) {
         this.approvedNotF = approvedNotF;
     }
+
+    public String getApprovedNotNotT() {
+        return approvedNotNotT;
+    }
+
+    public void setApprovedNotNotT(String approvedNotNotT) {
+        this.approvedNotNotT = approvedNotNotT;
+    }
+
+    public String getApprovedNotNotF() {
+        return approvedNotNotF;
+    }
+
+    public void setApprovedNotNotF(String approvedNotNotF) {
+        this.approvedNotNotF = approvedNotNotF;
+    }
 }

src/main/java/com/jeeplus/modules/sg/progress/mapper/xml/YearProgressMapper.xml

@@ -89,7 +89,9 @@
             SUM(CASE WHEN whetherIsApproval='是' THEN 1 ELSE 0 END) as whetherIsApprovalT,
             SUM(CASE WHEN whetherIsApproval='否' THEN 1 ELSE 0 END) as whetherIsApprovalF,
             SUM(CASE WHEN approvedNot='是' THEN 1 ELSE 0 END) as approvedNotT,
-            SUM(CASE WHEN approvedNot='否' THEN 1 ELSE 0 END) as approvedNotF
+            SUM(CASE WHEN approvedNot='否' THEN 1 ELSE 0 END) as approvedNotF,
+            SUM(CASE WHEN approvedNotNot='已开票' THEN 1 ELSE 0 END) as approvedNotNotT,
+            SUM(CASE WHEN approvedNotNot='未开票' THEN 1 ELSE 0 END) as approvedNotNotF
         from xm_year_progress GROUP BY projectYear,constructionUnit order by projectYear
     </select>
 
@@ -101,7 +103,9 @@
             SUM(CASE WHEN whetherIsApproval='是' THEN 1 ELSE 0 END) as whetherIsApprovalT,
             SUM(CASE WHEN whetherIsApproval='否' THEN 1 ELSE 0 END) as whetherIsApprovalF,
             SUM(CASE WHEN approvedNot='是' THEN 1 ELSE 0 END) as approvedNotT,
-            SUM(CASE WHEN approvedNot='否' THEN 1 ELSE 0 END) as approvedNotF
+            SUM(CASE WHEN approvedNot='否' THEN 1 ELSE 0 END) as approvedNotF,
+            SUM(CASE WHEN approvedNotNot='已开票' THEN 1 ELSE 0 END) as approvedNotNotT,
+            SUM(CASE WHEN approvedNotNot='未开票' THEN 1 ELSE 0 END) as approvedNotNotF
         from xm_year_progress GROUP BY projectYear order by projectYear
     </select>
 

src/main/java/com/jeeplus/modules/sg/progress/web/YearProgressController.java

@@ -8,19 +8,14 @@ import com.google.common.collect.Maps;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.DateUtils;
 import com.jeeplus.common.utils.StringUtils;
-import com.jeeplus.common.utils.collection.CollectionUtil;
 import com.jeeplus.common.utils.excel.ExportExcel;
 import com.jeeplus.common.utils.excel.ImportExcel;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
-import com.jeeplus.modules.sg.managementcenter.project.entity.ImportErp;
 import com.jeeplus.modules.sg.progress.entity.PlanningStatistics;
 import com.jeeplus.modules.sg.progress.entity.ShowStatistics;
 import com.jeeplus.modules.sg.progress.entity.YearProgress;
 import com.jeeplus.modules.sg.progress.service.YearProgressService;
-import com.jeeplus.modules.test.treetable.dialog.entity.CarKind1;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +29,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.ConstraintViolationException;
 import java.util.*;
 
 /**

src/main/webapp/webpage/modules/sg/progress/statisticsList.jsp

@@ -44,6 +44,7 @@
                             <td colspan="2">项目投运状态</td>
                             <td colspan="2">施工单位送审状态</td>
                             <td colspan="2">结算审定状态</td>
+                            <td colspan="2">开票状态</td>
                         </tr>
                         <tr>
                             <td>项目已投运</td>
@@ -52,6 +53,8 @@
                             <td>未送审</td>
                             <td>已审定</td>
                             <td>未审定</td>
+                            <td>已开票</td>
+                            <td>未开票</td>
                         </tr>
                         <c:forEach items="${PageList}" var="items" varStatus="id">
                             <c:forEach items="${items.planningStatistics}" var="itemss" varStatus="id">
@@ -64,6 +67,8 @@
                                     <td>${itemss.whetherIsApprovalF}</td>
                                     <td>${itemss.approvedNotT}</td>
                                     <td>${itemss.approvedNotF}</td>
+                                    <td>${itemss.approvedNotNotT}</td>
+                                    <td>${itemss.approvedNotNotF}</td>
                                 </tr>
                             </c:forEach>
                             <tr>
@@ -74,6 +79,8 @@
                                 <td>${items.planningStatisticsYear.whetherIsApprovalF}</td>
                                 <td>${items.planningStatisticsYear.approvedNotT}</td>
                                 <td>${items.planningStatisticsYear.approvedNotF}</td>
+                                <td>${items.planningStatisticsYear.approvedNotNotT}</td>
+                                <td>${items.planningStatisticsYear.approvedNotNotF}</td>
                             </tr>
                         </c:forEach>
                     </table>