message:

修改bug

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/ViewController/PowerAxiskernelHouseholdViewController.java

@@ -29,7 +29,7 @@ public class PowerAxiskernelHouseholdViewController {
      */
     @PostMapping("/list")
     public ResultDTO getList(@RequestBody PowerKernelHouseHoldViewListFormDTO form){
-        PowerKernelHouseHoldViewListResultDTO dto = powerKernelHouseholdService.getList(form);
+        List<PowerKernelHouseHoldViewListResultDTO> dto = powerKernelHouseholdService.getList(form);
         return ResultDTO.success("查询成功",dto,powerKernelHouseholdService.getTotal(form));
     }
     /**

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java

@@ -21,6 +21,7 @@ import com.epmet.plugin.power.modules.axis.excel.PowerKernelHouseholdExcel;
 import com.epmet.plugin.power.modules.axis.service.PowerKernelHouseholdService;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -115,14 +116,22 @@ public class PowerKernelHouseholdController {
             IcHouseDTO houseDto = icHouseDTOResult.getData();
             entity = new PowerKernelHouseholdEntity();
             entity.setHouseId(houseInfo.getHomeId());
-            entity.setLongitude(new BigDecimal(houseInfo.getBuildingLongitude()));
-            entity.setLatitude(new BigDecimal(houseInfo.getBuildingLatitude()));
+
+            if(!StringUtils.isEmpty(houseInfo.getBuildingLatitude()) && !StringUtils.isEmpty(houseInfo.getBuildingLongitude())){
+                entity.setLatitude(new BigDecimal(houseInfo.getBuildingLatitude()));
+                entity.setLongitude(new BigDecimal(houseInfo.getBuildingLongitude()));
+            } else {
+                entity.setLatitude(BigDecimal.ZERO);
+                entity.setLongitude(BigDecimal.ZERO);
+            }
             entity.setAddress(houseInfo.getAllName());
             entity.setCustomerId(loginUserUtil.getLoginUserCustomerId());
 
             entity.setOwnerPhone(houseDto.getOwnerPhone());
             entity.setOwnerIdCard(houseDto.getOwnerIdCard());
             entity.setOwnerName(houseDto.getOwnerName());
+
+            entity.setStructReferenceId(form.getAxisStructId());
             powerKernelHouseholdService.insert(entity);
         }
         return new Result();

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java

@@ -23,7 +23,7 @@ import java.util.List;
 public interface PowerKernelHouseholdDao extends BaseDao<PowerKernelHouseholdEntity> {
 
 
-    PowerKernelHouseHoldViewListResultDTO getList(PowerKernelHouseHoldViewListFormDTO form);
+    List<PowerKernelHouseHoldViewListResultDTO> getList(PowerKernelHouseHoldViewListFormDTO form);
 
     long getTotal(PowerKernelHouseHoldViewListFormDTO form);
 

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisLeaderEntity.java

@@ -51,4 +51,5 @@ public class PowerAxisLeaderEntity extends BaseEpmetEntity {
      */
 	private String avatar;
 
+
 }

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java

@@ -86,7 +86,7 @@ public interface PowerKernelHouseholdService extends BaseService<PowerKernelHous
     /**
      * 党员中心户列表
      */
-    PowerKernelHouseHoldViewListResultDTO getList(PowerKernelHouseHoldViewListFormDTO form);
+    List<PowerKernelHouseHoldViewListResultDTO> getList(PowerKernelHouseHoldViewListFormDTO form);
 
     long getTotal(PowerKernelHouseHoldViewListFormDTO form);
     /**

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java

@@ -56,9 +56,11 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernel
 
     private QueryWrapper<PowerKernelHouseholdEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
+        String axisStructId = (String)params.get("axisStructId");
 
         QueryWrapper<PowerKernelHouseholdEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id)
+                .eq(StringUtils.isNotBlank(axisStructId), "STRUCT_REFERENCE_ID", axisStructId);
 
         return wrapper;
     }
@@ -94,9 +96,9 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernel
      * 党员中心户列表
      */
     @Override
-    public PowerKernelHouseHoldViewListResultDTO getList(PowerKernelHouseHoldViewListFormDTO form) {
+    public List<PowerKernelHouseHoldViewListResultDTO> getList(PowerKernelHouseHoldViewListFormDTO form) {
         form.setPageNo((form.getPageNo() - 1) * form.getPageSize());
-        PowerKernelHouseHoldViewListResultDTO dto = baseDao.getList(form);
+        List<PowerKernelHouseHoldViewListResultDTO> dto = baseDao.getList(form);
         return dto;
     }
 

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisLeaderDao.xml

@@ -38,18 +38,22 @@
     <select id="getLeaderDetail"
             resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisLeaderDetailResultDTO">
         SELECT
-            NAME,
+            ppal.NAME,
             gender,
             mobile,
             INTERODUCTION,
-            ppat.CATEGORY_NAME,
+            CATEGORY_NAME,
             AVATAR
         FROM
             pli_power_axis_leader AS ppal
+        LEFT JOIN
+            pli_power_axis_struct AS poas
+        ON
+            poas.id = #{axisStructId}
         LEFT JOIN
             pli_power_axis_tag AS ppat
         ON
-            ppal.CATEGORY_CODE = ppat.CATEGORY_CODE
+            poas.CATEGORY_CODE = ppat.CATEGORY_CODE
         WHERE
 	        ppal.id = #{leaderId}
     </select>

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml

@@ -20,19 +20,7 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
-    <select id="getList"
-            resultType="com.epmet.plugin.power.dto.axis.result.PowerKernelHouseHoldViewListResultDTO">
-            SELECT
-                OWNER_NAME,
-                HOUSE_ID,
-                ADDRESS
-            FROM
-                pli_power_kernel_household
-            WHERE
-	            STRUCT_REFERENCE_ID = #{axisStructId}
-	        limit
-                #{pageNo},#{pageSize}
-    </select>
+
     <select id="getTotal" resultType="java.lang.Long">
         select
             count(*)
@@ -62,6 +50,19 @@
         where
             STRUCT_REFERENCE_ID = #{axisStructId}
     </select>
+    <select id="getList"
+            resultType="com.epmet.plugin.power.dto.axis.result.PowerKernelHouseHoldViewListResultDTO">
+        SELECT
+                OWNER_NAME,
+                HOUSE_ID,
+                ADDRESS
+            FROM
+                pli_power_kernel_household
+            WHERE
+	            STRUCT_REFERENCE_ID = #{axisStructId}
+	        limit
+                #{pageNo},#{pageSize}
+    </select>
 
 
 </mapper>