Skip to content

A
amos-boot-zx-biz
Commit 332a411c authored by wujiang's avatar wujiang
Browse files
Options

Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

parents 13077bd1 bafceab7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 611 additions and 53 deletions
amos-boot-system-equip/src/main/resources/mapper/EquipmentMapper.xml
View file @ 332a411c
......@@ -83,7 +83,7 @@
LEFT JOIN wl_equipment_category cate ON cate.id = eq.category_id
<where>
<if test="whereConditionStr != null and whereConditionStr != '' ">
eq.name like CONCAT("%",#{whereConditionStr},"%" )
eq.name like CONCAT('%',#{whereConditionStr},'%' )
</if>
<if test="isIot != null and isIot != '' ">
eq.is_iot = #{isIot}
......@@ -102,7 +102,7 @@
LEFT JOIN wl_equipment_category cate ON cate.id = eq.category_id
<where>
<if test="whereConditionStr != null and whereConditionStr != '' ">
eq.name like CONCAT("%",#{whereConditionStr},"%" )
eq.name like CONCAT('%',#{whereConditionStr},'%' )
</if>
</where>
</select>
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
View file @ 332a411c
......@@ -220,10 +220,10 @@
<where>
<if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">
CONCAT_WS(' ', wles.position,wled.area) like
concat(concat("%",#{param.warehouseStructureName}),"%")
concat(concat('%',#{param.warehouseStructureName}),'%')
</if>
<if test="param.equipCode != null and param.equipCode != ''">AND wles.code like
concat(concat("%",#{param.equipCode}),"%")
concat(concat('%',#{param.equipCode}),'%')
</if>
<if test="param.beginDate!=null">AND wlesal.create_date <![CDATA[>=]]> #{param.beginDate}</if>
<if test="param.endDate!=null">AND wlesal.create_date <![CDATA[<=]]> #{param.endDate}</if>
......@@ -400,10 +400,10 @@
and wlesal.id = #{param.alarmLogId}
</if>
<if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">
and wlesal.location like concat(concat("%",#{param.warehouseStructureName}),"%")
and wlesal.location like concat(concat('%',#{param.warehouseStructureName}),'%')
</if>
<if test="param.equipCode != null and param.equipCode != ''">
AND wlesal.equipment_specific_code like concat(concat("%",#{param.equipCode}),"%")
AND wlesal.equipment_specific_code like concat(concat('%',#{param.equipCode}),'%')
</if>
<if test="param.confirmType != null and param.confirmType != '' and param.confirmType == 1">
AND wlesal.confirm_type <![CDATA[<>]]> ''
......@@ -443,16 +443,16 @@
wlesal.type != 'FIREALARM'
</if>
<if test="param.equipmentCode != null and param.equipmentCode != ''">
AND wlesal.equipment_code like concat(concat("%",#{param.equipmentCode}),"%")
AND wlesal.equipment_code like concat(concat('%',#{param.equipmentCode}),'%')
</if>
<if test="param.equipDetailCode != null and param.equipDetailCode != ''">
AND wlesal.equipment_code like concat(concat("%",#{param.equipDetailCode}),"%")
AND wlesal.equipment_code like concat(concat('%',#{param.equipDetailCode}),'%')
</if>
<if test="param.indexTypeCode != null and param.indexTypeCode != ''">
AND wlesal.type = #{param.indexTypeCode}
</if>
<if test="param.fireEquipmentSpecificIndexKey != null and param.fireEquipmentSpecificIndexKey != ''">
AND wlesal.equipment_specific_index_key like concat(concat("%",#{param.fireEquipmentSpecificIndexKey}),"%")
AND wlesal.equipment_specific_index_key like concat(concat('%',#{param.fireEquipmentSpecificIndexKey}),'%')
</if>
</where>
ORDER BY wlesal.create_date DESC
......@@ -526,10 +526,10 @@
<where>
<if test="warehouseStructureName != null and warehouseStructureName != ''">
d.warehouseStructureName like
concat(concat("%",#{warehouseStructureName}),"%")
concat(concat('%',#{warehouseStructureName}),'%')
</if>
<if test="equipCode != null and equipCode != ''">AND d.fireEquipmentCode like
concat(concat("%",#{equipCode}),"%")
concat(concat('%',#{equipCode}),'%')
</if>
<if test="beginDate!=null">AND d.createDate >= #{beginDate}</if>
<if test="endDate!=null">AND d.createDate <![CDATA[<=]]> #{endDate}</if>
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificMapper.xml
View file @ 332a411c
......@@ -190,7 +190,7 @@
`wes`.`system_id`
)) AS `code`,
wes.system_id systemId,
( SELECT GROUP_CONCAT(fs.name) FROM f_fire_fighting_system fs WHERE `wes`.`system_id` like CONCAT("%",fs.id,'%') ) AS systemName
( SELECT GROUP_CONCAT(fs.name) FROM f_fire_fighting_system fs WHERE `wes`.`system_id` like CONCAT('%',fs.id,'%') ) AS systemName
FROM
wl_equipment_specific AS wes
......@@ -454,9 +454,9 @@
<if test="companyId != null and companyId != ''">
and spec.agency_id = #{companyId}
</if>
<if test="equipCode != '' and equipCode != null">and spec.code like concat("%", #{equipCode}, "%")</if>
<if test="equipCode != '' and equipCode != null">and spec.code like concat('%', #{equipCode}, '%')</if>
<if test="equipName != '' and equipName != null">
and spec.name like CONCAT("%", #{equipName},'%')
and spec.name like CONCAT('%', #{equipName},'%')
</if>
<if test="current != null and size != null">
Limit #{current},#{size}
......@@ -501,9 +501,9 @@
<if test="companyId != null and companyId != ''">
and spec.agency_id = #{companyId}
</if>
<if test="equipCode != '' and equipCode != null">and spec.code like concat("%", #{equipCode}, "%")</if>
<if test="equipCode != '' and equipCode != null">and spec.code like concat('%', #{equipCode}, '%')</if>
<if test="equipName != '' and equipName != null">
and spec.name like CONCAT("%", #{equipName},'%')
and spec.name like CONCAT('%', #{equipName},'%')
</if>
</select>
......
amos-boot-system-equip/src/main/resources/mapper/UnitMapper.xml
View file @ 332a411c
......@@ -46,7 +46,7 @@
LEFT JOIN wl_unit u1 ON u1.id = u.id
OR u1.parent_id = u.id
WHERE
u1.`name` LIKE concat(concat("%",#{name}),"%")
u1.`name` LIKE concat(concat('%',#{name}),'%')
</if>
ORDER BY
u.code
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/IcbcEnum.java 0 → 100644
View file @ 332a411c
package com.yeejoin.amos.boot.module.hygf.api.Enum;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.StringUtils;
/**
* 聚富通枚举
*
* <p>
* ProjectName: amos-boot-zx-biz
* PackageName: com.yeejoin.amos.boot.module.hygf.api.Enum
*
* @author yangyang
* @version v1.0
* @date 2024/7/18 11:51
*/
@Data
public class IcbcEnum {
/**
* 开户状态
*/
@Getter
@NoArgsConstructor
@AllArgsConstructor
public static enum OpenAccountState {
INITIAL("初始", "00"),
OPENING("开户中", "01"),
SUCCESSFULLY("开户成功", "02"),
FAIL("开户失败", "03");
/**
* 名称，描述
*/
private String name;
/**
* 编码
*/
private String code;
public static String getNameByCode(String code, String defaultName) {
for (OpenAccountState state : OpenAccountState.values()) {
if (state.getCode().equals(code)) {
return state.getName();
}
}
if (StringUtils.isNotEmpty(defaultName)) {
return defaultName;
}
return null;
}
}
/**
* 协议状态, 0-未生效，1-已生效，2-过期，3-作废，4-待短信确认
*/
@Getter
@NoArgsConstructor
@AllArgsConstructor
enum ProtocolStatus {
NOT_EFFECTIVE("未生效", "0"),
EFFECTIVE("已生效", "1"),
OVERDUE("过期", "2"),
DISCARD("作废", "3"),
WAITTING_SMS("待短信确认", "4");
/**
* 名称，描述
*/
private String name;
/**
* 编码
*/
private String code;
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HygfIcbcRecordDTO.java 0 → 100644
View file @ 332a411c
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
/**
* (hygf_icbc_record)实体类
*
* @author yangyang
* @description
* @since 2024-07-18 11:40:46
*/
@Data
@NoArgsConstructor
@ApiModel (value = "HygfIcbcRecordDTO", description = "聚富通钱包开户DTO")
public class HygfIcbcRecordDTO {
private static final long serialVersionUID = 1L;
protected Long sequenceNbr;
@ApiModelProperty (value = "农户姓名")
private String custName;
/**
* 身份证号
*/
@ApiModelProperty (value = "身份证号")
private String idCard;
/**
* 手机号码
*/
@ApiModelProperty (value = "手机号码")
private String phone;
/**
* 聚富通电子账户账号
*/
@ApiModelProperty (value = "聚富通电子账户账")
private String mediumId;
/**
* 项目编号
*/
@ApiModelProperty (value = "项目编号")
private String projectId;
/**
* 开户状态, 00-初始，01-开户中，02-开户成功，03-开户失败
*/
@ApiModelProperty (value = "开户状态, 00-初始，01-开户中，02-开户成功，03-开户失败")
private String openAccountStatus;
@ApiModelProperty (value = "开户状态Name")
private String openAccountStatusName;
/**
* 协议状态, 0-未生效，1-已生效，2-过期，3-作废，4-待短信确认
*/
@ApiModelProperty (value = "协议状态, 0-未生效，1-已生效，2-过期，3-作废，4-待短信确认")
private String protocolStatus;
@ApiModelProperty (value = "协议状态Name")
private String protocolStatusName;
/**
* 协议开始日期
*/
@ApiModelProperty (value = "协议开始日期")
private String protocolStartTime;
/**
* 协议终止日期
*/
@ApiModelProperty (value = "协议终止日期")
private String protocolEndTime;
/**
* 单笔限额
*/
@ApiModelProperty (value = "单笔限额")
private String trxLimitAmount;
/**
* 日累计限额
*/
@ApiModelProperty (value = "日累计限额")
private String dayLimitAmount;
/**
* 协议总限额
*/
@ApiModelProperty (value = "协议总限额")
private String protocolLimitAmount;
/**
* 合作方 appid
*/
@ApiModelProperty (value = "合作方 appid")
private String appId;
/**
* 外部用户编号
*/
@ApiModelProperty (value = "外部用户编号")
private String outUserId;
/**
* 企业外系统编号
*/
@ApiModelProperty (value = "企业外系统编号")
private String outVendorId;
/**
* signEntrsutPrtlStatus
*/
@ApiModelProperty (value = "signEntrsutPrtlStatus")
private String signEntrsutPrtlStatus;
/**
* 作废申请状态
*/
@ApiModelProperty (value = "作废申请状态")
private String discardStatus;
@ApiModelProperty(value = "农户id")
private String amosUserId;
@ApiModelProperty(value = "电站信息")
private List<IcbcPeasantHousehold> peasantHouseholds;
@Data
@AllArgsConstructor
@NoArgsConstructor
public static class IcbcPeasantHousehold {
/**
* 农户信息编号
*/
@ApiModelProperty(value = "农户信息编号")
private String peasantHouseholdNo;
/**
* 项目地址
*/
@ApiModelProperty(value = "项目地址")
private List<Integer> projectAddress;
/**
* 项目地址
*/
@ApiModelProperty(value = "项目地址")
private String projectAddressName;
/*
* 区域公司id
* */
@ApiModelProperty(value = "区域公司id")
private Long regionalCompaniesSeq;
/*
* 区域公司code
* */
@ApiModelProperty(value = "区域公司code")
private String regionalCompaniesCode;
/*
* 区域公司名称
* */
@ApiModelProperty(value = "区域公司名称")
private String regionalCompaniesName;
}
}
\ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HygfIcbcRecordQueryDTO.java 0 → 100644
View file @ 332a411c
package com.yeejoin.amos.boot.module.hygf.api.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* <p>
* ProjectName: amos-boot-zx-biz
* PackageName: com.yeejoin.amos.boot.module.hygf.api.dto
*
* @author yangyang
* @version v1.0
* @date 2024/7/18 14:36
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public class HygfIcbcRecordQueryDTO {
@ApiModelProperty (value = "开户状态, 00-初始，01-开户中，02-开户成功，03-开户失败")
private String openAccountStatus;
@ApiModelProperty (value = "农户姓名")
private String custName;
@ApiModelProperty (value = "身份证号")
private String idCard;
@ApiModelProperty (value = "手机号码")
private String phone;
@ApiModelProperty (value = "区域公司")
private String regionalCompaniesSeq;
@ApiModelProperty (value = "所属地址")
private String address;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HygfIcbcRecord.java 0 → 100644
View file @ 332a411c
package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.Date;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
/**
* (hygf_icbc_record)实体类
*
* @author yangyang
* @description
* @since 2024-07-18 11:40:46
*/
@Data
@NoArgsConstructor
@Accessors (chain = true)
@TableName (value = "hygf_icbc_record", autoResultMap = true)
public class HygfIcbcRecord extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 农户姓名
*/
@TableField ("cust_name")
private String custName;
/**
* 身份证号
*/
@TableField ("id_card")
private String idCard;
/**
* 手机号码
*/
@TableField ("phone")
private String phone;
/**
* 聚富通电子账户账号
*/
@TableField ("medium_id")
private String mediumId;
/**
* 项目编号
*/
@TableField ("project_id")
private String projectId;
/**
* 开户状态, 00-初始，01-开户中，02-开户成功，03-开户失败
*/
@TableField ("open_account_status")
private String openAccountStatus;
/**
* 协议状态, 0-未生效，1-已生效，2-过期，3-作废，4-待短信确认
*/
@TableField ("protocol_status")
private String protocolStatus;
/**
* 协议开始日期
*/
@TableField ("protocol_start_time")
private String protocolStartTime;
/**
* 协议终止日期
*/
@TableField ("protocol_end_time")
private String protocolEndTime;
/**
* 单笔限额
*/
@TableField ("trx_limit_amount")
private String trxLimitAmount;
/**
* 日累计限额
*/
@TableField ("day_limit_amount")
private String dayLimitAmount;
/**
* 协议总限额
*/
@TableField ("protocol_limit_amount")
private String protocolLimitAmount;
/**
* 合作方 appid
*/
@TableField ("app_id")
private String appId;
/**
* 外部用户编号
*/
@TableField ("out_user_id")
private String outUserId;
/**
* 企业外系统编号
*/
@TableField ("out_vendor_id")
private String outVendorId;
/**
* signEntrsutPrtlStatus
*/
@TableField ("sign_entrsut_prtl_status")
private String signEntrsutPrtlStatus;
/**
* 作废申请状态
*/
@TableField ("discard_status")
private String discardStatus;
/**
* 农户 用户 id
*/
@TableField("amos_user_id")
private String amosUserId;
}
\ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/HygfIcbcRecordMapper.java 0 → 100644
View file @ 332a411c
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.AcceptanceDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.HygfIcbcRecordDTO;
import com.yeejoin.amos.boot.module.hygf.api.dto.HygfIcbcRecordQueryDTO;
import com.yeejoin.amos.boot.module.hygf.api.entity.HygfIcbcRecord;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* (hygf_icbc_record)数据Mapper
*
* @author yangyang
* @description
* @since 2024-07-18 11:40:46
*/
public interface HygfIcbcRecordMapper extends BaseMapper<HygfIcbcRecord> {
@UserEmpower (field = {"ph.regional_companies_code"}, dealerField = {"ph.developer_code", "ph.regional_companies_code", "ph.developer_user_id"}, fieldConditions = {"in", "in", "in"}, relationship = "and")
List<HygfIcbcRecordDTO> listObject(@Param ("param") HygfIcbcRecordQueryDTO hygfIcbcRecordQueryDTO);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/HygfIcbcRecordService.java 0 → 100644
View file @ 332a411c
package com.yeejoin.amos.boot.module.hygf.api.service;
/**
* 服务接口
*
* @author yangyang
* @since 2024-07-18 11:40:46
* @description
*/
public interface HygfIcbcRecordService {
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml
View file @ 332a411c
......@@ -52,13 +52,13 @@
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}), "%")
AND hph.project_address_name LIKE concat(concat('%', #{map.projectAddress}), '%')
</if>
<if test="map.powerStationCode != null and map.powerStationCode !=''">
AND hph.peasant_household_no LIKE concat(concat("%", #{map.powerStationCode}), "%")
AND hph.peasant_household_no LIKE concat(concat('%', #{map.powerStationCode}), '%')
</if>
<if test="map.ownersName != null and map.ownersName !=''">
AND hph.owners_name LIKE concat(concat("%", #{map.ownersName}), "%")
AND hph.owners_name LIKE concat(concat('%', #{map.ownersName}), '%')
</if>
<if test="map.gridStatus != null and map.gridStatus !=''">
AND hbga.grid_status = #{map.gridStatus}
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HygfIcbcRecordMapper.xml 0 → 100644
View file @ 332a411c
<?xml version="1.0" encoding="UTF-8"?>
<!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.HygfIcbcRecordMapper">
<sql id="tableName">
hygf_icbc_record
</sql>
<sql id="baseColumn">
sequence_nbr,cust_name,id_card,phone,medium_id,project_id,open_account_state,protocol_status,protocol_start_time,protocol_end_time,trx_limit_amount,day_limit_amount,protocol_limit_amount,app_id,out_user_id,out_vendor_id,sign_entrsut_prtl_status
</sql>
<select id="listObject" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.HygfIcbcRecordDTO">
SELECT DISTINCT
icbc.sequence_nbr,
ph.owners_name as custName,
ph.telephone as phone,
ph.id_card,
ph.amos_user_id,
icbc.open_account_status,
icbc.protocol_status
FROM
hygf_peasant_household ph LEFT JOIN hygf_icbc_record icbc ON ph.amos_user_id = icbc.amos_user_id
<where>
ph.is_delete = 0
<if test="param != null">
<if test="param.openAccountStatus != null and param.openAccountStatus != ''">
AND icbc.protocol_status = #{param.openAccountStatus}
</if>
<if test="param.custName != null and param.custName != ''">
AND ph.owners_name LIKE CONCAT('%', #{param.custName}, '%')
</if>
<if test="param.idCard != null and param.idCard != ''">
AND ph.id_card LIKE CONCAT('%', #{param.idCard}, '%')
</if>
<if test="param.phone != null and param.phone != ''">
AND ph.telephone LIKE CONCAT('%', #{param.phone}, '%')
</if>
<if test="param.regionalCompaniesSeq != null and param.regionalCompaniesSeq != ''">
AND ph.regional_companies_seq = #{param.regionalCompaniesSeq}
</if>
</if>
</where>
GROUP BY
ph.amos_user_id
ORDER BY
ph.rec_date DESC
</select>
</mapper>
\ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpCollectorMapper.xml
View file @ 332a411c
......@@ -14,13 +14,13 @@
on hygf_jp_station.third_station_id=hygf_jp_collector.third_station_id
<where>
<if test="dto.snCode!=null and dto.snCode!='' ">
and hygf_jp_station.sn_code like concat(concat("%",#{dto.snCode}),"%")
and hygf_jp_station.sn_code like concat(concat('%',#{dto.snCode}),'%')
</if>
<if test="dto.name!=null and dto.name!='' ">
and hygf_jp_station.name like concat(concat("%",#{dto.name}),"%")
and hygf_jp_station.name like concat(concat('%',#{dto.name}),'%')
</if>
<if test="dto.area!=null">
and hygf_jp_station.area like concat(concat("%",#{dto.area}),"%")
and hygf_jp_station.area like concat(concat('%',#{dto.area}),'%')
</if>
<if test="dto.statioId!=null">
and hygf_jp_station.third_station_id in
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpInverterMapper.xml
View file @ 332a411c
......@@ -14,13 +14,13 @@
on hygf_jp_station.third_station_id=hygf_jp_inverter.third_station_id
<where>
<if test="dto.snCode!=null and dto.snCode!='' ">
and hygf_jp_station.sn_code like concat(concat("%",#{dto.snCode}),"%")
and hygf_jp_station.sn_code like concat(concat('%',#{dto.snCode}),'%')
</if>
<if test="dto.name!=null and dto.name!='' ">
and hygf_jp_station.name like concat(concat("%",#{dto.name}),"%")
and hygf_jp_station.name like concat(concat('%',#{dto.name}),'%')
</if>
<if test="dto.area!=null">
and hygf_jp_station.area like concat(concat("%",#{dto.area}),"%")
and hygf_jp_station.area like concat(concat('%',#{dto.area}),'%')
</if>
<if test="dto.statioId!=null">
and hygf_jp_station.third_station_id in
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PeasantHouseholdMapper.xml
View file @ 332a411c
......@@ -17,10 +17,10 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
and hygf_document_station.preparation_money_id !=#{ids}
</if>)
<if test="peasantHouseholdNo!=null and peasantHouseholdNo !=''">
and hygf_peasant_household.peasant_household_no like concat(concat("%",#{peasantHouseholdNo}),"%")
and hygf_peasant_household.peasant_household_no like concat(concat('%',#{peasantHouseholdNo}),'%')
</if>
<if test="ownersName!=null and ownersName !='' ">
and hygf_peasant_household.owners_name like concat(concat("%",#{ownersName}),"%")
and hygf_peasant_household.owners_name like concat(concat('%',#{ownersName}),'%')
</if>
<if test="orderBy !=null and orderBy !='' ">
ORDER BY ${orderBy}
......@@ -44,10 +44,10 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
</if>
)
<if test="peasantHouseholdNo!=null and peasantHouseholdNo !=''">
and hygf_peasant_household.peasant_household_no like concat(concat("%",#{peasantHouseholdNo}),"%")
and hygf_peasant_household.peasant_household_no like concat(concat('%',#{peasantHouseholdNo}),'%')
</if>
<if test="ownersName!=null and ownersName !='' ">
and hygf_peasant_household.owners_name like concat(concat("%",#{ownersName}),"%")
and hygf_peasant_household.owners_name like concat(concat('%',#{ownersName}),'%')
</if>
</select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PersonnelBusinessMapper.xml
View file @ 332a411c
......@@ -30,13 +30,13 @@
where std_user_biz.is_delete=0
<if test="dto.realName!=null">
and std_user_biz.real_name like concat(concat("%",#{dto.realName}),"%")
and std_user_biz.real_name like concat(concat('%',#{dto.realName}),'%')
</if>
<if test="dto.lockStatus!=null">
and std_user_biz.lock_status=#{dto.lockStatus}
</if>
<if test="dto.amosUserName!=null">
and std_user_biz.amos_user_name like concat(concat("%",#{dto.amosUserName}),"%")
and std_user_biz.amos_user_name like concat(concat('%',#{dto.amosUserName}),'%')
</if>
<if test="dto.amosUnitOrgCode!=null">
and hygf_personnel_business.amos_unit_org_code like concat(concat(#{dto.amosUnitOrgCode}),"%")
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PowerStationMapper.xml
View file @ 332a411c
......@@ -19,16 +19,16 @@
where hygf_power_station.is_delete=0
<if test="powerStationCode!=null and powerStationCode!=''">
and hygf_power_station.power_station_code like concat(concat("%",#{powerStationCode}),"%")
and hygf_power_station.power_station_code like concat(concat('%',#{powerStationCode}),'%')
</if>
<if test="ownersName!=null and ownersName!=''">
and hygf_power_station.owners_name like concat(concat("%",#{ownersName}),"%")
and hygf_power_station.owners_name like concat(concat('%',#{ownersName}),'%')
</if>
<if test="serviceAgent!=null and serviceAgent!=''">
and hygf_power_station.service_agent like concat(concat("%",#{serviceAgent}),"%")
and hygf_power_station.service_agent like concat(concat('%',#{serviceAgent}),'%')
</if>
<if test="regionalCompaniesName!=null and regionalCompaniesName!=''">
and hygf_peasant_household.regional_companies_name like concat(concat("%",#{regionalCompaniesName}),"%")
and hygf_peasant_household.regional_companies_name like concat(concat('%',#{regionalCompaniesName}),'%')
</if>
<if test="processStatus != null and processStatus != ''">
and hygf_power_station.process_status = #{processStatus}
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PreparationMoneyMapper.xml
View file @ 332a411c
......@@ -7,7 +7,7 @@ LEFT JOIN hygf_document_station on hygf_document_station.station_id=hygf_peasan
where hygf_document_station.preparation_money_id=#{sequenceNbr}
<if test="ownersName!=null and ownersName!=''">
and hygf_peasant_household.owners_name like concat(concat("%",#{ownersName}),"%")
and hygf_peasant_household.owners_name like concat(concat('%',#{ownersName}),'%')
</if>
</select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/RegionalCompaniesMapper.xml
View file @ 332a411c
......@@ -26,7 +26,7 @@
where hygf_regional_companies.is_delete=0
<if test="regionalCompaniesName!=null and regionalCompaniesName!=''">
and hygf_regional_companies.regional_companies_name like concat(concat("%",#{regionalCompaniesName}),"%")
and hygf_regional_companies.regional_companies_name like concat(concat('%',#{regionalCompaniesName}),'%')
</if>
<if test="unitId!=null and unitId!=''">
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/TrainingMapper.xml
View file @ 332a411c
......@@ -16,7 +16,7 @@
and hh.status =#{status}
</if>
<if test="name!=null and name!='' ">
and hh.name like concat(concat("%",#{name}),"%")
and hh.name like concat(concat('%',#{name}),'%')
</if>
</select>
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/UnitInfoMapper.xml
View file @ 332a411c
......@@ -17,7 +17,7 @@ from privilege_company where IS_DELETED=0 and AGENCY_CODE='JXIOP'
<if test="dto.companyName!=null">
and privilege_company.COMPANY_NAME like concat(concat("%",#{dto.companyName}),"%")
and privilege_company.COMPANY_NAME like concat(concat('%',#{dto.companyName}),'%')
</if>
<if test="dto.level!=null">
and privilege_company.LEVEL=#{dto.level}
......@@ -46,7 +46,7 @@ from privilege_company where IS_DELETED=0 and AGENCY_CODE='JXIOP'
<where>
<if test="role!=null">
and std_user_biz.role like concat(concat("%",#{role}),"%")
and std_user_biz.role like concat(concat('%',#{role}),'%')
</if>
<if test="regionalCompaniesSeq!=null">
and hygf_personnel_business.regional_companies_seq=#{regionalCompaniesSeq}
......@@ -72,7 +72,7 @@ from privilege_company where IS_DELETED=0 and AGENCY_CODE='JXIOP'
<where>
<if test="role!=null">
and std_user_biz.role like concat(concat("%",#{role}),"%")
and std_user_biz.role like concat(concat('%',#{role}),'%')
</if>
<if test="regionalCompaniesSeq!=null">
and hygf_personnel_business.regional_companies_seq=#{regionalCompaniesSeq}
......@@ -98,7 +98,7 @@ from privilege_company where IS_DELETED=0 and AGENCY_CODE='JXIOP'
<where>
<if test="role!=null">
and std_user_biz.role like concat(concat("%",#{role}),"%")
and std_user_biz.role like concat(concat('%',#{role}),'%')
</if>
<if test="regionalCompaniesSeq!=null">
and hygf_personnel_business.regional_companies_seq=#{regionalCompaniesSeq}
......@@ -125,7 +125,7 @@ from privilege_company where IS_DELETED=0 and AGENCY_CODE='JXIOP'
<where>
<if test="role!=null">
and std_user_biz.role like concat(concat("%",#{role}),"%")
and std_user_biz.role like concat(concat('%',#{role}),'%')
</if>
<if test="regionalCompaniesSeq!=null">
and hygf_personnel_business.regional_companies_seq=#{regionalCompaniesSeq}
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/WorkOrderMapper.xml
View file @ 332a411c
......@@ -17,10 +17,10 @@
FROM hygf_work_order
WHERE hygf_work_order.is_delete=0
<if test="dto.workOrderNum!=null and dto.workOrderNum!=''">
and hygf_work_order.work_order_num like concat(concat("%",#{dto.workOrderNum}),"%")
and hygf_work_order.work_order_num like concat(concat('%',#{dto.workOrderNum}),'%')
</if>
<if test="dto.projectRegionManager!=null and dto.projectRegionManager!=''">
and hygf_work_order.project_region_manager like concat(concat("%",#{dto.projectRegionManager}),"%")
and hygf_work_order.project_region_manager like concat(concat('%',#{dto.projectRegionManager}),'%')
</if>
<if test="dto.workOrderStatus!=null and dto.workOrderStatus!=''">
and hygf_work_order.work_order_status=#{dto.workOrderStatus}
......@@ -80,23 +80,23 @@
</if>
<if test="dto.projectAddressName!=null and dto.projectAddressName!=''">
and hygf_peasant_household.project_address_name like concat(concat("%",#{dto.projectAddressName}),"%")
and hygf_peasant_household.project_address_name like concat(concat('%',#{dto.projectAddressName}),'%')
</if>
<if test="dto.peasantHouseholdNo!=null and dto.peasantHouseholdNo!=''">
and hygf_peasant_household.peasant_household_no like concat(concat("%",#{dto.peasantHouseholdNo}),"%")
and hygf_peasant_household.peasant_household_no like concat(concat('%',#{dto.peasantHouseholdNo}),'%')
</if>
<if test="dto.ownersName!=null and dto.ownersName!=''">
and hygf_peasant_household.owners_name like concat(concat("%",#{dto.ownersName}),"%")
and hygf_peasant_household.owners_name like concat(concat('%',#{dto.ownersName}),'%')
</if>
<if test="dto.workOrderNum!=null and dto.workOrderNum!=''">
and hygf_work_order.work_order_num like concat(concat("%",#{dto.workOrderNum}),"%")
and hygf_work_order.work_order_num like concat(concat('%',#{dto.workOrderNum}),'%')
</if>
<if test="dto.projectRegionManager!=null and dto.projectRegionManager!=''">
and hygf_work_order.project_region_manager like concat(concat("%",#{dto.projectRegionManager}),"%")
and hygf_work_order.project_region_manager like concat(concat('%',#{dto.projectRegionManager}),'%')
</if>
<if test="dto.powerStationConstructionStatus!=null and dto.powerStationConstructionStatus!=''">
and hygf_work_order_power_station.power_station_construction_status=#{dto.powerStationConstructionStatus}
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/WorkOrderPowerStationMapper.xml
View file @ 332a411c
......@@ -13,7 +13,7 @@
WHERE
hygf_work_order_power_station.work_order_id=#{sequenceNbr}
<if test="ownersName!=null and ownersName!=''">
and hygf_peasant_household.owners_name like concat(concat("%",#{ownersName}),"%")
and hygf_peasant_household.owners_name like concat(concat('%',#{ownersName}),'%')
</if>
</select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HygfIcbcController.java
View file @ 332a411c
package com.yeejoin.amos.boot.module.hygf.biz.controller;
import com.icbc.api.response.JftApiUserEntrustopenacctQueryResponseV1;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingRectificationOrderDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.HygfIcbcRecordDTO;
import com.yeejoin.amos.boot.module.hygf.api.dto.HygfIcbcRecordQueryDTO;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HygfIcbcServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
......@@ -15,6 +23,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Map;
import java.util.List;
/**
......@@ -55,7 +64,51 @@ public class HygfIcbcController extends BaseController {
@GetMapping(value = "/getHygfIcbcWalletInfo")
@ApiOperation(httpMethod = "GET",value = "获取钱包信息", notes = "获取钱包信息")
public ResponseModel<JftApiUserEntrustopenacctQueryResponseV1> getHygfIcbcWalletInfo(HttpServletRequest req, HttpServletResponse resp) {
return ResponseHelper.buildResponse(hygfIcbcService.getHygfIcbcWalletInfo(req, resp));
return ResponseHelper.buildResponse(hygfIcbcService.getHygfIcbcWalletInfo(req.getParameter("userId")));
}
/**
* 开户签约异步通知
*
*
* @param request request
* @param response response
* @return {@link Object}
* @author yangyang
* @throws
* @date 2024/7/18 19:39
*/
@TycloudOperation (ApiLevel = UserType.PUBLIC, needAuth = false)
@PostMapping (value = "/notify")
@ApiOperation (httpMethod = "POST", value = "注册电子钱包回调", notes = "注册电子钱包回调")
public Object notify(HttpServletRequest request, HttpServletResponse response) throws Exception {
return hygfIcbcService.registerWalletCallback(request, response);
}
@TycloudOperation (ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping (value = "/{sequenceNbr}")
@ApiOperation (httpMethod = "GET", value = "根据sequenceNbr查询注册电子钱包", notes = "注册电子钱包")
public ResponseModel<HygfIcbcRecordDTO> getObject(@PathVariable String sequenceNbr) {
return ResponseHelper.buildResponse(hygfIcbcService.getObject(Long.valueOf(sequenceNbr)));
}
@TycloudOperation (ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping (value = "/list")
@ApiOperation (httpMethod = "GET", value = "聚富通电子钱包列表查询", notes = "聚富通电子钱包列表查询")
@UserLimits
public ResponseModel<List<HygfIcbcRecordDTO>> listObject(@ApiParam HygfIcbcRecordQueryDTO hygfIcbcRecordQueryDTO) {
return ResponseHelper.buildResponse(hygfIcbcService.listObject(hygfIcbcRecordQueryDTO));
}
@TycloudOperation (ApiLevel = UserType.AGENCY)
@GetMapping (value = "/page")
@ApiOperation (httpMethod = "GET", value = "聚富通电子钱包分页查询", notes = "聚富通电子钱包分页查询")
@UserLimits
public ResponseModel<Page<HygfIcbcRecordDTO>> queryForPage(@RequestParam (value = "current") int current,
@RequestParam(value = "size") int size,
@ApiParam @RequestParam HygfIcbcRecordQueryDTO hygfIcbcRecordQueryDTO) {
return ResponseHelper.buildResponse(hygfIcbcService.queryForPage(current, size, hygfIcbcRecordQueryDTO));
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties
View file @ 332a411c
......@@ -246,3 +246,6 @@ spring.elasticsearch.rest.connection-timeout=30000
spring.elasticsearch.rest.username=elastic
spring.elasticsearch.rest.password=123456
spring.elasticsearch.rest.read-timeout=30000
## 聚富通 配置
hygf.icbc.notifyUrl=http://47.92.234.253:8088/hygf/icbc/notify
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment