From 71ae352be9c09e8d7019a0bc3a6dc5e1a1d6e350 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 22 Aug 2021 14:16:47 +0800
Subject: [PATCH] 1.ftp
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 0222fc2..fa7d224 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -24,7 +24,24 @@
<result column="departmentid" property="departmentid"/>
<result column="stats" property="stats"/>
<result column="jurisdiction" property="jurisdiction"/>
+ <result column="representativecell" property="representativecell"/>
+ <result column="contacts" property="contacts"/>
+ <result column="contactscell" property="contactscell"/>
</resultMap>
+
+
+ <insert id="insertIn" useGeneratedKeys="true" keyProperty="id">
+ insert into sys_information(creditcode, enterprisename,representative, establishtime, registeredcapital,organizationcode, registrationnumber, identificationnumber, enterprises, address,business, region, registration, industry, departmentid, stats, jurisdiction,
+ representativecell, contacts, contactscell)
+ values (#{information.creditcode}, #{information.enterprisename}, #{information.representative},
+ #{information.establishtime}, #{information.registeredcapital},
+ #{information.organizationcode}, #{information.registrationnumber},
+ #{information.identificationnumber}, #{information.enterprises}, #{information.address},
+ #{information.business},
+ #{information.region}, #{information.registration}, #{information.industry},
+ #{information.departmentid}, #{information.stats}, #{information.jurisdiction},
+ #{information.representativecell}, #{information.contacts}, #{information.contactscell})
+ </insert>
<select id="selectInformationPage" resultMap="informationResultMap">
@@ -36,13 +53,13 @@
and representative like concat(concat('%', #{information.representative}),'%')
</if>
<if test="information.stats!=null and information.stats!=''">
- and stats=#{stats}
+ and stats=#{information.stats}
</if>
- <if test="information.jurisdiction!=null and information.jurisdiction!=''">
- and jurisdiction=#{jurisdiction}
+ <if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1123598813738675201'">
+ and jurisdiction=#{information.jurisdiction}
</if>
<if test="information.departmentid!=null and information.departmentid!=''">
- and departmentid=#{departmentid}
+ and departmentid=#{information.departmentid}
</if>
</select>
@@ -121,17 +138,19 @@
) B ON A.dept_id = B.dept_id
WHERE A.dept_id = #{deptid}
</select>
+
+
<!--保安员持证和未持证数量-->
<select id="selectHold" resultType="java.util.HashMap">
SELECT IFNULL(A.thisnum, 0) AS cz,
IFNULL(B.lastnum, 0) AS wcz
FROM (SELECT COUNT(*) AS thisnum, dept_id
FROM blade_user
- WHERE role_id = '1412226235153731586' AND hold = 0
+ WHERE role_id = '1412226235153731586' AND hold = 1
GROUP BY dept_id) A
LEFT JOIN (SELECT COUNT(*) AS lastnum, dept_id
FROM blade_user
- WHERE role_id = '1412226235153731586' AND hold = 1
+ WHERE role_id = '1412226235153731586' AND hold = 2
GROUP BY dept_id) B ON A.dept_id = B.dept_id
WHERE A.dept_id =#{deptid}
</select>
@@ -172,20 +191,13 @@
blade_dept bd
on
si.departmentid = bd.id
- left join
- sys_train_exam ste
- on
- ste.dept_id = bd.id
where 1=1
- and ste.audit_status = 1
+ and bd.dept_category = 3
<if test="information.deptName!=null and information.deptName!=''">
and bd.dept_name like concat(concat('%', #{information.deptName}),'%')
</if>
<if test="information.representative!=null and information.representative!=''">
and representative like concat(concat('%', #{information.representative}),'%')
- </if>
- <if test="information.stats!=null and information.stats!=''">
- and stats=#{stats}
</if>
<if test="information.jurisdiction!=null and information.jurisdiction!=''">
and si.jurisdiction=#{jurisdiction}
--
Gitblit v1.9.3