Merge remote-tracking branch 'origin/develop_master' into develop_3

This commit is contained in:
zhaokaiyao@91isoft.com
2021-08-27 15:30:35 +08:00
3 changed files with 16 additions and 5 deletions
@@ -5,8 +5,10 @@
<!-- Result Map-->
<resultMap id="resultMap" type="com.adc.da.scheduled.entity.WarningEO" >
<id column="ID" property="standId" />
<result column="STAND_NUMBER" property="standCode" />
<result column="STAND_NUMBER" property="standNum" />
<result column="STAND_NAME" property="standName" />
<result column="STAND_SORT" property="standSort"/>
<result column="STAND_YEAR" property="standYear"/>
<result column="XCXSSRQ" property="XCXSSRQ"/>
<result column="ZCCSSRQ" property="ZCCSSRQ"/>
<result column="CLLX" property="applyType" />
@@ -18,6 +20,8 @@
<select id="selectWithinTerm" resultMap="resultMap" parameterType="com.adc.da.scheduled.entity.DataDTO">
SELECT
info.ID,
info.STAND_SORT,
info.STAND_YEAR,
info.STAND_NUMBER,
info.STAND_NAME,
info.STAND_TYPE,