update 标准预警返回id

This commit is contained in:
liao
2023-10-31 18:09:35 +08:00
parent 013fd50d0d
commit cc116eb4f1
2 changed files with 9 additions and 0 deletions
@@ -1,5 +1,7 @@
package com.jero.modules.laws.localTool.entity; package com.jero.modules.laws.localTool.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.jero.common.aspect.annotation.Dict; import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
@@ -22,6 +24,10 @@ import java.util.List;
@ApiModel(value="标准预警", description="标准预警") @ApiModel(value="标准预警", description="标准预警")
public class StandardEarlyWarning { public class StandardEarlyWarning {
/**标准ID*/
@ApiModelProperty(value = "标准ID")
private java.lang.String id;
/**来源(国内/海外)*/ /**来源(国内/海外)*/
@Excel(name = "来源(国内/海外)", width = 15) @Excel(name = "来源(国内/海外)", width = 15)
@ApiModelProperty(value = "来源(国内/海外)") @ApiModelProperty(value = "来源(国内/海外)")
@@ -5,6 +5,7 @@
<select id="pageList" resultType="com.jero.modules.laws.localTool.entity.StandardEarlyWarning"> <select id="pageList" resultType="com.jero.modules.laws.localTool.entity.StandardEarlyWarning">
SELECT SELECT
standard.source, standard.source,
standard.id,
standard.standard_number, standard.standard_number,
standard.standard_name, standard.standard_name,
standard.responsible_department, standard.responsible_department,
@@ -14,6 +15,7 @@
( (
SELECT SELECT
'国内' AS source, '国内' AS source,
lds.id,
lds.standard_number, lds.standard_number,
lds.standard_name, lds.standard_name,
lds.responsible_department, lds.responsible_department,
@@ -26,6 +28,7 @@
lds.del_flag = 0 UNION lds.del_flag = 0 UNION
SELECT SELECT
'海外' AS source, '海外' AS source,
los.id,
los.standard_number, los.standard_number,
los.standard_name, los.standard_name,
los.responsible_department, los.responsible_department,