Commit 8417384f authored by 陈晓晋's avatar 陈晓晋
Browse files

app任务查询接口20230803

parent a927ecd3

censoft-rongtong/pom.xml

+6 −0
Original line number Diff line number Diff line
@@ -40,6 +40,12 @@ 
            <artifactId>hutool-all</artifactId>

            <version>5.8.5</version>

        </dependency>

        <dependency>

            <groupId>io.swagger</groupId>

            <artifactId>swagger-annotations</artifactId>

            <version>1.6.2</version>

            <scope>compile</scope>

        </dependency>



    </dependencies>

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/IndexController.java

0 → 100644
+52 −0
Original line number Diff line number Diff line 
package com.censoft.censoftrongtong.controller;



import com.ruoyi.common.core.controller.BaseController;

import com.ruoyi.common.core.domain.R;

import io.swagger.annotations.Api;

import io.swagger.annotations.ApiOperation;

import lombok.AllArgsConstructor;

import org.springframework.web.bind.annotation.GetMapping;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;



import java.util.HashMap;

import java.util.Map;



/**

 * 首页相关接口Controller

 *

 * @author ruoyi

 * @date 2023-03-20

 */

@Api(tags = {"首页统计相关接口"})

@RestController

@RequestMapping("/system/index")

@AllArgsConstructor

public class IndexController extends BaseController {





    /**

     * 项目,楼栋,楼层和房间数据统计

     */



    @ApiOperation("项目,楼栋,楼层和房间数据统计")

    @GetMapping("/getBaseInfoNum")

    public R getQygk() {



        int projectCount = 0;//项目数量

        int buildingCount = 0;//楼栋数量

        int floorCount = 0;//楼层数量

        int roomCount = 0;//房间数



        Map<String, String> map_gk = new HashMap<>();

        map_gk.put("projectNum", projectCount + "");

        map_gk.put("buildingNum", buildingCount + "");

        map_gk.put("floorNum", floorCount + "");

        map_gk.put("roomNum", roomCount + "");

        return R.ok(map_gk);

    }









}

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java

+8 −12
Original line number Diff line number Diff line
@@ -20,18 +20,14 @@ import com.ruoyi.system.service.ISysDeptService; 
import com.ruoyi.system.service.ISysDictDataService;

import com.ruoyi.system.service.ISysUploadFileService;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.web.bind.annotation.*;

import org.springframework.web.multipart.MultipartFile;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletResponse;

import java.io.IOException;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.Map;

import java.util.stream.Collectors;
@@ -188,7 +184,7 @@ public class RiskPlanAppController extends BaseController { 
     * @real_return {@link R<List<RiskPlanAppListDto>>}

     */

    @GetMapping("/create/list")

    public R<List<RiskPlanAppListDto>> getRiskPlanAppListDtoListByCreateUser(String status) {

    public R<List<RiskPlanAppListDto>> getRiskPlanAppListDtoListByCreateUser(String status,String name) {

        List<RiskPlanStatusType> statusList = new ArrayList<>();

        String state = "";

        if ("wait".equals(status)) {
@@ -202,7 +198,7 @@ public class RiskPlanAppController extends BaseController { 
                    , RiskPlanStatusType.PROJECT_REPORT, RiskPlanStatusType.FINISH);

            state = "已执行";

        }

        List<RiskPlanAppListDto> list = riskPlanService.getRiskPlanAppListDtoList(statusList, getUserId(), null, null);

        List<RiskPlanAppListDto> list = riskPlanService.getRiskPlanAppListDtoList(statusList, getUserId(), null, null,name);

        String finalState = state;

        list.forEach(dto -> {

            dto.setState(finalState);
@@ -217,7 +213,7 @@ public class RiskPlanAppController extends BaseController { 
     * @real_return {@link R<List<RiskPlanAppListDto>>}

     */

    @GetMapping("/allocation/list")

    public R<List<RiskPlanAppListDto>> getAllocationRiskPlanAppListDtoListByCreateUser(String status) {

    public R<List<RiskPlanAppListDto>> getAllocationRiskPlanAppListDtoListByCreateUser(String status,String name) {

        List<RiskPlanStatusType> statusList = new ArrayList<>();

        String state = "";

        if ("wait".equals(status)) {
@@ -231,7 +227,7 @@ public class RiskPlanAppController extends BaseController { 
                    , RiskPlanStatusType.PROJECT_REPORT, RiskPlanStatusType.FINISH);

            state = "已完成";

        }

        List<RiskPlanAppListDto> list = riskPlanService.getRiskPlanAppListDtoList(statusList, null, getUserId(), null);

        List<RiskPlanAppListDto> list = riskPlanService.getRiskPlanAppListDtoList(statusList, null, getUserId(), null,name);

        String finalState = state;

        list.forEach(dto -> {

            Long finishNumber = riskPlanUserBuildingService.countStatusByPlanIdAndStatus(dto.getId(), "finish");
@@ -260,7 +256,7 @@ public class RiskPlanAppController extends BaseController { 
     * @real_return {@link R<List<RiskPlanAppListDto>>}

     */

    @GetMapping("/task/list")

    public R<List<RiskPlanAppListDto>> getRiskPlanAppListDtoListByLeaderUser(String status) {

    public R<List<RiskPlanAppListDto>> getRiskPlanAppListDtoListByLeaderUser(String status,String name) {

        List<RiskPlanStatusType> statusList = new ArrayList<>();

        String state = "";

        if ("running".equals(status)) {
@@ -275,7 +271,7 @@ public class RiskPlanAppController extends BaseController { 
            state = "已退回";

        }



        List<RiskPlanAppListDto> list = riskPlanService.getRiskPlanAppListDtoList(statusList, null, null, getUserId());

        List<RiskPlanAppListDto> list = riskPlanService.getRiskPlanAppListDtoList(statusList, null, null, getUserId(),name);

        String finalState = state;

        list.forEach(dto -> {

            Long finishNumber = riskPlanUserBuildingService.countStatusByPlanIdAndStatus(dto.getId(), "finish");
@@ -675,9 +671,9 @@ public class RiskPlanAppController extends BaseController { 
     * @real_return {@link R<List<RiskPlanAppListDto>>}

     */

    @GetMapping("/details/list")

    public R<List<RiskPlanAppListDto>> getRiskPlanAppListDtoListByCreateUserDeptId() {

    public R<List<RiskPlanAppListDto>> getRiskPlanAppListDtoListByCreateUserDeptId(String name) {

        Long deptId = getLoginUser().getDeptId();

        List<RiskPlanAppListDto> list = riskPlanService.getRiskPlanAppListDtoListByCreateUserDeptId(deptId);

        List<RiskPlanAppListDto> list = riskPlanService.getRiskPlanAppListDtoListByCreateUserDeptId(deptId,name);

        list.forEach(dto -> {

            dto.setState(RiskPlanStatusType.getTitleByStatus(dto.getStatus()).getTitle());

        });

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlan.java

+6 −0
Original line number Diff line number Diff line
@@ -89,6 +89,12 @@ public class RiskPlan extends BaseEntityClean 
    @TableField(exist = false)

    private String projectName;



    /**

     * 是否台账

     */

    @TableField(exist = false)

    private String isLedger;

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanMapper.java

+2 −5
Original line number Diff line number Diff line
@@ -2,12 +2,9 @@ package com.censoft.censoftrongtong.mapper; 


import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import com.censoft.censoftrongtong.domain.RiskPlan;

import com.censoft.censoftrongtong.domain.RiskPlanInherentList;

import com.censoft.censoftrongtong.domain.dto.*;

import com.censoft.censoftrongtong.enums.RiskPlanStatusType;

import org.apache.ibatis.annotations.Param;



import java.util.Arrays;

import java.util.List;



/**
@@ -67,7 +64,7 @@ public interface RiskPlanMapper extends BaseMapper<RiskPlan> 
    public int deleteRiskPlanByIds(Long[] ids);



    List<RiskPlanAppListDto> getRiskPlanAppListDtoList(@Param("statusStringList") List<String> statusStringList

            , @Param("createUserId") Long createUserId, @Param("leaderUserId") Long leaderUserId, @Param("workUserId") Long workUserId);

            , @Param("createUserId") Long createUserId, @Param("leaderUserId") Long leaderUserId, @Param("workUserId") Long workUserId,@Param("name") String name);



    RiskPlanAppDetailsDto getRiskPlanAppDetailsDtoByPlanId(@Param("planId") Long planId);
@@ -81,5 +78,5 @@ public interface RiskPlanMapper extends BaseMapper<RiskPlan> 
    List<RiskPlanAppListDto> getRiskPlanAppListDtoListByApproveUser(@Param("userId") Long userId

            ,@Param("status") String status,@Param("result") String result);



    List<RiskPlanAppListDto> getRiskPlanAppListDtoListByCreateUserDeptId(@Param("deptId") Long deptId);

    List<RiskPlanAppListDto> getRiskPlanAppListDtoListByCreateUserDeptId(@Param("deptId") Long deptId,@Param("name") String name);

}