Skip to content

R
RuoYi-Vue-master
Commit db314a96 authored by 陈晓晋's avatar 陈晓晋
Browse files
Options

Merge branch 'develop' of http://git.censoft.com.cn/rongtong/ruoyi-vue-master into xjchen

parents b919bb35 c6343a47
Show whitespace changes
Inline Side-by-side
Showing with 390 additions and 393 deletions
.gitignore
View file @ db314a96
......@@ -45,3 +45,8 @@ nbdist/
!*/build/*.java
!*/build/*.html
!*/build/*.xml
# 去掉配置文件目录跟踪
application.yml
application-*.yml
logback.xml
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/LedgerRoomController.java
View file @ db314a96
package com.censoft.censoftrongtong.controller;
import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.censoft.censoftrongtong.domain.LedgerRoom;
import com.censoft.censoftrongtong.service.ILedgerRoomService;
import org.springframework.security.access.prepost.PreAuthorize;
......@@ -42,8 +44,9 @@ public class LedgerRoomController extends BaseController
@GetMapping("/list")
public TableDataInfo list(LedgerRoom ledgerRoom)
{
QueryWrapper<LedgerRoom> queryWrapper = new QueryWrapper<>();
startPage();
List<LedgerRoom> list = ledgerRoomService.selectLedgerRoomList(ledgerRoom);
List<LedgerRoom> list = ledgerRoomService.list(queryWrapper);
return getDataTable(list);
}
......@@ -55,7 +58,8 @@ public class LedgerRoomController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, LedgerRoom ledgerRoom)
{
List<LedgerRoom> list = ledgerRoomService.selectLedgerRoomList(ledgerRoom);
QueryWrapper<LedgerRoom> queryWrapper = new QueryWrapper<>();
List<LedgerRoom> list = ledgerRoomService.list(queryWrapper);
ExcelUtil<LedgerRoom> util = new ExcelUtil<LedgerRoom>(LedgerRoom.class);
util.exportExcel(response, list, "基础数据-楼层数据");
}
......@@ -67,7 +71,7 @@ public class LedgerRoomController extends BaseController
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(ledgerRoomService.selectLedgerRoomById(id));
return success(ledgerRoomService.getById(id));
}
/**
......@@ -78,7 +82,7 @@ public class LedgerRoomController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody LedgerRoom ledgerRoom)
{
return toAjax(ledgerRoomService.insertLedgerRoom(ledgerRoom));
return toAjax(ledgerRoomService.save(ledgerRoom));
}
/**
......@@ -89,7 +93,7 @@ public class LedgerRoomController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody LedgerRoom ledgerRoom)
{
return toAjax(ledgerRoomService.updateLedgerRoom(ledgerRoom));
return toAjax(ledgerRoomService.updateById(ledgerRoom));
}
/**
......@@ -100,6 +104,7 @@ public class LedgerRoomController extends BaseController
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(ledgerRoomService.deleteLedgerRoomByIds(ids));
ledgerRoomService.removeBatchByIds(Arrays.asList(ids));
return AjaxResult.success();
}
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java
View file @ db314a96
......@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
......@@ -63,6 +64,9 @@ public class RiskPlanAppController extends BaseController {
@Resource
private ISysDictDataService dictDataService;
@Resource
private IRiskPlanUserBuildingService riskPlanUserBuildingService;
/**
* 服务器地址
*/
......@@ -126,23 +130,70 @@ public class RiskPlanAppController extends BaseController {
*/
@GetMapping("/create/list")
public R<List<RiskPlanAppListDto>> getRiskPlanAppListDtoListByCreateUser(String status) {
List<RiskPlanStatusType> statusList;
String state;
if ("running".equals(status)) {
statusList = Arrays.asList(RiskPlanStatusType.WAIT_START, RiskPlanStatusType.RUNNING);
List<RiskPlanStatusType> statusList = new ArrayList<>();
String state = "";
if ("wait".equals(status)) {
statusList = Arrays.asList(RiskPlanStatusType.CREATE_TASK,RiskPlanStatusType.WAIT_START);
state = "待执行";
} else {
statusList = Arrays.asList(RiskPlanStatusType.WAIT_FINISH, RiskPlanStatusType.FINISH
, RiskPlanStatusType.WAIT_ADJUST, RiskPlanStatusType.REVOKE);
} else if ("running".equals(status)) {
statusList = Arrays.asList(RiskPlanStatusType.RUNNING,RiskPlanStatusType.WAIT_RETURN);
state = "执行中";
} else if ("finish".equals(status)) {
statusList = Arrays.asList(RiskPlanStatusType.WAIT_LEADER_APPROVE,RiskPlanStatusType.WAIT_APPROVE
,RiskPlanStatusType.PROJECT_REPORT,RiskPlanStatusType.FINISH);
state = "已执行";
}
List<RiskPlanAppListDto> list = riskPlanService.getRiskPlanAppListDtoList(statusList, getUserId(), null);
List<RiskPlanAppListDto> list = riskPlanService.getRiskPlanAppListDtoList(statusList,getUserId(),null );
String finalState = state;
list.forEach(dto -> {
dto.setState(state);
dto.setState(finalState);
});
return R.ok(list);
}
/**
* 任务执行情况列表
*
* @param status 状态 wait 待评估，running 执行中，finish 已完成
* @real_return {@link R<List<RiskPlanAppListDto>>}
*/
@GetMapping("/allocation/list")
public R<List<RiskPlanAppListDto>> getAllocationRiskPlanAppListDtoListByCreateUser(String status) {
List<RiskPlanStatusType> statusList = new ArrayList<>();
String state = "";
if ("wait".equals(status)) {
statusList = Arrays.asList(RiskPlanStatusType.CREATE_TASK,RiskPlanStatusType.WAIT_START);
state = "待评估";
} else if ("running".equals(status)) {
statusList = Arrays.asList(RiskPlanStatusType.RUNNING,RiskPlanStatusType.WAIT_RETURN);
state = "执行中";
} else if ("finish".equals(status)) {
statusList = Arrays.asList(RiskPlanStatusType.WAIT_LEADER_APPROVE,RiskPlanStatusType.WAIT_APPROVE
,RiskPlanStatusType.PROJECT_REPORT,RiskPlanStatusType.FINISH);
state = "已完成";
}
List<RiskPlanAppListDto> list = riskPlanService.getRiskPlanAppListDtoList(statusList, getUserId(),null);
String finalState = state;
list.forEach(dto -> {
Long finishNumber = riskPlanUserBuildingService.countStatusByPlanIdAndStatus(dto.getId(), "finish");
Long totalNumber = riskPlanUserBuildingService.countStatusByPlanIdAndStatus(dto.getId(), null);
dto.setState(finalState+"("+finishNumber+"/"+totalNumber+")");
});
return R.ok(list);
}
/**
* 任务执行情况-楼栋详情列表
*
* @param planId 任务id
* @real_return {@link R<List<RiskPlanAppListDto>>}
*/
@GetMapping("/allocation/building/list/{planId}")
public R<List<RiskPlanAppBuildingListDto>> getRiskPlanAppBuildingListDtoByPlanId(@PathVariable Long planId) {
return R.ok(riskPlanUserBuildingService.getRiskPlanAppBuildingListDtoByPlanId(planId));
}
/**
* 风险评估列表
*
......@@ -160,8 +211,8 @@ public class RiskPlanAppController extends BaseController {
* @real_return {@link R<RiskPlanAppDetailsDto>}
*/
@GetMapping("/details/{planId}")
public R<RiskPlanAppDetailsDto> getRiskPlanAppDetailsDtoByPlanId(@PathVariable("planId") Long planId) {
return R.ok(riskPlanService.getRiskPlanAppDetailsDtoByPlanId(planId));
public R<RiskPlanAppDetailsDto> getRiskPlanAppDetailsDtoByPlanId(@PathVariable("planId") Long planId,Long buildingId) {
return R.ok(riskPlanService.getRiskPlanAppDetailsDtoByPlanId(planId,buildingId));
}
/**
......@@ -351,7 +402,7 @@ public class RiskPlanAppController extends BaseController {
*/
@GetMapping("/approve/list")
public R<List<RiskPlanAppListDto>> getRiskPlanAppListDtoListByApproveUser() {
List<RiskPlanStatusType> statusList = Arrays.asList(RiskPlanStatusType.WAIT_FINISH);
List<RiskPlanStatusType> statusList = Arrays.asList(RiskPlanStatusType.WAIT_LEADER_APPROVE);
return R.ok(riskPlanService.getRiskPlanAppListDtoList(statusList, null, getUserId()));
}
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/LedgerRoom.java
View file @ db314a96
......@@ -3,6 +3,7 @@ package com.censoft.censoftrongtong.domain;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
......@@ -14,6 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author ruoyi
* @date 2023-06-26
*/
@Data
@TableName("ledger_room")
public class LedgerRoom extends BaseEntity
{
......@@ -43,6 +45,21 @@ public class LedgerRoom extends BaseEntity
@TableField("area")
private BigDecimal area;
/** 房屋类型 */
@Excel(name = "房屋类型")
@TableField("room_type")
private String roomType;
/** 楼层id */
@Excel(name = "颜色")
@TableField("color")
private String color;
/** 房屋平面图位置 */
@Excel(name = "房屋平面图位置")
@TableField(" position")
private String position;
/** 状态（0正常 1停用） */
@Excel(name = "状态", readConverterExp = "0=正常,1=停用")
@TableField("status")
......@@ -52,85 +69,4 @@ public class LedgerRoom extends BaseEntity
@TableField("del_flag")
@TableLogic
private String delFlag;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setFloorId(Long floorId)
{
this.floorId = floorId;
}
public Long getFloorId()
{
return floorId;
}
public void setName(String name)
{
this.name = name;
}
public String getName()
{
return name;
}
public void setNumber(String number)
{
this.number = number;
}
public String getNumber()
{
return number;
}
public void setArea(BigDecimal area)
{
this.area = area;
}
public BigDecimal getArea()
{
return area;
}
public void setStatus(String status)
{
this.status = status;
}
public String getStatus()
{
return status;
}
public void setDelFlag(String delFlag)
{
this.delFlag = delFlag;
}
public String getDelFlag()
{
return delFlag;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("floorId", getFloorId())
.append("name", getName())
.append("number", getNumber())
.append("area", getArea())
.append("status", getStatus())
.append("delFlag", getDelFlag())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
}
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlanUserBuilding.java 0 → 100644
View file @ db314a96
package com.censoft.censoftrongtong.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
/**
* 计划人员与楼宇关系表 risk_plan_user_building
*
* @author ruoyi
* @date 2023-07-05
*/
@Data
@TableName("risk_plan_user_building")
public class RiskPlanUserBuilding {
@TableId(type = IdType.AUTO)
private Long id;
/**
* 计划id
*/
@TableField("plan_id")
private Long planId;
/**
* 楼宇id
*/
@TableField("building_id")
private Long buildingId;
/**
* 处理人员ids
*/
@TableField("user_ids")
private String userIds;
/**
* 发起时间
*/
@TableField("start_time")
private Date startTime;
/**
* 结束时间
*/
@TableField("finish_time")
private Date finishTime;
/**
* 执行状态
*/
@TableField("status")
private String status;
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppBuildingListDto.java 0 → 100644
View file @ db314a96
package com.censoft.censoftrongtong.domain.dto;
import lombok.Data;
import java.util.Date;
/**
* @author 周昊
* @desc ...
* @date 2023-06-27 14:45:45
*/
@Data
public class RiskPlanAppBuildingListDto {
/** 计划id */
private Long id;
/** 楼宇id */
private Long buildingId;
/** 楼宇名称 */
private String buildingName;
/** 创建人员 */
private String createUserName;
/** 处理人员 */
private String workUserNames;
/** 发起时间 */
private Date startTime;
/** 状态 */
private String status;
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/enums/RiskPlanStatusType.java
View file @ db314a96
......@@ -2,56 +2,82 @@ package com.censoft.censoftrongtong.enums;
public enum RiskPlanStatusType {
/**
* 任务发起
* 创建任务计划
*/
WAIT_START("WAIT_START"),
CREATE_TASK("CREATE_TASK","创建任务计划"),
/**
* 风险评估
* 任务待执行
*/
RUNNING("RUNNING"),
WAIT_START("WAIT_START","任务待执行"),
/**
* 评估审核
* 执行任务
*/
WAIT_FINISH("WAIT_APPROVE"),
RUNNING("RUNNING","执行任务"),
/**
* 验收任务
*/
WAIT_LEADER_APPROVE("WAIT_LEADER_APPROVE","验收任务"),
/**
* 审批任务
*/
WAIT_APPROVE("WAIT_APPROVE","审批任务"),
/**
* 项目评估报告
*/
PROJECT_REPORT("PROJECT_REPORT","项目评估报告"),
/**
* 项目完成
*/
FINISH("FINISH"),
FINISH("FINISH","项目完成"),
/**
* 已退回
*/
WAIT_ADJUST("WAIT_RETURN"),
WAIT_RETURN("WAIT_RETURN","已退回"),
/**
* 已撤销
*/
REVOKE("REVOKE");
REVOKE("REVOKE","已撤销");
private final String status;
RiskPlanStatusType(String status) {
private final String title;
RiskPlanStatusType(String status, String title) {
this.status = status;
this.title = title;
}
public String getStatus() {
return status;
}
public String getTitle() {
return title;
}
public static String getTitleByStatus(String status){
public static RiskPlanStatusType getTitleByStatus(String status){
switch (status){
case "CREATE_TASK":
return CREATE_TASK;
case "WAIT_START":
return "任务发起";
return WAIT_START;
case "RUNNING":
return "风险评估";
return RUNNING;
case "WAIT_LEADER_APPROVE":
return WAIT_LEADER_APPROVE;
case "WAIT_APPROVE":
return "评估审核";
return WAIT_APPROVE;
case "PROJECT_REPORT":
return PROJECT_REPORT;
case "FINISH":
return "项目完成";
return FINISH;
case "WAIT_RETURN":
return "已退回";
return WAIT_RETURN;
case "REVOKE":
return "已撤销";
return REVOKE;
}
return "";
return null;
}
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/LedgerRoomMapper.java
View file @ db314a96
......@@ -13,51 +13,5 @@ import java.util.List;
*/
public interface LedgerRoomMapper extends BaseMapper<LedgerRoom>
{
/**
* 查询基础数据-楼层
*
* @param id 基础数据-楼层主键
* @return 基础数据-楼层
*/
public LedgerRoom selectLedgerRoomById(Long id);
/**
* 查询基础数据-楼层列表
*
* @param ledgerRoom 基础数据-楼层
* @return 基础数据-楼层集合
*/
public List<LedgerRoom> selectLedgerRoomList(LedgerRoom ledgerRoom);
/**
* 新增基础数据-楼层
*
* @param ledgerRoom 基础数据-楼层
* @return 结果
*/
public int insertLedgerRoom(LedgerRoom ledgerRoom);
/**
* 修改基础数据-楼层
*
* @param ledgerRoom 基础数据-楼层
* @return 结果
*/
public int updateLedgerRoom(LedgerRoom ledgerRoom);
/**
* 删除基础数据-楼层
*
* @param id 基础数据-楼层主键
* @return 结果
*/
public int deleteLedgerRoomById(Long id);
/**
* 批量删除基础数据-楼层
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteLedgerRoomByIds(Long[] ids);
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanMapper.java
View file @ db314a96
......@@ -69,7 +69,8 @@ public interface RiskPlanMapper
RiskPlanAppTaskDetailsDto getRiskPlanAppTaskDetailsDtoByPlanId(@Param("planId") Long planId);
List<RiskPlanAppRiskBuildingListDto> getRiskBuildingListDtoByPlanId(@Param("planId") Long planId);
List<RiskPlanAppRiskBuildingListDto> getRiskBuildingListDtoByPlanId(@Param("planId") Long planId
,@Param("buildingId") Long buildingId);
List<RiskPlanAppApproveListDto> getApproveListDtoByPlanId(@Param("planId") Long planId);
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskPlanUserBuildingMapper.java 0 → 100644
View file @ db314a96
package com.censoft.censoftrongtong.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.censoft.censoftrongtong.domain.LawList;
import com.censoft.censoftrongtong.domain.LedgerRoom;
import com.censoft.censoftrongtong.domain.RiskPlanUserBuilding;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppBuildingListDto;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 计划人员与楼宇关系表Mapper接口
*
* @author ruoyi
* @date 2023-06-26
*/
public interface RiskPlanUserBuildingMapper extends BaseMapper<RiskPlanUserBuilding> {
List<RiskPlanAppBuildingListDto> getRiskPlanAppBuildingListDtoByPlanId(@Param("planId") Long planId);
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILedgerRoomService.java
View file @ db314a96
......@@ -13,53 +13,6 @@ import java.util.List;
*/
public interface ILedgerRoomService extends IService<LedgerRoom>
{
/**
* 查询基础数据-楼层
*
* @param id 基础数据-楼层主键
* @return 基础数据-楼层
*/
public LedgerRoom selectLedgerRoomById(Long id);
/**
* 查询基础数据-楼层列表
*
* @param ledgerRoom 基础数据-楼层
* @return 基础数据-楼层集合
*/
public List<LedgerRoom> selectLedgerRoomList(LedgerRoom ledgerRoom);
/**
* 新增基础数据-楼层
*
* @param ledgerRoom 基础数据-楼层
* @return 结果
*/
public int insertLedgerRoom(LedgerRoom ledgerRoom);
/**
* 修改基础数据-楼层
*
* @param ledgerRoom 基础数据-楼层
* @return 结果
*/
public int updateLedgerRoom(LedgerRoom ledgerRoom);
/**
* 批量删除基础数据-楼层
*
* @param ids 需要删除的基础数据-楼层主键集合
* @return 结果
*/
public int deleteLedgerRoomByIds(Long[] ids);
/**
* 删除基础数据-楼层信息
*
* @param id 基础数据-楼层主键
* @return 结果
*/
public int deleteLedgerRoomById(Long id);
List<LedgerRoom> getRoomListByBuildingId(Long floorId);
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanService.java
View file @ db314a96
......@@ -69,7 +69,7 @@ public interface IRiskPlanService
List<RiskPlanAppListDto> getRiskPlanAppListDtoList(List<RiskPlanStatusType> statusList, Long createUserId, Long leaderUserId);
RiskPlanAppDetailsDto getRiskPlanAppDetailsDtoByPlanId(Long planId);
RiskPlanAppDetailsDto getRiskPlanAppDetailsDtoByPlanId(Long planId,Long buildingId);
List<LedgerBuilding> getBuildingListByPlanId(Long planId);
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskPlanUserBuildingService.java 0 → 100644
View file @ db314a96
package com.censoft.censoftrongtong.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.censoft.censoftrongtong.domain.RiskPlanUserBuilding;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppBuildingListDto;
import java.util.List;
/**
* 基Service接口
*
* @author ruoyi
* @date 2023-06-26
*/
public interface IRiskPlanUserBuildingService extends IService<RiskPlanUserBuilding> {
Long countStatusByPlanIdAndStatus(Long planId, String status);
List<RiskPlanAppBuildingListDto> getRiskPlanAppBuildingListDtoByPlanId(Long planId);
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerRoomServiceImpl.java
View file @ db314a96
......@@ -12,6 +12,8 @@ import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
* 基础数据-楼层Service业务层处理
*
......@@ -20,82 +22,9 @@ import org.springframework.stereotype.Service;
*/
@Service
public class LedgerRoomServiceImpl extends ServiceImpl<LedgerRoomMapper, LedgerRoom> implements ILedgerRoomService {
@Autowired
private LedgerRoomMapper ledgerRoomMapper;
/**
* 查询基础数据-楼层
*
* @param id 基础数据-楼层主键
* @return 基础数据-楼层
*/
@Override
public LedgerRoom selectLedgerRoomById(Long id)
{
return ledgerRoomMapper.selectLedgerRoomById(id);
}
/**
* 查询基础数据-楼层列表
*
* @param ledgerRoom 基础数据-楼层
* @return 基础数据-楼层
*/
@Override
public List<LedgerRoom> selectLedgerRoomList(LedgerRoom ledgerRoom)
{
return ledgerRoomMapper.selectLedgerRoomList(ledgerRoom);
}
/**
* 新增基础数据-楼层
*
* @param ledgerRoom 基础数据-楼层
* @return 结果
*/
@Override
public int insertLedgerRoom(LedgerRoom ledgerRoom)
{
ledgerRoom.setCreateTime(DateUtils.getNowDate());
return ledgerRoomMapper.insertLedgerRoom(ledgerRoom);
}
/**
* 修改基础数据-楼层
*
* @param ledgerRoom 基础数据-楼层
* @return 结果
*/
@Override
public int updateLedgerRoom(LedgerRoom ledgerRoom)
{
ledgerRoom.setUpdateTime(DateUtils.getNowDate());
return ledgerRoomMapper.updateLedgerRoom(ledgerRoom);
}
/**
* 批量删除基础数据-楼层
*
* @param ids 需要删除的基础数据-楼层主键
* @return 结果
*/
@Override
public int deleteLedgerRoomByIds(Long[] ids)
{
return ledgerRoomMapper.deleteLedgerRoomByIds(ids);
}
/**
* 删除基础数据-楼层信息
*
* @param id 基础数据-楼层主键
* @return 结果
*/
@Override
public int deleteLedgerRoomById(Long id)
{
return ledgerRoomMapper.deleteLedgerRoomById(id);
}
@Resource
private LedgerRoomMapper ledgerRoomMapper;
@Override
public List<LedgerRoom> getRoomListByBuildingId(Long floorId) {
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanServiceImpl.java
View file @ db314a96
......@@ -7,6 +7,7 @@ import java.util.stream.Collectors;
import com.censoft.censoftrongtong.domain.LedgerBuilding;
import com.censoft.censoftrongtong.domain.RiskPlan;
import com.censoft.censoftrongtong.domain.RiskPlanTask;
import com.censoft.censoftrongtong.domain.RiskPlanUserBuilding;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppApproveDto;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppListDto;
......@@ -15,6 +16,7 @@ import com.censoft.censoftrongtong.mapper.RiskPlanMapper;
import com.censoft.censoftrongtong.service.ILedgerBuildingService;
import com.censoft.censoftrongtong.service.IRiskPlanService;
import com.censoft.censoftrongtong.service.IRiskPlanTaskService;
import com.censoft.censoftrongtong.service.IRiskPlanUserBuildingService;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -38,6 +40,9 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
@Resource
private ILedgerBuildingService ledgerBuildingService;
@Resource
private IRiskPlanUserBuildingService riskPlanUserBuildingService;
/**
* 查询风险计划
*
......@@ -110,14 +115,14 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
public int saveRiskPlan(RiskPlan riskPlan) {
//插入主表
riskPlan.setNo(getNo());
riskPlan.setStatus(RiskPlanStatusType.RUNNING.getStatus());
riskPlan.setStatus(RiskPlanStatusType.WAIT_START.getStatus());
int i = insertRiskPlan(riskPlan);
//插入任务表 已完成任务发起
RiskPlanTask riskPlanTask = new RiskPlanTask();
riskPlanTask.setPlanId(riskPlan.getId());
riskPlanTask.setTaskKey(RiskPlanStatusType.WAIT_START.getStatus());
riskPlanTask.setTaskName(RiskPlanStatusType.getTitleByStatus(RiskPlanStatusType.WAIT_START.getStatus()));
riskPlanTask.setTaskKey(RiskPlanStatusType.CREATE_TASK.getStatus());
riskPlanTask.setTaskName(RiskPlanStatusType.CREATE_TASK.getTitle());
riskPlanTask.setStatus("completed");
riskPlanTask.setStartTime(new Date());
riskPlanTask.setCompletedTime(new Date());
......@@ -127,11 +132,24 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
RiskPlanTask riskPlanTask1 = new RiskPlanTask();
riskPlanTask1.setPlanId(riskPlan.getId());
riskPlanTask1.setApprovalUserId(riskPlan.getLeaderUserId());
riskPlanTask1.setTaskKey(RiskPlanStatusType.RUNNING.getStatus());
riskPlanTask1.setTaskName(RiskPlanStatusType.getTitleByStatus(RiskPlanStatusType.RUNNING.getStatus()));
riskPlanTask1.setTaskKey(RiskPlanStatusType.WAIT_START.getStatus());
riskPlanTask1.setTaskName(RiskPlanStatusType.WAIT_START.getTitle());
riskPlanTask1.setStatus("running");
riskPlanTask1.setStartTime(new Date());
riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
//插入计划人员与楼宇关系表
List<RiskPlanUserBuilding> list = Arrays.stream(riskPlan.getBuildingIds().split(",")).map(buildingId -> {
RiskPlanUserBuilding riskPlanUserBuilding = new RiskPlanUserBuilding();
riskPlanUserBuilding.setPlanId(riskPlan.getId());
riskPlanUserBuilding.setBuildingId(Long.valueOf(buildingId));
riskPlanUserBuilding.setUserIds(riskPlan.getWorkUserIds());
riskPlanUserBuilding.setStartTime(new Date());
riskPlanUserBuilding.setStatus("wait");
return riskPlanUserBuilding;
}).collect(Collectors.toList());
riskPlanUserBuildingService.saveBatch(list);
return i;
}
......@@ -147,23 +165,27 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
//查询并把状态值转化为状态名称
return riskPlanMapper.getRiskPlanAppListDtoList(statusStringList, createUserId, leaderUserId).stream().map(dto -> {
String status = RiskPlanStatusType.getTitleByStatus(dto.getStatus());
String status = RiskPlanStatusType.getTitleByStatus(dto.getStatus()).getTitle();
dto.setStatus(status);
return dto;
}).collect(Collectors.toList());
}
@Override
public RiskPlanAppDetailsDto getRiskPlanAppDetailsDtoByPlanId(Long planId) {
public RiskPlanAppDetailsDto getRiskPlanAppDetailsDtoByPlanId(Long planId,Long buildingId) {
//获取任务单基础信息
RiskPlanAppDetailsDto dto = riskPlanMapper.getRiskPlanAppDetailsDtoByPlanId(planId);
dto.setStatus(RiskPlanStatusType.getTitleByStatus(dto.getStatusKey()));
dto.setStatus(RiskPlanStatusType.getTitleByStatus(dto.getStatusKey()).getTitle());
//获取任务详情
dto.setDetailsDto(riskPlanMapper.getRiskPlanAppTaskDetailsDtoByPlanId(planId));
if (buildingId != null) {
LedgerBuilding ledgerBuilding = ledgerBuildingService.selectLedgerBuildingById(buildingId);
dto.getDetailsDto().setBuildingNames(ledgerBuilding.getName());
}
//风险清单
dto.setRiskBuildingListDtos(riskPlanMapper.getRiskBuildingListDtoByPlanId(planId));
dto.setRiskBuildingListDtos(riskPlanMapper.getRiskBuildingListDtoByPlanId(planId,buildingId));
//审批记录
dto.setApproveListDtos(riskPlanMapper.getApproveListDtoByPlanId(planId));
......@@ -199,14 +221,14 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
RiskPlanTask riskPlanTask1 = new RiskPlanTask();
riskPlanTask1.setPlanId(lastRiskPlanTask.getPlanId());
riskPlanTask1.setApprovalUserId(riskPlan.getLeaderUserId());
riskPlanTask1.setTaskKey(RiskPlanStatusType.WAIT_ADJUST.getStatus());
riskPlanTask1.setTaskName(RiskPlanStatusType.getTitleByStatus(RiskPlanStatusType.WAIT_ADJUST.getStatus()));
riskPlanTask1.setTaskKey(RiskPlanStatusType.WAIT_RETURN.getStatus());
riskPlanTask1.setTaskName(RiskPlanStatusType.WAIT_RETURN.getStatus());
riskPlanTask1.setStatus("running");
riskPlanTask1.setStartTime(new Date());
riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
//修改计划状态
riskPlan.setStatus(RiskPlanStatusType.WAIT_ADJUST.getStatus());
riskPlan.setStatus(RiskPlanStatusType.WAIT_RETURN.getStatus());
updateRiskPlan(riskPlan);
} else {
//修改计划状态
......@@ -231,7 +253,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
RiskPlanTask riskPlanTask1 = new RiskPlanTask();
riskPlanTask1.setPlanId(lastRiskPlanTask.getPlanId());
riskPlanTask1.setTaskKey(RiskPlanStatusType.REVOKE.getStatus());
riskPlanTask1.setTaskName(RiskPlanStatusType.getTitleByStatus(RiskPlanStatusType.REVOKE.getStatus()));
riskPlanTask1.setTaskName(RiskPlanStatusType.REVOKE.getStatus());
riskPlanTask1.setStatus("completed");
riskPlanTask1.setStartTime(new Date());
riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanUserBuildingServiceImpl.java 0 → 100644
View file @ db314a96
package com.censoft.censoftrongtong.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.censoft.censoftrongtong.domain.RiskPlanUserBuilding;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppBuildingListDto;
import com.censoft.censoftrongtong.mapper.RiskPlanUserBuildingMapper;
import com.censoft.censoftrongtong.service.IRiskPlanUserBuildingService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* 基础数据-楼层Service业务层处理
*
* @author ruoyi
* @date 2023-06-26
*/
@Service
public class RiskPlanUserBuildingServiceImpl
extends ServiceImpl<RiskPlanUserBuildingMapper, RiskPlanUserBuilding>
implements IRiskPlanUserBuildingService {
@Resource
private RiskPlanUserBuildingMapper riskPlanUserBuildingMapper;
@Override
public Long countStatusByPlanIdAndStatus(Long planId, String status) {
LambdaQueryWrapper<RiskPlanUserBuilding> wrapper = new LambdaQueryWrapper<>();
wrapper = wrapper.eq(RiskPlanUserBuilding::getPlanId, planId).eq(RiskPlanUserBuilding::getStatus, status);
return count(wrapper);
}
@Override
public List<RiskPlanAppBuildingListDto> getRiskPlanAppBuildingListDtoByPlanId(Long planId) {
return riskPlanUserBuildingMapper.getRiskPlanAppBuildingListDtoByPlanId(planId);
}
}
censoft-rongtong/src/main/resources/mapper/system/LawListMapper.xml
View file @ db314a96
......@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectLawListVo">
select id, name, type, sketch, `RANGE`, normative_references, issue_date, implementation_date, del_flag, create_by, create_time, update_by, update_time from law_list
select id, name, type, sketch, `range`, normative_references, issue_date, implementation_date, del_flag, create_by, create_time, update_by, update_time from law_list
</sql>
<select id="selectLawListList" parameterType="com.censoft.censoftrongtong.domain.LawList" resultMap="LawListResult">
......@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="sketch != null and sketch != ''"> and sketch = #{sketch}</if>
<if test="range != null and range != ''"> and range = #{range}</if>
<if test="range != null and range != ''"> and `range` = #{range}</if>
<if test="normativeReferences != null and normativeReferences != ''"> and normative_references = #{normativeReferences}</if>
<if test="issueDate != null "> and issue_date = #{issueDate}</if>
<if test="implementationDate != null "> and implementation_date = #{implementationDate}</if>
......@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="name != null">name,</if>
<if test="type != null">type,</if>
<if test="sketch != null">sketch,</if>
<if test="range != null">range,</if>
<if test="range != null">`range`,</if>
<if test="normativeReferences != null">normative_references,</if>
<if test="issueDate != null">issue_date,</if>
<if test="implementationDate != null">implementation_date,</if>
......@@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="name != null">name = #{name},</if>
<if test="type != null">type = #{type},</if>
<if test="sketch != null">sketch = #{sketch},</if>
<if test="range != null">range = #{range},</if>
<if test="range != null">`range` = #{range},</if>
<if test="normativeReferences != null">normative_references = #{normativeReferences},</if>
<if test="issueDate != null">issue_date = #{issueDate},</if>
<if test="implementationDate != null">implementation_date = #{implementationDate},</if>
......
censoft-rongtong/src/main/resources/mapper/system/LedgerRoomMapper.xml
View file @ db314a96
......@@ -4,93 +4,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.censoft.censoftrongtong.mapper.LedgerRoomMapper">
<resultMap type="com.censoft.censoftrongtong.domain.LedgerRoom" id="LedgerRoomResult">
<result property="id" column="id" />
<result property="floorId" column="floor_id" />
<result property="name" column="name" />
<result property="number" column="number" />
<result property="area" column="area" />
<result property="status" column="status" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectLedgerRoomVo">
select id, floor_id, name, number, area, status, del_flag, create_by, create_time, update_by, update_time from ledger_room
</sql>
<select id="selectLedgerRoomList" parameterType="com.censoft.censoftrongtong.domain.LedgerRoom" resultMap="LedgerRoomResult">
<include refid="selectLedgerRoomVo"/>
<where>
<if test="floorId != null "> and floor_id = #{floorId}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="number != null and number != ''"> and number = #{number}</if>
<if test="area != null "> and area = #{area}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
</where>
</select>
<select id="selectLedgerRoomById" parameterType="Long" resultMap="LedgerRoomResult">
<include refid="selectLedgerRoomVo"/>
where id = #{id}
</select>
<insert id="insertLedgerRoom" parameterType="com.censoft.censoftrongtong.domain.LedgerRoom" useGeneratedKeys="true" keyProperty="id">
insert into ledger_room
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="floorId != null">floor_id,</if>
<if test="name != null">name,</if>
<if test="number != null">number,</if>
<if test="area != null">area,</if>
<if test="status != null">status,</if>
<if test="delFlag != null">del_flag,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="floorId != null">#{floorId},</if>
<if test="name != null">#{name},</if>
<if test="number != null">#{number},</if>
<if test="area != null">#{area},</if>
<if test="status != null">#{status},</if>
<if test="delFlag != null">#{delFlag},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateLedgerRoom" parameterType="com.censoft.censoftrongtong.domain.LedgerRoom">
update ledger_room
<trim prefix="SET" suffixOverrides=",">
<if test="floorId != null">floor_id = #{floorId},</if>
<if test="name != null">name = #{name},</if>
<if test="number != null">number = #{number},</if>
<if test="area != null">area = #{area},</if>
<if test="status != null">status = #{status},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteLedgerRoomById" parameterType="Long">
delete from ledger_room where id = #{id}
</delete>
<delete id="deleteLedgerRoomByIds" parameterType="String">
delete from ledger_room where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
censoft-rongtong/src/main/resources/mapper/system/RiskPlanMapper.xml
View file @ db314a96
......@@ -151,6 +151,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND lf.del_flag = '0'
AND lr.`status` = '0'
AND lr.del_flag = '0'
<if test="buildingId != null">
AND lb.id = #{buildingId}
</if>
GROUP BY
lb.id
</select>
......
censoft-rongtong/src/main/resources/mapper/system/RiskPlanUserBuildingMapper.xml 0 → 100644
View file @ db314a96
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.censoft.censoftrongtong.mapper.RiskPlanUserBuildingMapper">
<select id="getRiskPlanAppBuildingListDtoByPlanId"
resultType="com.censoft.censoftrongtong.domain.dto.RiskPlanAppBuildingListDto">
SELECT
rp.id,
rpub.building_id AS buildingId,
lb.`name` AS buildingName,
( SELECT nick_name FROM sys_user WHERE user_id = rp.create_user_id ) AS createUserName,
( SELECT GROUP_CONCAT( nick_name ) FROM sys_user WHERE FIND_IN_SET( user_id, rpub.user_ids ) ) AS workUserNames,
rpub.start_time AS startTime,
rpub.`status`
FROM
risk_plan rp
LEFT JOIN risk_plan_user_building rpub ON rpub.plan_id = rp.id
LEFT JOIN ledger_building lb ON lb.id = rpub.building_id
WHERE
rp.id = #{planId}
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment