报表bug 修复

src/main/java/com/yunzhi/marketing/controller/TaBuildingController.java

@@ -8,10 +8,8 @@ import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
-import com.yunzhi.marketing.entity.TaBuilding;
-import com.yunzhi.marketing.entity.TaOrg;
-import com.yunzhi.marketing.entity.TaPerson;
-import com.yunzhi.marketing.entity.TaPersonBuilding;
+import com.yunzhi.marketing.entity.*;
+import com.yunzhi.marketing.mapper.TaBuildingApartmentMapper;
 import com.yunzhi.marketing.mapper.TaBuildingMapper;
 import com.yunzhi.marketing.mapper.TaOrgMapper;
 import com.yunzhi.marketing.reportCustomerAop.ReportCustomer;
@@ -68,6 +66,8 @@ public class TaBuildingController extends BaseController {
     @Autowired
     private ISceneLogService iSceneLogService;
 
+    @Autowired
+    TaBuildingApartmentMapper taBuildingApartmentMapper;
 
     /**
      * 楼盘详情
@@ -201,7 +201,11 @@ public class TaBuildingController extends BaseController {
     })
     @RequestMapping(value = "/admin/building/add", method = RequestMethod.POST)
     public ResponseBean buildingAdd(@RequestBody String parameter, HttpServletRequest request) {
-        return taBuildingService.buildingAdd(parameter, getOrgId(request), getUserId(request));
+        ResponseBean responseBean = taBuildingService.buildingAdd(parameter, getOrgId(request), getUserId(request));
+        JSONObject object = JSONObject.parseObject(parameter);
+        TaBuilding building = object.toJavaObject(TaBuilding.class);
+        iSceneLogService.saveLogs(getUserId(request),"building",building.getBuildingId());
+        return responseBean;
     }
 
     /**
@@ -216,7 +220,11 @@ public class TaBuildingController extends BaseController {
     })
     @RequestMapping(value = "/admin/building/update/status", method = RequestMethod.PUT)
     public ResponseBean buildingUpdateStatus(@RequestBody String parameter, HttpServletRequest request) {
-        return taBuildingService.buildingUpdateStatus(parameter, getOrgId(request));
+        ResponseBean responseBean = taBuildingService.buildingUpdateStatus(parameter, getOrgId(request));
+        JSONObject jsonobject = JSONObject.parseObject(parameter);
+        String id = jsonobject.getString("id");
+        iSceneLogService.saveLogs(getUserId(request),"building",id);
+        return responseBean;
     }
 
     /**
@@ -232,7 +240,9 @@ public class TaBuildingController extends BaseController {
     })
     @RequestMapping(value = "/admin/building/delete/{id}", method = RequestMethod.DELETE)
     public ResponseBean buildingdelete(@PathVariable("id") String id, HttpServletRequest request) {
-        return taBuildingService.buildingdelete(id, getOrgId(request));
+        ResponseBean buildingdelete = taBuildingService.buildingdelete(id, getOrgId(request));
+        iSceneLogService.saveLogs(getUserId(request),"building",id);
+        return buildingdelete;
     }
 
     /**
@@ -244,8 +254,11 @@ public class TaBuildingController extends BaseController {
      */
     @ApiOperation(value = "添加户型", notes = "添加户型")
     @RequestMapping(value = "/admin/buildingApartment/add", method = RequestMethod.POST)
-    public ResponseBean buildingApartment(@RequestBody String parameter, HttpSession session) {
-        return taBuildingService.buildingApartmentAdd(parameter);
+    public ResponseBean buildingApartment(@RequestBody String parameter, HttpSession session,HttpServletRequest request) {
+        ResponseBean responseBean = taBuildingService.buildingApartmentAdd(parameter);
+        TaBuildingApartment building = JSONObject.parseObject(parameter, TaBuildingApartment.class);
+        iSceneLogService.saveLogs(getUserId(request),"apartment",building.getBuildingId());
+        return responseBean;
     }
 
     /**
@@ -256,8 +269,11 @@ public class TaBuildingController extends BaseController {
      */
     @ApiOperation(value = "户型编辑", notes = "户型编辑")
     @RequestMapping(value = "/admin/buildingApartment/update", method = RequestMethod.PUT)
-    public ResponseBean buildingApartmentUpdate(@RequestBody String parameter) {
-        return taBuildingService.buildingApartmentUpdate(parameter);
+    public ResponseBean buildingApartmentUpdate(@RequestBody String parameter,HttpServletRequest request) {
+        ResponseBean responseBean = taBuildingService.buildingApartmentUpdate(parameter);
+        TaBuildingApartment building = JSONObject.parseObject(parameter, TaBuildingApartment.class);
+        iSceneLogService.saveLogs(getUserId(request),"apartment",building.getBuildingId());
+        return responseBean;
     }
 
     /**
@@ -426,8 +442,13 @@ public class TaBuildingController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/apartment/deleted/{id}", method = RequestMethod.DELETE)
-    public ResponseBean apartmentDeleted(@PathVariable(value = "id") String id) {
-        return taBuildingService.apartmentDel(id);
+    public ResponseBean apartmentDeleted(@PathVariable(value = "id") String id,HttpServletRequest request) {
+        ResponseBean responseBean = taBuildingService.apartmentDel(id);
+        QueryWrapper<TaBuildingApartment> buildingApartmentQueryWrapper = new QueryWrapper<>();
+        buildingApartmentQueryWrapper.eq("apartment_id", id);
+        TaBuildingApartment buildingApartment = taBuildingApartmentMapper.selectOne(buildingApartmentQueryWrapper);
+        iSceneLogService.saveLogs(getUserId(request),"apartment",buildingApartment.getBuildingId());
+        return responseBean;
     }
 
     /**
@@ -489,7 +510,7 @@ public class TaBuildingController extends BaseController {
 
     @ApiOperation(value = "admin - 解绑驻场人员", notes = "admin - 解绑驻场人员")
     @DeleteMapping(value = "/admin/marketing/{id}")
-    public  ResponseBean buildingDynamicFinish(@PathVariable String id) {
+    public  ResponseBean buildingDynamicFinish(@PathVariable String id,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         TaPersonBuilding taPersonBuilding = taPersonBuildingService.getById(id);
 
@@ -504,6 +525,7 @@ public class TaBuildingController extends BaseController {
                 // 成为驻场顾问并绑定楼盘
                 taPerson.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
                 iTaPersonService.updateById(taPerson);
+                iSceneLogService.saveLogs(getUserId(request),"marketing",taPersonBuilding.getBuildingId());
             }
 
             responseBean.addSuccess("解绑成功");

src/main/java/com/yunzhi/marketing/controller/TaBuildingPanoramaController.java

@@ -8,6 +8,7 @@ import com.yunzhi.marketing.entity.TaBuildingApartment;
 import com.yunzhi.marketing.entity.TaBuildingPanorama;
 import com.yunzhi.marketing.service.ITaBuildingApartmentService;
 import com.yunzhi.marketing.service.ITaBuildingPanoramaService;
+import com.yunzhi.marketing.xlk.service.ISceneLogService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +41,9 @@ public class TaBuildingPanoramaController extends BaseController {
     @Autowired
     private ITaBuildingApartmentService taBuildingApartmentService;
 
+    @Autowired
+    private ISceneLogService iSceneLogService;
+
     /**
      * 查询列表
      * @return
@@ -126,6 +130,7 @@ public class TaBuildingPanoramaController extends BaseController {
                 taBuildingPanorama.setContent(apartment.getApartmentName());
             }
             if (iTaBuildingPanoramaService.save(taBuildingPanorama)){
+                iSceneLogService.saveLogs(getUserId(request),"panorama",taBuildingPanorama.getBuildingId());
                 responseBean.addSuccess(taBuildingPanorama);
             }else {
                 responseBean.addError("fail");
@@ -144,13 +149,14 @@ public class TaBuildingPanoramaController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value="/admin/panorama/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taBuildingPanoramaDelete(@PathVariable Integer id){
+    public ResponseBean taBuildingPanoramaDelete(@PathVariable Integer id,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             TaBuildingPanorama taBuildingPanorama = new TaBuildingPanorama();
             taBuildingPanorama.setPanoramaId(id);
             taBuildingPanorama.setStatus(CommConstant.STATUS_UNACCALIMED);
             if(iTaBuildingPanoramaService.updateById(taBuildingPanorama)){
+                iSceneLogService.saveLogs(getUserId(request),"panorama",taBuildingPanorama.getBuildingId());
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");
@@ -171,11 +177,12 @@ public class TaBuildingPanoramaController extends BaseController {
      */
     @RequestMapping(value="/admin/panorama/{id}",method= RequestMethod.PUT)
     public ResponseBean taBuildingPanoramaUpdate(@PathVariable Integer id,
-                                        @RequestBody TaBuildingPanorama taBuildingPanorama){
+                                        @RequestBody TaBuildingPanorama taBuildingPanorama,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             taBuildingPanorama.setPanoramaId(id);
             if (iTaBuildingPanoramaService.updateById(taBuildingPanorama)){
+                iSceneLogService.saveLogs(getUserId(request),"panorama",taBuildingPanorama.getBuildingId());
                 responseBean.addSuccess(taBuildingPanorama);
             }else {
                 responseBean.addError("fail");

src/main/java/com/yunzhi/marketing/controller/TaPosterController.java

@@ -11,6 +11,7 @@ import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.entity.TaPoster;
 import com.yunzhi.marketing.service.ITaBuildingService;
 import com.yunzhi.marketing.service.TaPosterService;
+import com.yunzhi.marketing.xlk.service.ISceneLogService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +46,8 @@ public class TaPosterController extends BaseController {
     @Autowired
     private ITaBuildingService iTaBuildingService;
 
+    @Autowired
+    private ISceneLogService iSceneLogService;
 
     /**
      * 分页查询列表
@@ -91,6 +94,7 @@ public class TaPosterController extends BaseController {
                 // 为了兼容 小程序3.0 -> v3.4的后端
                 updateBuildingPoster(poster);
                 responseBean.addSuccess(poster);
+                iSceneLogService.saveLogs(getUserId(request),"poster",poster.getTargetId());
             } else {
                 responseBean.addError("fail");
             }
@@ -150,7 +154,7 @@ public class TaPosterController extends BaseController {
      */
     @RequestMapping(value = "/admin/poster/{id}", method = RequestMethod.PUT)
     public ResponseBean posterUpdate(@PathVariable Integer id,
-                                     @RequestBody TaPoster poster) {
+                                     @RequestBody TaPoster poster,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         poster.setPosterId(id);
         try {
@@ -159,6 +163,7 @@ public class TaPosterController extends BaseController {
                 // 为了兼容 小程序3.0 -> v3.4的后端
                 updateBuildingPoster(poster);
                 responseBean.addSuccess(poster);
+                iSceneLogService.saveLogs(getUserId(request),"poster",poster.getTargetId());
             } else {
                 responseBean.addError("fail");
             }

src/main/java/com/yunzhi/marketing/controller/TaShareContentController.java

@@ -8,6 +8,7 @@ import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.entity.TaShareContent;
 import com.yunzhi.marketing.service.TaShareContentService;
+import com.yunzhi.marketing.xlk.service.ISceneLogService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +40,8 @@ public class TaShareContentController extends BaseController {
     @Autowired
     public TaShareContentService iShareContentService;
 
+    @Autowired
+    private ISceneLogService iSceneLogService;
 
     /**
      * 分页查询列表
@@ -80,6 +83,7 @@ public class TaShareContentController extends BaseController {
             shareContent.setCreateDate(LocalDateTime.now());
             if (iShareContentService.save(shareContent)){
                 responseBean.addSuccess(shareContent);
+                iSceneLogService.saveLogs(getUserId(request),"shareContent",shareContent.getTargetId());
             }else {
                 responseBean.addError("fail");
             }
@@ -121,12 +125,13 @@ public class TaShareContentController extends BaseController {
      */
     @RequestMapping(value="/admin/shareContent/{id}",method= RequestMethod.PUT)
     public ResponseBean shareContentUpdate(@PathVariable Integer id,
-                                        @RequestBody TaShareContent shareContent){
+                                        @RequestBody TaShareContent shareContent,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         shareContent.setShareContentId(id);
         try {
             if (iShareContentService.updateById(shareContent)){
                 responseBean.addSuccess(shareContent);
+                iSceneLogService.saveLogs(getUserId(request),"shareContent",shareContent.getTargetId());
             }else {
                 responseBean.addError("fail");
             }

src/main/java/com/yunzhi/marketing/xlk/controller/BuildingChannelController.java

@@ -11,6 +11,7 @@ import com.yunzhi.marketing.xlk.dto.BuildingChannelDTO;
 import com.yunzhi.marketing.xlk.dto.MarkingChannelCustomerDTO;
 import com.yunzhi.marketing.xlk.entity.BuildingChannel;
 import com.yunzhi.marketing.xlk.service.IBuildingChannelService;
+import com.yunzhi.marketing.xlk.service.ISceneLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -49,6 +50,8 @@ public class BuildingChannelController extends BaseController {
     @Autowired
     private ITaBuildingService taBuildingService;
 
+    @Autowired
+    private ISceneLogService iSceneLogService;
     /**
      * 保存对象
      * @param buildingChannelDTO 实体对象
@@ -62,6 +65,7 @@ public class BuildingChannelController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             if (saveData(buildingChannelDTO, getOrgId(request))){
+                iSceneLogService.saveLogs(getUserId(request),"channel",buildingChannelDTO.getBuildingId());
                 responseBean.addSuccess("添加成功");
             }else {
                 responseBean.addError("fail");
@@ -91,6 +95,7 @@ public class BuildingChannelController extends BaseController {
 
             // 重新添加
             if (saveData(buildingChannelDTO, getOrgId(request))){
+                iSceneLogService.saveLogs(getUserId(request),"channel",buildingChannelDTO.getBuildingId());
                 responseBean.addSuccess("修改成功");
             }else {
                 responseBean.addError("fail");

src/main/java/com/yunzhi/marketing/xlk/controller/BuildingSpecialRoomController.java

@@ -10,6 +10,7 @@ import com.yunzhi.marketing.service.ITaBuildingService;
 import com.yunzhi.marketing.xlk.dto.BuildingSpecialRoomDTO;
 import com.yunzhi.marketing.xlk.entity.BuildingSpecialRoom;
 import com.yunzhi.marketing.xlk.service.IBuildingSpecialRoomService;
+import com.yunzhi.marketing.xlk.service.ISceneLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -42,6 +43,8 @@ public class BuildingSpecialRoomController extends BaseController {
     @Autowired
     public ITaBuildingService iTaBuildingService;
 
+    @Autowired
+    private ISceneLogService iSceneLogService;
 
     /**
      * 分页查询列表
@@ -105,6 +108,7 @@ public class BuildingSpecialRoomController extends BaseController {
             buildingSpecialRoom.setOrgId(orgId);
             buildingSpecialRoom.setCreateDate(LocalDateTime.now());
             if (iBuildingSpecialRoomService.save(buildingSpecialRoom)){
+                iSceneLogService.saveLogs(getUserId(request),"buildingSpecialRoom",buildingSpecialRoom.getBuildingId());
                 responseBean.addSuccess(buildingSpecialRoom);
             }else {
                 responseBean.addError("fail");
@@ -128,6 +132,8 @@ public class BuildingSpecialRoomController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             if(iBuildingSpecialRoomService.removeById(id)){
+                BuildingSpecialRoom buildingSpecialRoom = iBuildingSpecialRoomService.getById(id);
+                iSceneLogService.saveLogs(getUserId(request),"buildingSpecialRoom",buildingSpecialRoom.getBuildingId());
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");
@@ -156,6 +162,7 @@ public class BuildingSpecialRoomController extends BaseController {
             BeanUtils.copyProperties(buildingSpecialRoomDTO,buildingSpecialRoom);
             buildingSpecialRoom.setSpecialRoomId(id);
             if (iBuildingSpecialRoomService.updateById(buildingSpecialRoom)){
+                iSceneLogService.saveLogs(getUserId(request),"buildingSpecialRoom",buildingSpecialRoom.getBuildingId());
                 responseBean.addSuccess(buildingSpecialRoom);
             }else {
                 responseBean.addError("fail");

src/main/java/com/yunzhi/marketing/xlk/controller/TrendController.java

@@ -7,6 +7,7 @@ import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.xlk.dto.TrendDTO;
 import com.yunzhi.marketing.xlk.entity.Trend;
+import com.yunzhi.marketing.xlk.service.ISceneLogService;
 import com.yunzhi.marketing.xlk.service.ITrendService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -44,6 +45,8 @@ public class TrendController extends BaseController {
     @Autowired
     public ITrendService iTrendService;
 
+    @Autowired
+    private ISceneLogService iSceneLogService;
 
     /**
      * 分页查询列表
@@ -93,6 +96,7 @@ public class TrendController extends BaseController {
             trend.setOrgId(getOrgId(request));
             trend.setCreateDate(LocalDateTime.now());
             if (iTrendService.save(trend)){
+                iSceneLogService.saveLogs(getUserId(request),"trend",trend.getBuildingId());
                 responseBean.addSuccess(trend);
             }else {
                 responseBean.addError("fail");
@@ -116,6 +120,8 @@ public class TrendController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             if(iTrendService.removeById(id)){
+                Trend trend = iTrendService.getById(id);
+                iSceneLogService.saveLogs(getUserId(request),"trend",trend.getBuildingId());
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");
@@ -144,6 +150,7 @@ public class TrendController extends BaseController {
             BeanUtils.copyProperties(trendDTO,trend);
             trend.setTrendId(id);
             if (iTrendService.updateById(trend)){
+                iSceneLogService.saveLogs(getUserId(request),"trend",trend.getBuildingId());
                 responseBean.addSuccess(trend);
             }else {
                 responseBean.addError("fail");

src/main/resources/mapper/xlk/SceneLogMapper.xml

@@ -13,7 +13,6 @@
         FROM
             xlk_scene_log t
             LEFT JOIN ta_building b ON t.uuid = b.building_id
-            AND t.type = "building"
         WHERE
             1 = 1
         <if test="buildingId != null and buildingId != ''">