Commit 2a71dc8e authored by 麻笑宇's avatar 麻笑宇

Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into develop_tzs_register_to_0715
parents 513bd360 c25c2564
...@@ -48,6 +48,9 @@ public class AlertUseUnitStatisticsDto extends BaseDto { ...@@ -48,6 +48,9 @@ public class AlertUseUnitStatisticsDto extends BaseDto {
@ApiModelProperty(value = "电梯总量") @ApiModelProperty(value = "电梯总量")
private Integer equipNum; private Integer equipNum;
@ApiModelProperty(value = "使用单位统一信用代码")
private String useUnitCode;
@ApiModelProperty(value = "使用单位") @ApiModelProperty(value = "使用单位")
private String useUnit; private String useUnit;
......
...@@ -76,6 +76,12 @@ public class AlertUseUnitStatistics extends BaseEntity { ...@@ -76,6 +76,12 @@ public class AlertUseUnitStatistics extends BaseEntity {
private Integer equipNum; private Integer equipNum;
/** /**
* 使用单位统一信用代码
*/
@TableField("use_unit_code")
private String useUnitCode;
/**
* 使用单位 * 使用单位
*/ */
@TableField("use_unit") @TableField("use_unit")
......
...@@ -55,6 +55,7 @@ public class AlertUseUnitStatisticsServiceImpl extends BaseService<AlertUseUnitS ...@@ -55,6 +55,7 @@ public class AlertUseUnitStatisticsServiceImpl extends BaseService<AlertUseUnitS
useUnitMessage.setStartDate(format.format(firstDayOfMonth)); useUnitMessage.setStartDate(format.format(firstDayOfMonth));
useUnitMessage.setEndDate(format.format(lastDayOfMonth)); useUnitMessage.setEndDate(format.format(lastDayOfMonth));
useUnitMessage.setStatisticsDate(format.format(lastDayOfMonth).substring(0, 7)); useUnitMessage.setStatisticsDate(format.format(lastDayOfMonth).substring(0, 7));
useUnitMessage.setUseUnitCode(item.get("unitCode"));
list.add(useUnitMessage); list.add(useUnitMessage);
} }
}); });
......
...@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel; ...@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -60,6 +61,7 @@ public class JgChangeRegistrationNameDto extends BaseDto { ...@@ -60,6 +61,7 @@ public class JgChangeRegistrationNameDto extends BaseDto {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class) @JsonSerialize(using = BizCustomDateSerializer.class)
private Date createDate; private Date createDate;
......
...@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel; ...@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -82,6 +83,7 @@ public class JgChangeRegistrationReformDto extends BaseDto { ...@@ -82,6 +83,7 @@ public class JgChangeRegistrationReformDto extends BaseDto {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class) @JsonSerialize(using = BizCustomDateSerializer.class)
private Date createDate; private Date createDate;
......
...@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -79,6 +80,7 @@ public class JgChangeRegistrationTransferDto extends BaseDto { ...@@ -79,6 +80,7 @@ public class JgChangeRegistrationTransferDto extends BaseDto {
@ApiModelProperty (value = "创建时间") @ApiModelProperty (value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class) @JsonSerialize(using = BizCustomDateSerializer.class)
private Date createDate; private Date createDate;
......
...@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel; ...@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -70,6 +71,7 @@ public class JgChangeRegistrationUnitDto extends BaseDto { ...@@ -70,6 +71,7 @@ public class JgChangeRegistrationUnitDto extends BaseDto {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class) @JsonSerialize(using = BizCustomDateSerializer.class)
private Date createDate; private Date createDate;
......
...@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel; ...@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -55,6 +56,7 @@ public class JgChangeVehicleRegistrationUnitDto extends BaseDto { ...@@ -55,6 +56,7 @@ public class JgChangeVehicleRegistrationUnitDto extends BaseDto {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class) @JsonSerialize(using = BizCustomDateSerializer.class)
private Date createDate; private Date createDate;
......
...@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel; ...@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -53,6 +54,7 @@ public class JgEnableDisableDto extends BaseDto { ...@@ -53,6 +54,7 @@ public class JgEnableDisableDto extends BaseDto {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class) @JsonSerialize(using = BizCustomDateSerializer.class)
private Date createDate; private Date createDate;
......
...@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel; ...@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -65,6 +66,7 @@ public class JgEquipTransferDto extends BaseDto { ...@@ -65,6 +66,7 @@ public class JgEquipTransferDto extends BaseDto {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class) @JsonSerialize(using = BizCustomDateSerializer.class)
private Date createDate; private Date createDate;
......
...@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel; ...@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.util.Date; import java.util.Date;
...@@ -167,6 +168,7 @@ public class JgInstallationNoticeDto extends BaseDto { ...@@ -167,6 +168,7 @@ public class JgInstallationNoticeDto extends BaseDto {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class) @JsonSerialize(using = BizCustomDateSerializer.class)
private Date createDate; private Date createDate;
......
...@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel; ...@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -61,6 +62,7 @@ public class JgMaintainNoticeDto extends BaseDto { ...@@ -61,6 +62,7 @@ public class JgMaintainNoticeDto extends BaseDto {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class) @JsonSerialize(using = BizCustomDateSerializer.class)
private Date createDate; private Date createDate;
......
...@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel; ...@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -139,6 +140,7 @@ public class JgMaintenanceContractDto extends BaseDto { ...@@ -139,6 +140,7 @@ public class JgMaintenanceContractDto extends BaseDto {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class) @JsonSerialize(using = BizCustomDateSerializer.class)
private Date createDate; private Date createDate;
......
...@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto; import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.util.Date; import java.util.Date;
...@@ -65,6 +66,7 @@ public class JgReformNoticeDto extends BaseDto { ...@@ -65,6 +66,7 @@ public class JgReformNoticeDto extends BaseDto {
@ApiModelProperty (value = "创建时间") @ApiModelProperty (value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class) @JsonSerialize(using = BizCustomDateSerializer.class)
private Date createDate; private Date createDate;
......
...@@ -56,6 +56,7 @@ public class JgScrapCancelDto extends BaseDto { ...@@ -56,6 +56,7 @@ public class JgScrapCancelDto extends BaseDto {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class) @JsonSerialize(using = BizCustomDateSerializer.class)
private Date createDate; private Date createDate;
......
...@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel; ...@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.util.Date; import java.util.Date;
...@@ -63,6 +64,7 @@ public class JgTransferNoticeDto extends BaseDto { ...@@ -63,6 +64,7 @@ public class JgTransferNoticeDto extends BaseDto {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class) @JsonSerialize(using = BizCustomDateSerializer.class)
private Date createDate; private Date createDate;
......
...@@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModel; ...@@ -8,6 +8,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -90,6 +92,7 @@ public class JgUseRegistrationDto extends BaseDto { ...@@ -90,6 +92,7 @@ public class JgUseRegistrationDto extends BaseDto {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class) @JsonSerialize(using = BizCustomDateSerializer.class)
private Date createDate; private Date createDate;
......
...@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel; ...@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -85,6 +86,7 @@ public class JgVehicleInformationDto extends BaseDto { ...@@ -85,6 +86,7 @@ public class JgVehicleInformationDto extends BaseDto {
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class) @JsonSerialize(using = BizCustomDateSerializer.class)
private Date createDate; private Date createDate;
......
...@@ -109,6 +109,13 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> { ...@@ -109,6 +109,13 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
Integer checkFactoryNumUniquenessForVehicleCylinder(String factoryNum,String sequenceNbr); Integer checkFactoryNumUniquenessForVehicleCylinder(String factoryNum,String sequenceNbr);
/** /**
* 使用登记证编号全库唯一校验
* @param useRegistrationCode
* @return
*/
Integer useRegistrationCertificateAccountUnique(String useRegistrationCode);
/**
* 查询维保超期的设备 * 查询维保超期的设备
* */ * */
List<Map<String, Object>> queryOutOfMaintenanceRecord(); List<Map<String, Object>> queryOutOfMaintenanceRecord();
......
...@@ -873,6 +873,14 @@ ...@@ -873,6 +873,14 @@
</if> </if>
</select> </select>
<select id="useRegistrationCertificateAccountUnique" resultType="java.lang.Integer">
SELECT COUNT( 1 )
FROM
"amos_tzs_biz"."idx_biz_jg_register_info"
WHERE
"USE_ORG_CODE" = #{useRegistrationCode}
</select>
<select id="queryOutOfMaintenanceRecord" resultType="java.util.Map"> <select id="queryOutOfMaintenanceRecord" resultType="java.util.Map">
SELECT SELECT
tt."RECORD", tt."RECORD",
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
and cru.use_unit_credit_code = #{dto.useUnitCreditCode} and cru.use_unit_credit_code = #{dto.useUnitCreditCode}
</if> </if>
<if test="dto.createDate != null"> <if test="dto.createDate != null">
. AND cru.create_date LIKE concat(DATE_FORMAT(#{dto.createDate},'%Y-%m-%d'),'%') AND cru.create_date LIKE concat(DATE_FORMAT(#{dto.createDate},'%Y-%m-%d'),'%')
</if> </if>
<if test="type == 'supervision'"> <if test="type == 'supervision'">
AND (cru.receive_org_code = #{orgCode} or cru.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' )) AND (cru.receive_org_code = #{orgCode} or cru.transfer_to_user_ids LIKE concat ( '%', #{currentUserId}, '%' ))
......
...@@ -139,7 +139,12 @@ ...@@ -139,7 +139,12 @@
fi.factory_standard AS factoryStandard, fi.factory_standard AS factoryStandard,
fi.product_quality_yield_prove AS productQualityYieldProve, fi.product_quality_yield_prove AS productQualityYieldProve,
fi.ins_use_maintain_explain AS insUseMaintainExplain, fi.ins_use_maintain_explain AS insUseMaintainExplain,
useUnit.use_contact AS safetyManager, (select ui.PROVINCE_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS equipProvinceName,
(select ui.CITY_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS equipCityName,
(select ui.COUNTY_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS equipCountyName,
(select ui.STREET_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS equipStreetName,
(select ui.ADDRESS from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS equipAddress,
useUnit.use_contact AS safetyManager,
useUnit.contact_phone AS safetyManagerPhone, useUnit.contact_phone AS safetyManagerPhone,
useUnit.use_code AS useCode, useUnit.use_code AS useCode,
installUnit.use_code AS installUnitCreditCode, installUnit.use_code AS installUnitCreditCode,
......
...@@ -159,6 +159,11 @@ ...@@ -159,6 +159,11 @@
fi.factory_standard AS factoryStandard, fi.factory_standard AS factoryStandard,
fi.product_quality_yield_prove AS productQualityYieldProve, fi.product_quality_yield_prove AS productQualityYieldProve,
fi.ins_use_maintain_explain AS insUseMaintainExplain, fi.ins_use_maintain_explain AS insUseMaintainExplain,
(select ui.PROVINCE_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS equipProvinceName,
(select ui.CITY_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS equipCityName,
(select ui.COUNTY_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS equipCountyName,
(select ui.STREET_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS equipStreetName,
(select ui.ADDRESS from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS equipAddress,
(select ui.PROVINCE_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS useUnitProvinceName, (select ui.PROVINCE_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS useUnitProvinceName,
(select ui.CITY_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS useUnitCityName, (select ui.CITY_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS useUnitCityName,
(select ui.COUNTY_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS useUnitCountyName, (select ui.COUNTY_NAME from idx_biz_jg_use_info ui WHERE ui.record = re.equ_id) AS useUnitCountyName,
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<if test="dto.equListCode != null and dto.equListCode != ''"> <if test="dto.equListCode != null and dto.equListCode != ''">
and tjurm.equ_list_code = #{dto.equListCode} and tjurm.equ_list_code = #{dto.equListCode}
</if> </if>
<if test="dto.equCategoryCode != null and dto.equCategoryCode != ''"> <if test="dto.equCategoryCode != null and dto.equCategoryCode != '' and dto.isCyl != 1 ">
and tjurm.equ_category_code = #{dto.equCategoryCode} and tjurm.equ_category_code = #{dto.equCategoryCode}
</if> </if>
<if test="dto.equDefineCode != null and dto.equDefineCode != ''"> <if test="dto.equDefineCode != null and dto.equDefineCode != ''">
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
and tjurm.certificate_status = #{dto.certificateStatus} and tjurm.certificate_status = #{dto.certificateStatus}
</if> </if>
<if test="dto.isCyl != null and dto.isCyl == 1 "> <if test="dto.isCyl != null and dto.isCyl == 1 ">
AND tjurm.reg_type != '车用气瓶登记' AND tjurm.reg_type = '车用气瓶登记'
</if> </if>
ORDER BY tjurm.rec_date DESC ORDER BY tjurm.rec_date DESC
</where> </where>
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
and ur.status = #{dto.status} and ur.status = #{dto.status}
</if> </if>
<if test="dto.applicationDate != null"> <if test="dto.applicationDate != null">
and ur.reg_date like concat('%',DATE_FORMAT(#{dto.applicationDate},'%Y-%m-%d'),'%') and ur.create_date like concat('%',DATE_FORMAT(#{dto.applicationDate},'%Y-%m-%d'),'%')
</if> </if>
<if test="dto.equCode != null and dto.equCode != ''"> <if test="dto.equCode != null and dto.equCode != ''">
and jri.EQU_CODE like concat('%',#{dto.equCode},'%') and jri.EQU_CODE like concat('%',#{dto.equCode},'%')
...@@ -102,9 +102,6 @@ ...@@ -102,9 +102,6 @@
<if test="dto.useUnitCode != null and dto.useUnitCode != ''"> <if test="dto.useUnitCode != null and dto.useUnitCode != ''">
and ur.use_unit_credit_code = #{dto.useUnitCode} and ur.use_unit_credit_code = #{dto.useUnitCode}
</if> </if>
<if test="dto.createDate != null">
AND ur.create_date LIKE concat(DATE_FORMAT(#{dto.createDate},'%Y-%m-%d'),'%')
</if>
<if test="roleIds != null and dto.dataType == 'supervision'"> <if test="roleIds != null and dto.dataType == 'supervision'">
<foreach collection='roleIds' item='role' open='and (' close=')' separator='or'> <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
instance_status like concat('%',#{role},'%') instance_status like concat('%',#{role},'%')
......
...@@ -2118,4 +2118,18 @@ public class CommonServiceImpl implements ICommonService { ...@@ -2118,4 +2118,18 @@ public class CommonServiceImpl implements ICommonService {
.findFirst() .findFirst()
.orElse(null); .orElse(null);
} }
/**
* 使用登记证编号的全库唯一校验
*
* @param useRegistrationCode 登记证编号
* @return true : 已经存在 false :不存在
*/
public Boolean useRegistrationCertificateAccountUnique(String useRegistrationCode) {
Integer count = commonMapper.useRegistrationCertificateAccountUnique(useRegistrationCode);
if (count > 0) {
return true;
}
return false;
}
} }
\ No newline at end of file
...@@ -223,7 +223,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto, ...@@ -223,7 +223,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
Date currentDate = new Date(); Date currentDate = new Date();
nextInspectDates.forEach(next -> { nextInspectDates.forEach(next -> {
// 下次检验日期在当前时间之前的 // 下次检验日期在当前时间之前的
if (next.before(currentDate)) { if (!next.after(currentDate)) {
throw new BadRequest("启用的设备中存在超过定期检验有效期的设备"); throw new BadRequest("启用的设备中存在超过定期检验有效期的设备");
} }
}); });
......
...@@ -438,6 +438,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg ...@@ -438,6 +438,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
notice.setSequenceNbr(sequenceNbr); notice.setSequenceNbr(sequenceNbr);
notice.setApplyNo(applyNoList.get(0)); notice.setApplyNo(applyNoList.get(0));
notice.setNoticeDate(new Date()); notice.setNoticeDate(new Date());
notice.setCreateDate(new Date());
notice.setCreateUserName(reginParams.getUserModel().getRealName()); notice.setCreateUserName(reginParams.getUserModel().getRealName());
notice.setCreateUserId(reginParams.getUserModel().getUserId()); notice.setCreateUserId(reginParams.getUserModel().getUserId());
notice.setCreateUserCompanyName(reginParams.getCompany().getCompanyName()); notice.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
...@@ -475,7 +476,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg ...@@ -475,7 +476,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode())); notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
} }
notice.setCreateUserId(reginParams.getUserModel().getUserId()); // notice.setCreateUserId(reginParams.getUserModel().getUserId());
// 插入业务单 // 插入业务单
jgReformNoticeMapper.insert(notice); jgReformNoticeMapper.insert(notice);
......
...@@ -602,6 +602,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto ...@@ -602,6 +602,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
} }
dto.setCreateUserName(reginParams.getUserModel().getRealName()); dto.setCreateUserName(reginParams.getUserModel().getRealName());
dto.setCreateUserId(reginParams.getUserModel().getUserId()); dto.setCreateUserId(reginParams.getUserModel().getUserId());
dto.setCreateDate(new Date());
// dto.setEquAddress(obj.getOrDefault("ADDRESS", "").toString()); // dto.setEquAddress(obj.getOrDefault("ADDRESS", "").toString());
list.add(dto); list.add(dto);
jgTransferNoticeMapper.insert(list.get(0)); jgTransferNoticeMapper.insert(list.get(0));
......
...@@ -2593,6 +2593,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2593,6 +2593,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
*/ */
public List<Map<String, Object>> handleUnitHistoryEquip(JSONObject jsonObject) { public List<Map<String, Object>> handleUnitHistoryEquip(JSONObject jsonObject) {
return null; return null;
//TODO 校验使用登记证编号的唯一性
} }
/** /**
...@@ -2604,6 +2605,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD ...@@ -2604,6 +2605,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public List<Map<String, Object>> handleHistoryEquip(JSONObject map) { public List<Map<String, Object>> handleHistoryEquip(JSONObject map) {
try { try {
// 使用登记证编号
String useRegistrationCode = String.valueOf(map.get("useRegistrationCode")).trim();
//校验使用登记证编号的唯一性
Boolean used = commonServiceImpl.useRegistrationCertificateAccountUnique(useRegistrationCode);
if (used){
throw new BadRequest("使用登记证编号已存在!");
}
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class); ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
CompanyBo company = reginParams.getCompany(); CompanyBo company = reginParams.getCompany();
// 使用登记信息 // 使用登记信息
......
...@@ -1669,6 +1669,15 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform ...@@ -1669,6 +1669,15 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@GlobalTransactional(rollbackFor = Exception.class) @GlobalTransactional(rollbackFor = Exception.class)
public List<JgVehicleInformation> saveOrUpdateHisData(JSONObject map) { public List<JgVehicleInformation> saveOrUpdateHisData(JSONObject map) {
// 使用登记证编号
String useRegistrationCode1 = String.valueOf(map.get("useRegistrationCode")).trim();
//校验使用登记证编号的唯一性
Boolean used = commonService.useRegistrationCertificateAccountUnique(useRegistrationCode1);
if (used){
throw new BadRequest("使用登记证编号已存在!");
}
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class); ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class);
JgVehicleInformationDto vehicleInfoDto = JSON.parseObject(JSON.toJSONString(map), JgVehicleInformationDto.class); JgVehicleInformationDto vehicleInfoDto = JSON.parseObject(JSON.toJSONString(map), JgVehicleInformationDto.class);
List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists"); List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists");
......
...@@ -37,9 +37,9 @@ public class DPSubController { ...@@ -37,9 +37,9 @@ public class DPSubController {
@ApiOperation(httpMethod = "POST", value = "动态详情页", notes = "动态详情页") @ApiOperation(httpMethod = "POST", value = "动态详情页", notes = "动态详情页")
@PostMapping(value = "/{template}") @PostMapping(value = "/{template}")
public ResponseModel<JSONObject> commonQuery(@PathVariable String template, @RequestBody Map<String, Object> param) { public ResponseModel<JSONObject> commonQuery(@PathVariable String template, @RequestBody Map<String, Object> param) {
if (template.equals("company")) { if (template.equals("company")) { // 企业
Assert.notNull(param.get("useUnitCode"), "企业统一信用代码不能为空"); Assert.notNull(param.get("useUnitCode"), "企业统一信用代码不能为空");
} else if (template.equals("equip")) { } else if (template.equals("equip")) { // 设备
if (ValidationUtil.isEmpty(param.get("record"))){ if (ValidationUtil.isEmpty(param.get("record"))){
param.put("record", param.get("SEQUENCE_NBR")); param.put("record", param.get("SEQUENCE_NBR"));
} }
...@@ -54,15 +54,17 @@ public class DPSubController { ...@@ -54,15 +54,17 @@ public class DPSubController {
Assert.notNull(param.get("record"), "设备ID不能为空"); Assert.notNull(param.get("record"), "设备ID不能为空");
Assert.notNull(param.get("equList"), "设备种类不能为空"); Assert.notNull(param.get("equList"), "设备种类不能为空");
template = template + "_" + param.get("equList"); template = template + "_" + param.get("equList");
} else if (template.equals("emergency") || template.equals("registration")) { } else if (template.equals("emergency")) { // 应急
if (!ValidationUtil.isEmpty(param.get("alertId"))){
param.put("sequenceNbr", param.get("alertId"));
}
Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空"); Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
} else if(template.equals("problem")) { } else if(template.equals("problem")) { // 隐患
if (ValidationUtil.isEmpty(param.get("sequenceNbr"))){ if (ValidationUtil.isEmpty(param.get("sequenceNbr"))){
param.put("sequenceNbr", param.get("alertId")); param.put("sequenceNbr", param.get("alertId"));
} }
Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空"); Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
} else if(template.equals("cylinderProblem")) { } else if(template.equals("registration")) { // 登记证
template = "problem_cylinder";
Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空"); Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
} else { } else {
throw new RuntimeException("暂无模板"); throw new RuntimeException("暂无模板");
......
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
{ "key": "keyUnit", "label": "是否重点监控单位" } { "key": "keyUnit", "label": "是否重点监控单位" }
], ],
"infoRecords": { "infoRecords": {
"title": "问题记录", "title": "隐患记录",
"renderType": "timeline", "renderType": "timeline",
"datas": [] "datas": []
} }
......
{ {
"name": "应急模板",
"tabs": [ "tabs": [
{ {
"key": "keyinfo", "key": "keyinfo",
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
}, },
{ {
"key": "devtable", "key": "devtable",
"displayName": "问题列表", "displayName": "隐患列表",
"renderType": "table", "renderType": "table",
"useAloneApi": true, "useAloneApi": true,
"dataConfig": { "dataConfig": {
...@@ -119,15 +119,15 @@ ...@@ -119,15 +119,15 @@
"visualParams": { "visualParams": {
"rowKey": "sequenceNbr", "rowKey": "sequenceNbr",
"columns": [ "columns": [
{"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "1"}, {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "隐患主体类型","key": "1"},
{"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "2","imageAttributeName": "problemTypePic"}, {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "隐患类型","key": "2","imageAttributeName": "problemTypePic"},
{"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "3"}, {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "隐患描述","key": "3"},
{"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "4"}, {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "隐患时间","key": "4"},
{"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"}, {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"},
{"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"}, {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"},
{"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"}, {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"},
{"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"}, {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"},
{"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "9"} {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "隐患状态","key": "9"}
] ]
} }
} }
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
}, },
{ {
"key": "devtable", "key": "devtable",
"displayName": "问题列表", "displayName": "隐患列表",
"renderType": "table", "renderType": "table",
"useAloneApi": true, "useAloneApi": true,
"dataConfig": { "dataConfig": {
...@@ -123,15 +123,15 @@ ...@@ -123,15 +123,15 @@
"visualParams": { "visualParams": {
"rowKey": "sequenceNbr", "rowKey": "sequenceNbr",
"columns": [ "columns": [
{"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "1"}, {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "隐患主体类型","key": "1"},
{"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "2","imageAttributeName": "problemTypePic"}, {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "隐患类型","key": "2","imageAttributeName": "problemTypePic"},
{"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "3"}, {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "隐患描述","key": "3"},
{"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "4"}, {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "隐患时间","key": "4"},
{"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"}, {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"},
{"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"}, {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"},
{"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"}, {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"},
{"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"}, {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"},
{"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "9"} {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "隐患状态","key": "9"}
] ]
} }
} }
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
}, },
{ {
"key": "devtable", "key": "devtable",
"displayName": "问题列表", "displayName": "隐患列表",
"renderType": "table", "renderType": "table",
"useAloneApi": true, "useAloneApi": true,
"dataConfig": { "dataConfig": {
...@@ -119,15 +119,15 @@ ...@@ -119,15 +119,15 @@
"visualParams": { "visualParams": {
"rowKey": "sequenceNbr", "rowKey": "sequenceNbr",
"columns": [ "columns": [
{"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "1"}, {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "隐患主体类型","key": "1"},
{"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "2","imageAttributeName": "problemTypePic"}, {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "隐患类型","key": "2","imageAttributeName": "problemTypePic"},
{"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "3"}, {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "隐患描述","key": "3"},
{"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "4"}, {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "隐患时间","key": "4"},
{"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"}, {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"},
{"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"}, {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"},
{"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"}, {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"},
{"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"}, {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"},
{"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "9"} {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "隐患状态","key": "9"}
] ]
} }
} }
......
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
}, },
{ {
"key": "devtable", "key": "devtable",
"displayName": "问题列表", "displayName": "隐患列表",
"renderType": "table", "renderType": "table",
"useAloneApi": true, "useAloneApi": true,
"dataConfig": { "dataConfig": {
...@@ -115,15 +115,15 @@ ...@@ -115,15 +115,15 @@
"visualParams": { "visualParams": {
"rowKey": "sequenceNbr", "rowKey": "sequenceNbr",
"columns": [ "columns": [
{"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "1"}, {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "隐患主体类型","key": "1"},
{"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "2","imageAttributeName": "problemTypePic"}, {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "隐患类型","key": "2","imageAttributeName": "problemTypePic"},
{"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "3"}, {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "隐患描述","key": "3"},
{"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "4"}, {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "隐患时间","key": "4"},
{"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"}, {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"},
{"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"}, {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"},
{"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"}, {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"},
{"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"}, {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"},
{"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "9"} {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "隐患状态","key": "9"}
] ]
} }
} }
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
}, },
{ {
"key": "devtable", "key": "devtable",
"displayName": "问题列表", "displayName": "隐患列表",
"renderType": "table", "renderType": "table",
"useAloneApi": true, "useAloneApi": true,
"dataConfig": { "dataConfig": {
...@@ -111,15 +111,15 @@ ...@@ -111,15 +111,15 @@
"visualParams": { "visualParams": {
"rowKey": "sequenceNbr", "rowKey": "sequenceNbr",
"columns": [ "columns": [
{"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "1"}, {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "隐患主体类型","key": "1"},
{"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "2","imageAttributeName": "problemTypePic"}, {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "隐患类型","key": "2","imageAttributeName": "problemTypePic"},
{"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "3"}, {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "隐患描述","key": "3"},
{"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "4"}, {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "隐患时间","key": "4"},
{"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"}, {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"},
{"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"}, {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"},
{"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"}, {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"},
{"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"}, {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"},
{"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "9"} {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "隐患状态","key": "9"}
] ]
} }
} }
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
}, },
{ {
"key": "devtable", "key": "devtable",
"displayName": "问题列表", "displayName": "隐患列表",
"renderType": "table", "renderType": "table",
"useAloneApi": true, "useAloneApi": true,
"dataConfig": { "dataConfig": {
...@@ -105,15 +105,15 @@ ...@@ -105,15 +105,15 @@
"visualParams": { "visualParams": {
"rowKey": "sequenceNbr", "rowKey": "sequenceNbr",
"columns": [ "columns": [
{"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "1"}, {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "隐患主体类型","key": "1"},
{"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "2","imageAttributeName": "problemTypePic"}, {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "隐患类型","key": "2","imageAttributeName": "problemTypePic"},
{"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "3"}, {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "隐患描述","key": "3"},
{"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "4"}, {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "隐患时间","key": "4"},
{"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"}, {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"},
{"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"}, {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"},
{"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"}, {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"},
{"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"}, {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"},
{"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "9"} {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "隐患状态","key": "9"}
] ]
} }
} }
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
}, },
{ {
"key": "devtable", "key": "devtable",
"displayName": "问题列表", "displayName": "隐患列表",
"renderType": "table", "renderType": "table",
"useAloneApi": true, "useAloneApi": true,
"dataConfig": { "dataConfig": {
...@@ -111,15 +111,15 @@ ...@@ -111,15 +111,15 @@
"visualParams": { "visualParams": {
"rowKey": "sequenceNbr", "rowKey": "sequenceNbr",
"columns": [ "columns": [
{"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "1"}, {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "隐患主体类型","key": "1"},
{"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "2","imageAttributeName": "problemTypePic"}, {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "隐患类型","key": "2","imageAttributeName": "problemTypePic"},
{"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "3"}, {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "隐患描述","key": "3"},
{"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "4"}, {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "隐患时间","key": "4"},
{"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"}, {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"},
{"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"}, {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"},
{"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"}, {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"},
{"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"}, {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"},
{"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "9"} {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "隐患状态","key": "9"}
] ]
} }
} }
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
}, },
{ {
"key": "devtable", "key": "devtable",
"displayName": "问题列表", "displayName": "隐患列表",
"renderType": "table", "renderType": "table",
"useAloneApi": true, "useAloneApi": true,
"dataConfig": { "dataConfig": {
...@@ -111,15 +111,15 @@ ...@@ -111,15 +111,15 @@
"visualParams": { "visualParams": {
"rowKey": "sequenceNbr", "rowKey": "sequenceNbr",
"columns": [ "columns": [
{"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "问题主体类型","key": "1"}, {"dataRenderingMode": "defaultText","dataIndex": "sourceType","width": 150,"align": "left","title": "隐患主体类型","key": "1"},
{"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "问题类型","key": "2","imageAttributeName": "problemTypePic"}, {"dataRenderingMode": "imageText","dataIndex": "problemType","width": 150,"align": "left","title": "隐患类型","key": "2","imageAttributeName": "problemTypePic"},
{"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "问题描述","key": "3"}, {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","width": 150,"align": "left","title": "隐患描述","key": "3"},
{"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "问题时间","key": "4"}, {"dataRenderingMode": "defaultText","dataIndex": "problemTime","width": 180,"align": "left","title": "隐患时间","key": "4"},
{"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"}, {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","width": 200,"align": "left","title": "主体单位","key": "5"},
{"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"}, {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","width": 150,"align": "left","title": "单位类型","key": "6"},
{"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"}, {"dataRenderingMode": "defaultText","dataIndex": "governingBody","width": 150,"align": "left","title": "管辖机构","key": "7"},
{"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"}, {"dataRenderingMode": "defaultText","dataIndex": "regionName","width": 180,"align": "left","title": "所属区域","key": "8"},
{"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "问题状态","key": "9"} {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","width": 100,"align": "left","title": "隐患状态","key": "9"}
] ]
} }
} }
......
{ {
"name": "问题模板", "name": "隐患模板",
"tabs": [ "tabs": [
{ {
"key": "keyinfo", "key": "keyinfo",
...@@ -77,16 +77,16 @@ ...@@ -77,16 +77,16 @@
"content": { "content": {
"keyinfo": { "keyinfo": {
"keyParams": [ "keyParams": [
{ "key": "sourceType", "label": "问题主体类型" }, { "key": "sourceType", "label": "隐患主体类型" },
{ "key": "problemType", "label": "问题类型" }, { "key": "problemType", "label": "隐患类型" },
{ "key": "problemDesc", "label": "问题描述" }, { "key": "problemDesc", "label": "隐患描述" },
{ "key": "problemTime", "label": "问题时间" }, { "key": "problemTime", "label": "隐患时间" },
{ "key": "problemLevel", "label": "问题等级", "value": "重大" }, { "key": "problemLevel", "label": "隐患等级", "value": "重大" },
{ "key": "principalUnit", "label": "主体单位" }, { "key": "principalUnit", "label": "主体单位" },
{ "key": "principalUnitType", "label": "单位类型" }, { "key": "principalUnitType", "label": "单位类型" },
{ "key": "governingBody", "label": "管辖机构" }, { "key": "governingBody", "label": "管辖机构" },
{ "key": "governingBodyCode", "label": "所属区域" }, { "key": "governingBodyCode", "label": "所属区域" },
{ "key": "problemStatus", "label": "问题状态" }, { "key": "problemStatus", "label": "隐患状态" },
{ "key": "equipSuperviseCode", "label": "监管吗" }, { "key": "equipSuperviseCode", "label": "监管吗" },
{ "key": "equipList", "label": "设备种类" } { "key": "equipList", "label": "设备种类" }
] ]
......
{ {
"name": "气瓶问题模板", "name": "气瓶隐患模板",
"tabs": [ "tabs": [
{ {
"key": "keyinfo", "key": "keyinfo",
...@@ -77,16 +77,16 @@ ...@@ -77,16 +77,16 @@
"content": { "content": {
"keyinfo": { "keyinfo": {
"keyParams": [ "keyParams": [
{ "key": "sourceType", "label": "问题主体类型" }, { "key": "sourceType", "label": "隐患主体类型" },
{ "key": "problemType", "label": "问题类型" }, { "key": "problemType", "label": "隐患类型" },
{ "key": "problemDesc", "label": "问题描述" }, { "key": "problemDesc", "label": "隐患描述" },
{ "key": "problemTime", "label": "问题时间" }, { "key": "problemTime", "label": "隐患时间" },
{ "key": "problemLevel", "label": "问题等级", "value": "重大" }, { "key": "problemLevel", "label": "隐患等级", "value": "重大" },
{ "key": "principalUnit", "label": "主体单位" }, { "key": "principalUnit", "label": "主体单位" },
{ "key": "principalUnitType", "label": "单位类型" }, { "key": "principalUnitType", "label": "单位类型" },
{ "key": "governingBody", "label": "管辖机构" }, { "key": "governingBody", "label": "管辖机构" },
{ "key": "governingBodyCode", "label": "所属区域" }, { "key": "governingBodyCode", "label": "所属区域" },
{ "key": "problemStatus", "label": "问题状态" }, { "key": "problemStatus", "label": "隐患状态" },
{ "key": "equipSuperviseCode", "label": "监管吗" }, { "key": "equipSuperviseCode", "label": "监管吗" },
{ "key": "equipList", "label": "设备种类" } { "key": "equipList", "label": "设备种类" }
] ]
......
{ {
"name": "登记证模板",
"tabs": [ "tabs": [
{ {
"key": "keyinfo", "key": "keyinfo",
......
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