Skip to content

A
amos-boot-biz
Commit 8f5411ee authored by chenzhao's avatar chenzhao
Browse files
Options

修改 户用bug

parent ca1ccb4e
Hide whitespace changes
Inline Side-by-side
Showing with 159 additions and 49 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/UserEmpowerInterceptor.java
View file @ 8f5411ee
......@@ -163,23 +163,20 @@ public class UserEmpowerInterceptor implements Interceptor {
//获取参数值，
StdUserEmpower dataAuthRule =(StdUserEmpower) redisUtils.get("Emp_"+RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
String[] data = new String[]{String.join(",",dataAuthRule.getAmosOrgCode()),dataAuthRule.getRegionalCompaniesCode(),dataAuthRule.getUserId(),dataAuthRule.getAdminRegionalCompaniesCode()};
String[] data = new String[]{String.join(",",dataAuthRule.getAmosOrgCode()),dataAuthRule.getAdminRegionalCompaniesCode(),dataAuthRule.getUserId(),dataAuthRule.getRegionalCompaniesCode()};
List<String> list = new ArrayList<>(Arrays.asList(data));
list.removeAll(Collections.singleton(null));
List<String> sq ;
//获取sql
List<String> fileds = Arrays.asList(filed);
if (!ValidationUtil.isEmpty(dataAuthRule.getAdminRegionalCompaniesCode())) {
if (!ValidationUtil.isEmpty(dataAuthRule.getAdminRegionalCompaniesCode()) && fileds.size() >1) {
sq = selectSqlJXS(new String[]{fileds.get(0), fileds.get(1)}, fileCondition, list);
} else if (!ValidationUtil.isEmpty(dataAuthRule.getUserId())) {
list.remove(1);
sq = selectSqlJXS(new String[]{fileds.get(0),fileds.size()<3?fileds.get(0):fileds.get(2)},new String[]{fileCondition[0],fileCondition[2]} , list);
} else {
sq = selectSqlJXS(new String[]{fileds.get(0), fileds.get(1)}, fileCondition, list);
sq = selectSqlJXS(new String[]{fileds.get(0)}, fileCondition, list);
}
String sqldata = " ";
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/UserLimitsAdvice.java
View file @ 8f5411ee
......@@ -16,6 +16,7 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.UserEmpowerMapper;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
......@@ -34,7 +35,7 @@ import java.util.stream.Collectors;
* @createDate: 2023/11/9
*/
@Aspect
@Order(-1)// 保证该AOP在@Transactional之前执行
@Order(0)// 保证该AOP在@Transactional之前执行
@Component
@Slf4j
public class UserLimitsAdvice {
......@@ -76,7 +77,11 @@ public class UserLimitsAdvice {
stdUserEmpower.setDeveloperId(userUnitInformationDto!=null?userUnitInformationDto.getAmosUnitInfoId():null);
stdUserEmpower.setRegionalCompaniesCode(userUnitInformationDto!=null?userUnitInformationDto.getRegionalCompaniesCode():null);
stdUserEmpower.setAmosOrgCode(Arrays.asList(userUnitInformationDto.getAmosUnitOrgCode()));
if (org.contains(ROLEFLAGADMIN)){
int num = StringUtils.countMatches(org, ROLEFLAG);
if (org.contains(ROLEFLDEVELOP) && num<2 ){
stdUserEmpower.setUserId(userid);
}
else if (org.contains(ROLEFLAGADMIN)){
LambdaQueryWrapper<RegionalCompanies> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(RegionalCompanies::getUnitInfoId,userUnitInformationDto!=null?userUnitInformationDto.getAmosUnitInfoId():null);
queryWrapper.eq(BaseEntity::getIsDelete,0);
......@@ -85,8 +90,9 @@ public class UserLimitsAdvice {
List<String> regionalCompaniesCodes = regionalCompanies.stream().map(RegionalCompanies::getRegionalCompaniesCode).collect(Collectors.toList());
stdUserEmpower.setAdminRegionalCompaniesCode(String.join(",",regionalCompaniesCodes));
}
}else if (org.contains(ROLEFLDEVELOP)){
stdUserEmpower.setUserId(userid);
} else {
stdUserEmpower.setAdminRegionalCompaniesCode(stdUserEmpower.getRegionalCompaniesCode());
}
}else if(org.contains(FARMER)){
//农户暂不做需求
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PreparationDto.java 0 → 100644
View file @ 8f5411ee
package com.yeejoin.amos.boot.module.hygf.api.dto;
import lombok.Data;
import java.util.List;
@Data
public class PreparationDto {
String orderBy;
Boolean isASC;
String consigneeRegion;//订单区域
String amosUnitId;//经销商
String amosUnitName;//经销商
String oddNumbers;//发货单号
String regionalCompaniesCode;
String arrivalState;//收货
String deliveryState;//发货状态 未发货已发货
List<String> deliveryTime;
String deliveryTimeStart;
String deliveryTimeEnd;
String flag ;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PreparationPageDto.java
View file @ 8f5411ee
......@@ -26,6 +26,8 @@ public class PreparationPageDto extends Page<PreparationMoney> {
String arrivalState;//收货
String deliveryState;//发货状态 未发货已发货
List<String> deliveryTime;
String deliveryTimeStart;
String deliveryTimeEnd;
String flag ;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PeasantHousehold.java
View file @ 8f5411ee
......@@ -194,4 +194,13 @@ public class PeasantHousehold extends BaseEntity {
*/
@TableField("construction_state")
private String constructionState;
@TableField(exist = false)
private String surveyOrNotText;
@TableField(exist = false,typeHandler = FastjsonTypeHandler.class)
private List<String> permanentAddressText;
@TableField(exist = false,typeHandler = FastjsonTypeHandler.class)
private List<String> projectAddressText;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PeasantHouseholdMapper.java
View file @ 8f5411ee
......@@ -16,6 +16,7 @@ import java.util.List;
* @date 2023-07-07
*/
public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
@UserEmpower(field={},dealerField={"developer_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<PeasantHousehold> selectPeasantHouseholdList(@Param("developerId") Long developerId,
@Param("regionalCompaniesSeq")Long regionalCompaniesSeq,
@Param("peasantHouseholdNo")String peasantHouseholdNo,
......@@ -30,6 +31,6 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
);
@UserEmpower(field={},dealerField={"developer_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"eq","in","eq"} ,relationship="and")
Page<PeasantHouseholdDto> queryForPage(Page<PeasantHouseholdDto> page, String developerCode,String ownersName,Long developerId,Integer isCertified);
List<PeasantHousehold> queryForPage( String developerCode,String ownersName,Long developerId,Integer isCertified);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PreparationMoneyMapper.java
View file @ 8f5411ee
......@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationPageDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
import org.apache.ibatis.annotations.Param;
......@@ -22,7 +24,8 @@ public interface PreparationMoneyMapper extends BaseMapper<PreparationMoney> {
List<PeasantHousehold> getPeasantHouseholdData(@Param("sequenceNbr") Long sequenceNbr,@Param("ownersName") String ownersName);
@UserEmpower(field ={"regional_companies_code"} ,dealerField={"amos_unit_org_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
IPage<PreparationMoney> selectPage(IPage<PreparationMoney> page, @Param(Constants.WRAPPER) Wrapper<PreparationMoney> queryWrapper);
List<PreparationMoney> selectPageList(@Param(value = "dto") PreparationDto preparationDto);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/UnitInfoMapper.java
View file @ 8f5411ee
......@@ -26,7 +26,9 @@ public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
List< Map<String,Object>> getuserList(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
List< Map<String,Object>> getuserListtelephone(@Param("userName") String userName,@Param("role") Long role,@Param("regionalCompaniesSeq") Long regionalCompaniesSeq,@Param("amosUnitId") Long amosUnitId);
@UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,dealerField ={"hygf_unit_info.amos_company_code","hygf_regional_companies.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
@UserEmpower(field ={"hygf_unit_info.regional_companies_code"} ,dealerField ={"hygf_unit_info.amos_company_code","hygf_unit_info.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<UnitInfo> getlistUnitInfo();
@UserEmpower(field ={"hygf_unit_info.regional_companies_code"} ,dealerField ={"hygf_unit_info.amos_company_code","hygf_unit_info.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
UnitInfo selectById( Long unitInfoId);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PeasantHouseholdMapper.xml
View file @ 8f5411ee
......@@ -51,12 +51,12 @@ and hygf_document_station.station_id is not null
</if>
</select>
<select id="queryForPage" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto">
<select id="queryForPage" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold">
SELECT *
FROM hygf_peasant_household
WHERE IS_CERTIFIED = #{isCertified}
<if test="ownersName!=null and ownersName !=''">
and owners_name like #{ownersName}
and owners_name like concat ('%',#{ownersName},'%')
</if>
<if test="developerId!=null and developerId !=''">
and developer_id = #{developerId}
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PreparationMoneyMapper.xml
View file @ 8f5411ee
......@@ -11,4 +11,32 @@ LEFT JOIN hygf_document_station on hygf_document_station.station_id=hygf_peasan
</if>
</select>
<select id="selectPageList" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney">
SELECT * FROM hygf_preparation_money
<where>
<if test="dto.consigneeRegion != null and dto.consigneeRegion != ''">
and hygf_preparation_money.consignee_region like concat ('%',#{dto.consigneeRegion},'%')
</if>
<if test="dto.amosUnitName != null and dto.amosUnitName != ''">
and hygf_preparation_money.amos_unit_name like concat ('%',#{dto.amosUnitName},'%')
</if>
<if test="dto.oddNumbers != null and dto.oddNumbers != ''">
and hygf_preparation_money.odd_numbers = #{dto.oddNumbers}
</if>
<if test="dto.deliveryState != null and dto.deliveryState != ''">
and hygf_preparation_money.delivery_state = #{dto.deliveryState}
</if>
<if test="dto.amosUnitId != null and dto.amosUnitId != ''">
and hygf_preparation_money.amos_unit_id = #{dto.amosUnitId}
</if>
<if test="dto.flag != null and dto.flag != ''">
and hygf_preparation_money.delivery_state != "已作废"
</if>
<if test="dto.deliveryTimeStart != null and dto.deliveryTimeEnd != ''">
and hygf_preparation_money.delivery_time between #{dto.deliveryTimeStart} and #{dto.deliveryTimeEnd}
</if>
</where>
ORDER BY order_time DESC
</select>
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpInverterController.java
View file @ 8f5411ee
......@@ -302,7 +302,7 @@ public class JpInverterController extends BaseController {
List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
if(StringUtils.isEmpty(dataDto.getTime())){
dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM-dd"));
dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM"));
}
// List<String> dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
......@@ -316,7 +316,7 @@ public class JpInverterController extends BaseController {
List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
if(StringUtils.isEmpty(dataDto.getTime())){
dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM-dd"));
dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM"));
}
// List<String> dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
List<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGenerates =jpInverterServiceImpl.jpInverterMonthReportExport(dataDto.getTime(),dataDto.getSnCodes(),stationIds);
......@@ -337,7 +337,7 @@ public class JpInverterController extends BaseController {
List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
if(StringUtils.isEmpty(dataDto.getTime())){
dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM-dd"));
dataDto.setTime(DateUtil.format(new Date(),"yyyy"));
}
// List<String> dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
......@@ -351,7 +351,7 @@ public class JpInverterController extends BaseController {
List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
if(StringUtils.isEmpty(dataDto.getTime())){
dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM-dd"));
dataDto.setTime(DateUtil.format(new Date(),"yyyy"));
}
// List<String> dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
List<TdHYGFInverterYearGenerate> tdHYGFInverterYearGenerates =jpInverterServiceImpl.jpInverterYearReportExport(dataDto.getTime(),dataDto.getSnCodes(),stationIds);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java
View file @ 8f5411ee
package com.yeejoin.amos.boot.module.hygf.biz.controller;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.hygf.api.config.DealerRestrict;
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PeasantHouseholdController.java
View file @ 8f5411ee
......@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.SurveyInformationDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PeasantHouseholdServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.SurveyInformationServiceImpl;
......@@ -204,11 +205,11 @@ public class PeasantHouseholdController extends BaseController {
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "农户信息分页查询", notes = "农户信息分页查询")
@UserLimits()
public ResponseModel<Page<PeasantHouseholdDto>> queryForPage(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
@RequestParam(value = "ownersName",required = false)String ownersName,
@RequestParam(value = "developerId",required = false)Long developerId) {
Page<PeasantHouseholdDto> page = new Page<PeasantHouseholdDto>();
public ResponseModel<Page<PeasantHousehold>> queryForPage(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
@RequestParam(value = "ownersName",required = false)String ownersName,
@RequestParam(value = "developerId",required = false)Long developerId) {
Page<PeasantHousehold> page = new Page<PeasantHousehold>();
page.setCurrent(current);
page.setSize(size);
AgencyUserModel userInfo = getUserInfo();
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java
View file @ 8f5411ee
......@@ -764,6 +764,7 @@ public class UnitInfoController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getPeasantHouseholdData")
@UserLimits
public ResponseModel<Page<PeasantHousehold>> getPeasantHouseholdData(
@RequestParam(required=false) Long unitInfoId,
@RequestParam(required=false) Long regionalCompaniesSeq,
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpStationServiceImpl.java
View file @ 8f5411ee
......@@ -21,6 +21,7 @@ import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.YearGenerateMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
......@@ -409,6 +410,9 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
if(dataJpStation!=null&&dataJpStation.size()>0){
switch (type){
case"day":
if (StringUtils.isEmpty(reviewDto.getTimeDate())){
reviewDto.setTimeDate(DateUtil.format(new Date(),"yyyy-MM-dd"));
}
LambdaQueryWrapper<DayGenerate> wapper = new LambdaQueryWrapper<DayGenerate>();
wapper.in(DayGenerate::getThirdStationId,reviewDto.getThirdStationIds());
wapper.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),DayGenerate::getDayTime,reviewDto.getTimeDate());
......@@ -417,6 +421,9 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
list = getJpStationDtoday( dataJpStation, listday);
break;
case"month":
if (StringUtils.isEmpty(reviewDto.getTimeDate())){
reviewDto.setTimeDate(DateUtil.format(new Date(),"yyyy-MM"));
}
LambdaQueryWrapper<MonthGenerate> wapper1 = new LambdaQueryWrapper<MonthGenerate>();
wapper1.in(MonthGenerate::getThirdStationId,reviewDto.getThirdStationIds());
wapper1.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),MonthGenerate::getMonthTime,reviewDto.getTimeDate());
......@@ -426,6 +433,9 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
list = getJpStationDtomonth( dataJpStation, listmonth);
break;
case"year":
if (StringUtils.isEmpty(reviewDto.getTimeDate())){
reviewDto.setTimeDate(DateUtil.format(new Date(),"yyyy"));
}
LambdaQueryWrapper<YearGenerate> wapper2 = new LambdaQueryWrapper<YearGenerate>();
wapper2.in(YearGenerate::getThirdStationId,reviewDto.getThirdStationIds());
wapper2.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),YearGenerate::getYear,reviewDto.getTimeDate());
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java
View file @ 8f5411ee
......@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.PhoneRegisterTypeEum;
......@@ -108,6 +110,9 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
CommercialServiceImpl commercialService;
@Autowired
PeasantHouseholdMapper peasantHouseholdMapper;
@Autowired
SurveyInformationServiceImpl surveyInformationServiceImpl;
@Autowired
......@@ -222,10 +227,16 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
* 分页查询
*/
public Page<PeasantHouseholdDto> queryForPeasantHouseholdPage(Page<PeasantHouseholdDto> page,String developerCode, String ownersName,Long developerId, Integer isCertified) {
Page<PeasantHouseholdDto> peasantHouseholdDtoPage = this.getBaseMapper().queryForPage(page, developerCode,ownersName,developerId, isCertified);
List<PeasantHouseholdDto> records = peasantHouseholdDtoPage.getRecords();
List<PeasantHouseholdDto> newRecords = records.stream().map(item -> {
public Page<PeasantHousehold> queryForPeasantHouseholdPage(Page<PeasantHousehold> page,String developerCode, String ownersName,Long developerId, Integer isCertified) {
int current = (int)page.getCurrent();
int size = (int)page.getSize();
PageHelper.startPage(current,size);
List<PeasantHousehold> records = peasantHouseholdMapper.queryForPage( developerCode,ownersName,developerId, isCertified);
PageInfo<PeasantHousehold> objectPageInfo = new PageInfo<PeasantHousehold>(records);
List<PeasantHousehold> newRecords = records.stream().map(item -> {
if(item.getSurveyOrNot() != null){
if (item.getSurveyOrNot() == 0) {
item.setSurveyOrNotText("待勘察");
......@@ -250,8 +261,13 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
return item;
}).collect(Collectors.toList());
peasantHouseholdDtoPage.setRecords(newRecords);
return peasantHouseholdDtoPage;
Page<PeasantHousehold> pagenew = new Page<PeasantHousehold>();
pagenew.setCurrent(current);
pagenew.setTotal(objectPageInfo.getTotal());
pagenew.setSize(size);
pagenew.setRecords(newRecords);
return pagenew;
}
/**
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java
View file @ 8f5411ee
......@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
......@@ -13,10 +16,7 @@ import com.yeejoin.amos.boot.module.hygf.api.Enum.DeliveryStateeEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.PreparationEnum;
import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationMoneyDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationMoneyLogDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationPageDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.*;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
import com.yeejoin.amos.boot.module.hygf.api.service.IPreparationMoneyService;
......@@ -84,26 +84,33 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
public IPage<PreparationMoney> queryForPreparationMoneyPage(PreparationPageDto dto) {
//列表数据组装
LambdaQueryWrapper<PreparationMoney> qw = new LambdaQueryWrapper<>();
// LambdaQueryWrapper<PreparationMoney> qw = new LambdaQueryWrapper<>();
DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
qw.like(StringUtils.isNotEmpty(dto.getConsigneeRegion()), PreparationMoney::getConsigneeRegion, dto.getConsigneeRegion());
qw.like(StringUtils.isNotEmpty(dto.getAmosUnitName()), PreparationMoney::getAmosUnitName, dto.getAmosUnitName());
qw.like(StringUtils.isNotEmpty(dto.getOddNumbers()), PreparationMoney::getOddNumbers, dto.getOddNumbers());
qw.eq(StringUtils.isNotEmpty(dto.getDeliveryState()), PreparationMoney::getDeliveryState, dto.getDeliveryState());
qw.eq(StringUtils.isNotEmpty(dto.getAmosUnitId()), PreparationMoney::getAmosUnitId, dto.getAmosUnitId());
qw.ne(StringUtils.isNotEmpty(dto.getFlag()),PreparationMoney::getDeliveryState,DeliveryStateeEnum.已作废.getCode());
qw.ne(StringUtils.isNotEmpty(dto.getFlag()),PreparationMoney::getDeliveryState,DeliveryStateeEnum.待发货.getCode());
// qw.like(StringUtils.isNotEmpty(dto.getConsigneeRegion()), PreparationMoney::getConsigneeRegion, dto.getConsigneeRegion());
// qw.like(StringUtils.isNotEmpty(dto.getAmosUnitName()), PreparationMoney::getAmosUnitName, dto.getAmosUnitName());
// qw.like(StringUtils.isNotEmpty(dto.getOddNumbers()), PreparationMoney::getOddNumbers, dto.getOddNumbers());
// qw.eq(StringUtils.isNotEmpty(dto.getDeliveryState()), PreparationMoney::getDeliveryState, dto.getDeliveryState());
// qw.eq(StringUtils.isNotEmpty(dto.getAmosUnitId()), PreparationMoney::getAmosUnitId, dto.getAmosUnitId());
// qw.ne(StringUtils.isNotEmpty(dto.getFlag()),PreparationMoney::getDeliveryState,DeliveryStateeEnum.已作废.getCode());
if(dto.getDeliveryTime()!=null&&!dto.getDeliveryTime().get(0).equals("")){
qw.between(dto.getDeliveryTime()!=null, PreparationMoney::getDeliveryTime, dto.getDeliveryTime().get(0), dto.getDeliveryTime().get(1));
// qw.between(dto.getDeliveryTime()!=null, PreparationMoney::getDeliveryTime, dto.getDeliveryTime().get(0), dto.getDeliveryTime().get(1));
dto.setDeliveryTimeStart(dto.getDeliveryTime().get(0));
dto.setDeliveryTimeEnd(dto.getDeliveryTime().get(1));
}
qw.orderBy(Boolean.TRUE, Boolean.FALSE, PreparationMoney::getOrderTime);
IPage<PreparationMoney> warningQuestionInfoIPage = preparationMoneyMapper.selectPage(dto, qw);
return warningQuestionInfoIPage;
// qw.orderBy(Boolean.TRUE, Boolean.FALSE, PreparationMoney::getOrderTime);
PreparationDto preparationDto = new PreparationDto();
BeanUtils.copyProperties(dto,preparationDto);
PageHelper.startPage((int)dto.getCurrent(),(int)dto.getSize());
List<PreparationMoney> list = preparationMoneyMapper.selectPageList(preparationDto);
PageInfo<PreparationMoney> page = new PageInfo(list);
Page<PreparationMoney> pagenew = new Page<PreparationMoney>();
pagenew.setCurrent(page.getPageNum());
pagenew.setTotal(page.getTotal());
pagenew.setSize(page.getSize());
pagenew.setRecords(page.getList());
return pagenew;
}
/**
......
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