From 0f2c1b3050973dd27219a8fa39bce5662c5ebad5 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 21 二月 2025 14:37:17 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 2
ruoyi-common/src/main/java/com/ruoyi/common/enums/ProcessCategoryEnum.java | 6 +-
ruoyi-system/src/main/resources/mapper/system/TItemTypeMapper.xml | 16 ++++++--
ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java | 10 +++--
ruoyi-system/src/main/java/com/ruoyi/system/service/TItemTypeService.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemTypeServiceImpl.java | 4 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/StateProcessTemplateServiceImpl.java | 6 ++-
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java | 12 ++----
ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java | 4 +-
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemTypeMapper.java | 2
ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml | 5 ++
ruoyi-system/src/main/java/com/ruoyi/system/query/TFaultRepairMessageAppletQuery.java | 2 +
12 files changed, 42 insertions(+), 29 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 699d80c..8a9866e 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
@@ -276,7 +276,7 @@
* 获取报修管理列表
*/
@ApiOperation(value = "管理员-房屋维修分页列表")
- @PostMapping(value = "/houstPageList")
+ @PostMapping(value = "/housePageList")
public R<PageInfo<TFaultRepairMessageVO>> pageList(@RequestBody TFaultRepairMessageAppletQuery query) {
return R.ok(tFaultRepairMessageService.pageListApplet(query));
}
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java
index fae3037..cc86304 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java
@@ -14,11 +14,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.time.LocalDate;
import java.util.List;
@@ -62,9 +58,9 @@
* 获取维修物品二级结构
*/
@ApiOperation(value = "获取维修物品二级结构")
- @PostMapping(value = "/getItemList")
- public R<List<TItemTypeVO>> getItemList() {
- List<TItemTypeVO> itemTypes = itemTypeService.getItemList();
+ @GetMapping(value = "/getItemList")
+ public R<List<TItemTypeVO>> getItemList(@RequestParam(required = false) String itemName) {
+ List<TItemTypeVO> itemTypes = itemTypeService.getItemList(itemName);
List<TItem> items = itemService.list();
itemTypes.forEach(itemType -> {
itemType.setItemList(items.stream().filter(item -> itemType.getId().equals(item.getTypeId())).collect(Collectors.toList()));
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java
index 7b7dba6..954a2ed 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/DataUpdateHandlerConfig.java
@@ -1,6 +1,8 @@
package com.ruoyi.common.config;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.context.annotation.Configuration;
@@ -27,14 +29,14 @@
@Override
public void insertFill(MetaObject metaObject) {
// 获取登录信息
- /* String userName = JwtTokenUtils.getUsername();
+ String userName = SecurityUtils.getUsername();
if (StringUtils.isNotBlank(userName)) {
this.setFieldValByName("createBy", userName, metaObject);
this.setFieldValByName("updateBy", userName, metaObject);
} else {
this.setFieldValByName("createBy", "", metaObject);
this.setFieldValByName("updateBy", "", metaObject);
- }*/
+ }
}
/**
@@ -45,13 +47,13 @@
@Override
public void updateFill(MetaObject metaObject) {
// 获取登录信息
- /*String userName = JwtTokenUtils.getUsername();
+ String userName = SecurityUtils.getUsername();
if (StringUtils.isNotBlank(userName)) {
this.setFieldValByName("createBy", userName, metaObject);
this.setFieldValByName("updateBy", userName, metaObject);
} else {
this.setFieldValByName("createBy", "", metaObject);
this.setFieldValByName("updateBy", "", metaObject);
- }*/
+ }
}
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/ProcessCategoryEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/ProcessCategoryEnum.java
index 0b27e26..5aef891 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/ProcessCategoryEnum.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/ProcessCategoryEnum.java
@@ -13,9 +13,9 @@
@AllArgsConstructor
public enum ProcessCategoryEnum {
CATEGORY0(0, "错误分类"),
- CATEGORY1(1, "入户调查"),
- CATEGORY2(2, "价格评估"),
- CATEGORY3(3, "协议签订"),
+ CATEGORY1(1, "合同新增审批"),
+ CATEGORY2(2, "合同签订审批"),
+ CATEGORY3(3, "合同提前终止审批"),
;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemTypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemTypeMapper.java
index 3edc837..7ded449 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemTypeMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemTypeMapper.java
@@ -27,7 +27,7 @@
*/
List<TItemType> pageList(@Param("query") TItemTypeQuery query, @Param("pageInfo")PageInfo<TItemType> pageInfo);
- List<TItemTypeVO> getItemList();
+ List<TItemTypeVO> getItemList(@Param("itemName") String itemName);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
index 63dec62..12c8605 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
@@ -44,12 +44,12 @@
private String contractName;
@ApiModelProperty(value = "开始时间")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("start_time")
private LocalDateTime startTime;
@ApiModelProperty(value = "结束时间")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("end_time")
private LocalDateTime endTime;
@ApiModelProperty(value = "开始计费时间")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TFaultRepairMessageAppletQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TFaultRepairMessageAppletQuery.java
index a7a772c..aa43d32 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TFaultRepairMessageAppletQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TFaultRepairMessageAppletQuery.java
@@ -11,4 +11,6 @@
@ApiModelProperty(value = "房屋地址")
private String houseAddress;
+ @ApiModelProperty(value = "处理状态 1=待处理 2=已处理")
+ private Integer status;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TItemTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TItemTypeService.java
index 14ee3d1..3b8af03 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TItemTypeService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TItemTypeService.java
@@ -32,5 +32,5 @@
*/
PageInfo<TItemType> pageList(TItemTypeQuery query);
- List<TItemTypeVO> getItemList();
+ List<TItemTypeVO> getItemList(String itemName);
}
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 b144e21..598a8a1 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
@@ -249,7 +249,9 @@
//监听器参数补全
processStartBO.getVariable().put("category", processStartBO.getCategory());
// 开启流程
- flowLongEngine.startInstanceById(flwProcess.getId(), creator, processStartBO.getVariable()).ifPresent(instance -> {
+ Optional<FlwInstance> flwInstanceOptional = flowLongEngine.startInstanceById(flwProcess.getId(), creator, processStartBO.getVariable());
+ if(flwInstanceOptional.isPresent()){
+ FlwInstance instance = flwInstanceOptional.get();
//存储任务中心信息
StateTaskCenter stateTaskCenter = new StateTaskCenter();
stateTaskCenter.setId(IdUtils.simpleUUID());
@@ -279,7 +281,7 @@
//保存version
stateProcessExtInstance.setProcessVersion(flwProcess.getProcessVersion());
stateProcessExtInstanceService.save(stateProcessExtInstance);
- });
+ }
return true;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemTypeServiceImpl.java
index d579295..be72660 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemTypeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemTypeServiceImpl.java
@@ -46,7 +46,7 @@
}
@Override
- public List<TItemTypeVO> getItemList() {
- return this.baseMapper.getItemList();
+ public List<TItemTypeVO> getItemList(String itemName) {
+ return this.baseMapper.getItemList(itemName);
}
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml
index f39bab5..217157a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml
@@ -167,7 +167,10 @@
LEFT JOIN t_tenant tnt ON t.tenant_id = tnt.id
<where>
<if test="query.houseAddress != null and query.houseAddress != ''">
- AND tnt.service_address LIKE CONCAT('%', #{query.houseAddress}, '%')
+ AND t.service_address LIKE CONCAT('%', #{query.houseAddress}, '%')
+ </if>
+ <if test="query.status != null">
+ AND t.status = #{query.status}
</if>
AND t.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TItemTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TItemTypeMapper.xml
index 4f0c44e..c92258e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TItemTypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TItemTypeMapper.xml
@@ -26,11 +26,19 @@
ORDER BY sort_by,create_time DESC
</select>
<select id="getItemList" resultType="com.ruoyi.system.vo.TItemTypeVO">
- select
- <include refid="Base_Column_List"/>
+ select <include refid="Base_Column_List"></include>
from t_item_type
- where disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
- ORDER BY sort_by,create_time DESC
+ where id in (
+ select
+ tit.id
+ from t_item_type tit
+ left join t_item ti on tit.id = ti.type_id
+ where tit.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ <if test="itemName != null and itemName != ''">
+ and ti.item_name like concat('%', #{itemName}, '%')
+ </if>
+ GROUP BY tit.id
+ ORDER BY tit.sort_by,tit.create_time DESC)
</select>
</mapper>
--
Gitblit v1.7.1