| | |
| | | //获取上报数据对象
|
| | | PreventCJReportRiskAnaUnit CJReportRiskAnaUnit = new PreventCJReportRiskAnaUnit();
|
| | |
|
| | | //此类方法已经修改,实际使用username
|
| | | User createUser = trUserService.getUserByLoginName(infoByRiskId.getCreateBy());
|
| | | User updateUser = trUserService.getUserByLoginName(infoByRiskId.getUpdateBy());
|
| | | User userById = trUserService.getUserById(infoByRiskId.getUserId());
|
| | |
| | | //获取上报数据对象
|
| | | PreventCJReportRiskControlMeasure CJReportMeasure = new PreventCJReportRiskControlMeasure();
|
| | | //转换数据
|
| | | // todo 逻辑改变
|
| | | PreventRiskControlTemplate controlTemplateById = preventRiskControlTemplateService.getControlTemplateById(measure.getClassify2());
|
| | | String classify2 = measure.getClassify1() + "-" + controlTemplateById.getOrderIndex();
|
| | |
|
| | |
| | | //是隐患设置核查人ID、核查人名称 |
| | | if ((!StringUtils.isEmpty(hdcp.getWhetherDanger())) && |
| | | (TrHiddenDangerCheckConstants.WHETHER_DANGER_YES.equals(hdcp.getWhetherDanger()))) { |
| | | hdcp.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状态(待核查) |
| | | hdcp.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状8态(待核查) |
| | | hdcp.setExamineUserId(hiddenDangerCheck.getExamineUserId());//核查人ID |
| | | hdcp.setExamineUserName(hiddenDangerCheck.getExamineUserName());//核查人名称 |
| | | hdcp.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_EXAMINE);//3隐患核查阶段(/** 更新者 */数据进入到3隐患核查阶段) |
| | |
| | | map.put("seriesDangers", seriesDangers); |
| | | //未整改隐患数量 |
| | | map.put("unRectifyDangerCount", unRectifyDangerCount); |
| | | |
| | | Map monthlyDangerMap = selectMonthlyDangers(companyId); |
| | | |
| | | ArrayList normalDanger = (ArrayList) monthlyDangerMap.get("normalDanger"); |
| | | long thisMonthNormalDangerCount = (long) normalDanger.get(normalDanger.size() - 1); |
| | | ArrayList highDanger = (ArrayList) monthlyDangerMap.get("highDanger"); |
| | |
| | | mmap.put("riskList", riskList); |
| | | //查询风险清单类型 |
| | | List<RiskType> riskTypes = getRiskTypes(riskList.getRiskType()); |
| | | mmap.put(" ", riskTypes); |
| | | mmap.put("riskTypes", riskTypes); |
| | | //判断如果是作业活动,查询作业活动频率 |
| | | if (riskList.getRiskType() == 2) { |
| | | List riskTypes1 = getRiskTypes(4); |
| | |
| | | |
| | | <!-- User getUserByLoginName(String createBy);--> |
| | | <select id="getUserByLoginName" parameterType="User" resultMap="UserResult"> |
| | | select * from sys_user where login_name = #{createBy} |
| | | select * from sys_user where user_name = #{createBy} |
| | | </select> |
| | | </mapper> |
| | |
| | | <if test="isForce != null "> and is_force = #{isForce}</if> |
| | | </where> |
| | | GROUP BY version_code DESC |
| | | <!-- GROUP BY version_code,version_id, create_by, create_time, update_by, update_time, remark,version_name, updete_desc, apk_ptah, is_force desc--> |
| | | </select> |
| | | |
| | | <select id="selectVersionControlById" parameterType="Long" resultMap="VersionControlResult"> |