Merge remote-tracking branch 'origin/upgrade' into upgrade

src/main/java/com/cm/population/controller/api/residential/ResidentialController.java

@@ -203,23 +203,31 @@ public class ResidentialController extends AbstractController {
                             params.put("streetName", data.getStreet());
                             params.put("communityName", data.getCommunity());
                             params.put("name", data.getResidential());
+
+                            // 获取社区ID
+                            String communityId = residentialService.getCommunityId(data.getCommunity());
+                            String streetId = residentialService.getStreetId(data.getStreet());
                             List<ResidentialDTO> residentialDTOList = residentialService.list(params);
                             if(CollectionUtils.isEmpty(residentialDTOList)) {
                                 ResidentialVO residentialVO = new ResidentialVO();
                                 residentialVO.setStreetName(data.getStreet());
                                 residentialVO.setCommunityName(data.getCommunity());
+                                residentialVO.setCommunity(communityId);
+                                residentialVO.setStreet(streetId);
                                 residentialVO.setName(data.getResidential());
                                 residentialService.save(residentialVO);
                             }
 
                             // 插入楼栋信息，获取小区信息
                             List<ResidentialDTO> residentialDTOList1 = residentialService.list(params);
-                            if(!CollectionUtils.isEmpty(residentialDTOList)) {
+                            if(!CollectionUtils.isEmpty(residentialDTOList1)) {
                                 BuildingVO buildingVO = new BuildingVO();
                                 buildingVO.setStreetName(data.getStreet());
                                 buildingVO.setCommunityName(data.getCommunity());
                                 buildingVO.setResidentialId(residentialDTOList1.get(0).getResidentialId());
                                 buildingVO.setResidentialName(residentialDTOList1.get(0).getName());
+                                buildingVO.setCommunity(communityId);
+                                buildingVO.setStreet(streetId);
                                 buildingVO.setName(data.getName());
                                 buildingVO.setBuildNum(data.getBuildingNum());
                                 buildingVO.setUnitNum(data.getUnit());

src/main/java/com/cm/population/dao/residential/IResidentialDao.java

@@ -117,4 +117,7 @@ public interface IResidentialDao {
      */
     Integer count(Map<String, Object> params) throws SearchException;
 
+    String getCommunityId(String community);
+
+    String getStreetId(String street);
 }

src/main/java/com/cm/population/pojo/dtos/house/BatchHouseDTO.java

@@ -100,6 +100,8 @@ public class BatchHouseDTO {
         private String houseId;
         @ApiModelProperty(name = "name", value = "房屋编号")
         private String name;
+        @ApiModelProperty(name = "gmtCreate", value = "创建时间")
+        private String gmtCreate;
 
         public String getHouseId() {
             return houseId;
@@ -116,6 +118,14 @@ public class BatchHouseDTO {
         public void setName(String name) {
             this.name = name;
         }
+
+        public String getGmtCreate() {
+            return gmtCreate;
+        }
+
+        public void setGmtCreate(String gmtCreate) {
+            this.gmtCreate = gmtCreate;
+        }
     }
 
 }

src/main/java/com/cm/population/service/house/impl/HouseServiceImpl.java

@@ -293,6 +293,7 @@ public class HouseServiceImpl extends AbstractService implements IHouseService {
                                     if (j == houseDTO.getAffiliationUnit()) {
                                         house.setHouseId(houseDTO.getHouseId());
                                         house.setName(houseDTO.getHouseNum().toString());
+                                        house.setGmtCreate(houseDTO.getGmtCreate());
                                         houseList.add(house);
                                     }
                                 }

src/main/java/com/cm/population/service/population/impl/PopulationServiceImpl.java

@@ -79,6 +79,7 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
             setSaveInfo(token, params);
         }
         params.put("bindTime", params.get("gmtCreate"));
+        params.put("outHouse", 0);
         populationDao.save(params);
         return populationId;
     }

src/main/java/com/cm/population/service/residential/IResidentialService.java

@@ -185,4 +185,7 @@ public interface IResidentialService {
      */
     Integer count(Map<String, Object> params);
 
+    String getCommunityId(String community);
+
+    String getStreetId(String street);
 }

src/main/java/com/cm/population/service/residential/impl/ResidentialServiceImpl.java

@@ -184,4 +184,14 @@ public class ResidentialServiceImpl extends AbstractService implements IResident
         return count == null ? 0 : count;
     }
 
+    @Override
+    public String getCommunityId(String community) {
+        return residentialDao.getCommunityId(community);
+    }
+
+    @Override
+    public String getStreetId(String street) {
+        return residentialDao.getStreetId(street);
+    }
+
 }

src/main/resources/mybatis/mapper/population/population-mapper.xml

@@ -248,7 +248,8 @@
             t1.house_id = hh.house_id
         WHERE
             t1.is_delete = 0
-            AND t1.out_house = 0 OR t1.out_house IS NULL
+            AND (t1.out_house = 0
+            OR t1.out_house IS NULL)
         AND
             hh.is_delete = 0
         <if test="keywords != null and keywords != ''">

src/main/resources/mybatis/mapper/residential/residential-mapper.xml

@@ -429,4 +429,12 @@
             t1.is_delete = 0
     </select>
 
+    <select id="getStreetId" parameterType="String" resultType="String">
+        SELECT dict_id FROM d_dict WHERE dict_name = #{street} and is_delete = 0
+    </select>
+
+    <select id="getCommunityId" parameterType="String" resultType="String">
+        SELECT community_id FROM d_community WHERE community_name = #{community} and is_delete = 0
+    </select>
+
 </mapper>

src/main/resources/templates/house/list-summary.html

@@ -35,6 +35,7 @@
         #contentBody .center .main .floor .unit .house {width: 200px; height: 100px; border: 1px solid #e6e6e6; box-sizing: border-box; display: inline-block; font-size: 14px; cursor: pointer; text-align: center; line-height: 100px; user-select:none; transition: background-color .3s, font-weight .3s;}
         #contentBody .center .main .floor .unit .house:hover {font-weight: bold; background-color: #f2f2f2;}
         #contentBody .center .main .floor .unit .house .info {display: flex; justify-content: center; align-items: center;}
+        #contentBody .center .main .floor .unit .house .info .name {}
         #contentBody .center .main .floor .unit .house .info .option {display: none;}
     </style>
 </head>