feige
2023-09-16 d29cce61fb3a38f9f57a64a2a20d276b0d1254bc
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -16,6 +16,7 @@
import com.ruoyi.service.IZfPropertyService;
import com.ruoyi.service.ZAuthorityService;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfLogService;
import com.ruoyi.util.ArraysUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -25,6 +26,7 @@
import javax.annotation.Resource;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -48,6 +50,9 @@
    @Resource
    ZAuthorityService zAuthorityService;
    @Resource
    ZfPropertyMapper zfPropertyMapper;
//    private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) {
@@ -77,7 +82,6 @@
                .in(ZfProperty::getFamilyId,familyIdList)
                .eq(zfProperty.getHappenTime()!=null,ZfProperty::getHappenTime,zfProperty.getHappenTime())
                .between(zfProperty.getHappenStartTime() != null && zfProperty.getHappenEndTime() != null, ZfProperty::getHappenTime, zfProperty.getHappenStartTime(), zfProperty.getHappenEndTime());
        lqw.orderByDesc(ZfProperty::getCreateTime);
        return lqw;
@@ -275,7 +279,7 @@
                        bean.setOwnData(0);
                    }
                }
        ).collect(Collectors.toList());
        ).sorted((a,b)-> b.getOwnData()-a.getOwnData()).collect(Collectors.toList());
    }
    @Override
@@ -380,6 +384,9 @@
        }
    }
    @Resource
    ZfLogService zfLogService;
    @Override
    public AjaxResult updateData(ZfProperty zfProperty) {
        ZInfoUser myself = zInfoUserService.getMyself();
@@ -395,6 +402,13 @@
        if (dataFamilyId!=null && !familyIdList.contains(dataFamilyId)) {
            throw new RuntimeException("你没有权限操作此家庭的数据");
        }
        //操作后加入日志
        ZfLog zfLog = new ZfLog();
        zfLog.setUpdateTime(LocalDateTime.now());
        zfLog.setModule("家庭资产");
        zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
        zfLogService.save(zfLog);
        if(updateById(zfProperty)){
            return AjaxResult.success();
@@ -499,6 +513,12 @@
    }
    @Override
    public AjaxResult listType() {
        List<String> result = zfPropertyMapper.listType();
        return AjaxResult.success(result);
    }
}