From 6acee0d1d79a05f7a3a3c386e9df02e9a741f544 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期五, 21 六月 2024 17:21:16 +0800
Subject: [PATCH] 执法单节点添加，审批修改
---
project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
index da8443b..8878a5b 100644
--- a/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
+++ b/project-enforce/src/main/resources/mapper/enforce/EnforceOrderMapper.xml
@@ -3,8 +3,8 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.project.enforce.mapper.EnforceOrderMapper">
-
- <resultMap type="EnforceOrder" id="EnforceOrderResult">
+
+ <resultMap type="EnforceOrderVo" id="EnforceOrderResult">
<result property="orderId" column="order_id" />
<result property="orderNo" column="order_no" />
<result property="companyId" column="company_id" />
@@ -16,23 +16,24 @@
<result property="regionCode" column="region_code" />
<result property="regionName" column="region_name" />
<result property="enforceReason" column="enforce_reason" />
+ <result property="enforceType" column="enforce_type" />
<result property="applyId" column="apply_id" />
<result property="applyUser" column="apply_user" />
<result property="applyPhone" column="apply_phone" />
<result property="applyDeptId" column="apply_dept_id" />
<result property="applyDeptName" column="apply_dept_name" />
<result property="applyTime" column="apply_time" />
+ <result property="planTime" column="plan_time" />
+ <result property="inTime" column="in_time" />
+ <result property="userNum" column="user_num" />
<result property="warnStatus" column="warn_status" />
<result property="warnReason" column="warn_reason" />
<result property="orderStatus" column="order_status" />
- <result property="checkId" column="check_id" />
- <result property="checkUser" column="check_user" />
- <result property="checkPhone" column="check_phone" />
<result property="checkDeptId" column="check_dept_id" />
<result property="checkDeptName" column="check_dept_name" />
- <result property="checkTime" column="check_time" />
<result property="checkStatus" column="check_status" />
<result property="checkReason" column="check_reason" />
+ <result property="checkLevel" column="check_level" />
<result property="executeId" column="execute_id" />
<result property="executeUser" column="execute_user" />
<result property="executePhone" column="execute_phone" />
@@ -47,9 +48,38 @@
<result property="isShow" column="is_show" />
<result property="isEva" column="is_eva" />
<result property="totalScore" column="total_score" />
- <result property="delFlag" column="del_flag" />
</resultMap>
+ <sql id="selectEnforceOrderVo">
+ select *
+ from enforce_order
+ </sql>
+
+ <select id="selectCheckList"
+ parameterType="EnforceOrderQueryBo"
+ resultMap="EnforceOrderResult">
+ <include refid="selectEnforceOrderVo"/>
+ <where>
+ <if test="orderNo != null and orderNo != ''">
+ AND order_no like concat('%', #{orderNo}, '%')
+ </if>
+ <if test="companyName != null and companyName != ''">
+ AND company_name like concat('%', #{companyName}, '%')
+ </if>
+ <if test="orderStatus != null and orderStatus != ''">
+ AND order_status = #{orderStatus}
+ </if>
+ <if test="checkIds != null and checkIds != '' ">
+ AND check_ids like concat('%', #{checkIds}, '%')
+ </if>
+ <if test="applyDeptIds != null and applyDeptIds !='' ">
+ AND apply_dept_id in
+ <foreach collection="applyDeptIds" item="applyDeptId" open="(" separator="," close=")">
+ #{applyDeptId}
+ </foreach>
+ </if>
+ </where>
+ </select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.1