操作记录代码修改

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/service/SignInService.java

@@ -64,17 +64,18 @@ public class SignInService extends ServiceImpl<SignInMapper, SignIn> {
      * @date 2020/4/20 9:29 下午
      */
     public RestResponse signIn(CapitalRepairRequest request) {
-        SignIn signIn = getOne(request.getMtCompanyId(), request.getProjectId(), request.getUserId());
-        if (ObjectUtil.isNotEmpty(signIn)) {
-            String approachTime = signIn.getApproachTime();
-            String leavingTime = signIn.getLeavingTime();
+        SignIn oldSignIn = getOne(request.getMtCompanyId(), request.getProjectId(), request.getUserId());
+        if (ObjectUtil.isNotEmpty(oldSignIn)) {
+            String approachTime = oldSignIn.getApproachTime();
+            String leavingTime = oldSignIn.getLeavingTime();
             if (ObjectUtil.notEqual("--", approachTime) && ObjectUtil.notEqual("--", leavingTime)) {
                 //今日已签到
                 return RestResponse.success(null, MessageUtils.get("msg.sign.limit"));
             }
-            signIn.setLeavingTime(LocalTime.now().withNano(0).toString());
-            saveOrUpdate(signIn);
+            oldSignIn.setLeavingTime(LocalTime.now().withNano(0).toString());
+            saveOrUpdate(oldSignIn);
         } else {
+            SignIn signIn = new SignIn();
             signIn.setCoordinate(request.getCoordinate());
             signIn.setAddress(request.getAddress());
             signIn.setSignDate(LocalDate.now());

lift-business-service/src/main/java/cn/com/ty/lift/business/common/BeanUtils.java

@@ -44,7 +44,6 @@ public class BeanUtils {
         for (Map.Entry<String, Object> entry : oldResult.entrySet()) {
             Object oldValue = oldResult.get(entry.getKey());
             Object newValue = newResult.get(entry.getKey());
-            if (Objects.isNull(oldValue) && Objects.isNull(newValue)) continue;
             if (Objects.isNull(newValue)) continue;
             Class<?> cls = newEntry.getClass();
             Field field = cls.getDeclaredField(entry.getKey());
@@ -52,7 +51,11 @@ public class BeanUtils {
             FieldName fieldName = field.getDeclaredAnnotation(FieldName.class);
             boolean result = ObjectUtil.notEqual(oldValue, newValue);
             if (result) {
-                beforeBuilder.append(fieldName.name()).append(oldValue.toString());
+                if (ObjectUtil.isEmpty(oldValue)) {
+                    beforeBuilder.append(fieldName.name()).append("：").append("--");
+                } else {
+                    beforeBuilder.append(fieldName.name()).append("：").append(oldValue.toString());
+                }
                 afterBuilder.append(fieldName.name()).append(newValue.toString());
                 resultMap.put("before", beforeBuilder.toString());
                 resultMap.put("after", afterBuilder.toString());

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectService.java

@@ -243,6 +243,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
      * @description 修改项目
      * @date 2019/11/27 2:22 PM
      */
+    @Transactional(rollbackFor = Exception.class)
     public RestResponse modify(Project project) {
         Optional<Project> oldProject = getOne(project.getId());
         if (!oldProject.isPresent())