完善

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

@@ -10,7 +10,9 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.modules.partyOrg.service.YiFengPartyOrgService;
+import com.epmet.modules.partymember.service.IcPartyPlaceService;
 import com.epmet.modules.partymember.service.YiFengScreenService;
+import com.epmet.resi.partymember.dto.IcPartyPlaceDTO;
 import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO;
 import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO;
 import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO;
@@ -24,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("yifengScreen")
@@ -36,6 +39,34 @@ public class YiFengScreenController {
     @Autowired
     private YiFengPartyOrgService yiFengPartyOrgService;
 
+    @Autowired
+    private IcPartyPlaceService icPartyPlaceService;
+
+    /**
+     * @Description: 移风党建列表
+     * @param params:
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.page.PageData < com.epmet.resi.partymember.dto.IcPartyPlaceDTO>>
+     * @Author: lichao
+     * @Date: 2024/3/5 14:50
+     */
+    @GetMapping("partyPlacePage")
+    public Result<PageData<IcPartyPlaceDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcPartyPlaceDTO> page = icPartyPlaceService.page(params);
+        return new Result<PageData<IcPartyPlaceDTO>>().ok(page);
+    }
+
+    /**
+     * @Description: 移风党建详情
+     * @param id:
+     * @Return com.epmet.commons.tools.utils.Result<com.epmet.resi.partymember.dto.IcPartyPlaceDTO>
+     * @Author: lichao
+     * @Date: 2024/3/5 15:10
+     */
+    @GetMapping("partyPlace/{id}")
+    public Result<IcPartyPlaceDTO> get(@PathVariable("id") String id){
+        IcPartyPlaceDTO data = icPartyPlaceService.get(id);
+        return new Result<IcPartyPlaceDTO>().ok(data);
+    }
 
     /**
      * @Description: 移风大屏-党员活动列表

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/IcPartyPlaceEntity.java

@@ -46,4 +46,9 @@ public class IcPartyPlaceEntity extends BaseEpmetEntity {
      */
 	private String address;
 
+	/**
+	 * 类型 1：公司 2：阵地
+	 */
+	private Integer type;
+
 }

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

@@ -1,6 +1,7 @@
 package com.epmet.modules.partymember.service;
 
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.resi.partymember.dto.IcPartyPlaceDTO;
 import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO;
 import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO;
 import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO;
@@ -8,6 +9,7 @@ import com.epmet.resi.partymember.dto.partymember.result.*;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 public interface YiFengScreenService {
     /**
@@ -69,4 +71,5 @@ public interface YiFengScreenService {
     PageData<IcPartyActPageResultDTO> actPageList(IcPartyActPageFormDTO formDTO);
 
     IcPartyActDetailResDTO queryActDetail(String customerId, String icPartyActId);
+
 }

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

@@ -49,9 +49,15 @@ public class IcPartyPlaceServiceImpl extends BaseServiceImpl<IcPartyPlaceDao, Ic
     private QueryWrapper<IcPartyPlaceEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
 
+        String type = (String)params.get("type");
+
         QueryWrapper<IcPartyPlaceEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
+        if (type!=null){
+            wrapper.eq("type", type);
+        }
+
         return wrapper;
     }
 
@@ -65,7 +71,7 @@ public class IcPartyPlaceServiceImpl extends BaseServiceImpl<IcPartyPlaceDao, Ic
     @Transactional(rollbackFor = Exception.class)
     public void save(IcPartyPlaceDTO dto) {
         IcPartyPlaceEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyPlaceEntity.class);
-        insert(entity);
+        saveOrUpdate(entity);
     }
 
     @Override