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

@@ -2,15 +2,13 @@ package com.management.platform.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.BusinessOpportunity;
-import com.management.platform.entity.Clue;
-import com.management.platform.entity.Stage;
-import com.management.platform.entity.User;
+import com.management.platform.entity.*;
 import com.management.platform.mapper.BusinessOpportunityMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.BusinessOpportunityService;
 import com.management.platform.service.StageService;
 import com.management.platform.service.SysFunctionService;
+import com.management.platform.service.TaskService;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -46,10 +44,13 @@ public class BusinessOpportunityController {
 
     @Resource
     private BusinessOpportunityService bOservice;
-    @Resource
-    private BusinessOpportunityMapper bOMapper;
 
 
+    @RequestMapping("exportData")
+    public Object exportData(BusinessOpportunity bo, HttpServletRequest request) throws Exception {
+        return bOservice.exportData(bo,request);
+    }
+
     @RequestMapping("insertAndUpdate")
     public HttpRespMsg insertAndUpdate( BusinessOpportunity bo, HttpServletRequest request) {
         User user = userMapper.selectById(request.getHeader("Token"));
@@ -58,6 +59,7 @@ public class BusinessOpportunityController {
             //新增
             bo.setCompanyId(user.getCompanyId());
             bo.setCreatorId(user.getId());
+            bo.setUserId(user.getId());
             bo.setCreateTime(new Date());
             bOservice.insert(bo);
         }else {
@@ -111,6 +113,7 @@ public class BusinessOpportunityController {
         HashMap<Object, Object> r = new HashMap<>();
         User user = userMapper.selectById(request.getHeader("Token"));
         bo.setIsDelete(1);
+        bo.setUserId(user.getId());
         bo.setCompanyId(user.getCompanyId());
         setNull(bo);
         List<BusinessOpportunity> list = new ArrayList<>();
@@ -133,15 +136,28 @@ public class BusinessOpportunityController {
         msg.setData(r);
         return msg;
     }
+    @RequestMapping("getInfo")
+    public HttpRespMsg getInfo(BusinessOpportunity bo ,HttpServletRequest request) {
+        User user = userMapper.selectById(request.getHeader("Token"));
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.setData(bOservice.getInfo(bo,user));
+        return msg;
+    }
+    @RequestMapping("saveProduct")
+    public HttpRespMsg saveProduct(BusinessOpportunity bo , HttpServletRequest request) {
+        User user = userMapper.selectById(request.getHeader("Token"));
+        return bOservice.saveProduct(bo,user);
+    }
+
     @RequestMapping("saveStage")
     public HttpRespMsg insertStage(List<Stage> stages, HttpServletRequest request) {
-//        request
         return stageService.changeStage(stages);
-    }    @RequestMapping("getStage")
+    }
+    @RequestMapping("getStage")
     public HttpRespMsg Stage() {
-//        request
         return stageService.getStage();
     }
+
     private BusinessOpportunity setNull(BusinessOpportunity bo) {
         if (bo.getPlate1() == "") {
             bo.setPlate1(null);

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

@@ -0,0 +1,21 @@
+package com.management.platform.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-04-02
+ */
+@RestController
+@RequestMapping("/seq")
+public class SeqController {
+
+}
+

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

@@ -47,6 +47,7 @@ public class ActionLog extends Model<ActionLog> {
      */
     @TableField("name")
     private String name;
+    @TableField(exist = false)
     private String userName;
 
     /**

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

@@ -35,6 +35,16 @@ public class BusinessItemProduct extends Model<BusinessItemProduct> {
      */
     @TableField("product_id")
     private Integer productId;
+    @TableField(exist = false)
+    private String productName;
+    @TableField(exist = false)
+    private String unit;
+    @TableField(exist = false)
+    private BigDecimal price;
+    @TableField(exist = false)
+    private String inventory;
+    @TableField(exist = false)
+    private String productType;
 
     /**
      * 商机id

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

@@ -3,10 +3,13 @@ package com.management.platform.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -80,7 +83,10 @@ public class BusinessOpportunity extends Model<BusinessOpportunity> {
      */
     @TableField("stage_id")
     private Integer stageId;
+    @TableField(exist = false)
     private String stageValue;
+    @TableField(exist = false)
+    private String total;
 
     /**
      * 创建时间
@@ -119,6 +125,8 @@ public class BusinessOpportunity extends Model<BusinessOpportunity> {
     private String remark;
     @TableField(exist = false)
     private String ids;
+    @TableField(exist = false)
+    private BigDecimal finalPrice;
 
     /**
      * 回收站(是否删除) 0-否 1-是
@@ -161,6 +169,14 @@ public class BusinessOpportunity extends Model<BusinessOpportunity> {
      */
     @TableField("plate5")
     private String plate5;
+    @TableField(exist = false)
+    private List<BusinessItemProduct> businessItemProductList;
+    @TableField(exist = false)
+    private List<ActionLog> actionLogList;
+    @TableField(exist = false)
+    private List<Task> taskList;
+    @TableField(exist = false)
+    private List<UploadFile> uploadFilePList;
 
 
 

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

@@ -0,0 +1,59 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-04-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class Seq extends Model<Seq> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId("id")
+    private Integer id;
+
+    /**
+     * 字段名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 顺序
+     */
+    @TableField("seq")
+    private String seq;
+
+    /**
+     * 是否为自定义 0否1是
+     */
+    @TableField("is_flag")
+    private Integer isFlag;
+
+    /**
+     * 模块
+     */
+    @TableField("code")
+    private String code;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/BusinessItemProductMapper.java

@@ -3,6 +3,8 @@ package com.management.platform.mapper;
 import com.management.platform.entity.BusinessItemProduct;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface BusinessItemProductMapper extends BaseMapper<BusinessItemProduct> {
 
+    List<BusinessItemProduct> selectListToBoId(Integer id);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/SeqMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.Seq;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-04-02
+ */
+public interface SeqMapper extends BaseMapper<Seq> {
+
+}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/UploadFileMapper.java

@@ -3,6 +3,7 @@ package com.management.platform.mapper;
 import com.management.platform.entity.Clue;
 import com.management.platform.entity.UploadFile;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -17,6 +18,6 @@ import java.util.List;
  */
 public interface UploadFileMapper extends BaseMapper<UploadFile> {
 
-    @Select("select a.*,u.`name` userName from upload_file a left join `user` u on a.create_id = u.id where code = 'clue' and item_id = #{id}")
-    List<UploadFile> selectByInfoList(Clue clue1);
+    @Select("select a.*,u.`name` userName from upload_file a left join `user` u on a.create_id = u.id where code = #{code} and item_id = #{id}")
+    List<UploadFile> selectByInfoList(@Param("code") String code ,@Param("id") Integer id);
 }

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

@@ -1,10 +1,10 @@
 package com.management.platform.service;
 
-import com.management.platform.entity.BusinessOpportunity;
+import com.management.platform.entity.*;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.management.platform.entity.Clue;
-import com.management.platform.entity.User;
+import com.management.platform.util.HttpRespMsg;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -20,6 +20,8 @@ public interface BusinessOpportunityService extends IService<BusinessOpportunity
     List<BusinessOpportunity> getAll(BusinessOpportunity bo);
     List<BusinessOpportunity> getAll1(BusinessOpportunity bo, User user);
 
+    BusinessOpportunity getInfo(BusinessOpportunity bo ,User user);
+
     List<BusinessOpportunity> getAll2(BusinessOpportunity bo, User user);
 
     int getTotal(BusinessOpportunity bo);
@@ -32,4 +34,8 @@ public interface BusinessOpportunityService extends IService<BusinessOpportunity
     void update(BusinessOpportunity bo,String userId);
 
     void getAndTransfer(BusinessOpportunity bo, User user);
+
+    Object exportData(BusinessOpportunity bo, HttpServletRequest request) throws Exception;
+
+    HttpRespMsg saveProduct(BusinessOpportunity bo, User user);
 }

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

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.Seq;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-04-02
+ */
+public interface SeqService extends IService<Seq> {
+
+}

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

@@ -1,25 +1,32 @@
 package com.management.platform.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.management.platform.entity.ActionLog;
-import com.management.platform.entity.BusinessOpportunity;
-import com.management.platform.entity.Clue;
-import com.management.platform.entity.User;
-import com.management.platform.mapper.ActionLogMapper;
-import com.management.platform.mapper.BusinessOpportunityMapper;
+import com.management.platform.entity.*;
+import com.management.platform.mapper.*;
 import com.management.platform.service.BusinessOpportunityService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.management.platform.service.WxCorpInfoService;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author Seyason
@@ -28,10 +35,25 @@ import java.util.List;
 @Service
 public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportunityMapper, BusinessOpportunity> implements BusinessOpportunityService {
 
+    @Resource
+    private ExcelExportServiceImpl excelExportService;
+    @Resource
+    private WxCorpInfoService wxCorpInfoService;
     @Resource
     private BusinessOpportunityMapper bOMapper;
     @Resource
+    private TaskMapper taskMapper;
+    @Resource
     private ActionLogMapper actionLogMapper;
+    @Resource
+    private UserMapper userMapper;
+    @Resource
+    private BusinessItemProductMapper biMapper;
+    @Autowired
+    private SysFormMapper sysFormMapper;
+    @Autowired
+    private UploadFileMapper uploadFileMapper;
+
     @Override
     public List<BusinessOpportunity> getAll(BusinessOpportunity bo) {
         return bOMapper.selectAllList(bo);
@@ -39,12 +61,39 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
 
     @Override
     public List<BusinessOpportunity> getAll1(BusinessOpportunity bo, User user) {
-        return bOMapper.selectAllList1(bo,user.getId());
+        return bOMapper.selectAllList1(bo, user.getId());
+    }
+
+    @Override
+    public BusinessOpportunity getInfo(BusinessOpportunity bo, User user) {
+        BusinessOpportunity businessOpportunity = bOMapper.selectById(bo.getId());
+        businessOpportunity.setActionLogList(actionLogMapper.selectList(new QueryWrapper<ActionLog>().eq("item_id", bo.getId()).eq("code", "business")));
+        businessOpportunity.setUploadFilePList(uploadFileMapper.selectByInfoList("business",bo.getId()));
+        businessOpportunity.setTaskList(taskMapper.selectList(new QueryWrapper<Task>().eq("business_opportunity_id",bo.getId())));
+        List<BusinessItemProduct> businessItemProducts = biMapper.selectListToBoId(bo.getId());
+        businessOpportunity.setBusinessItemProductList(businessItemProducts);
+        if (businessItemProducts.size() > 0){
+            BigDecimal finalPrice = new BigDecimal(0);
+            BigDecimal discountedPrice = new BigDecimal(0);
+            for (BusinessItemProduct businessItemProduct : businessItemProducts) {
+                BigDecimal price = businessItemProduct.getPrice();
+                // 原价
+                finalPrice = finalPrice.add(price.multiply(new BigDecimal(businessItemProduct.getQuantity())));
+                //折扣率
+                BigDecimal divide = new BigDecimal(businessItemProduct.getDiscount()).divide(new BigDecimal(100));
+                // 折后价格
+                discountedPrice = discountedPrice.add(price.multiply(divide));
+            }
+            BigDecimal divide = discountedPrice.divide(finalPrice);
+            // 整单折扣率
+            businessOpportunity.setFinalPrice(divide.multiply(new BigDecimal(100)));
+        }
+        return businessOpportunity;
     }
 
     @Override
     public List<BusinessOpportunity> getAll2(BusinessOpportunity bo, User user) {
-        return bOMapper.selectAllList2(bo,user.getId());
+        return bOMapper.selectAllList2(bo, user.getId());
     }
 
     @Override
@@ -54,23 +103,31 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
 
     @Override
     public int getTotal1(BusinessOpportunity bo, User user) {
-        return bOMapper.getTotal1(bo,user.getId());
+        return bOMapper.getTotal1(bo, user.getId());
     }
 
     @Override
     public int getTotal2(BusinessOpportunity bo, User user) {
-        return bOMapper.getTotal2(bo,user.getId());
+        return bOMapper.getTotal2(bo, user.getId());
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void insert(BusinessOpportunity bo) {
+        setNull(bo);
         bo.setCreateTime(new Date());
         bOMapper.insert(bo);
-
+        ActionLog actionLog = new ActionLog();
+        actionLog.setUserId(bo.getUserId());
+        actionLog.setItemId(bo.getId());
+        actionLog.setCode("business");
+        actionLog.setName("创建了线索");
+        actionLogMapper.insert(actionLog);
     }
 
     @Override
-    public void update(BusinessOpportunity bo,String userId) {
+    @Transactional(rollbackFor = Exception.class)
+    public void update(BusinessOpportunity bo, String userId) {
         setNull(bo);
         bOMapper.updateById(bo);
         ActionLog log = new ActionLog();
@@ -83,6 +140,7 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void getAndTransfer(BusinessOpportunity bo, User user) {
         UpdateWrapper<BusinessOpportunity> updateWrapper = new UpdateWrapper<>();
         String ids1 = bo.getIds();
@@ -116,9 +174,56 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
             }
         }
 
-        updateWrapper.set("incharger_id",inchargerId);
+        updateWrapper.set("incharger_id", inchargerId);
         bOMapper.update(null, updateWrapper);
     }
+
+    @Value(value = "${upload.file}")
+    private String path;
+
+    @Override
+    public Object exportData(BusinessOpportunity bo, HttpServletRequest request) throws Exception {
+        User user = userMapper.selectById(request.getHeader("token"));
+        SysForm sysForm = sysFormMapper.selectOne(new LambdaQueryWrapper<SysForm>().eq(SysForm::getCompanyId, user.getCompanyId()).eq(SysForm::getCode, "Clue").eq(SysForm::getIsCurrent, 1));
+        WxCorpInfo wxCorpInfo = wxCorpInfoService.getOne(new LambdaQueryWrapper<WxCorpInfo>().eq(WxCorpInfo::getCompanyId, user.getCompanyId()));
+        String config = sysForm.getConfig();
+        JSONObject configOb = JSON.parseObject(config);
+        JSONArray configObJSONArray = configOb.getJSONArray("list");
+        List<List<String>> dataList = new ArrayList<>();
+        List<String> titleList = new ArrayList<>();
+        for (int i = 0; i < configObJSONArray.size(); i++) {
+            JSONObject item = configObJSONArray.getJSONObject(i);
+            titleList.add(item.getString("label"));
+        }
+        dataList.add(titleList);//设置表头
+
+
+        bo.setCompanyId(user.getCompanyId());
+
+        String fileName = "商机表导出_" + System.currentTimeMillis();
+        return excelExportService.exportGeneralExcelByTitleAndList(wxCorpInfo, fileName, dataList, path);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public HttpRespMsg saveProduct(BusinessOpportunity bo, User user) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.setMsg("操作成功");
+        biMapper.delete(new QueryWrapper<BusinessItemProduct>().eq("business_id",bo.getId()));
+        List<BusinessItemProduct> businessItemProductList = bo.getBusinessItemProductList();
+//        biMapper.saveBatch()
+        for (BusinessItemProduct businessItemProduct : businessItemProductList) {
+            biMapper.insert(businessItemProduct);
+        }
+        ActionLog al = new ActionLog();
+        al.setCode("business");
+        al.setName("编辑了产品");
+        al.setUserId(user.getId());
+        al.setItemId(bo.getId());
+        actionLogMapper.insert(al);
+        return msg;
+    }
+
     private BusinessOpportunity setNull(BusinessOpportunity bo) {
         if (bo.getPlate1() == "") {
             bo.setPlate1(null);

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

@@ -60,7 +60,7 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
     @Autowired
     private UploadFileMapper uploadFileMapper;
     @Autowired
-    private SysFormMapper SysFormMapper;
+    private SysFormMapper sysFormMapper;
     @Autowired
     private UserMapper userMapper;
     @Autowired
@@ -167,7 +167,7 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
     public Clue getInfo(Clue clue) {
         Clue clue1 = clueMapper.selectById2Info(clue.getId());
         clue1.setClueLogList(actionLogMapper.selectByInfoList(clue1));
-        clue1.setFiles(uploadFileMapper.selectByInfoList(clue1));
+        clue1.setFiles(uploadFileMapper.selectByInfoList("clue",clue1.getId()));
         List<Task> tasks = taskMapper.selectList(new QueryWrapper<Task>().in("clue_id", clue.getId()));
         for (Task task : tasks) {
             String executorId = task.getExecutorId();
@@ -258,7 +258,7 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
     @Override
     public HttpRespMsg exportData(Clue clue, HttpServletRequest request) throws Exception {
         User user = userMapper.selectById(request.getHeader("token"));
-        SysForm sysForm = SysFormMapper.selectOne(new LambdaQueryWrapper<SysForm>().eq(SysForm::getCompanyId, user.getCompanyId()).eq(SysForm::getCode, "Clue").eq(SysForm::getIsCurrent, 1));
+        SysForm sysForm = sysFormMapper.selectOne(new LambdaQueryWrapper<SysForm>().eq(SysForm::getCompanyId, user.getCompanyId()).eq(SysForm::getCode, "Clue").eq(SysForm::getIsCurrent, 1));
         WxCorpInfo wxCorpInfo = wxCorpInfoService.getOne(new LambdaQueryWrapper<WxCorpInfo>().eq(WxCorpInfo::getCompanyId, user.getCompanyId()));
         String config = sysForm.getConfig();
         JSONObject configOb = JSON.parseObject(config);

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

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.Seq;
+import com.management.platform.mapper.SeqMapper;
+import com.management.platform.service.SeqService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-04-02
+ */
+@Service
+public class SeqServiceImpl extends ServiceImpl<SeqMapper, Seq> implements SeqService {
+
+}

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

@@ -37,6 +37,7 @@ public class StageServiceImpl extends ServiceImpl<StageMapper, Stage> implements
             }else {
                 stageMapper.insert(stage);
             }
+            i++;
         }
         msg.setMsg("操作成功");
         return msg;

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/BusinessItemProductMapper.xml

@@ -15,5 +15,21 @@
     <sql id="Base_Column_List">
         id, product_id, quantity, discount, total_price
     </sql>
+    <select id="selectListToBoId" resultType="com.management.platform.entity.BusinessItemProduct">
+        select i.id,
+               i.product_id,
+               i.quantity,
+               i.discount,
+               i.total_price,
+               p.product_name productName,
+               p.price price,
+               (select `name` from sys_dict where id = p.unit and code = 'ProductUnit') unit,
+               (select `name` from sys_dict where id = p.type and code = 'ProductType') productType,
+               p.inventory inventory,
+        from business_item_product i
+                 left join product p on i.product_id = p.id
+--         left join sys_dict d on
+        where business_id = #{id}
+    </select>
 
 </mapper>

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/BusinessOpportunityMapper.xml

@@ -38,14 +38,14 @@
         (select `name` from contacts where id = contacts_id) contactsName,
         (select `name` from `user` where id = contacts_id) inchargerName,
         (select `name` from `user` where id = creator_id) creatorName,
-        (SELECT sum(total) from business_product WHERE business_id = id)
+        (SELECT sum(total) from business_product WHERE business_id = id) total
         from business_opportunity
         where company_id = #{companyId}
         and is_delete = #{isDelete}
         <if test="name != null and name != ''">
             and `name` LIKE CONCAT('%', #{name}, '%')
         </if>
-        <if test="inchargerId != null ">
+        <if test="inchargerId != null and inchargerId == '' ">
             and incharger_id = #{inchargerId}
         </if>
         <if test="startTime != null and endTime != null ">

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/SeqMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.SeqMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.Seq">
+        <id column="id" property="id" />
+        <result column="name" property="name" />
+        <result column="seq" property="seq" />
+        <result column="is_flag" property="isFlag" />
+        <result column="code" property="code" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, seq, is_flag, code
+    </sql>
+
+</mapper>