From bfc934622cf560cebcab9d8967e049e50161b431 Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Tue, 21 May 2024 18:01:08 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF:=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=87=BA=E5=B7=AE=E5=8D=95=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E8=AF=A2=E8=AF=AD=E5=8F=A5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=B8=BA=E5=87=BA=E5=B7=AE?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=EF=BC=8C=E5=87=BA=E5=B7=AE=E6=97=B6=E9=97=B4?= =?UTF-8?q?=EF=BC=8C=E5=87=BA=E5=B7=AE=E4=BA=BA,=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=87=BA=E5=B7=AE=E5=8D=95=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=BC=96=E8=BE=91=E5=87=BA=E5=B7=AE?= =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD=E9=A1=B5=E9=9D=A2=E3=80=82=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=8A=A5=E9=94=80=E5=8D=95=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=BE=E7=A4=BA=E5=BD=95=E5=85=A5=E6=97=B6?= =?UTF-8?q?=E9=97=B4=EF=BC=8C=E4=B8=8A=E6=AC=A1=E6=9B=B4=E6=96=B0=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseEvectionFormController.java | 151 ++++++++ .../BaseExpenseAccountChildController.java | 2 - .../ruoyi/system/domain/BaseEvectionForm.java | 336 ++++++++++++++++++ .../system/mapper/BaseEvectionFormMapper.java | 77 ++++ .../service/IBaseEvectionFormService.java | 75 ++++ .../impl/BaseEvectionFormServiceImpl.java | 126 +++++++ .../mapper/system/BaseEvectionFormMapper.xml | 181 ++++++++++ .../system/baseEvectionForm/add.html | 168 +++++++++ .../baseEvectionForm/baseEvectionForm.html | 128 +++++++ .../system/baseEvectionForm/edit.html | 115 ++++++ .../system/baseExpense/baseExpense.html | 3 + 11 files changed, 1360 insertions(+), 2 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseEvectionFormController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEvectionForm.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseEvectionFormMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEvectionFormService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEvectionFormServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/system/BaseEvectionFormMapper.xml create mode 100644 ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html create mode 100644 ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/edit.html 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 new file mode 100644 index 00000000..84d15fb4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseEvectionFormController.java @@ -0,0 +1,151 @@ +package com.ruoyi.system.controller; + +import java.util.List; +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.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.BaseEvectionForm; +import com.ruoyi.system.service.IBaseEvectionFormService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 出差单Controller + * + * @author zhang + * @date 2024-05-21 + */ +@Controller +@RequestMapping("/system/baseEvectionForm") +public class BaseEvectionFormController extends BaseController +{ + private String prefix = "system/baseEvectionForm"; + + @Autowired + private IBaseEvectionFormService baseEvectionFormService; + + @RequiresPermissions("system:baseEvectionForm:view") + @GetMapping() + public String baseEvectionForm() + { + return prefix + "/baseEvectionForm"; + } + + /** + * 查询出差单列表 + */ + @RequiresPermissions("system:baseEvectionForm:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BaseEvectionForm baseEvectionForm) + { + startPage(); + List list = baseEvectionFormService.selectBaseEvectionFormList(baseEvectionForm); + return getDataTable(list); + } + + /** + * 导出出差单列表 + */ + @RequiresPermissions("system:baseEvectionForm:export") + @Log(title = "出差单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BaseEvectionForm baseEvectionForm) + { + List list = baseEvectionFormService.selectBaseEvectionFormList(baseEvectionForm); + ExcelUtil util = new ExcelUtil(BaseEvectionForm.class); + return util.exportExcel(list, "出差单数据"); + } + + /** + * 新增出差单 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存出差单 + */ + @RequiresPermissions("system:baseEvectionForm:add") + @Log(title = "出差单", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BaseEvectionForm baseEvectionForm) + { + return toAjax(baseEvectionFormService.insertBaseEvectionForm(baseEvectionForm)); + } + + /** + * 修改出差单 + */ + @GetMapping("/edit/{evectionId}") + public String edit(@PathVariable("evectionId") Long evectionId, ModelMap mmap) + { + BaseEvectionForm baseEvectionForm = baseEvectionFormService.selectBaseEvectionFormById(evectionId); + mmap.put("baseEvectionForm", baseEvectionForm); + return prefix + "/edit"; + } + + /** + * 修改保存出差单 + */ + @RequiresPermissions("system:baseEvectionForm:edit") + @Log(title = "出差单", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BaseEvectionForm baseEvectionForm) + { + return toAjax(baseEvectionFormService.updateBaseEvectionForm(baseEvectionForm)); + } + + /** + * 删除出差单 + */ + @RequiresPermissions("system:baseEvectionForm:remove") + @Log(title = "出差单", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(baseEvectionFormService.deleteBaseEvectionFormByIds(ids)); + } + + /** + * 作废出差单 + */ + @RequiresPermissions("system:baseEvectionForm:cancel") + @Log(title = "出差单", businessType = BusinessType.CANCEL) + @GetMapping( "/cancel/{id}") + @ResponseBody + public AjaxResult cancel(@PathVariable("id") Long id){ + return toAjax(baseEvectionFormService.cancelBaseEvectionFormById(id)); + } + + /** + * 恢复出差单 + */ + @RequiresPermissions("system:baseEvectionForm:restore") + @Log(title = "出差单", businessType = BusinessType.RESTORE) + @GetMapping( "/restore/{id}") + @ResponseBody + public AjaxResult restore(@PathVariable("id")Long id) + { + return toAjax(baseEvectionFormService.restoreBaseEvectionFormById(id)); + } + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseExpenseAccountChildController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseExpenseAccountChildController.java index 0b4cd7fe..ad0771d6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseExpenseAccountChildController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseExpenseAccountChildController.java @@ -146,6 +146,4 @@ public class BaseExpenseAccountChildController extends BaseController { return toAjax(baseExpenseAccountChildService.restoreBaseExpenseAccountChildById(id)); } - - } 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 new file mode 100644 index 00000000..7e97dfaa --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEvectionForm.java @@ -0,0 +1,336 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 出差单对象 base_evection_form + * + * @author zhang + * @date 2024-05-21 + */ +public class BaseEvectionForm extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 出差单索引id */ + private Long evectionId; + + /** 审核状态 */ + @Excel(name = "审核状态") + private String auditStatus; + + /** 使用状态 */ + @Excel(name = "使用状态") + private String useStatus; + + /** 人事行政 */ + @Excel(name = "人事行政") + private String personnelAdministration; + + /** 出差单编号 */ + @Excel(name = "出差单编号") + private String evectionCode; + + /** 部门 */ + @Excel(name = "部门") + private String deptName; + + /** 岗位 */ + @Excel(name = "岗位") + private String postName; + + /** 出差人 */ + @Excel(name = "出差人") + private String evectionBy; + + /** 同行人 */ + @Excel(name = "同行人") + private String partnerBy; + + /** 出差地 */ + @Excel(name = "出差地") + private String evectionAddr; + + /** 出差详细地址 */ + @Excel(name = "出差详细地址") + private String evectionDetailAddr; + + /** 出差事由 */ + @Excel(name = "出差事由") + private String evectionCauses; + + /** 出差时间 */ + @Excel(name = "出差时间") + private String evectionTime; + + /** 派工单号 */ + @Excel(name = "派工单号") + private String dispatchlistCode; + + /** 生产单号 */ + @Excel(name = "生产单号") + private String makeCode; + + /** 出行方式 */ + @Excel(name = "出行方式") + private String travelMode; + + /** 酒店 */ + @Excel(name = "酒店") + private String hotel; + + /** 交通预算费用 */ + @Excel(name = "交通预算费用") + private String transportationCostBudget; + + /** 住宿预算费用 */ + @Excel(name = "住宿预算费用") + private String accommodationBudget; + + /** 其他预算费用 */ + @Excel(name = "其他预算费用") + private String otherExpensesBudget; + + /** 实际出差时间 */ + @Excel(name = "实际出差时间") + private String realityEvenctionTime; + + /** 申请人 */ + @Excel(name = "申请人") + private String applyUser; + + public void setEvectionId(Long evectionId) + { + this.evectionId = evectionId; + } + + public Long getEvectionId() + { + return evectionId; + } + public void setAuditStatus(String auditStatus) + { + this.auditStatus = auditStatus; + } + + public String getAuditStatus() + { + return auditStatus; + } + public void setUseStatus(String useStatus) + { + this.useStatus = useStatus; + } + + public String getUseStatus() + { + return useStatus; + } + public void setPersonnelAdministration(String personnelAdministration) + { + this.personnelAdministration = personnelAdministration; + } + + public String getPersonnelAdministration() + { + return personnelAdministration; + } + public void setEvectionCode(String evectionCode) + { + this.evectionCode = evectionCode; + } + + public String getEvectionCode() + { + return evectionCode; + } + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + public String getDeptName() + { + return deptName; + } + public void setPostName(String postName) + { + this.postName = postName; + } + + public String getPostName() + { + return postName; + } + public void setEvectionBy(String evectionBy) + { + this.evectionBy = evectionBy; + } + + public String getEvectionBy() + { + return evectionBy; + } + public void setPartnerBy(String partnerBy) + { + this.partnerBy = partnerBy; + } + + public String getPartnerBy() + { + return partnerBy; + } + public void setEvectionAddr(String evectionAddr) + { + this.evectionAddr = evectionAddr; + } + + public String getEvectionAddr() + { + return evectionAddr; + } + public void setEvectionDetailAddr(String evectionDetailAddr) + { + this.evectionDetailAddr = evectionDetailAddr; + } + + public String getEvectionDetailAddr() + { + return evectionDetailAddr; + } + public void setEvectionCauses(String evectionCauses) + { + this.evectionCauses = evectionCauses; + } + + public String getEvectionCauses() + { + return evectionCauses; + } + public void setEvectionTime(String evectionTime) + { + this.evectionTime = evectionTime; + } + + public String getEvectionTime() + { + return evectionTime; + } + public void setDispatchlistCode(String dispatchlistCode) + { + this.dispatchlistCode = dispatchlistCode; + } + + public String getDispatchlistCode() + { + return dispatchlistCode; + } + public void setMakeCode(String makeCode) + { + this.makeCode = makeCode; + } + + public String getMakeCode() + { + return makeCode; + } + public void setTravelMode(String travelMode) + { + this.travelMode = travelMode; + } + + public String getTravelMode() + { + return travelMode; + } + public void setHotel(String hotel) + { + this.hotel = hotel; + } + + public String getHotel() + { + return hotel; + } + public void setTransportationCostBudget(String transportationCostBudget) + { + this.transportationCostBudget = transportationCostBudget; + } + + public String getTransportationCostBudget() + { + return transportationCostBudget; + } + public void setAccommodationBudget(String accommodationBudget) + { + this.accommodationBudget = accommodationBudget; + } + + public String getAccommodationBudget() + { + return accommodationBudget; + } + public void setOtherExpensesBudget(String otherExpensesBudget) + { + this.otherExpensesBudget = otherExpensesBudget; + } + + public String getOtherExpensesBudget() + { + return otherExpensesBudget; + } + public void setRealityEvenctionTime(String realityEvenctionTime) + { + this.realityEvenctionTime = realityEvenctionTime; + } + + public String getRealityEvenctionTime() + { + return realityEvenctionTime; + } + public void setApplyUser(String applyUser) + { + this.applyUser = applyUser; + } + + public String getApplyUser() + { + return applyUser; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("evectionId", getEvectionId()) + .append("auditStatus", getAuditStatus()) + .append("useStatus", getUseStatus()) + .append("personnelAdministration", getPersonnelAdministration()) + .append("evectionCode", getEvectionCode()) + .append("deptName", getDeptName()) + .append("postName", getPostName()) + .append("evectionBy", getEvectionBy()) + .append("partnerBy", getPartnerBy()) + .append("evectionAddr", getEvectionAddr()) + .append("evectionDetailAddr", getEvectionDetailAddr()) + .append("evectionCauses", getEvectionCauses()) + .append("evectionTime", getEvectionTime()) + .append("dispatchlistCode", getDispatchlistCode()) + .append("makeCode", getMakeCode()) + .append("travelMode", getTravelMode()) + .append("hotel", getHotel()) + .append("transportationCostBudget", getTransportationCostBudget()) + .append("accommodation budget", getAccommodationBudget()) + .append("otherExpensesBudget", getOtherExpensesBudget()) + .append("realityEvenctionTime", getRealityEvenctionTime()) + .append("applyUser", getApplyUser()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} 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 new file mode 100644 index 00000000..444a7551 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseEvectionFormMapper.java @@ -0,0 +1,77 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.BaseEvectionForm; + +/** + * 出差单Mapper接口 + * + * @author zhang + * @date 2024-05-21 + */ +public interface BaseEvectionFormMapper +{ + /** + * 查询出差单 + * + * @param evectionId 出差单ID + * @return 出差单 + */ + public BaseEvectionForm selectBaseEvectionFormById(Long evectionId); + + /** + * 查询出差单列表 + * + * @param baseEvectionForm 出差单 + * @return 出差单集合 + */ + public List selectBaseEvectionFormList(BaseEvectionForm baseEvectionForm); + + /** + * 新增出差单 + * + * @param baseEvectionForm 出差单 + * @return 结果 + */ + public int insertBaseEvectionForm(BaseEvectionForm baseEvectionForm); + + /** + * 修改出差单 + * + * @param baseEvectionForm 出差单 + * @return 结果 + */ + public int updateBaseEvectionForm(BaseEvectionForm baseEvectionForm); + + /** + * 删除出差单 + * + * @param evectionId 出差单ID + * @return 结果 + */ + public int deleteBaseEvectionFormById(Long evectionId); + + /** + * 批量删除出差单 + * + * @param evectionIds 需要删除的数据ID + * @return 结果 + */ + public int deleteBaseEvectionFormByIds(String[] evectionIds); + + /** + * 作废出差单 + * + * @param evectionId 出差单ID + * @return 结果 + */ + public int cancelBaseEvectionFormById(Long evectionId); + + /** + * 恢复出差单 + * + * @param evectionId 出差单ID + * @return 结果 + */ + public int restoreBaseEvectionFormById(Long evectionId); +} 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 new file mode 100644 index 00000000..2bf7e793 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEvectionFormService.java @@ -0,0 +1,75 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.BaseEvectionForm; + +/** + * 出差单Service接口 + * + * @author zhang + * @date 2024-05-21 + */ +public interface IBaseEvectionFormService +{ + /** + * 查询出差单 + * + * @param evectionId 出差单ID + * @return 出差单 + */ + public BaseEvectionForm selectBaseEvectionFormById(Long evectionId); + + /** + * 查询出差单列表 + * + * @param baseEvectionForm 出差单 + * @return 出差单集合 + */ + public List selectBaseEvectionFormList(BaseEvectionForm baseEvectionForm); + + /** + * 新增出差单 + * + * @param baseEvectionForm 出差单 + * @return 结果 + */ + public int insertBaseEvectionForm(BaseEvectionForm baseEvectionForm); + + /** + * 修改出差单 + * + * @param baseEvectionForm 出差单 + * @return 结果 + */ + public int updateBaseEvectionForm(BaseEvectionForm baseEvectionForm); + + /** + * 批量删除出差单 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteBaseEvectionFormByIds(String ids); + + /** + * 删除出差单信息 + * + * @param evectionId 出差单ID + * @return 结果 + */ + public int deleteBaseEvectionFormById(Long evectionId); + + /** + * 作废出差单 + * @param evectionId 出差单ID + * @return + */ + int cancelBaseEvectionFormById(Long evectionId); + + /** + * 恢复出差单 + * @param evectionId 出差单ID + * @return + */ + int restoreBaseEvectionFormById(Long evectionId); +} 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 new file mode 100644 index 00000000..fa4862aa --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseEvectionFormServiceImpl.java @@ -0,0 +1,126 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.BaseEvectionFormMapper; +import com.ruoyi.system.domain.BaseEvectionForm; +import com.ruoyi.system.service.IBaseEvectionFormService; +import com.ruoyi.common.core.text.Convert; + +/** + * 出差单Service业务层处理 + * + * @author zhang + * @date 2024-05-21 + */ +@Service +public class BaseEvectionFormServiceImpl implements IBaseEvectionFormService +{ + @Autowired + private BaseEvectionFormMapper baseEvectionFormMapper; + + /** + * 查询出差单 + * + * @param evectionId 出差单ID + * @return 出差单 + */ + @Override + public BaseEvectionForm selectBaseEvectionFormById(Long evectionId) + { + return baseEvectionFormMapper.selectBaseEvectionFormById(evectionId); + } + + /** + * 查询出差单列表 + * + * @param baseEvectionForm 出差单 + * @return 出差单 + */ + @Override + public List selectBaseEvectionFormList(BaseEvectionForm baseEvectionForm) + { + return baseEvectionFormMapper.selectBaseEvectionFormList(baseEvectionForm); + } + + /** + * 新增出差单 + * + * @param baseEvectionForm 出差单 + * @return 结果 + */ + @Override + public int insertBaseEvectionForm(BaseEvectionForm baseEvectionForm) + { + String loginName = ShiroUtils.getLoginName(); + baseEvectionForm.setCreateBy(loginName); + baseEvectionForm.setCreateTime(DateUtils.getNowDate()); + return baseEvectionFormMapper.insertBaseEvectionForm(baseEvectionForm); + } + + /** + * 修改出差单 + * + * @param baseEvectionForm 出差单 + * @return 结果 + */ + @Override + public int updateBaseEvectionForm(BaseEvectionForm baseEvectionForm) + { + String loginName = ShiroUtils.getLoginName(); + baseEvectionForm.setUpdateBy(loginName); + baseEvectionForm.setUpdateTime(DateUtils.getNowDate()); + return baseEvectionFormMapper.updateBaseEvectionForm(baseEvectionForm); + } + + /** + * 删除出差单对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteBaseEvectionFormByIds(String ids) + { + return baseEvectionFormMapper.deleteBaseEvectionFormByIds(Convert.toStrArray(ids)); + } + + /** + * 删除出差单信息 + * + * @param evectionId 出差单ID + * @return 结果 + */ + @Override + public int deleteBaseEvectionFormById(Long evectionId) + { + return baseEvectionFormMapper.deleteBaseEvectionFormById(evectionId); + } + + /** + * 作废出差单 + * + * @param evectionId 出差单ID + * @return 结果 + */ + @Override + public int cancelBaseEvectionFormById(Long evectionId) + { + return baseEvectionFormMapper.cancelBaseEvectionFormById(evectionId); + } + + /** + * 恢复出差单信息 + * + * @param evectionId 出差单ID + * @return 结果 + */ + @Override + public int restoreBaseEvectionFormById(Long evectionId) + { + return baseEvectionFormMapper.restoreBaseEvectionFormById(evectionId); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/system/BaseEvectionFormMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/BaseEvectionFormMapper.xml new file mode 100644 index 00000000..f71ba4f4 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/system/BaseEvectionFormMapper.xml @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select evection_id, audit_status, use_status, personnel_administration, + evection_code, deptName, postName, evection_by, partner_by, evection_addr, + evection_detail_addr, evection_causes, evection_time, dispatchlist_code, + make_code, travel_mode, hotel, transportation_cost_budget, accommodation_budget, + other_expenses_budget, reality_evenction_time, apply_user, create_by, create_time, + update_by, update_time, remark + from base_evection_form + + + + + + + + insert into base_evection_form + + audit_status, + use_status, + personnel_administration, + evection_code, + deptName, + postName, + evection_by, + partner_by, + evection_addr, + evection_detail_addr, + evection_causes, + evection_time, + dispatchlist_code, + make_code, + travel_mode, + hotel, + transportation_cost_budget, + accommodation_budget, + other_expenses_budget, + reality_evenction_time, + apply_user, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{auditStatus}, + #{useStatus}, + #{personnelAdministration}, + #{evectionCode}, + #{deptName}, + #{postName}, + #{evectionBy}, + #{partnerBy}, + #{evectionAddr}, + #{evectionDetailAddr}, + #{evectionCauses}, + #{evectionTime}, + #{dispatchlistCode}, + #{makeCode}, + #{travelMode}, + #{hotel}, + #{transportationCostBudget}, + #{accommodationBudget}, + #{otherExpensesBudget}, + #{realityEvenctionTime}, + #{applyUser}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update base_evection_form + + audit_status = #{auditStatus}, + use_status = #{useStatus}, + personnel_administration = #{personnelAdministration}, + evection_code = #{evectionCode}, + deptName = #{deptName}, + postName = #{postName}, + evection_by = #{evectionBy}, + partner_by = #{partnerBy}, + evection_addr = #{evectionAddr}, + evection_detail_addr = #{evectionDetailAddr}, + evection_causes = #{evectionCauses}, + evection_time = #{evectionTime}, + dispatchlist_code = #{dispatchlistCode}, + make_code = #{makeCode}, + travel_mode = #{travelMode}, + hotel = #{hotel}, + transportation_cost_budget = #{transportationCostBudget}, + accommodation_budget = #{accommodationBudget}, + other_expenses_budget = #{otherExpensesBudget}, + reality_evenction_time = #{realityEvenctionTime}, + apply_user = #{applyUser}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where evection_id = #{evectionId} + + + + delete from base_evection_form where evection_id = #{evectionId} + + + + delete from base_evection_form where evection_id in + + #{evectionId} + + + + + update base_evection_form set del_flag = '1' where evection_id = #{evectionId} + + + + update base_evection_form set del_flag = '0' where evection_id = #{evectionId} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/add.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/add.html new file mode 100644 index 00000000..528da7db --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/add.html @@ -0,0 +1,168 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + + - + + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ + +
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html new file mode 100644 index 00000000..ba1f3fd0 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html @@ -0,0 +1,128 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/edit.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/edit.html new file mode 100644 index 00000000..f131c723 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/edit.html @@ -0,0 +1,115 @@ + + + + + + + +
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + + - + + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/baseExpense/baseExpense.html b/ruoyi-admin/src/main/resources/templates/system/baseExpense/baseExpense.html index af0a7710..a7dfff00 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseExpense/baseExpense.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseExpense/baseExpense.html @@ -129,6 +129,9 @@ {title: '对公收款方',field: 'corporatePayee',visible: false}, {title: '对公收款账户',field: 'corporateReceivingAccount',visible: false}, {title: '对公开户行',field: 'publicAccountBanks',visible: false}, + {title: '录入时间',field: 'createTime',}, + {title: '更新人',field: 'updateBy'}, + {title: '上次更新时间',field: 'updateTime',visible: false}, {title: '备注',field: 'remark',visible: false}, {title: '使用状态',field: 'useStatus',visible: false}, {