houseHolderName

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectFormDTO.java

@@ -91,7 +91,7 @@ public class IcResiCollectFormDTO implements Serializable {
      * 户主姓名
      */
     @NotBlank(message = "户主姓名不能为空", groups = {InternalShowGroup.class, ExternalShowGroup.class})
-    private String houseHolerName;
+    private String houseHolderName;
 
     /**
      * 居住成员人数

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java

@@ -3,6 +3,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.IcResiCollectEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 居民信息采集表
@@ -14,4 +15,9 @@ import org.apache.ibatis.annotations.Mapper;
 public interface IcResiCollectDao extends BaseDao<IcResiCollectEntity> {
 
     IcResiCollectEntity selectByAddress(String address);
+
+    int updateRec(@Param("id") String id,
+                  @Param("houseType") Integer houseType,
+                  @Param("houseHolderName") String houseHolderName,
+                  @Param("totalResi") Integer totalResi);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiCollectEntity.java

@@ -76,7 +76,7 @@ public class IcResiCollectEntity extends BaseEpmetEntity {
     /**
      * 户主姓名
      */
-	private String houseHolerName;
+	private String houseHolderName;
 
     /**
      * 居住成员人数

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java

@@ -35,8 +35,8 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(IcResiCollectFormDTO formDTO) {
-        IcResiCollectEntity origin=baseDao.selectByAddress(formDTO.getAddress());
+        IcResiCollectEntity origin = baseDao.selectByAddress(formDTO.getAddress());
-        if(null==origin){
+        if (null == origin) {
             //插入主表、成员表
             IcResiCollectEntity insert = ConvertUtils.sourceToTarget(formDTO, IcResiCollectEntity.class);
             if ("internal".equals(formDTO.getOrigin())) {
@@ -52,14 +52,18 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
                 mem.setIcResiCollectId(insert.getId());
                 icResiMemberDao.insert(mem);
             });
-        }else{
+        } else {
+            //更新主表
+            baseDao.updateRec(origin.getId(),formDTO.getHouseType(),formDTO.getHouseHolderName(),formDTO.getTotalResi());
             //查询成员表
 
+
         }
         // IcResiCollectEntity entity = ConvertUtils.sourceToTarget(dto, IcResiCollectEntity.class);
         // insert(entity);
     }
 
+
     private IcNeighborHoodDTO queryIcNeighborHood(String villageId) {
         Result<IcNeighborHoodDTO> res = govOrgOpenFeignClient.getIcNeighbordhoodById(villageId);
         if (!res.success() || null == res.getData()) {

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml

@@ -3,10 +3,19 @@
 
 <mapper namespace="com.epmet.dao.IcResiCollectDao">
 
-    <select id="selectByAddress" parameterType="java.lang.String">
+    <select id="selectByAddress" parameterType="java.lang.String" resultType="com.epmet.entity.IcResiCollectEntity">
         select c.id from ic_resi_collect c
         where and c.address=#{address}
         and c.DEL_FLAG='0'
     </select>
 
+    <update id="updateRec" parameterType="map">
+        UPDATE ic_resi_collect
+        SET UPDATED_TIME = NOW(),
+        HOUSE_TYPE = #{houseType},
+        HOUSE_HOLER_NAME = #{houseHolderName},
+        TOTAL_RESI = #{totalResi}
+        WHERE
+            id = #{id}
+    </update>
 </mapper>