Skip to content

A
amos-boot-biz
Commit 3dff6727 authored by chenzhao's avatar chenzhao
Browse files
Options

修改bug

parent cfed33b1
Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 104 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FirefightersMapper.java
View file @ 3dff6727
...@@ -32,7 +32,7 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> { ...@@ -32,7 +32,7 @@ public interface FirefightersMapper extends BaseMapper<Firefighters> {
List<FirefightersTreeDto> getFirefightersJobTitleCount(); List<FirefightersTreeDto> getFirefightersJobTitleCount();
List<String> getFirefightersName( ); List<Map<String,String>> getFirefightersName( );
List<FirefightersExcelDto> exportToExcel(Boolean isDelete, String name, String postQualification, String fireTeamId, List<FirefightersExcelDto> exportToExcel(Boolean isDelete, String name, String postQualification, String fireTeamId,
String state, String areasExpertise, String jobTitle); String state, String areasExpertise, String jobTitle);
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml
View file @ 3dff6727
...@@ -159,9 +159,10 @@ WHERE ...@@ -159,9 +159,10 @@ WHERE
<if test='jobTitle!=null'>and f.job_title_code = #{jobTitle}</if> <if test='jobTitle!=null'>and f.job_title_code = #{jobTitle}</if>
</select> </select>
<select id="getFirefightersName" resultType="string"> <select id="getFirefightersName" resultType="Map">
SELECT SELECT
cb_firefighters.name cb_firefighters.name AS name,
cb_firefighters.mobile_phone AS phone
FROM FROM
cb_firefighters cb_firefighters
WHERE WHERE
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml
View file @ 3dff6727
...@@ -18,104 +18,122 @@ ...@@ -18,104 +18,122 @@
<select id="selectPersonListCount" resultType="Integer"> <select id="selectPersonListCount" resultType="Integer">
select count(1) from ( select count(1) from (
SELECT SELECT
DISTINCT DISTINCT
u.sequence_nbr sequenceNbr, u.sequence_nbr sequenceNbr,
u.biz_org_name bizOrgName, u.biz_org_name bizOrgName,
u.biz_org_code bizOrgCode, u.biz_org_code bizOrgCode,
<if test="fields != null"> g.*
<foreach collection="fields" item="item" separator=",">MAX(case f.field_code when #{item} then v.field_value FROM
end) ${item} cb_org_usr u
</foreach>
</if> LEFT JOIN
FROM ( SELECT
cb_org_usr u LEFT JOIN v.`instance_id`,
cb_dynamic_form_instance v on u.sequence_nbr = v.instance_id max(case v.field_code when 'personNumber' then IFNULL(v.field_value_label,v.field_value) end) personNumber,
LEFT JOIN cb_dynamic_form_column f ON f.sequence_nbr = v.form_column_id max(case v.field_code when 'certificatesTypeCode' then IFNULL(v.field_value_label,v.field_value) end) certificatesTypeCode,
where max(case v.field_code when 'gender' then IFNULL(v.field_value_label,v.field_value) end) gender,
u.biz_org_type = #{bizOrgType} max(case v.field_code when 'certificatesNumber' then IFNULL(v.field_value_label,v.field_value) end) certificatesNumber,
AND u.is_delete = 0 max(case v.field_code when 'telephone' then IFNULL(v.field_value_label,v.field_value) end) telephone,
<if test="bizOrgName != null"> max(case v.field_code when 'state' then IFNULL(v.field_value_label,v.field_value) end) state,
AND u.biz_org_name = #{bizOrgName} max(case v.field_code when 'safetyTraining' then IFNULL(v.field_value_label,v.field_value) end) safetyTraining,
</if> max(case v.field_code when 'administrativePositionCode' then IFNULL(v.field_value_label,v.field_value) end) administrativePositionCode,
<if test="bizOrgCode != null and bizOrgCode != '-1'"> max(case v.field_code when 'internalPositionCode' then IFNULL(v.field_value_label,v.field_value) end) internalPositionCode,
AND u.biz_org_code like concat(#{bizOrgCode}, '%') max(case v.field_code when 'fireManagementPostCode' then IFNULL(v.field_value_label,v.field_value) end) fireManagementPostCode,
</if> max(case v.field_code when 'positionType' then IFNULL(v.field_value_label,v.field_value) end) positionType,
GROUP BY max(case v.field_code when 'certificateType' then IFNULL(v.field_value_label,v.field_value) end) certificateType,
u.sequence_nbr , max(case v.field_code when 'holdingTime' then IFNULL(v.field_value_label,v.field_value) end) holdingTime,
u.biz_org_name , max(case v.field_code when 'auditCycle' then IFNULL(v.field_value_label,v.field_value) end) auditCycle,
u.biz_org_code max(case v.field_code when 'personImg' then IFNULL(v.field_value_label,v.field_value) end) personImg,
)a where a.sequenceNbr is not null max(case v.field_code when 'certificateImg' then IFNULL(v.field_value_label,v.field_value) end) certificateImg
FROM
`cb_dynamic_form_instance` v
WHERE
v.group_code = 246
GROUP BY
v.`instance_id`
) g
on u.sequence_nbr = g.instance_id
where
u.biz_org_type = 'person'
AND
u.is_delete = 0
GROUP BY
u.sequence_nbr ,
u.biz_org_name ,
u.biz_org_code
order by u.rec_date desc
)a where a.sequenceNbr is not null
<if test="fieldsValue != null">
<foreach collection="fieldsValue.keys" item="item">AND a.${item} = #{fieldsValue[${item}]}</foreach>
</if>
</select> </select>
<!--机场单位人员按时间倒叙排列add order by u.rec_date desc 2021-09-08 by kongfm --> <!--机场单位人员按时间倒叙排列add order by u.rec_date desc 2021-09-08 by kongfm -->
<select id="selectPersonList" resultType="Map"> <select id="selectPersonList" resultType="Map">
select * from ( select * from (
SELECT SELECT
DISTINCT DISTINCT
u.sequence_nbr sequenceNbr, u.sequence_nbr sequenceNbr,
u.biz_org_name bizOrgName, u.biz_org_name bizOrgName,
u.biz_org_code bizOrgCode, u.biz_org_code bizOrgCode,
g.* g.*
FROM FROM
cb_org_usr u cb_org_usr u
LEFT JOIN LEFT JOIN
( SELECT ( SELECT
v.`instance_id`, v.`instance_id`,
max(case v.field_code when 'personNumber' then IFNULL(v.field_value_label,v.field_value) end) personNumber, max(case v.field_code when 'personNumber' then IFNULL(v.field_value_label,v.field_value) end) personNumber,
max(case v.field_code when 'certificatesTypeCode' then IFNULL(v.field_value_label,v.field_value) end) certificatesTypeCode, max(case v.field_code when 'certificatesTypeCode' then IFNULL(v.field_value_label,v.field_value) end) certificatesTypeCode,
max(case v.field_code when 'gender' then IFNULL(v.field_value_label,v.field_value) end) gender, max(case v.field_code when 'gender' then IFNULL(v.field_value_label,v.field_value) end) gender,
max(case v.field_code when 'certificatesNumber' then IFNULL(v.field_value_label,v.field_value) end) certificatesNumber, max(case v.field_code when 'certificatesNumber' then IFNULL(v.field_value_label,v.field_value) end) certificatesNumber,
max(case v.field_code when 'telephone' then IFNULL(v.field_value_label,v.field_value) end) telephone, max(case v.field_code when 'telephone' then IFNULL(v.field_value_label,v.field_value) end) telephone,
max(case v.field_code when 'state' then IFNULL(v.field_value_label,v.field_value) end) state, max(case v.field_code when 'stateCode' then IFNULL(v.field_value_label,v.field_value) end) state,
max(case v.field_code when 'safetyTraining' then IFNULL(v.field_value_label,v.field_value) end) safetyTraining, max(case v.field_code when 'safetyTraining' then IFNULL(v.field_value_label,v.field_value) end) safetyTraining,
max(case v.field_code when 'administrativePositionCode' then IFNULL(v.field_value_label,v.field_value) end) administrativePositionCode, max(case v.field_code when 'administrativePositionCode' then IFNULL(v.field_value_label,v.field_value) end) administrativePositionCode,
max(case v.field_code when 'internalPositionCode' then IFNULL(v.field_value_label,v.field_value) end) internalPositionCode, max(case v.field_code when 'internalPositionCode' then IFNULL(v.field_value_label,v.field_value) end) internalPositionCode,
max(case v.field_code when 'fireManagementPostCode' then IFNULL(v.field_value_label,v.field_value) end) fireManagementPostCode, max(case v.field_code when 'fireManagementPostCode' then IFNULL(v.field_value_label,v.field_value) end) fireManagementPostCode,
max(case v.field_code when 'positionType' then IFNULL(v.field_value_label,v.field_value) end) positionType, max(case v.field_code when 'positionType' then IFNULL(v.field_value_label,v.field_value) end) positionType,
max(case v.field_code when 'certificateType' then IFNULL(v.field_value_label,v.field_value) end) certificateType, max(case v.field_code when 'certificateType' then IFNULL(v.field_value_label,v.field_value) end) certificateType,
max(case v.field_code when 'holdingTime' then IFNULL(v.field_value_label,v.field_value) end) holdingTime, max(case v.field_code when 'holdingTime' then IFNULL(v.field_value_label,v.field_value) end) holdingTime,
max(case v.field_code when 'auditCycle' then IFNULL(v.field_value_label,v.field_value) end) auditCycle, max(case v.field_code when 'auditCycle' then IFNULL(v.field_value_label,v.field_value) end) auditCycle,
max(case v.field_code when 'personImg' then IFNULL(v.field_value_label,v.field_value) end) personImg, max(case v.field_code when 'personImg' then IFNULL(v.field_value_label,v.field_value) end) personImg,
max(case v.field_code when 'certificateImg' then IFNULL(v.field_value_label,v.field_value) end) certificateImg max(case v.field_code when 'certificateImg' then IFNULL(v.field_value_label,v.field_value) end) certificateImg
FROM FROM
`cb_dynamic_form_instance` v `cb_dynamic_form_instance` v
WHERE WHERE
v.group_code = 246 v.group_code = 246
GROUP BY GROUP BY
v.`instance_id` v.`instance_id`
) g ) g
on u.sequence_nbr = g.instance_id on u.sequence_nbr = g.instance_id
where where
u.biz_org_type = 'person' u.biz_org_type = 'person'
AND AND
u.is_delete = 0 u.is_delete = 0
<if test="map.bizOrgName != null"> <if test="map.bizOrgName != null">
AND u.biz_org_name like concat('%',#{map.bizOrgName},'%') AND u.biz_org_name like concat('%',#{map.bizOrgName},'%')
</if> </if>
<if test="map.personNumber!= null"> <if test="map.personNumber!= null">
AND v.field_value like concat('%',#{map.personNumber},'%') AND v.field_value like concat('%',#{map.personNumber},'%')
</if> </if>
<if test="map.bizOrgCode != null and map.bizOrgCode != '-1'"> <if test="map.bizOrgCode != null and map.bizOrgCode != '-1'">
AND u.biz_org_code like concat(#{map.bizOrgCode}, '%') AND u.biz_org_code like concat(#{map.bizOrgCode}, '%')
</if> </if>
GROUP BY GROUP BY
u.sequence_nbr , u.sequence_nbr ,
u.biz_org_name , u.biz_org_name ,
u.biz_org_code u.biz_org_code
order by u.rec_date desc order by u.rec_date desc
)a where a.sequenceNbr is not null )a where a.sequenceNbr is not null
<if test="map.fieldsValue != null"> <if test="map.fieldsValue != null">
<foreach collection="map.fieldsValue.keys" item="item">AND a.${item} = #{map.fieldsValue[${item}]}</foreach> <foreach collection="map.fieldsValue.keys" item="item">AND a.${item} = #{map.fieldsValue[${item}]}</foreach>
</if> </if>
LIMIT #{map.pageNum}, #{map.pageSize} LIMIT #{map.pageNum}, #{map.pageSize}
</select> </select>
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertCalledMapper.java
View file @ 3dff6727
...@@ -36,7 +36,7 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> { ...@@ -36,7 +36,7 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
List<AlertCalledTodyDto> getTodayAlertCalled(); List<AlertCalledTodyDto> getTodayAlertCalled();
List<String> getContactName( ); List<Map<String,String>> getContactName( );
List<String> getAddress(); List<String> getAddress();
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml
View file @ 3dff6727
...@@ -232,9 +232,10 @@ ...@@ -232,9 +232,10 @@
</select> </select>
<select id="getContactName" resultType="string"> <select id="getContactName" resultType="Map">
SELECT SELECT
jc_alert_called.contact_user jc_alert_called.contact_user AS name,
jc_alert_called.contact_phone AS phone
FROM FROM
jc_alert_called jc_alert_called
WHERE WHERE
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersServiceImpl.java
View file @ 3dff6727
...@@ -124,7 +124,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi ...@@ -124,7 +124,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
return menus; return menus;
} }
public List<String> getFirefightersName() { public List<Map<String,String>> getFirefightersName() {
return firefightersMapper.getFirefightersName(); return firefightersMapper.getFirefightersName();
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertCalledController.java
View file @ 3dff6727
...@@ -362,7 +362,7 @@ public class AlertCalledController extends BaseController { ...@@ -362,7 +362,7 @@ public class AlertCalledController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/getAmosId", method = RequestMethod.GET) @RequestMapping(value = "/getAmosId", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "警情填报联系人模糊查询", notes = "警情填报联系人模糊查询") @ApiOperation(httpMethod = "GET", value = "警情填报联系人模糊查询", notes = "警情填报联系人模糊查询")
public ResponseModel< List<String>> getContact ( ) { public ResponseModel< List<Map<String,String>>> getContact ( ) {
return ResponseHelper.buildResponse(iAlertCalledService.getContactName()); return ResponseHelper.buildResponse(iAlertCalledService.getContactName());
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java
View file @ 3dff6727
...@@ -797,9 +797,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal ...@@ -797,9 +797,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
} }
/*2304 地址 联系人模糊查询缺失 陈召 2021-09-23 开始*/ /*2304 地址 联系人模糊查询缺失 陈召 2021-09-23 开始*/
public List<String> getContactName() { public List<Map<String,String>> getContactName() {
List<String> firefightersName = firefightersService.getFirefightersName(); List<Map<String,String>> firefightersName = firefightersService.getFirefightersName();
List<String> contactNames = alertCalledMapper.getContactName(); List<Map<String,String>> contactNames = alertCalledMapper.getContactName();
firefightersName.addAll(contactNames); firefightersName.addAll(contactNames);
return firefightersName; return firefightersName;
......
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