java/zhihuishenqu.git

			@@ -224,6 +224,9 @@
			@ApiModelProperty("社区名字")
			private String communityName;

			@ApiModelProperty("隐患编号")
			private Integer dagerNo;

			/**
			* 巡查类型
			*/

			@@ -254,8 +254,10 @@
			.eq(ComSwPatrolRecordReportDO::getPatrolRecordId, patrolRecordId));
			if (null != comSwPatrolRecordReportDO) {
			if (comSwPatrolRecordVO.getIsHiddenDanger().equals(ComSwPatrolRecordVO.isOk.yes)) {
			if (null != comSwDangerReportDAO.selectById(comSwPatrolRecordReportDO.getReportId())) {
			ComSwDangerReportDO comSwDangerReportDO=comSwDangerReportDAO.selectById(comSwPatrolRecordReportDO.getReportId());
			if (null != comSwDangerReportDO) {
			comSwPatrolRecordVO.setDisplayButton(3);
			comSwPatrolRecordVO.setDagerNo(comSwDangerReportDO.getDangerNo());
			} else {
			comSwPatrolRecordVO.setDisplayButton(2);
			}

			@@ -174,7 +174,7 @@
			return R.fail("该值班表不存在");
			}
			ComSwRotaDO checkCreditCode = comSwRotaDAO.selectOne(new QueryWrapper<ComSwRotaDO>().lambda()
			.eq(ComSwRotaDO::getRotaDate, comSwRotaSaveDTO.getRotaDate()));
			.eq(ComSwRotaDO::getRotaDate, comSwRotaSaveDTO.getRotaDate()).eq(ComSwRotaDO::getCommunityId,comSwRotaSaveDTO.getCommunityId()));
			if (null != checkCreditCode && !comSwRotaDO.getId().equals(checkCreditCode.getId())) {
			return R.fail("该值班表已存在，值班日期重复");
			}
			@@ -187,7 +187,7 @@
			comSwRotaDAO.updateById(comSwRotaDO);
			} else {
			Integer count = comSwRotaDAO.selectCount(new QueryWrapper<ComSwRotaDO>().lambda()
			.eq(ComSwRotaDO::getRotaDate, comSwRotaSaveDTO.getRotaDate()));
			.eq(ComSwRotaDO::getRotaDate, comSwRotaSaveDTO.getRotaDate()).eq(ComSwRotaDO::getCommunityId,comSwRotaSaveDTO.getCommunityId()));
			if (count > 0) {
			return R.fail("该值班表已存在，值班日期重复");
			}

	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwPatrolRecordServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史