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

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

@@ -229,7 +229,14 @@ public class BusinessOpportunityController {
         bOservice.getAndTransfer(bo, user);
         return msg;
     }
-    @RequestMapping("saveContactsId")
+    @RequestMapping("saveReason")
+    public Object saveReason(BusinessOpportunity bo, HttpServletRequest request) {
+        User user = userMapper.selectById(request.getHeader("Token"));
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.setMsg("操作成功");
+        bOservice.saveReason(bo, user);
+        return msg;
+    } @RequestMapping("saveContactsId")
     public Object saveContactsId(BusinessOpportunity bo, HttpServletRequest request) {
         User user = userMapper.selectById(request.getHeader("Token"));
         HttpRespMsg msg = new HttpRespMsg();

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/BusinessOpportunity.java

@@ -51,6 +51,11 @@ public class BusinessOpportunity extends Model<BusinessOpportunity> {
      */
     @TableField("contacts_id")
     private Integer contactsId;
+    /**
+     * 赢单\输单 理由
+     */
+    @TableField("reason")
+    private String reason;
     @TableField(exist = false)
     private String contactsName;
 

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

@@ -63,4 +63,6 @@ public interface BusinessOpportunityService extends IService<BusinessOpportunity
     HttpRespMsg importData(MultipartFile multipartFile);
 
     void saveContactsId(BusinessOpportunity bo, User user);
+
+    void saveReason(BusinessOpportunity bo, User user);
 }

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

@@ -575,6 +575,17 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
         actionLogMapper.insert(al);
     }
 
+    @Override
+    public void saveReason(BusinessOpportunity bo, User user) {
+        bOMapper.update(bo, new UpdateWrapper<BusinessOpportunity>().eq("id", bo.getId()).set("reason", bo.getReason()));
+        ActionLog al = new ActionLog();
+        al.setCode("business");
+        al.setName("编辑了 结束理由");
+        al.setUserId(user.getId());
+        al.setItemId(bo.getId());
+        actionLogMapper.insert(al);
+    }
+
 
     private BusinessOpportunity setNull(BusinessOpportunity bo) {
         if (bo.getPlate1() == "") {

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

@@ -5663,19 +5663,30 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     }
                 }
                 Department finalDept = dept;
-                Optional<User> manager = userList.stream().filter(u -> u.getId().equals(finalDept.getManagerId())).findFirst();
+
+                String managerName = null;
+                if (finalDept != null) {
+                    User manageUser = null;
+                    Optional<User> manager = userList.stream().filter(u -> u.getId().equals(finalDept.getManagerId())).findFirst();
+                    if (manager.isPresent()) {
+                        manageUser = manager.get();
+                    }
+                    if (manageUser != null) {
+                        managerName = manageUser.getName();
+                    }
+                }
                 if(needCorpWxTranslate){
                     item.add("$userName="+(map.get("corpwxUserId")==null?"":map.get("corpwxUserId"))+"$");
                     item.add(departmentService.exportWxDepartment(dept,departments));
-                    item.add(manager.isPresent()?("$userName="+manager.get().getName()+"$"):"");
+                    item.add(managerName != null?("$userName="+managerName+"$"):"");
                 }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                     item.add("$userName="+(map.get("name")==null?"":map.get("name"))+"$");
                     item.add(departmentService.exportDdDepartment(dept,departments));
-                    item.add(manager.isPresent()?("$userName="+manager.get().getName()+"$"):"");
+                    item.add(managerName != null?("$userName="+managerName+"$"):"");
                 }else  {
                     item.add((String) map.get("name"));
                     item.add(departmentService.getSupDepartment(dept,departments));
-                    item.add(manager.isPresent()?manager.get().getName():"");
+                    item.add(managerName != null?managerName:"");
                 }
                 item.add((String) map.get("projectCode"));
                 item.add((String) map.get("project"));

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -896,8 +896,7 @@
         FROM user
         left join report on user.id = report.creator_id
         left join department on department.department_id = user.department_id
-        WHERE (report.state = 0 or report.state = 1)
-        and user.company_id = #{companyId} and (user.is_active=1 or(user.is_active=0 and user.inactive_date>=#{startDate}))
+        WHERE user.company_id = #{companyId} and (user.is_active=1 or(user.is_active=0 and user.inactive_date>=#{startDate}))
         <if test="deptIds != null">
             AND ((user.department_id in
             <foreach collection="deptIds" separator="," index="index" item="item" close=")" open="(">