工作流引入【未完全修复完毕】

adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java

@@ -3,6 +3,7 @@ package com.adc.da.sys.dao.mysql;
 import java.util.List;
 import java.util.Map;
 
+import com.adc.da.sys.vo.UserVO;
 import com.adc.da.sys.vo.ddm.DdmUserQueryVO;
 import com.adc.da.sys.vo.ddm.DdmUserVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -33,6 +34,8 @@ public interface UserEODao extends BaseMapper<UserEO> {
      */
     UserEO getUserWithRoles(String id);
 
+    List<UserVO> getUserByIdList(List<String> userIdList);
+
     // 根据account获取未逻辑删除的UserEO
     UserEO getUserEOByAccountNotDeleted(String account);
 
@@ -42,11 +45,6 @@ public interface UserEODao extends BaseMapper<UserEO> {
 
     int insertUserBatch(@Param("userEOList") List<UserEO> userEOList);
 
-    UserEO getDdmUserEOByAccountNotDeleted(String account);
-
     List<Map<String, Object>> allList( @Param("account") String account, @Param("roleName") String roleName);
 
-    List<UserEO> getUserByMail(@Param("mailList")  List<String> mailList);
-
-    List<UserEO> getUserByAccount(@Param("accountList") List<String> accountList);
 }

adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java

@@ -9,6 +9,7 @@ import com.adc.da.sys.entity.UserRoleEO;
 import com.adc.da.sys.service.iservice.IUserEoService;
 import com.adc.da.sys.util.EncryptUtil;
 import com.adc.da.sys.vo.UserImportVO;
+import com.adc.da.sys.vo.UserVO;
 import com.adc.da.sys.vo.ddm.DdmUserQueryVO;
 import com.adc.da.sys.vo.ddm.DdmUserVO;
 import com.adc.da.util.exception.AdcDaBaseException;
@@ -71,16 +72,6 @@ public class UserEOServiceImpl implements IUserEoService {
         return dao.selectOne(wrapper);
     }
 
-    @Override
-    public int getUserCountByEmail(String email, String usid) {
-        QueryWrapper<UserEO> wrapper = new QueryWrapper();
-        wrapper.eq("EMAIL", email).eq("DEL_FLAG", "0");
-        if (StringUtils.isNotEmpty(usid)) {
-            wrapper.ne("USID", usid);
-        }
-        return dao.selectCount(wrapper);
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(UserEO eo) {
@@ -145,6 +136,11 @@ public class UserEOServiceImpl implements IUserEoService {
         return userEO;
     }
 
+    @Override
+    public List<UserVO> getUserByIdList(List<String> userIdList){
+        return dao.getUserByIdList(userIdList);
+    }
+
     @Override
     public IPage<Map<String, Object>> list(int pageNo, int pageSize, String account, String roleName) {
         IPage page = new Page();
@@ -288,16 +284,6 @@ public class UserEOServiceImpl implements IUserEoService {
         return dao.allList(account,roleName);
     }
 
-    @Override
-    public List<UserEO> getUserByMail(List<String> mailList) {
-        return dao.getUserByMail(mailList);
-    }
-
-    @Override
-    public List<UserEO> getUserByAccount(List<String> accountList) {
-        return dao.getUserByAccount(accountList);
-    }
-
     void checkExcel(List<UserImportVO> list) {
         if (CollectionUtils.isEmpty(list)) {
             throw new AdcDaBaseException("数据不能为空");

adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java

@@ -2,6 +2,7 @@ package com.adc.da.sys.service.iservice;
 
 import com.adc.da.sys.entity.UserEO;
 import com.adc.da.sys.vo.UserImportVO;
+import com.adc.da.sys.vo.UserVO;
 import com.adc.da.sys.vo.ddm.DdmUserQueryVO;
 import com.adc.da.sys.vo.ddm.DdmUserVO;
 import com.adc.da.util.http.PageInfo;
@@ -24,14 +25,6 @@ public interface IUserEoService {
      */
     UserEO getUserByLoginName(String userName,String usid);
 
-    /**
-     * 根据邮箱和id查询用户数量
-     * @param email
-     * @param usid
-     * @return
-     */
-    int getUserCountByEmail(String email,String usid);
-
     /**
      * 新增或者编辑用户
      * @param eo
@@ -42,6 +35,8 @@ public interface IUserEoService {
 
     UserEO getUserById(String usid);
 
+    List<UserVO> getUserByIdList(List<String> userIdList);
+
     IPage<Map<String, Object>> list(int pageNo, int pageSize, String account, String roleName);
 
     void delete(String ids);
@@ -50,13 +45,8 @@ public interface IUserEoService {
 
     UserEO getUserByLoginNameNotDeleted(String userName);
 
-    public PageInfo<DdmUserVO> getUserPage(DdmUserQueryVO query);
-
     public void importExcelUser(List<UserImportVO> list);
 
     List<Map<String, Object>> allList(String account, String roleName);
 
-    List<UserEO> getUserByMail(List<String> mailList);
-
-    List<UserEO> getUserByAccount(List<String> mailList);
 }

adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java

@@ -38,15 +38,8 @@ public class UserVO {
      */
     private String email;
 
-
-
-
-    private String department;
-
-
     private String usname;
 
-
     /**
      * 角色ID列表
      */

adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml

@@ -116,24 +116,6 @@
 
     </insert>
 
-    <select id="getDdmUserEOByAccountNotDeleted" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select
-        <include refid="Base_Column_List"/>
-        from TS_USER where account = #{account} and del_flag != 1
-    </select>
-
-
-    <select id="getUserByMail" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select
-        <include refid="Base_Column_List"/>
-        from TS_USER
-        WHERE EMAIL in
-        <foreach collection="mailList" item="mail" open="(" separator="," close=")">
-            #{mail}
-        </foreach>
-
-    </select>
-
     <select id="allList" resultType="java.util.Map">
         select * from(select t1.USID,t1.ACCOUNT,t1.USNAME,t1.CELLPHONE_NUMBER,t1.EMAIL,t1.ISUSE,t1.DEPARTMENT,t3.NAME ROLENAME,t3.id ROLEID,
         date_format(t1.UPDATE_TIME,'%Y-%m-%d %H:%i:%S')CREATEDATE from TS_USER t1
@@ -150,15 +132,15 @@
         ORDER BY t1.UPDATE_TIME DESC)tt
 
     </select>
-    <select id="getUserByAccount" resultType="com.adc.da.sys.entity.UserEO">
-        select
-        ACCOUNT,USNAME,DEPARTMENT
-        from TS_USER
-        WHERE ACCOUNT in
-        <foreach collection="accountList" item="account" open="(" separator="," close=")">
-            #{account}
+
+    <select id="getUserByIdList" resultMap="com.adc.da.sys.vo.UserVO" parameterType="java.lang.String">
+        select users.usid, users.usname, users.account
+        from TS_USER users
+        where del_flag != 1
+        and users.usid in
+        <foreach collection="userIdList" item="id" open="(" separator="," close=")">
+            #{id}
         </foreach>
     </select>
 
-
 </mapper>

adc-da-sys/target/classes/dozer/dozer-mappings-ddm.xml

@@ -6,43 +6,6 @@
     <!--调用时依靠Controller 中
         @Resource private BeanMapper beanMapper 进行自动装配，然后调用相应方法进行匹配-->
 
-
-    <mapping>
-        <!--角色对应实体类-->
-        <class-a>com.adc.da.sys.entity.RoleEO</class-a>
-        <class-b>com.adc.da.sys.vo.ddm.DdmRoleVO</class-b>
-
-        <!--区别字段-->
-        <field>
-            <a>id</a>
-            <b>rid</b>
-        </field>
-        <field>
-            <a>name</a>
-            <b>roleName</b>
-        </field>
-        <field>
-            <a>name</a>
-            <b>roleCode</b>
-        </field>
-        <field>
-            <a>remarks</a>
-            <b>rdesc</b>
-        </field>
-        <field>
-            <a>delFlag</a>
-            <b>enabled</b>
-        </field>
-        <field>
-            <a>menuEOIdList</a>
-            <b>menusstr</b>
-        </field>
-        <field>
-            <a>menuEOList</a>
-            <b>menus</b>
-        </field>
-    </mapping>
-
     <mapping>
         <!--菜单对应实体类-->
         <class-a>com.adc.da.sys.entity.MenuEO</class-a>