Skip to content

A
amos-boot-zx-biz
Commit 58fbe0c5 authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

Merge remote-tracking branch 'origin/developer_bw' into developer_bw

parents 8d94f529 cc88742f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 56 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HouseholdContractPageDto.java
View file @ 58fbe0c5
......@@ -27,6 +27,8 @@ public class HouseholdContractPageDto extends Page<HouseholdContract> {
*/
private String status;
private String projectAddress;
/**
* 农户id
*/
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationDto.java
View file @ 58fbe0c5
......@@ -101,4 +101,6 @@ public class PowerStationDto extends BaseDto {
private String realScale;
@ApiModelProperty(value = "省份")
private String province;
@ApiModelProperty(value = "制单日期")
private String creatorTime;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PreparationMoneyDto.java
View file @ 58fbe0c5
......@@ -2,12 +2,14 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoneyLog;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* 发货单
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/WorkOrderPage.java
View file @ 58fbe0c5
......@@ -23,6 +23,12 @@ public class WorkOrderPage {
@ApiModelProperty(value = "农户信息编号")
private String peasantHouseholdNo;
@ApiModelProperty(value = "开发商")
private String developerName;
@ApiModelProperty(value = "区域公司")
private String regionalCompaniesName;
@ApiModelProperty(value = "派工单编号")
private String workOrderNum;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PreparationMoney.java
View file @ 58fbe0c5
......@@ -12,6 +12,7 @@ import lombok.experimental.Accessors;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* 发货单
......@@ -153,11 +154,16 @@ public class PreparationMoney extends BaseEntity {
@TableField(exist = false)
private List<HygfReplenishment> files;
@TableField(exist = false)
private List<Map> replenishmentFile; //补货单
@TableField(exist = false)
private String instanceId; //发货单流水
//订单状态
@TableField("order_status")
private String orderStatus;
@TableField(exist = false)
private String delFile;
@TableField(exist = false)
private String arrFile;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PowerStationMapper.java
View file @ 58fbe0c5
......@@ -23,8 +23,9 @@ public interface PowerStationMapper extends BaseMapper<PowerStation> {
@Param("regionalCompaniesName") String regionalCompaniesName, @Param("processStatus") String processStatus,
@Param("province") String province,
@Param("projectAddress") String projectAddress,
@Param("status") String status);
@Param("status") String status,
@Param("startTime") String startTime,
@Param("endTime") String endTime);
String getInstanceIdByhouseId(String peasantHouseholdId);
List<Map<String, Object>> getKcCreateTime();
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PreparationMoneyMapper.java
View file @ 58fbe0c5
......@@ -7,6 +7,7 @@ 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.PreparationMoneyDto;
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;
......@@ -24,18 +25,20 @@ import java.util.Map;
public interface PreparationMoneyMapper extends BaseMapper<PreparationMoney> {
List<PeasantHousehold> getPeasantHouseholdData(@Param("sequenceNbr") Long sequenceNbr,@Param("ownersName") String ownersName, @Param("projectAddress") String projectAddress);
List<PeasantHousehold> getPeasantHouseholdData(@Param("sequenceNbr") Long sequenceNbr, @Param("ownersName") String ownersName, @Param("projectAddress") String projectAddress);
@UserEmpower(field ={"regional_companies_code"} ,dealerField={"amos_unit_org_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
@UserEmpower(field = {"regional_companies_code"}, dealerField = {"amos_unit_org_code", "regional_companies_code"}, fieldConditions = {"eq", "in"}, relationship = "and")
List<PreparationMoney> selectPageList(@Param(value = "dto") PreparationDto preparationDto);
@UserEmpower(field ={"regional_companies_code"} ,dealerField={"developer_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<Map<String,Object>> preparationStation (@Param(value = "preparationMoneyState") String preparationMoneyState,
@UserEmpower(field = {"regional_companies_code"}, dealerField = {"developer_code", "regional_companies_code"}, fieldConditions = {"eq", "in"}, relationship = "and")
List<Map<String, Object>> preparationStation(@Param(value = "preparationMoneyState") String preparationMoneyState,
@Param(value = "ownersName") String ownersName,
@Param(value = "regionalCompaniesSeq") String regionalCompaniesSeq,
@Param(value = "developerId") String developerId,
@Param(value = "state") String state,
@Param(value = "province") String province,
@Param(value = "projectAddress") String projectAddress);
@Param(value = "projectAddress") String projectAddress,
@Param(value = "startTime") String startTime,
@Param(value = "endTime") String endTime);
PreparationMoney selectPreparationMoneyInfo(@Param(value = "peasantHouseholdId") String peasantHouseholdId);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceCheckMapper.xml
View file @ 58fbe0c5
......@@ -47,6 +47,12 @@
<if test="map.amosDealerId!=null and map.amosDealerId!=''">
and hygf_work_order.amos_dealer_id = #{map.amosDealerId}
</if>
<if test="map.developerName!=null and map.developerName!=''">
and hph.developer_name like concat('%',#{map.developerName},'%')
</if>
<if test="map.regionalCompaniesName!=null and map.regionalCompaniesName!=''">
and hph.regional_companies_name like concat('%',#{map.regionalCompaniesName},'%')
</if>
<if test="map.regionCompanyId!=null and map.regionCompanyId!=''">
and hygf_work_order.region_company_id =#{map.regionCompanyId}
</if>
......@@ -56,8 +62,11 @@
<if test="map.formType != null and map.formType!=''">
AND hbga.acceptance_check_status IN ('2', '3', '4')
</if>
<if test="map.projectAddress != null and map.projectAddress!=''">
AND hph.project_address_name LIKE concat(concat('%', #{map.projectAddress}), '%')
<if test="map.projectAddress != null and map.projectAddress != '' and map.projectAddress.contains('/'.toString())">
AND hph.project_address_name LIKE CONCAT('%', #{map.projectAddress}, '%')
</if>
<if test="map.projectAddress != null and map.projectAddress != '' and !map.projectAddress.contains('/'.toString())">
AND REPLACE(hph.project_address_name, '/', '') LIKE CONCAT('%', #{map.projectAddress}, '%')
</if>
<if test="map.type != null">
and ( (hbga.basic_grid_node is not null AND hbga.basic_grid_node != 'jxsAdmin')
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml
View file @ 58fbe0c5
......@@ -61,11 +61,20 @@
<if test="map.powerStationCode!=null and map.powerStationCode!=''">
and hph.peasant_household_no like concat('%',#{map.powerStationCode},'%')
</if>
<if test="map.developerName!=null and map.developerName!=''">
and hph.developer_name like concat('%',#{map.developerName},'%')
</if>
<if test="map.regionalCompaniesName!=null and map.regionalCompaniesName!=''">
and hph.regional_companies_name like concat('%',#{map.regionalCompaniesName},'%')
</if>
<if test="map.formType != null and map.formType!=''">
AND hbga.grid_status IN ('2', '3', '4')
</if>
<if test="map.projectAddress != null and map.projectAddress!=''">
AND hph.project_address_name LIKE concat(concat('%', #{map.projectAddress}), '%')
<if test="map.projectAddress != null and map.projectAddress != '' and map.projectAddress.contains('/'.toString())">
AND hph.project_address_name LIKE CONCAT('%', #{map.projectAddress}, '%')
</if>
<if test="map.projectAddress != null and map.projectAddress != '' and !map.projectAddress.contains('/'.toString())">
AND REPLACE(hph.project_address_name, '/', '') LIKE CONCAT('%', #{map.projectAddress}, '%')
</if>
<if test="map.type != null">
AND ( (hbga.basic_grid_node IS NOT NULL AND hbga.basic_grid_node != 'jxsAdmin' )
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/FinancingInfoMapper.xml
View file @ 58fbe0c5
......@@ -18,6 +18,7 @@
CONCAT(info.disbursement_money,'') as disbursementMoney,
hph.regional_companies_code,
hph.developer_code,
hph.developer_name developerName,
hph.is_history isHistory,
info.financing_companies_name financingCompaniesName
FROM
......@@ -29,6 +30,15 @@
<if test="params.ownersName != null and params.ownersName !=''">
and hph.owners_name like concat('%',#{params.ownersName},'%')
</if>
<if test="params.peasantHouseholdNo != null and params.peasantHouseholdNo !=''">
and hph.peasant_household_no like concat('%',#{params.peasantHouseholdNo},'%')
</if>
<if test="params.developerName != null and params.developerName !=''">
and hph.developer_name like concat('%',#{params.developerName},'%')
</if>
<if test="params.financingCompaniesName != null and params.financingCompaniesName !=''">
and info.financing_companies_name like concat('%',#{params.financingCompaniesName},'%')
</if>
<if test="params.isHistory != null and params.isHistory !='' and params.type != 2 ">
and hph.is_history is not null
</if>
......@@ -50,7 +60,12 @@
<if test="params.peasantHouseholdNo != null and params.peasantHouseholdNo !='' ">
and hph.peasant_household_no = #{params.peasantHouseholdNo}
</if>
<if test="params.projectAddress != null and params.projectAddress != '' and params.projectAddress.contains('/'.toString())">
AND concat(hph.project_address_name,hph.project_address_detail) LIKE CONCAT('%', #{params.projectAddress}, '%')
</if>
<if test="params.projectAddress != null and params.projectAddress != '' and !params.projectAddress.contains('/'.toString())">
AND REPLACE(concat(hph.project_address_name,hph.project_address_detail), '/', '') LIKE CONCAT('%', #{params.projectAddress}, '%')
</if>
</where>
ORDER BY
info.rec_date DESC ,hph.sequence_nbr DESC ) as sta
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HouseholdContractMapper.xml
View file @ 58fbe0c5
......@@ -18,6 +18,12 @@
<if test="dto.status != null and dto.status !=''">
and hygf_household_contract.status = #{dto.status}
</if>
<if test="dto.projectAddress != null and dto.projectAddress != '' and dto.projectAddress.contains('/'.toString())">
AND hygf_household_contract.project_address_name LIKE CONCAT('%', #{dto.projectAddress}, '%')
</if>
<if test="dto.projectAddress != null and dto.projectAddress != '' and !dto.projectAddress.contains('/'.toString())">
AND REPLACE(hygf_household_contract.project_address_name, '/', '') LIKE CONCAT('%', #{dto.projectAddress}, '%')
</if>
<if test="dto.name != null and dto.name !='' ">
and hygf_household_contract.name like concat('%',#{dto.name},'%')
</if>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PowerStationMapper.xml
View file @ 58fbe0c5
......@@ -34,7 +34,8 @@
ph.project_address_detail,
SUBSTRING_INDEX(ph.project_address_name, '/', 1) AS province,
lc.stamp_status,
lc.status
lc.status,
hsi.creator_time
FROM
hygf_power_station ps
LEFT JOIN (
......@@ -56,6 +57,7 @@
ON lc.peasant_household_id = ps.peasant_household_id
LEFT JOIN hygf_peasant_household ph
ON ph.sequence_nbr = ps.peasant_household_id
LEFT JOIN (select sequence_nbr, creator_time from hygf_survey_information ) hsi on ph.survey_information_id = hsi.sequence_nbr
WHERE
ps.is_delete = 0
<if test="powerStationCode != null and powerStationCode != ''">
......@@ -80,11 +82,17 @@
AND ps.process_status = #{processStatus}
</if>
<if test="province != null and province != ''">
AND ph.project_address_name LIKE CONCAT('%', #{province}, '%')
AND ph.project_address LIKE CONCAT('%', #{province}, '%')
</if>
<if test="status != null and status != ''">
AND lc.status = #{status}
</if>
<if test="startTime != null and startTime != ''">
AND hsi.creator_time &gt;= #{startTime}
</if>
<if test="endTime != null and endTime != ''">
AND hsi.creator_time &lt;= #{endTime}
</if>
ORDER BY ps.rec_date DESC
</select>
<select id="getInstanceIdByhouseId" resultType="java.lang.String">
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PreparationMoneyMapper.xml
View file @ 58fbe0c5
......@@ -89,6 +89,12 @@ LEFT JOIN hygf_document_station on hygf_document_station.station_id=hygf_peasan
<if test="province != null and province != ''">
and hygf_peasant_household.project_address like concat(concat('%',#{province}),'%')
</if>
<if test="startTime != null and startTime != ''">
and hygf_preparation_money.delivery_time &gt;= #{startTime}
</if>
<if test="endTime != null and endTime != ''">
and hygf_preparation_money.delivery_time &lt;= #{endTime}
</if>
<if test="projectAddress != null and projectAddress != '' and projectAddress.contains('/'.toString())">
AND concat_ws('/',hygf_peasant_household.project_address_name,hygf_peasant_household.project_address_detail) LIKE CONCAT('%', #{projectAddress}, '%')
</if>
......@@ -106,4 +112,16 @@ LEFT JOIN hygf_document_station on hygf_document_station.station_id=hygf_peasan
) b
</select>
<select id="selectPreparationMoneyInfo" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney">
SELECT
*,
delivery_file as delFile,
arrival_file as arrFile
FROM
`hygf_preparation_money` pm
LEFT JOIN hygf_document_station ds ON ds.preparation_money_id = pm.sequence_nbr
WHERE
ds.station_id = #{peasantHouseholdId}
</select>
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/StatisticsHomepageMapper.xml
View file @ 58fbe0c5
......@@ -112,7 +112,7 @@
<select id="preparationMoneyTotal" resultType="map">
SELECT
SUM( CASE WHEN preparation_money_state = '待发货' or preparation_money_state = '暂存发货'or preparation_money_state = '待补货' THEN 1 ELSE 0 END ) AS '待发货',
SUM( CASE WHEN preparation_money_state = '备货完成' THEN 1 ELSE 0 END ) AS '已收货',
SUM( CASE WHEN preparation_money_state = '备货完成' or preparation_money_state = '已收货' THEN 1 ELSE 0 END ) AS '已收货',
SUM( CASE WHEN preparation_money_state = '待收货' THEN 1 ELSE 0 END ) AS '已发货'
FROM
hygf_peasant_household
......@@ -138,13 +138,13 @@
<select id="workOrderTotal" resultType="map">
SELECT
count(*) AS total,
(CASE WHEN power_station_construction_status = '待施工' THEN '派工发料'
(CASE
WHEN power_station_construction_status = '未通过' THEN '未通过'
WHEN power_station_construction_status = '施工中' or power_station_construction_status = '待登记' THEN '施工资料已上传'
WHEN power_station_construction_status = '待审核' and work_order_power_station_node IS NULL THEN '完工登记'
WHEN power_station_construction_status = '待审核' and work_order_power_station_node ='area' THEN '完工自审'
WHEN power_station_construction_status = '施工中' or power_station_construction_status = '待施工' THEN '施工资料上传'
WHEN power_station_construction_status = '待登记' THEN '完工登记'
WHEN power_station_construction_status = '待审核' and work_order_power_station_node is null THEN '完工自审'
WHEN power_station_construction_status = '已完工' THEN '已完成'
WHEN power_station_construction_status = '待审核' and work_order_power_station_node in ('engineering','design') THEN '审核中'
WHEN power_station_construction_status = '待审核' and work_order_power_station_node in ('engineering','design','area') THEN '审核中'
ELSE power_station_construction_status END )
AS statusText,
ROUND(COALESCE(SUM(ei.real_scale), 0), 2) AS realScale FROM
......@@ -270,7 +270,7 @@
'待放款'
WHEN info.`status` = '待融资审核' THEN
'待审核'
WHEN info.`status` = '审核不通过' THEN
WHEN info.`status` = '审核不通过' or info.`status` = '重新验收' THEN
'未通过'
WHEN info.`status` = '放款完成' THEN
'放款完成' ELSE '待推送'
......@@ -391,8 +391,8 @@
'' AS kcjxzrl,
SUM(CASE WHEN ps.process_status = '完成' THEN 1 ELSE 0 END) AS kcywc,
ROUND(COALESCE(SUM(CASE WHEN ps.process_status = '完成' THEN ei.real_scale ELSE 0 END)/1000, 0), 2) AS kcywcrl,
SUM(CASE WHEN ph.preparation_money_state = '备货完成' THEN 1 ELSE 0 END) AS bhywc,
ROUND(COALESCE(SUM(CASE WHEN ph.preparation_money_state = '备货完成' THEN ei.real_scale ELSE 0 END)/1000, 0), 2) AS bhywcrl,
SUM(CASE WHEN ph.preparation_money_state = '备货完成' or ph.preparation_money_state = '已收货'THEN 1 ELSE 0 END) AS bhywc,
ROUND(COALESCE(SUM(CASE WHEN ph.preparation_money_state = '备货完成'or ph.preparation_money_state = '已收货' THEN ei.real_scale ELSE 0 END)/1000, 0), 2) AS bhywcrl,
SUM(CASE WHEN ph.preparation_money_state = '待发货' or ph.preparation_money_state = '暂存发货'or ph.preparation_money_state = '待补货' THEN 1 ELSE 0 END ) AS bhwtg,
'' AS bhjxzrl,
SUM(CASE WHEN ph.preparation_money_state = '待收货' THEN 1 ELSE 0 END) AS bhjxz,
......@@ -611,8 +611,8 @@
<select id="statisticsPreparationMoney" resultType="map">
SELECT
IFNULL(SUM( CASE WHEN preparation_money_state = '待发货' or preparation_money_state = '暂存发货' or preparation_money_state = '待补货' THEN 1 ELSE 0 END ), 0 ) AS dfh,
IFNULL(SUM( CASE WHEN preparation_money_state = '备货完成' THEN 1 ELSE 0 END ), 0 ) AS ysh,
IFNULL(SUM( CASE WHEN preparation_money_state = '备货完成' THEN ei.real_scale ELSE 0 END ), 0 ) AS yshrl,
IFNULL(SUM( CASE WHEN preparation_money_state = '备货完成' or preparation_money_state = '已收货'THEN 1 ELSE 0 END ), 0 ) AS ysh,
IFNULL(SUM( CASE WHEN preparation_money_state = '备货完成' or preparation_money_state = '已收货'THEN ei.real_scale ELSE 0 END ), 0 ) AS yshrl,
IFNULL(SUM( CASE WHEN preparation_money_state = '待收货' THEN 1 ELSE 0 END ), 0 ) AS yfh
FROM
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/WorkOrderMapper.xml
View file @ 58fbe0c5
......@@ -73,6 +73,8 @@
select
hygf_peasant_household.sequence_nbr sequenceNbr,
hygf_peasant_household.peasant_household_no peasantHouseholdNo,
hygf_peasant_household.developer_name developerName,
hygf_peasant_household.regional_companies_name regionalCompaniesName,
substring_index ( hygf_peasant_household.project_address_name, '/', 1 ) AS province,
hygf_work_order.work_order_num workOrderNum,
hygf_peasant_household.owners_name ownersName,
......@@ -117,12 +119,18 @@
or hygf_work_order_power_station.power_station_engineering_status is not null
)
</if>
<if test="dto.projectAddressName!=null and dto.projectAddressName!=''">
and hygf_peasant_household.project_address_name like concat(concat('%',#{dto.projectAddressName}),'%')
<if test="dto.projectAddressName != null and dto.projectAddressName != '' and dto.projectAddressName.contains('/'.toString())">
AND hygf_peasant_household.project_address_name LIKE CONCAT('%', #{dto.projectAddressName}, '%')
</if>
<if test="dto.projectAddressName != null and dto.projectAddressName != '' and !dto.projectAddressName.contains('/'.toString())">
AND REPLACE(hygf_peasant_household.project_address_name, '/', '') LIKE CONCAT('%', #{dto.projectAddressName}, '%')
</if>
<if test="dto.peasantHouseholdNo!=null and dto.peasantHouseholdNo!=''">
and hygf_peasant_household.peasant_household_no like concat(concat('%',#{dto.peasantHouseholdNo}),'%')
</if>
<if test="dto.constructionRegionManager!=null and dto.constructionRegionManager!=''">
and hygf_work_order.construction_region_manager like concat(concat('%',#{dto.constructionRegionManager}),'%')
</if>
<if test="dto.ownersName!=null and dto.ownersName!=''">
and hygf_peasant_household.owners_name like concat(concat('%',#{dto.ownersName}),'%')
</if>
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/AcceptanceCheckController.java
View file @ 58fbe0c5
......@@ -206,7 +206,9 @@ public class AcceptanceCheckController extends BaseController {
@RequestParam(required = false,value = "acceptanceCheckStatus") String acceptanceCheckStatus,
@RequestParam(required = false,value = "type") String type,
@RequestParam(required = false,value = "acceptanceTime") String acceptanceTime,
@RequestParam(required = false, value = "province") String province) throws Exception {
@RequestParam(required = false, value = "province") String province,
@RequestParam(required = false, value = "developerName") String developerName,
@RequestParam(required = false, value = "regionalCompaniesName") String regionalCompaniesName) throws Exception {
//当前登录人所属场站
// UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
......@@ -235,7 +237,7 @@ public class AcceptanceCheckController extends BaseController {
basicGridNodes.add("ys-zichan");
}
}
Page<AcceptanceCheckDto> page = acceptanceCheckServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, acceptanceCheckStatus, acceptanceTime, "",basicGridNodes,type,province);
Page<AcceptanceCheckDto> page = acceptanceCheckServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, acceptanceCheckStatus, acceptanceTime, "",basicGridNodes,type,province, developerName, regionalCompaniesName);
//根据角色及当前节点判断是否有操作权限
if (basicGridNodes != null){
for (AcceptanceCheckDto e : page.getRecords()) {
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/BasicGridAcceptanceController.java
View file @ 58fbe0c5
......@@ -151,7 +151,9 @@ public class BasicGridAcceptanceController extends BaseController {
@RequestParam(required = false, value = "gridStatus") String gridStatus,
@RequestParam(required = false, value = "type") String type,
@RequestParam(required = false, value = "gridConnectionTime") String gridConnectionTime,
@RequestParam(required = false, value = "province") String province) throws Exception {
@RequestParam(required = false, value = "province") String province,
@RequestParam(required = false, value = "developerName") String developerName,
@RequestParam(required = false, value = "regionalCompaniesName") String regionalCompaniesName) throws Exception {
// 当前登录人所属场站
// UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
......@@ -178,7 +180,7 @@ public class BasicGridAcceptanceController extends BaseController {
}
Page<BasicGridRecordDto> page = basicGridAcceptanceServiceImpl.selectPage(null, null, current, size,
projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "", basicGridNodes, type,
province);
province, developerName, regionalCompaniesName);
// 根据角色及当前节点判断是否有操作权限
if (basicGridNodes != null) {
for (BasicGridRecordDto e : page.getRecords()) {
......@@ -218,7 +220,7 @@ public class BasicGridAcceptanceController extends BaseController {
// 当前登录人所属场站
Page<BasicGridRecordDto> page = basicGridAcceptanceServiceImpl.selectPage(null, null, current, size,
projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "check", null, null,province);
projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "check", null, null,province, null, null);
return ResponseHelper.buildResponse(page);
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/FinancingInfoController.java
View file @ 58fbe0c5
......@@ -166,11 +166,15 @@ public class FinancingInfoController extends BaseController {
@RequestParam(value = "region" ,required = false) String region ,
@RequestParam(value = "batchNo" ,required = false) String batchNo ,
@RequestParam(value = "isHistory" ,required = false) String isHistory ,
@RequestParam(value = "ownersName",required = false) String ownersName){
@RequestParam(value = "ownersName",required = false) String ownersName,
@RequestParam(value = "projectAddress",required = false) String projectAddress,
@RequestParam(value = "peasantHouseholdNo",required = false) String peasantHouseholdNo,
@RequestParam(value = "developerName",required = false) String developerName,
@RequestParam(value = "financingCompaniesName",required = false) String financingCompaniesName){
Page<Map<String, Object>> page = new Page<Map<String, Object>>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(financingInfoServiceImpl.queryForFinancingInfoPage(page,type,status,regionalCompaniesCode,ownersName, region,batchNo,isHistory));
return ResponseHelper.buildResponse(financingInfoServiceImpl.queryForFinancingInfoPage(page,type,status,regionalCompaniesCode,ownersName, region,batchNo,isHistory, projectAddress, peasantHouseholdNo, developerName, financingCompaniesName));
}
/**
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PowerStationController.java
View file @ 58fbe0c5
......@@ -107,12 +107,14 @@ public class PowerStationController extends BaseController {
@RequestParam(value = "regionalCompaniesName",required = false)String regionalCompaniesName,
@RequestParam(value = "province",required = false)String province,
@RequestParam(value = "projectAddress",required = false)String projectAddress,
@RequestParam(value = "status",required = false)String status) {
@RequestParam(value = "status",required = false)String status,
@RequestParam(value = "startTime",required = false)String startTime,
@RequestParam(value = "endTime",required = false)String endTime) {
Page<PowerStationDto> page = new Page<PowerStationDto>();
page.setCurrent(current);
page.setSize(size);
AgencyUserModel userInfo = getUserInfo();
return ResponseHelper.buildResponse(powerStationServiceImpl.queryForPowerStationUserRoles(page,powerStationCode,ownersName,userInfo,serviceAgent,regionalCompaniesName,processStatus,province, projectAddress, status));
return ResponseHelper.buildResponse(powerStationServiceImpl.queryForPowerStationUserRoles(page,powerStationCode,ownersName,userInfo,serviceAgent,regionalCompaniesName,processStatus,province, projectAddress, status, startTime, endTime));
}
/**
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PreparationMoneyController.java
View file @ 58fbe0c5
......@@ -346,9 +346,11 @@ public class PreparationMoneyController extends BaseController {
@RequestParam(value = "state",required = false) String state,
@RequestParam(value = "preparationMoneyState") String preparationMoneyState,
@RequestParam(value = "province",required = false) String province,
@RequestParam(value = "projectAddress",required = false) String projectAddress){
@RequestParam(value = "projectAddress",required = false) String projectAddress,
@RequestParam(value = "startTime",required = false) String startTime,
@RequestParam(value = "endTime",required = false) String endTime){
return ResponseHelper.buildResponse(preparationMoneyServiceImpl.preparationStation(current,size,preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state,province, projectAddress)) ;
return ResponseHelper.buildResponse(preparationMoneyServiceImpl.preparationStation(current,size,preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state,province, projectAddress, startTime, endTime)) ;
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceCheckServiceImpl.java
View file @ 58fbe0c5
......@@ -70,7 +70,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
public Page<AcceptanceCheckDto> selectPage(Long regionCompanyId, Long amosDealerId, int current, int size,
String projectAddress, String powerStationCode, String ownersName, String acceptanceCheckStatus,
String gridConnectionTime, String formType, List<String> basicGridNodes, String type,String province) throws Exception {
String gridConnectionTime, String formType, List<String> basicGridNodes, String type,String province, String developerName, String regionalCompaniesName) throws Exception {
PageHelper.startPage(current, size);
Map<String, Object> map = new HashMap<>();
Date date = null;
......@@ -88,6 +88,8 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
map.put("basicGridNodes",basicGridNodes);
map.put("type",type);
map.put("province",province);
map.put("developerName", developerName);
map.put("regionalCompaniesName", regionalCompaniesName);
List<AcceptanceCheckDto> list = acceptanceCheckMapper.selectPageList(map);
if(list != null && list.size() > 0) {
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java
View file @ 58fbe0c5
......@@ -100,7 +100,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
public Page<BasicGridRecordDto> selectPage(Long regionCompanyId, Long amosDealerId, int current, int size,
String projectAddress, String powerStationCode, String ownersName, String gridStatus,
String gridConnectionTime, String formType, List<String> basicGridNodes, String type, String province)
String gridConnectionTime, String formType, List<String> basicGridNodes, String type, String province, String developerName, String regionalCompaniesName)
throws Exception {
PageHelper.startPage(current, size);
Map<String, Object> map = new HashMap<>();
......@@ -119,6 +119,8 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
map.put("basicGridNodes", basicGridNodes);
map.put("type", type);
map.put("province", province);
map.put("developerName", developerName);
map.put("regionalCompaniesName", regionalCompaniesName);
List<BasicGridRecordDto> list = basicGridAcceptanceMapper.selectPageList(map);
PageInfo<BasicGridRecordDto> page = new PageInfo(list);
Page<BasicGridRecordDto> pageNew = new Page<>();
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/FinancingInfoServiceImpl.java
View file @ 58fbe0c5
......@@ -87,7 +87,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
private RedisLockUtil redisLockUtil;
@UserLimits
public Page<Map<String, Object>> queryForFinancingInfoPage(Page<Map<String, Object>> page, String type, String status, String regionalCompaniesCode, String ownersName, String region,String batchNo,String isHistory) {
public Page<Map<String, Object>> queryForFinancingInfoPage(Page<Map<String, Object>> page, String type, String status, String regionalCompaniesCode, String ownersName, String region,String batchNo,String isHistory, String projectAddress, String peasantHouseholdNo, String developerName, String financingCompaniesName) {
StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
List<String> amosOrgCodes = orgCode.getAmosOrgCode();
......@@ -101,6 +101,10 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
params.put("batchNo", batchNo);
params.put("isHistory", isHistory);
params.put("region", region);
params.put("projectAddress", projectAddress);
params.put("peasantHouseholdNo", peasantHouseholdNo);
params.put("developerName", developerName);
params.put("financingCompaniesName", financingCompaniesName);
// 1 投融人员 2.融资 3经销商管理员
switch (type) {
case "1":
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java
View file @ 58fbe0c5
......@@ -98,7 +98,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
private RedisLockUtil redisLockUtil;
public Page<PowerStationDto> queryForPowerStationUserRoles(Page<PowerStationDto> page, String powerStationCode,
String ownersName, AgencyUserModel userInfo, String serviceAgent, String regionalCompaniesName, String processStatus,String province, String projectAddress, String status) {
String ownersName, AgencyUserModel userInfo, String serviceAgent, String regionalCompaniesName, String processStatus,String province, String projectAddress, String status, String startTime, String endTime) {
// Map<Long, List<RoleModel>> orgRoles = userInfo.getOrgRoles();
// Collection<List<RoleModel>> roleModels = orgRoles.values();
// if(roleModels !=null){
......@@ -124,7 +124,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
// this.queryForPowerStationPage(page,powerStationCode,ownersName,serviceAgent);
Page<PowerStationDto> powerStationDtoPage = this.queryPage((int) page.getCurrent(), (int) page.getSize(), powerStationCode, ownersName,
serviceAgent, regionalCompaniesName, processStatus,province, projectAddress, status);
serviceAgent, regionalCompaniesName, processStatus,province, projectAddress, status, startTime, endTime);
// if(powerStationDtoPage.getRecords() != null && powerStationDtoPage.getRecords().size() > 0) {
// powerStationDtoPage.getRecords().forEach(e -> {
......@@ -170,10 +170,10 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
// 查询电站审核记录
public Page<PowerStationDto> queryPage(int current, int size, String powerStationCode, String ownersName,
String serviceAgent,String regionalCompaniesName,String processStatus,String province,String projectAddress, String status) {
String serviceAgent,String regionalCompaniesName,String processStatus,String province,String projectAddress, String status, String startTime, String endTime) {
PageHelper.startPage(current, size);
List<PowerStationDto> list = powerStationMapper.queryPage(powerStationCode, ownersName, serviceAgent,regionalCompaniesName,processStatus,province, projectAddress, status);
List<PowerStationDto> list = powerStationMapper.queryPage(powerStationCode, ownersName, serviceAgent,regionalCompaniesName,processStatus,province, projectAddress, status, startTime, endTime);
PageInfo<PowerStationDto> pages = new PageInfo(list);
com.baomidou.mybatisplus.extension.plugins.pagination.Page<PowerStationDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<PowerStationDto>();
......
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 @ 58fbe0c5
......@@ -99,8 +99,6 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
private HygfReplenishmentMapper hygfReplenishmentMapper;
@Autowired
private WorkflowFeignClient workflowFeignClient;
@Autowired
private CommonServiceImpl commonService;
private static final String regionRedis = "app_region_redis";
// private static final String PROCESSKEY = "DeliveryManagement";
......@@ -1208,11 +1206,11 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
}
public IPage<Map<String,Object>> preparationStation(Integer current, Integer size, String preparationMoneyState,String ownersName,String regionalcompaniesSeq,String developerId,String state,String province, String projectAddress){
public IPage<Map<String,Object>> preparationStation(Integer current, Integer size, String preparationMoneyState,String ownersName,String regionalcompaniesSeq,String developerId,String state,String province, String projectAddress, String startTime, String endTime){
PageHelper.startPage(current, size);
List<Map<String, Object>> resultPage = preparationMoneyMapper.preparationStation(preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state,province, projectAddress);
List<Map<String, Object>> resultPage = preparationMoneyMapper.preparationStation(preparationMoneyState,ownersName,regionalcompaniesSeq,developerId,state,province, projectAddress, startTime, endTime);
if(resultPage != null && resultPage.size() > 0) {
resultPage.forEach(e -> {
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/StatisticsHomepageServiceImpl.java
View file @ 58fbe0c5
......@@ -106,7 +106,7 @@ public class StatisticsHomepageServiceImpl {
List<String> surveKeys = new ArrayList<>(Arrays.asList("未通过","未勘察","已完成(法务审核)","进行中(审核)"));
List<String> contractKeys = new ArrayList<>(Arrays.asList("双方已签署","农户已签署","未签署","已作废"));
List<String> workOrder = new ArrayList<>(Arrays.asList("派工发料","未通过","施工资料已上传","完工登记","完工自审","审核中","已完成","整改待审核" ,"待整改"));
List<String> workOrder = new ArrayList<>(Arrays.asList("未通过","施工资料上传","完工登记","完工自审","审核中","已完成","整改待审核" ,"待整改"));
List<String> preparationMoneyKeys = new ArrayList<>(Arrays.asList("待发货","已收货","已发货"));
List<String> desionKeys = new ArrayList<>(Arrays.asList("施工图已上传","典设图已上传"));
List<String> gridKeys = new ArrayList<>(Arrays.asList("待登记","审核中","已完成","未通过","整改待审核" ,"待整改"));
......@@ -204,14 +204,14 @@ public class StatisticsHomepageServiceImpl {
realScale += (double) map.get("realScale");
iterator.remove();
}
if ("施工资料已上传".equals(map.get("statusText"))) {
if ("施工资料上传".equals(map.get("statusText"))) {
sgtotal += (long) map.get("total");
sgrealScale += (double) map.get("realScale");
iterator.remove();
}
}
maps.add(MapBuilder.<String, Object>create().put("statusText","审核中").put("total",total).put("realScale",new BigDecimal(realScale).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()).build());
maps.add(MapBuilder.<String, Object>create().put("statusText","施工资料已上传").put("total",sgtotal).put("realScale",new BigDecimal(sgrealScale).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()).build());
maps.add(MapBuilder.<String, Object>create().put("statusText","施工资料上传").put("total",sgtotal).put("realScale",new BigDecimal(sgrealScale).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()).build());
differenceValue(maps,workOrder);
resultMap.put("workOrder",maps);
}
......@@ -274,13 +274,13 @@ public class StatisticsHomepageServiceImpl {
if ("放款完成".equals(map.get("statusText"))) {
disbursementMoney += (double)map.get("disbursementMoney");
}
if ("待推送".equals(map.get("statusText"))) {
if ("未通过".equals(map.get("statusText"))) {
trtotal += (long) map.get("total");
trrealScale += (double) map.get("realScale");
iterator2.remove();
}
}
maps.add(MapBuilder.<String, Object>create().put("statusText","待推送").put("total",trtotal).put("realScale",new BigDecimal(trrealScale).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()).build());
maps.add(MapBuilder.<String, Object>create().put("statusText","未通过").put("total",trtotal).put("realScale",new BigDecimal(trrealScale).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()).build());
differenceValue(maps,financingKeys);
resultMap.put("financing",maps);
}
......
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