Skip to content

A
amos-boot-biz
Commit 760c4ee6 authored by lisong's avatar lisong
Browse files
Options

修改bug

parent 832141da
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 16 deletions
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/dto/BaseEnterpriseInfoDto.java
View file @ 760c4ee6
......@@ -30,11 +30,11 @@ public class BaseEnterpriseInfoDto extends BaseDto {
@ApiModelProperty(value = "统一社会信用代码")
@TableField("use_code")
private String socialCreditCode;
private String useCode;
@ApiModelProperty(value = "维护保养单位名称")
@TableField("supervise_org_name")
private String unitName;
@TableField("use_unit")
private String useUnit;
@ApiModelProperty(value = "省份")
@TableField("province")
......@@ -49,7 +49,7 @@ public class BaseEnterpriseInfoDto extends BaseDto {
private String district;
@ApiModelProperty(value = "区域代码")
@TableField("district")
@TableField("supervise_code")
private String regionCode;
@ApiModelProperty(value = "地址(详细地址，包括道路、门牌号码)")
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/dto/EnterpriseInfoExportDto.java
View file @ 760c4ee6
......@@ -20,10 +20,10 @@ import java.util.List;
public class EnterpriseInfoExportDto {
@ExcelProperty(value = "统一社会信用代码", index = 1)
private String socialCreditCode;
private String useCode;
@ExcelProperty(value = "单位名称", index = 0)
private String unitName;
private String useUnit;
@ExcelProperty(value = "所属区域", index = 2)
private String district;
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/entity/EnterpriseInfo.java
View file @ 760c4ee6
......@@ -26,11 +26,11 @@ public class EnterpriseInfo extends BaseEntity {
@ApiModelProperty(value = "统一社会信用代码")
@TableField("use_code")
private String socialCreditCode;
private String useCode;
@ApiModelProperty(value = "维护保养单位名称")
@TableField("use_unit")
private String unitName;
private String useUnit;
@ApiModelProperty(value = "省份")
@TableField("province")
......@@ -45,7 +45,7 @@ public class EnterpriseInfo extends BaseEntity {
private String district;
@ApiModelProperty(value = "区域代码")
@TableField("district")
@TableField("supervise_code")
private String regionCode;
@ApiModelProperty(value = "地址(详细地址，包括道路、门牌号码)")
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/ElevatorMapper.xml
View file @ 760c4ee6
......@@ -110,7 +110,7 @@
LEFT JOIN idx_biz_jg_register_info jri on jui.RECORD = jri.RECORD
LEFT JOIN idx_biz_jg_maintenance_record_info mri on jui.RECORD = mri.RECORD
<where>
jri.EQU_LIST = '3000'
jri.EQU_LIST = '3000' AND joi.CLAIM_STATUS = '已认领' and jui.RECORD is not null
<if test="dto.regionCode != null and dto.regionCode != ''">
and (jui.PROVINCE = #{dto.regionCode} or jui.CITY = #{dto.regionCode} or jui.COUNTY = #{dto.regionCode}
)
......@@ -133,7 +133,8 @@
<if test="dto.useUnit != null and dto.useUnit != ''">
and jui.USE_UNIT_NAME like concat('%',#{dto.useUnit},'%')
</if>
GROUP BY
joi.RECORD
</where>
</select>
<!-- <select id="selectExportDataNew" resultType="com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDtoNew">-->
......@@ -398,7 +399,7 @@
LEFT JOIN idx_biz_jg_register_info jri on jui.RECORD = jri.RECORD
LEFT JOIN idx_biz_jg_maintenance_record_info mri on jui.RECORD = mri.RECORD
<where>
jri.EQU_LIST = '3000'
jri.EQU_LIST = '3000' AND joi.CLAIM_STATUS = '已认领' and jui.RECORD is not null
<if test="dto.regionCode != null and dto.regionCode != ''">
and (jui.PROVINCE = #{dto.regionCode} or jui.CITY = #{dto.regionCode} or jui.COUNTY = #{dto.regionCode}
)
......@@ -428,6 +429,8 @@
</if>
</where>
GROUP BY
joi.RECORD
</select>
<select id="selectElevatorEsList" resultType="java.util.Map">
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/MaintenanceUnitController.java
View file @ 760c4ee6
......@@ -251,7 +251,7 @@ public class MaintenanceUnitController extends BaseController {
Object o = field.get(enterpriseInfo);
if (o != null) {
String name = NameUtils.camel2Underline(field.getName());
if ("city".equalsIgnoreCase(name) || "district".equalsIgnoreCase(name) || "qualification_level".equalsIgnoreCase(name)) {
if ("city".equalsIgnoreCase(name) ) {
String fileValue = (String) o;
enterpriseInfoQueryWrapper.eq(name, fileValue);
} else if ("credit_level".equalsIgnoreCase(name)) {
......@@ -264,7 +264,7 @@ public class MaintenanceUnitController extends BaseController {
// 此处由于写接口时表数据还未进行整理，所以此处先默认用文字做查询
enterpriseInfoQueryWrapper.like(name, "使用单位");
} else {
enterpriseInfoQueryWrapper.notLike(name, "使用单位");
enterpriseInfoQueryWrapper.like(name, "维保单位");
}
} else {
String fileValue = (String) o;
......@@ -301,7 +301,7 @@ public class MaintenanceUnitController extends BaseController {
Object o = field.get(enterpriseInfo);
if (o != null) {
String name = NameUtils.camel2Underline(field.getName());
if ("city".equalsIgnoreCase(name) || "district".equalsIgnoreCase(name) || "qualification_level".equalsIgnoreCase(name)) {
if ("city".equalsIgnoreCase(name) ) {
String fileValue = (String) o;
enterpriseInfoQueryWrapper.eq(name, fileValue);
} else if ("credit_level".equalsIgnoreCase(name)) {
......@@ -314,7 +314,7 @@ public class MaintenanceUnitController extends BaseController {
// 此处由于写接口时表数据还未进行整理，所以此处先默认用文字做查询
enterpriseInfoQueryWrapper.like(name, "使用单位");
} else {
enterpriseInfoQueryWrapper.notLike(name, "使用单位");
enterpriseInfoQueryWrapper.like(name, "维保单位");
}
} else {
String fileValue = (String) o;
......
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