hazardInvestigationSystem.git

			@@ -9,11 +9,8 @@
			import com.gk.hotwork.Config.Oauth2.IRedisService;
			import com.gk.hotwork.Config.Oauth2.OauthRole;
			import com.gk.hotwork.Config.Oauth2.RedisKeyEnum;
			import com.gk.hotwork.Domain.AuthorizationInfo;
			import com.gk.hotwork.Domain.ExamScoreInfo;
			import com.gk.hotwork.Domain.*;
			import com.gk.hotwork.Domain.Exception.BusinessException;
			import com.gk.hotwork.Domain.UserFace;
			import com.gk.hotwork.Domain.UserInfo;
			import com.gk.hotwork.Domain.Utils.CommonUtil;
			import com.gk.hotwork.Domain.Utils.Msg;
			import com.gk.hotwork.Domain.Vo.ExamScoreVo;
			@@ -48,6 +45,9 @@
			ExamScoreService examScoreService;
			@Autowired
			UserFaceService userFaceService;
			@Autowired
			CompanyService companyService;

			@Value("${host}")
			private String host;
			@Value("${workname}")
			@@ -118,6 +118,14 @@
			UserFace userFace = userFaceService.selectByUserId(user.getId());
			if (userFace != null)
			user.setCode(userFace.getCode());
			if(user.getCompanyid() != null){
			CompanyInfo companyInfo = companyService.getById(user.getId());
			if(companyInfo != null){
			user.setProvince(companyInfo.getProvince());
			user.setCity(companyInfo.getCity());
			user.setCounty(companyInfo.getArea());
			}
			}
			msg.setResult(user);
			} catch (Exception e) {
			e.printStackTrace();

			@@ -3,6 +3,7 @@
			<mapper namespace="com.gk.hotwork.Mapper.InspectionHiddenDangerMapper" >
			<update id="delByInspectionItemId">
			update inspection_hidden_danger set valid_flag = 0 , update_time = #{inspectionHiddenDanger.updateTime},update_by = #{inspectionHiddenDanger.updateBy}
			where self_inspection_item_id = #{inspectionHiddenDanger.selfInspectionItemId}
			</update>

			<update id="delByIds">
			@@ -77,7 +78,7 @@
			<if test="params.area != null and params.area != ''" >
			and co.area = #{params.area}
			</if>
			ORDER BY l.create_time
			ORDER BY l.create_time desc
			</select>
			<select id="inspectionHdangerlist" resultType="com.gk.hotwork.Domain.InspectionHiddenDanger">
			SELECT

			@@ -630,7 +630,7 @@
			//否决合格--删除扣分记录
			safetySelfInspectionItemDeductionMapper.delBySafetySelfInspectionItemId(param.getId(),username,date);
			//删除隐患
			dangerService.delByInspectionItemId(param.getSafetyInspectionItemId(),user);
			dangerService.delByInspectionItemId(param.getId(),user);
			//删除附件
			attachmentInfoService.deleteByBusinessId(param.getId());
			}else{

	src/main/java/com/gk/hotwork/Controller/LoginController.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/gk/hotwork/Mapper/mybatis/InspectionHiddenDangerMapper.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/gk/hotwork/Service/ServiceImpl/SafetySelfInspectionImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史