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

adc-da-slrs/src/main/resources/mybatis/mapper/evaluationIndex/EvaluationIndexMapper.xml

@@ -0,0 +1,5 @@
+<?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.evaluationIndex.dao.EvaluationIndexDao">
+
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/EvaluationIndexMapper.xml

@@ -0,0 +1,5 @@
+<?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.sarEnterpriseStandardEvaluation.dao.EvaluationIndexDao">
+
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml

@@ -0,0 +1,24 @@
+<?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.sarEnterpriseStandardEvaluation.dao.QualityEvaluationDao">
+
+    <select id="getHistory"
+            resultType="com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation">
+
+        SELECT
+        	`user`.UNAME AS userName,
+        	evaluation_index,
+        	eva.user_id,
+        	avg(eva.score * iex.weight) AS score
+        FROM
+        	quality_evaluation AS eva
+        LEFT JOIN ts_user `user` ON eva.user_id = `user`.USID
+        LEFT JOIN evaluation_index AS iex ON eva.evaluation_index = iex.id
+        GROUP BY
+        	userName,
+        	evaluation_index,
+        	eva.user_id,
+	        score
+        ${ew.customSqlSegment}
+    </select>
+</mapper>

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

@@ -37,56 +37,73 @@
 
 
     <sql id="stand_where">
-            <if test="waringEO.standCode != null and waringEO.standCode != ''">
-               AND trim(replace(CONCAT(
-                sarInfo.STAND_SORT,
-                ' ',
-                sarInfo.STAND_NUMBER,
-                '-',
-                sarInfo.STAND_YEAR
-                ),' ','')) LIKE trim(replace(CONCAT('%',#{waringEO.standCode},'%'),' ',''))
-            </if>
-            <if test="waringEO.standName != null and waringEO.standName != ''">
-                AND sarInfo.STAND_NAME like  concat('%', #{waringEO.standName},'%')
-            </if>
-            <if test="waringEO.startPutTime != null and waringEO.startPutTime != '' and waringEO.endPutTime != null and waringEO.endPutTime != '' ">
-                AND (
-                DATE_FORMAT(sarInfo.PUT_TIME, '%Y-%m-%d') &gt;= DATE_FORMAT(
-                #{waringEO.endPutTime},
-                '%Y-%m-%d'
-                )
 
-                AND
-                DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(
-                #{waringEO.endPutTime},
-                '%Y-%m-%d'
-                )
-                )
-            </if>
-            <if test="waringEO.startSSRQ != null and waringEO.startSSRQ != '' and waringEO.endSSRQ != null and waringEO.endSSRQ != ''">
-                AND (
-                sarInfo.ID IN (SELECT DISTINCT law_id FROM warning_date as t WHERE
-                DATE_FORMAT(t.SSRQ, '%Y-%m-%d') &gt;= DATE_FORMAT(#{waringEO.startSSRQ}, '%Y-%m-%d')
-                AND
-                DATE_FORMAT(t.SSRQ, '%Y-%m-%d') &lt;= DATE_FORMAT(#{waringEO.endSSRQ}, '%Y-%m-%d') AND t.time_name = 'SSRQ' )
-                )
-            </if>
+        <if test="idList != null and idList.size() > 0">
+
+            warning.ID
+            IN
+            <foreach collection="idList" item="id" open="and (" close=")" separator=",">
+                <!-- 每个遍历需要生成的串 -->
+                #{id}
+            </foreach>
+
+        </if>
+
+        <if test="waringEO.standCode != null and waringEO.standCode != ''">
+           AND trim(replace(CONCAT(
+            sarInfo.STAND_SORT,
+            ' ',
+            sarInfo.STAND_NUMBER,
+            '-',
+            sarInfo.STAND_YEAR
+            ),' ','')) LIKE trim(replace(CONCAT('%',#{waringEO.standCode},'%'),' ',''))
+        </if>
+        <if test="waringEO.standName != null and waringEO.standName != ''">
+            AND sarInfo.STAND_NAME like  concat('%', #{waringEO.standName},'%')
+        </if>
+        <if test="waringEO.startPutTime != null and waringEO.startPutTime != '' and waringEO.endPutTime != null and waringEO.endPutTime != '' ">
+            AND (
+            DATE_FORMAT(sarInfo.PUT_TIME, '%Y-%m-%d') &gt;= DATE_FORMAT(
+            #{waringEO.endPutTime},
+            '%Y-%m-%d'
+            )
+            AND
+            DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(
+            #{waringEO.endPutTime},
+            '%Y-%m-%d'
+            )
+            )
+        </if>
+        <if test="waringEO.startSSRQ != null and waringEO.startSSRQ != '' and waringEO.endSSRQ != null and waringEO.endSSRQ != ''">
+            AND (
+            sarInfo.ID IN (SELECT DISTINCT law_id FROM warning_date as t WHERE
+            DATE_FORMAT(t.SSRQ, '%Y-%m-%d') &gt;= DATE_FORMAT(#{waringEO.startSSRQ}, '%Y-%m-%d')
+            AND
+            DATE_FORMAT(t.SSRQ, '%Y-%m-%d') &lt;= DATE_FORMAT(#{waringEO.endSSRQ}, '%Y-%m-%d') AND t.time_name = 'SSRQ' )
+            )
+        </if>
     </sql>
 
     <select id="selectWarningPage" resultMap="resultMap">
+        SELECT WARNING_RESULT.* FROM
+        (
+
+
         SELECT
-            <include refid="stand_column"/> ,
-        	attr.CLLX AS APPLY_TYPE ,
-        	attr.ZRGCS AS DUTY_ENGINEER ,
-        	NULL AS ITEMS_ID ,
-        	NULL AS ITEMS_NUM ,
-        	NULL AS  ITEMS_NAME ,
-        	NULL AS POLICY_ID ,
-        	NULL AS POLICY_NAME ,
-        	MARK ,
-        	POWER,
-        	attr.XCXSSRQ AS XCXSSRQ ,
-        	attr.ZCCSSRQ AS ZCCSSRQ
+        <include refid="stand_column"/>
+        ,
+        attr.CLLX AS
+        APPLY_TYPE ,
+        attr
+        .ZRGCS AS DUTY_ENGINEER ,
+        NULL AS ITEMS_ID ,
+        NULL AS ITEMS_NUM , NULL AS ITEMS_NAME ,
+        NULL AS POLICY_ID ,
+        NULL AS POLICY_NAME ,
+        MARK ,
+        POWER,
+        attr.XCXSSRQ AS XCXSSRQ ,
+        attr.ZCCSSRQ AS ZCCSSRQ
         FROM sar_stand_warning AS warning
         LEFT JOIN sar_standards_info AS sarInfo on sarInfo.id=warning.STAND_ID
         LEFT JOIN sar_stand_attr_info AS attr on attr.STAND_ID=warning.STAND_ID
@@ -94,8 +111,8 @@
             POWER = '1'
             AND (MARK = 'stand')
             <include refid="stand_where"/>
-            <if test="waringEO.applyType != null and waringEO.applyType != ''">
-               AND attr.CLLX LIKE CONCAT('%', #{waringEO.applyType},'%')
+            <if test="waringEO.applyType != null and waringEO.applyType != ''">AND attr.CLLX LIKE CONCAT('%',
+                #{waringEO.applyType},'%')
             </if>
             <if test="waringEO.startXCXSSRQ != null and waringEO.startXCXSSRQ != '' and waringEO.endXCXSSRQ != null and waringEO.endXCXSSRQ != ''">
                AND (
@@ -157,6 +174,15 @@
             </if>
 
         </where>
+        )
+        WARNING_RESULT
+        LEFT JOIN
+        (
+        SELECT law_id,MIN(SSRQ) SSRQ_MIN FROM warning_date
+        GROUP BY warning_date.law_id
+        ) warning_date
+        ON warning_date.law_id = WARNING_RESULT.STAND_ID
+        ORDER BY warning_date.SSRQ_MIN
 
     </select>
 

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -441,10 +441,11 @@
             <!-- 标准编号111 -->
             <if test="standNumber != null and standNumber != ''">
                 and (
-                (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
-                SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR != '')
-                or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) like concat(concat('%',#{standNumber}),'%')
-                and SAR_STANDARDS_INFO.STAND_YEAR = '')
+                (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+                SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
+                or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ',''))
+                )
+                <!-- and SAR_STANDARDS_INFO.STAND_YEAR = '' -->
                 or (stand_name like concat(concat('%',#{standNumber}),'%'))
                 )
             </if>
@@ -757,8 +758,9 @@
                 (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
                 SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
                 or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ',''))
-                and SAR_STANDARDS_INFO.STAND_YEAR = '')
-             <!--    or (stand_name like concat(concat('%',#{page.standNumber}),'%')) -->
+                )
+                <!--  and SAR_STANDARDS_INFO.STAND_YEAR = ''-->
+               <!--    or (stand_name like concat(concat('%',#{page.standNumber}),'%')) -->
                 )
             </if>
             <!-- 标准名称 -->
@@ -884,9 +886,14 @@
             </if>
             <!-- 标准编号111 -->
             <if test="standNumber != null and standNumber != ''">
-                and
-                (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
-                SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR != '')
+                and (
+                (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+                SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),
+                ' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
+                or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like
+                trim(replace(concat(concat('%',#{standNumber}),'%'),' ',''))
+                )
+                )
             </if>
             <!-- 标准名称 -->
             <if test="standName != null and standName != ''">
@@ -1038,16 +1045,28 @@
         </if>
         <if test="standNumber != null">
             and (
+            (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+            SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
+            or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ',''))
+            )
+            <!-- and SAR_STANDARDS_INFO.STAND_YEAR = '' -->
+            or (stand_name like concat(concat('%',#{standNumber}),'%'))
+            )
+
+
+
+           <!-- and (
                 ( ( #{standNumber}) like CONCAT('%',dicstandSort.DIC_TYPE_NAME,'%')
                 and
                 ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_NUMBER,'%')
                 and
-                ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_YEAR,'%') and SAR_STANDARDS_INFO.STAND_YEAR != '')
+                ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_YEAR,'%')  and SAR_STANDARDS_INFO.STAND_YEAR != '' )
                 or (( #{standNumber}) like CONCAT('%',dicstandSort.DIC_TYPE_NAME,'%')
                 and
                 ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_NUMBER,'%')
-                and SAR_STANDARDS_INFO.STAND_YEAR = '')
-            )
+                )
+                and SAR_STANDARDS_INFO.STAND_YEAR = ''
+            ) -->
         </if>
         <if test="sychronId != null">
             and id != #{sychronId}
@@ -1254,6 +1273,13 @@
             #{item}
         </foreach>
     </update>
+    <update id="updateISRELATEACCESSById">
+
+    UPDATE sar_standards_info set IS_RELATE_ACCESS = #{IS_RELATE_ACCESS} WHERE ID IN
+        <foreach collection="list" item="id" index="index"  open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
 
     <select id="selectStandardsInfoByIdAndRoleAll" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage">
         select SAR_STANDARDS_INFO.id