代码完善

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgCensusController.java

@@ -62,6 +62,12 @@ public class IcPartyOrgCensusController {
         return new Result<IcPartyOrgCensusDTO>().ok(data);
     }
 
+    @GetMapping("detailByOrgId/{orgId}")
+    public Result<IcPartyOrgCensusDTO> detailByOrgId(@PathVariable("orgId") String orgId){
+        IcPartyOrgCensusDTO data = icPartyOrgCensusService.detailByOrgId(orgId);
+        return new Result<IcPartyOrgCensusDTO>().ok(data);
+    }
+
     @PostMapping
     public Result save(@RequestBody IcPartyOrgCensusDTO dto){
         //效验数据

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgCensusService.java

@@ -95,4 +95,6 @@ public interface IcPartyOrgCensusService extends BaseService<IcPartyOrgCensusEnt
     void delete(String[] ids);
 
     List<IcPartyOrgCensusDTO> partyOrgCensusList(String type);
+
+    IcPartyOrgCensusDTO detailByOrgId(String orgId);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgCensusServiceImpl.java

@@ -17,6 +17,7 @@
 
 package com.epmet.modules.partyOrg.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@@ -82,9 +83,19 @@ public class IcPartyOrgCensusServiceImpl extends BaseServiceImpl<IcPartyOrgCensu
     @Transactional(rollbackFor = Exception.class)
     public void save(IcPartyOrgCensusDTO dto) {
         IcPartyOrgCensusEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyOrgCensusEntity.class);
-        insert(entity);
-    }
 
+        LambdaQueryWrapper<IcPartyOrgCensusEntity> lambdaQueryWrapper = new LambdaQueryWrapper<IcPartyOrgCensusEntity>()
+                .eq(IcPartyOrgCensusEntity::getPartyOrgId,dto.getPartyOrgId());
+        IcPartyOrgCensusEntity old = baseDao.selectOne(lambdaQueryWrapper);
+        if (old!=null){
+            old.setGridCount(dto.getGridCount());
+            old.setNaturalVillageCount(dto.getNaturalVillageCount());
+            old.setPartyMemberCenterCount(dto.getPartyMemberCenterCount());
+            updateById(old);
+        }else{
+            insert(entity);
+        }
+    }
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(IcPartyOrgCensusDTO dto) {
@@ -110,4 +121,17 @@ public class IcPartyOrgCensusServiceImpl extends BaseServiceImpl<IcPartyOrgCensu
         return result;
     }
 
+    @Override
+    public IcPartyOrgCensusDTO detailByOrgId(String orgId) {
+
+        IcPartyOrgCensusDTO result = new IcPartyOrgCensusDTO();
+
+        LambdaQueryWrapper<IcPartyOrgCensusEntity> lambdaQueryWrapper = new LambdaQueryWrapper<IcPartyOrgCensusEntity>()
+                .eq(IcPartyOrgCensusEntity::getPartyOrgId,orgId);
+        if (baseDao.selectOne(lambdaQueryWrapper)!=null){
+            result =  ConvertUtils.sourceToTarget(baseDao.selectOne(lambdaQueryWrapper),IcPartyOrgCensusDTO.class);
+        }
+        return result;
+    }
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java

@@ -124,7 +124,7 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl<IcPartyOrgDao, IcPart
             checkOrgType(parentOrg.getPartyOrgType(), dto.getPartyOrgType());
         }
         //如果不是支部，需要判断行政组织是否重复
-        if (!PartyOrgTypeEnum.BRANCH.getCode().equals(dto.getPartyOrgType())) {
+        if (!PartyOrgTypeEnum.BRANCH.getCode().equals(dto.getPartyOrgType()) && !PartyOrgTypeEnum.GROUP.getCode().equals(dto.getPartyOrgType())) {
             IcPartyOrgEntity isAgency = baseDao.selectByAgencyId(dto.getAgencyId(), PartyOrgTypeEnum.BRANCH.getCode());
             if (null != isAgency) {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"该行政组织已被关联！","该行政组织已被关联！");

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java

@@ -13,6 +13,7 @@ import com.epmet.modules.partyOrg.service.IcPartyOrgCensusService;
 import com.epmet.modules.partyOrg.service.IcPartyOrgLeaderService;
 import com.epmet.modules.partyOrg.service.IcPartyWishService;
 import com.epmet.modules.partyOrg.service.YiFengPartyOrgService;
+import com.epmet.modules.partymember.dao.IcPartyMemberDao;
 import com.epmet.modules.partymember.service.*;
 import com.epmet.resi.partymember.dto.IcPartyPlaceDTO;
 import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO;
@@ -25,6 +26,7 @@ import com.epmet.resi.partymember.dto.partyOrg.result.LingShanPartyOrgAndOtherOb
 import com.epmet.resi.partymember.dto.partyOrg.result.LingShanScreenPartyObjectByTypeRstDTO;
 import com.epmet.resi.partymember.dto.partymember.IcParameterConfigDTO;
 import com.epmet.resi.partymember.dto.partymember.IcPartyInventoryDTO;
+import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO;
 import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO;
 import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO;
 import com.epmet.resi.partymember.dto.partymember.result.*;
@@ -65,6 +67,8 @@ public class YiFengScreenController {
     private IcParameterConfigService icParameterConfigService;
     @Autowired
     private IcPartyInventoryService icPartyInventoryService;
+    @Autowired
+    private IcPartyMemberService icPartyMemberService;
 
 
     /**
@@ -105,6 +109,13 @@ public class YiFengScreenController {
         return new Result<List<IcPartyMemberCensusResultDTO>>().ok(result);
     }
 
+
+    @GetMapping("partyMemberCenListByOrg")
+    public Result<List<IcPartyMemberDTO>> partyMemberCenListByOrg(@RequestParam String orgId){
+        List<IcPartyMemberDTO> list = icPartyMemberService.partyMemberCenListByOrg(orgId);
+        return new Result<List<IcPartyMemberDTO>>().ok(list);
+    }
+
     /**
      * @Description: 参数配置
      * @param type:

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java

@@ -158,4 +158,6 @@ public interface IcPartyMemberService extends BaseService<IcPartyMemberEntity> {
      * @return
      */
     PageData<PartymemberPortraitResultDTO> queryPartyMemberPortraitList(IcPartyMemberListFormDTO formDTO);
+
+    List<IcPartyMemberDTO> partyMemberCenListByOrg(String orgId);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyInventoryServiceImpl.java

@@ -85,7 +85,7 @@ public class IcPartyInventoryServiceImpl extends BaseServiceImpl<IcPartyInventor
     @Transactional(rollbackFor = Exception.class)
     public void save(IcPartyInventoryDTO dto) {
         IcPartyInventoryEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyInventoryEntity.class);
-        insert(entity);
+        saveOrUpdate(entity);
     }
 
     @Override

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java

@@ -750,5 +750,19 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl<IcPartyMemberDao,
         return new PageData<>(resultDTOList, pageInfo.getTotal(), formDTO.getPageSize());
     }
 
+    @Override
+    public List<IcPartyMemberDTO> partyMemberCenListByOrg(String orgId) {
+
+        List<IcPartyMemberDTO> result = new ArrayList<>();
+
+        LambdaQueryWrapper<IcPartyMemberEntity> partyMemberEntityLambdaQueryWrapper = new LambdaQueryWrapper<IcPartyMemberEntity>()
+                .eq(IcPartyMemberEntity::getSszb,orgId).eq(IcPartyMemberEntity::getIsDyzxh,1);
+        List<IcPartyMemberEntity> entities = baseDao.selectList(partyMemberEntityLambdaQueryWrapper);
+        if (entities.size()>0){
+            result = ConvertUtils.sourceToTarget(entities,IcPartyMemberDTO.class);
+        }
+        return result;
+    }
+
 
 }