From 358e4f19e130045ce58c2313435baec2a3f11b61 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 25 二月 2025 10:47:58 +0800
Subject: [PATCH] 审批流
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 8 ++++
ruoyi-system/src/main/java/com/ruoyi/system/vo/TenantVO.java | 3 +
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java | 1
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java | 26 ++++++------
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java | 26 +++++++++++++
ruoyi-applet/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java | 32 ++++++++--------
ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultRepairMessage.java | 6 ++-
8 files changed, 71 insertions(+), 33 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
index 8a9866e..fdc926c 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
@@ -310,6 +310,14 @@
return R.ok(tenantService.pageListApplet(query));
}
/**
+ * 获取租户管理列表
+ */
+ @ApiOperation(value = "获取租户详情")
+ @GetMapping(value = "/getTenantDetailById")
+ public R<TTenant> getTenantDetailById(@RequestParam String id) {
+ return R.ok(tenantService.getById(id));
+ }
+ /**
* 租户详情-租房信息
*/
@ApiOperation(value = "租户详情-租房信息列表")
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java b/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java
index bf32258..e27f2a5 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java
@@ -29,14 +29,14 @@
@Override
public void insertFill(MetaObject metaObject) {
// 获取登录信息
- String userName = SecurityUtils.getUsernameApplet();
- if (StringUtils.isNotBlank(userName)) {
- this.setFieldValByName("createBy", userName, metaObject);
- this.setFieldValByName("updateBy", userName, metaObject);
- } else {
- this.setFieldValByName("createBy", userName, metaObject);
- this.setFieldValByName("updateBy", userName, metaObject);
- }
+// String userName = SecurityUtils.getUsernameApplet();
+// if (StringUtils.isNotBlank(userName)) {
+// this.setFieldValByName("createBy", userName, metaObject);
+// this.setFieldValByName("updateBy", userName, metaObject);
+// } else {
+// this.setFieldValByName("createBy", userName, metaObject);
+// this.setFieldValByName("updateBy", userName, metaObject);
+// }
}
@@ -48,14 +48,14 @@
@Override
public void updateFill(MetaObject metaObject) {
// 获取登录信息
- String userName = SecurityUtils.getUsernameApplet();
- if (StringUtils.isNotBlank(userName)){
- this.setFieldValByName("createBy", userName, metaObject);
- this.setFieldValByName("updateBy", userName, metaObject);
- } else {
- this.setFieldValByName("createBy", userName, metaObject);
- this.setFieldValByName("updateBy", userName, metaObject);
- }
+// String userName = SecurityUtils.getUsernameApplet();
+// if (StringUtils.isNotBlank(userName)){
+// this.setFieldValByName("createBy", userName, metaObject);
+// this.setFieldValByName("updateBy", userName, metaObject);
+// } else {
+// this.setFieldValByName("createBy", userName, metaObject);
+// this.setFieldValByName("updateBy", userName, metaObject);
+// }
}
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java
index 88f8dc3..3e5ea1d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseModel.java
@@ -41,7 +41,6 @@
* 新增和更新执行
*/
@ApiModelProperty(value = "记录修改人，前端忽略")
- @JsonIgnore
@TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultRepairMessage.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultRepairMessage.java
index 74decae..ea3d9ec 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultRepairMessage.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultRepairMessage.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDate;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
@@ -90,9 +92,9 @@
private String handlePerson;
@ApiModelProperty(value = "处理时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("handle_time")
- private LocalDateTime handleTime;
+ private LocalDate handleTime;
@ApiModelProperty(value = "结果描述")
@TableField("result_describe")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
index 598a8a1..b25418c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java
@@ -141,7 +141,7 @@
// 更新模板, version+1
StateProcessTemplate processTemplate = new StateProcessTemplate();
- processTemplate.setId(IdUtils.simpleUUID());
+ processTemplate.setId(processUpdateBO.getId());
processTemplate.setWorkFlowId(deployId);
processTemplate.setWorkflowVersion(flwProcess.getProcessVersion());
processTemplate.setTemplateName(processUpdateBO.getTemplateName());
@@ -152,20 +152,20 @@
processTemplate.setUpdateBy(SecurityUtils.getLoginUser().getUsername());
processTemplate.setUpdateTime(LocalDateTime.now());
processTemplate.setTemplateVersion(temp.getTemplateVersion() + 1);
- this.save(processTemplate);
+ return this.updateById(processTemplate);
//查询版本是否绑定流程，更新
- LambdaQueryWrapper<StateProcessModule> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(StateProcessModule::getTemplateId, processUpdateBO.getId());
- List<StateProcessModule> stateProcessModules = stateProcessModuleService.list(queryWrapper);
- if (Objects.isNull(stateProcessModules) || stateProcessModules.isEmpty()) {
- return true;
- }
- for (StateProcessModule stateProcessModule : stateProcessModules) {
- stateProcessModule.setTemplateId(processTemplate.getId());
- stateProcessModule.setTemplateName(processTemplate.getTemplateName());
- }
- return stateProcessModuleService.updateBatchById(stateProcessModules);
+// LambdaQueryWrapper<StateProcessModule> queryWrapper = new LambdaQueryWrapper<>();
+// queryWrapper.eq(StateProcessModule::getTemplateId, processUpdateBO.getId());
+// List<StateProcessModule> stateProcessModules = stateProcessModuleService.list(queryWrapper);
+// if (Objects.isNull(stateProcessModules) || stateProcessModules.isEmpty()) {
+// return true;
+// }
+// for (StateProcessModule stateProcessModule : stateProcessModules) {
+// stateProcessModule.setTemplateId(processTemplate.getId());
+// stateProcessModule.setTemplateName(processTemplate.getTemplateName());
+// }
+// return stateProcessModuleService.updateBatchById(stateProcessModules);
}
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java
index 19144f9..f20404c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.constant.DictConstants;
@@ -24,7 +25,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.token.TokenService;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -59,9 +62,32 @@
public PageInfo<TenantVO> pageListApplet(TTenantAppletQuery query) {
PageInfo<TenantVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TenantVO> list = this.baseMapper.pageListApplet(query,pageInfo);
+ List<String> ids = list.stream().map(TTenant::getId).collect(Collectors.toList());
+ if(CollectionUtils.isEmpty(ids)){
+ return new PageInfo<>();
+ }
+ List<TContract> contracts = contractMapper.selectList(Wrappers.lambdaQuery(TContract.class)
+ .in(TContract::getTenantId, ids)
+ .eq(TContract::getStatus, 4));
+ List<THouse> houses = new ArrayList<>();
+ if(!CollectionUtils.isEmpty(contracts)){
+ List<String> houseIds = contracts.stream().map(TContract::getHouseId).collect(Collectors.toList());
+ houses = houseMapper.selectList(Wrappers.lambdaQuery(THouse.class)
+ .in(THouse::getId, houseIds));
+ }
+
for (TenantVO tenantVO : list) {
tenantVO.setTenantAttributesName(StringUtils.isNotBlank(tenantVO.getTenantAttributes())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_ATTRIBUTE,tenantVO.getTenantAttributes()):"");
tenantVO.setTenantTypeName(StringUtils.isNotBlank(tenantVO.getTenantType())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_TYPE,tenantVO.getTenantType()):"");
+ if(!CollectionUtils.isEmpty(houses)){
+ List<TContract> contractList = contracts.stream().filter(contract -> contract.getTenantId().equals(tenantVO.getId())).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(contractList)){
+ TContract contract = contractList.get(0);
+ List<THouse> houseList = houses.stream().filter(house -> house.getId().equals(contract.getHouseId())).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(houseList))
+ tenantVO.setHouseName(houseList.get(0).getHouseName());
+ }
+ }
}
pageInfo.setRecords(list);
return pageInfo;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TenantVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TenantVO.java
index 52566aa..1514830 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TenantVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TenantVO.java
@@ -18,4 +18,7 @@
@ApiModelProperty(value = "租户类型")
private String tenantTypeName;
+ @ApiModelProperty(value = "房屋名称")
+ private String houseName;
+
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 7487409..477a6ee 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -191,7 +191,7 @@
from sys_user u
WHERE u.del_flag = 0
<if test="names != null and names.size()>0">
- AND u.nick_name IN
+ AND u.user_name IN
<foreach collection="names" close=")" open="(" item="name" separator=",">
#{name}
</foreach>
--
Gitblit v1.7.1