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

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartyMemberDTO.java

@@ -110,6 +110,21 @@ public class IcPartyMemberDTO implements Serializable {
      */
 	private String isDyzxh;
 
+    /**
+     * 入党时所在党支部
+     */
+    private String rdsszzb;
+
+    /**
+     * 组织关系转入社区时间
+     */
+    private String zzgxzrsqsj;
+
+    /**
+     * 是否请长假
+     */
+    private String isQcj;
+
     /**
      * 是否免学习0否,1是
      */

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/IcPartyMemberFromDTO.java

@@ -82,4 +82,8 @@ public class IcPartyMemberFromDTO extends PageFormDTO implements Serializable {
     private String payEndDate;
     private String year;
     private String month;
+    /**
+     * 是否请长假
+     */
+    private String isQcj;
 }

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

@@ -98,6 +98,21 @@ public class IcPartyMemberEntity extends BaseEpmetEntity {
      */
 	private String isDyzxh;
 
+	/**
+	 * 入党时所在党支部
+	 */
+	private String rdsszzb;
+
+	/**
+	 * 组织关系转入社区时间
+	 */
+	private String zzgxzrsqsj;
+
+	/**
+	 * 是否请长假
+	 */
+	private String isQcj;
+
     /**
      * 是否免学习0否,1是
      */

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/IcPartyMemberImportExcel.java

@@ -56,6 +56,15 @@ public class IcPartyMemberImportExcel {
     @ExcelProperty("文化程度")
     private String culture;
 
+    @ExcelProperty("入党时所在党支部")
+    private String rdsszzb;
+
+    @ExcelProperty("组织关系转入社区时间")
+    private String zzgxzrsqsj;
+
+    @ExcelProperty("是否请长假")
+    private String isQcj;
+
     @ExcelProperty("备注")
     private String remark;
 

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml

@@ -106,6 +106,9 @@
             <if test='null != isMxx and "" != isMxx.trim()'>
                 AND a.IS_MXX = #{isMxx}
             </if>
+            <if test='null != isQcj and "" != isQcj.trim()'>
+                AND a.IS_QCJ = #{isQcj}
+            </if>
             <if test='null != culture and "" != culture.trim()'>
                 AND a.CULTURE = #{culture}
             </if>

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

@@ -63,7 +63,6 @@ import com.epmet.dto.result.demand.IcResiDemandDictDTO;
 import com.epmet.dto.result.demand.OptionDTO;
 import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO;
 import com.epmet.entity.*;
-import com.epmet.excel.DataSyncRecordDisabilityExcel;
 import com.epmet.excel.EpidemicPreventionExportExcel;
 import com.epmet.excel.support.ExportResiUserItemDTO;
 import com.epmet.feign.*;
@@ -373,6 +372,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     partyMemberDTO.setPartyZw(hash.get("PARTY_ZW"));
                     partyMemberDTO.setIsTx(hash.get("IS_TX"));
                     partyMemberDTO.setIsDyzxh(hash.get("IS_DYZXH"));
+                    partyMemberDTO.setRdsszzb(hash.get("RDSSZZB"));
+                    partyMemberDTO.setZzgxzrsqsj(hash.get("ZZGXZRSQSJ"));
+                    partyMemberDTO.setIsQcj(hash.get("IS_QCJ"));
                 }
             }
             if ("ic_volunteer".equals(d.getTableName())) {
@@ -703,6 +705,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     partyMemberDTO.setPartyZw(hash.get("PARTY_ZW"));
                     partyMemberDTO.setIsTx(hash.get("IS_TX"));
                     partyMemberDTO.setIsDyzxh(hash.get("IS_DYZXH"));
+                    partyMemberDTO.setRdsszzb(hash.get("RDSSZZB"));
+                    partyMemberDTO.setZzgxzrsqsj(hash.get("ZZGXZRSQSJ"));
+                    partyMemberDTO.setIsQcj(hash.get("IS_QCJ"));
                 }
             }
             if ("ic_volunteer".equals(d.getTableName())) {