人员资质超期问题页面调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/SafetyProblemTracingMapper.java

@@ -34,4 +34,6 @@ public interface SafetyProblemTracingMapper extends BaseMapper<SafetyProblemTrac
     List<Map<String, Object>> countEquOverdue(@Param("typeList") List<String> typeList,@Param("orgCode") String orgCode);
 
     List<String> getSourceId(@Param("orgCode") String orgCode, @Param("typeList") List<String> typeList);
+
+    Page<Map<String, Object>> queryUserListProblemById(Page<Map<String, Object>> page, String problemId);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/SafetyProblemTracingMapper.xml

@@ -102,6 +102,27 @@
     <select id="queryPrincipalUnitByProblemId" resultType="java.util.Map">
         SELECT * FROM (
         SELECT
+        '1' sourceTypeCode,
+        spt.sequence_nbr problemSeq,
+        ei.sequence_nbr sequenceNbr,
+        ei.use_unit unitName,
+        ei.use_unit_code useUnitCode,
+        ei.unit_type unitType,
+        ei.governing_body governingBody,
+        ei.use_contact useContact,
+        ei.contact_phone contactPhone,
+        ei.status,
+        case when ei.status = '0' then '异常'
+        else '正常' end problemStatusName,
+        case when ei.status = '0' then 'red'
+        else 'green' end problemStatusColor
+        FROM
+        tzs_safety_problem_tracing spt
+        LEFT JOIN tz_base_enterprise_info ei on ei.use_unit_code = spt.principal_unit_code
+        WHERE
+        spt.sequence_nbr = #{problemId}
+        UNION
+        SELECT
         '2' sourceTypeCode,
         spt.sequence_nbr problemSeq,
         ei.sequence_nbr sequenceNbr,
@@ -240,4 +261,23 @@
         and source_type_code = '3'
 
     </select>
+
+    <select id="queryUserListProblemById" resultType="java.util.Map">
+        SELECT
+        tui.sequence_nbr sequenceNbr,
+        tui.name,
+        tui.certificate_num certificateNum,
+        tui.phone,
+        tui.post_name postName,
+        case when tui.qr_code_state = '0' then '异常'
+        else '正常' end problemStatusName,
+        case when tui.qr_code_state = '0' then 'red'
+        else 'green' end problemStatusColor
+        FROM
+        tzs_user_info tui
+        LEFT JOIN tzs_user_permission tup on tup.user_seq = tui.sequence_nbr
+        LEFT JOIN tzs_safety_problem_tracing tspt on tspt.source_id = tup.sequence_nbr
+        WHERE
+        tspt.is_delete = '0' and tspt.sequence_nbr = #{problemId}
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/SafetyProblemTracingController.java

@@ -181,6 +181,22 @@ public class SafetyProblemTracingController extends BaseController {
 	}
 
 	/**
+	 * 根据问题ID及问题类型查询关联设备列表
+	 *
+	 * @param problemId 问题Id
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "根据问题ID及问题类型查询关联人员列表",   notes = "根据问题ID及问题类型查询关联人员列表")
+	@GetMapping(value = "/user/list")
+	public ResponseModel<Page<Map<String, Object>>> queryUserListProblemById(@RequestParam(value = "current") int current,@RequestParam
+			(value = "size") int size, @RequestParam(value = "sequenceNbr") String problemId) {
+		Page<Map<String, Object>> page = new Page<>();
+		page.setCurrent(current);
+		page.setSize(size);
+		return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.queryUserListProblemById(page, problemId));
+	}
+	/**
 	 * 根据问题ID及问题类型查询关联企业
 	 *
 	 * @param problemId 问题Id

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/SafetyProblemTracingServiceImpl.java

@@ -210,4 +210,8 @@ public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTr
 
         return true;
     }
+
+    public Page<Map<String, Object>> queryUserListProblemById(Page<Map<String, Object>> page, String problemId) {
+        return this.baseMapper.queryUserListProblemById(page, problemId);
+    }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzsUserInfoDto.java

@@ -117,4 +117,8 @@ public class TzsUserInfoDto extends BaseDto {
 
     @ApiModelProperty(value = "菜单类型下的所有人员类型")
     private List<String> menuTypeUnderPost;
+
+    @ApiModelProperty("二维码状态0异常1正常")
+    private String qrCodeState;
+
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java

@@ -944,6 +944,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         }
         // 更新资质
         tzsUserPermissionServiceImpl.updatePermissionData(tzsUserInfoDto);
+        tzsUserInfoDto.setQrCodeState("1");
         this.updateWithModel(tzsUserInfoDto);
         return tzsUserInfoDto;
     }