From 23bd719cebe5feeff4e48fde925b0b39755eea93 Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 15 十一月 2022 10:59:50 +0800
Subject: [PATCH] 2022.11.15

---
 src/main/resources/mapper/LawsRegulationsMapper.xml |   93 +++++++++++++++++++++++++---------------------
 1 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/src/main/resources/mapper/LawsRegulationsMapper.xml b/src/main/resources/mapper/LawsRegulationsMapper.xml
index 8a0c8cb..507dee0 100644
--- a/src/main/resources/mapper/LawsRegulationsMapper.xml
+++ b/src/main/resources/mapper/LawsRegulationsMapper.xml
@@ -1,60 +1,69 @@
-<?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="cn.flightfeather.supervision.domain.mapper.LawsRegulationsMapper" >
-  <resultMap id="BaseResultMap" type="cn.flightfeather.supervision.domain.entity.LawsRegulations" >
+<?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="cn.flightfeather.supervision.domain.mapper.LawsRegulationsMapper">
+  <resultMap id="BaseResultMap" type="cn.flightfeather.supervision.domain.entity.LawsRegulations">
     <!--
       WARNING - @mbg.generated
     -->
-    <id column="LR_GUID" property="lrGuid" jdbcType="VARCHAR" />
-    <result column="LR_ResourceTitle" property="lrResourcetitle" jdbcType="VARCHAR" />
-    <result column="LR_ResourceLevel" property="lrResourcelevel" jdbcType="INTEGER" />
-    <result column="LR_PicUrl" property="lrPicurl" jdbcType="VARCHAR" />
-    <result column="LR_BodyUrl" property="lrBodyurl" jdbcType="VARCHAR" />
-    <result column="LR_IsForeign" property="lrIsforeign" jdbcType="BIT" />
-    <result column="LR_ResourceTypeId" property="lrResourcetypeid" jdbcType="INTEGER" />
-    <result column="LR_IsOpen" property="lrIsopen" jdbcType="BIT" />
-    <result column="LR_IsUse" property="lrIsuse" jdbcType="BIT" />
-    <result column="LR_ResourceFileType" property="lrResourcefiletype" jdbcType="INTEGER" />
-    <result column="LR_IsUseOutUrls" property="lrIsuseouturls" jdbcType="BIT" />
-    <result column="LR_ResourceOutUrls" property="lrResourceouturls" jdbcType="VARCHAR" />
-    <result column="LR_ResourceUrls" property="lrResourceurls" jdbcType="VARCHAR" />
-    <result column="LR_CreatorId" property="lrCreatorid" jdbcType="VARCHAR" />
-    <result column="LR_Creator" property="lrCreator" jdbcType="VARCHAR" />
-    <result column="LR_CreateDate" property="lrCreatedate" jdbcType="TIMESTAMP" />
-    <result column="LR_ModifierId" property="lrModifierid" jdbcType="VARCHAR" />
-    <result column="LR_Modifier" property="lrModifier" jdbcType="VARCHAR" />
-    <result column="LR_UpdateDate" property="lrUpdatedate" jdbcType="TIMESTAMP" />
-    <result column="LR_PublishId" property="lrPublishid" jdbcType="VARCHAR" />
-    <result column="LR_Publish" property="lrPublish" jdbcType="VARCHAR" />
-    <result column="LR_PublishDate" property="lrPublishdate" jdbcType="TIMESTAMP" />
-    <result column="LR_Version" property="lrVersion" jdbcType="VARCHAR" />
-    <result column="LR_Extension1" property="lrExtension1" jdbcType="VARCHAR" />
-    <result column="LR_Extension2" property="lrExtension2" jdbcType="VARCHAR" />
-    <result column="LR_Extension3" property="lrExtension3" jdbcType="VARCHAR" />
-    <result column="LR_Remark" property="lrRemark" jdbcType="VARCHAR" />
+    <id column="LR_GUID" jdbcType="VARCHAR" property="lrGuid" />
+    <result column="LR_ResourceTitle" jdbcType="VARCHAR" property="lrResourcetitle" />
+    <result column="LR_ResourceLevel" jdbcType="INTEGER" property="lrResourcelevel" />
+    <result column="LR_ResourceTypeId" jdbcType="INTEGER" property="lrResourcetypeid" />
+    <result column="LR_ResourceFileType" jdbcType="INTEGER" property="lrResourcefiletype" />
+    <result column="LR_PicUrl" jdbcType="VARCHAR" property="lrPicurl" />
+    <result column="LR_BodyUrl" jdbcType="VARCHAR" property="lrBodyurl" />
+    <result column="LR_IsForeign" jdbcType="BIT" property="lrIsforeign" />
+    <result column="LR_IsOpen" jdbcType="BIT" property="lrIsopen" />
+    <result column="LR_IsUse" jdbcType="BIT" property="lrIsuse" />
+    <result column="LR_IsUseOutUrls" jdbcType="BIT" property="lrIsuseouturls" />
+    <result column="LR_ResourceOutUrls" jdbcType="VARCHAR" property="lrResourceouturls" />
+    <result column="LR_ResourceUrls" jdbcType="VARCHAR" property="lrResourceurls" />
+    <result column="LR_CreatorId" jdbcType="VARCHAR" property="lrCreatorid" />
+    <result column="LR_Creator" jdbcType="VARCHAR" property="lrCreator" />
+    <result column="LR_CreateDate" jdbcType="TIMESTAMP" property="lrCreatedate" />
+    <result column="LR_ModifierId" jdbcType="VARCHAR" property="lrModifierid" />
+    <result column="LR_Modifier" jdbcType="VARCHAR" property="lrModifier" />
+    <result column="LR_UpdateDate" jdbcType="TIMESTAMP" property="lrUpdatedate" />
+    <result column="LR_PublishId" jdbcType="VARCHAR" property="lrPublishid" />
+    <result column="LR_Publish" jdbcType="VARCHAR" property="lrPublish" />
+    <result column="LR_PublishDate" jdbcType="TIMESTAMP" property="lrPublishdate" />
+    <result column="LR_Version" jdbcType="VARCHAR" property="lrVersion" />
+    <result column="BI_Province_Code" jdbcType="VARCHAR" property="biProvinceCode" />
+    <result column="BI_Province_Name" jdbcType="VARCHAR" property="biProvinceName" />
+    <result column="BI_City_Code" jdbcType="VARCHAR" property="biCityCode" />
+    <result column="BI_City_Name" jdbcType="VARCHAR" property="biCityName" />
+    <result column="BI_District_Code" jdbcType="VARCHAR" property="biDistrictCode" />
+    <result column="BI_District_Name" jdbcType="VARCHAR" property="biDistrictName" />
+    <result column="BI_Town_Code" jdbcType="VARCHAR" property="biTownCode" />
+    <result column="BI_Town_Name" jdbcType="VARCHAR" property="biTownName" />
+    <result column="LR_Extension1" jdbcType="VARCHAR" property="lrExtension1" />
+    <result column="LR_Extension2" jdbcType="VARCHAR" property="lrExtension2" />
+    <result column="LR_Extension3" jdbcType="VARCHAR" property="lrExtension3" />
+    <result column="LR_Remark" jdbcType="VARCHAR" property="lrRemark" />
   </resultMap>
-  <resultMap id="ResultMapWithBLOBs" type="cn.flightfeather.supervision.domain.entity.LawsRegulations" extends="BaseResultMap" >
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="cn.flightfeather.supervision.domain.entity.LawsRegulations">
     <!--
       WARNING - @mbg.generated
     -->
-    <result column="LR_Keywords" property="lrKeywords" jdbcType="LONGVARCHAR" />
-    <result column="LR_ResourceDesc" property="lrResourcedesc" jdbcType="LONGVARCHAR" />
+    <result column="LR_ResourceDesc" jdbcType="LONGVARCHAR" property="lrResourcedesc" />
+    <result column="LR_Keywords" jdbcType="LONGVARCHAR" property="lrKeywords" />
   </resultMap>
-  <sql id="Base_Column_List" >
+  <sql id="Base_Column_List">
     <!--
       WARNING - @mbg.generated
     -->
-    LR_GUID, LR_ResourceTitle, LR_ResourceLevel, LR_PicUrl, LR_BodyUrl, LR_IsForeign, 
-    LR_ResourceTypeId, LR_IsOpen, LR_IsUse, LR_ResourceFileType, LR_IsUseOutUrls, LR_ResourceOutUrls, 
+    LR_GUID, LR_ResourceTitle, LR_ResourceLevel, LR_ResourceTypeId, LR_ResourceFileType, 
+    LR_PicUrl, LR_BodyUrl, LR_IsForeign, LR_IsOpen, LR_IsUse, LR_IsUseOutUrls, LR_ResourceOutUrls, 
     LR_ResourceUrls, LR_CreatorId, LR_Creator, LR_CreateDate, LR_ModifierId, LR_Modifier, 
-    LR_UpdateDate, LR_PublishId, LR_Publish, LR_PublishDate, LR_Version, LR_Extension1, 
-    LR_Extension2, LR_Extension3, LR_Remark
+    LR_UpdateDate, LR_PublishId, LR_Publish, LR_PublishDate, LR_Version, BI_Province_Code, 
+    BI_Province_Name, BI_City_Code, BI_City_Name, BI_District_Code, BI_District_Name, 
+    BI_Town_Code, BI_Town_Name, LR_Extension1, LR_Extension2, LR_Extension3, LR_Remark
   </sql>
-  <sql id="Blob_Column_List" >
+  <sql id="Blob_Column_List">
     <!--
       WARNING - @mbg.generated
     -->
-    LR_Keywords, LR_ResourceDesc
+    LR_ResourceDesc, LR_Keywords
   </sql>
 
   <select id="getLawsRegulations" resultMap="BaseResultMap">
@@ -78,7 +87,7 @@
       and (select count(*) + 1
         from ec_t_lawsregulations t2
         where 	t2.LR_ResourceTypeId = t1.LR_ResourceTypeId
-        AND t2.LR_PublishDate > t1.LR_PublishDate
+        AND t2.LR_PublishDate &gt; t1.LR_PublishDate
       <if test="param1 != null">
         and t1.LR_ResourceLevel = #{param1}
       </if>

--
Gitblit v1.9.3