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

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java

@@ -45,6 +45,9 @@ public class IcPartyActDetailResDTO implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date holdTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date autoPublicTime;
+
     /**
      * 活动主题
      */
@@ -69,6 +72,8 @@ public class IcPartyActDetailResDTO implements Serializable {
      * 活动开始前几天
      */
     private Integer autoPublicType;
+
+    private String autoPublicTypeDesc;
     /**
      * 发布活动党组织
      */

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

@@ -278,6 +278,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg);
         }
         IcPartyActDetailResDTO resDTO=ConvertUtils.sourceToTarget(icPartyActEntity,IcPartyActDetailResDTO.class);
+        resDTO.setAutoPublicTypeDesc(icPartyActEntity.getAutoPublicType().compareTo(NumConstant.ZERO) != NumConstant.ZERO ? "活动开始前"+icPartyActEntity.getAutoPublicType()+"天" : "立即发布");
         resDTO.setIcPartyActId(icPartyActEntity.getId());
         resDTO.setActTypeName(baseDao.selectActTypeName(customerId,icPartyActEntity.getActType()));
         //参加人员类型，0：全体党员；1：支部委员

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

@@ -47,8 +47,8 @@
             WHEN pa.IS_AUTO_INFORM = '0' THEN '否'
             ELSE '否' END) AS isAutoInformValue,
             pa.IS_AUTO_INFORM as isAutoInform,
-            if(IS_AUTO_INFORM = '1',DATE_FORMAT(pa.AUTO_PUBLIC_TIME,'%Y-%m-%d %H:%i:%s'),'') AS autoPublicTime,
+            if(AUTO_PUBLIC_TYPE != 0,DATE_FORMAT(pa.AUTO_PUBLIC_TIME,'%Y-%m-%d %H:%i:%s'),'') AS autoPublicTime,
-            if(IS_AUTO_INFORM = '1',concat('活动开始前',pa.AUTO_PUBLIC_TYPE,'天'),'') as autoInformDay,
+            if(AUTO_PUBLIC_TYPE != 0,concat('活动开始前',pa.AUTO_PUBLIC_TYPE,'天'),'立即发布') as autoInformDay,
             DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') AS dateId,
             pa.ACT_TYPE AS type,
             (CASE WHEN pa.JOIN_USER_TYPE = '1' THEN '支部委员'