统计接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringCivilController.java

@@ -147,4 +147,9 @@ public class ZEngineeringCivilController extends BaseController {
     public TableDataInfo getAreaCompletionInformationList(ZEngineeringCivilBo bo,PageQuery pageQuery) {
         return iZEngineeringCivilService.getAreaCompletionInformationList(bo,pageQuery);
     }
+    @Log(title = "民用工程", businessType = BusinessType.DELETE)
+    @GetMapping("/getsumStatus")
+    public R getsumStatus(ZEngineeringCivilBo bo) {
+        return R.ok(iZEngineeringCivilService.getsumStatus(bo));
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringReviewController.java

@@ -4,8 +4,12 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import com.dtflys.forest.annotation.GetRequest;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
+import com.ruoyi.zdsz.service.IZEngineeringNodeService;
 import lombok.RequiredArgsConstructor;
+
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -39,6 +43,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
 public class ZEngineeringReviewController extends BaseController {
 
     private final IZEngineeringReviewService iZEngineeringReviewService;
+   @Resource
+    private IZEngineeringNodeService izEngineeringNodeService;
 
     /**
      * 查询工程审核列表
@@ -105,4 +111,16 @@ public class ZEngineeringReviewController extends BaseController {
                           @PathVariable String[] ids) {
         return toAjax(iZEngineeringReviewService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
+    /**
+     * 删除工程审核
+     *
+     * @param ids 主键串
+     */
+    //@SaCheckPermission("zdsz:engineeringReview:remove")
+    @Log(title = "工程审核", businessType = BusinessType.DELETE)
+    @GetMapping("/ZEngineeringReview")
+    public R ZEngineeringReview(ZEngineeringNodeBo bo) {
+
+        return R.ok(izEngineeringNodeService.ZEngineeringReview(bo));
+    }
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringCivilMapper.java

@@ -5,11 +5,8 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.zdsz.domain.ZEngineeringCivil;
 import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringCivilBo;
-import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
-import com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo;
+import com.ruoyi.zdsz.domain.vo.*;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
-import com.ruoyi.zdsz.domain.vo.areaWillDoneVo;
-import com.ruoyi.zdsz.domain.vo.roomStatusVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -27,5 +24,6 @@ public interface ZEngineeringCivilMapper extends BaseMapperPlus<ZEngineeringCivi
 
     List<roomStatusVo> getObtainRoomcCompletionInformationList(ZEngineeringCivilBo bo);
     List<areaWillDoneVo> getAreaCompletionInformationList(List idList,String enginCycle);
+    areaStatusVo getsumStatus(String enginCycle);
 
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringCivilService.java

@@ -59,4 +59,5 @@ public interface IZEngineeringCivilService {
     List getObtainRoomcCompletionInformationList(ZEngineeringCivilBo bo);
 
     TableDataInfo<areaStatusVo> getAreaCompletionInformationList(ZEngineeringCivilBo bo,PageQuery po);
+    areaStatusVo getsumStatus(ZEngineeringCivilBo bo);
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringCivilServiceImpl.java

@@ -305,4 +305,11 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         page2.setRecords(areaList);
         return TableDataInfo.build(page2);
     }
+
+    @Override
+    public areaStatusVo getsumStatus(ZEngineeringCivilBo bo) {
+        areaStatusVo areaStatusVo=  baseMapper.getsumStatus(bo.getEnginCycle());
+        areaStatusVo.setNotstart(String.valueOf(Integer.parseInt(areaStatusVo.getNotstart())-Integer.parseInt(areaStatusVo.getWillDone())-Integer.parseInt(areaStatusVo.getDone())));
+        return areaStatusVo;
+    }
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringNodeServiceImpl.java

@@ -129,8 +129,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         String userId=LoginHelper.getLoginUser().getUsername().toString();
         SimpleDateFormat formatter= new SimpleDateFormat("yyyy-MM-dd");
         Date date = new Date(System.currentTimeMillis());
-
-        List<String>dateList= getMonthBetweenDates("2023-09",formatter.format(date));
+        List<String>dateList= getMonthBetweenDates("2021-12",formatter.format(date));
         dateList.stream().forEach(item->{
             Runnable runnable=new Runnable() {
                 @Override

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEngineeringCivilMapper.xml

@@ -103,4 +103,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY a.area_id ASC
 
     </select>
+    <select id="getsumStatus" resultType="com.ruoyi.zdsz.domain.vo.areaStatusVo">
+        SELECT
+            COUNT( DISTINCT a.house_id ) AS 'willDone' ,
+            ( SELECT COUNT( DISTINCT a.house_id ) FROM z_engineering_civil a WHERE a.completion_status = '完工' AND a.engin_cycle=a.engin_cycle=#{enginCycle}) AS 'done',
+            ( SELECT COUNT( a.id ) FROM z_house a )  AS 'notstart'
+        FROM
+            z_engineering_civil a
+        WHERE
+            a.completion_status = '未完工'AND a.engin_cycle=#{enginCycle}
+    </select>
 </mapper>