五色预警相关提交

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/WarningEntity/SysDictitemContrast.java

+package com.founder.commonutils.model.newPublicEntity.WarningEntity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * <p>
+ * SysDictitemContrast对象
+ * </p>
+ *
+ * @author yangyang
+ * @since 2023-11-30
+ */
+@Data
+@ApiModel(value="SysDictitemContrast对象", description="SysDictitemContrast")
+public class SysDictitemContrast implements Serializable {
+
+    @ApiModelProperty(value = "行政区划代码")
+    private String name;
+
+    @ApiModelProperty(value = "旧代码")
+    private String code;
+
+    @ApiModelProperty(value = "新代码")
+    private String newcode;
+
+    @ApiModelProperty(value = "父节点code代码")
+    private String pid;
+
+    @ApiModelProperty(value = "类型")
+    private String groupid;
+}

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/DataStatisticsMapperCqxz.java

@@ -3,6 +3,7 @@ package com.founder.publicapi.mapper.mysqlMapper;
 import com.founder.commonutils.model.newPublicEntity.SysDictitem;
 import com.founder.commonutils.model.newPublicEntity.WarningEntity.CQTbStAsj;
 import com.founder.commonutils.model.newPublicEntity.WarningEntity.DataStatisticsParams;
+import com.founder.commonutils.model.newPublicEntity.WarningEntity.SysDictitemContrast;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -34,4 +35,7 @@ public interface DataStatisticsMapperCqxz {
 
     //热力图
     List<CQTbStAsj> getXzqhLaCountDetail(DataStatisticsParams params);
+
+    //新旧字典
+    List<SysDictitemContrast> getSysDictitemContrastList(SysDictitemContrast sysDictitemContrast);
 }

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/DataStatisticsMapperCqxz.xml

@@ -198,6 +198,30 @@
         <if test="ajlbdm!=null and ajlbdm!=''">
             and AJLBDM in (${ajlbdm})
         </if>
+        <if test="ajlbdmList != null and ajlbdmList.size() > 0">
+            and
+            <foreach collection="ajlbdmList" index="index" item="ajlbdms" open="(" separator="or" close=")">
+                a.AJLB like concat( #{ajlbdms} , '%')
+            </foreach>
+        </if>
+        <if test="ajztdmList != null and ajztdmList.size() > 0">
+            and
+            <foreach collection="ajztdmList" index="index" item="ajztdms" open="(" separator="or" close=")">
+                a.AJZT like concat(#{ajztdms} ,'%')
+            </foreach>
+        </if>
+        <if test="ladwList != null and ladwList.size() > 0">
+            and
+            <foreach collection="ladwList" index="index" item="ladwdms" open="(" separator="or" close=")">
+                a.LADW_GAJGJGDM like concat(#{ladwdms} , '%')
+            </foreach>
+        </if>
+        <if test="xzqhdmList != null and xzqhdmList.size() > 0">
+            and
+            <foreach collection="xzqhdmList" index="index" item="xzqhdms" open="(" separator="or" close=")">
+                a.LADW_GAJGJGDM like concat(#{xzqhdms} , '%')
+            </foreach>
+        </if>
         <if test="zatzJyqkList != null and zatzJyqkList.size() > 0">
         and a.ZATZ_JYQK in
             <foreach collection="zatzJyqkList" index="index" item="zatzJyqk" open="(" separator="," close=")">
@@ -212,4 +236,24 @@
         </if>
         limit 10000
     </select>
+    <select id="getSysDictitemContrastList" parameterType="com.founder.commonutils.model.newPublicEntity.WarningEntity.SysDictitemContrast" resultType="com.founder.commonutils.model.newPublicEntity.WarningEntity.SysDictitemContrast">
+        select
+        code as code,
+        newcode as newcode,
+        name as name,
+        pid as pid,
+        groupid as groupid
+        from SYS_DICTITEM_CONTRAST
+        where 1=1
+        and groupid = #{groupid, jdbcType=VARCHAR}
+        <if test="code != null and code != ''">
+            and code = #{code, jdbcType=VARCHAR}
+        </if>
+        <if test="newcode != null and newcode != ''">
+            and newcode = #{newcode, jdbcType=VARCHAR}
+        </if>
+        <if test="pid != null and pid != ''">
+            and pid = #{pid, jdbcType=VARCHAR}
+        </if>
+    </select>
 </mapper>
\ No newline at end of file