From 23c4967b4cb8dbce8277f830f7152d315c5a4a57 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期一, 25 十二月 2023 09:25:17 +0800
Subject: [PATCH] 12.25
---
guns-management/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/guns-management/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java b/guns-management/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java
index e7e0b8c..a4ea430 100644
--- a/guns-management/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java
+++ b/guns-management/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java
@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.HouseResourceMapper;
import com.stylefeng.guns.modular.system.dto.THouseResource;
@@ -31,10 +32,7 @@
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -343,12 +341,17 @@
houseResource.setStatus(1);
houseResource.setLeaseTime(req.getTime());
houseResource.setFirmHouse(req.getFirmHouse());
- if (req.getTime().contains("年")){
- houseResource.setRentalDuration(2);
- }else{
- houseResource.setRentalDuration(1);
+ houseResource.setAuthTime(new Date());
+ if (req.getDataType()==1) {
+ if (req.getTime().contains("年")) {
+ houseResource.setRentalDuration(2);
+ } else {
+ houseResource.setRentalDuration(1);
+ }
}
houseResource.setIsManage(1);
+ houseResource.setAppUserId(Objects.requireNonNull(ShiroKit.getUser()).id);
+ houseResource.setInsertUserId(Objects.requireNonNull(ShiroKit.getUser()).id);
this.baseMapper.insert(houseResource);
return ResultUtil.success("添加成功");
@@ -358,11 +361,13 @@
public ResultUtil editHouse(AddHouseReq req) {
HouseResource houseResource = new HouseResource();
BeanUtils.copyProperties(req,houseResource);
+ if (req.getDataType()==1) {
- if (req.getTime().contains("年")){
- houseResource.setRentalDuration(2);
- }else{
- houseResource.setRentalDuration(1);
+ if (req.getTime().contains("年")) {
+ houseResource.setRentalDuration(2);
+ } else {
+ houseResource.setRentalDuration(1);
+ }
}
this.baseMapper.updateById(houseResource);
return ResultUtil.success("编辑成功");
--
Gitblit v1.7.1