Skip to content

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

代码规范化20240402

parent dbda0d9e
Show whitespace changes
Inline Side-by-side
Showing with 517 additions and 247 deletions
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/BacklogInfoController.java
View file @ 9c86ee2f
package com.censoft.censoftrongtong.controller;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.IMessageInfoService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.censoft.censoftrongtong.service.IBacklogInfoService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.BacklogInfo;
import com.ruoyi.system.service.IBacklogInfoService;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.domain.BacklogInfo;
import com.ruoyi.system.service.IMessageInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 待办信息Controller
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/BigScreenController.java
View file @ 9c86ee2f
......@@ -212,7 +212,9 @@ public class BigScreenController extends BaseController {
result.setProjectName(project.getName());
//评估时间
List<RiskPlan> lastRiskPlan = riskPlanServices.list(Wrappers.<RiskPlan>query().lambda().eq(RiskPlan::getProjectId, projectId).orderByDesc(RiskPlan::getCreateTime));
if (lastRiskPlan.size()>0) {
result.setEvaluationTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, lastRiskPlan.get(0).getCreateTime()));
}
//评估数据
Long buildingNum = ledgerProjectService.getBuildingCount(null, null, projectId);
Long floorNum = ledgerProjectService.getFloorCount(null, null, projectId);
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/MessageInfoController.java
View file @ 9c86ee2f
package com.ruoyi.system.controller;
package com.censoft.censoftrongtong.controller;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.MessageInfo;
import com.ruoyi.system.service.IMessageInfoService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 消息信息Controller
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/ProjectUserPostController.java
View file @ 9c86ee2f
package com.censoft.censoftrongtong.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import io.swagger.annotations.Api;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.censoft.censoftrongtong.domain.ProjectUserPost;
import com.censoft.censoftrongtong.service.IProjectUserPostService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.censoft.censoftrongtong.domain.ProjectUserPost;
import com.censoft.censoftrongtong.service.IProjectUserPostService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 项目用户岗位关系Controller
......@@ -74,7 +66,7 @@ public class ProjectUserPostController extends BaseController
/**
* 新增项目用户岗位关系
*/
@PreAuthorize("@ss.hasPermi('risk:currentProject:add')")
//@PreAuthorize("@ss.hasPermi('risk:currentProject:add')")
@Log(title = "项目用户岗位关系", businessType = BusinessType.INSERT)
@PostMapping("save")
public AjaxResult add(@RequestBody ProjectUserPost projectUserPost)
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java
View file @ 9c86ee2f
......@@ -893,9 +893,9 @@ public class RiskPlanAppController extends BaseController {
* 获取固有风险模版列表
*/
@GetMapping("/inherent/template/list")
public TableDataInfo list(RiskInherentList riskInherentList) {
public TableDataInfo list(RiskInherentListVO riskInherentList) {
startPage();
return getDataTable(riskInherentListService.selectRiskInherentListList(riskInherentList));
return getDataTable(riskInherentListService.selectRiskInherentListListVO(riskInherentList));
}
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanController.java
View file @ 9c86ee2f
package com.censoft.censoftrongtong.controller;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.convert.Convert;
import cn.hutool.http.Header;
import cn.hutool.http.HttpRequest;
import com.censoft.censoftrongtong.domain.LedgerBuilding;
import com.censoft.censoftrongtong.domain.LedgerFloor;
import com.censoft.censoftrongtong.domain.RiskPlan;
import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
import com.censoft.censoftrongtong.domain.dto.LedgerFloorDto;
import com.censoft.censoftrongtong.domain.dto.RiskInherentListExportDto;
import com.censoft.censoftrongtong.domain.dto.RiskNotificationExportWordDto;
import com.censoft.censoftrongtong.domain.dto.RiskPlanAppTaskDetailsDto;
import com.censoft.censoftrongtong.enums.RiskPlanStatusType;
import com.censoft.censoftrongtong.service.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.WordUtil;
import com.ruoyi.system.service.ISysUserService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import static com.ruoyi.common.utils.SecurityUtils.getLoginUser;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 风险计划Controller
......@@ -81,11 +66,14 @@ public class RiskPlanController extends BaseController
public TableDataInfo list(RiskPlan riskPlan)
{
startPage();
if(riskPlan.getCreateDeptId()==null) {
if ("ledger".equals(riskPlan.getIsLedger())){
riskPlan.setCreateDeptId(getDeptId());
}else {
riskPlan.setCreateUserId(getLoginUser().getUserId());
}
}
List<RiskPlanAppTaskDetailsDto> list = riskPlanService.selectRiskPlanList(riskPlan);
list.forEach(dto -> {
dto.setStatusName(RiskPlanStatusType.getTitleByStatus(dto.getStatus()).getTitle());
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanInherentListController.java
View file @ 9c86ee2f
package com.censoft.censoftrongtong.controller;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.censoft.censoftrongtong.domain.RiskPlan;
import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
import com.censoft.censoftrongtong.service.IRiskPlanInherentListService;
import com.censoft.censoftrongtong.service.IRiskPlanService;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableSupport;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.censoft.censoftrongtong.domain.RiskPlanInherentList;
import com.censoft.censoftrongtong.service.IRiskPlanInherentListService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 固有风险信息Controller
......@@ -48,7 +35,8 @@ public class RiskPlanInherentListController extends BaseController
/**
* 查询固有风险信息列表
*/
@PreAuthorize("@ss.hasPermi('system:inherent:list')")
//@PreAuthorize("@ss.hasPermi('system:inherent:list')")
@Anonymous
@GetMapping("/list")
public TableDataInfo list(RiskPlanInherentList riskPlanInherentList)
{
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/CurrentRiskDetailAbnormal.java
View file @ 9c86ee2f
package com.censoft.censoftrongtong.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntityClean;
import com.ruoyi.system.domain.SysUploadFile;
......@@ -35,6 +37,7 @@ public class CurrentRiskDetailAbnormal extends BaseEntityClean
*
*/
@TableField(exist = false)
@JsonSerialize(using = ToStringSerializer.class)
private Long buildingId;
@TableField(exist = false)
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/LawList.java
View file @ 9c86ee2f
package com.censoft.censoftrongtong.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntityClean;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import java.util.Date;
/**
* 法律法规库对象 law_list
*
* @author ruoyi
* @date 2023-06-26
* @date 2024-03-27
*/
public class LawList extends BaseEntity
public class LawList extends BaseEntityClean
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
/** */
private Long id;
/** 标题 */
......@@ -34,7 +35,7 @@ public class LawList extends BaseEntity
/** 范围 */
@Excel(name = "范围")
private String range;
private String rangeInfo;
/** 规范性引用文件 */
@Excel(name = "规范性引用文件")
......@@ -53,6 +54,9 @@ public class LawList extends BaseEntity
/** 删除标志（0代表存在 1代表删除） */
private String delFlag;
/** 附件信息 */
private String lawFiles;
public void setId(Long id)
{
this.id = id;
......@@ -89,14 +93,14 @@ public class LawList extends BaseEntity
{
return sketch;
}
public void setRange(String range)
public void setRangeInfo(String rangeInfo)
{
this.range = range;
this.rangeInfo = rangeInfo;
}
public String getRange()
public String getRangeInfo()
{
return range;
return rangeInfo;
}
public void setNormativeReferences(String normativeReferences)
{
......@@ -134,6 +138,15 @@ public class LawList extends BaseEntity
{
return delFlag;
}
public void setLawFiles(String lawFiles)
{
this.lawFiles = lawFiles;
}
public String getLawFiles()
{
return lawFiles;
}
@Override
public String toString() {
......@@ -142,7 +155,7 @@ public class LawList extends BaseEntity
.append("name", getName())
.append("type", getType())
.append("sketch", getSketch())
.append("range", getRange())
.append("range", getRangeInfo())
.append("normativeReferences", getNormativeReferences())
.append("issueDate", getIssueDate())
.append("implementationDate", getImplementationDate())
......@@ -151,6 +164,7 @@ public class LawList extends BaseEntity
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("lawFiles", getLawFiles())
.toString();
}
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/LedgerBuilding.java
View file @ 9c86ee2f
package com.censoft.censoftrongtong.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntityClean;
import lombok.Data;
......@@ -19,6 +21,7 @@ public class LedgerBuilding extends BaseEntityClean
private static final long serialVersionUID = 1L;
/** $column.columnComment */
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 项目id */
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/LedgerFloor.java
View file @ 9c86ee2f
package com.censoft.censoftrongtong.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntityClean;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 基础数据-楼层对象 ledger_floor
......@@ -20,9 +19,12 @@ public class LedgerFloor extends BaseEntityClean
private static final long serialVersionUID = 1L;
/** $column.columnComment */
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 楼宇id */
@JsonSerialize(using = ToStringSerializer.class)
private Long buildingId;
/** 楼层名称 */
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskInherentListVO.java 0 → 100644
View file @ 9c86ee2f
package com.censoft.censoftrongtong.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
/**
* 固有风险清单库对象 risk_inherent_list
*
* @author ruoyi
* @date 2023-06-26
*/
@Data
@TableName("risk_inherent_list")
public class RiskInherentListVO extends BaseEntity
{
/**
* 风险源名称
*/
private String name;
/**
* 风险点类型
*/
private String pointType;
/**
* 是否为特种设备
*/
private Boolean specialEquipment;
/**
* 安全警示标志
*/
private String safetyWarningSigns;
/**
* 风险因素
*/
private String factor;
/**
* 准事故类型
*/
private String type;
/**
* 工程技术措施
*/
private String measuresProject;
/**
* 应采取的管理措施
*/
private String measuresAdministration;
/**
* 应急措施
*/
private String measuresEmergency;
/**
* 是否存在重大危险源
*/
private Boolean majorHazardSource;
/**
* 危险源名称
*/
private String hazardSourceName;
/**
* 重大危险源描述
*/
private String majorHazardSourceDescription;
/**
* 参考依据
*/
private String referenceBasis;
/**
* 删除标志（0代表存在 1代表删除）
*/
private String delFlag;
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlanUserBuilding.java
View file @ 9c86ee2f
......@@ -4,6 +4,8 @@ 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 com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.util.Date;
......@@ -31,6 +33,7 @@ public class RiskPlanUserBuilding {
* 楼宇id
*/
@TableField("building_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long buildingId;
/**
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/LedgerRoomDto.java
View file @ 9c86ee2f
package com.censoft.censoftrongtong.domain.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
......@@ -29,6 +31,7 @@ public class LedgerRoomDto {
private String projectName;
/** 楼宇id */
@JsonSerialize(using = ToStringSerializer.class)
private Long buildingId;
/** 楼宇名称 */
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskExistingListSaveDto.java
View file @ 9c86ee2f
......@@ -18,6 +18,7 @@ import java.math.BigDecimal;
public class RiskExistingListSaveDto {
@TableField(exist = false)
@JsonSerialize(using = ToStringSerializer.class)
private Long buildingId;
/**
* id
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskInherentListExportDto.java
View file @ 9c86ee2f
......@@ -26,6 +26,11 @@ public class RiskInherentListExportDto {
*/
private String projectName;
/**
* 项目id
*/
private String projectId;
/**
* 所属城市
*/
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppApproveBuildingDto.java
View file @ 9c86ee2f
package com.censoft.censoftrongtong.domain.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.util.List;
......@@ -13,6 +15,7 @@ import java.util.List;
@Data
public class RiskPlanAppApproveBuildingDto {
/** id */
@JsonSerialize(using = ToStringSerializer.class)
private Long buildingId;
/** 经办结果 */
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppBuildingListDto.java
View file @ 9c86ee2f
package com.censoft.censoftrongtong.domain.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.util.Date;
......@@ -13,9 +15,13 @@ import java.util.Date;
@Data
public class RiskPlanAppBuildingListDto {
/** 计划id */
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 楼宇id */
@JsonSerialize(using = ToStringSerializer.class)
private Long buildingId;
/** 楼宇名称 */
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppDetailsDto.java
View file @ 9c86ee2f
......@@ -17,6 +17,25 @@ public class RiskPlanAppDetailsDto {
/** id */
private Long id;
/**
* 项目业态
*/
private String projectBusiness;
/**
* 经营状态
*/
private String businessStatus;
/**
* 是否为物业
*/
private Boolean propertyManagement;
/** 发起人员id */
private Long createUserId;
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppExistingListDetailsDto.java
View file @ 9c86ee2f
......@@ -66,6 +66,9 @@ public class RiskPlanAppExistingListDetailsDto {
/** 风险等级 */
private String level;
/** 风险级别分 */
private String levelScore;
/** 存在部位 */
private String presenceLocation;
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppInherentListDto.java
View file @ 9c86ee2f
package com.censoft.censoftrongtong.domain.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
......@@ -20,6 +22,7 @@ public class RiskPlanAppInherentListDto {
private String name;
/** 楼宇id */
@JsonSerialize(using = ToStringSerializer.class)
private Long buildingId;
/** 楼宇名称 */
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppRiskBuildingListDto.java
View file @ 9c86ee2f
package com.censoft.censoftrongtong.domain.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.util.Date;
......@@ -12,6 +14,7 @@ import java.util.Date;
@Data
public class RiskPlanAppRiskBuildingListDto {
/** 建筑id */
@JsonSerialize(using = ToStringSerializer.class)
private Long buildingId;
/** 建筑名称 */
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskPlanAppTaskDetailsDto.java
View file @ 9c86ee2f
package com.censoft.censoftrongtong.domain.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import java.util.Date;
......@@ -87,4 +86,23 @@ public class RiskPlanAppTaskDetailsDto {
* 状态名称
*/
private String statusName;
/**
* 项目业态
*/
private String projectBusiness;
/**
* 经营状态
*/
private String businessStatus;
/**
* 是否为物业
*/
private Boolean propertyManagement;
}
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/LawListMapper.java
View file @ 9c86ee2f
......@@ -9,7 +9,7 @@ import java.util.List;
* 法律法规库Mapper接口
*
* @author ruoyi
* @date 2023-06-26
* @date 2024-03-27
*/
public interface LawListMapper extends MPJBaseMapper<LawList>
{
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskInherentListMapper.java
View file @ 9c86ee2f
package com.censoft.censoftrongtong.mapper;
import com.censoft.censoftrongtong.domain.RiskInherentList;
import com.censoft.censoftrongtong.domain.RiskInherentListVO;
import com.github.yulichang.base.MPJBaseMapper;
import java.util.List;
......@@ -29,6 +30,14 @@ public interface RiskInherentListMapper extends MPJBaseMapper<RiskInherentList>
*/
public List<RiskInherentList> selectRiskInherentListList(RiskInherentList riskInherentList);
/**
* 查询固有风险清单库列表(不返回id)
*
* @param riskInherentList 固有风险清单库
* @return 固有风险清单库集合
*/
public List<RiskInherentListVO> selectRiskInherentListListVO(RiskInherentListVO riskInherentList);
/**
* 新增固有风险清单库
*
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IBacklogInfoService.java
View file @ 9c86ee2f
package com.ruoyi.system.service;
package com.censoft.censoftrongtong.service;
import com.github.yulichang.base.MPJBaseService;
import com.ruoyi.system.domain.BacklogInfo;
import java.util.List;
import java.util.Map;
import com.ruoyi.system.domain.BacklogInfo;
import com.github.yulichang.base.MPJBaseService;
/**
* 待办信息Service接口
*
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/ILawListService.java
View file @ 9c86ee2f
......@@ -4,12 +4,11 @@ import com.censoft.censoftrongtong.domain.LawList;
import com.github.yulichang.base.MPJBaseService;
import java.util.List;
/**
* 法律法规库Service接口
*
* @author ruoyi
* @date 2023-06-26
* @date 2024-03-27
*/
public interface ILawListService extends MPJBaseService<LawList>
{
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskInherentListService.java
View file @ 9c86ee2f
package com.censoft.censoftrongtong.service;
import com.censoft.censoftrongtong.domain.RiskInherentList;
import com.censoft.censoftrongtong.domain.RiskInherentListVO;
import com.github.yulichang.base.MPJBaseService;
import java.util.List;
......@@ -29,6 +30,14 @@ public interface IRiskInherentListService extends MPJBaseService<RiskInherentLis
*/
public List<RiskInherentList> selectRiskInherentListList(RiskInherentList riskInherentList);
/**
* 查询固有风险清单库列表（不返回ID）
*
* @param riskInherentList 固有风险清单库
* @return 固有风险清单库集合
*/
public List<RiskInherentListVO> selectRiskInherentListListVO(RiskInherentListVO riskInherentList);
/**
* 新增固有风险清单库
*
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/BacklogInfoServiceImpl.java
View file @ 9c86ee2f
package com.ruoyi.system.service.impl;
import java.util.List;
import java.util.Map;
package com.censoft.censoftrongtong.service.impl;
import com.censoft.censoftrongtong.service.IBacklogInfoService;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.domain.BacklogInfo;
import com.ruoyi.system.mapper.BacklogInfoMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.system.mapper.BacklogInfoMapper;
import com.ruoyi.system.domain.BacklogInfo;
import com.ruoyi.system.service.IBacklogInfoService;
import com.github.yulichang.base.MPJBaseServiceImpl;
import java.util.List;
import java.util.Map;
/**
* 待办信息Service业务层处理
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LawListServiceImpl.java
View file @ 9c86ee2f
......@@ -9,12 +9,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 法律法规库Service业务层处理
*
* @author ruoyi
* @date 2023-06-26
* @date 2024-03-27
*/
@Service
public class LawListServiceImpl extends MPJBaseServiceImpl<LawListMapper, LawList> implements ILawListService
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskInherentListServiceImpl.java
View file @ 9c86ee2f
package com.censoft.censoftrongtong.service.impl;
import com.censoft.censoftrongtong.domain.RiskInherentList;
import com.censoft.censoftrongtong.domain.RiskInherentListVO;
import com.censoft.censoftrongtong.mapper.RiskInherentListMapper;
import com.censoft.censoftrongtong.service.IRiskInherentListService;
import com.github.yulichang.base.MPJBaseServiceImpl;
......@@ -46,6 +47,18 @@ public class RiskInherentListServiceImpl extends MPJBaseServiceImpl<RiskInherent
return riskInherentListMapper.selectRiskInherentListList(riskInherentList);
}
/**
* 查询固有风险清单库列表(不返回ID)
*
* @param riskInherentList 固有风险清单库
* @return 固有风险清单库
*/
@Override
public List<RiskInherentListVO> selectRiskInherentListListVO(RiskInherentListVO riskInherentList)
{
return riskInherentListMapper.selectRiskInherentListListVO(riskInherentList);
}
/**
* 新增固有风险清单库
*
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanInherentListServiceImpl.java
View file @ 9c86ee2f
......@@ -19,7 +19,6 @@ import com.github.yulichang.base.MPJBaseServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.WordUtil;
import com.ruoyi.system.service.ISysUploadFileService;
import org.apache.ibatis.annotations.Param;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
......@@ -137,6 +136,7 @@ public class RiskPlanInherentListServiceImpl
}
}
riskPlanInherentList.setCreateTime(DateUtils.getNowDate());
riskPlanInherentList.setDelFlag("0");//部分风险模版导入保存delflag会变成1导致数据丢失，原因未找到
// return riskPlanInherentListMapper.insert(riskPlanInherentList)>0;
return saveOrUpdate(riskPlanInherentList);
}
......
censoft-rongtong/src/main/resources/mapper/system/BacklogInfoMapper.xml
View file @ 9c86ee2f
......@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.BacklogInfoMapper">
<resultMap type="BacklogInfo" id="BacklogInfoResult">
<resultMap type="com.ruoyi.system.domain.BacklogInfo" id="BacklogInfoResult">
<result property="id" column="id" />
<result property="nodeId" column="node_id" />
<result property="pid" column="pid" />
......@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select id, node_id, pid, main_id, title, theme, content, status, backlog_by, menu_name, menu_url, app_url, create_by, create_time, update_by, update_time, remark from backlog_info
</sql>
<select id="selectBacklogInfoList" parameterType="BacklogInfo" resultMap="BacklogInfoResult">
<select id="selectBacklogInfoList" parameterType="com.ruoyi.system.domain.BacklogInfo" resultMap="BacklogInfoResult">
select a.id,
a.node_id,
a.pid,
......@@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
</select>
<insert id="insertBacklogInfo" parameterType="BacklogInfo">
<insert id="insertBacklogInfo" parameterType="com.ruoyi.system.domain.BacklogInfo">
insert into backlog_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
......@@ -153,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
</insert>
<update id="updateBacklogInfo" parameterType="BacklogInfo">
<update id="updateBacklogInfo" parameterType="com.ruoyi.system.domain.BacklogInfo">
update backlog_info
<trim prefix="SET" suffixOverrides=",">
<if test="nodeId != null">node_id = #{nodeId},</if>
......
censoft-rongtong/src/main/resources/mapper/system/LawListMapper.xml
View file @ 9c86ee2f
......@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="name" column="name" />
<result property="type" column="type" />
<result property="sketch" column="sketch" />
<result property="range" column="range" />
<result property="rangeInfo" column="range_info" />
<result property="normativeReferences" column="normative_references" />
<result property="issueDate" column="issue_date" />
<result property="implementationDate" column="implementation_date" />
......@@ -18,10 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="lawFiles" column="law_files" />
</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_info, normative_references, issue_date, implementation_date, del_flag, create_by, create_time, update_by, update_time, law_files from law_list
</sql>
<select id="selectLawListList" parameterType="com.censoft.censoftrongtong.domain.LawList" resultMap="LawListResult">
......@@ -30,7 +31,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="rangeInfo != null and rangeInfo != ''"> and range_info = #{rangeInfo}</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 +49,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="rangeInfo != null">range_info,</if>
<if test="normativeReferences != null">normative_references,</if>
<if test="issueDate != null">issue_date,</if>
<if test="implementationDate != null">implementation_date,</if>
......@@ -57,12 +58,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="lawFiles != null">law_files,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<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="rangeInfo != null">#{rangeInfo},</if>
<if test="normativeReferences != null">#{normativeReferences},</if>
<if test="issueDate != null">#{issueDate},</if>
<if test="implementationDate != null">#{implementationDate},</if>
......@@ -71,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="lawFiles != null">#{lawFiles},</if>
</trim>
</insert>
......@@ -80,7 +83,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="rangeInfo != null">range_info = #{rangeInfo},</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>
......@@ -89,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="lawFiles != null">law_files = #{lawFiles},</if>
</trim>
where id = #{id}
</update>
......
censoft-rongtong/src/main/resources/mapper/system/LedgerBuildingMapper.xml
View file @ 9c86ee2f
......@@ -35,6 +35,8 @@
type,
dept_id,
floor,
ground_floor,
underground_floor,
useto,
city,
area,
......
censoft-rongtong/src/main/resources/mapper/system/LedgerFloorMapper.xml
View file @ 9c86ee2f
......@@ -41,13 +41,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ledger_building b ON f.building_id = b.id
LEFT JOIN sys_dept d ON b.dept_id = d.dept_id
<where>
<if test="buildingName != null "> and b.building_name like concat('%', #{buildingName}, '%')</if>
<if test="buildingName != null "> and b.name like concat('%', #{buildingName}, '%')</if>
<if test="buildingId != null "> and f.building_id = #{buildingId}</if>
<if test="name != null and name != ''"> and f.name like concat('%', #{name}, '%')</if>
<if test="type != null and type != ''"> and f.type = #{type}</if>
<if test="roomNumber != null "> and f.room_number = #{roomNumber}</if>
<if test="status != null and status != ''"> and f.status = #{status}</if>
and f.del_flag = '0'
and b.del_flag='0'
</where>
</select>
......
censoft-rongtong/src/main/resources/mapper/system/LedgerProjectMapper.xml
View file @ 9c86ee2f
......@@ -207,7 +207,7 @@
<where>
<if test="name != null and name != ''">and p.name like concat('%', #{name}, '%')</if>
<if test="type != null and type != ''">and p.type like concat('%', #{type}, '%')</if>
<if test="business != null and business != ''">and p.business = #{business}</if>
<if test="business != null and business != ''">and find_in_set(p.business,#{business})</if>
<if test="deptId != null ">and ( d.dept_id = #{deptId} or find_in_set(#{deptId},d.ancestors) )</if>
<if test="province != null and province != ''">and p.province like concat('%', #{province}, '%')</if>
<if test="city != null and city != ''">and p.city like concat('%', #{city}, '%')</if>
......
censoft-rongtong/src/main/resources/mapper/system/MessageInfoMapper.xml
View file @ 9c86ee2f
......@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.MessageInfoMapper">
<resultMap type="MessageInfo" id="MessageInfoResult">
<resultMap type="com.ruoyi.system.domain.MessageInfo" id="MessageInfoResult">
<result property="id" column="id" />
<result property="nodeId" column="node_id" />
<result property="pid" column="pid" />
......@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select id, node_id, pid, title, content, status, message_by, menu_name, menu_url, app_url, create_by, create_time, update_by, update_time, remark from message_info
</sql>
<select id="selectMessageInfoList" parameterType="MessageInfo" resultMap="MessageInfoResult">
<select id="selectMessageInfoList" parameterType="com.ruoyi.system.domain.MessageInfo" resultMap="MessageInfoResult">
select a.id,
a.node_id,
a.pid,
......@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
</select>
<insert id="insertMessageInfo" parameterType="MessageInfo">
<insert id="insertMessageInfo" parameterType="com.ruoyi.system.domain.MessageInfo">
insert into message_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
......@@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
</insert>
<update id="updateMessageInfo" parameterType="MessageInfo">
<update id="updateMessageInfo" parameterType="com.ruoyi.system.domain.MessageInfo">
update message_info
<trim prefix="SET" suffixOverrides=",">
<if test="nodeId != null">node_id = #{nodeId},</if>
......
censoft-rongtong/src/main/resources/mapper/system/RiskInherentListMapper.xml
View file @ 9c86ee2f
......@@ -27,6 +27,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="remark" column="remark" />
</resultMap>
<resultMap type="com.censoft.censoftrongtong.domain.RiskInherentListVO" id="RiskInherentListResultVO">
<result property="name" column="name" />
<result property="pointType" column="point_type" />
<result property="specialEquipment" column="special_equipment" />
<result property="safetyWarningSigns" column="safety_warning_signs" />
<result property="factor" column="factor" />
<result property="type" column="type" />
<result property="measuresProject" column="measures_project" />
<result property="measuresAdministration" column="measures_administration" />
<result property="hazardSourceName" column="hazard_source_name" />
<result property="majorHazardSource" column="major_hazard_source" />
<result property="majorHazardSourceDescription" column="major_hazard_source_description" />
<result property="measuresEmergency" column="measures_emergency" />
<result property="referenceBasis" column="reference_basis" />
<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" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectRiskInherentListVo">
select id, name, point_type, special_equipment, safety_warning_signs, factor, type, measures_project, measures_administration, hazard_source_name, major_hazard_source, major_hazard_source_description, measures_emergency, reference_basis, del_flag, create_by, create_time, update_by, update_time, remark from risk_inherent_list
</sql>
......@@ -42,6 +64,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectRiskInherentListListVO" parameterType="com.censoft.censoftrongtong.domain.RiskInherentListVO" resultMap="RiskInherentListResultVO">
select name, point_type, special_equipment, safety_warning_signs, factor, type, measures_project, measures_administration, hazard_source_name, major_hazard_source, major_hazard_source_description, measures_emergency, reference_basis, del_flag, create_by, create_time, update_by, update_time, remark from risk_inherent_list
<where>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="pointType != null and pointType != ''"> and point_type = #{pointType}</if>
<if test="safetyWarningSigns != null and safetyWarningSigns != ''"> and safety_warning_signs like concat('%', #{safetyWarningSigns}, '%')</if>
<if test="factor != null and factor != ''"> and factor like concat('%', #{factor}, '%')</if>
<if test="type != null and type != ''"> and type like concat('%', #{type}, '%')</if>
</where>
</select>
<select id="selectRiskInherentListById" parameterType="Long" resultMap="RiskInherentListResult">
<include refid="selectRiskInherentListVo"/>
where id = #{id}
......
censoft-rongtong/src/main/resources/mapper/system/RiskPlanExistingListMapper.xml
View file @ 9c86ee2f
......@@ -65,7 +65,7 @@
update_by,
update_time,
remark,
evaluationItemIds,
evaluation_item_ids,
factor_items
from risk_plan_existing_list
</sql>
......@@ -496,7 +496,8 @@
rpil.reference_basis AS referenceBasis,
rpil.create_time,
rpil.evaluation_item_ids,
rpil.factor_items
rpil.factor_items,
rpil.level_score
FROM risk_plan_existing_list rpil
LEFT JOIN sys_user su ON su.user_id = rpil.user_id
LEFT JOIN risk_plan rp ON rp.id = rpil.plan_id
......@@ -546,6 +547,7 @@
rpil.id IS NOT NULL
<if test="deptName != null and deptName != ''">and sd.dept_name like concat('%',#{deptName},'%')</if>
<if test="projectName != null and projectName != ''">and lp.name like concat('%',#{projectName},'%')</if>
<if test="projectId != null and projectId != ''">and lp.id =#{projectId}</if>
<if test="city != null and city != ''">and lp.city like concat('%',#{city},'%')</if>
<if test="businessFormat != null and businessFormat != ''">and lp.business like
concat('%',#{businessFordoneListmat},'%')
......
censoft-rongtong/src/main/resources/mapper/system/RiskPlanInherentListMapper.xml
View file @ 9c86ee2f
......@@ -704,9 +704,10 @@
rpil.id IS NOT NULL
<if test="deptName != null and deptName != ''">and sd.dept_name like concat('%',#{deptName},'%')</if>
<if test="projectName != null and projectName != ''">and lp.name like concat('%',#{projectName},'%')</if>
<if test="projectId != null and projectId != ''">and lp.id = #{projectId}</if>
<if test="city != null and city != ''">and lp.city like concat('%',#{city},'%')</if>
<if test="businessFormat != null and businessFormat != ''">and lp.business like
concat('%',#{businessFordoneListmat},'%')
<if test="businessFormat != null and businessFormat != ''">and find_in_set(lp.business,#{businessFormat})
</if>
<if test="inherentName != null and inherentName != ''">and rpil.`name` like concat('%',#{inherentName},'%')</if>
<if test="inherentLevel != null and inherentLevel != ''">and rpil.`level` like
......
censoft-rongtong/src/main/resources/mapper/system/RiskPlanMapper.xml
View file @ 9c86ee2f
......@@ -122,6 +122,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
resultType="com.censoft.censoftrongtong.domain.dto.RiskPlanAppDetailsDto">
SELECT
rp.id,
pro.business_status,
pro.property_management,
pro.business AS projectBusiness,
su1.user_id AS createUserId,
su1.nick_name AS createUserName,
su2.user_id AS leaderUserId,
......@@ -131,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
rp.end_time AS endTime
FROM
risk_plan rp
LEFT JOIN ledger_project pro ON pro.id = rp.project_id
LEFT JOIN sys_user su1 ON su1.user_id = rp.create_user_id
LEFT JOIN sys_user su2 ON su2.user_id = rp.leader_user_id
WHERE
......@@ -160,7 +164,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
rp.work_user_ids AS workUserIds,
( SELECT GROUP_CONCAT( nick_name ) FROM sys_user WHERE FIND_IN_SET( user_id, rp.work_user_ids ) ) AS workUserNames,
rp.start_time AS startTime,
rp.end_time AS endTime
rp.end_time AS endTime,
lp.business_status,
lp.property_management,
lp.business AS projectBusiness
FROM
risk_plan rp
LEFT JOIN sys_user su1 ON su1.user_id = rp.create_user_id
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
View file @ 9c86ee2f
package com.ruoyi.web.controller.system;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
......@@ -21,6 +8,13 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.service.ISysPostService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 岗位信息操作处理
......@@ -37,7 +31,7 @@ public class SysPostController extends BaseController
/**
* 获取岗位列表
*/
@PreAuthorize("@ss.hasPermi('system:post:list')")
//@PreAuthorize("@ss.hasPermi('system:post:list')")
@GetMapping("/list")
public TableDataInfo list(SysPost post)
{
......
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View file @ 9c86ee2f
......@@ -240,6 +240,14 @@ public class SysUserController extends BaseController
@GetMapping("/deptTree")
public AjaxResult deptTree(SysDept dept)
{
Long userId=SecurityUtils.getUserId();
Boolean isAdmin= SysUser.isAdmin(userId);
if (!isAdmin) {
dept.setRemark(SecurityUtils.getDeptId()+"");
dept.setDeptId(SecurityUtils.getDeptId());
}
return success(deptService.selectDeptTreeList(dept));
}
}
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
View file @ 9c86ee2f
package com.ruoyi.common.core.domain.entity;
import java.util.Date;
import java.util.List;
import javax.validation.constraints.*;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.annotation.Excel.Type;
import com.ruoyi.common.annotation.Excels;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.xss.Xss;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.util.Date;
import java.util.List;
/**
* 用户对象 sys_user
......@@ -29,6 +32,11 @@ public class SysUser extends BaseEntity
@Excel(name = "部门编号", type = Type.IMPORT)
private Long deptId;
/**
* 部门名称
*/
private String deptName;
/** 用户账号 */
@Excel(name = "登录名称")
private String userName;
......@@ -168,6 +176,17 @@ public class SysUser extends BaseEntity
this.deptId = deptId;
}
public String getDeptName()
{
return deptName;
}
public void setDeptName(String deptName)
{
this.deptName = deptName;
}
@Xss(message = "用户昵称不能包含脚本字符")
@Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
public String getNickName()
......
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
View file @ 9c86ee2f
......@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysConfigMapper">
<resultMap type="SysConfig" id="SysConfigResult">
<resultMap type="com.ruoyi.system.domain.SysConfig" id="SysConfigResult">
<id property="configId" column="config_id" />
<result property="configName" column="config_name" />
<result property="configKey" column="config_key" />
......@@ -33,12 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</sql>
<select id="selectConfig" parameterType="SysConfig" resultMap="SysConfigResult">
<select id="selectConfig" parameterType="com.ruoyi.system.domain.SysConfig" resultMap="SysConfigResult">
<include refid="selectConfigVo"/>
<include refid="sqlwhereSearch"/>
</select>
<select id="selectConfigList" parameterType="SysConfig" resultMap="SysConfigResult">
<select id="selectConfigList" parameterType="com.ruoyi.system.domain.SysConfig" resultMap="SysConfigResult">
<include refid="selectConfigVo"/>
<where>
<if test="configName != null and configName != ''">
......@@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where config_key = #{configKey} limit 1
</select>
<insert id="insertConfig" parameterType="SysConfig">
<insert id="insertConfig" parameterType="com.ruoyi.system.domain.SysConfig">
insert into sys_config (
<if test="configName != null and configName != '' ">config_name,</if>
<if test="configKey != null and configKey != '' ">config_key,</if>
......@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</insert>
<update id="updateConfig" parameterType="SysConfig">
<update id="updateConfig" parameterType="com.ruoyi.system.domain.SysConfig">
update sys_config
<set>
<if test="configName != null and configName != ''">config_name = #{configName},</if>
......
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
View file @ 9c86ee2f
......@@ -42,6 +42,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null and status != ''">
AND status = #{status}
</if>
<if test="remark != null and remark != ''">
AND FIND_IN_SET(parent_id,'0,100') or parent_id =#{remark} or dept_id=#{remark}
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
order by d.parent_id, d.order_num
......
ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
View file @ 9c86ee2f
......@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysDictDataMapper">
<resultMap type="SysDictData" id="SysDictDataResult">
<resultMap type="com.ruoyi.common.core.domain.entity.SysDictData" id="SysDictDataResult">
<id property="dictCode" column="dict_code" />
<result property="dictSort" column="dict_sort" />
<result property="dictLabel" column="dict_label" />
......@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sys_dict_data
</sql>
<select id="selectDictDataList" parameterType="SysDictData" resultMap="SysDictDataResult">
<select id="selectDictDataList" parameterType="com.ruoyi.common.core.domain.entity.SysDictData" resultMap="SysDictDataResult">
<include refid="selectDictDataVo"/>
<where>
<if test="dictType != null and dictType != ''">
......@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by dict_sort asc
</select>
<select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult">
<select id="selectDictDataByType" parameterType="com.ruoyi.common.core.domain.entity.SysDictData" resultMap="SysDictDataResult">
<include refid="selectDictDataVo"/>
where status = '0' and dict_type = #{dictType} order by dict_sort asc
</select>
......@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<update id="updateDictData" parameterType="SysDictData">
<update id="updateDictData" parameterType="com.ruoyi.common.core.domain.entity.SysDictData">
update sys_dict_data
<set>
<if test="dictSort != null">dict_sort = #{dictSort},</if>
......@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update sys_dict_data set dict_type = #{newDictType} where dict_type = #{oldDictType}
</update>
<insert id="insertDictData" parameterType="SysDictData">
<insert id="insertDictData" parameterType="com.ruoyi.common.core.domain.entity.SysDictData">
insert into sys_dict_data(
<if test="dictSort != null">dict_sort,</if>
<if test="dictLabel != null and dictLabel != ''">dict_label,</if>
......
ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
View file @ 9c86ee2f
......@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysDictTypeMapper">
<resultMap type="SysDictType" id="SysDictTypeResult">
<resultMap type="com.ruoyi.common.core.domain.entity.SysDictType" id="SysDictTypeResult">
<id property="dictId" column="dict_id" />
<result property="dictName" column="dict_name" />
<result property="dictType" column="dict_type" />
......@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sys_dict_type
</sql>
<select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult">
<select id="selectDictTypeList" parameterType="com.ruoyi.common.core.domain.entity.SysDictType" resultMap="SysDictTypeResult">
<include refid="selectDictTypeVo"/>
<where>
<if test="dictName != null and dictName != ''">
......@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<update id="updateDictType" parameterType="SysDictType">
<update id="updateDictType" parameterType="com.ruoyi.common.core.domain.entity.SysDictType">
update sys_dict_type
<set>
<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
......@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where dict_id = #{dictId}
</update>
<insert id="insertDictType" parameterType="SysDictType">
<insert id="insertDictType" parameterType="com.ruoyi.common.core.domain.entity.SysDictType">
insert into sys_dict_type(
<if test="dictName != null and dictName != ''">dict_name,</if>
<if test="dictType != null and dictType != ''">dict_type,</if>
......
ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
View file @ 9c86ee2f
......@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysLogininforMapper">
<resultMap type="SysLogininfor" id="SysLogininforResult">
<resultMap type="com.ruoyi.system.domain.SysLogininfor" id="SysLogininforResult">
<id property="infoId" column="info_id" />
<result property="userName" column="user_name" />
<result property="status" column="status" />
......@@ -16,12 +16,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="loginTime" column="login_time" />
</resultMap>
<insert id="insertLogininfor" parameterType="SysLogininfor">
<insert id="insertLogininfor" parameterType="com.ruoyi.system.domain.SysLogininfor">
insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time)
values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate())
</insert>
<select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
<select id="selectLogininforList" parameterType="com.ruoyi.system.domain.SysLogininfor" resultMap="SysLogininforResult">
select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor
<where>
<if test="ipaddr != null and ipaddr != ''">
......
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
View file @ 9c86ee2f
......@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysMenuMapper">
<resultMap type="SysMenu" id="SysMenuResult">
<resultMap type="com.ruoyi.common.core.domain.entity.SysMenu" id="SysMenuResult">
<id property="menuId" column="menu_id"/>
<result property="menuName" column="menu_name"/>
<result property="parentName" column="parent_name"/>
......@@ -32,7 +32,7 @@
from sys_menu
</sql>
<select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
<select id="selectMenuList" parameterType="com.ruoyi.common.core.domain.entity.SysMenu" resultMap="SysMenuResult">
<include refid="selectMenuVo"/>
<where>
<if test="menuName != null and menuName != ''">
......@@ -49,7 +49,7 @@
</select>
<select id="selectMenusApp" parameterType="SysMenu" resultMap="SysMenuResult">
<select id="selectMenusApp" parameterType="com.ruoyi.common.core.domain.entity.SysMenu" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status,
ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
......@@ -73,7 +73,7 @@
order by m.parent_id, m.order_num
</select>
<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
<select id="selectMenuListByUserId" parameterType="com.ruoyi.common.core.domain.entity.SysMenu" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status,
ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
......@@ -148,12 +148,12 @@
select count(1) from sys_menu where parent_id = #{menuId}
</select>
<select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
<select id="checkMenuNameUnique" parameterType="com.ruoyi.common.core.domain.entity.SysMenu" resultMap="SysMenuResult">
<include refid="selectMenuVo"/>
where menu_name=#{menuName} and parent_id = #{parentId} limit 1
</select>
<update id="updateMenu" parameterType="SysMenu">
<update id="updateMenu" parameterType="com.ruoyi.common.core.domain.entity.SysMenu">
update sys_menu
<set>
<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
......@@ -176,7 +176,7 @@
where menu_id = #{menuId}
</update>
<insert id="insertMenu" parameterType="SysMenu">
<insert id="insertMenu" parameterType="com.ruoyi.common.core.domain.entity.SysMenu">
insert into sys_menu(
<if test="menuId != null and menuId != 0">menu_id,</if>
<if test="parentId != null and parentId != 0">parent_id,</if>
......
ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
View file @ 9c86ee2f
......@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysNoticeMapper">
<resultMap type="SysNotice" id="SysNoticeResult">
<resultMap type="com.ruoyi.system.domain.SysNotice" id="SysNoticeResult">
<result property="noticeId" column="notice_id" />
<result property="noticeTitle" column="notice_title" />
<result property="noticeType" column="notice_type" />
......@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where notice_id = #{noticeId}
</select>
<select id="selectNoticeList" parameterType="SysNotice" resultMap="SysNoticeResult">
<select id="selectNoticeList" parameterType="com.ruoyi.system.domain.SysNotice" resultMap="SysNoticeResult">
<include refid="selectNoticeVo"/>
<where>
<if test="noticeTitle != null and noticeTitle != ''">
......@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<insert id="insertNotice" parameterType="SysNotice">
<insert id="insertNotice" parameterType="com.ruoyi.system.domain.SysNotice">
insert into sys_notice (
<if test="noticeTitle != null and noticeTitle != '' ">notice_title, </if>
<if test="noticeType != null and noticeType != '' ">notice_type, </if>
......@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</insert>
<update id="updateNotice" parameterType="SysNotice">
<update id="updateNotice" parameterType="com.ruoyi.system.domain.SysNotice">
update sys_notice
<set>
<if test="noticeTitle != null and noticeTitle != ''">notice_title = #{noticeTitle}, </if>
......
ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
View file @ 9c86ee2f
......@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysOperLogMapper">
<resultMap type="SysOperLog" id="SysOperLogResult">
<resultMap type="com.ruoyi.system.domain.SysOperLog" id="SysOperLogResult">
<id property="operId" column="oper_id" />
<result property="title" column="title" />
<result property="businessType" column="business_type" />
......@@ -29,12 +29,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sys_oper_log
</sql>
<insert id="insertOperlog" parameterType="SysOperLog">
<insert id="insertOperlog" parameterType="com.ruoyi.system.domain.SysOperLog">
insert into sys_oper_log(title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time)
values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate())
</insert>
<select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">
<select id="selectOperLogList" parameterType="com.ruoyi.system.domain.SysOperLog" resultMap="SysOperLogResult">
<include refid="selectOperLogVo"/>
<where>
<if test="title != null and title != ''">
......
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
View file @ 9c86ee2f
......@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysPostMapper">
<resultMap type="SysPost" id="SysPostResult">
<resultMap type="com.ruoyi.system.domain.SysPost" id="SysPostResult">
<id property="postId" column="post_id" />
<result property="postCode" column="post_code" />
<result property="postName" column="post_name" />
......@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from sys_post
</sql>
<select id="selectPostList" parameterType="SysPost" resultMap="SysPostResult">
<select id="selectPostList" parameterType="com.ruoyi.system.domain.SysPost" resultMap="SysPostResult">
<include refid="selectPostVo"/>
<where>
<if test="postCode != null and postCode != ''">
......@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where post_code=#{postCode} limit 1
</select>
<update id="updatePost" parameterType="SysPost">
<update id="updatePost" parameterType="com.ruoyi.system.domain.SysPost">
update sys_post
<set>
<if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
......@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where post_id = #{postId}
</update>
<insert id="insertPost" parameterType="SysPost" useGeneratedKeys="true" keyProperty="postId">
<insert id="insertPost" parameterType="com.ruoyi.system.domain.SysPost" useGeneratedKeys="true" keyProperty="postId">
insert into sys_post(
<if test="postId != null and postId != 0">post_id,</if>
<if test="postCode != null and postCode != ''">post_code,</if>
......
ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
View file @ 9c86ee2f
......@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysRoleDeptMapper">
<resultMap type="SysRoleDept" id="SysRoleDeptResult">
<resultMap type="com.ruoyi.system.domain.SysRoleDept" id="SysRoleDeptResult">
<result property="roleId" column="role_id" />
<result property="deptId" column="dept_id" />
</resultMap>
......
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
View file @ 9c86ee2f
......@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysRoleMapper">
<resultMap type="SysRole" id="SysRoleResult">
<resultMap type="com.ruoyi.common.core.domain.entity.SysRole" id="SysRoleResult">
<id property="roleId" column="role_id" />
<result property="roleName" column="role_name" />
<result property="roleKey" column="role_key" />
......@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_dept d on u.dept_id = d.dept_id
</sql>
<select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
<select id="selectRoleList" parameterType="com.ruoyi.common.core.domain.entity.SysRole" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
where r.del_flag = '0'
<if test="roleId != null and roleId != 0">
......@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
</select>
<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
<insert id="insertRole" parameterType="com.ruoyi.common.core.domain.entity.SysRole" useGeneratedKeys="true" keyProperty="roleId">
insert into sys_role(
<if test="roleId != null and roleId != 0">role_id,</if>
<if test="roleName != null and roleName != ''">role_name,</if>
......@@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</insert>
<update id="updateRole" parameterType="SysRole">
<update id="updateRole" parameterType="com.ruoyi.common.core.domain.entity.SysRole">
update sys_role
<set>
<if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
......
ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
View file @ 9c86ee2f
......@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysRoleMenuMapper">
<resultMap type="SysRoleMenu" id="SysRoleMenuResult">
<resultMap type="com.ruoyi.system.domain.SysRoleMenu" id="SysRoleMenuResult">
<result property="roleId" column="role_id" />
<result property="menuId" column="menu_id" />
</resultMap>
......
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View file @ 9c86ee2f
......@@ -4,9 +4,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
<resultMap type="SysUser" id="SysUserResult">
<resultMap type="com.ruoyi.common.core.domain.entity.SysUser" id="SysUserResult">
<id property="userId" column="user_id" />
<result property="deptId" column="dept_id" />
<result property="deptName" column="dept_name" />
<result property="userName" column="user_name" />
<result property="nickName" column="nick_name" />
<result property="email" column="email" />
......@@ -26,11 +27,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="postId" column="post_id" />
<result property="postName" column="post_name" />
<result property="projectUserPostId" column="projectUserPostId" />
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult" />
<association property="dept" column="dept_id" javaType="com.ruoyi.common.core.domain.entity.SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
<resultMap id="deptResult" type="SysDept">
<resultMap id="deptResult" type="com.ruoyi.common.core.domain.entity.SysDept">
<id property="deptId" column="dept_id" />
<result property="parentId" column="parent_id" />
<result property="deptName" column="dept_name" />
......@@ -40,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="status" column="dept_status" />
</resultMap>
<resultMap id="RoleResult" type="SysRole">
<resultMap id="RoleResult" type="com.ruoyi.common.core.domain.entity.SysRole">
<id property="roleId" column="role_id" />
<result property="roleName" column="role_name" />
<result property="roleKey" column="role_key" />
......@@ -59,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_role r on r.role_id = ur.role_id
</sql>
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
<select id="selectUserList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
d.dept_name, d.leader
......@@ -79,6 +80,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%')
</if>
<if test="nickName != null and nickName != ''">
AND u.nick_name like concat('%', #{nickName}, '%')
</if>
<if test="status != null and status != ''">
AND u.status = #{status}
</if>
......@@ -98,8 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
${params.dataScope}
</select>
<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
<select id="selectAllocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id,d.dept_name, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
......@@ -115,8 +119,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
${params.dataScope}
</select>
<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
<select id="selectUnallocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id,d.dept_name, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
......@@ -129,6 +133,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="phonenumber != null and phonenumber != ''">
AND u.phonenumber like concat('%', #{phonenumber}, '%')
</if>
<if test="deptId != null and deptId != ''">
AND u.dept_id = #{deptId}
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
</select>
......@@ -190,7 +198,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</select>
<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
<insert id="insertUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into sys_user(
<if test="userId != null and userId != 0">user_id,</if>
<if test="deptId != null and deptId != 0">dept_id,</if>
......@@ -222,7 +230,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</insert>
<update id="updateUser" parameterType="SysUser">
<update id="updateUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update sys_user
<set>
<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
......@@ -243,15 +251,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where user_id = #{userId}
</update>
<update id="updateUserStatus" parameterType="SysUser">
<update id="updateUserStatus" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update sys_user set status = #{status} where user_id = #{userId}
</update>
<update id="updateUserAvatar" parameterType="SysUser">
<update id="updateUserAvatar" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update sys_user set avatar = #{avatar} where user_name = #{userName}
</update>
<update id="resetUserPwd" parameterType="SysUser">
<update id="resetUserPwd" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update sys_user set password = #{password} where user_name = #{userName}
</update>
......
ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
View file @ 9c86ee2f
......@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysUserPostMapper">
<resultMap type="SysUserPost" id="SysUserPostResult">
<resultMap type="com.ruoyi.system.domain.SysUserPost" id="SysUserPostResult">
<result property="userId" column="user_id" />
<result property="postId" column="post_id" />
</resultMap>
......
ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
View file @ 9c86ee2f
......@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysUserRoleMapper">
<resultMap type="SysUserRole" id="SysUserRoleResult">
<resultMap type="com.ruoyi.system.domain.SysUserRole" id="SysUserRoleResult">
<result property="userId" column="user_id" />
<result property="roleId" column="role_id" />
</resultMap>
......@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</insert>
<delete id="deleteUserRoleInfo" parameterType="SysUserRole">
<delete id="deleteUserRoleInfo" parameterType="com.ruoyi.system.domain.SysUserRole">
delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
</delete>
......
ruoyi-system/src/main/resources/mapper/system/WebsitesMapper.xml
View file @ 9c86ee2f
......@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.WebsitesMapper">
<resultMap type="Websites" id="WebsitesResult">
<resultMap type="com.ruoyi.system.domain.Websites" id="WebsitesResult">
<result property="id" column="id" />
<result property="name" column="name" />
<result property="url" column="url" />
......@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select id, name, url, alexa, country from websites
</sql>
<select id="selectWebsitesList" parameterType="Websites" resultMap="WebsitesResult">
<select id="selectWebsitesList" parameterType="com.ruoyi.system.domain.Websites" resultMap="WebsitesResult">
<include refid="selectWebsitesVo"/>
<where>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
......@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
</select>
<insert id="insertWebsites" parameterType="Websites" useGeneratedKeys="true" keyProperty="id">
<insert id="insertWebsites" parameterType="com.ruoyi.system.domain.Websites" useGeneratedKeys="true" keyProperty="id">
insert into websites
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="name != null and name != ''">name,</if>
......@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
</insert>
<update id="updateWebsites" parameterType="Websites">
<update id="updateWebsites" parameterType="com.ruoyi.system.domain.Websites">
update websites
<trim prefix="SET" suffixOverrides=",">
<if test="name != null and name != ''">name = #{name},</if>
......
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