标准详情->标准分解单查询
This commit is contained in:
+12
-4
@@ -5,16 +5,13 @@ import com.adc.da.http.ResponseMessage;
|
|||||||
import com.adc.da.http.Result;
|
import com.adc.da.http.Result;
|
||||||
|
|
||||||
import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto;
|
import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto;
|
||||||
import com.adc.da.slrs.sarStandItems.entity.FindStandDto;
|
import com.adc.da.slrs.sarStandItems.entity.*;
|
||||||
import com.adc.da.slrs.sarStandItems.entity.SarItemsTime;
|
|
||||||
import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto;
|
|
||||||
import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl;
|
import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
|
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import com.adc.da.base.web.BaseController;
|
import com.adc.da.base.web.BaseController;
|
||||||
|
|
||||||
@@ -54,6 +51,17 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiOperation(value = "分解单查询")
|
||||||
|
@GetMapping("/querySarItemAndInterpretation")
|
||||||
|
public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
|
||||||
|
List<SarItemVO> sarItemVOS = ServiceImpl.querySarItemAndInterpretation(page);
|
||||||
|
|
||||||
|
return Result.success("200",sarItemVOS);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ApiOperation(value = "分解单查询(带时间)")
|
@ApiOperation(value = "分解单查询(带时间)")
|
||||||
@GetMapping("/findAllItemsTimes")
|
@GetMapping("/findAllItemsTimes")
|
||||||
public List<SarItemsTime> findAllItemsTimes(@RequestParam("type") String type,@RequestParam("ids") String ids){
|
public List<SarItemsTime> findAllItemsTimes(@RequestParam("type") String type,@RequestParam("ids") String ids){
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
package com.adc.da.slrs.sarStandItems.dao;
|
package com.adc.da.slrs.sarStandItems.dao;
|
||||||
|
|
||||||
import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
|
import com.adc.da.slrs.sarStandItems.entity.*;
|
||||||
import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto;
|
|
||||||
import com.adc.da.slrs.sarStandItems.entity.StandsTimeDto;
|
|
||||||
import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
|
import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
|
||||||
import com.adc.da.sys.common.SelectionResult;
|
import com.adc.da.sys.common.SelectionResult;
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
@@ -24,6 +22,8 @@ import java.util.Set;
|
|||||||
@Mapper
|
@Mapper
|
||||||
public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
|
public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
|
||||||
|
|
||||||
|
List<SarItemVO> querySarItemAndInterpretation(FindSarItemsPageReqDTO page);
|
||||||
|
|
||||||
List<SarStandItems> querySarStandItemsList(SarStandItemsEOPage page);
|
List<SarStandItems> querySarStandItemsList(SarStandItemsEOPage page);
|
||||||
|
|
||||||
int querySarStandItemsListCount(SarStandItemsEOPage page);
|
int querySarStandItemsListCount(SarStandItemsEOPage page);
|
||||||
|
|||||||
+36
@@ -0,0 +1,36 @@
|
|||||||
|
package com.adc.da.slrs.sarStandItems.entity;
|
||||||
|
|
||||||
|
import com.adc.da.base.page.BasePage;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class FindSarItemsPageReqDTO {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
private Integer page = 1;
|
||||||
|
private Integer pageSize = 20;
|
||||||
|
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "标准id")
|
||||||
|
private String standId;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "条款名称")
|
||||||
|
private String itemsName;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "新车型实施日期")
|
||||||
|
@DateTimeFormat(pattern = "yyy-MM-dd")
|
||||||
|
private Date XCXSSRQ;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "在产车实施日期")
|
||||||
|
@DateTimeFormat(pattern = "yyy-MM-dd")
|
||||||
|
private Date ZCCSSRQ;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "文件类型")
|
||||||
|
private String fileType;
|
||||||
|
}
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
package com.adc.da.slrs.sarStandItems.entity;
|
||||||
|
|
||||||
|
import com.adc.da.base.entity.BaseEntity;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import io.swagger.annotations.ApiModel;
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@ApiModel(value="标准分解单显示对象", description="")
|
||||||
|
public class SarItemVO extends BaseEntity {
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "主键")
|
||||||
|
private String id;
|
||||||
|
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "标准ID")
|
||||||
|
private String standId;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "条款号")
|
||||||
|
private String itemsNum;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "条款名称")
|
||||||
|
private String itemsName;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "条款内容")
|
||||||
|
private String itemsTitle;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "解读内容--条款要求")
|
||||||
|
private String termsConditions;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "新车实施日期")
|
||||||
|
@DateTimeFormat
|
||||||
|
private Date XCXSSRQ;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "在产车实施日期")
|
||||||
|
@DateTimeFormat
|
||||||
|
private Date ZCCSSRQ;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "适用车型")
|
||||||
|
private String applyArctic;
|
||||||
|
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "责任部门")
|
||||||
|
private String responsibleUnit;
|
||||||
|
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "责任工程师")
|
||||||
|
private String dutyEngineer;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "相对于上一版本变化点")
|
||||||
|
private String comparedWithPrevious;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "合规性分析")
|
||||||
|
private String complianceState;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "符合性要求-符合性状态")
|
||||||
|
private String complianceRequire;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "文件类型")
|
||||||
|
private String fileType;
|
||||||
|
}
|
||||||
+5
@@ -179,4 +179,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
|
|||||||
public List<SarStandItemsDto> findAllItems(String type,String[] ids){
|
public List<SarStandItemsDto> findAllItems(String type,String[] ids){
|
||||||
return dao.selectAllItemsByIds(type,ids);
|
return dao.selectAllItemsByIds(type,ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public List<SarItemVO> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
|
||||||
|
return dao.querySarItemAndInterpretation(page);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+104
-24
@@ -51,6 +51,23 @@
|
|||||||
<result column="foShow" property="foShow"/>
|
<result column="foShow" property="foShow"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
|
<resultMap id="sarItemVOResultMap" type="com.adc.da.slrs.sarStandItems.entity.SarItemVO">
|
||||||
|
<id column="id" property="id"/>
|
||||||
|
<result column="STAND_ID" property="standId"/>
|
||||||
|
<result column="ITEMS_NUM" property="itemsNum"/>
|
||||||
|
<result column="ITEMS_NAME" property="itemsName"/>
|
||||||
|
<result column="ITEMS_TITLE" property="itemsTitle"/>
|
||||||
|
<result column="TERMS_CONDITIONS" property="termsConditions"/>
|
||||||
|
<result column="XCXSSRQ" property="XCXSSRQ"/>
|
||||||
|
<result column="ZCCSSRQ" property="ZCCSSRQ"/>
|
||||||
|
<result column="APPLY_ARCTIC" property="applyArctic"/>
|
||||||
|
<result column="RESPONSIBLE_UNIT" property="responsibleUnit"/>
|
||||||
|
<result column="DUTY_ENGINEER" property="dutyEngineer"/>
|
||||||
|
<result column="compared_with_previous" property="comparedWithPrevious"/>
|
||||||
|
<result column="compliance_state" property="complianceState"/>
|
||||||
|
<result column="COMPLIANCE_REQUIR" property="complianceRequire"/>
|
||||||
|
<result column="FILE_TYPE" property="fileType"/>
|
||||||
|
</resultMap>
|
||||||
|
|
||||||
|
|
||||||
<!-- SAR_STAND_ITEMS table all fields -->
|
<!-- SAR_STAND_ITEMS table all fields -->
|
||||||
@@ -69,10 +86,13 @@
|
|||||||
|
|
||||||
<!-- 查询条件 -->
|
<!-- 查询条件 -->
|
||||||
<sql id="Base_Where_Clause">
|
<sql id="Base_Where_Clause">
|
||||||
left join SAR_STANDARDS_INFO on (SAR_STANDARDS_INFO.id = SAR_STAND_ITEMS.stand_id and SAR_STANDARDS_INFO.valid_flag=0)
|
left join SAR_STANDARDS_INFO on (SAR_STANDARDS_INFO.id = SAR_STAND_ITEMS.stand_id and
|
||||||
left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_STAND_ITEMS.claim_type and dicClaimType.dic_id is
|
SAR_STANDARDS_INFO.valid_flag=0)
|
||||||
|
left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_STAND_ITEMS.claim_type and
|
||||||
|
dicClaimType.dic_id is
|
||||||
not null and dicClaimType.valid_flag = 0)
|
not null and dicClaimType.valid_flag = 0)
|
||||||
left join TS_USER tsdutyEngineer on (tsdutyEngineer.USID = SAR_STAND_ITEMS.duty_engineer and tsdutyEngineer.valid_flag=0
|
left join TS_USER tsdutyEngineer on (tsdutyEngineer.USID = SAR_STAND_ITEMS.duty_engineer and
|
||||||
|
tsdutyEngineer.valid_flag=0
|
||||||
and tsdutyEngineer.DISABLE_FLAG=0)
|
and tsdutyEngineer.DISABLE_FLAG=0)
|
||||||
left join TS_USER tsFo on (tsFo.USID = SAR_STAND_ITEMS.fo and tsFo.valid_flag=0
|
left join TS_USER tsFo on (tsFo.USID = SAR_STAND_ITEMS.fo and tsFo.valid_flag=0
|
||||||
and tsFo.DISABLE_FLAG=0)
|
and tsFo.DISABLE_FLAG=0)
|
||||||
@@ -130,7 +150,8 @@
|
|||||||
and SAR_STAND_ITEMS.parts like concat(concat('%', #{parts}),'%')
|
and SAR_STAND_ITEMS.parts like concat(concat('%', #{parts}),'%')
|
||||||
</if>
|
</if>
|
||||||
<if test="nameOrRequest != null">
|
<if test="nameOrRequest != null">
|
||||||
and (SAR_STAND_ITEMS.items_name like concat(concat('%', #{nameOrRequest}),'%') or SAR_STAND_ITEMS.TERMS_CONDITIONS like concat(concat('%', #{nameOrRequest}),'%'))
|
and (SAR_STAND_ITEMS.items_name like concat(concat('%', #{nameOrRequest}),'%') or
|
||||||
|
SAR_STAND_ITEMS.TERMS_CONDITIONS like concat(concat('%', #{nameOrRequest}),'%'))
|
||||||
</if>
|
</if>
|
||||||
<if test="itemsName != null">
|
<if test="itemsName != null">
|
||||||
and SAR_STAND_ITEMS.items_name ${itemsNameOperator} #{itemsName}
|
and SAR_STAND_ITEMS.items_name ${itemsNameOperator} #{itemsName}
|
||||||
@@ -143,8 +164,10 @@
|
|||||||
</if>
|
</if>
|
||||||
<if test="standNum != null">
|
<if test="standNum != null">
|
||||||
and ((SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER || '-' ||
|
and ((SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER || '-' ||
|
||||||
SAR_STANDARDS_INFO.STAND_YEAR like concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.STAND_YEAR is not null)
|
SAR_STANDARDS_INFO.STAND_YEAR like concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.STAND_YEAR
|
||||||
or (SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER like concat(concat('%',#{standNum}),'%')
|
is not null)
|
||||||
|
or (SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER like
|
||||||
|
concat(concat('%',#{standNum}),'%')
|
||||||
and SAR_STANDARDS_INFO.STAND_YEAR is null))
|
and SAR_STANDARDS_INFO.STAND_YEAR is null))
|
||||||
</if>
|
</if>
|
||||||
<if test="id != null">
|
<if test="id != null">
|
||||||
@@ -174,7 +197,11 @@
|
|||||||
SELECT SEQ_SAR_STAND_ITEMS.NEXTVAL FROM DUAL
|
SELECT SEQ_SAR_STAND_ITEMS.NEXTVAL FROM DUAL
|
||||||
</selectKey> -->
|
</selectKey> -->
|
||||||
insert into SAR_STAND_ITEMS(<include refid="Base_Column_List"/>)
|
insert into SAR_STAND_ITEMS(<include refid="Base_Column_List"/>)
|
||||||
values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{remarks, jdbcType=VARCHAR}, #{responsibleUnit, jdbcType=VARCHAR}, #{energyKind, jdbcType=VARCHAR}, #{applyArctic, jdbcType=VARCHAR}, #{tackTime, jdbcType=TIMESTAMP}, #{parts, jdbcType=VARCHAR}, #{itemsName, jdbcType=VARCHAR}, #{itemsNum, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR})
|
values (#{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP},
|
||||||
|
#{creationUser, jdbcType=VARCHAR}, #{validFlag, jdbcType=INTEGER}, #{remarks, jdbcType=VARCHAR},
|
||||||
|
#{responsibleUnit, jdbcType=VARCHAR}, #{energyKind, jdbcType=VARCHAR}, #{applyArctic, jdbcType=VARCHAR},
|
||||||
|
#{tackTime, jdbcType=TIMESTAMP}, #{parts, jdbcType=VARCHAR}, #{itemsName, jdbcType=VARCHAR},
|
||||||
|
#{itemsNum, jdbcType=VARCHAR}, #{standId, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR})
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
<!-- 动态插入记录 主键是序列 -->
|
<!-- 动态插入记录 主键是序列 -->
|
||||||
@@ -329,7 +356,8 @@
|
|||||||
|
|
||||||
<!-- 根据id查询 SAR_STAND_ITEMS -->
|
<!-- 根据id查询 SAR_STAND_ITEMS -->
|
||||||
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
|
<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
|
||||||
select <include refid="Base_Query_Column_List" />
|
select
|
||||||
|
<include refid="Base_Query_Column_List"/>
|
||||||
from SAR_STAND_ITEMS
|
from SAR_STAND_ITEMS
|
||||||
where id = #{value}
|
where id = #{value}
|
||||||
|
|
||||||
@@ -348,12 +376,51 @@
|
|||||||
<include refid="Base_Where_Clause"/>
|
<include refid="Base_Where_Clause"/>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="querySarItemAndInterpretation" resultMap="sarItemVOResultMap"
|
||||||
|
parameterType="com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO">
|
||||||
|
SELECT
|
||||||
|
*
|
||||||
|
FROM
|
||||||
|
sar_stand_items AS a
|
||||||
|
LEFT JOIN sar_interpretation_national_standard AS b ON a.STAND_ID = b.STAND_ID
|
||||||
|
<where>
|
||||||
|
-- valid_flag=0
|
||||||
|
|
||||||
|
<if test="standId!=null and standId!=''">
|
||||||
|
and a.stand_id=#{standId}
|
||||||
|
</if>
|
||||||
|
|
||||||
|
<if test="fileType !=null and fileType!=''">
|
||||||
|
and a.file_type=#{fileType}
|
||||||
|
</if>
|
||||||
|
|
||||||
|
<if test="itemsName != null and itemsName!=''">
|
||||||
|
and a.ITEMS_NAME=#{itemsName}
|
||||||
|
</if>
|
||||||
|
<if test="XCSSRQ !=null and XCSSRQ!=''">
|
||||||
|
and a.XCXSSRQ=#{XCXSSRQ}
|
||||||
|
</if>
|
||||||
|
<if test="ZCCSSRQ !=null and ZCCSSRQ != ''">
|
||||||
|
and a.ZCCSSRQ=#{ZCCSSRQ}
|
||||||
|
</if>
|
||||||
|
</where>
|
||||||
|
LIMIT #{page},#{pageSize}
|
||||||
|
|
||||||
|
|
||||||
|
</select>
|
||||||
|
|
||||||
<!-- 查询SAR_STAND_ITEMS列表 -->
|
<!-- 查询SAR_STAND_ITEMS列表 -->
|
||||||
<select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
|
<select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
|
||||||
select <include refid="Base_Column_List" /> from
|
select
|
||||||
|
<include refid="Base_Column_List"/>
|
||||||
|
from
|
||||||
(select tmp_tb.* from
|
(select tmp_tb.* from
|
||||||
(select SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user, SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit, SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name, SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id
|
(select SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user,
|
||||||
,TS_ORG.org_name as responsibleUnitShow,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS
|
SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit,
|
||||||
|
SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name,
|
||||||
|
SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id
|
||||||
|
,TS_ORG.org_name as
|
||||||
|
responsibleUnitShow,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS
|
||||||
from SAR_STAND_ITEMS
|
from SAR_STAND_ITEMS
|
||||||
<include refid="Base_Where_Clause"/>
|
<include refid="Base_Where_Clause"/>
|
||||||
<if test="pager.orderCondition != null and pager.orderCondition != ''">
|
<if test="pager.orderCondition != null and pager.orderCondition != ''">
|
||||||
@@ -363,7 +430,9 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="queryByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
|
<select id="queryByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
|
||||||
select <include refid="Base_Column_List"/> from SAR_STAND_ITEMS
|
select
|
||||||
|
<include refid="Base_Column_List"/>
|
||||||
|
from SAR_STAND_ITEMS
|
||||||
<include refid="Base_Where_Clause"/>
|
<include refid="Base_Where_Clause"/>
|
||||||
<if test="pager.orderCondition != null and pager.orderCondition != ''">
|
<if test="pager.orderCondition != null and pager.orderCondition != ''">
|
||||||
${pager.orderCondition}
|
${pager.orderCondition}
|
||||||
@@ -376,7 +445,8 @@
|
|||||||
SELECT
|
SELECT
|
||||||
group_concat(TS_DICTYPE.DIC_TYPE_NAME ORDER BY SAR_STAND_ITEM_VAL.property_type separator ',')
|
group_concat(TS_DICTYPE.DIC_TYPE_NAME ORDER BY SAR_STAND_ITEM_VAL.property_type separator ',')
|
||||||
FROM
|
FROM
|
||||||
SAR_STAND_ITEM_VAL left join TS_DICTYPE on (TS_DICTYPE.dic_type_code = SAR_STAND_ITEM_VAL.property_val and TS_DICTYPE.dic_id is not null)
|
SAR_STAND_ITEM_VAL left join TS_DICTYPE on (TS_DICTYPE.dic_type_code = SAR_STAND_ITEM_VAL.property_val and
|
||||||
|
TS_DICTYPE.dic_id is not null)
|
||||||
WHERE
|
WHERE
|
||||||
SAR_STAND_ITEM_VAL.ITEM_ID = SAR_STAND_ITEMS.id
|
SAR_STAND_ITEM_VAL.ITEM_ID = SAR_STAND_ITEMS.id
|
||||||
AND SAR_STAND_ITEM_VAL.property_type = 'APPLY_ARCTIC'
|
AND SAR_STAND_ITEM_VAL.property_type = 'APPLY_ARCTIC'
|
||||||
@@ -385,16 +455,20 @@
|
|||||||
SELECT
|
SELECT
|
||||||
group_concat(TS_DICTYPE.DIC_TYPE_NAME ORDER BY SAR_STAND_ITEM_VAL.property_type separator ',')
|
group_concat(TS_DICTYPE.DIC_TYPE_NAME ORDER BY SAR_STAND_ITEM_VAL.property_type separator ',')
|
||||||
FROM
|
FROM
|
||||||
SAR_STAND_ITEM_VAL left join TS_DICTYPE on (TS_DICTYPE.dic_type_code = SAR_STAND_ITEM_VAL.property_val and TS_DICTYPE.dic_id is not null)
|
SAR_STAND_ITEM_VAL left join TS_DICTYPE on (TS_DICTYPE.dic_type_code = SAR_STAND_ITEM_VAL.property_val and
|
||||||
|
TS_DICTYPE.dic_id is not null)
|
||||||
WHERE
|
WHERE
|
||||||
SAR_STAND_ITEM_VAL.ITEM_ID = SAR_STAND_ITEMS.id
|
SAR_STAND_ITEM_VAL.ITEM_ID = SAR_STAND_ITEMS.id
|
||||||
AND SAR_STAND_ITEM_VAL.property_type = 'ENERGY_KIND'
|
AND SAR_STAND_ITEM_VAL.property_type = 'ENERGY_KIND'
|
||||||
) AS emergyKindShow
|
) AS emergyKindShow
|
||||||
from SAR_STAND_ITEMS left join TS_ORG on (SAR_STAND_ITEMS.responsible_unit =TS_ORG.id)
|
from SAR_STAND_ITEMS left join TS_ORG on (SAR_STAND_ITEMS.responsible_unit =TS_ORG.id)
|
||||||
left join SAR_STANDARDS_INFO on (SAR_STANDARDS_INFO.id = SAR_STAND_ITEMS.stand_id and SAR_STANDARDS_INFO.valid_flag=0)
|
left join SAR_STANDARDS_INFO on (SAR_STANDARDS_INFO.id = SAR_STAND_ITEMS.stand_id and
|
||||||
left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_STAND_ITEMS.claim_type and dicClaimType.dic_id is
|
SAR_STANDARDS_INFO.valid_flag=0)
|
||||||
|
left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_STAND_ITEMS.claim_type and
|
||||||
|
dicClaimType.dic_id is
|
||||||
not null and dicClaimType.valid_flag = 0)
|
not null and dicClaimType.valid_flag = 0)
|
||||||
left join TS_USER tsdutyEngineer on (tsdutyEngineer.USID = SAR_STAND_ITEMS.duty_engineer and tsdutyEngineer.valid_flag=0
|
left join TS_USER tsdutyEngineer on (tsdutyEngineer.USID = SAR_STAND_ITEMS.duty_engineer and
|
||||||
|
tsdutyEngineer.valid_flag=0
|
||||||
and tsdutyEngineer.DISABLE_FLAG=0)
|
and tsdutyEngineer.DISABLE_FLAG=0)
|
||||||
left join TS_USER tsFo on (tsFo.USID = SAR_STAND_ITEMS.fo and tsFo.valid_flag=0
|
left join TS_USER tsFo on (tsFo.USID = SAR_STAND_ITEMS.fo and tsFo.valid_flag=0
|
||||||
and tsFo.DISABLE_FLAG=0)
|
and tsFo.DISABLE_FLAG=0)
|
||||||
@@ -451,7 +525,8 @@
|
|||||||
and SAR_STAND_ITEMS.parts like concat(concat('%', #{parts}),'%')
|
and SAR_STAND_ITEMS.parts like concat(concat('%', #{parts}),'%')
|
||||||
</if>
|
</if>
|
||||||
<if test="nameOrRequest != null">
|
<if test="nameOrRequest != null">
|
||||||
and (SAR_STAND_ITEMS.items_name like concat(concat('%', #{nameOrRequest}),'%') or SAR_STAND_ITEMS.TERMS_CONDITIONS like concat(concat('%', #{nameOrRequest}),'%'))
|
and (SAR_STAND_ITEMS.items_name like concat(concat('%', #{nameOrRequest}),'%') or
|
||||||
|
SAR_STAND_ITEMS.TERMS_CONDITIONS like concat(concat('%', #{nameOrRequest}),'%'))
|
||||||
</if>
|
</if>
|
||||||
<if test="itemsName != null">
|
<if test="itemsName != null">
|
||||||
and SAR_STAND_ITEMS.items_name ${itemsNameOperator} #{itemsName}
|
and SAR_STAND_ITEMS.items_name ${itemsNameOperator} #{itemsName}
|
||||||
@@ -464,8 +539,10 @@
|
|||||||
</if>
|
</if>
|
||||||
<if test="standNum != null">
|
<if test="standNum != null">
|
||||||
and ((SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER || '-' ||
|
and ((SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER || '-' ||
|
||||||
SAR_STANDARDS_INFO.STAND_YEAR like concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.STAND_YEAR is not null)
|
SAR_STANDARDS_INFO.STAND_YEAR like concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.STAND_YEAR is
|
||||||
or (SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER like concat(concat('%',#{standNum}),'%')
|
not null)
|
||||||
|
or (SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER like
|
||||||
|
concat(concat('%',#{standNum}),'%')
|
||||||
and SAR_STANDARDS_INFO.STAND_YEAR is null))
|
and SAR_STANDARDS_INFO.STAND_YEAR is null))
|
||||||
</if>
|
</if>
|
||||||
<if test="id != null">
|
<if test="id != null">
|
||||||
@@ -595,7 +672,6 @@
|
|||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<select id="selectSvppsByStandId" parameterType="java.lang.String" resultType="java.lang.String">
|
<select id="selectSvppsByStandId" parameterType="java.lang.String" resultType="java.lang.String">
|
||||||
select svpps from SAR_STAND_ITEMS
|
select svpps from SAR_STAND_ITEMS
|
||||||
where valid_flag=0 and svpps != ''
|
where valid_flag=0 and svpps != ''
|
||||||
@@ -613,7 +689,8 @@
|
|||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectAllItemsClaimType" resultType="com.adc.da.sys.common.SelectionResult" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
|
<select id="selectAllItemsClaimType" resultType="com.adc.da.sys.common.SelectionResult"
|
||||||
|
parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
|
||||||
select stand_id as label,claim_type as value from SAR_STAND_ITEMS
|
select stand_id as label,claim_type as value from SAR_STAND_ITEMS
|
||||||
where valid_flag = 0 and claim_type != ''
|
where valid_flag = 0 and claim_type != ''
|
||||||
<if test="standId != null">
|
<if test="standId != null">
|
||||||
@@ -627,7 +704,8 @@
|
|||||||
</if>
|
</if>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectAllItemsSvpps" resultType="com.adc.da.sys.common.SelectionResult" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
|
<select id="selectAllItemsSvpps" resultType="com.adc.da.sys.common.SelectionResult"
|
||||||
|
parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
|
||||||
select stand_id as label,svpps as value from SAR_STAND_ITEMS
|
select stand_id as label,svpps as value from SAR_STAND_ITEMS
|
||||||
where valid_flag = 0 and svpps != ''
|
where valid_flag = 0 and svpps != ''
|
||||||
<if test="standId != null">
|
<if test="standId != null">
|
||||||
@@ -643,7 +721,9 @@
|
|||||||
|
|
||||||
|
|
||||||
<select id="selectAllItemsByIds" resultType="com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto">
|
<select id="selectAllItemsByIds" resultType="com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto">
|
||||||
select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer
|
select
|
||||||
|
ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as
|
||||||
|
responsibleEngineer
|
||||||
from SAR_STAND_ITEMS
|
from SAR_STAND_ITEMS
|
||||||
where FILE_TYPE=#{type}
|
where FILE_TYPE=#{type}
|
||||||
<if test="ids != null">
|
<if test="ids != null">
|
||||||
|
|||||||
Reference in New Issue
Block a user