创建人

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

@@ -60,6 +60,24 @@ public class WelcomeDTO implements Serializable {
     
     private String creatorId ;
     private String creatorName ;
+    private String modifierId ;
+    private String modifierName ;
+
+    public String getModifierId() {
+        return modifierId;
+    }
+
+    public String getModifierName() {
+        return modifierName;
+    }
+
+    public void setModifierId(String modifierId) {
+        this.modifierId = modifierId;
+    }
+
+    public void setModifierName(String modifierName) {
+        this.modifierName = modifierName;
+    }
 
     public String getCreatorId() {
         return creatorId;

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

@@ -40,6 +40,8 @@ public class SaveWelcomeQDTO implements Serializable {
     private String operatorName;
     private String creatorId ;
     private String creatorName ;
+    private String modifierId ;
+    private String modifierName ;
     /**
      * 默认欢迎语标记 1是 0否  1 全体成员 0 部分成员
      */
@@ -65,6 +67,22 @@ public class SaveWelcomeQDTO implements Serializable {
      */
     private List<WelcomeSuitStaffDTO> suitStaffDeleteList;
 
+    public String getModifierId() {
+        return modifierId;
+    }
+
+    public String getModifierName() {
+        return modifierName;
+    }
+
+    public void setModifierId(String modifierId) {
+        this.modifierId = modifierId;
+    }
+
+    public void setModifierName(String modifierName) {
+        this.modifierName = modifierName;
+    }
+
     public String getCreatorId() {
         return creatorId;
     }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseApiService.java

@@ -151,12 +151,6 @@ public interface WxEnterpriseApiService {
     boolean delMiniprogramSettingByEid(String id);
 
     /**
-     * @param dto
-     * @return
-     */
-    boolean saveWelcome(WelcomeDTO dto);
-
-    /**
      * 获取欢迎语
      *
      * @param wxEnterpriseId

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabWelcome.java

@@ -74,6 +74,24 @@ public class TabWelcome implements Serializable {
     
     private String creatorId ;
     private String creatorName ;
+    private String modifierId ;
+    private String modifierName ;
+    
+    public String getModifierId() {
+        return modifierId;
+    }
+
+    public String getModifierName() {
+        return modifierName;
+    }
+
+    public void setModifierId(String modifierId) {
+        this.modifierId = modifierId;
+    }
+
+    public void setModifierName(String modifierName) {
+        this.modifierName = modifierName;
+    }
 
     public String getCreatorId() {
         return creatorId;

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

@@ -35,6 +35,8 @@ public class SaveWelcomeBO {
     private String operatorName;
     private String creatorId ;
     private String creatorName ;
+    private String modifierId ;
+    private String modifierName ;
     /**
      * 默认欢迎语标记 1是 0否  1 全体成员 0 部分成员
      */
@@ -60,6 +62,22 @@ public class SaveWelcomeBO {
      */
     private List<WelcomeSuitStaffBO> suitStaffDeleteList;
 
+    public String getModifierId() {
+        return modifierId;
+    }
+
+    public String getModifierName() {
+        return modifierName;
+    }
+
+    public void setModifierId(String modifierId) {
+        this.modifierId = modifierId;
+    }
+
+    public void setModifierName(String modifierName) {
+        this.modifierName = modifierName;
+    }
+
     public String getCreatorId() {
         return creatorId;
     }

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

@@ -138,6 +138,8 @@ public class WelcomeServiceImpl implements WelcomeService {
         welcome.setOperatorName(bo.getOperatorName());
         welcome.setCreatorId(bo.getCreatorId());
         welcome.setCreatorName(bo.getCreatorName());
+        welcome.setModifierId(bo.getModifierId());
+        welcome.setModifierName(bo.getModifierName());
         welcome.setDefaultWelcomeFlag(bo.getDefaultWelcomeFlag());
         welcomeMapper.insert(welcome);
         return welcome;

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

@@ -45,6 +45,8 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
         saveWelcomeBO.setDefaultWelcomeFlag(qdto.getDefaultWelcomeFlag());
         saveWelcomeBO.setCreatorId(qdto.getCreatorId());
         saveWelcomeBO.setCreatorName(qdto.getCreatorName());
+        saveWelcomeBO.setModifierId(qdto.getModifierId());
+        saveWelcomeBO.setModifierName(qdto.getModifierName());
         // 媒体列表
         saveWelcomeBO.setWelcomeMediaList(EntityUtil.changeEntityListNew(SaveWelcomeMediaBO.class, qdto.getWelcomeMediaList()));
         // 适用部门新增列表

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

@@ -268,33 +268,6 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         return true;
     }
 
-
-    @Override
-    public boolean saveWelcome(WelcomeDTO dto) {
-        TabWelcome tabWelcome = welcomeMapper.selectByWxEnterpriseId(dto.getWxEnterpriseId());
-        if (tabWelcome == null) {
-            tabWelcome = new TabWelcome();
-            tabWelcome.setTitle(dto.getTitle());
-            tabWelcome.setWelcomeContent(dto.getWelcomeContent());
-            tabWelcome.setWelcomeImg(dto.getWelcomeImg());
-            tabWelcome.setCreateTime(new Date());
-            tabWelcome.setUpdateTime(new Date());
-            tabWelcome.setStatusFlag(1);
-            tabWelcome.setOpenFlag(dto.getOpenFlag());
-            tabWelcome.setWxEnterpriseId(dto.getWxEnterpriseId());
-            tabWelcome.setWelcomeId(ToolUtil.randomUUID());
-            welcomeMapper.insert(tabWelcome);
-        } else {
-            tabWelcome.setTitle(dto.getTitle());
-            tabWelcome.setWelcomeContent(dto.getWelcomeContent());
-            tabWelcome.setWelcomeImg(dto.getWelcomeImg());
-            tabWelcome.setUpdateTime(new Date());
-            tabWelcome.setOpenFlag(dto.getOpenFlag());
-            welcomeMapper.updateByPrimaryKeySelective(tabWelcome);
-        }
-        return true;
-    }
-
     @Override
     public WelcomeDTO getWelcome(String wxEnterpriseId) {
         TabWelcome tabWelcome = welcomeMapper.selectByWxEnterpriseId(wxEnterpriseId);

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

@@ -16,12 +16,14 @@
         <result column="default_welcome_flag" jdbcType="INTEGER" property="defaultWelcomeFlag"/>
         <result column="creator_id" property="creatorId"/>
         <result column="creator_name" property="creatorName"/>
+        <result column="modifier_id" property="modifierId"/>
+        <result column="modifier_name" property="modifierName"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         welcome_id
         , wx_enterprise_id, title, welcome_content,welcome_img,open_flag, status_flag,
-        create_time, update_time, operator_id, operator_name, default_welcome_flag , creator_id , creator_name
+        create_time, update_time, operator_id, operator_name, default_welcome_flag , creator_id , creator_name , modifierId , modifierName
     </sql>
 
     <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
@@ -40,7 +42,7 @@
     <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabWelcome">
         insert into tab_haoban_welcome (welcome_id, wx_enterprise_id, title,
                                         welcome_content, welcome_img, open_flag, status_flag, create_time,
-                                        update_time, operator_id, operator_name, default_welcome_flag , creator_id , creator_name)
+                                        update_time, operator_id, operator_name, default_welcome_flag , creator_id , creator_name,modifier_id,modifier_name)
         values (#{welcomeId,jdbcType=VARCHAR},
                 #{wxEnterpriseId,jdbcType=VARCHAR},
                 #{title,jdbcType=VARCHAR},
@@ -52,7 +54,7 @@
                 #{updateTime,jdbcType=TIMESTAMP},
                 #{operatorId,jdbcType=VARCHAR},
                 #{operatorName,jdbcType=VARCHAR},
-                #{defaultWelcomeFlag,jdbcType=INTEGER} , #{creatorId} , #{creatorName}
+                #{defaultWelcomeFlag,jdbcType=INTEGER} , #{creatorId} , #{creatorName} , #{modifierId} , #{modifierName}
                 )
     </insert>
 
@@ -81,14 +83,20 @@
                 update_time = #{updateTime,jdbcType=TIMESTAMP},
             </if>
             <if test="operatorId != null">
-                operator_id = #{operatorId,jdbcType=TIMESTAMP},
+                operator_id = #{operatorId},
             </if>
             <if test="operatorName != null">
-                operator_name = #{operatorName,jdbcType=TIMESTAMP},
+                operator_name = #{operatorName},
             </if>
             <if test="defaultWelcomeFlag != null">
                 default_welcome_flag = #{defaultWelcomeFlag,jdbcType=INTEGER},
             </if>
+             <if test="modifierId != null">
+                modifier_id = #{modifierId},
+            </if>
+            <if test="modifierName != null">
+                modifier_name = #{modifierName},
+            </if>
         </set>
         where welcome_id = #{welcomeId,jdbcType=VARCHAR}
     </update>

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

@@ -235,7 +235,7 @@ public class LoginController extends WebBaseController {
         ClerkDTO clerk = clerkService.getUserByPhoneNumber(loginPhoneNumber, gicEnterpriseId);
         if (clerk == null) {
             logger.info("gic账号不存在,eid={},phone={}", gicEnterpriseId, loginPhoneNumber);
-            return "登录失败,gic账号不存在";
+            return "登录失败,gic账号不存在"+loginPhoneNumber;
         }
         EnterpriseDTO en = this.enterpriseService.getEnterpriseById(gicEnterpriseId) ;
         webLoginDTO.setLoginChannel(loginChannel);

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

@@ -74,8 +74,10 @@ public class WelcomeController extends WebBaseController {
         qdto.setSuitDepartmentAddList(qo.getSuitDepartmentAddList());
         qdto.setSuitDepartmentDeleteList(qo.getSuitDepartmentDeleteList());
         // 员工暂时不传
-        qdto.setCreatorId(login.getStaffId());
-        qdto.setCreatorName(login.getStaffName());
+        qdto.setCreatorId(login.getClerkId());
+        qdto.setCreatorName(login.getClerkFullName());
+        qdto.setModifierId(login.getClerkId());
+        qdto.setModifierName(login.getClerkFullName());
         ServiceResponse<Boolean> response = welcomeApiService.saveWelcome(qdto);
         return RestResponse.successResult(response.getResult());
     }

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

@@ -725,43 +725,6 @@ public class WxEnterpriseController extends WebBaseController {
     }
 
     /**
-     * 保存欢迎语
-     *
-     * @return
-     * @deprecated : 欢迎语功能统一迁移到 {@link WelcomeController}
-     */
-    @RequestMapping("save-welcome")
-    public HaobanResponse savewelcome(String title, String welcomeContent, String welcomeImg) {
-        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-        String wxEnterpriseId = loginUser.getWxEnterpriseId();
-        if (StringUtils.isAnyBlank(title, welcomeContent)) {
-            return resultResponse(HaoBanErrCode.ERR_2);
-        }
-        WelcomeDTO welcomeDTO = new WelcomeDTO();
-        welcomeDTO.setTitle(title);
-        welcomeDTO.setWelcomeContent(welcomeContent);
-        welcomeDTO.setWelcomeImg(welcomeImg);
-        welcomeDTO.setWxEnterpriseId(wxEnterpriseId);
-        welcomeDTO.setOpenFlag(1);
-        wxEnterpriseApiService.saveWelcome(welcomeDTO);
-        return resultResponse(HaoBanErrCode.ERR_1);
-    }
-
-    /**
-     * 欢迎语列表
-     *
-     * @return
-     * @deprecated : 欢迎语功能统一迁移到 {@link WelcomeController}
-     */
-    @RequestMapping("get-welcome")
-    public HaobanResponse getWelcome() {
-        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-        String wxEnterpriseId = loginUser.getWxEnterpriseId();
-        WelcomeDTO welcome = wxEnterpriseApiService.getWelcome(wxEnterpriseId);
-        return resultResponse(HaoBanErrCode.ERR_1, welcome);
-    }
-
-    /**
      * 删除欢迎语
      *
      * @return

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/WebLoginVO.java

@@ -20,8 +20,17 @@ public class WebLoginVO implements Serializable {
     private String phoneNumber;
     // 企业用户id(密文)
     private String wxOpenUseId;
-    
+    private String headImg ;
     private StaffVO staffDTO ;
+
+    public String getHeadImg() {
+        return headImg;
+    }
+
+    public void setHeadImg(String headImg) {
+        this.headImg = headImg;
+    }
+
     public StaffVO getStaffDTO() {
         return staffDTO;
     }