Commit 22a72833 authored by tianyiming's avatar tianyiming

两员配备- 设备列表添加安全员筛选

parent 6a76e5d9
...@@ -37,4 +37,6 @@ public interface ITzsUserInfoService extends IService<TzsUserInfo> { ...@@ -37,4 +37,6 @@ public interface ITzsUserInfoService extends IService<TzsUserInfo> {
Page<TzsEquipListDto> getEquipList(String type,String userSeq,TzsEquipListDto dto, Page<TzsEquipListDto> page); Page<TzsEquipListDto> getEquipList(String type,String userSeq,TzsEquipListDto dto, Page<TzsEquipListDto> page);
Boolean equipBind(String type, String userSeq, String creditCode, Map<String,Object> map); Boolean equipBind(String type, String userSeq, String creditCode, Map<String,Object> map);
List<TzsUserInfo> getSafetyList(String companyCode);
} }
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
LEFT JOIN idx_biz_jg_other_info ibjoi ON ibjui."RECORD" = ibjoi."RECORD" LEFT JOIN idx_biz_jg_other_info ibjoi ON ibjui."RECORD" = ibjoi."RECORD"
LEFT JOIN idx_biz_jg_register_info ibjri ON ibjui."RECORD" = ibjri."RECORD" LEFT JOIN idx_biz_jg_register_info ibjri ON ibjui."RECORD" = ibjri."RECORD"
LEFT JOIN amos_tzs_biz.tz_equipment_category tec ON ibjri."EQU_LIST" = tec.code LEFT JOIN amos_tzs_biz.tz_equipment_category tec ON ibjri."EQU_LIST" = tec.code
LEFT JOIN tzs_user_equip tue ON ibjui."SEQUENCE_NBR" = tue.equip_id
WHERE WHERE
"USE_UNIT_CREDIT_CODE" = #{companyCode} "USE_UNIT_CREDIT_CODE" = #{companyCode}
AND "CLAIM_STATUS" = '已认领' AND "CLAIM_STATUS" = '已认领'
...@@ -129,6 +130,9 @@ ...@@ -129,6 +130,9 @@
<if test="dto.code96333 != '' and dto.code96333 != null"> <if test="dto.code96333 != '' and dto.code96333 != null">
and "CODE96333" like concat('%',#{dto.code96333},'%') and "CODE96333" like concat('%',#{dto.code96333},'%')
</if> </if>
<if test="dto.userSeq != '' and dto.userSeq != null">
AND tue.user_seq = #{userSeq}
</if>
<if test="dto.isNotBind != '' and dto.isNotBind != null and dto.isNotBind == 1"> <if test="dto.isNotBind != '' and dto.isNotBind != null and dto.isNotBind == 1">
AND ibjui."SEQUENCE_NBR" IN ( SELECT DISTINCT equip_id FROM tzs_user_equip WHERE credit_code = #{companyCode} ) AND ibjui."SEQUENCE_NBR" IN ( SELECT DISTINCT equip_id FROM tzs_user_equip WHERE credit_code = #{companyCode} )
</if> </if>
......
...@@ -223,4 +223,13 @@ public class TzsUserInfoController extends BaseController { ...@@ -223,4 +223,13 @@ public class TzsUserInfoController extends BaseController {
@RequestBody Map<String,Object> map) { @RequestBody Map<String,Object> map) {
return ResponseHelper.buildResponse(tzsUserInfoService.equipBind(type, userSeq, creditCode, map)); return ResponseHelper.buildResponse(tzsUserInfoService.equipBind(type, userSeq, creditCode, map));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getSafetyList")
@ApiOperation(httpMethod = "GET", value = "企业安全员查询", notes = "企业安全员查询")
public ResponseModel<List<TzsUserInfo>> getSafetyList(@RequestParam(value = "companyCode") String companyCode) {
return ResponseHelper.buildResponse(tzsUserInfoService.getSafetyList(companyCode));
}
} }
...@@ -400,6 +400,11 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI ...@@ -400,6 +400,11 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
} }
@Override @Override
public List<TzsUserInfo> getSafetyList(String companyCode) {
return tzsUserInfoMapper.selectList(new QueryWrapper<TzsUserInfo>().eq("unit_code",companyCode).like("post",6549));
}
@Override
public List<Map<String, Object>> getUserType(String unitType) { public List<Map<String, Object>> getUserType(String unitType) {
if (unitType.equals("pro")){ if (unitType.equals("pro")){
return tzsUserInfoMapper.getUserType("QYRYGW-SCDW"); return tzsUserInfoMapper.getUserType("QYRYGW-SCDW");
......
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