From 0d02ee0aeeaa7c4df579a57b6f75e59c69a1ed26 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期三, 16 十一月 2022 10:22:06 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server --- ycl-platform/src/main/resources/mapper/caseHandler/WritMapper.xml | 47 +++++++++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 18 deletions(-) diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/WritMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/WritMapper.xml index 05d4d7d..0def7c2 100644 --- a/ycl-platform/src/main/resources/mapper/caseHandler/WritMapper.xml +++ b/ycl-platform/src/main/resources/mapper/caseHandler/WritMapper.xml @@ -4,28 +4,39 @@ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> <resultMap id="BaseResultMap" type="com.ycl.entity.caseHandler.Writ"> - <id column="base_case_id" property="baseCaseId" /> - <result column="illegal_building_id" property="illegalBuildingId" /> - <result column="writ_type" property="writType" /> - <result column="writ_code" property="writCode" /> - <result column="illegal_type" property="illegalType" /> - <result column="send_time" property="sendTime" /> - <result column="limit_time" property="limitTime" /> - <result column="send_content" property="sendContent" /> - <result column="rectify_time" property="rectifyTime" /> - <result column="rectify_situation" property="rectifySituation" /> - <result column="remark" property="remark" /> - <result column="writ_pic" property="writPic" /> - <result column="original_pic" property="originalPic" /> - <result column="rectified_pic" property="rectifiedPic" /> - <result column="other_pic" property="otherPic" /> - <result column="create_user" property="createUser" /> - <result column="create_time" property="createTime" /> + <id column="base_case_id" property="baseCaseId"/> + <result column="illegal_building_id" property="illegalBuildingId"/> + <result column="writ_type" property="writType"/> + <result column="writ_code" property="writCode"/> + <result column="illegal_type" property="illegalType"/> + <result column="send_time" property="sendTime"/> + <result column="limit_time" property="limitTime"/> + <result column="send_content" property="sendContent"/> + <result column="rectify_time" property="rectifyTime"/> + <result column="rectify_situation" property="rectifySituation"/> + <result column="remark" property="remark"/> + <result column="writ_pic" property="writPic"/> + <result column="original_pic" property="originalPic"/> + <result column="rectified_pic" property="rectifiedPic"/> + <result column="other_pic" property="otherPic"/> + <result column="create_user" property="createUser"/> + <result column="create_time" property="createTime"/> </resultMap> <!-- 閫氱敤鏌ヨ缁撴灉鍒� --> <sql id="Base_Column_List"> - base_case_id, illegal_building_id, writ_type, writ_code, illegal_type, send_time, limit_time, send_content, rectify_time, rectify_situation, remark, writ_pic, original_pic, rectified_pic, othen_pic, create_user, create_time + base_case_id + , illegal_building_id, writ_type, writ_code, illegal_type, send_time, limit_time, send_content, rectify_time, rectify_situation, remark, writ_pic, original_pic, rectified_pic, othen_pic, create_user, create_time </sql> + <select id="selectWritPage" resultType="com.ycl.vo.writ.WritVO"> + SELECT t1.*, t2.`name` as writTemplateName + FROM ums_writ t1 + LEFT JOIN ums_writ_template t2 on t1.writ_type = t2.id + <where> + <if test="writType != null"> + t1.writ_type=#{writType} + </if> + </where> + </select> </mapper> -- Gitblit v1.8.0