From 560db6a1036201e7e2ac50f34ad4a418f17eaba6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 06 六月 2022 11:01:11 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 19 +++++++++
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 10 -----
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidRecord.java | 4 ++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java | 36 ++++++++---------
4 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
index d16a70b..22e000d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -259,17 +259,7 @@
@ApiOperation(value = "编辑党员")
@PutMapping("updatepartybuildingmember")
public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
- if (partyBuildingMemberVO.getIsPb() != null) {
- Long id = partyBuildingMemberVO.getId();
- if (partyBuildingMemberVO.getIsPb() == 1) {
- if (null == id || 0 == id) {
- return partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
- }
return partyBuildingService.updatePartyBuildingMember(partyBuildingMemberVO);
- }
- return partyBuildingService.deleteprepartybuildingmember(id);
- }
- return R.fail();
}
@ApiOperation(value = "查询社区下所有党员报到单位", response = ComPbCheckUnitVo.class)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidRecord.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidRecord.java
index 5578a15..cf84347 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidRecord.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActAcidRecord.java
@@ -154,15 +154,19 @@
private Date createTime;
@ApiModelProperty("健康码截图")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String colorImage;
@ApiModelProperty("行程码截图")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String travelImage;
@ApiModelProperty("48小时核酸截图")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String acidImage;
@ApiModelProperty("疫苗接种截图")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String vaccinationImage;
@ApiModelProperty("备注")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java
index 2337aa0..5176897 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java
@@ -353,12 +353,21 @@
}
String localCity = comActAcidRecordVO.getLocalCity();
String localAddress = comActAcidRecordVO.getLocalAddress();
+ Integer checkStatus=comActAcidRecordVO.getCheckStatus();
+ String remark=comActAcidRecordVO.getRemark();
BeanUtils.copyProperties(comActAcidRecord1, comActAcidRecordVO);
if(StringUtils.isNotEmpty(localCity)){
comActAcidRecordVO.setLocalCity(localCity);
}
if(StringUtils.isNotEmpty(localAddress)){
comActAcidRecordVO.setLocalAddress(localAddress);
+ }
+ BeanUtils.copyProperties(comActAcidRecord1,comActAcidRecord);
+ if(checkStatus>0){
+ comActAcidRecord.setCheckStatus(checkStatus);
+ }
+ if(StringUtils.isNotEmpty(remark)){
+ comActAcidRecord.setRemark(remark);
}
}
ComActAcidDangerMember comActAcidDangerMember =
@@ -394,32 +403,21 @@
ComActAcidRecord comActAcidRecord = new ComActAcidRecord();
BeanUtils.copyProperties(comActAcidRecordVO, comActAcidRecord);
String idCard = comActAcidRecordVO.getIdCard();
- if(StringUtils.isNotEmpty(comActAcidRecordVO.getAcidImage())){
- comActAcidRecord.setAcidImage(" ");
- }
- if(StringUtils.isNotEmpty(comActAcidRecordVO.getColorImage())){
- comActAcidRecord.setColorImage(" ");
- }
- if(StringUtils.isNotEmpty(comActAcidRecordVO.getTravelImage())){
- comActAcidRecord.setTravelImage(" ");
- }
- if(StringUtils.isNotEmpty(comActAcidRecordVO.getVaccinationImage())){
- comActAcidRecord.setVaccinationImage(" ");
- }
if (isBlank(idCard)) {
- //只修改地址，其他信息需要查询
+ //只修改核对状态，其他信息需要查询
ComActAcidRecord comActAcidRecord1 = this.baseMapper.selectById(comActAcidRecordVO.getId());
if (isNull(comActAcidRecord1)) {
return R.fail("填报纪录不存在");
}
- String localCity = comActAcidRecordVO.getLocalCity();
- String localAddress = comActAcidRecordVO.getLocalAddress();
+ Integer checkStatus=comActAcidRecordVO.getCheckStatus();
+ String remark=comActAcidRecordVO.getRemark();
BeanUtils.copyProperties(comActAcidRecord1, comActAcidRecordVO);
- if(StringUtils.isNotEmpty(localCity)){
- comActAcidRecordVO.setLocalCity(localCity);
+ BeanUtils.copyProperties(comActAcidRecord1,comActAcidRecord);
+ if(checkStatus>0){
+ comActAcidRecord.setCheckStatus(checkStatus);
}
- if(StringUtils.isNotEmpty(localAddress)){
- comActAcidRecordVO.setLocalAddress(localAddress);
+ if(StringUtils.isNotEmpty(remark)){
+ comActAcidRecord.setRemark(remark);
}
}
ComActAcidDangerMember comActAcidDangerMember =
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
index e31f765..475b10e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -695,7 +695,24 @@
if (nonNull(type) && type.equals(1)) {
comPbMemberDO.setEmploymentTime(null);
}
-
+ if(partyBuildingMemberVO.getVillageId()!=null){
+ comPbMemberDO.setVillageId(partyBuildingMemberVO.getVillageId());
+ }
+ if(partyBuildingMemberVO.getHelpCommunityId()!=null){
+ comPbMemberDO.setHelpCommunityId(partyBuildingMemberVO.getHelpCommunityId());
+ }
+ if(partyBuildingMemberVO.getCommunityId()!=null){
+ comPbMemberDO.setCommunityId(partyBuildingMemberVO.getCommunityId());
+ }
+ if(partyBuildingMemberVO.getNatureId()!=null){
+ comPbMemberDO.setNatureId(partyBuildingMemberVO.getNatureId());
+ }
+ if(nonNull(partyBuildingMemberVO.getNatureName())){
+ comPbMemberDO.setNatureName(partyBuildingMemberVO.getNatureName());
+ }
+ if(nonNull(partyBuildingMemberVO.getOtherRemark())){
+ comPbMemberDO.setOtherRemark(partyBuildingMemberVO.getOtherRemark());
+ }
if (comPbMemberDAO.updateById(comPbMemberDO) > 0) {
PartyBuildingMemberVO rtVO = new PartyBuildingMemberVO();
--
Gitblit v1.7.1