优化代码结构

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkCollectMapper.java

@@ -3,6 +3,7 @@ package cn.wisenergy.mapper;
 import cn.wisenergy.model.app.WorkCollect;
 import cn.wisenergy.model.dto.CalendarDto;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
@@ -17,9 +18,9 @@ import java.util.List;
  */
 public interface WorkCollectMapper extends BaseMapper<WorkCollect> {
 
-    List<CalendarDto> getWorkMonth(Integer userId, Date workMonth);
+    List<CalendarDto> getWorkMonth(@Param("userId") Integer userId,@Param("workMonth") Date workMonth);
 
     int insertWorkCollect(WorkCollect workCollect);
 
-    int updateStatusOrTotalTime(Integer id, Integer status, Integer totalTime);
+    int updateStatusOrTotalTime(@Param("userId") Integer id,@Param("status") Integer status,@Param("totalTime") Integer totalTime);
 }

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkTimeOrderMapper.java

@@ -22,13 +22,13 @@ import java.util.Map;
 public interface WorkTimeOrderMapper extends BaseMapper<WorkTimeOrder> {
 
 
-    List<WorkTimeOrder> getByDay(Integer userId, Date workDay);
+    List<WorkTimeOrder> getByDay(@Param("userId") Integer userId,@Param("workDay") Date workDay);
 
     int save(WorkTimeOrder workTimeOrder);
 
     int updateByIds(@Param("reviewerId") Integer reviewerId, @Param("ids") List<Integer> ids);
 
-    int updateStatusById(Integer reviewerId, Integer id, String reason);
+    int updateStatusById(@Param("reviewerId") Integer reviewerId,@Param("id") Integer id,@Param("reason") String reason);
 
     List<WorkTimeOrder> queryByPage(@Param("status") Integer status, @Param("projectId") Integer projectId, @Param("types") List<Integer> types);
 

wisenergy-model/src/main/java/cn/wisenergy/model/dto/ResultUser.java

@@ -37,6 +37,9 @@ public class ResultUser implements Serializable {
     @ApiModelProperty(name = "email",value = "邮箱")
     private String email;
 
+    @ApiModelProperty(name = "level",value = "权限")
+    private Integer level;
+
     @ApiModelProperty(name = "role",value = "角色（产品、开发、测试、售前）")
     private String role;
 

wisenergy-model/src/main/java/cn/wisenergy/model/enums/ProjectTypeEnum.java

 package cn.wisenergy.model.enums;
 
 public enum ProjectTypeEnum {
-    PROJECT(0, "项目"),
-    BUSINESS_OPPORTUNITY(1,"商机");
+    PROJECT(1, "项目"),
+    BUSINESS_OPPORTUNITY(2,"商机");
 
     private Integer code;
     private String msg;

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkUserServiceImpl.java

@@ -96,11 +96,11 @@ public class WorkUserServiceImpl implements WorkUserService {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
         //MD5加密
-        String md5Password = Md5Util.digestMD5(password);
+       /* String md5Password = Md5Util.digestMD5(password);*/
 
         HashMap<String, Object> map = new HashMap<>();
         map.put("loginName", loginName);
-        map.put("password", md5Password);
+        map.put("password", password);
         WorkUser user = workUserMapper.getUserInfo(map);
         if (null == user) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.USER_LOGIN_NAME_OR_PASSWORD_IS_ERROR);