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

# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

@@ -643,7 +643,7 @@
 
 
     <select id="selectAllItemsByIds" resultType="com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto">
-        select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER
+        select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer
         from SAR_STAND_ITEMS
         where FILE_TYPE=#{type}
 
@@ -654,6 +654,35 @@
         </foreach>
         </if>
     </select>
-
+    <select id="selectStandTime" resultType="com.adc.da.slrs.sarStandItems.entity.StandsTimeDto">
+        select STAND_ID,XCXSSRQ,ZCCSSRQ
+        from sar_stand_attr_info
+        where STAND_ID=#{standId,jdbcType=VARCHAR}
+    </select>
+    <select id="selectStandTimeAll" resultType="com.adc.da.slrs.sarStandItems.entity.StandsTimeDto">
+        select STAND_ID,XCXSSRQ,ZCCSSRQ
+        from sar_stand_attr_info
+    </select>
+    <select resultType="java.lang.String" id="selectStandId">
+        SELECT
+            a.STAND_ID
+        FROM
+            sar_stand_items a
+        LEFT JOIN sar_standards_info b
+        on a.STAND_ID=b.ID
+        WHERE b.VALID_FLAG = 0
+        and a.FILE_TYPE ='FBGBJBD'
+        GROUP BY
+            a.STAND_ID
+            limit #{page},#{size}
+    </select>
+    <select id="selectToken" resultType="java.lang.Integer">
+        SELECT
+            count(DISTINCT a.STAND_ID )
+        FROM
+            sar_stand_items a LEFT JOIN sar_standards_info b
+                                        on a.STAND_ID=b.ID
+        WHERE b.VALID_FLAG = 0
+    </select>
 
 </mapper>

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

@@ -2,24 +2,42 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao">
 
-    <select id="selectLawsById" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LittleLawsDto">
-        SELECT ID,STAND_NUMBER,STAND_NAME,STAND_EN_NAME,ISSUE_TIME,TEXT_STATUS
-        FROM sar_standards_info
+    <select id="selectLawsById" parameterType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarFindDto" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto">
+        SELECT a.ID,a.STAND_NUMBER,a.STAND_NAME,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQGJ,b.ZCCSSRQGJ,b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,
+               b.CLLX as typeApplicable,dicstandSort.DIC_TYPE_NAME as standSortShow ,a.STAND_YEAR as standYear
+        FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on
+        a.ID = b.STAND_ID left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = a.stand_sort and
+        dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0  and dicstandSort.PARENT_ID is null)
         <where>
-            <if test="standName != null">
-                (STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')
-                or STAND_NAME LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%'))
+            <if test="sarFindDto.standName != null">
+                (a.STAND_NUMBER LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%')
+                or a.STAND_NAME LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%'))
                 and
             </if>
-            ID IN
-            <foreach collection="param1" index="index" item="item" open="(" separator="," close=")">
+            <if test="sarFindDto.standEnName != null">
+                a.STAND_EN_NAME LIKE concat ('%',#{sarFindDto.standEnName,jdbcType=VARCHAR},'%')
+                and
+            </if>
+            <if test="sarFindDto.typeApplicable != null">
+                b.CLLX LIKE concat ('%',#{sarFindDto.typeApplicable,jdbcType=VARCHAR},'%')
+                and
+            </if>
+            <if test="sarFindDto.NYLX != null">
+                b.NYLX LIKE concat ('%',#{sarFindDto.NYLX,jdbcType=VARCHAR},'%')
+                and
+            </if>
+            <if test="sarFindDto.ZRBM != null">
+                b.ZRBM LIKE concat ('%',#{sarFindDto.ZRBM,jdbcType=VARCHAR},'%')
+                and
+            </if>
+            <if test="sarFindDto.SYCPX != null">
+                b.SYCPX LIKE concat ('%',#{sarFindDto.SYCPX,jdbcType=VARCHAR},'%')
+                and
+            </if>
+            a.ID IN
+            <foreach collection="param1" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
-            order by field(ID,
-            <foreach collection="param1" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
-            )
         </where>
 
     </select>
@@ -45,11 +63,44 @@
         </where>
         order by number
     </select>
+    <select id="selectLawsByIdC" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto">
+        SELECT a.ID,a.STAND_NUMBER,a.STAND_NAME,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQGJ,b.ZCCSSRQGJ,b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,b.CLLX as typeApplicable
+        FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on
+        a.ID = b.STAND_ID
+        <where>
+            <if test="standName != null">
+                (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')
+                or a.STAND_NAME LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%'))
+                and
+            </if>
+        <if test="standType !=null">
+            a.STAND_TYPE = #{standType} and
+        </if>
+            a.ID IN
+            <foreach collection="param1" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </where>
+    </select>
+    <select id="selectTimes" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.StandRegionalTimeDto">
+        SELECT
+            b.country_area AS country,
+            a.putTime AS putTime,
+            a.xcxssrq AS xcxssrq,
+            a.zccssrq AS zccssrq
+        FROM
+            sar_laws_attr_detailed_list a
+                LEFT JOIN sar_laws_detailed_list b ON b.id = a.detailed_list_id
+        WHERE
+            b.sort_key = 1
+          AND a.stand_id = #{standId}
+    </select>
+
 
     <insert id="insertList">
-        INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ) VALUES
+        INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ,putTime,xcxssrq,zccssrq) VALUES
         <foreach collection ="sarLawsAttrDetailedLists" item="list" separator =",">
-            (#{list.id,jdbcType=VARCHAR}, #{list.number}, #{list.detailedListId,jdbcType=VARCHAR}, #{list.standId,jdbcType=VARCHAR})
+            (#{list.id,jdbcType=VARCHAR}, #{list.number}, #{list.detailedListId,jdbcType=VARCHAR}, #{list.standId,jdbcType=VARCHAR},#{list.putTime,jdbcType=VARCHAR},#{list.xcxssrq,jdbcType=VARCHAR},#{list.zccssrq,jdbcType=VARCHAR})
         </foreach >
     </insert>
 

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

@@ -1,14 +1,28 @@
 <?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.sarStandProjectLibrary.dao.SarStandProjectLibraryDao">
+    <insert id="batchInsert">
+        insert into sar_stand_project_relation(project_id,stand_id) VALUES
+        <foreach collection="list" item="list" separator=",">
+            (#{list.projectId,jdbcType=VARCHAR},#{list.standId,jdbcType=VARCHAR})
+        </foreach>
+    </insert>
 
 
     <select id="queryProjectManagerPage" resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
-        select s.product_line,t.UNAME as uName
+        select s.product_line,t.UNAME as uName ,s.project_manager as projectManager
         from sar_stand_project_library s
         INNER JOIN ts_user t
         ON s.project_manager=t.USID
         GROUP BY s.product_line
         limit #{current},#{pageSize}
     </select>
+
+    <delete id="deleteByIds">
+        delete from sar_stand_project_relation where stand_id in (
+        <foreach collection="ids" item="list" separator=",">
+            #{list}
+        </foreach>
+        )
+    </delete>
 </mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml

@@ -2,4 +2,31 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.sarStandUnqualified.dao.SarStandUnqualifiedDao">
 
+
+    <select id="getAllDatasByPage" resultType="com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified">
+         SELECT
+            a.*,
+            b.UNAME AS qaEngineerName,
+            c.UNAME AS authEngineerName,
+            d.UNAME AS dutyEngineerName
+        FROM
+            sar_stand_unqualified a
+            LEFT JOIN ts_user b ON a.QA_ENGINEER = b.USID
+            LEFT JOIN ts_user c ON a.AUTH_ENGINEER = c.USID
+            LEFT JOIN ts_user d ON a.DUTY_ENGINEER = d.USID
+        WHERE
+            a.close_state = 1
+        <if test="sar.productName != null and sar.productName != '' ">
+            and a.product_name like concat(concat('%',#{sar.productName}),'%')
+        </if>
+        <if test="sar.standName != null and sar.standName != '' ">
+            and a.stand_name like concat(concat('%',#{sar.standName}),'%')
+        </if>
+        <if test="sar.productName != null and sar.productName != '' ">
+            and a.responsible_unit = #{responsibleUnit}
+        </if>
+        <if test="sar.standId != null and sar.standId != '' ">
+            and a.stand_id = #{standId}
+        </if>
+    </select>
 </mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarFileSplitInfoEOMapper.xml

@@ -263,6 +263,9 @@
         <if test="standId != null and standId != ''">
             and SAR_FILE_SPLIT_INFO.stand_id = #{standId}
         </if>
+        <if test="sarType != null and sarType != ''">
+            and SAR_TYPE = #{sarType}
+        </if>
         <if test="id != null and id != ''">
             and SAR_FILE_SPLIT_INFO.id = #{id}
         </if>

adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml

@@ -20,6 +20,7 @@
       <result column="standNumber" property="standNumber" />
       <result column="standName" property="standName" />
       <result column="sarType" property="sarType" />
+      <result column="attId1" property="attId1" />
   </resultMap>
 
   <!-- SAR_STAND_FILE table all fields -->
@@ -278,7 +279,7 @@
         CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number,'-',SAR_STANDARDS_INFO.stand_year)
         ) ) AS standNumber,
         SAR_STANDARDS_INFO.stand_name as standName,
-        SAR_STAND_FILE.att_id AS attId,
+        SAR_STAND_FILE.att_id AS attId1,
         SAR_STANDARDS_INFO.STAND_TYPE as sarType
         FROM
         SAR_STAND_FILE