合并分支 'dev_xy_20230509' 到 'master'

Dev xy 20230509

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!74
This commit is contained in:
高嵩
2023-05-11 18:16:53 +08:00
13 changed files with 415 additions and 1 deletions
@@ -0,0 +1,45 @@
<?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.adc.da.slrs.pdmcSarLawsStandInfo.dao.PDMCSarLawsStandInfoDao">
<!-- Result Map-->
<resultMap id="BaseResultMap" type="com.adc.da.slrs.pdmcSarLawsStandInfo.entity.PDMCSarLawsStandInfo" >
<result property="id" column="id" javaType="String"/>
<result property="menuId" column="MENU_ID"/>
<result property="standNumber" column="STAND_NUMBER"/>
<result property="standName" column="STAND_NAME"/>
<result property="standEnName" column="STAND_EN_NAME"/>
<result property="textState" column="TEXT_STATE"/>
<result property="issueTime" column="ISSUE_TIME"/>
<result property="putTime" column="PUT_TIME"/>
<result property="replaceStandNum" column="REPLACE_STAND_NUM"/>
</resultMap>
<resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.pdmcSarLawsStandInfo.entity.PDMCSarLawsStandInfo" >
</resultMap>
<sql id="Base_Column_List_Show" >
DISTINCT sar_standards_info.ID,
sar_stand_menu.MENU_ID as MENU_ID,
sar_standards_info.STAND_NUMBER as STAND_NUMBER,
sar_standards_info.STAND_NAME as STAND_NAME,
sar_standards_info.STAND_EN_NAME as STAND_EN_NAME,
sar_standards_info.STAND_STATE as TEXT_STATE,
sar_standards_info.ISSUE_TIME as ISSUE_TIME,
sar_standards_info.REPLACE_STAND_NUM as REPLACE_STAND_NUM,
concat('https://srms.foton.com.cn/#/otherStandardDetails/',sar_standards_info.ID,'/',sar_standards_info.STAND_TYPE,'_STAND') as LINK
</sql>
<select id="getSarStandardsInfo" resultMap="BaseResultMap">
select
<include refid="Base_Column_List_Show"/>
from sar_standards_info
left join sar_stand_menu on sar_standards_info.id=sar_stand_menu.STAND_ID order by sar_standards_info.ID asc
</select>
<select id="getSarStandardsCount" resultType="java.lang.Integer">
select
count(1)
from sar_standards_info
left join sar_stand_menu on sar_standards_info.id=sar_stand_menu.STAND_ID order by sar_standards_info.ID asc
</select>
</mapper>