Skip to content

A
amos-boot-biz
Commit 31967a74 authored by 李秀明's avatar 李秀明
Browse files
Options

fix(jcs): 驻站消防员接口bizOrgCode取值错误

parent d03c7438
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 51 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/SignMapper.xml
View file @ 31967a74
...@@ -77,56 +77,56 @@ ...@@ -77,56 +77,56 @@
</select> </select>
<select id="queryPeopleInfo" resultType="Map"> <select id="queryPeopleInfo" resultType="Map">
SELECT SELECT
s1.date, s1.date,
IFNULL( s2.signNum, 0 ) AS signNum IFNULL( s2.signNum, 0 ) AS signNum
FROM FROM
( (
SELECT SELECT
@s := @s + 1 AS `index`, @s := @s + 1 AS `index`,
DATE_FORMAT( DATE_ADD(( DATE( DATE_ADD( now(), INTERVAL - 5 DAY ))), INTERVAL @s DAY ), '%Y-%m-%d' ) AS date DATE_FORMAT( DATE_ADD(( DATE( DATE_ADD( now(), INTERVAL - 5 DAY ))), INTERVAL @s DAY ), '%Y-%m-%d' ) AS date
FROM FROM
mysql.help_topic, mysql.help_topic,
( SELECT @s := - 2 ) temp ( SELECT @s := - 2 ) temp
WHERE WHERE
@s &lt; 5 @s &lt; 5
) s1 ) s1
LEFT JOIN ( LEFT JOIN (
SELECT SELECT
count(s0.userId) AS signNum, count(s0.userId) AS signNum,
s0.* s0.*
FROM FROM
( (
SELECT SELECT
s.* s.*
FROM FROM
( (
SELECT DISTINCT SELECT DISTINCT
sign.user_id userId, sign.user_id userId,
date, date,
biz_org_Name bizOrgName, biz_org_Name bizOrgName,
biz_org_code bizOrgCode, biz_org_code bizOrgCode,
person_of_day personOfDay person_of_day personOfDay
FROM FROM
cb_sign sign cb_sign sign
<where> <where>
<if test="dto.dateLESS!=null and dto.dateLESS!=''"> <if test="dto.dateLESS!=null and dto.dateLESS!=''">
and #{dto.dateLESS} >= sign.sign_time and #{dto.dateLESS} >= sign.sign_time
</if> </if>
<if test="dto.bizOrgCode!=null and dto.bizOrgCode!=''"> <if test="dto.bizOrgCode!=null and dto.bizOrgCode!=''">
and sign.biz_org_code like CONCAT(#{dto.bizOrgCode},'%') and sign.biz_org_code like CONCAT(#{dto.bizOrgCode},'%')
</if> </if>
</where> </where>
ORDER BY ORDER BY
sign.sign_time DESC sign.sign_time DESC
) s ) s
) s0 ) s0
GROUP BY s0.date GROUP BY s0.date
) s2 ON s2.date = s1.date ) s2 ON s2.date = s1.date
GROUP BY GROUP BY
s1.date s1.date
ORDER BY ORDER BY
s1.date s1.date
</select> </select>
<select id="queryPersonNum" resultType="java.lang.Integer"> <select id="queryPersonNum" resultType="java.lang.Integer">
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/SignController.java
View file @ 31967a74
...@@ -196,7 +196,7 @@ public class SignController extends BaseController { ...@@ -196,7 +196,7 @@ public class SignController extends BaseController {
ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class); ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
String bizOrgCode = null; String bizOrgCode = null;
if(null != reginParam) { if(null != reginParam) {
bizOrgCode = reginParam.getPersonIdentity().getBizOrgCode(); bizOrgCode = reginParam.getPersonIdentity().getCompanyBizOrgCode();
} }
dto.setBizOrgCode(bizOrgCode); dto.setBizOrgCode(bizOrgCode);
List<Map<String, Object>> res = signServiceImpl.queryPeopleInfo(dto); List<Map<String, Object>> res = signServiceImpl.queryPeopleInfo(dto);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment