Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/CustomController.java

@@ -52,7 +52,12 @@ public class CustomController {
     @RequestMapping("getInfo")
     public HttpRespMsg getInfo(Custom custom , HttpServletRequest request){
         return customService.getInfo(custom,request);
+    } @RequestMapping("getLog")
+    public HttpRespMsg getLog(Custom custom , HttpServletRequest request){
+        return customService.getInfo(custom,request);
     }
+
+
     // 批量放入回收站
     @RequestMapping("deleter")
     public Object delete(Custom custom) {

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/CustomService.java

@@ -30,6 +30,7 @@ public interface CustomService extends IService<Custom> {
     void getAndTransfer(Custom custom, User user);
 
     HttpRespMsg getInfo(Custom custom, HttpServletRequest request);
+//    HttpRespMsg getLog(Custom custom, HttpServletRequest request);
 
     HttpRespMsg getList(Custom custom, HttpServletRequest request);
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/CustomServiceImpl.java

@@ -166,8 +166,11 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
     public HttpRespMsg getInfo(Custom custom, HttpServletRequest request) {
         Custom custom1 = customMapper.getInfo(custom.getId());
 
+        // 附件列表
         custom1.setFiles(uploadFileMapper.selectList(new QueryWrapper<UploadFile>().eq("code", "custom").eq("item_id",custom1.getId())));
+        //商机列表
         custom1.setBusinessOpportunitys(businessOpportunityMapper.selectList(new QueryWrapper<BusinessOpportunity>().eq("customer_id",custom1.getId())));
+        //操作记录
         custom1.setActionLogs(actionLogMapper.selectList(new QueryWrapper<ActionLog>().eq("code","custom").eq("item_id",custom1.getId())));
         List<CustomItemContacts> contacts = customItemContactsMapper.selectList(new QueryWrapper<CustomItemContacts>().eq("contacts_id", custom1.getId()));
         List<Integer> ids = new ArrayList<>();
@@ -182,6 +185,14 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
         return httpRespMsg;
     }
 
+//    @Override
+//    public HttpRespMsg getLog(Custom custom, HttpServletRequest request) {
+//        List<ActionLog> actionLogs = actionLogMapper.selectList(new QueryWrapper<ActionLog>().eq("code", "custom").eq("item_id", custom.getId()));
+//        HttpRespMsg httpRespMsg = new HttpRespMsg();
+//        httpRespMsg.setData(actionLogs);
+//        return httpRespMsg;
+//    }
+
     @Override
     public HttpRespMsg getList(Custom custom, HttpServletRequest request) {
         User user = userMapper.selectById(request.getHeader("Token"));