springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java
@@ -124,6 +124,9 @@ @ApiModelProperty("隐患名称") private String dangerName; @ApiModelProperty("原隐患名称") private String dagerName; /** * 排查时间 */ @@ -142,6 +145,9 @@ @ApiModelProperty("隐患简述") private String dangerDescription; @ApiModelProperty("原隐患简述") private String dagerDescription; /** * 是否立即整改（1是 、0否） */ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java
@@ -116,6 +116,7 @@ Long dangerReportId = Snowflake.getId(); comSwDangerReportDO.setId(dangerReportId); comSwPatrolRecordReportDO.setReportId(dangerReportId); comSwDangerReportDO.setDangerName(comSwPatrolRecordAddDTO.getDagerName()); comSwDangerReportDO.setDangerType(comSwPatrolRecordAddDTO.getPatrolType()); if (comSwPatrolRecordAddDTO.getIsRectifyImmediately().intValue() == ComSwPatrolRecordAddDTO.isOk.yes && StringUtils.isNotEmpty(comSwPatrolRecordAddDTO.getTakeSteps())) { comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.YZG.getCode())); @@ -124,7 +125,7 @@ comSwDangerReportDO.setStatus(String.valueOf(SafeWordStatusEnum.DCL.getCode())); } BeanUtils.copyProperties(comSwPatrolRecordAddDTO, comSwDangerReportDO); comSwDangerReportDO.setDagerDescription(comSwPatrolRecordAddDTO.getDangerDescription()); comSwDangerReportDO.setDagerDescription(comSwPatrolRecordAddDTO.getDagerDescription()); comSwDangerReportDO.setPersonName(comSwPatrolRecordAddDTO.getDPersonName()); comSwDangerReportDO.setPersonPhone(comSwPatrolRecordAddDTO.getDPersonPhone()); comSwDangerReportDAO.insert(comSwDangerReportDO); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java
@@ -179,7 +179,7 @@ return R.fail("该值班表不存在"); } ComSwRotaDO checkCreditCode = comSwRotaDAO.selectOne(new QueryWrapper<ComSwRotaDO>().lambda().eq(ComSwRotaDO::getRotaDate, comSwRotaSaveDTO.getRotaDate())); if (null != checkCreditCode && comSwRotaDO.getId() != checkCreditCode.getId()) { if (null != checkCreditCode && !comSwRotaDO.getId().equals(checkCreditCode.getId())) { return R.fail("该值班表已存在，值班日期重复"); } BeanUtils.copyProperties(comSwRotaSaveDTO, comSwRotaDO); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSwRotaMapper.xml
@@ -46,7 +46,7 @@ or csr.leader_phone LIKE concat('%',#{comSwRotaPageDTO.phone},'%') ) </if> order by csr.create_at desc order by csr.rota_date desc </select> <select id="getTeamIdsByTeamPhone" resultType="java.lang.String"> select id springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -640,9 +640,14 @@ //通过身份证号判断性别以及出生日期 sysUserDO.setSex(IdCard.sex(idCard)); sysUserDO.setBirthday(IdCard.birthDay(idCard)); sysUserDO.setJob(loginUserInfoVO.getJob()); if(!StringUtils.isEmpty(loginUserInfoVO.getJob())){ sysUserDO.setJob(loginUserInfoVO.getJob()); } sysUserDO.setUserId(loginUserInfoVO.getUserId()); sysUserDO.setFaceUrl(loginUserInfoVO.getFaceUrl()); if(!StringUtils.isEmpty(loginUserInfoVO.getPhone())){ sysUserDO.setPhone(loginUserInfoVO.getPhone()); } sysUserDO.setFaceState(null); SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, idCard)); if (!ObjectUtils.isEmpty(sysUserDO1)) {
