党员活动列表时间加一个格式化

huanghongfa

2021-01-13 1915939a3dda1ededa888238ec7310c312348122

党员活动列表时间加一个格式化

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -23,7 +23,9 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -110,13 +112,13 @@
      </set>
    </option>
  </component>
  <component name="RunManager" selected="Application.RealNameUtil">
    <configuration name="CommonApi" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
      <option name="MAIN_CLASS_NAME" value="com.panzhihua.applets.api.CommonApi" />
      <module name="applets" />
  <component name="RunManager" selected="Application.ComBpActivityServiceImpl">
    <configuration name="ComBpActivityServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
      <option name="MAIN_CLASS_NAME" value="com.panzhihua.service_dangjian.service.impl.ComBpActivityServiceImpl" />
      <module name="service_partybuilding" />
      <extension name="coverage">
        <pattern>
          <option name="PATTERN" value="com.panzhihua.applets.api.*" />
          <option name="PATTERN" value="com.panzhihua.service_dangjian.service.impl.*" />
          <option name="ENABLED" value="true" />
        </pattern>
      </extension>
@@ -124,12 +126,12 @@
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="HanyuPinyinHelper" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
      <option name="MAIN_CLASS_NAME" value="com.panzhihua.common.service.HanyuPinyinHelper" />
      <module name="common" />
    <configuration name="CommonApi" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
      <option name="MAIN_CLASS_NAME" value="com.panzhihua.applets.api.CommonApi" />
      <module name="applets" />
      <extension name="coverage">
        <pattern>
          <option name="PATTERN" value="com.panzhihua.common.service.*" />
          <option name="PATTERN" value="com.panzhihua.applets.api.*" />
          <option name="ENABLED" value="true" />
        </pattern>
      </extension>
@@ -258,7 +260,6 @@
      </method>
    </configuration>
    <list>
      <item itemvalue="Application.HanyuPinyinHelper" />
      <item itemvalue="Application.IPUtil" />
      <item itemvalue="Application.UserServiceImpl" />
      <item itemvalue="Application.CommonApi" />
@@ -273,14 +274,15 @@
      <item itemvalue="Spring Boot.ServiceUserApplication" />
      <item itemvalue="Spring Boot.ZuulApplication" />
      <item itemvalue="Spring Boot.ServiceCommunityApplication" />
      <item itemvalue="Application.ComBpActivityServiceImpl" />
    </list>
    <recent_temporary>
      <list>
        <item itemvalue="Application.ComBpActivityServiceImpl" />
        <item itemvalue="Application.RealNameUtil" />
        <item itemvalue="Application.CommonApi" />
        <item itemvalue="Application.UserServiceImpl" />
        <item itemvalue="Application.IPUtil" />
        <item itemvalue="Application.HanyuPinyinHelper" />
      </list>
    </recent_temporary>
  </component>
@@ -389,7 +391,7 @@
      <workItem from="1610326930387" duration="5497000" />
      <workItem from="1610368400707" duration="771000" />
      <workItem from="1610415637750" duration="6485000" />
      <workItem from="1610499071420" duration="10065000" />
      <workItem from="1610499071420" duration="11040000" />
    </task>
    <servers />
  </component>
@@ -441,54 +443,54 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610368574903" />
    <state width="1031" height="544" key="GridCell.Tab.0.bottom" timestamp="1610526998051">
    <state width="1031" height="544" key="GridCell.Tab.0.bottom" timestamp="1610529000823">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.0.center" timestamp="1610526998051">
    <state width="1031" height="544" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610529000823" />
    <state width="1031" height="544" key="GridCell.Tab.0.center" timestamp="1610529000823">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.0.left" timestamp="1610526998051">
    <state width="1031" height="544" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610529000823" />
    <state width="1031" height="544" key="GridCell.Tab.0.left" timestamp="1610529000823">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.0.right" timestamp="1610526998051">
    <state width="1031" height="544" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610529000823" />
    <state width="1031" height="544" key="GridCell.Tab.0.right" timestamp="1610529000823">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.1.bottom" timestamp="1610526998051">
    <state width="1031" height="544" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610529000823" />
    <state width="1031" height="544" key="GridCell.Tab.1.bottom" timestamp="1610529000823">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.1.center" timestamp="1610526998051">
    <state width="1031" height="544" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610529000823" />
    <state width="1031" height="544" key="GridCell.Tab.1.center" timestamp="1610529000823">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.1.left" timestamp="1610526998051">
    <state width="1031" height="544" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610529000823" />
    <state width="1031" height="544" key="GridCell.Tab.1.left" timestamp="1610529000823">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.1.right" timestamp="1610526998051">
    <state width="1031" height="544" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610529000823" />
    <state width="1031" height="544" key="GridCell.Tab.1.right" timestamp="1610529000823">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.2.bottom" timestamp="1610526998051">
    <state width="1031" height="544" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610529000823" />
    <state width="1031" height="544" key="GridCell.Tab.2.bottom" timestamp="1610529000824">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.2.center" timestamp="1610526998051">
    <state width="1031" height="544" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610529000824" />
    <state width="1031" height="544" key="GridCell.Tab.2.center" timestamp="1610529000824">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.2.left" timestamp="1610526998051">
    <state width="1031" height="544" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610529000824" />
    <state width="1031" height="544" key="GridCell.Tab.2.left" timestamp="1610529000824">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.2.right" timestamp="1610526998051">
    <state width="1031" height="544" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610529000824" />
    <state width="1031" height="544" key="GridCell.Tab.2.right" timestamp="1610529000824">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610526998051" />
    <state width="1031" height="544" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610529000824" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610072873414">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -509,10 +511,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1609226181026" />
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610528305570">
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610529035673">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610528305570" />
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610529035673" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java

@@ -41,6 +41,8 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("活动开始时间")
    private Date activityTimeBegin;
    @ApiModelProperty("活动开始时间-格式化后的")
    private String activityTimeBeginFormat;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @ApiModelProperty("活动结束时间")
    private Date activityTimeEnd;

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java

@@ -23,6 +23,8 @@
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

@@ -214,6 +216,16 @@
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<PartyBuildingActivityVO> iPage = comBpActivityDAO.pageActivity(page, partyBuildingActivityVO);
        List<PartyBuildingActivityVO> records = iPage.getRecords();
        if (!ObjectUtils.isEmpty(records)) {
            DateFormat formatTo = new SimpleDateFormat("M月d ahh:mm");
            records.forEach(partyBuildingActivityVO1 -> {
                Date activityTimeBegin = partyBuildingActivityVO1.getActivityTimeBegin();
                if (!ObjectUtils.isEmpty(activityTimeBegin)) {
                    partyBuildingActivityVO1.setActivityTimeBeginFormat(formatTo.format(activityTimeBegin));
                }
            });
        }
        return R.ok(iPage);
    }

@@ -386,5 +398,10 @@
        return R.ok();
    }

    public static void main(String[] args) {
        DateFormat formatTo = new SimpleDateFormat("M月d ahh:mm");
        String format = formatTo.format(new Date());
        System.out.println(format);
    }

}