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

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/welcome/dto/WelcomeMediaDTO.java

@@ -23,6 +23,10 @@ public class WelcomeMediaDTO implements Serializable {
      */
     private String welcomeId;
     /**
+     * 小程序名称
+     */
+    private String miniProgramName;
+    /**
      * 媒体标题
      */
     private String mediaTitle;
@@ -84,6 +88,14 @@ public class WelcomeMediaDTO implements Serializable {
         this.mediaUrl = mediaUrl;
     }
 
+    public String getMiniProgramName() {
+        return miniProgramName;
+    }
+
+    public void setMiniProgramName(String miniProgramName) {
+        this.miniProgramName = miniProgramName;
+    }
+
     @Override
     public String toString() {
         return "WelcomeMediaDTO{" +

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/welcome/qdto/SaveWelcomeQDTO.java

@@ -41,7 +41,7 @@ public class SaveWelcomeQDTO implements Serializable {
     /**
      * 欢迎语媒体列表
      */
-    private List<SaveWelcomeMediaQDTO> mediaList;
+    private List<SaveWelcomeMediaQDTO> welcomeMediaList;
     /**
      * 适用部门新增列表
      */
@@ -107,12 +107,12 @@ public class SaveWelcomeQDTO implements Serializable {
         this.operatorName = operatorName;
     }
 
-    public List<SaveWelcomeMediaQDTO> getMediaList() {
-        return mediaList;
+    public List<SaveWelcomeMediaQDTO> getWelcomeMediaList() {
+        return welcomeMediaList;
     }
 
-    public void setMediaList(List<SaveWelcomeMediaQDTO> mediaList) {
-        this.mediaList = mediaList;
+    public void setWelcomeMediaList(List<SaveWelcomeMediaQDTO> welcomeMediaList) {
+        this.welcomeMediaList = welcomeMediaList;
     }
 
     public List<WelcomeSuitDepartmentDTO> getSuitDepartmentAddList() {
@@ -156,7 +156,6 @@ public class SaveWelcomeQDTO implements Serializable {
                 ", welcomeContent='" + welcomeContent + '\'' +
                 ", operatorId='" + operatorId + '\'' +
                 ", operatorName='" + operatorName + '\'' +
-                ", mediaList=" + mediaList +
                 ", suitDepartmentAddList=" + suitDepartmentAddList +
                 ", suitDepartmentDeleteList=" + suitDepartmentDeleteList +
                 ", suitStaffAddList=" + suitStaffAddList +

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/welcome/SaveWelcomeBO.java

@@ -36,7 +36,7 @@ public class SaveWelcomeBO {
     /**
      * 欢迎语媒体列表
      */
-    private List<SaveWelcomeMediaBO> mediaList;
+    private List<SaveWelcomeMediaBO> welcomeMediaList;
     /**
      * 适用部门新增列表
      */
@@ -86,12 +86,12 @@ public class SaveWelcomeBO {
         this.welcomeContent = welcomeContent;
     }
 
-    public List<SaveWelcomeMediaBO> getMediaList() {
-        return mediaList;
+    public List<SaveWelcomeMediaBO> getWelcomeMediaList() {
+        return welcomeMediaList;
     }
 
-    public void setMediaList(List<SaveWelcomeMediaBO> mediaList) {
-        this.mediaList = mediaList;
+    public void setWelcomeMediaList(List<SaveWelcomeMediaBO> welcomeMediaList) {
+        this.welcomeMediaList = welcomeMediaList;
     }
 
     public String getOperatorId() {
@@ -151,7 +151,6 @@ public class SaveWelcomeBO {
                 ", welcomeContent='" + welcomeContent + '\'' +
                 ", operatorId='" + operatorId + '\'' +
                 ", operatorName='" + operatorName + '\'' +
-                ", mediaList=" + mediaList +
                 ", suitDepartmentAddList=" + suitDepartmentAddList +
                 ", suitDepartmentDeleteList=" + suitDepartmentDeleteList +
                 ", suitStaffAddList=" + suitStaffAddList +

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WelcomeServiceImpl.java

@@ -125,6 +125,7 @@ public class WelcomeServiceImpl implements WelcomeService {
         welcome.setOpenFlag(1);
         welcome.setStatusFlag(1);
         welcome.setCreateTime(new Date());
+        welcome.setUpdateTime(new Date());
         welcome.setOperatorId(bo.getOperatorId());
         welcome.setOperatorName(bo.getOperatorName());
         welcomeMapper.insert(welcome);
@@ -141,10 +142,10 @@ public class WelcomeServiceImpl implements WelcomeService {
     }
 
     private void addWelcomeMedia(String welComeId, SaveWelcomeBO bo) {
-        if (CollectionUtils.isEmpty(bo.getMediaList())) {
+        if (CollectionUtils.isEmpty(bo.getWelcomeMediaList())) {
             return;
         }
-        List<TabHaobanWelcomeMedia> mediaList = bo.getMediaList().stream().map(one -> {
+        List<TabHaobanWelcomeMedia> mediaList = bo.getWelcomeMediaList().stream().map(one -> {
             TabHaobanWelcomeMedia media = new TabHaobanWelcomeMedia();
             media.setWelcomeMediaId(UniqueIdUtils.uniqueLong());
             media.setWxEnterpriseId(bo.getWxEnterpriseId());

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WelcomeApiServiceImpl.java

@@ -38,7 +38,7 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
         saveWelcomeBO.setOperatorId(qdto.getOperatorId());
         saveWelcomeBO.setOperatorName(qdto.getOperatorName());
         // 媒体列表
-        saveWelcomeBO.setMediaList(EntityUtil.changeEntityListNew(SaveWelcomeMediaBO.class, qdto.getMediaList()));
+        saveWelcomeBO.setWelcomeMediaList(EntityUtil.changeEntityListNew(SaveWelcomeMediaBO.class, qdto.getWelcomeMediaList()));
         // 适用部门新增列表
         saveWelcomeBO.setSuitDepartmentAddList(EntityUtil.changeEntityListNew(WelcomeSuitDepartmentBO.class, qdto.getSuitDepartmentAddList()));
         // 使用部门删除列表

haoban-manage3-service/src/main/resources/mapper/StaffDepartmentRelatedMapper.xml

@@ -338,8 +338,7 @@
     </foreach>
   </update>
 
-  <select id="listByWxEnterpriseIdAndStaffId"
-          resultType="com.gic.haoban.manage.service.entity.TabHaobanStaffDepartmentRelated">
+  <select id="listByWxEnterpriseIdAndStaffId" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
     from tab_haoban_staff_department_related

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WelcomeController.java

@@ -52,7 +52,7 @@ public class WelcomeController extends WebBaseController {
         qdto.setWxEnterpriseId(qo.getWxEnterpriseId());
         qdto.setTitle(qo.getTitle());
         qdto.setWelcomeContent(qo.getWelcomeContent());
-        qdto.setMediaList(EntityUtil.changeEntityListNew(SaveWelcomeMediaQDTO.class, qo.getMediaList()));
+        qdto.setWelcomeMediaList(EntityUtil.changeEntityListNew(SaveWelcomeMediaQDTO.class, qo.getWelcomeMediaList()));
         qdto.setOperatorId(login.getStaffDTO().getStaffId());
         qdto.setOperatorName(login.getStaffDTO().getStaffName());
         qdto.setSuitDepartmentAddList(qo.getSuitDepartmentAddList());

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/welcome/SaveWelcomeQO.java

@@ -37,7 +37,7 @@ public class SaveWelcomeQO implements Serializable {
     /**
      * 媒体列表
      */
-    private List<SaveWelcomeMediaQO> mediaList;
+    private List<SaveWelcomeMediaQO> welcomeMediaList;
     /**
      * 适用部门新增列表
      */
@@ -87,12 +87,12 @@ public class SaveWelcomeQO implements Serializable {
         this.welcomeContent = welcomeContent;
     }
 
-    public List<SaveWelcomeMediaQO> getMediaList() {
-        return mediaList;
+    public List<SaveWelcomeMediaQO> getWelcomeMediaList() {
+        return welcomeMediaList;
     }
 
-    public void setMediaList(List<SaveWelcomeMediaQO> mediaList) {
-        this.mediaList = mediaList;
+    public void setWelcomeMediaList(List<SaveWelcomeMediaQO> welcomeMediaList) {
+        this.welcomeMediaList = welcomeMediaList;
     }
 
     public List<WelcomeSuitDepartmentDTO> getSuitDepartmentAddList() {
@@ -134,7 +134,6 @@ public class SaveWelcomeQO implements Serializable {
                 ", wxEnterpriseId='" + wxEnterpriseId + '\'' +
                 ", title='" + title + '\'' +
                 ", welcomeContent='" + welcomeContent + '\'' +
-                ", mediaList=" + mediaList +
                 ", suitDepartmentAddList=" + suitDepartmentAddList +
                 ", suitDepartmentDeleteList=" + suitDepartmentDeleteList +
                 ", suitStaffAddList=" + suitStaffAddList +