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

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardWarningDao.xml

@@ -91,22 +91,6 @@ select A.* from
         from sar_stand_attr_info attr
            WHERE
             ZCCSSRQ REGEXP #{termStr}
-
-
-
-        UNION All
-        select item.STAND_ID as lawId,item.ID as itemId,'ZCCSSRQ' as timeName,
-        ZCCSSRQ as SSRQ
-        from sar_stand_items item
-           WHERE
-            ZCCSSRQ REGEXP #{termStr}
-
-        UNION All
-        select item.STAND_ID as lawId,item.ID as itemId,'XCXSSRQ' as timeName,
-        XCXSSRQ as SSRQ
-        from sar_stand_items item
-           WHERE
-            XCXSSRQ REGEXP #{termStr}
             ) AS A
             left join sar_standards_info as sarInfo
             on sarInfo.id=A.lawId
@@ -115,5 +99,30 @@ select A.* from
 
     </select>
 
+    <select id="getWarningDateOfItems" resultType="com.adc.da.slrs.sarStandWarning.entity.WarningDate">
+        select A.* from
+            (
+                select item.STAND_ID as lawId,item.ID as itemId,'ZCCSSRQ' as timeName,
+                       ZCCSSRQ as SSRQ,item.FILE_TYPE AS fileType
+                from sar_stand_items item
+                WHERE
+                    ZCCSSRQ REGEXP #{termStr}
+                UNION All
+                select item.STAND_ID as lawId,item.ID as itemId,'XCXSSRQ' as timeName,
+                    XCXSSRQ as SSRQ,item.FILE_TYPE AS fileType
+                from sar_stand_items item
+                WHERE
+                    XCXSSRQ REGEXP #{termStr}
+            ) AS A
+                left join sar_standards_info as sarInfo
+                          on sarInfo.id=A.lawId
+        where sarInfo.valid_flag = '0'
+    </select>
+
+
+    <select id="getStandTextStateByStandId" resultType="java.lang.String">
+        SELECT TEXT_STATUS FROM sar_standards_info WHERE ID = #{standId}
+    </select>
+
 
 </mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml

@@ -48,6 +48,31 @@
         limit #{start},#{end}
     </select>
 
+    <select id="getUserUnderInstitutionAll"  resultMap="UserPosition">
+        select u.USID,u.ACCOUNT,u.PASSWORD,u.OPER_USER,u.UNAME,u.SEX,u.USER_SOURCE,u.PHONE,u.EMAIL,u.INSTITUTION_NAME,u.INSTITUTION_ID
+        ,u.POSITION_NAME,u.STATE,u.POSITION_ID,u.WORK_NUM,u.EXT_INFO,u.CREATION_TIME,u.MODIFY_TIME,u.VALID_FLAG
+        ,u.DISABLE_FLAG,u.UNLOCK_FLAG,u.USER_TYPE,u.SSO_ID,
+        p.id p_id,p.name p_name from ts_user u
+        left join ts_user_position up
+        on u.usid=up.user_id
+        left join ts_position p
+        on up.position_id=p.id
+        where 1=1
+        <if test=" null != ids and ids.size()> 0">
+            and INSTITUTION_ID in
+            <foreach item="id" collection="ids" open="(" separator="," close=")" index="index">
+                #{id}
+            </foreach>
+        </if>
+        <if test=" null != ids and ids.size()> 0">
+            order by field(INSTITUTION_ID,
+            <foreach item="id" collection="ids" open="" separator="," close="" index="index">
+                #{id}
+            </foreach>)
+        </if>
+    </select>
+
+
     <select id="userUnderInstitution" parameterType="com.adc.da.slrs.sarUser.entity.TsUser" resultMap="UserPosition">
         select u.USID,u.ACCOUNT,u.PASSWORD,u.OPER_USER,u.UNAME,u.SEX,u.USER_SOURCE,u.PHONE,u.EMAIL,u.INSTITUTION_NAME,u.INSTITUTION_ID
                ,u.POSITION_NAME,u.STATE,u.POSITION_ID,u.WORK_NUM,u.EXT_INFO,u.CREATION_TIME,u.MODIFY_TIME,u.VALID_FLAG