Merge remote-tracking branch 'origin/master'

wisenergy-common/src/main/java/cn/wisenergy/common/utils/exception/BASE_RESP_CODE_ENUM.java

@@ -65,6 +65,7 @@ public enum BASE_RESP_CODE_ENUM {
     HAVE_ORDER_DELETE("643", "有工单被用户删除，审批失败，请重新审批"),
     ORDER_EXAMINE("644","该工单已经被审批，请刷新查看"),
     NO_WORK_ORDERS_HAVE_BEEN_REJECTED("645", "暂无驳回未提交工单"),
+    LEAVE_JOB_USER("646","账号状态异常，请联系管理员")
     ;
 
 

wisenergy-model/src/main/java/cn/wisenergy/model/app/WorkTimeOrder.java

@@ -67,6 +67,7 @@ public class WorkTimeOrder implements Serializable {
 
     @ApiModelProperty(name = "modifyTime", value = "工单修改时间")
     private Date modifyTime;
+
     @ApiModelProperty(name = "rejectTime",value = "驳回时间")
     private Date rejectTime;
 

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

@@ -240,7 +240,7 @@ public class StatisticsServiceImpl implements StatisticsService {
         Date date = DateUtil.convertStrToDate(param.getYear() + "-" + param.getMonth(), "yyyy-MM");
         // 传参的时间当月总天数
         int dayCount = DateUtil.getMonthDaysArray(date).length;
-        // 导出的信息
+        // 需要导出的信息
         List<StatisticsTableDto> list = dayWorkTimeOfMonth.getList();
         // 创建工作簿
         HSSFWorkbook sheets = new HSSFWorkbook();
@@ -251,6 +251,7 @@ public class StatisticsServiceImpl implements StatisticsService {
         // 垂直、水平中心对齐
         cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
         cellStyle.setAlignment(HorizontalAlignment.CENTER);
+        // 自动换行
         cellStyle.setWrapText(true);
         // 第一列列宽
         sheet.setColumnWidth(1, EXCEL_WIDTH);

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

@@ -41,6 +41,9 @@ public class WorkUserServiceImpl implements WorkUserService {
 
     private static final String LOGIN_SOURCE = "PC";
 
+    // 用户在职状态码
+    private static final Integer ON_THE_JOB_STATUS = 1;
+
 
     @Override
     public WorkUser getById(Integer id) {
@@ -112,6 +115,9 @@ public class WorkUserServiceImpl implements WorkUserService {
         if (null == user) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.USER_LOGIN_NAME_OR_PASSWORD_IS_ERROR);
         }
+        if (user.getStatus() != ON_THE_JOB_STATUS) {
+            throw new BaseCustomException(BASE_RESP_CODE_ENUM.LEAVE_JOB_USER);
+        }
 /*
         if (user.getModifyTime() != user.getCreateTime()) {
             修改密码