[feat] 售后管理

按照万材要求，基础资料员工出差单新增导出功能，支持部分行和全部行导出，导出更多数据
新增导出所有和选择导出后端接口
新增 导出基础资料出差单明细方法
新增根据基础资料出差单集合方法
新增导出基础资料出差单明细
修复，出差单分页查询多余的异常抛出问题

ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseEvectionFormController.java

@@ -5,9 +5,7 @@ import java.util.List;
 
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.process.general.service.IProcessService;
-import com.ruoyi.system.domain.Vo.BaseEvectionFormVo;
+import com.ruoyi.system.domain.Vo.*;
-import com.ruoyi.system.domain.Vo.BaseExpenseAccountVo;
-import com.ruoyi.system.domain.Vo.OutsourceOrderVO;
 import com.ruoyi.system.service.ISysUserService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
@@ -18,6 +16,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
@@ -69,7 +68,7 @@ public class BaseEvectionFormController extends BaseController
     @RequiresPermissions("system:baseEvectionForm:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(BaseEvectionFormVo baseEvectionFormVo) throws Exception {
+    public TableDataInfo list(BaseEvectionFormVo baseEvectionFormVo){
         startPage();
         List<BaseEvectionFormVo> list = baseEvectionFormService.selectBaseEvectionFormList(baseEvectionFormVo);
         return getDataTable(list);
@@ -82,10 +81,19 @@ public class BaseEvectionFormController extends BaseController
     @Log(title = "出差单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(BaseEvectionFormVo baseEvectionFormVo) throws Exception {
+    public AjaxResult export(BaseEvectionFormVo baseEvectionFormVo,String ids){
-        List<BaseEvectionFormVo> list = baseEvectionFormService.selectBaseEvectionFormList(baseEvectionFormVo);
+
-        ExcelUtil<BaseEvectionFormVo> util = new ExcelUtil<BaseEvectionFormVo>(BaseEvectionFormVo.class);
+        if (StringUtils.isEmpty(ids)){
-        return util.exportExcel(list, "出差单数据");
+            List<BaseEvectionFormVo> list = baseEvectionFormService.selectBaseEvectionFormListByObject(baseEvectionFormVo);
+            ExcelUtil<BaseEvectionFormVo> util = new ExcelUtil<BaseEvectionFormVo>(BaseEvectionFormVo.class);
+            return util.exportExcel(list, "出差单数据");
+        }else {
+            String[] evectionCodes = ids.split(",");
+            List<BaseEvectionFormVo> list = baseEvectionFormService.selectBaseEvectionFormListByCodes(evectionCodes);
+            ExcelUtil<BaseEvectionFormVo> util = new ExcelUtil<BaseEvectionFormVo>(BaseEvectionFormVo.class);
+            return util.exportExcel(list, "出差单数据");
+        }
+
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEvectionForm.java

@@ -22,17 +22,7 @@ public class BaseEvectionForm extends BaseEntity
     /** 出差单索引id */
     private Long evectionId;
 
-    /** 审核状态 */
-    @Excel(name = "审核状态")
-    private String auditStatus;
 
-    /** 使用状态 */
-    @Excel(name = "使用状态")
-    private String useStatus;
-
-    /** 人事行政 */
-    @Excel(name = "人事行政")
-    private String personnelAdministration;
 
     /** 出差单编号 */
     @Excel(name = "出差单编号")
@@ -54,6 +44,7 @@ public class BaseEvectionForm extends BaseEntity
     @Excel(name = "同行人")
     private String partnerBy;
 
+
     /** 出差地 */
     @Excel(name = "出差地")
     private String evectionAddr;
@@ -112,6 +103,19 @@ public class BaseEvectionForm extends BaseEntity
     @Excel(name = "实际出差时间")
     private String realityEvenctionEndTime;
 
+    /** 审核状态 */
+    @Excel(name = "审核状态",dictType = "auditStatus")
+    private String auditStatus;
+
+    /** 使用状态 */
+    @Excel(name = "使用状态", dictType = "useStatus")
+    private String useStatus;
+
+    /** 人事行政 */
+    @Excel(name = "人事行政",dictType = "administration_status")
+    private String personnelAdministration;
+
+
     /** 申请人 */
     @Excel(name = "申请人")
     private String applyUser;

ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseEvectionFormMapper.java

@@ -75,4 +75,9 @@ public interface BaseEvectionFormMapper
      * @return 结果
      */
     public int restoreBaseEvectionFormById(Long evectionId);
+
+    /**
+    *  根据出差单编号查询出差单
+    * */
+    List<BaseEvectionFormVo> selectBaseEvectionFormListByCodes(String[] evectionCodes);
 }

ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEvectionFormService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.ruoyi.sales.domain.SalesAftersalesNotice;
 import com.ruoyi.system.domain.BaseEvectionForm;
+import com.ruoyi.system.domain.Vo.BaseEmpRequisiteOrderVO;
 import com.ruoyi.system.domain.Vo.BaseEvectionFormVo;
 import org.activiti.engine.runtime.ProcessInstance;
 
@@ -29,7 +30,7 @@ public interface IBaseEvectionFormService
      * @param baseEvectionForm 出差单
      * @return 出差单集合
      */
-    public List<BaseEvectionFormVo> selectBaseEvectionFormList(BaseEvectionForm baseEvectionForm) throws Exception;
+    public List<BaseEvectionFormVo> selectBaseEvectionFormList(BaseEvectionForm baseEvectionForm);
 
     /**
      * 新增出差单
@@ -84,4 +85,14 @@ public interface IBaseEvectionFormService
      *  审批流程启动
      * */
     ProcessInstance submitApply(BaseEvectionForm baseEvectionForm);
+
+    /**
+    *  通过出差单号查询出差单集合
+    * */
+    List<BaseEvectionFormVo> selectBaseEvectionFormListByCodes(String[] evectionCodes);
+
+    /**
+    *  通过出差单对象查询出差单集合
+    * */
+    List<BaseEvectionFormVo> selectBaseEvectionFormListByObject(BaseEvectionFormVo baseEvectionFormVo);
 }

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEvectionFormServiceImpl.java

@@ -88,7 +88,7 @@ public class BaseEvectionFormServiceImpl implements IBaseEvectionFormService
      * @return 出差单
      */
     @Override
-    public List<BaseEvectionFormVo> selectBaseEvectionFormList(BaseEvectionForm baseEvectionForm) throws Exception {
+    public List<BaseEvectionFormVo> selectBaseEvectionFormList(BaseEvectionForm baseEvectionForm){
         SysUser curUser = ShiroUtils.getSysUser();
         Long userId = curUser.getUserId();
         Set<String> roleKeys = roleService.selectRoleKeys(userId);
@@ -170,6 +170,23 @@ public class BaseEvectionFormServiceImpl implements IBaseEvectionFormService
         return returnList;
     }
 
+
+    /**
+    *  根据出差单对象查询出差单
+    * */
+    @Override
+    public List<BaseEvectionFormVo> selectBaseEvectionFormListByObject(BaseEvectionFormVo baseEvectionFormVo) {
+        return baseEvectionFormMapper.selectBaseEvectionFormList(baseEvectionFormVo);
+    }
+
+    /**
+    *  根据出差单号查询出差单
+    * */
+    @Override
+    public List<BaseEvectionFormVo> selectBaseEvectionFormListByCodes(String[] evectionCodes) {
+        return baseEvectionFormMapper.selectBaseEvectionFormListByCodes(evectionCodes);
+    }
+
     /**
      * 新增出差单
      * 

ruoyi-admin/src/main/resources/mapper/system/BaseEvectionFormMapper.xml

@@ -85,7 +85,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectBaseEvectionFormVo"/>
         where evection_id = #{evectionId}
     </select>
-        
+
+
+    <select id="selectBaseEvectionFormListByCodes" parameterType="String" resultMap="BaseEvectionFormResult">
+        <include refid="selectBaseEvectionFormVo"/>
+        where evection_code in
+        <foreach collection="array" item="evectionCode" open="(" close=")" separator=",">
+            #{evectionCode}
+        </foreach>
+    </select>
+
+
     <insert id="insertBaseEvectionForm" parameterType="BaseEvectionFormVo" useGeneratedKeys="true" keyProperty="evectionId">
         insert into base_evection_form
         <trim prefix="(" suffix=")" suffixOverrides=",">

ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html

@@ -51,6 +51,9 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:baseEvectionForm:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
+                <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="system:baseEvectionForm:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
             </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
@@ -257,6 +260,31 @@
         function hrApprove(evectionId){
             $.modal.open("核准",prefix + "/hrApprove/" + evectionId);
         }
+
+
+        // 导出
+        function exportExcel() {
+            var ids = $.table.selectColumns("evectionCode");
+            var dataParam = $("#formId").serializeArray();
+
+            let tipMsg = "确定导出当前所有数据吗?";
+            if ($.common.isNotEmpty(ids)) {
+                tipMsg = `确定导出 ${ids} 数据吗?`;
+                dataParam.push({ "name": "ids", "value": ids });
+            }
+            $.modal.confirm(tipMsg, function () {
+                $.modal.loading("正在导出数据，请稍后...");
+                $.post( prefix + "/export", dataParam, function (result) {
+                    if (result.code === web_status.SUCCESS) {
+                        window.location.href = ctx + "common/download?fileName="+ encodeURI(result.msg) + "&delete=" + true;
+                    } else {
+                        $.modal.alertError(result.msg);
+                    }
+                    $.modal.closeLoading();
+                });
+            });
+        }
+
     </script>
 </body>
 </html>