添加资产编号

pcbms/src/main/java/com/hssx/pcbms/controller/UserController.java

@@ -6,6 +6,7 @@ import com.hssx.pcbms.entity.User;
 import com.hssx.pcbms.entity.vo.UserVO;
 import com.hssx.pcbms.service.UserService;
 import com.hssx.pcbms.util.HttpRespMsg;
+import com.hssx.pcbms.util.PageUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.axis.client.Call;
@@ -71,15 +72,15 @@ public class UserController {
 
     /**
      * 用户列表
-     * 参数：deptId 部门id ,roleName 备注（角色）名称,isPass 审核是否通过 0-未通过 1-通过（以上参数查什么传什么）
-     *
+     * 参数：deptId 部门id ,
+     *      pageNum:当前页，pageSize：每页多少条
      * @return
      */
     @ApiOperation(value = "用户列表", notes = "用户列表方法")
     @RequestMapping("/list")
     @ResponseBody
-    public HttpRespMsg list(UserVO userVO) {
-        HttpRespMsg msg = userService.getList(userVO);
+    public HttpRespMsg list(UserVO userVO, PageUtil page) {
+        HttpRespMsg msg = userService.getList(userVO,page);
         return msg;
     }
 

pcbms/src/main/java/com/hssx/pcbms/entity/vo/UserVO.java

@@ -1,9 +1,6 @@
 package com.hssx.pcbms.entity.vo;
 
-import com.hssx.pcbms.entity.Permission;
-import com.hssx.pcbms.entity.SysFunction;
-import com.hssx.pcbms.entity.SysRole;
-import com.hssx.pcbms.entity.User;
+import com.hssx.pcbms.entity.*;
 import lombok.Data;
 
 import java.util.List;
@@ -18,4 +15,6 @@ import java.util.List;
 public class UserVO extends User {
     private List<SysFunction> functions;
     private List<SysRole> roles;
+    private Score score;
+    private String roleName;
 }

pcbms/src/main/java/com/hssx/pcbms/mapper/UserMapper.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hssx.pcbms.entity.vo.UserVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -16,4 +18,6 @@ import org.apache.ibatis.annotations.Param;
 public interface UserMapper extends BaseMapper<User> {
 
     UserVO selectUserRolesAndPermisssuons(@Param("user") User systemUser);
+
+    List<UserVO> selectListByCondition(@Param("userVO") UserVO userVO);
 }

pcbms/src/main/java/com/hssx/pcbms/service/UserService.java

@@ -4,6 +4,7 @@ import com.hssx.pcbms.entity.User;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.pcbms.entity.vo.UserVO;
 import com.hssx.pcbms.util.HttpRespMsg;
+import com.hssx.pcbms.util.PageUtil;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -22,7 +23,7 @@ public interface UserService extends IService<User> {
 
     HttpRespMsg regist(User user,String code);
 
-    HttpRespMsg getList(UserVO userVO);
+    HttpRespMsg getList(UserVO userVO,PageUtil page);
 
     HttpRespMsg updateUser(User user,MultipartFile file);
 

pcbms/src/main/java/com/hssx/pcbms/service/impl/UserServiceImpl.java

@@ -6,10 +6,7 @@ import com.hssx.pcbms.entity.vo.UserVO;
 import com.hssx.pcbms.mapper.*;
 import com.hssx.pcbms.service.UserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hssx.pcbms.util.HttpRespMsg;
-import com.hssx.pcbms.util.ListUtil;
-import com.hssx.pcbms.util.MD5Util;
-import com.hssx.pcbms.util.UploadFileToFileNameUtil;
+import com.hssx.pcbms.util.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -104,12 +101,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     }
 
     @Override
-    public HttpRespMsg getList(UserVO userVO) {
+    public HttpRespMsg getList(UserVO userVO,PageUtil page) {
         HttpRespMsg msg = new HttpRespMsg();
-        User user = new User();
-        BeanUtils.copyProperties(userVO, user);
-        List<User> users = userMapper.selectList(new QueryWrapper<User>(user));
-        msg.data = users;
+        List<UserVO> list = userMapper.selectListByCondition(userVO);
+        msg.data = list;
         return msg;
     }
 

pcbms/src/main/resources/mapper/MaintainRecordMapper.xml

@@ -37,7 +37,7 @@
         mr.id, mr.goods_id, mr.goods_no_id, mr.operator, mr.operator_phone, mr.company, mr.company_phone, mr.indate,mr.model_no
     from
         maintain_record mr
-    where gn.goods_id = #{goods.id,jdbcType=INTEGER}
+    where mr.goods_id = #{goods.id,jdbcType=INTEGER}
     order by mr.indate desc
 </select>
 

pcbms/src/main/resources/mapper/OperateRecordMapper.xml

@@ -40,7 +40,7 @@
     from
         operate_record ore
     where
-        go.goods_id = #{goods.id}
+        ore.goods_id = #{goods.id}
     order by ore.indate desc
 </select>
 

pcbms/src/main/resources/mapper/UserMapper.xml

@@ -23,10 +23,40 @@
         <result column="xing_zhi" property="xingZhi" />
         <result column="key_code" property="keyCode" />
     </resultMap>
+    <resultMap id="BaseResultMapVO" type="com.hssx.pcbms.entity.vo.UserVO">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="phone" property="phone" />
+        <result column="dept_id" property="deptId" />
+        <result column="role_name" property="roleName" />
+        <association property="score" resultMap="BaseResultMapScore">
+        </association>
+    </resultMap>
+
+    <resultMap id="BaseResultMapScore" type="com.hssx.pcbms.entity.Score">
+        <id column="score_id" property="scoreId" />
+        <result column="personal_score" property="personalScore" />
+        <result column="idea_score" property="ideaScore" />
+        <result column="total" property="total" />
+        <result column="reason" property="reason" />
+        <result column="rater_id" property="raterId" />
+        <result column="rater" property="rater" />
+        <result column="uid" property="uid" />
+        <result column="scoring_year_month" property="scoringYearMonth" />
+    </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, head_url, name, phone, dept_id, is_pass, indate, password, role_name, email, sex, birthday, office_phone, job_title, login_name, login_password, xing_zhi, key_code
     </sql>
-
+    <select id="selectListByCondition" resultMap="BaseResultMapVO">
+        SELECT
+            u.id,  u.name, u.phone, u.dept_id,sr.rolename role_name,(SELECT total FROM score  WHERE uid = u.id AND scoring_year_month = DATE_FORMAT(NOW(),'%Y-%m')) total
+        FROM
+            USER u
+        LEFT JOIN user_role ur
+        ON u.id = ur.user_id
+        LEFT JOIN sys_role sr
+        ON sr.id = ur.role_id
+    </select>
 </mapper>