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

2021-08-20 15:20:54 +08:00
parent dcfedac4bf 1363a5b5af
commit e4c66d74a2
41 changed files with 1660 additions and 278 deletions
@@ -185,9 +185,9 @@
        <if test="standId != null" >
            and stand_id = #{standId}
        </if>
-        <if test="idlist != null">
+        <if test="idList != null">
            and id not in
-            <foreach collection="idlist" index="index" item="item" open="(" separator="," close=")">
+            <foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
@@ -20,6 +20,7 @@
        <result column="stand_nature" property="standNature" />
        <result column="stand_sort" property="standSort" />
        <result column="stand_year" property="standYear" />
+        <result column="text_status_buss" property="textStatusBuss" />
    </resultMap>

    <resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand" >
@@ -35,12 +36,13 @@
        <result column="standNatrueShow" property="standNatrueShow" />
        <result column="standSortShow" property="standSortShow" />
        <result column="stand_year" property="standYear" />
+        <result column="text_status_buss" property="textStatusBuss" />
    </resultMap>

    <!-- SAR_BUSSIONESS_STAND table all fields -->
    <sql id="Base_Column_List" >
     modify_time, creation_time, valid_flag, stand_status, replaced_stand_num,replace_stand_num,
-     put_time, issue_time,stand_en_name,stand_name, stand_code, id,apply_country, stand_nature, stand_sort
+     put_time, issue_time,stand_en_name,stand_name, stand_code, id,apply_country, stand_nature, stand_sort,text_status_buss
  </sql>
    <sql id="Base_Column_List_show" >
     stand_year,dicapplyCountry.DIC_TYPE_NAME as applyCountryShow,dicstandSort.DIC_TYPE_NAME as standSortShow,
@@ -48,7 +50,7 @@
     SAR_BUSSIONESS_STAND.creation_time, SAR_BUSSIONESS_STAND.valid_flag,
     SAR_BUSSIONESS_STAND.apply_country, SAR_BUSSIONESS_STAND.stand_nature,SAR_BUSSIONESS_STAND.stand_sort,
     stand_status, replaced_stand_num,replace_stand_num,put_time,issue_time,stand_en_name,
-     stand_name, stand_code,SAR_BUSSIONESS_STAND.id,dicstandStatus.DIC_TYPE_NAME as standStatusShow
+     stand_name, stand_code,SAR_BUSSIONESS_STAND.id,dicstandStatus.DIC_TYPE_NAME as standStatusShow,SAR_BUSSIONESS_STAND.text_status_buss
  </sql>

    <sql id="Group_Column_List_show" >
@@ -352,7 +354,7 @@

    <!-- 分页查询条件 -->
    <sql id="SarBussionInfo_Where_Clause">
-        left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0)
+        left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0)
        left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0)
        left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0)
        left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0)
@@ -0,0 +1,38 @@
+<?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.scheduled.dao.SarStandardInfoDao">
+
+    <!-- Result Map-->
+    <resultMap id="resultMap" type="com.adc.da.scheduled.entity.WarningEO" >
+        <id column="ID" property="id" />
+        <result column="STAND_NUMBER" property="standCode" />
+        <result column="STAND_NAME" property="standName" />
+        <result column="XCXSSRQ" property="XCXSSRQ"/>
+        <result column="ZCCSSRQ" property="ZCCSSRQ"/>
+        <result column="CLLX" property="applyType" />
+        <result column="STAND_TYPE" property="standType" />
+        <result column="ZRGCS" property="dutyEngineer" />
+    </resultMap>
+
+    <!-- 查询条件 -->
+    <select id="select" resultMap="resultMap" parameterType="com.adc.da.scheduled.entity.DataDTO">
+        SELECT
+        info.ID,
+        info.STAND_NUMBER,
+        info.STAND_NAME,
+        info.STAND_TYPE,
+        attrInfo.CLLX,
+        attrInfo.ZRGCS,
+        attrInfo.${str}
+        FROM
+        sar_standards_info AS info
+        JOIN sar_stand_attr_info AS attrInfo ON info.id = attrinfo.stand_id
+        WHERE
+              attrInfo.${str} BETWEEN #{date.startDate} and  #{date.endDate}
+
+    </select>
+
+
+
+
+</mapper>
@@ -0,0 +1,35 @@
+<?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.scheduled.dao.SarStandardItemDao">
+
+    <!-- Result Map-->
+    <resultMap id="resultMap" type="com.adc.da.scheduled.entity.WarningEO">
+        <id column="ID" property="id"/>
+        <result column="STAND_NUMBER" property="standCode"/>
+        <result column="STAND_NAME" property="standName"/>
+        <result column="XCXSSRQ" property="XCXSSRQ"/>
+        <result column="ZCCSSRQ" property="ZCCSSRQ"/>
+        <result column="CLLX" property="applyType"/>
+        <result column="STAND_TYPE" property="standType"/>
+        <result column="ZRGCS" property="dutyEngineer"/>
+    </resultMap>
+    <!-- 查询条件 -->
+    <select id="select" resultMap="resultMap" parameterType="com.adc.da.scheduled.entity.DataDTO">
+        SELECT
+            STAND_ID,
+            ITEMS_NUM,
+            TERMS_CONDITIONS,
+            DUTY_ENGINEER,
+            APPLY_ARCTIC,
+            info.STAND_TYPE,
+
+            ${str}
+        FROM
+	        sar_stand_items AS items
+        JOIN sar_standards_info AS info ON items.STAND_ID=info.ID
+
+            WHERE
+              ${str} BETWEEN #{date.startDate} and  #{date.endDate}
+    </select>
+
+</mapper>
@@ -0,0 +1,31 @@
+<?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.scheduled.dao.SarStandardWarningDao">
+
+    <insert id="ignoreInsert" parameterType="java.util.LinkedList">
+
+        INSERT IGNORE INTO sar_stand_warning (ID, STAND_TYPE, STAND_CODE,STAND_NAME,PUT_TIME,APPLY_TYPE,DUTY_ENGINEER,ITEMS_ID,ITEMS_NAME,POLICY_ID,POLICY_NAME,MARK,POWER)
+        VALUES
+        <if test="warningEOS !=null and warningEOS.size()!=0">
+            <foreach collection="warningEOS" item="item" index="index"  separator=",">
+               (
+                #{item.id}
+                ,#{item.standType}
+                ,#{item.standCode}
+                ,#{item.standName}
+                ,#{item.putTime}
+                ,#{item.applyType}
+                ,#{item.dutyEngineer}
+                ,#{item.itemsId}
+                ,#{item.itemsName}
+                ,#{item.policyId}
+                ,#{item.policyName}
+                ,#{item.mark}
+                ,#{item.power}
+                )
+            </foreach>
+        </if>
+    </insert>
+
+
+</mapper>