Skip to content

A
amos-boot-biz
Commit 8b7cf6c4 authored by tangwei's avatar tangwei
Browse files
Options

新增备货管理

parent fe3b967a
Show whitespace changes
Inline Side-by-side
Showing with 196 additions and 35 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/PreparationEnum.java
View file @ 8b7cf6c4
...@@ -19,6 +19,8 @@ public enum PreparationEnum { ...@@ -19,6 +19,8 @@ public enum PreparationEnum {
确认收货("确认收货", "确认收货"), 确认收货("确认收货", "确认收货"),
编辑货单("编辑货单", "编辑货单"),
作废发货单("作废发货单", "作废发货单"); 作废发货单("作废发货单", "作废发货单");
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/DocumentStationDto.java
View file @ 8b7cf6c4
package com.yeejoin.amos.boot.module.hygf.api.dto; package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
...@@ -26,5 +27,22 @@ public class DocumentStationDto extends BaseDto { ...@@ -26,5 +27,22 @@ public class DocumentStationDto extends BaseDto {
@ApiModelProperty(value = " 场站id") @ApiModelProperty(value = " 场站id")
private Long stationId; private Long stationId;
/**
* 农户信息编号
*/
private String peasantHouseholdNo;
/**
* 业主姓名
*/
private String ownersName;
/**
* 开发方名称
*/
private String developerName;
/**
* 项目地址
*/
private String projectAddressName;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UserUnitInformationDto.java
View file @ 8b7cf6c4
...@@ -35,4 +35,7 @@ public class UserUnitInformationDto { ...@@ -35,4 +35,7 @@ public class UserUnitInformationDto {
private String amosDealerName; private String amosDealerName;
@ApiModelProperty(value = "平台经销商单位orgcode") @ApiModelProperty(value = "平台经销商单位orgcode")
private String amosDealerOrgCode; private String amosDealerOrgCode;
@ApiModelProperty(value = "经销商单位id")
private Long amosUnitInfoId;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/DocumentStation.java
View file @ 8b7cf6c4
...@@ -33,5 +33,26 @@ public class DocumentStation extends BaseEntity { ...@@ -33,5 +33,26 @@ public class DocumentStation extends BaseEntity {
*/ */
@TableField("station_id") @TableField("station_id")
private Long stationId; private Long stationId;
/**
* 农户信息编号
*/
@TableField("peasant_household_no")
private String peasantHouseholdNo;
/**
* 业主姓名
*/
@TableField("owners_name")
private String ownersName;
/**
* 开发方名称
*/
@TableField("developer_name")
private String developerName;
/**
* 项目地址
*/
@TableField("project_address_name")
private String projectAddressName;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PeasantHousehold.java
View file @ 8b7cf6c4
package com.yeejoin.amos.boot.module.hygf.api.entity; package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
...@@ -183,4 +185,7 @@ public class PeasantHousehold extends BaseEntity { ...@@ -183,4 +185,7 @@ public class PeasantHousehold extends BaseEntity {
* */ * */
@TableField("amos_user_id") @TableField("amos_user_id")
private String amosUserId; private String amosUserId;
@TableField(exist = false)
protected Long stationId;
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PreparationMoney.java
View file @ 8b7cf6c4
...@@ -143,9 +143,11 @@ public class PreparationMoney extends BaseEntity { ...@@ -143,9 +143,11 @@ public class PreparationMoney extends BaseEntity {
@TableField(value = "arrival_file", typeHandler = FastjsonTypeHandler.class) @TableField(value = "arrival_file", typeHandler = FastjsonTypeHandler.class)
private List<Object> arrivalFile; //收货单 private List<Object> arrivalFile; //收货单
@TableField(value = "peasant_household_id", typeHandler = FastjsonTypeHandler.class) @TableField(exist = false)
private List<Long> peasantHouseholdId; //发货单 private List<DocumentStation> peasantHouseholdId; //发货单
@TableField(exist = false)
private List<PreparationMoneyLog> preparationMoneyLog; //发货单流水
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PeasantHouseholdMapper.java
View file @ 8b7cf6c4
...@@ -14,6 +14,8 @@ import java.util.List; ...@@ -14,6 +14,8 @@ import java.util.List;
*/ */
public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> { public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
List<PeasantHousehold> selectPeasantHouseholdList(@Param("developerId") Long developerId, List<PeasantHousehold> selectPeasantHouseholdList(@Param("developerId") Long developerId,
@Param("regionalCompaniesSeq")Long regionalCompaniesSeq @Param("regionalCompaniesSeq")Long regionalCompaniesSeq,
@Param("peasantHouseholdNo")String peasantHouseholdNo,
@Param("ownersName")String ownersName
); );
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PeasantHouseholdMapper.xml
View file @ 8b7cf6c4
...@@ -3,12 +3,19 @@ ...@@ -3,12 +3,19 @@
<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper"> <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper">
<select id="selectPeasantHouseholdList" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold"> <select id="selectPeasantHouseholdList" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold">
SELECT * FROM hygf_peasant_household LEFT JOIN hygf_household_contract ON hygf_household_contract.peasant_household_id=hygf_peasant_household.sequence_nbr where SELECT *,
hygf_peasant_household.sequence_nbr stationId
FROM hygf_peasant_household LEFT JOIN hygf_household_contract ON hygf_household_contract.peasant_household_id=hygf_peasant_household.sequence_nbr where
hygf_household_contract.`status`='双方已签署' hygf_household_contract.`status`='双方已签署'
and hygf_peasant_household.developer_id=#{developerId} and hygf_peasant_household.developer_id=#{developerId}
and hygf_peasant_household.regional_companies_seq=#{regionalCompaniesSeq} and hygf_peasant_household.regional_companies_seq=#{regionalCompaniesSeq}
and hygf_peasant_household.review=2 and hygf_peasant_household.review=2
<if test="peasantHouseholdNo!=null and peasantHouseholdNo !=''">
and hygf_peasant_household.peasant_household_no like concat(concat("%",#{peasantHouseholdNo}),"%")
</if>
<if test="ownersName!=null and ownersName !='' ">
and hygf_peasant_household.owners_name like concat(concat("%",#{ownersName}),"%")
</if>
</select> </select>
</mapper> </mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PersonnelBusinessMapper.xml
View file @ 8b7cf6c4
...@@ -67,10 +67,11 @@ select ORG_CODE orgCode from privilege_company where privilege_company.SEQUEN ...@@ -67,10 +67,11 @@ select ORG_CODE orgCode from privilege_company where privilege_company.SEQUEN
hygf_personnel_business.amos_dealer_id amosDealerId , hygf_personnel_business.amos_dealer_id amosDealerId ,
privilege_company.COMPANY_NAME amosDealerName , privilege_company.COMPANY_NAME amosDealerName ,
privilege_company.ORG_CODE amosDealerOrgCode privilege_company.ORG_CODE amosDealerOrgCode,
hygf_unit_info.sequence_nbr amosUnitInfoId
FROM std_user_biz LEFT JOIN hygf_personnel_business FROM std_user_biz LEFT JOIN hygf_personnel_business
LEFT JOIN hygf_unit_info on hygf_personnel_business.amos_unit_id=hygf_unit_info.amos_company_seq
ON std_user_biz.sequence_nbr=hygf_personnel_business.foundation_id ON std_user_biz.sequence_nbr=hygf_personnel_business.foundation_id
LEFT JOIN privilege_company on privilege_company.SEQUENCE_NBR=hygf_personnel_business.amos_dealer_id LEFT JOIN privilege_company on privilege_company.SEQUENCE_NBR=hygf_personnel_business.amos_dealer_id
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PowerStationMapper.xml
View file @ 8b7cf6c4
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
and hygf_power_station.owners_name like concat(concat("%",#{ownersName}),"%") and hygf_power_station.owners_name like concat(concat("%",#{ownersName}),"%")
</if> </if>
<if test="serviceAgent!=null and serviceAgent!=''"> <if test="serviceAgent!=null and serviceAgent!=''">
and hygf_power_station.service_agent=#{service_agent} and hygf_power_station.service_agent=#{serviceAgent}
</if> </if>
) a ) a
</select> </select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PreparationMoneyController.java
View file @ 8b7cf6c4
...@@ -7,10 +7,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -7,10 +7,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.yeejoin.amos.boot.module.hygf.api.Enum.DeliveryStateeEnum; 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.Enum.PreparationEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto; import com.yeejoin.amos.boot.module.hygf.api.dto.*;
import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationPageDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.*; import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.DocumentStationMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PreparationMoneyMapper; import com.yeejoin.amos.boot.module.hygf.api.mapper.PreparationMoneyMapper;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DesignInformationServiceImpl; import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DesignInformationServiceImpl;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
...@@ -33,7 +33,6 @@ import javax.servlet.http.HttpServletRequest; ...@@ -33,7 +33,6 @@ import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationMoneyDto;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
...@@ -54,6 +53,10 @@ public class PreparationMoneyController extends BaseController { ...@@ -54,6 +53,10 @@ public class PreparationMoneyController extends BaseController {
PreparationMoneyMapper preparationMoneyMapper; PreparationMoneyMapper preparationMoneyMapper;
@Autowired @Autowired
DesignInformationServiceImpl designInformationService; DesignInformationServiceImpl designInformationService;
@Autowired
PersonnelBusinessMapper personnelBusinessMapper;
@Autowired
DocumentStationMapper documentStationMapper;
/** /**
* 新增发货单 * 新增发货单
* *
...@@ -106,9 +109,9 @@ public class PreparationMoneyController extends BaseController { ...@@ -106,9 +109,9 @@ public class PreparationMoneyController extends BaseController {
@GetMapping(value = "/{sequenceNbr}") @GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个发货单", notes = "根据sequenceNbr查询单个发货单") @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个发货单", notes = "根据sequenceNbr查询单个发货单")
public ResponseModel<PreparationMoney> selectOne(@PathVariable Long sequenceNbr) { public ResponseModel<PreparationMoney> selectOne(@PathVariable Long sequenceNbr) {
LambdaUpdateWrapper<PreparationMoney> qu=new LambdaUpdateWrapper<>();
qu.eq(PreparationMoney::getSequenceNbr,sequenceNbr); PreparationMoney preparationMoney =preparationMoneyServiceImpl.selectOnebyId(sequenceNbr);
PreparationMoney preparationMoney= preparationMoneyMapper.selectOne(qu);
return ResponseHelper.buildResponse(preparationMoney); return ResponseHelper.buildResponse(preparationMoney);
} }
...@@ -125,6 +128,15 @@ public class PreparationMoneyController extends BaseController { ...@@ -125,6 +128,15 @@ public class PreparationMoneyController extends BaseController {
public ResponseModel<IPage<PreparationMoney>> queryForPage(@RequestBody PreparationPageDto preparationPageDto public ResponseModel<IPage<PreparationMoney>> queryForPage(@RequestBody PreparationPageDto preparationPageDto
) { ) {
//获取用户所在经销商单位
AgencyUserModel userInfo = getUserInfo();
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(userInfo.getUserId());
if(userUnitInformationDto!=null&&userUnitInformationDto.getAmosDealerName()!=null){
preparationPageDto.setAmosUnitId(String.valueOf(userUnitInformationDto.getAmosUnitInfoId()));
}
return ResponseHelper.buildResponse(preparationMoneyServiceImpl.queryForPreparationMoneyPage(preparationPageDto)); return ResponseHelper.buildResponse(preparationMoneyServiceImpl.queryForPreparationMoneyPage(preparationPageDto));
} }
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java
View file @ 8b7cf6c4
...@@ -741,9 +741,12 @@ public class UnitInfoController extends BaseController { ...@@ -741,9 +741,12 @@ public class UnitInfoController extends BaseController {
public ResponseModel< List<Map<String,Object>> > getUnitInfoListData( public ResponseModel< List<Map<String,Object>> > getUnitInfoListData(
@RequestParam(required=false) Long unitInfoId, @RequestParam(required=false) Long unitInfoId,
@RequestParam(required=false) Long regionalCompaniesSeq @RequestParam(required=false) Long regionalCompaniesSeq
) { ) {
UnitInfo unitInfo=unitInfoMapper.selectById(unitInfoId); UnitInfo unitInfo=unitInfoMapper.selectById(unitInfoId);
List<PeasantHousehold> list=peasantHouseholdMapper.selectPeasantHouseholdList(unitInfo.getAmosCompanySeq(),regionalCompaniesSeq); List<PeasantHousehold> list=peasantHouseholdMapper.selectPeasantHouseholdList(unitInfo.getAmosCompanySeq(),regionalCompaniesSeq,null,null);
List<Map<String,Object>> date=new ArrayList<>(); List<Map<String,Object>> date=new ArrayList<>();
if(list!=null){ if(list!=null){
...@@ -758,5 +761,18 @@ public class UnitInfoController extends BaseController { ...@@ -758,5 +761,18 @@ public class UnitInfoController extends BaseController {
} }
return ResponseHelper.buildResponse(date); return ResponseHelper.buildResponse(date);
} }
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/getPeasantHouseholdData")
public ResponseModel<Page<PeasantHousehold>> getPeasantHouseholdData(
@RequestParam(required=false) Long unitInfoId,
@RequestParam(required=false) Long regionalCompaniesSeq,
@RequestParam(value = "current") int current,
@RequestParam (value = "size") int size,
@RequestParam (required=false) String peasantHouseholdNo,
@RequestParam (required=false) String ownersName
) {
return ResponseHelper.buildResponse(unitInfoServiceImpl.getPeasantHouseholdData( unitInfoId,regionalCompaniesSeq, current,size,peasantHouseholdNo,ownersName));
}
} }
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpInverterServiceImpl.java
View file @ 8b7cf6c4
...@@ -371,11 +371,11 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter ...@@ -371,11 +371,11 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
public Map<String,Object> jpInverterTotal(String snCode, String thirdStationId, String time, String date) { public Map<String,Object> jpInverterTotal(String snCode, String thirdStationId, String time, String date) {
if (date.equals("day")){ if (date.equals("day")){
Map<String, Object> map = tdHYGFInverterMonthGenerateMapper.selectMonthTotal(time, snCode, thirdStationId); Map<String, Object> map = tdHYGFInverterMonthGenerateMapper.selectMonthTotal(time, snCode, thirdStationId);
map.put("fullhour",String.format("%.2f",Double.valueOf(map.get("fullhour").toString()))); map.put("fullhour",String.format("%.2f",map!=null?Double.valueOf(map.get("fullhour").toString()):null));
return map; return map;
}else if (date.equals("month")){ }else if (date.equals("month")){
Map<String, Object> map = tdHYGFInverterYearGenerateMapper.selectYearTotal(time, snCode, thirdStationId); Map<String, Object> map = tdHYGFInverterYearGenerateMapper.selectYearTotal(time, snCode, thirdStationId);
map.put("fullhour",String.format("%.2f",Double.valueOf(map.get("fullhour").toString()))); map.put("fullhour",String.format("%.2f",map!=null?Double.valueOf(map.get("fullhour").toString()):null));
return map; return map;
}else if (date.equals("year")){ }else if (date.equals("year")){
List<TdHYGFInverterTotalGenerate> tdHYGFInverterTotalGenerates = tdHYGFInverterYearGenerateMapper.selectTotalSum(time, snCode, thirdStationId); List<TdHYGFInverterTotalGenerate> tdHYGFInverterTotalGenerates = tdHYGFInverterYearGenerateMapper.selectTotalSum(time, snCode, thirdStationId);
...@@ -384,7 +384,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter ...@@ -384,7 +384,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
TdHYGFInverterTotalGenerate tdHYGFInverterTotalGenerate = tdHYGFInverterTotalGenerates.get(0); TdHYGFInverterTotalGenerate tdHYGFInverterTotalGenerate = tdHYGFInverterTotalGenerates.get(0);
Map<String, Object> map = Bean.BeantoMap(tdHYGFInverterTotalGenerate); Map<String, Object> map = Bean.BeantoMap(tdHYGFInverterTotalGenerate);
map.put("fullhour",String.format("%.2f",Double.valueOf(map.get("fullhour").toString()))); map.put("fullhour",String.format("%.2f",map!=null?Double.valueOf(map.get("fullhour").toString()):null));
return map; return map;
} }
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
......
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 @ 8b7cf6c4
...@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.enums.SqlKeyword;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
...@@ -15,10 +16,7 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto; ...@@ -15,10 +16,7 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationMoneyLogDto; 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.PreparationPageDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.*; import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.DesignInformationMapper; import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.DocumentStationMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PreparationMoneyMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IPreparationMoneyService; import com.yeejoin.amos.boot.module.hygf.api.service.IPreparationMoneyService;
import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationMoneyDto; import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationMoneyDto;
import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil; import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
...@@ -79,6 +77,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -79,6 +77,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
RedisUtils redisUtil; RedisUtils redisUtil;
@Autowired @Autowired
DesignInformationMapper designInformationMapper; DesignInformationMapper designInformationMapper;
@Autowired
PreparationMoneyLogMapper preparationMoneyLogMapper;
private static final String regionRedis="app_region_redis"; private static final String regionRedis="app_region_redis";
/** /**
...@@ -94,6 +94,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -94,6 +94,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
qw.like(StringUtils.isNotEmpty(dto.getAmosUnitName()), PreparationMoney::getAmosUnitName, dto.getAmosUnitName()); qw.like(StringUtils.isNotEmpty(dto.getAmosUnitName()), PreparationMoney::getAmosUnitName, dto.getAmosUnitName());
qw.like(StringUtils.isNotEmpty(dto.getOddNumbers()), PreparationMoney::getOddNumbers, dto.getOddNumbers()); 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.getDeliveryState()), PreparationMoney::getDeliveryState, dto.getDeliveryState());
qw.eq(StringUtils.isNotEmpty(dto.getAmosUnitId()), PreparationMoney::getAmosUnitId, dto.getAmosUnitId());
if(dto.getDeliveryTime()!=null&&!dto.getDeliveryTime().get(0).equals("")){ 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));
} }
...@@ -151,6 +152,22 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -151,6 +152,22 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
} }
public PreparationMoney selectOnebyId(Long sequenceNbr){
LambdaUpdateWrapper<PreparationMoney> qu=new LambdaUpdateWrapper<>();
qu.eq(PreparationMoney::getSequenceNbr,sequenceNbr);
PreparationMoney preparationMoney= preparationMoneyMapper.selectOne(qu);
LambdaUpdateWrapper<DocumentStation> q=new LambdaUpdateWrapper<>();
q.eq(DocumentStation::getPreparationMoneyId,sequenceNbr);
List<DocumentStation> li=documentStationMapper.selectList(q);
preparationMoney.setPeasantHouseholdId(li);
return preparationMoney;
}
@Transactional @Transactional
public boolean zfPreparationMoney(Long sequenceNbr, AgencyUserModel agencyUserModel) { public boolean zfPreparationMoney(Long sequenceNbr, AgencyUserModel agencyUserModel) {
...@@ -173,10 +190,28 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -173,10 +190,28 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
LambdaUpdateWrapper<PreparationMoney> qu=new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<PreparationMoney> qu=new LambdaUpdateWrapper<>();
qu.eq(PreparationMoney::getSequenceNbr,sequenceNbr); qu.eq(PreparationMoney::getSequenceNbr,sequenceNbr);
PreparationMoney preparationMoney= preparationMoneyMapper.selectOne(qu); PreparationMoney preparationMoney= preparationMoneyMapper.selectOne(qu);
LambdaUpdateWrapper<DocumentStation> q=new LambdaUpdateWrapper<>();
q.eq(DocumentStation::getPreparationMoneyId,sequenceNbr);
List<DocumentStation> lih=documentStationMapper.selectList(q);
preparationMoney.setPeasantHouseholdId(lih);
LambdaUpdateWrapper<PreparationMoneyLog> q1=new LambdaUpdateWrapper<>();
q1.eq(PreparationMoneyLog::getPreparationMoneyId,sequenceNbr);
q1.orderByDesc(PreparationMoneyLog::getExecutionTime);
List<PreparationMoneyLog> liD=preparationMoneyLogMapper.selectList(q1);
preparationMoney.setPreparationMoneyLog(liD);
List<Long> ids=new ArrayList<>();
for (DocumentStation documentStation : lih) {
ids.add(documentStation.getStationId());
}
//获取所有电站Bom，分组合并，暂时不相加 //获取所有电站Bom，分组合并，暂时不相加
QueryWrapper<DesignInformation> designInformationQueryWrapper = new QueryWrapper<>(); QueryWrapper<DesignInformation> designInformationQueryWrapper = new QueryWrapper<>();
designInformationQueryWrapper.in("peasant_household_id", preparationMoney.getPeasantHouseholdId()); designInformationQueryWrapper.in("peasant_household_id", ids);
List<DesignInformation> li = designInformationMapper.selectList(designInformationQueryWrapper); List<DesignInformation> li = designInformationMapper.selectList(designInformationQueryWrapper);
DesignInformation designInformation=new DesignInformation(); DesignInformation designInformation=new DesignInformation();
//组件 //组件
...@@ -207,6 +242,9 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -207,6 +242,9 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
designInformation.setCable(cable); designInformation.setCable(cable);
map.put("preparationMoney",preparationMoney); map.put("preparationMoney",preparationMoney);
map.put("designInformation",designInformation); map.put("designInformation",designInformation);
Map<String,Object> map1 =new HashMap<>();
map1.put("preparationMoneyLog",liD);
map.put("preparationMoneyLog",map1);
return map; return map;
} }
...@@ -271,12 +309,10 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -271,12 +309,10 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
preparationMoneyMapper.insert(model); preparationMoneyMapper.insert(model);
//电站信息存储 //电站信息存储
List<Long> ids= model.getPeasantHouseholdId(); List<DocumentStation> ids= model.getPeasantHouseholdId();
List<DocumentStation> listDocumentStation= new ArrayList<>(); List<DocumentStation> listDocumentStation= new ArrayList<>();
for (Long id : ids) { for (DocumentStation documentStation : ids) {
DocumentStation documentStation =new DocumentStation();
documentStation.setPreparationMoneyId(model.getSequenceNbr()); documentStation.setPreparationMoneyId(model.getSequenceNbr());
documentStation.setStationId(id);
listDocumentStation.add(documentStation); listDocumentStation.add(documentStation);
} }
documentStationService.saveBatch(listDocumentStation); documentStationService.saveBatch(listDocumentStation);
...@@ -328,8 +364,14 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -328,8 +364,14 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
model.setConsigneeRegion(ConsigneeRegion); model.setConsigneeRegion(ConsigneeRegion);
} }
if(model.getArrivalFile()!=null&&!model.getArrivalFile().isEmpty()){
model.setDeliveryState(ArrivalStateeEnum.已收货.getCode());
}else{
if(model.getDeliveryFile()!=null&&!model.getDeliveryFile().isEmpty()){ if(model.getDeliveryFile()!=null&&!model.getDeliveryFile().isEmpty()){
model.setDeliveryState(DeliveryStateeEnum.已发货.getCode()); model.setDeliveryState(DeliveryStateeEnum.已发货.getCode());
model.setArrivalState(ArrivalStateeEnum.待收货.getCode()); model.setArrivalState(ArrivalStateeEnum.待收货.getCode());
model.setDeliveryTime(new Date()); model.setDeliveryTime(new Date());
...@@ -337,31 +379,38 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -337,31 +379,38 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
model.setDeliveryState(DeliveryStateeEnum.待发货.getCode()); model.setDeliveryState(DeliveryStateeEnum.待发货.getCode());
model.setArrivalState(DeliveryStateeEnum.待发货.getCode()); model.setArrivalState(DeliveryStateeEnum.待发货.getCode());
} }
}
preparationMoneyMapper.updateById(model); preparationMoneyMapper.updateById(model);
//电站信息存储 //电站信息存储
LambdaUpdateWrapper<DocumentStation> up=new LambdaUpdateWrapper(); LambdaUpdateWrapper<DocumentStation> up=new LambdaUpdateWrapper();
up.eq(DocumentStation::getPreparationMoneyId,model.getSequenceNbr()); up.eq(DocumentStation::getPreparationMoneyId,model.getSequenceNbr());
documentStationMapper.delete(up); documentStationMapper.delete(up);
List<Long> ids= model.getPeasantHouseholdId(); List<DocumentStation> ids= model.getPeasantHouseholdId();
List<DocumentStation> listDocumentStation= new ArrayList<>(); List<DocumentStation> listDocumentStation= new ArrayList<>();
for (Long id : ids) { for (DocumentStation documentStation : ids) {
DocumentStation documentStation =new DocumentStation();
documentStation.setPreparationMoneyId(model.getSequenceNbr()); documentStation.setPreparationMoneyId(model.getSequenceNbr());
documentStation.setStationId(id);
listDocumentStation.add(documentStation); listDocumentStation.add(documentStation);
} }
documentStationService.saveBatch(listDocumentStation); documentStationService.saveBatch(listDocumentStation);
// 记录操作日志 // 记录操作日志
if(model.getArrivalFile()!=null&&!model.getArrivalFile().isEmpty()){ if(model.getArrivalFile()!=null&&!model.getArrivalFile().isEmpty()){
PreparationMoneyLog preparationMoneyLog1 = new PreparationMoneyLog(); PreparationMoneyLog preparationMoneyLog1 = new PreparationMoneyLog();
preparationMoneyLog1.setPreparationMoneyId(model.getSequenceNbr()); preparationMoneyLog1.setPreparationMoneyId(model.getSequenceNbr());
preparationMoneyLog1.setOperationContent(PreparationEnum.确认发货.getCode()); preparationMoneyLog1.setOperationContent(PreparationEnum.确认收货.getCode());
preparationMoneyLog1.setExecutionTime(new Date()); preparationMoneyLog1.setExecutionTime(new Date());
preparationMoneyLog1.setExecutor(agencyUserModel.getRealName()); preparationMoneyLog1.setExecutor(agencyUserModel.getRealName());
preparationMoneyLogService.save(preparationMoneyLog1); preparationMoneyLogService.save(preparationMoneyLog1);
}else{
PreparationMoneyLog preparationMoneyLog2 = new PreparationMoneyLog();
preparationMoneyLog2.setPreparationMoneyId(model.getSequenceNbr());
preparationMoneyLog2.setOperationContent(PreparationEnum.编辑货单.getCode());
preparationMoneyLog2.setExecutionTime(new Date());
preparationMoneyLog2.setExecutor(agencyUserModel.getRealName());
preparationMoneyLogService.save(preparationMoneyLog2);
} }
} }
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/ToDoTasksServiceImpl.java
View file @ 8b7cf6c4
...@@ -111,6 +111,7 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD ...@@ -111,6 +111,7 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
userMessageMapper.insert(userMessage); userMessageMapper.insert(userMessage);
emqKeeper.getMqttClient().publish("MY_MESSAGE" ,JSON.toJSONString(userMessage).getBytes(), 2 ,false); emqKeeper.getMqttClient().publish("MY_MESSAGE" ,JSON.toJSONString(userMessage).getBytes(), 2 ,false);
}catch (Exception e){ }catch (Exception e){
e.printStackTrace();
throw new BadRequest("任务添加失败！"); throw new BadRequest("任务添加失败！");
} }
} }
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java
View file @ 8b7cf6c4
...@@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSONObject; ...@@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.Enum.DealerReviewEnum; import com.yeejoin.amos.boot.module.hygf.api.Enum.DealerReviewEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.*; import com.yeejoin.amos.boot.module.hygf.api.dto.*;
...@@ -32,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -32,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestParam;
import org.typroject.tyboot.core.foundation.context.RequestContext; import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.exception.BaseException; import org.typroject.tyboot.core.foundation.exception.BaseException;
import org.typroject.tyboot.core.foundation.utils.Bean; import org.typroject.tyboot.core.foundation.utils.Bean;
...@@ -78,6 +81,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn ...@@ -78,6 +81,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
@Autowired @Autowired
UnitInfoMapper unitInfoMapper; UnitInfoMapper unitInfoMapper;
@Autowired @Autowired
PeasantHouseholdMapper peasantHouseholdMapper;
@Autowired
CommerceInfoMapper commerceInfoMapper; CommerceInfoMapper commerceInfoMapper;
@Autowired @Autowired
RegionalCompaniesMapper regionalCompaniesMapper; RegionalCompaniesMapper regionalCompaniesMapper;
...@@ -811,6 +816,22 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn ...@@ -811,6 +816,22 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
public Page<PeasantHousehold> getPeasantHouseholdData( Long unitInfoId,
Long regionalCompaniesSeq,
int pageNum,
int pageSize,
String peasantHouseholdNo,
String ownersName){
PageHelper.startPage(pageNum, pageSize);
UnitInfo unitInfo=unitInfoMapper.selectById(unitInfoId);
List<PeasantHousehold> list=peasantHouseholdMapper.selectPeasantHouseholdList(unitInfo.getAmosCompanySeq(),regionalCompaniesSeq,peasantHouseholdNo,ownersName);
PageInfo<PeasantHousehold> page = new PageInfo(list);
Page<PeasantHousehold> pagenew = new Page<PeasantHousehold>();
pagenew.setCurrent(pageNum);
pagenew.setTotal(page.getTotal());
pagenew.setSize(pageSize);
pagenew.setRecords(page.getList());
return pagenew;
}
} }
\ No newline at end of file
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