diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseEvectionFormController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseEvectionFormController.java index 08ec56c3..e7e05bc8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseEvectionFormController.java +++ b/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.BaseExpenseAccountVo; -import com.ruoyi.system.domain.Vo.OutsourceOrderVO; +import com.ruoyi.system.domain.Vo.*; 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 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 { - List list = baseEvectionFormService.selectBaseEvectionFormList(baseEvectionFormVo); - ExcelUtil util = new ExcelUtil(BaseEvectionFormVo.class); - return util.exportExcel(list, "出差单数据"); + public AjaxResult export(BaseEvectionFormVo baseEvectionFormVo,String ids){ + + if (StringUtils.isEmpty(ids)){ + List list = baseEvectionFormService.selectBaseEvectionFormListByObject(baseEvectionFormVo); + ExcelUtil util = new ExcelUtil(BaseEvectionFormVo.class); + return util.exportExcel(list, "出差单数据"); + }else { + String[] evectionCodes = ids.split(","); + List list = baseEvectionFormService.selectBaseEvectionFormListByCodes(evectionCodes); + ExcelUtil util = new ExcelUtil(BaseEvectionFormVo.class); + return util.exportExcel(list, "出差单数据"); + } + } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEvectionForm.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEvectionForm.java index f7f6370f..cb1743ea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEvectionForm.java +++ b/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; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseEvectionFormMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseEvectionFormMapper.java index 9803c568..3bddc2e0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseEvectionFormMapper.java +++ b/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 selectBaseEvectionFormListByCodes(String[] evectionCodes); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEvectionFormService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEvectionFormService.java index 7b90c3fa..bb0ad0e6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEvectionFormService.java +++ b/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 selectBaseEvectionFormList(BaseEvectionForm baseEvectionForm) throws Exception; + public List selectBaseEvectionFormList(BaseEvectionForm baseEvectionForm); /** * 新增出差单 @@ -84,4 +85,14 @@ public interface IBaseEvectionFormService * 审批流程启动 * */ ProcessInstance submitApply(BaseEvectionForm baseEvectionForm); + + /** + * 通过出差单号查询出差单集合 + * */ + List selectBaseEvectionFormListByCodes(String[] evectionCodes); + + /** + * 通过出差单对象查询出差单集合 + * */ + List selectBaseEvectionFormListByObject(BaseEvectionFormVo baseEvectionFormVo); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEvectionFormServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEvectionFormServiceImpl.java index c7a6d687..511b520e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEvectionFormServiceImpl.java +++ b/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 selectBaseEvectionFormList(BaseEvectionForm baseEvectionForm) throws Exception { + public List selectBaseEvectionFormList(BaseEvectionForm baseEvectionForm){ SysUser curUser = ShiroUtils.getSysUser(); Long userId = curUser.getUserId(); Set roleKeys = roleService.selectRoleKeys(userId); @@ -170,6 +170,23 @@ public class BaseEvectionFormServiceImpl implements IBaseEvectionFormService return returnList; } + + /** + * 根据出差单对象查询出差单 + * */ + @Override + public List selectBaseEvectionFormListByObject(BaseEvectionFormVo baseEvectionFormVo) { + return baseEvectionFormMapper.selectBaseEvectionFormList(baseEvectionFormVo); + } + + /** + * 根据出差单号查询出差单 + * */ + @Override + public List selectBaseEvectionFormListByCodes(String[] evectionCodes) { + return baseEvectionFormMapper.selectBaseEvectionFormListByCodes(evectionCodes); + } + /** * 新增出差单 * diff --git a/ruoyi-admin/src/main/resources/mapper/system/BaseEvectionFormMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/BaseEvectionFormMapper.xml index 1b473717..a9e56e3a 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/BaseEvectionFormMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/BaseEvectionFormMapper.xml @@ -85,7 +85,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where evection_id = #{evectionId} - + + + + + insert into base_evection_form diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html index 6457671e..645c6e06 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html @@ -51,6 +51,9 @@ 添加 + + 导出 +
@@ -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(); + }); + }); + } + \ No newline at end of file