浏览代码

* 代码优化

顾绍勇 5 年前
父节点
当前提交
7a67df34e4

+ 1
- 1
src/main/java/com/huiju/estateagents/sample/controller/TaNoticeController.java 查看文件

148
                 return responseBean;
148
                 return responseBean;
149
             }
149
             }
150
             if (taNotice.getTargetId() != null) {
150
             if (taNotice.getTargetId() != null) {
151
-                TaH5Sample taH5Sample = iTaH5SampleService.getById(taNotice.getNoticeId());
151
+                TaH5Sample taH5Sample = iTaH5SampleService.getById(taNotice.getTargetId());
152
                 if (taH5Sample != null) {
152
                 if (taH5Sample != null) {
153
                     taNotice.setTargetName(taH5Sample.getSampleName());
153
                     taNotice.setTargetName(taH5Sample.getSampleName());
154
                 }
154
                 }

+ 14
- 0
src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java 查看文件

5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7
 import com.huiju.estateagents.base.ResponseBean;
7
 import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.center.taUser.entity.TaUser;
9
+import com.huiju.estateagents.center.taUser.service.impl.TaUserServiceImpl;
8
 import com.huiju.estateagents.common.CommConstant;
10
 import com.huiju.estateagents.common.CommConstant;
9
 import com.huiju.estateagents.common.StringUtils;
11
 import com.huiju.estateagents.common.StringUtils;
10
 import com.huiju.estateagents.entity.*;
12
 import com.huiju.estateagents.entity.*;
97
     @Autowired
99
     @Autowired
98
     private TaRaiseRecordMapper taRaiseRecordMapper;
100
     private TaRaiseRecordMapper taRaiseRecordMapper;
99
 
101
 
102
+    @Autowired
103
+    private TaUserServiceImpl taUserService;
104
+
100
     /**
105
     /**
101
      * 分页获取房源列表
106
      * 分页获取房源列表
102
      *
107
      *
671
         taRaiseRecordQueryWrapper.eq("raise_record_id", raiseRecordId);
676
         taRaiseRecordQueryWrapper.eq("raise_record_id", raiseRecordId);
672
         TaRaiseRecord raiseRecord = taRaiseRecordMapper.selectOne(taRaiseRecordQueryWrapper);
677
         TaRaiseRecord raiseRecord = taRaiseRecordMapper.selectOne(taRaiseRecordQueryWrapper);
673
 
678
 
679
+        TaUser taUser = taUserService.getUserInfoById(userId, orgId);
674
         // 更新为锁定状态
680
         // 更新为锁定状态
675
         if ("locked".equals(type)) {
681
         if ("locked".equals(type)) {
676
             // 校验当前房源状态
682
             // 校验当前房源状态
692
             TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
698
             TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
693
             taRaiseRecord.setRaiseRecordId(raiseRecordId);
699
             taRaiseRecord.setRaiseRecordId(raiseRecordId);
694
             taRaiseRecord.setHouseLockingStatus("locked");
700
             taRaiseRecord.setHouseLockingStatus("locked");
701
+            if(taUser != null){
702
+                taRaiseRecord.setUpdateUserName(taUser.getUserName());
703
+            }
704
+            taRaiseRecord.setUpdateDate(LocalDateTime.now());
695
             taRaiseRecordMapper.updateById(taRaiseRecord);
705
             taRaiseRecordMapper.updateById(taRaiseRecord);
696
 
706
 
697
             // 更新关联表状态
707
             // 更新关联表状态
723
             TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
733
             TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
724
             taRaiseRecord.setRaiseRecordId(raiseRecordId);
734
             taRaiseRecord.setRaiseRecordId(raiseRecordId);
725
             taRaiseRecord.setHouseLockingStatus("unlocked");
735
             taRaiseRecord.setHouseLockingStatus("unlocked");
736
+            if(taUser != null){
737
+                taRaiseRecord.setUpdateUserName(taUser.getUserName());
738
+            }
739
+            taRaiseRecord.setUpdateDate(LocalDateTime.now());
726
             taRaiseRecordMapper.updateById(taRaiseRecord);
740
             taRaiseRecordMapper.updateById(taRaiseRecord);
727
 
741
 
728
             // 更新关联表状态
742
             // 更新关联表状态