Commit bff41acc authored by fangxinjiang's avatar fangxinjiang

优化-fxj

parent 3557078b
...@@ -42,7 +42,6 @@ import org.springframework.web.bind.annotation.*; ...@@ -42,7 +42,6 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.Date;
import java.util.List; import java.util.List;
...@@ -206,23 +205,11 @@ public class SysBaseSetInfoController { ...@@ -206,23 +205,11 @@ public class SysBaseSetInfoController {
@PostMapping("/inner/getSocialHouseBaseSet") @PostMapping("/inner/getSocialHouseBaseSet")
public SysBaseSetInfoVo getSocialHouseBaseSet(@RequestBody String houseId) { public SysBaseSetInfoVo getSocialHouseBaseSet(@RequestBody String houseId) {
SysBaseSetInfo baseSetInfo = sysBaseSetInfoService.getById(houseId); SysBaseSetInfo baseSetInfo = sysBaseSetInfoService.getById(houseId);
SysBaseSetInfo baseSetLast;
SysBaseSetInfoVo sysBaseSetInfoVo = new SysBaseSetInfoVo();
if (null != baseSetInfo && CommonConstants.ONE_STRING.equals(baseSetInfo.getBaseType())){ if (null != baseSetInfo && CommonConstants.ONE_STRING.equals(baseSetInfo.getBaseType())){
Date date = new Date(); baseSetInfo.setFundProList(sysPayProportionService.list(Wrappers.<SysPayProportion>query().lambda().eq(SysPayProportion::getSysBaseSetId,houseId)));
baseSetLast = sysBaseSetInfoService.getOne(Wrappers.<SysBaseSetInfo>query().lambda()
.eq(SysBaseSetInfo::getDepartName,baseSetInfo.getDepartName())
.eq(SysBaseSetInfo::getBaseType,baseSetInfo.getBaseType())
.eq(SysBaseSetInfo::getDeleteFlag,CommonConstants.ZERO_STRING)
.eq(SysBaseSetInfo::getStatus,CommonConstants.ZERO_STRING)
.ge(SysBaseSetInfo::getApplyStartDate,date)
.and(obj->obj.le(SysBaseSetInfo::getApplyEndDate,date).or(obj1->obj1.isNull(SysBaseSetInfo::getApplyEndDate)))
);
if (null != baseSetLast){
baseSetLast.setFundProList(sysPayProportionService.list(Wrappers.<SysPayProportion>query().lambda().eq(SysPayProportion::getSysBaseSetId,baseSetLast.getId())));
BeanCopyUtils.copyProperties(baseSetLast,sysBaseSetInfoVo);
}
} }
SysBaseSetInfoVo sysBaseSetInfoVo = new SysBaseSetInfoVo();
BeanCopyUtils.copyProperties(baseSetInfo,sysBaseSetInfoVo);
return sysBaseSetInfoVo; return sysBaseSetInfoVo;
} }
/** /**
......
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