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

adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml

@@ -64,7 +64,7 @@
 
 
     <select id="selectLawsId" resultType="string">
-        select stand_id from sar_laws_attr_detailed_list
+        select distinct stand_id from sar_laws_attr_detailed_list
         LEFT JOIN sar_standards_info si ON sar_laws_attr_detailed_list.stand_id = si.ID
         <where>
             <if test="standId != null">
@@ -78,6 +78,7 @@
             </if>
             <if test="sar.standNumber != null">
                 and concat(concat(concat(concat(si.STAND_SORT,' '),si.STAND_NUMBER),'-'),si.STAND_YEAR) like concat(concat('%', #{sar.standNumber}),'%')
+                or si.STAND_NAME like concat(concat('%', #{sar.standNumber}),'%')
             </if>
             <if test="sar.standName != null">
                 and si.STAND_NAME like concat(concat('%', #{sar.standName}),'%')

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml

@@ -27,6 +27,11 @@
 
     </delete>
 
+    <delete id="deleteByProjectId">
+        delete from sar_stand_project_relation where
+             project_id= #{projectId}
+    </delete>
+
     <select id="selectCount" resultType="java.lang.Integer">
         SELECT
         count(sar_stand_project_library.id ) as total
@@ -34,13 +39,16 @@
         sar_stand_project_library
         LEFT JOIN ts_user tu ON project_manager = tu.USID
         WHERE
-        (
+
         <if test="flag == 1">
             id NOT IN ( SELECT project_id FROM sar_stand_project_relation )
         </if>
         <if test="flag == 2">
             id IN ( SELECT project_id FROM sar_stand_project_relation )
         </if>
+        <if test="flag == 4">
+            1=1
+        </if>
         <if test="qu != null">
             <if test="qu.projectNumber != null">
                 AND project_number LIKE concat(concat('%',#{qu.projectNumber}),'%')
@@ -79,7 +87,7 @@
                 AND project_end_date &lt;= #{qu.projectEndDate}
             </if>
         </if>
-        )
+
     </select>
 
     <select id="selectPages" resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
@@ -90,13 +98,15 @@
         sar_stand_project_library
         LEFT JOIN ts_user tu ON project_manager = tu.USID
         WHERE
-        (
         <if test="flag == 1">
             id NOT IN ( SELECT project_id FROM sar_stand_project_relation )
         </if>
         <if test="flag == 2">
             id IN ( SELECT project_id FROM sar_stand_project_relation )
         </if>
+        <if test="flag == 4">
+            1=1
+        </if>
         <if test="qu != null">
             <if test="qu.projectNumber != null">
                 AND project_number LIKE concat(concat('%',#{qu.projectNumber}),'%')
@@ -135,7 +145,7 @@
                 AND project_end_date &lt;= #{qu.projectEndDate}
             </if>
         </if>
-        )
+
         limit ${(page-1)*size},${page*size}
     </select>
     <select id="selectPagesWorkFlow"

adc-da-slrs/src/main/resources/mybatis/mapper/utArea/UtAreaMapper.xml

@@ -182,7 +182,7 @@
     </select>
 
     <select id="getAreaSelList" parameterType="com.adc.da.slrs.utArea.entity.UtArea" resultType="com.adc.da.sys.common.SelectionResult">
-        select id as value,area_name as label
+        select id as value,area_name as label,sar_type AS sarType
         from UT_AREA
         where 1=1
         <if test="id != null" >
@@ -191,6 +191,12 @@
         <if test="sarType != null" >
             and sar_type like concat(concat('%',#{sarType}),'%')
         </if>
+        <if test="sarTypeList != null" >
+            and sar_type in
+            <foreach collection="sarTypeList" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         order by show_index,id
     </select>
 </mapper>