Merge branch 'feature-wcz' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/service/AnnualInspectionService.java

@@ -199,6 +199,7 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
         liftHistory.setMtCompanyId(mtCompanyId);
         liftHistory.setLiftId(liftId);
         liftHistory.setCode(lift.getLiftCode());
+        liftHistory.setOperaItem("电梯年检时间");
         liftHistory.setDescription("修改电梯年检日期");
         liftHistory.setBeforeContent(String.format("%tF", oldInspectionDate));
         liftHistory.setAfterContent(String.format("%tF", nextInspectionTime));

lift-business-service/src/main/java/cn/com/ty/lift/business/framework/conf/BigDecimalDeserializer.java

@@ -5,18 +5,16 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonTokenId;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer;
-import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;
 import java.math.BigDecimal;
 
 /**
- * BigDecimal反序列化
+ * BigDecimal反序列化: 默认四舍五入保留两位小数
  *
  * @author wcz
  * @since 2020/4/26
  */
-@Slf4j
 public class BigDecimalDeserializer extends StdScalarDeserializer<BigDecimal> {
 
     public static final BigDecimalDeserializer instance = new BigDecimalDeserializer();

lift-business-service/src/main/java/cn/com/ty/lift/business/framework/conf/BigDecimalSerializer.java

@@ -15,7 +15,7 @@ import java.math.BigDecimal;
 import java.util.Objects;
 
 /**
- * BigDecimal序列化
+ * BigDecimal序列化: 默认四舍五入保留两位小数
  *
  * @author wcz
  * @since 2020/4/26
@@ -29,9 +29,9 @@ public class BigDecimalSerializer extends StdScalarSerializer<BigDecimal> implem
     }
 
     @Override
-    public JsonSerializer<?> createContextual(SerializerProvider prov,
+    public JsonSerializer<?> createContextual(SerializerProvider provider,
                                               BeanProperty property) throws JsonMappingException {
-        JsonFormat.Value format = findFormatOverrides(prov, property, handledType());
+        JsonFormat.Value format = findFormatOverrides(provider, property, handledType());
         if (format != null) {
             switch (format.getShape()) {
                 case STRING:

lift-common/src/main/java/cn.com.ty.lift.common/utils/ValuePool.java

@@ -273,6 +273,7 @@ public interface ValuePool {
     String   ATTEND_AM_DOWN_PM_TOP                    = "下午的上班(%tT)时间不得早于上午的下班(%tT)时间";
     String   ATTEND_PM_DOWN_OT_TOP                    = "加班的上班(%tT)时间不得早于下午的下班(%tT)时间";
     String   ATTEND_MAINTAIN_COMPANY_MISSING          = "维保公司不存在，请核查";
+    String   ATTEND_MISSING                           = "打卡记录不存在，请核查";
     //===================导入相关======================================
     String   EXCEL_IMPORT_DATA_MISSING                = "未解析到有效数据";
     String   EXCEL_IMPORT_FORMAT_SUPPORT              = "文件格式不支持，暂时只支持xls,xlsx";
@@ -283,7 +284,7 @@ public interface ValuePool {
     int      EXCEL_IMPORT_MAX_ROWS_ONETIME            = 5000;
     String   EXCEL_IMPORT_MAX_ROWS_DESC               = "一次性导入不能超过5000条数据";
 
-    static <T> T nullable(T object, T nullable) {
-        return Objects.isNull(object) ? nullable : object;
+    static <T> T nullable(T object, T valueForNull) {
+        return Objects.isNull(object) ? valueForNull : object;
     }
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/AttendanceController.java

@@ -123,29 +123,29 @@ public class AttendanceController {
 
         LocalTime topTimePm = request.getTopTimePm();
         LocalTime downTimePm = request.getDownTimePm();
-        boolean toppm = Objects.nonNull(topTimePm);
-        boolean downpm = Objects.nonNull(downTimePm);
-        boolean pm = toppm && downpm;
-        Validate.notTrue(toppm ^ downpm, ValuePool.ATTEND_SET_PM_TIME);
+        boolean topPm = Objects.nonNull(topTimePm);
+        boolean downPm = Objects.nonNull(downTimePm);
+        boolean pm = topPm && downPm;
+        Validate.notTrue(topPm ^ downPm, ValuePool.ATTEND_SET_PM_TIME);
         if (pm) {
             Validate.notTrue(topTimePm.isAfter(downTimePm), String.format(ValuePool.ATTEND_INVALID_PM_TIME, topTimePm, downTimePm));
         }
         //上午下班 < 下午上班
-        if (down && toppm) {
+        if (down && topPm) {
             Validate.notTrue(downTime.isAfter(topTimePm), String.format(ValuePool.ATTEND_AM_DOWN_PM_TOP, topTimePm, downTime));
         }
 
         LocalTime topTimeOt = request.getTopTimeOt();
         LocalTime downTimeOt = request.getDownTimeOt();
-        boolean topot = Objects.nonNull(topTimeOt);
-        boolean downot = Objects.nonNull(downTimeOt);
-        boolean ot = topot && downot;
-        Validate.notTrue(topot ^ downot, ValuePool.ATTEND_SET_OT_TIME);
+        boolean topOt = Objects.nonNull(topTimeOt);
+        boolean downOt = Objects.nonNull(downTimeOt);
+        boolean ot = topOt && downOt;
+        Validate.notTrue(topOt ^ downOt, ValuePool.ATTEND_SET_OT_TIME);
         if (ot) {
             Validate.notTrue(topTimeOt.isAfter(downTimeOt), String.format(ValuePool.ATTEND_INVALID_OT_TIME, topTimeOt, downTimeOt));
         }
         // 下午下班 < 加班上班
-        if (downpm && topot) {
+        if (downPm && topOt) {
             Validate.notTrue(downTimePm.isAfter(topTimeOt), String.format(ValuePool.ATTEND_PM_DOWN_OT_TOP, topTimeOt, downTimePm));
         }
         //三组时间至少设置一组
@@ -181,9 +181,11 @@ public class AttendanceController {
         Integer type = entity.getType();
         //先统计当天是否有对应的打卡记录
         Attendance same = attendanceService.sameByUserAndType(mtCompanyId, userId, type);
-        Validate.notTrue(Objects.nonNull(same), String.format(ValuePool.ATTEND_HAD_CLOCK, same.getCreateDate(), same.getCreateDate()));
+        if(Objects.nonNull(same)){
+            return RestResponse.fail(String.format(ValuePool.ATTEND_HAD_CLOCK, same.getCreateDate(), same.getCreateDate()));
+        }
         MaintenanceCompany maintenanceCompany = maintenanceCompanyService.getById(mtCompanyId);
-        Validate.notNull(maintenanceCompany, "维保公司不存在，请核查");
+        Validate.notNull(maintenanceCompany, ValuePool.ATTEND_MAINTAIN_COMPANY_MISSING);
 
         LocalTime now = LocalTime.now();
         //状态（是否迟到早退，0：否，1：是）
@@ -268,7 +270,7 @@ public class AttendanceController {
     public void export(@Val @RequestBody AttendanceRequest request, HttpServletResponse response) {
         log.info("headerAlias: {}", headerAlias);
         List<AttendanceResponse> attendances = attendanceService.listByIdList(request);
-        Validate.notNull(attendances, "打卡记录不存在，请核查");
+        Validate.notNull(attendances, ValuePool.ATTEND_MISSING);
         try {
             ExcelWriter writer = ExcelUtil.getWriter();
             //设置列别名