Commit 7c4b2462 authored by 朱晨阳's avatar 朱晨阳

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

parents 8ce5a5e7 696eb39f
......@@ -189,6 +189,30 @@ public class DateUtils {
}
/**
* 时间格式字符串化成标准字符串 2024-05-23T14:19:05.432 => 2024-05-23 14:19:05
*
* @param dateString Date
* @return
* @throws ParseException
*/
public static Object dateStringFormat(Object dateString){
if(Objects.isNull(dateString)){
return null;
}
try {
// 转换为 LocalDateTime
LocalDateTime localDateTime = LocalDateTime.parse(String.valueOf(dateString));
// 转换为 Date
Date date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
SimpleDateFormat sdf = new SimpleDateFormat(DATE_TIME_PATTERN);
return sdf.format(date);
}catch (Exception e){
return dateString;
}
}
/**
* 暂时不操作原生截取做下转换
*
* @param str
......
......@@ -16,7 +16,7 @@ public enum CommonEnum {
经销商代建("经销商代建","fzx","电站类型"),
平顶屋("平顶屋","pdw","屋顶类型"),
斜顶屋("斜顶屋","xdw","屋顶类型"),
庭院("ty","other","屋顶类型"),
庭院("庭院","ty","屋顶类型"),
别墅("别墅","bs","房屋整体情况"),
普通民房("普通民房","pymf","房屋整体情况"),
单门独院("单门独院","dmdy","房屋整体情况"),
......@@ -62,6 +62,8 @@ public enum CommonEnum {
SMC("SMC","smc","材质"),
不锈钢("不锈钢","bxg","材质"),
钢板喷塑("钢板喷塑","gbps","材质"),
单面("单面","dm","组件类型"),
双面("双面","sm","组件类型"),
其他("其他","other","公用");
/**
......@@ -80,7 +82,7 @@ public enum CommonEnum {
public static String getNameByCode(String code) {
String name = null;
String name = "";
for(CommonEnum obj: CommonEnum.values()) {
if (obj.getCode().equals(code)) {
name = obj.getName();
......
package com.yeejoin.amos.boot.module.hygf.api.Enum;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.springframework.util.StringUtils;
import java.util.List;
@Getter
@AllArgsConstructor
public enum StatisicsHomePageEnum {
序号("xh",0),
省份("sf",1),
项目公司("regionalCompaniesName",2),
代理商("developerName",3),
实际建设容量("realScale",4),
未勘察("wkc",5),
勘察未通过("kcwtg",6),
勘察未通过容量("kcwtgrl",7),
勘察进行中("kcjxz",8),
勘察进行中容量("kcjxzrl",9),
勘察已完成("kcywc",10),
勘察已完成容量("kcywcrl",11),
备货未通过("bhwtg",12),
备货未通过容量("bhwtgrl",13),
备货进行中("bhjxz",14),
备货进行中容量("bhjxzrl",15),
备货已完成("bhywc",16),
备货已完成容量("bhywcrl",17),
施工未通过("sgwtg",18),
施工未通过容量("sgwtgrl",19),
施工进行中("sgjxz",20),
施工进行中容量("sgjxzrl",21),
施工已完成("sgywc",22),
施工已完成容量("sgywcrl",23),
并网未通过("bwwtg",24),
并网未通过容量("bwwtgrl",25),
并网进行中("bwjxz",26),
并网进行中容量("bwjxzrl",27),
并网已完成("bwywc",28),
并网已完成容量("bwywcrl",29),
验收未通过("yswtg",30),
验收未通过容量("yswtgrl",31),
验收进行中("ysjxz",32),
验收进行中容量("ysjxzrl",33),
验收已完成("ysywc",34),
验收已完成容量("ysywcrl",35),
融资公司("rzgs",36),
融资户数("rzhs",37),
融资容量("rzrl",38),
融资单价("rzdj",39),
放款金额("fkje",40);
/**
* 名称,描述
*/
private String name;
/**
* 编码
*/
private int code;
public static Integer getCodeByName(String name) {
for(StatisicsHomePageEnum obj: StatisicsHomePageEnum.values()) {
if (obj.getName().equals(name)) {
return obj.getCode();
}
}
return null;
}
}
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "BusinessFieldDto", description = "业务字段Dto")
public class BusinessFieldDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "字段名称")
private String fieldName;
@ApiModelProperty(value = "字段标识")
private String fieldFlag;
@ApiModelProperty(value = "业务类型")
private String businessType;
}
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.annotation.JSONField;
import com.alibaba.fastjson.support.spring.annotation.FastJsonFilter;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
import io.swagger.annotations.ApiModel;
......@@ -68,6 +69,7 @@ public class FinancingInfoDto extends BaseDto {
@ApiModelProperty(value = "单价")
private String unitPrice;
@ApiModelProperty(value = "投融创建时间")
private Date trCreateTime;
List<PeasantHousehold> peasantHouseholds;
}
package com.yeejoin.amos.boot.module.hygf.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
import java.util.Map;
@Data
@ApiModel("电站时间批量处理Dto")
public class PowerStationTimeStatisticsBatchDto {
@ApiModelProperty("主键Id")
private List<String> sequenceNbrList;
@ApiModelProperty("过滤字段")
private Map<String, Object> filters;
}
......@@ -102,4 +102,13 @@ public class PowerStationTimeStatisticsDto implements Serializable {
@ApiModelProperty(value = "验收停留时间")
private String ysStopTime;
@ApiModelProperty(value = "投融开始时间")
private Date trCreateTime;
@ApiModelProperty(value = "投融结束时间")
private Date trEndTime;
@ApiModelProperty(value = "投融停留时间")
private String trStopTime;
}
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.yeejoin.amos.boot.module.hygf.api.entity.HygfBusinessField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
import java.util.Map;
@Data
@ApiModel(value = "StationFieldDto", description = "电站字段Dto")
public class StationFieldDto {
@ApiModelProperty(value = "电站ID")
private List<String> stationIdList;
@ApiModelProperty(value = "业务字段主键")
private List<String> businessIdList;
@ApiModelProperty(value = "业务字段")
private List<HygfBusinessField> businessFieldList;
@ApiModelProperty(value = "导出页面Code")
private String exportPageCode;
@ApiModelProperty(value = "过滤条件")
private Map<String, Object> filters;
}
......@@ -82,4 +82,16 @@ public class FinancingInfo extends BaseEntity {
*/
@TableField("unit_price")
private String unitPrice;
/**
* 投融创建时间
*/
@TableField("tr_create_time")
private Date trCreateTime;
/**
* 投融创建时间
*/
@TableField("tr_end_time")
private Date trEndTime;
}
package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@Data
@EqualsAndHashCode()
@Accessors(chain = true)
@TableName("hygf_business_field")
public class HygfBusinessField extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 字段名称
*/
@TableField("field_name")
private String fieldName;
/**
* 字段标识
*/
@TableField("field_flag")
private String fieldFlag;
/**
* 业务类型
*/
@TableField("business_type")
private String businessType;
/**
* 业务名称
*/
@TableField("business_name")
private String businessName;
}
package com.yeejoin.amos.boot.module.hygf.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridRecordDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.WorkOrderPage;
import com.yeejoin.amos.boot.module.hygf.api.entity.HygfBusinessField;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
public interface BusinessFieldMapper extends BaseMapper<HygfBusinessField> {
/**
* 获取电站的电站Id
* @return
*/
@UserEmpower(field = {"hph.regional_companies_code"}, dealerField = {"hph.regional_companies_code"}, fieldConditions = {"in"}, relationship = "and")
List<String> getDzStationIdByProcessStatus(@Param("map") Map<String, Object> map);
/**
* 获取投融的电站Id
* @return
*/
@UserEmpower(field = {"sta.regional_companies_code"},dealerField = {"sta.developer_code","sta.regional_companies_code"},fieldConditions = {"eq","in"},relationship = {"and"})
List<String> getTrStationIdByStatus(@Param(value = "params") Map<String,Object> params,@Param(value = "amosOrgCodes")List<String> amosOrgCodes);
/**
* 获取施工验收场站Id
* @param map
* @return
*/
@UserEmpower(field = {"region_code"}, dealerField = {"hygf_work_order.amos_dealer_org_code","hygf_work_order.region_code","hygf_peasant_household.developer_user_id"}, fieldConditions = {"in", "in", "in"}, relationship = "and")
List<String> getSgysStationId(@Param("dto") Map<String, Object> map);
/**
* 获取并网验收场站Id
* @param map
* @return
*/
@UserEmpower(field ={"hph.regional_companies_code"} ,dealerField={"hph.developer_code","hph.regional_companies_code","hph.developer_user_id"},fieldConditions ={"in","in","in"} ,relationship="and")
List<String> getBwysStationId(@Param("map") Map<String, Object> map);
/**
* 获取验收审核场站Id
* @param map
* @return
*/
@UserEmpower(field ={"hph.regional_companies_code"} ,dealerField={"hph.developer_code","hph.regional_companies_code","hph.developer_user_id"},fieldConditions ={"in","in","in"} ,relationship="and")
List<String> getYsshStationId(@Param("map") Map<String, Object> map);
/**
* 获取发货场站
* @param map
* @return
*/
@UserEmpower(field ={"regional_companies_code"} ,dealerField={"developer_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<String> getFhStationId (@Param("map") Map<String, Object> map);
/**
* 获取基本信息
* @param stationIdList
* @return
*/
List<Map<String, Object>> getBasicInformation(@Param("list") List<String> stationIdList);
/**
* 获取勘察信息
* @param stationIdList
* @return
*/
List<Map<String, Object>> getSurveyInformation(@Param("list") List<String> stationIdList);
/**
* 获取设计信息
* @param stationIdList
* @return
*/
List<Map<String, Object>> getDesignInformation(@Param("list") List<String> stationIdList);
/**
* 获取商务信息
* @param stationIdList
* @return
*/
List<Map<String, Object>> getBusinessInformation(@Param("list") List<String> stationIdList);
/**
* 获取扩展信息
* @param stationIdList
* @return
*/
List<Map<String, Object>> getExtendedInformation(@Param("list") List<String> stationIdList);
/**
* 获取资料归档信息
* @param stationIdList
* @return
*/
List<Map<String, Object>> getArchivingInformation(@Param("list") List<String> stationIdList);
/**
* 获取工程信息
* @param stationIdList
* @return
*/
List<Map<String, Object>> getEngineeringInformation(@Param("list") List<String> stationIdList);
/**
* 获取并网信息
* @param stationIdList
* @return
*/
List<Map<String, Object>> getGridInformation(@Param("list") List<String> stationIdList);
/**
* 获取派工单信息
* @param stationIdList
* @return
*/
List<Map<String, Object>> getDispatchOrderInformation(@Param("list") List<String> stationIdList);
}
......@@ -35,4 +35,8 @@ public interface FinancingInfoMapper extends BaseMapper<FinancingInfo> {
List<Map<String,Object>> selectRegionByParentCode(String parentCode, String level);
List<Map<String, Object>> getTrCreateTime();
List<Map<String, Object>> getTrEndTime();
}
......@@ -45,6 +45,8 @@ public interface JpStationMapper extends BaseMapper<JpStation> {
List<String> getRegionNode(String province);
List<String> getRegionNodeByCode(String code);
List<DropDown> getRegionAll();
@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")
......
......@@ -73,10 +73,11 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
/**
* 获取所有电站详情
* @param map
* @return
*/
@UserEmpower(field = {"hph.regional_companies_code"}, dealerField = {"hph.regional_companies_code"}, fieldConditions = {"in"}, relationship = "and")
List<PowerStationTimeStatisticsDto> getAllPowerStationTimeDetail();
List<PowerStationTimeStatisticsDto> getAllPowerStationTimeDetail(@Param("map")Map<String, Object> map);
List<PowerStationTimeStatisticsDto> getKcTime(@Param("list") List<Long> peasantHouseholdIdList);
......@@ -92,5 +93,7 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
List<PowerStationTimeStatisticsDto> getYsTime(@Param("list") List<Long> peasantHouseholdIdList);
List<PowerStationTimeStatisticsDto> getTrTime(@Param("list") List<Long> peasantHouseholdIdList);
// String getHygfCommercialScale(Long surveyInformationId);
}
package com.yeejoin.amos.boot.module.hygf.api.mapper;
import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import java.util.Map;
public interface StatisticsHomepageMapper {
@UserEmpower(field ={"ph.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
public List<Map<String,Object>> surveyStatusTotal(@RequestParam(value = "developerCode") String developerCode, @RequestParam(value = "regionalCompaniesCode")String regionalCompaniesCode, @RequestParam(value = "province")String province, @RequestParam(value = "city") String city, @RequestParam(value = "district")String district);
@UserEmpower(field ={"hygf_peasant_household.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
public int selectWKC(@RequestParam(value = "developerCode") String developerCode, @RequestParam(value = "regionalCompaniesCode")String regionalCompaniesCode, @RequestParam(value = "province")String province, @RequestParam(value = "city") String city, @RequestParam(value = "district")String district);
@UserEmpower(field ={"ph.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
public List<Map<String,Object>> homePageExport(@RequestParam(value = "developerCode") String developerCode, @RequestParam(value = "regionalCompaniesCode")String regionalCompaniesCode, @RequestParam(value = "province")String province, @RequestParam(value = "city") String city, @RequestParam(value = "district")String district);
@UserEmpower(field ={"b.regionalCompaniesCode"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
public List<Map<String,Object>> merCount(@RequestParam(value = "developerCode") String developerCode, @RequestParam(value = "regionalCompaniesCode")String regionalCompaniesCode, @RequestParam(value = "province")String province, @RequestParam(value = "city") String city, @RequestParam(value = "district")String district);
@UserEmpower(field ={"ph.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
public List<Map<String,Object>> contractStatusTotal(@RequestParam(value = "developerCode") String developerCode, @RequestParam(value = "regionalCompaniesCode")String regionalCompaniesCode, @RequestParam(value = "province")String province, @RequestParam(value = "city") String city, @RequestParam(value = "district")String district);
@UserEmpower(field ={"hygf_peasant_household.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
public List<Map<String,Object>> desionTotal(@RequestParam(value = "developerCode") String developerCode, @RequestParam(value = "regionalCompaniesCode")String regionalCompaniesCode, @RequestParam(value = "province")String province, @RequestParam(value = "city") String city, @RequestParam(value = "district")String district);
@UserEmpower(field ={"hygf_peasant_household.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
public List<Map<String,Object>> preparationMoneyTotal(@RequestParam(value = "developerCode") String developerCode, @RequestParam(value = "regionalCompaniesCode")String regionalCompaniesCode, @RequestParam(value = "province")String province, @RequestParam(value = "city") String city, @RequestParam(value = "district")String district);
@UserEmpower(field ={"hygf_peasant_household.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
public List<Map<String,Object>> workOrderTotal(@RequestParam(value = "developerCode") String developerCode, @RequestParam(value = "regionalCompaniesCode")String regionalCompaniesCode, @RequestParam(value = "province")String province, @RequestParam(value = "city") String city, @RequestParam(value = "district")String district);
@UserEmpower(field ={"hygf_peasant_household.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
public List<Map<String,Object>> gridStatusTotal(@RequestParam(value = "developerCode") String developerCode, @RequestParam(value = "regionalCompaniesCode")String regionalCompaniesCode, @RequestParam(value = "province")String province, @RequestParam(value = "city") String city, @RequestParam(value = "district")String district);
@UserEmpower(field ={"hygf_peasant_household.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
public List<Map<String,Object>> acceptanceStatusTotal(@RequestParam(value = "developerCode") String developerCode, @RequestParam(value = "regionalCompaniesCode")String regionalCompaniesCode, @RequestParam(value = "province")String province, @RequestParam(value = "city") String city, @RequestParam(value = "district")String district);
@UserEmpower(field ={"hph.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
public List<Map<String,Object>> financingStatusTotal(@RequestParam(value = "developerCode") String developerCode, @RequestParam(value = "regionalCompaniesCode")String regionalCompaniesCode, @RequestParam(value = "province")String province, @RequestParam(value = "city") String city, @RequestParam(value = "district")String district);
@UserEmpower(field ={"hygf_peasant_household.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
public List<Map<String,Object>> inverterTotal(@RequestParam(value = "developerCode") String developerCode, @RequestParam(value = "regionalCompaniesCode")String regionalCompaniesCode, @RequestParam(value = "province")String province, @RequestParam(value = "city") String city, @RequestParam(value = "district")String district, @RequestParam(value = "regions")List<String> regions);
@UserEmpower(field ={"jp.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
public List<Map<String,Object>> inverterTotalJp(@RequestParam(value = "developerCode") String developerCode, @RequestParam(value = "regionalCompaniesCode")String regionalCompaniesCode, @RequestParam(value = "province")String province, @RequestParam(value = "city") String city, @RequestParam(value = "district")String district, @RequestParam(value = "regions")List<String> regions);
@UserEmpower(field ={"hygf_peasant_household.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
public Map<String,Object> stationNum(String developerCode, String regionalCompaniesCode, String province, String city, String district);
@UserEmpower(field ={"ph.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
public Map<String,Object> statisticsPowerStation(String developerCode, String regionalCompaniesCode, String province, String city, String district);
@UserEmpower(field ={"hygf_peasant_household.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
public Map<String,Object> statisticsPreparationMoney(String developerCode, String regionalCompaniesCode, String province, String city, String district);
public String selectProvince (String regionSeq);
@UserEmpower(field ={"hygf_repayment.regional_companies_code"},dealerField ={"hygf_peasant_household.developer_code"} ,fieldConditions ={"eq"} ,relationship="and")
public List<Map<String,Object>> getRent (@RequestParam(value = "regionalCompaniesCode") String regionalCompaniesCode, @RequestParam(value = "regions")List<String> regions);
}
package com.yeejoin.amos.boot.module.hygf.api.service;
public interface IBusinessFieldService {
}
......@@ -143,4 +143,21 @@
PARENT_REGION_CODE = #{parentCode} and LEVEL = #{level}
</select>
<select id="getTrCreateTime" resultType="java.util.Map">
SELECT hfi.sequence_nbr as sequenceNbr,max(hfa.rec_date) AS time
FROM
hygf_financing_info hfi
LEFT JOIN hygf_financing_auditing hfa ON hfa.peasant_household_id=hfi.peasant_household_id
WHERE hfa.next_node_name='融资审核'
GROUP BY hfi.sequence_nbr
</select>
<select id="getTrEndTime" resultType="java.util.Map">
SELECT hfi.sequence_nbr as sequenceNbr,hfa.rec_date AS time
FROM
hygf_financing_info hfi
LEFT JOIN hygf_financing_auditing hfa ON hfa.peasant_household_id=hfi.peasant_household_id
WHERE hfa.next_node_name is null
</select>
</mapper>
......@@ -273,6 +273,28 @@
Subtree;
</select>
<select id="getRegionNodeByCode" resultType="string">
WITH RECURSIVE Subtree AS (
SELECT
SEQUENCE_NBR
FROM
systemctl_region sr
WHERE
sr.REGION_CODE = #{code}
UNION ALL
SELECT
h.SEQUENCE_NBR
FROM
systemctl_region h
JOIN
Subtree s ON h.PARENT_ID = s.SEQUENCE_NBR
)
SELECT
*
FROM
Subtree;
</select>
<select id="getRegionByProvince" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DropDown">
SELECT privilege_company.ORG_CODE orgCode,
......
......@@ -245,6 +245,7 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
</foreach>
</if>
</where>
ORDER BY hph.rec_date DESC ,hph.sequence_nbr DESC
</select>
<select id="getAllPowerStationTimeDetail"
......@@ -263,6 +264,21 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
LEFT JOIN hygf_commercial hc ON hc.survey_information_id = hph.survey_information_id
LEFT JOIN hygf_work_order_power_station hwops ON hph.sequence_nbr = hwops.peasant_household_id
LEFT JOIN hygf_power_station_engineering_info hpsei ON hwops.sequence_nbr = hpsei.work_order_power_station_id
<where>
<if test="map.ownersName!=null and map.ownersName !=''">
and hph.owners_name like concat ('%',#{map.ownersName},'%')
</if>
<if test="map.province!=null and map.province !=''">
and hph.project_address_name like concat ('%',#{map.province},'%')
</if>
<if test="map.regionalCompaniesName!=null and map.regionalCompaniesName !=''">
and hph.regional_companies_name like concat ('%',#{map.regionalCompaniesName},'%')
</if>
<if test="map.serviceAgent!=null and map.serviceAgent !=''">
and hph.developer_name like concat ('%',#{map.serviceAgent},'%')
</if>
</where>
ORDER BY hph.rec_date DESC ,hph.sequence_nbr DESC
</select>
<select id="getKcTime"
......@@ -371,6 +387,21 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
</if>
</where>
</select>
<select id="getTrTime"
resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationTimeStatisticsDto">
SELECT peasant_household_id as sequenceNbr,tr_create_time,tr_end_time
FROM
hygf_financing_info
<where>
<if test="list != null and list.size()>0">
AND peasant_household_id IN
<foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</where>
</select>
<!-- <select id="getHygfCommercialScale" resultType="String">-->
<!-- select scale from hygf_commercial where survey_information_id=${surveyInformationId}-->
<!-- </select>-->
......
......@@ -2,42 +2,81 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationMapper">
<select id="queryPage" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationDto">
select DISTINCT
hygf_power_station.*,
b.initiate_status,
b.contract_lock_id,
hygf_peasant_household.regional_companies_code,
hygf_peasant_household.regional_companies_name,
hygf_peasant_household.developer_code,
hygf_peasant_household.developer_user_id,
hygf_peasant_household.project_address_detail,
substring_index ( hygf_peasant_household.project_address_name, '/', 1 ) AS province,
b.stamp_status,
b.status
from hygf_power_station LEFT JOIN ( SELECT bb.peasant_household_id, initiate_status, contract_lock_id, stamp_status, status FROM (SELECT peasant_household_id,MAX(sequence_nbr) AS sequence_nbr from hygf_household_contract GROUP BY peasant_household_id ) aa LEFT JOIN hygf_household_contract bb ON aa.sequence_nbr=bb.sequence_nbr) b on b.peasant_household_id=hygf_power_station.peasant_household_id
LEFT JOIN hygf_peasant_household on hygf_peasant_household.sequence_nbr=hygf_power_station.peasant_household_id
where hygf_power_station.is_delete=0
<if test="powerStationCode!=null and powerStationCode!=''">
and hygf_power_station.power_station_code like concat(concat('%',#{powerStationCode}),'%')
SELECT DISTINCT
ps.sequence_nbr,
ps.power_station_code,
ps.owners_name,
ps.project_address,
ps.service_agent,
ps.power_station_type,
ps.process_status,
ps.design_status,
ps.business_status,
ps.technology_status,
ps.process_instance_id,
ps.peasant_household_id,
ps.task_id,
ps.node_routing,
ps.process_definition_id,
ps.node_role,
ps.next_process_node,
ps.flow_task_id,
ps.plan_instance_id,
ps.drawing_review,
ps.next_node_name,
ps.next_execute_user_ids,
lc.initiate_status,
lc.contract_lock_id,
ph.regional_companies_code,
ph.regional_companies_name,
ph.developer_code,
ph.developer_user_id,
ph.project_address_detail,
SUBSTRING_INDEX(ph.project_address_name, '/', 1) AS province,
lc.stamp_status,
lc.status
FROM
hygf_power_station ps
LEFT JOIN (
SELECT
peasant_household_id,
initiate_status,
contract_lock_id,
stamp_status,
status
FROM (
SELECT
hhc.*,
ROW_NUMBER() OVER (PARTITION BY peasant_household_id ORDER BY sequence_nbr DESC) AS rn
FROM
hygf_household_contract hhc
) subq
WHERE subq.rn = 1
) lc
ON lc.peasant_household_id = ps.peasant_household_id
LEFT JOIN hygf_peasant_household ph
ON ph.sequence_nbr = ps.peasant_household_id
WHERE
ps.is_delete = 0
<if test="powerStationCode != null and powerStationCode != ''">
AND ps.power_station_code LIKE CONCAT('%', #{powerStationCode}, '%')
</if>
<if test="ownersName!=null and ownersName!=''">
and hygf_power_station.owners_name like concat(concat('%',#{ownersName}),'%')
<if test="ownersName != null and ownersName != ''">
AND ps.owners_name LIKE CONCAT('%', #{ownersName}, '%')
</if>
<if test="serviceAgent!=null and serviceAgent!=''">
and hygf_power_station.service_agent like concat(concat('%',#{serviceAgent}),'%')
<if test="serviceAgent != null and serviceAgent != ''">
AND ps.service_agent LIKE CONCAT('%', #{serviceAgent}, '%')
</if>
<if test="regionalCompaniesName!=null and regionalCompaniesName!=''">
and hygf_peasant_household.regional_companies_name like concat(concat('%',#{regionalCompaniesName}),'%')
<if test="regionalCompaniesName != null and regionalCompaniesName != ''">
AND ph.regional_companies_name LIKE CONCAT('%', #{regionalCompaniesName}, '%')
</if>
<if test="processStatus != null and processStatus != ''">
and hygf_power_station.process_status = #{processStatus}
AND ps.process_status = #{processStatus}
</if>
<if test="province != null and province != ''">
and hygf_peasant_household.project_address like concat(concat('%',#{province}),'%')
AND ph.project_address_name LIKE CONCAT('%', #{province}, '%')
</if>
<!-- GROUP BY hygf_peasant_household.sequence_nbr-->
ORDER BY hygf_power_station.rec_date desc
ORDER BY ps.rec_date DESC
</select>
<select id="getInstanceIdByhouseId" resultType="java.lang.String">
select process_instance_id From hygf_power_station where peasant_household_id = #{peasantHouseholdId}
......
package com.yeejoin.amos.boot.module.hygf.biz.controller;
import com.yeejoin.amos.boot.module.hygf.api.dto.StationFieldDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.HygfBusinessField;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.BusinessFieldServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
@RestController
@Api(tags = "业务字段Api")
@RequestMapping(value = "/businessField")
public class BusinessFieldController {
@Autowired
BusinessFieldServiceImpl businessFieldService;
/**
* 获取所有的字段
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getAllField")
@ApiOperation(httpMethod = "GET",value = "获取所有的字段", notes = "获取所有的字段")
public ResponseModel<Map<String,List<HygfBusinessField>>> getAllField() {
return ResponseHelper.buildResponse(businessFieldService.getAllField());
}
/**
* 导出电站Excel
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/exportStationExcelByField")
@ApiOperation(httpMethod = "POST", value = "导出电站Excel根据字段", notes = "导出电站Excel根据字段")
public void exportStationExcelByField(@RequestBody StationFieldDto stationFieldDto, HttpServletResponse response) {
businessFieldService.exportStationExcelByField(stationFieldDto, response);
}
}
package com.yeejoin.amos.boot.module.hygf.biz.controller;
import com.google.common.net.HttpHeaders;
import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
import com.yeejoin.amos.boot.module.hygf.api.dto.CommerceInfoDto;
import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.CommonServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.FinancingInfoServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.StatisticsHomepageServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -28,6 +30,8 @@ public class CommonController {
FinancingInfoServiceImpl financingInfoService;
@Autowired
CommonServiceImpl commonService;
@Autowired
StatisticsHomepageServiceImpl statisticsHomepageService;
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/selectRegion")
......@@ -95,4 +99,65 @@ public class CommonController {
}
/**
* 统计首页环形图
*
* @return
*/
@GetMapping(value = "/statisticsHomepage")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "首页统计环形图及统计表", notes = "首页统计环形图及统计表")
@UserLimits
public ResponseModel<Map<String, Object>> statisticsHomepage(@RequestParam(required = false) String developerCode,
@RequestParam(required = false) String regionalCompaniesCode,
@RequestParam(required = false) String province,
@RequestParam(required = false) String city,
@RequestParam(required = false) String district) {
return ResponseHelper.buildResponse(statisticsHomepageService.statisticsHomepage(developerCode,regionalCompaniesCode,province,city,district));
}
/**
* 统计首页环形图
*
* @return
*/
@GetMapping(value = "/statisticsTop")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "列表上方统计表", notes = "列表上方统计表")
@UserLimits
public ResponseModel<Map<String, Object>> statisticsTop(@RequestParam(required = false) String developerCode,
@RequestParam(required = false) String regionalCompaniesCode,
@RequestParam(required = false) String province,
@RequestParam(required = false) String city,
@RequestParam(required = true) String type,
@RequestParam(required = false) String district) {
return ResponseHelper.buildResponse(statisticsHomepageService.statisticsTop(type,developerCode,regionalCompaniesCode,province,city,district));
}
/**
* 统计首页环形图
*
* @return
*/
@GetMapping(value = "/homePageExport")
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "资料下载进度获取", notes = "资料下载进度获取")
@UserLimits
public void homePageExport(@RequestParam(required = false) String developerCode,
@RequestParam(required = false) String regionalCompaniesCode,
@RequestParam(required = false) String province,
@RequestParam(required = false) String city,
@RequestParam(required = false) String district,
HttpServletResponse response) throws IOException {
statisticsHomepageService.homePageExport(developerCode,regionalCompaniesCode,province,city,district,response);
}
}
......@@ -305,14 +305,14 @@ public class PeasantHouseholdController extends BaseController {
return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.deleteUser(sequenceNbr, peasantHouseholdNo));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST",value = "更新详情信息", notes = "更新详情信息")
@PostMapping(value = "/saveHistory")
public ResponseModel updateDetail(@RequestBody PowerStationEngineeringInfoAllDto powerStationEngineeringInfoAllDto,@RequestParam(value = "operationType") String operationType) {
peasantHouseholdServiceImpl.saveHistoryPeasantHousehold(powerStationEngineeringInfoAllDto,operationType);
return ResponseHelper.buildResponse(null);
}
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @ApiOperation(httpMethod = "POST",value = "更新详情信息", notes = "更新详情信息")
// @PostMapping(value = "/saveHistory")
// public ResponseModel updateDetail(@RequestBody PowerStationEngineeringInfoAllDto powerStationEngineeringInfoAllDto,@RequestParam(value = "operationType") String operationType) {
//
// peasantHouseholdServiceImpl.saveHistoryPeasantHousehold(powerStationEngineeringInfoAllDto,operationType);
// return ResponseHelper.buildResponse(null);
// }
/**
......
......@@ -49,8 +49,8 @@ public class PowerStationStatisticsController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/exportPowerStationExcel")
@ApiOperation(httpMethod = "POST", value = "导出电站Excel", notes = "导出电站Excel")
public ResponseModel<?> exportPowerStationExcel(@RequestBody PowerStationTimeStatisticsBatchDto powerStationTimeStatisticsBatchDto, HttpServletResponse response) {
powerStationStatisticsService.exportPowerStationExcel(powerStationTimeStatisticsBatchDto.getSequenceNbrList(), response);
public ResponseModel<?> exportPowerStationExcel(@RequestBody PowerStationTimeStatisticsBatchDto statisticsBatchDto, HttpServletResponse response) {
powerStationStatisticsService.exportPowerStationExcel(statisticsBatchDto, response);
return ResponseHelper.buildResponse(null);
}
......
package com.yeejoin.amos.boot.module.hygf.biz.excel.Enum;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Map;
@Getter
@AllArgsConstructor
public enum BusinessTypeEnum {
BASIC_INFORMATION("基本信息"),
SURVEY_INFORMATION("勘察信息"),
DESIGN_INFORMATION("设计信息"),
BUSINESS_INFORMATION("商务信息"),
EXTENDED_INFORMATION("扩展信息"),
ARCHIVING_INFORMATION("资料归档"),
ENGINEERING_INFORMATION("工程信息"),
GRID_INFORMATION("并网信息"),
DISPATCH_ORDER_INFORMATION("派工单信息"),
;
private String name;
public static BusinessTypeEnum getEnumByName(String name) {
for (BusinessTypeEnum businessTypeEnum : BusinessTypeEnum.values()) {
if (businessTypeEnum.getName().equals(name)) {
return businessTypeEnum;
}
}
return null;
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.Enum;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public enum ExportPageEnum {
DZJXZ("0", "电站进行中"),
DZBTG("1", "电站不通过"),
DZWC("2", "电站完成"),
TRDTS("3", "投融待推送"),
TRWTG("4", "投融未通过"),
TRYFK("5", "投融已放款"),
TRDFK("6", "投融待放款"),
TRYTS("7", "投融已推送"),
RZDSH("8", "融资待审核"),
RZDFK("9", "融资待放款"),
RZYFK("10", "融资已放款"),
RZWTG("11", "融资未通过"),
SGYS("12", "施工验收"),
BWYS("13", "并网验收"),
YSSH("14", "验收审核"),
FHDFH("15", "发货待发货"),
FHYFH("16", "发货已发货"),
UN_KNOW("","未识别的类型")
;
private String code;
private String remark;
public static ExportPageEnum getEnumByCode(String code) {
for (ExportPageEnum exportPageEnum : ExportPageEnum.values()) {
if (exportPageEnum.getCode().equals(code)) {
return exportPageEnum;
}
}
return UN_KNOW;
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.factory;
import com.yeejoin.amos.boot.module.hygf.biz.excel.Enum.ExportPageEnum;
import com.yeejoin.amos.boot.module.hygf.biz.excel.impl.*;
import com.yeejoin.amos.boot.module.hygf.biz.excel.service.IExportPageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
@Component
public class ExportPageFactory {
@Autowired
private DzjxzServiceImpl dzjxzService;
@Autowired
private DzbtgServiceImpl dzbtgService;
@Autowired
private DzwcServiceImpl dzwcService;
@Autowired
private TrdtsServiceImpl trdtsService;
@Autowired
private TrwtgServiceImpl trwtgService;
@Autowired
private TryfkServiceImpl tryfkService;
@Autowired
private TrdfkServiceImpl trdfkService;
@Autowired
private TrytsServiceImpl trytsService;
@Autowired
private RzdshServiceImpl rzdshService;
@Autowired
private RzdfkServiceImpl rzdfkService;
@Autowired
private RzyfkServiceImpl rzyfkService;
@Autowired
private RzwtgServiceImpl rzwtgService;
@Autowired
private SgysServiceImpl sgysService;
@Autowired
private BwysServiceImpl bwysService;
@Autowired
private YsshServiceImpl ysshService;
@Autowired
private FhdfhServiceImpl fhdfhService;
@Autowired
private FhyfhServiceImpl fhyfhService;
public IExportPageService getExportPage(ExportPageEnum dataType) {
switch (dataType) {
case DZJXZ:
return dzjxzService;
case DZBTG:
return dzbtgService;
case DZWC:
return dzwcService;
case TRDTS:
return trdtsService;
case TRWTG:
return trwtgService;
case TRYFK:
return tryfkService;
case TRDFK:
return trdfkService;
case TRYTS:
return trytsService;
case RZDSH:
return rzdshService;
case RZDFK:
return rzdfkService;
case RZYFK:
return rzyfkService;
case RZWTG:
return rzwtgService;
case SGYS:
return sgysService;
case BWYS:
return bwysService;
case YSSH:
return ysshService;
case FHDFH:
return fhdfhService;
case FHYFH:
return fhyfhService;
default:
throw new BadRequest("没有找到匹配的页面类型");
}
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.impl;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.dto.WorkOrderPage;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BusinessFieldMapper;
import com.yeejoin.amos.boot.module.hygf.biz.excel.service.IExportPageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.util.*;
@Service
public class BwysServiceImpl implements IExportPageService {
@Autowired
private BusinessFieldMapper businessFieldMapper;
@Autowired
private RedisUtils redisUtils;
@Value("${admin.engineering.roleId}")
Long engineeringId;
@Value("${admin.area.roleId}")
Long areaId;
@Value("${admin.design.roleId}")
Long designId;
@Value("${admin.delerAdmin.roleId}")
Long delerAdminId;
@Override
public List<String> getStationId(Map<String, Object> filters) {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
List<String> basicGridNodes = new ArrayList<>();
List<Long> roleIds = new ArrayList<>();
for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
roleIds.addAll(longs);
if (longs.contains(areaId)) {
basicGridNodes.add("bw-area");
}
if (longs.contains(engineeringId)) {
basicGridNodes.add("bw-engineering");
}
if (longs.contains(designId)) {
basicGridNodes.add("bw-design");
}
if (longs.contains(delerAdminId)) {
basicGridNodes.add("bw-design");
basicGridNodes.add("bw-engineering");
basicGridNodes.add("bw-area");
}
}
Map<String, Object> map = new HashMap<>();
map.put("basicGridNodes", basicGridNodes);
map.put("type", "1");
if (Objects.nonNull(filters)) {
map.putAll(filters);
}
return businessFieldMapper.getBwysStationId(map);
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.impl;
import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationProcessStateEnum;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BusinessFieldMapper;
import com.yeejoin.amos.boot.module.hygf.biz.excel.service.IExportPageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@Service
public class DzbtgServiceImpl implements IExportPageService {
@Autowired
private BusinessFieldMapper businessFieldMapper;
@Override
public List<String> getStationId(Map<String, Object> filters) {
Map<String, Object> map = new HashMap<>();
map.put("processStatus", PowerStationProcessStateEnum.不通过.getName());
if (Objects.nonNull(filters)) {
map.putAll(filters);
}
return businessFieldMapper.getDzStationIdByProcessStatus(map);
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.impl;
import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationProcessStateEnum;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BusinessFieldMapper;
import com.yeejoin.amos.boot.module.hygf.biz.excel.service.IExportPageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
@Service
public class DzjxzServiceImpl implements IExportPageService {
@Autowired
private BusinessFieldMapper businessFieldMapper;
@Override
public List<String> getStationId(Map<String, Object> filters) {
Map<String, Object> map = new HashMap<>();
map.put("processStatus", PowerStationProcessStateEnum.进行中.getName());
if (Objects.nonNull(filters)) {
map.putAll(filters);
}
return businessFieldMapper.getDzStationIdByProcessStatus(map);
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.impl;
import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationProcessStateEnum;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BusinessFieldMapper;
import com.yeejoin.amos.boot.module.hygf.biz.excel.service.IExportPageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
@Service
public class DzwcServiceImpl implements IExportPageService {
@Autowired
private BusinessFieldMapper businessFieldMapper;
@Override
public List<String> getStationId(Map<String, Object> filters) {
Map<String, Object> map = new HashMap<>();
map.put("processStatus", PowerStationProcessStateEnum.完成.getName());
if (Objects.nonNull(filters)) {
map.putAll(filters);
}
return businessFieldMapper.getDzStationIdByProcessStatus(map);
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.impl;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BusinessFieldMapper;
import com.yeejoin.amos.boot.module.hygf.biz.excel.service.IExportPageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@Service
public class FhdfhServiceImpl implements IExportPageService {
@Autowired
private BusinessFieldMapper businessFieldMapper;
@Override
public List<String> getStationId(Map<String, Object> filters) {
Map<String, Object> map = new HashMap<>();
map.put("preparationMoneyState", "0");
if (Objects.nonNull(filters)) {
map.putAll(filters);
map.put("regionalCompaniesSeq",filters.get("regionalcompaniesSeq"));
}
return businessFieldMapper.getFhStationId(map);
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.impl;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BusinessFieldMapper;
import com.yeejoin.amos.boot.module.hygf.biz.excel.service.IExportPageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@Service
public class FhyfhServiceImpl implements IExportPageService {
@Autowired
private BusinessFieldMapper businessFieldMapper;
@Override
public List<String> getStationId(Map<String, Object> filters) {
Map<String, Object> map = new HashMap<>();
map.put("preparationMoneyState", "1");
if (Objects.nonNull(filters)) {
map.putAll(filters);
map.put("regionalCompaniesSeq",filters.get("regionalcompaniesSeq"));
}
return businessFieldMapper.getFhStationId(map);
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.impl;
import com.alibaba.fastjson.JSON;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.entity.StdUserEmpower;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BusinessFieldMapper;
import com.yeejoin.amos.boot.module.hygf.biz.excel.service.IExportPageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.util.*;
@Service
public class RzdfkServiceImpl implements IExportPageService {
@Autowired
private BusinessFieldMapper businessFieldMapper;
@Autowired
private RedisUtils redisUtils;
@Override
public List<String> getStationId(Map<String, Object> filters) {
StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
List<String> amosOrgCodes = orgCode.getAmosOrgCode();
Map<String, Object> params = new HashMap<>();
String status = "审核通过";
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
Long sequenceNbr = reginParams.getCompany().getSequenceNbr();
params.put("financingCompaniesSeq", String.valueOf(sequenceNbr));
if (Objects.nonNull(filters)) {
params.putAll(filters);
}
params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : Arrays.asList(filters.get("status")));
params.put("type", "2");
return businessFieldMapper.getTrStationIdByStatus(params, amosOrgCodes);
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.impl;
import com.alibaba.fastjson.JSON;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.entity.StdUserEmpower;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BusinessFieldMapper;
import com.yeejoin.amos.boot.module.hygf.biz.excel.service.IExportPageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.util.*;
@Service
public class RzdshServiceImpl implements IExportPageService {
@Autowired
private BusinessFieldMapper businessFieldMapper;
@Autowired
private RedisUtils redisUtils;
@Override
public List<String> getStationId(Map<String, Object> filters) {
StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
List<String> amosOrgCodes = orgCode.getAmosOrgCode();
Map<String, Object> params = new HashMap<>();
String status="待融资审核";
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
Long sequenceNbr = reginParams.getCompany().getSequenceNbr();
params.put("financingCompaniesSeq", String.valueOf(sequenceNbr));
if (Objects.nonNull(filters)) {
params.putAll(filters);
}
params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : Arrays.asList(filters.get("status")));
params.put("type", "2");
return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.impl;
import com.alibaba.fastjson.JSON;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.entity.StdUserEmpower;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BusinessFieldMapper;
import com.yeejoin.amos.boot.module.hygf.biz.excel.service.IExportPageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.util.*;
@Service
public class RzwtgServiceImpl implements IExportPageService {
@Autowired
private BusinessFieldMapper businessFieldMapper;
@Autowired
private RedisUtils redisUtils;
@Override
public List<String> getStationId(Map<String, Object> filters) {
StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
List<String> amosOrgCodes = orgCode.getAmosOrgCode();
Map<String, Object> params = new HashMap<>();
String status="审核不通过,重新验收";
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
Long sequenceNbr = reginParams.getCompany().getSequenceNbr();
params.put("financingCompaniesSeq", String.valueOf(sequenceNbr));
if (Objects.nonNull(filters)) {
params.putAll(filters);
}
params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : Arrays.asList(filters.get("status")));
params.put("type", "2");
return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.impl;
import com.alibaba.fastjson.JSON;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.entity.StdUserEmpower;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BusinessFieldMapper;
import com.yeejoin.amos.boot.module.hygf.biz.excel.service.IExportPageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.util.*;
@Service
public class RzyfkServiceImpl implements IExportPageService {
@Autowired
private BusinessFieldMapper businessFieldMapper;
@Autowired
private RedisUtils redisUtils;
@Override
public List<String> getStationId(Map<String, Object> filters) {
StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
List<String> amosOrgCodes = orgCode.getAmosOrgCode();
Map<String, Object> params = new HashMap<>();
String status="已放款,放款完成";
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
Long sequenceNbr = reginParams.getCompany().getSequenceNbr();
params.put("financingCompaniesSeq", String.valueOf(sequenceNbr));
if (Objects.nonNull(filters)) {
params.putAll(filters);
}
params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : Arrays.asList(filters.get("status")));
params.put("type", "2");
return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.impl;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.dto.WorkOrderPage;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BusinessFieldMapper;
import com.yeejoin.amos.boot.module.hygf.biz.excel.service.IExportPageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.util.*;
@Service
public class SgysServiceImpl implements IExportPageService {
@Autowired
private BusinessFieldMapper businessFieldMapper;
@Autowired
private RedisUtils redisUtils;
@Value("${admin.engineering.roleId}")
Long engineeringId;
@Value("${admin.area.roleId}")
Long areaId;
@Value("${admin.design.roleId}")
Long designId;
@Value("${admin.delerAdmin.roleId}")
Long delerAdminId;
@Override
public List<String> getStationId(Map<String, Object> filters) {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
List<String> workOrderPowerStationNodes = new ArrayList<>();
Map<String,Object> map =new HashMap<>();
List<Long> roleIds = new ArrayList<>();
for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
if (longs.contains(areaId)) {
workOrderPowerStationNodes.add("area");
}
if (longs.contains(engineeringId)) {
workOrderPowerStationNodes.add("engineering");
}
if (longs.contains(designId)) {
workOrderPowerStationNodes.add("design");
}
if (longs.contains(delerAdminId)) {
workOrderPowerStationNodes.add("design");
workOrderPowerStationNodes.add("engineering");
workOrderPowerStationNodes.add("area");
}
roleIds.addAll(longs);
}
map.put("workOrderPowerStationNodes",workOrderPowerStationNodes);
if (Objects.nonNull(filters)) {
map.putAll(filters);
}
return businessFieldMapper.getSgysStationId(map);
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.impl;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.entity.StdUserEmpower;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BusinessFieldMapper;
import com.yeejoin.amos.boot.module.hygf.biz.excel.service.IExportPageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.util.*;
@Service
public class TrdfkServiceImpl implements IExportPageService {
@Autowired
private BusinessFieldMapper businessFieldMapper;
@Autowired
private RedisUtils redisUtils;
@Override
public List<String> getStationId(Map<String, Object> filters) {
StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
List<String> amosOrgCodes = orgCode.getAmosOrgCode();
Map<String, Object> params = new HashMap<>();
String status = "审核通过";
if (Objects.nonNull(filters)) {
params.putAll(filters);
}
params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : Arrays.asList(filters.get("status")));
params.put("type", "1");
return businessFieldMapper.getTrStationIdByStatus(params, amosOrgCodes);
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.impl;
import com.alibaba.fastjson.JSON;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.entity.StdUserEmpower;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BusinessFieldMapper;
import com.yeejoin.amos.boot.module.hygf.biz.excel.service.IExportPageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.util.*;
@Service
public class TrdtsServiceImpl implements IExportPageService {
@Autowired
private BusinessFieldMapper businessFieldMapper;
@Autowired
private RedisUtils redisUtils;
@Override
public List<String> getStationId(Map<String, Object> filters) {
StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
List<String> amosOrgCodes = orgCode.getAmosOrgCode();
Map<String, Object> params = new HashMap<>();
String status="待推送";
if (Objects.nonNull(filters)) {
params.putAll(filters);
}
params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : Arrays.asList(filters.get("status")));
params.put("type", "1");
return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.impl;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.entity.StdUserEmpower;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BusinessFieldMapper;
import com.yeejoin.amos.boot.module.hygf.biz.excel.service.IExportPageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.util.*;
@Service
public class TrwtgServiceImpl implements IExportPageService {
@Autowired
private BusinessFieldMapper businessFieldMapper;
@Autowired
private RedisUtils redisUtils;
@Override
public List<String> getStationId(Map<String, Object> filters) {
StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
List<String> amosOrgCodes = orgCode.getAmosOrgCode();
Map<String, Object> params = new HashMap<>();
String status="审核不通过,重新验收";
if (Objects.nonNull(filters)) {
params.putAll(filters);
}
params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : Arrays.asList(filters.get("status")));
params.put("type", "1");
return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.impl;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.entity.StdUserEmpower;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BusinessFieldMapper;
import com.yeejoin.amos.boot.module.hygf.biz.excel.service.IExportPageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.util.*;
@Service
public class TryfkServiceImpl implements IExportPageService {
@Autowired
private BusinessFieldMapper businessFieldMapper;
@Autowired
private RedisUtils redisUtils;
@Override
public List<String> getStationId(Map<String, Object> filters) {
StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
List<String> amosOrgCodes = orgCode.getAmosOrgCode();
Map<String, Object> params = new HashMap<>();
String status="放款完成";
if (Objects.nonNull(filters)) {
params.putAll(filters);
}
params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : Arrays.asList(filters.get("status")));
params.put("type", "1");
return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.impl;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.entity.StdUserEmpower;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BusinessFieldMapper;
import com.yeejoin.amos.boot.module.hygf.biz.excel.service.IExportPageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.util.*;
@Service
public class TrytsServiceImpl implements IExportPageService {
@Autowired
private BusinessFieldMapper businessFieldMapper;
@Autowired
private RedisUtils redisUtils;
@Override
public List<String> getStationId(Map<String, Object> filters) {
StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
List<String> amosOrgCodes = orgCode.getAmosOrgCode();
Map<String, Object> params = new HashMap<>();
String status="待融资审核";
if(Objects.nonNull(filters)){
params.putAll(filters);
}
params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : Arrays.asList(filters.get("status")));
params.put("type", "1");
return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.impl;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BusinessFieldMapper;
import com.yeejoin.amos.boot.module.hygf.biz.excel.service.IExportPageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.util.*;
@Service
public class YsshServiceImpl implements IExportPageService {
@Autowired
private BusinessFieldMapper businessFieldMapper;
@Autowired
private RedisUtils redisUtils;
@Value("${admin.tourong.roleId}")
Long tourongId;
@Value("${admin.fawu.roleId}")
Long fawuId;
@Value("${admin.area.roleId}")
Long areaId;
@Value("${admin.zichan.roleId}")
Long zichanId;
@Value("${admin.delerAdmin.roleId}")
Long delerAdminId;
@Override
public List<String> getStationId(Map<String, Object> filters) {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
List<String> basicGridNodes = new ArrayList<>();
List<Long> roleIds = new ArrayList<>();
for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
roleIds.addAll(longs);
if (longs.contains(areaId)) {
basicGridNodes.add("ys-area");
}
if (longs.contains(tourongId)) {
basicGridNodes.add("ys-tourong");
}
if (longs.contains(fawuId)) {
basicGridNodes.add("ys-fawu");
}
if (longs.contains(zichanId)) {
basicGridNodes.add("ys-zichan");
}
if (longs.contains(delerAdminId)) {
basicGridNodes.add("ys-tourong");
basicGridNodes.add("ys-area");
basicGridNodes.add("ys-fawu");
basicGridNodes.add("ys-zichan");
}
}
Map<String, Object> map = new HashMap<>();
map.put("basicGridNodes",basicGridNodes);
map.put("type","1");
if(Objects.nonNull(filters)){
map.putAll(filters);
}
return businessFieldMapper.getYsshStationId(map);
}
}
package com.yeejoin.amos.boot.module.hygf.biz.excel.service;
import java.util.List;
import java.util.Map;
public interface IExportPageService {
/**
* 根据条件获取场站Id
* @param filters
* @return
*/
List<String> getStationId(Map<String, Object> filters);
}
......@@ -1773,7 +1773,6 @@ public class CommonServiceImpl {
result.add(map);
}
}
return result;
}
......
......@@ -87,6 +87,7 @@ public class FinancingInfoHistoryServiceImpl extends BaseService<FinancingInfoHi
e.setDisbursementTime(financingInfoDto.getDisbursementTime());
e.setUnitPrice(financingInfoDto.getUnitPrice());
e.setFinancingCompaniesName(financingInfoDto.getFinancingCompaniesName());
e.setBacthNo(financingInfoDto.getBacthNo());
e.setStatus("放款完成");
if (financingInfoDto.getFiles() != null){
e.setFile(JSON.toJSONString(financingInfoDto.getFiles()));
......
......@@ -187,6 +187,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
financingInfoDto.setSequenceNbr(null);
financingInfoDto.setBatchNo(batcvNo);
financingInfoDto.setRegionalCompaniesSeq(peasantHousehold.getRegionalCompaniesSeq());
financingInfoDto.setTrCreateTime(new Date());
this.createWithModel(financingInfoDto);
//开启工作流 并执行一步
ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
......@@ -219,7 +220,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
//批量 兼容审核不通过及整改待推送
else if (financingInfos.getStatus().equals(FinancingAuditEnum.审核不通过.getName()) || financingInfos.getStatus().equals("待推送") ){
financingInfos.setStatus(FinancingAuditEnum.待融资审核.getName());
financingInfos.setTrCreateTime(new Date());
Map<String, Object> orgInfo1 = this.getBaseMapper().selectRZOrgInfo(model.getFinancingCompaniesSeq());
//业务表中无工作流id 需要补充
LambdaQueryWrapper<FinancingAuditing> queryWrapper1 = new LambdaQueryWrapper<>();
......@@ -330,6 +331,9 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
if (params.containsKey("financingCompaniesSeq") && params.get("financingCompaniesSeq")!= null) {
financingInfo.setFinancingCompaniesSeq(Long.valueOf(params.get("financingCompaniesSeq").toString()));
}
if("融资审核".equals(financingAuditingDto.getNextNodeName())){
financingInfo.setTrCreateTime(new Date());
}
//标识对于整改待推送状态
if (params.containsKey("isZG")) {
financingInfo.setStatus("待推送");
......@@ -337,10 +341,12 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
financingInfo.setStatus(statusName);
}
if (params.containsKey("isHistory")) {
financingInfo.setStatus("退回建档");
// if (params.containsKey("isHistory")) {
// financingInfo.setStatus("退回建档");
// }
if("放款完成".equals(financingInfo.getStatus())){
financingInfo.setTrEndTime(new Date());
}
this.updateById(financingInfo);
//更新待办
// workflowResultDto.setInstanceId(financingAuditing.getInstanceId());
......
......@@ -19,13 +19,18 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.JpStationMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.MaintenanceMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IHYGFMaintenanceTicketsService;
import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpInverterWarnMapper;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.SmsRecordModel;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
......@@ -40,7 +45,8 @@ public class HYGFMaintenanceTicketsServiceImpl extends BaseService<HYGFMaintenan
EmqKeeper emqKeeper;
@Autowired
TdHygfJpInverterWarnMapper tdHygfJpInverterWarnMapper;
@Value("${hygf.sms.tempCode}")
private String smsTempCode;
@Autowired
HYGFMaintenanceTicketsMapper hygfMaintenanceTicketsMapper;
@Autowired
......@@ -81,6 +87,23 @@ public class HYGFMaintenanceTicketsServiceImpl extends BaseService<HYGFMaintenan
public void sendMeassageToMcb(HYGFMaintenanceTicketsDto hygfMaintenanceTicketsDto) {
MaintenanceDto data = maintenanceMapper.selectOneById(Long.valueOf(hygfMaintenanceTicketsDto.getMaintenancePersonId()));
if (ObjectUtil.isNotEmpty(data)) {
HashMap<String, String> params = new HashMap<>(3);
params.put("code","123456");
params.put("mobile",data.getTelephone());
params.put("smsCode", smsTempCode);
try {
Systemctl.smsClient.sendCommonSms(params).getResult();
} catch (Exception e) {
throw new BadRequest("发送短信失败:" + e.getMessage());
}
}
if(hygfMaintenanceTicketsDto.getWarningId()==null){
......@@ -117,6 +140,18 @@ public class HYGFMaintenanceTicketsServiceImpl extends BaseService<HYGFMaintenan
if (ObjectUtil.isNotEmpty(maintenance)) {
hygfMaintenanceTicketsDto.setMaintenancePersonName(maintenance.getName());
hygfMaintenanceTicketsDto.setMaintenancePersonPhone(maintenance.getTelephone());
HashMap<String, String> params = new HashMap<>(3);
params.put("code","123456");
params.put("mobile",maintenance.getTelephone());
params.put("smsCode", smsTempCode);
try {
Systemctl.smsClient.sendCommonSms(params).getResult();
} catch (Exception e) {
throw new BadRequest("发送短信失败:" + e.getMessage());
}
}
HYGFMaintenanceTickets fMaintenanceTickets=new HYGFMaintenanceTickets();
BeanUtils.copyProperties(hygfMaintenanceTicketsDto,fMaintenanceTickets);
......
......@@ -7,6 +7,7 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.biz.common.utils.ExcelUtils;
import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationTimeStatisticsBatchDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationTimeStatisticsDto;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
import com.yeejoin.amos.boot.module.hygf.api.util.ListUtils;
......@@ -56,6 +57,7 @@ public class PowerStationStatisticsServiceImpl {
Map<Long, List<PowerStationTimeStatisticsDto>> sgMap = getSgTime(sequenceNbrList);
Map<Long, List<PowerStationTimeStatisticsDto>> bwMap = getBwTime(sequenceNbrList);
Map<Long, List<PowerStationTimeStatisticsDto>> ysMap = getYsTime(sequenceNbrList);
Map<Long, List<PowerStationTimeStatisticsDto>> trMap = getTrTime(sequenceNbrList);
for (PowerStationTimeStatisticsDto statisticsDto : statisticsDtos) {
dealKcTime(statisticsDto, kcMap);
dealDzhtqyTime(statisticsDto, dzhtqyMap);
......@@ -64,10 +66,33 @@ public class PowerStationStatisticsServiceImpl {
dealSgTime(statisticsDto, sgMap);
dealBwTime(statisticsDto, bwMap);
dealYsTime(statisticsDto, ysMap);
dealTrTime(statisticsDto, trMap);
}
}
}
private void dealTrTime(PowerStationTimeStatisticsDto statisticsDto, Map<Long, List<PowerStationTimeStatisticsDto>> map) {
List<PowerStationTimeStatisticsDto> time = map.get(statisticsDto.getSequenceNbr());
if (CollectionUtil.isNotEmpty(time)) {
statisticsDto.setTrCreateTime(time.get(0).getTrCreateTime());
statisticsDto.setTrEndTime(time.get(0).getTrEndTime());
statisticsDto.setTrStopTime(dealStopTime(time.get(0).getTrCreateTime(), time.get(0).getTrEndTime()));
}
}
private Map<Long, List<PowerStationTimeStatisticsDto>> getTrTime(List<Long> sequenceNbrList) {
List<PowerStationTimeStatisticsDto> statisticsDtos = new ArrayList<>();
if (sequenceNbrList.size() < 1000) {
statisticsDtos = peasantHouseholdMapper.getTrTime(sequenceNbrList);
} else {
List<List<Long>> lists = ListUtils.splitList(sequenceNbrList, 1000);
for (List<Long> list : lists) {
statisticsDtos.addAll(peasantHouseholdMapper.getTrTime(list));
}
}
return statisticsDtos.stream().collect(Collectors.groupingBy(PowerStationTimeStatisticsDto::getSequenceNbr));
}
private Map<Long, List<PowerStationTimeStatisticsDto>> getYsTime(List<Long> sequenceNbrList) {
List<PowerStationTimeStatisticsDto> statisticsDtos = new ArrayList<>();
if (sequenceNbrList.size() < 1000) {
......@@ -281,8 +306,8 @@ public class PowerStationStatisticsServiceImpl {
}
public void exportPowerStationExcel(List<String> sequenceNbrList, HttpServletResponse response) {
List<PowerStationTimeStatisticsDto> powerStationTimeStatisticsDtoList = getAllDetail(sequenceNbrList);
public void exportPowerStationExcel(PowerStationTimeStatisticsBatchDto statisticsBatchDto, HttpServletResponse response) {
List<PowerStationTimeStatisticsDto> powerStationTimeStatisticsDtoList = getAllDetail(statisticsBatchDto);
if (CollectionUtil.isNotEmpty(powerStationTimeStatisticsDtoList)) {
try {
List<PowerStationTimeStatisticsExcelVO> dataList = new ArrayList<>();
......@@ -302,6 +327,8 @@ public class PowerStationStatisticsServiceImpl {
excelVO.setSjEndTime(DateUtils.dateFormat(statisticsDto.getSjEndTime(), DateUtils.DATE_TIME_PATTERN));
excelVO.setFhbhCreateTime(DateUtils.dateFormat(statisticsDto.getFhbhCreateTime(), DateUtils.DATE_TIME_PATTERN));
excelVO.setFhbhEndTime(DateUtils.dateFormat(statisticsDto.getFhbhEndTime(), DateUtils.DATE_TIME_PATTERN));
excelVO.setTrCreateTime(DateUtils.dateFormat(statisticsDto.getTrCreateTime(), DateUtils.DATE_TIME_PATTERN));
excelVO.setTrEndTime(DateUtils.dateFormat(statisticsDto.getTrEndTime(), DateUtils.DATE_TIME_PATTERN));
dataList.add(excelVO);
}
ExcelUtils.exportExcelDefaultGroundColor(dataList, null, "电站时间统计", PowerStationTimeStatisticsExcelVO.class, "电站时间统计" + DateUtils.dateFormat(new Date(), "YYYY-MM-dd-HH-mm") + ".xlsx", response);
......@@ -314,11 +341,12 @@ public class PowerStationStatisticsServiceImpl {
/**
* 获取全部的详情
* @param sequenceNbrList
* @param statisticsBatchDto
* @return
*/
private List<PowerStationTimeStatisticsDto> getAllDetail(List<String> sequenceNbrList) {
private List<PowerStationTimeStatisticsDto> getAllDetail(PowerStationTimeStatisticsBatchDto statisticsBatchDto) {
List<PowerStationTimeStatisticsDto> statisticsDtos = new ArrayList<>();
List<String> sequenceNbrList = statisticsBatchDto.getSequenceNbrList();
if (CollectionUtil.isNotEmpty(sequenceNbrList)) {
if (sequenceNbrList.size() < 1000) {
statisticsDtos = peasantHouseholdMapper.getPowerStationTimeDetail(sequenceNbrList);
......@@ -329,7 +357,7 @@ public class PowerStationStatisticsServiceImpl {
}
}
} else {
statisticsDtos = peasantHouseholdMapper.getAllPowerStationTimeDetail();
statisticsDtos = peasantHouseholdMapper.getAllPowerStationTimeDetail(statisticsBatchDto.getFilters());
}
addPowerStationTime(statisticsDtos);
return statisticsDtos;
......
......@@ -120,4 +120,16 @@ public class PowerStationTimeStatisticsExcelVO implements Serializable {
@Excel(name = "验收停留时间", width = 30, orderNum = "27")
@ApiModelProperty(value = "验收停留时间")
private String ysStopTime;
@Excel(name = "投融开始时间", width = 30, orderNum = "28")
@ApiModelProperty(value = "投融开始时间")
private String trCreateTime;
@Excel(name = "投融结束时间", width = 30, orderNum = "29")
@ApiModelProperty(value = "投融结束时间")
private String trEndTime;
@Excel(name = "投融停留时间", width = 30, orderNum = "30")
@ApiModelProperty(value = "投融停留时间")
private String trStopTime;
}
......@@ -93,7 +93,7 @@ emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://47.92.234.253:1883
emqx.user-name=admin
emqx.password=Yeejoin@1234
emqx.password=Yeejoin@2020
emqx.max-inflight=1000
......@@ -173,16 +173,16 @@ hygf.user.group.empty=1775056568031645697
#qiyuesuo.serverUrl = https://openapi.qiyuesuo.cn
#qiyuesuo.accessKey = a1lcd3WRRV
#qiyuesuo.accessSecret = haqYIOxTP20ZYiDNEN92GVBa6aoJLu
#qiyuesuo.secretKey=Fp2LQAqK5gc68hi5
qiyuesuo.serverUrl = https://openapi.qiyuesuo.cn
qiyuesuo.accessKey = a1lcd3WRRV
qiyuesuo.accessSecret = haqYIOxTP20ZYiDNEN92GVBa6aoJLu
qiyuesuo.secretKey=Fp2LQAqK5gc68hi5
qiyuesuo.serverUrl = https://openapi.qiyuesuo.com
qiyuesuo.accessKey = QcmHQu55pl
qiyuesuo.accessSecret = em0zvOMRNCAXoD1ePNTL7hGR5KpKUs
qiyuesuo.secretKey=B6OYbHyfXikAghB2
#qiyuesuo.serverUrl = https://openapi.qiyuesuo.com
#qiyuesuo.accessKey = QcmHQu55pl
#qiyuesuo.accessSecret = em0zvOMRNCAXoD1ePNTL7hGR5KpKUs
#qiyuesuo.secretKey=B6OYbHyfXikAghB2
......
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