Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/precision-effect

precision-effect-admin/src/main/java/com/zehong/web/controller/system/SysUserController.java

@@ -29,7 +29,7 @@ import com.zehong.system.service.ISysUserService;
 
 /**
  * 用户信息
- * 
+ *
  * @author zehong
  */
 @RestController
@@ -210,4 +210,8 @@ public class SysUserController extends BaseController
     public AjaxResult selectTransactorByDeptId(@RequestParam(value="deptId") Long deptId){
         return AjaxResult.success(userService.selectTransactorByDeptId(deptId));
     }
+
+
+
+
 }

precision-effect-admin/src/main/java/com/zehong/web/controller/transaction/TBorrowingApplyForController.java

+package com.zehong.web.controller.transaction;
+
+import java.util.Date;
+import java.util.List;
+
+import com.zehong.common.core.domain.entity.SysUser;
+import com.zehong.common.utils.ServletUtils;
+import com.zehong.common.utils.StringUtils;
+import com.zehong.framework.web.service.TokenService;
+import com.zehong.system.domain.TCashOperate;
+import com.zehong.system.service.ITCashOperateService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TBorrowingApplyFor;
+import com.zehong.system.service.ITBorrowingApplyForService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 借支申请Controller
+ *
+ * @author zehong
+ * @date 2023-06-15
+ */
+@RestController
+@RequestMapping("/system/for")
+public class TBorrowingApplyForController extends BaseController
+{
+    @Autowired
+    private ITBorrowingApplyForService tBorrowingApplyForService;
+    @Autowired
+    private TokenService tokenService;
+    @Autowired
+    private ITCashOperateService tCashOperateService;
+    /**
+     * 查询借支申请列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:for:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TBorrowingApplyFor tBorrowingApplyFor)
+    {
+        startPage();
+        List<TBorrowingApplyFor> list = tBorrowingApplyForService.selectTBorrowingApplyForList(tBorrowingApplyFor);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出借支申请列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:for:export')")
+    @Log(title = "借支申请", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TBorrowingApplyFor tBorrowingApplyFor)
+    {
+        List<TBorrowingApplyFor> list = tBorrowingApplyForService.selectTBorrowingApplyForList(tBorrowingApplyFor);
+        ExcelUtil<TBorrowingApplyFor> util = new ExcelUtil<TBorrowingApplyFor>(TBorrowingApplyFor.class);
+        return util.exportExcel(list, "借支申请数据");
+    }
+
+    /**
+     * 获取借支申请详细信息
+     */
+    @GetMapping(value = "/{borrowing}")
+    public AjaxResult getInfo(@PathVariable("borrowing") Long borrowing)
+    {
+        return AjaxResult.success(tBorrowingApplyForService.selectTBorrowingApplyForById(borrowing));
+    }
+
+    /**
+     * 新增借支申请
+     */
+    @Log(title = "借支申请", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TBorrowingApplyFor tBorrowingApplyFor)
+    {
+        // 获取当前用户
+        SysUser user = tokenService.getLoginUser(ServletUtils.getRequest()).getUser();
+        if (StringUtils.isNotNull(user)) {
+            tBorrowingApplyFor.setHandledByUserId(user.getUserId());
+        }
+        return toAjax(tBorrowingApplyForService.insertTBorrowingApplyFor(tBorrowingApplyFor));
+    }
+
+    /**
+     * 修改借支申请
+     */
+    @PreAuthorize("@ss.hasPermi('system:for:approved')")
+    @Log(title = "借支申请", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public int edit(@RequestBody TBorrowingApplyFor tBorrowingApplyFor)
+    {
+        /**查询部门余额是否足够*/
+        int isSufficient = tBorrowingApplyForService.selectTacc(tBorrowingApplyFor);
+        SysUser user = tokenService.getLoginUser(ServletUtils.getRequest()).getUser();
+        tBorrowingApplyFor.setApprovedUserId(user.getUserId());
+        //0部门余额不足 1余额足够
+        if (isSufficient!=0){
+            //修改部门余额
+            tBorrowingApplyForService.deletebBalance(tBorrowingApplyFor);
+            //修改借支申请表状态
+             tBorrowingApplyForService.updateTBorrowingApplyFor(tBorrowingApplyFor);
+            TCashOperate tCashOperate=new TCashOperate();
+            tCashOperate.setOperateDeptId(tBorrowingApplyFor.getBorrowingDeptId());
+            tCashOperate.setOperateType("2");
+            tCashOperate.setOperateAmount(tBorrowingApplyFor.getTotalFigures());
+            tCashOperate.setIsDel("0");
+            tCashOperate.setOperateTime(new Date());
+             //增加资金操作记录
+            tCashOperateService.insertTCashOperate(tCashOperate);
+            return 1;
+        }else {
+            tBorrowingApplyFor.setApprovalStatus(3);
+            //修改借支申请表状态
+            tBorrowingApplyForService.updateTBorrowingApplyFor(tBorrowingApplyFor);
+            return 2;
+        }
+
+    }
+
+    /**
+     * 删除借支申请
+     */
+    @PreAuthorize("@ss.hasPermi('system:for:remove')")
+    @Log(title = "借支申请", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{borrowings}")
+    public AjaxResult remove(@PathVariable Long[] borrowings)
+    {
+        return toAjax(tBorrowingApplyForService.deleteTBorrowingApplyForByIds(borrowings));
+    }
+}

precision-effect-system/src/main/java/com/zehong/system/domain/TBorrowingApplyFor.java

+package com.zehong.system.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 借支申请对象 t_borrowing_apply_for
+ *
+ * @author zehong
+ * @date 2023-06-15
+ */
+public class TBorrowingApplyFor extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 借支主键id */
+    private Long borrowing;
+
+    /** 费用名称 */
+    @Excel(name = "费用名称")
+    private String feeName;
+
+    /** 借支部门id */
+    @Excel(name = "借支部门id")
+    private Long borrowingDeptId;
+
+    /** 经办人id */
+    @Excel(name = "经办人id")
+    private Long handledByUserId;
+
+    /** 用途说明 */
+    @Excel(name = "用途说明")
+    private String applicationDescription;
+
+    /** 使用人id */
+    @Excel(name = "使用人id")
+    private Long userId;
+
+    /** 大写合计 */
+    @Excel(name = "大写合计")
+    private String totalWords;
+
+    /** 小写合计 */
+    @Excel(name = "小写合计")
+    private BigDecimal totalFigures;
+
+    /** 审批人id */
+    @Excel(name = "审批人id")
+    private Long approvedUserId;
+
+    /** 登记日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "登记日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date registrationDate;
+
+    /** 附件 */
+    @Excel(name = "附件")
+    private String attachmentUrl;
+
+    /** 是否删除 0未删除 1删除 */
+    @Excel(name = "是否删除 0未删除 1删除")
+    private String isDel;
+
+    /**审批状态  1未审批   2审批通过   3审批拒绝 */
+    private Integer approvalStatus;
+
+    private String handledByUserIdName;
+
+    private String userIdName;
+
+    private String ApprovedUserIdName;
+
+    public String getHandledByUserIdName() {
+        return handledByUserIdName;
+    }
+
+    public void setHandledByUserIdName(String handledByUserIdName) {
+        this.handledByUserIdName = handledByUserIdName;
+    }
+
+    public String getUserIdName() {
+        return userIdName;
+    }
+
+    public void setUserIdName(String userIdName) {
+        this.userIdName = userIdName;
+    }
+
+    public String getApprovedUserIdName() {
+        return ApprovedUserIdName;
+    }
+
+    public void setApprovedUserIdName(String approvedUserIdName) {
+        ApprovedUserIdName = approvedUserIdName;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Integer getApprovalStatus() {
+        return approvalStatus;
+    }
+
+    public void setApprovalStatus(Integer approvalStatus) {
+        this.approvalStatus = approvalStatus;
+    }
+
+    public void setBorrowing(Long borrowing)
+    {
+        this.borrowing = borrowing;
+    }
+
+    public Long getBorrowing()
+    {
+        return borrowing;
+    }
+    public void setFeeName(String feeName)
+    {
+        this.feeName = feeName;
+    }
+
+    public String getFeeName()
+    {
+        return feeName;
+    }
+    public void setBorrowingDeptId(Long borrowingDeptId)
+    {
+        this.borrowingDeptId = borrowingDeptId;
+    }
+
+    public Long getBorrowingDeptId()
+    {
+        return borrowingDeptId;
+    }
+    public void setHandledByUserId(Long handledByUserId)
+    {
+        this.handledByUserId = handledByUserId;
+    }
+
+    public Long getHandledByUserId()
+    {
+        return handledByUserId;
+    }
+    public void setApplicationDescription(String applicationDescription)
+    {
+        this.applicationDescription = applicationDescription;
+    }
+
+    public String getApplicationDescription()
+    {
+        return applicationDescription;
+    }
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+    public void setTotalWords(String totalWords)
+    {
+        this.totalWords = totalWords;
+    }
+
+    public String getTotalWords()
+    {
+        return totalWords;
+    }
+    public void setTotalFigures(BigDecimal totalFigures)
+    {
+        this.totalFigures = totalFigures;
+    }
+
+    public BigDecimal getTotalFigures()
+    {
+        return totalFigures;
+    }
+    public void setApprovedUserId(Long approvedUserId)
+    {
+        this.approvedUserId = approvedUserId;
+    }
+
+    public Long getApprovedUserId()
+    {
+        return approvedUserId;
+    }
+    public void setRegistrationDate(Date registrationDate)
+    {
+        this.registrationDate = registrationDate;
+    }
+
+    public Date getRegistrationDate()
+    {
+        return registrationDate;
+    }
+    public void setAttachmentUrl(String attachmentUrl)
+    {
+        this.attachmentUrl = attachmentUrl;
+    }
+
+    public String getAttachmentUrl()
+    {
+        return attachmentUrl;
+    }
+    public void setIsDel(String isDel)
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel()
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return "TBorrowingApplyFor{" +
+                "borrowing=" + borrowing +
+                ", feeName='" + feeName + '\'' +
+                ", borrowingDeptId=" + borrowingDeptId +
+                ", handledByUserId=" + handledByUserId +
+                ", applicationDescription='" + applicationDescription + '\'' +
+                ", userId=" + userId +
+                ", totalWords='" + totalWords + '\'' +
+                ", totalFigures=" + totalFigures +
+                ", approvedUserId=" + approvedUserId +
+                ", registrationDate=" + registrationDate +
+                ", attachmentUrl='" + attachmentUrl + '\'' +
+                ", isDel='" + isDel + '\'' +
+                ", approvalStatus=" + approvalStatus +
+                ", handledByUserIdName='" + handledByUserIdName + '\'' +
+                ", userIdName='" + userIdName + '\'' +
+                ", ApprovedUserIdName='" + ApprovedUserIdName + '\'' +
+                '}';
+    }
+}

precision-effect-system/src/main/java/com/zehong/system/mapper/TBorrowingApplyForMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TBorrowingApplyFor;
+
+/**
+ * 借支申请Mapper接口
+ *
+ * @author zehong
+ * @date 2023-06-15
+ */
+public interface TBorrowingApplyForMapper
+{
+    /**
+     * 查询借支申请
+     *
+     * @param borrowing 借支申请ID
+     * @return 借支申请
+     */
+    public TBorrowingApplyFor selectTBorrowingApplyForById(Long borrowing);
+
+    /**
+     * 查询借支申请列表
+     *
+     * @param tBorrowingApplyFor 借支申请
+     * @return 借支申请集合
+     */
+    public List<TBorrowingApplyFor> selectTBorrowingApplyForList(TBorrowingApplyFor tBorrowingApplyFor);
+
+    /**
+     * 新增借支申请
+     *
+     * @param tBorrowingApplyFor 借支申请
+     * @return 结果
+     */
+    public int insertTBorrowingApplyFor(TBorrowingApplyFor tBorrowingApplyFor);
+
+    /**
+     * 修改借支申请
+     *
+     * @param tBorrowingApplyFor 借支申请
+     * @return 结果
+     */
+    public int updateTBorrowingApplyFor(TBorrowingApplyFor tBorrowingApplyFor);
+
+    /**
+     * 删除借支申请
+     *
+     * @param borrowing 借支申请ID
+     * @return 结果
+     */
+    public int deleteTBorrowingApplyForById(Long borrowing);
+
+    /**
+     * 批量删除借支申请
+     *
+     * @param borrowings 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTBorrowingApplyForByIds(Long[] borrowings);
+
+    /**
+     * 查询部门余额是否足够
+     * @param tBorrowingApplyFor
+     * @return
+     */
+    int selectTacc(TBorrowingApplyFor tBorrowingApplyFor);
+
+    /**
+     * 修改部门余额
+     * @param tBorrowingApplyFor
+     */
+    void deletebBalance(TBorrowingApplyFor tBorrowingApplyFor);
+}

precision-effect-system/src/main/java/com/zehong/system/service/ITBorrowingApplyForService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TBorrowingApplyFor;
+
+/**
+ * 借支申请Service接口
+ *
+ * @author zehong
+ * @date 2023-06-15
+ */
+public interface ITBorrowingApplyForService
+{
+    /**
+     * 查询借支申请
+     *
+     * @param borrowing 借支申请ID
+     * @return 借支申请
+     */
+    public TBorrowingApplyFor selectTBorrowingApplyForById(Long borrowing);
+
+    /**
+     * 查询借支申请列表
+     *
+     * @param tBorrowingApplyFor 借支申请
+     * @return 借支申请集合
+     */
+    public List<TBorrowingApplyFor> selectTBorrowingApplyForList(TBorrowingApplyFor tBorrowingApplyFor);
+
+    /**
+     * 新增借支申请
+     *
+     * @param tBorrowingApplyFor 借支申请
+     * @return 结果
+     */
+    public int insertTBorrowingApplyFor(TBorrowingApplyFor tBorrowingApplyFor);
+
+    /**
+     * 修改借支申请
+     *
+     * @param tBorrowingApplyFor 借支申请
+     * @return 结果
+     */
+    public int updateTBorrowingApplyFor(TBorrowingApplyFor tBorrowingApplyFor);
+
+    /**
+     * 批量删除借支申请
+     *
+     * @param borrowings 需要删除的借支申请ID
+     * @return 结果
+     */
+    public int deleteTBorrowingApplyForByIds(Long[] borrowings);
+
+    /**
+     * 删除借支申请信息
+     *
+     * @param borrowing 借支申请ID
+     * @return 结果
+     */
+    public int deleteTBorrowingApplyForById(Long borrowing);
+
+    /**
+     * 查询部门余额是否足够
+     * @param tBorrowingApplyFor
+     * @return
+     */
+    int selectTacc(TBorrowingApplyFor tBorrowingApplyFor);
+
+    /**
+     * 修改部门余额
+     * @param tBorrowingApplyFor
+     */
+    void deletebBalance(TBorrowingApplyFor tBorrowingApplyFor);
+}

precision-effect-system/src/main/java/com/zehong/system/service/impl/TBorrowingApplyForServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TBorrowingApplyForMapper;
+import com.zehong.system.domain.TBorrowingApplyFor;
+import com.zehong.system.service.ITBorrowingApplyForService;
+
+/**
+ * 借支申请Service业务层处理
+ *
+ * @author zehong
+ * @date 2023-06-15
+ */
+@Service
+public class TBorrowingApplyForServiceImpl implements ITBorrowingApplyForService
+{
+    @Autowired
+    private TBorrowingApplyForMapper tBorrowingApplyForMapper;
+
+    /**
+     * 查询借支申请
+     *
+     * @param borrowing 借支申请ID
+     * @return 借支申请
+     */
+    @Override
+    public TBorrowingApplyFor selectTBorrowingApplyForById(Long borrowing)
+    {
+        return tBorrowingApplyForMapper.selectTBorrowingApplyForById(borrowing);
+    }
+
+    /**
+     * 查询借支申请列表
+     *
+     * @param tBorrowingApplyFor 借支申请
+     * @return 借支申请
+     */
+    @Override
+    public List<TBorrowingApplyFor> selectTBorrowingApplyForList(TBorrowingApplyFor tBorrowingApplyFor)
+    {
+        return tBorrowingApplyForMapper.selectTBorrowingApplyForList(tBorrowingApplyFor);
+    }
+
+    /**
+     * 新增借支申请
+     *
+     * @param tBorrowingApplyFor 借支申请
+     * @return 结果
+     */
+    @Override
+    public int insertTBorrowingApplyFor(TBorrowingApplyFor tBorrowingApplyFor)
+    {
+        tBorrowingApplyFor.setCreateTime(DateUtils.getNowDate());
+        return tBorrowingApplyForMapper.insertTBorrowingApplyFor(tBorrowingApplyFor);
+    }
+
+    /**
+     * 修改借支申请
+     *
+     * @param tBorrowingApplyFor 借支申请
+     * @return 结果
+     */
+    @Override
+    public int updateTBorrowingApplyFor(TBorrowingApplyFor tBorrowingApplyFor)
+    {
+        tBorrowingApplyFor.setUpdateTime(DateUtils.getNowDate());
+        return tBorrowingApplyForMapper.updateTBorrowingApplyFor(tBorrowingApplyFor);
+    }
+
+    /**
+     * 批量删除借支申请
+     *
+     * @param borrowings 需要删除的借支申请ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTBorrowingApplyForByIds(Long[] borrowings)
+    {
+        return tBorrowingApplyForMapper.deleteTBorrowingApplyForByIds(borrowings);
+    }
+
+    /**
+     * 删除借支申请信息
+     *
+     * @param borrowing 借支申请ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTBorrowingApplyForById(Long borrowing)
+    {
+        return tBorrowingApplyForMapper.deleteTBorrowingApplyForById(borrowing);
+    }
+
+    /**
+     * 查询部门余额是否足够
+     * @param tBorrowingApplyFor
+     * @return
+     */
+    @Override
+    public int selectTacc(TBorrowingApplyFor tBorrowingApplyFor) {
+        return tBorrowingApplyForMapper.selectTacc(tBorrowingApplyFor);
+    }
+
+    /**
+     * 修改部门余额
+     * @param tBorrowingApplyFor
+     */
+    @Override
+    public void deletebBalance(TBorrowingApplyFor tBorrowingApplyFor) {
+        tBorrowingApplyForMapper.deletebBalance(tBorrowingApplyFor);
+    }
+}

precision-effect-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
 		<collection  property="roles"   javaType="java.util.List"        resultMap="RoleResult" />
 	</resultMap>
-	
+
 	<resultMap id="deptResult" type="SysDept">
 		<id     property="deptId"   column="dept_id"     />
 		<result property="parentId" column="parent_id"   />
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="leader"   column="leader"      />
 		<result property="status"   column="dept_status" />
 	</resultMap>
-	
+
 	<resultMap id="RoleResult" type="SysRole">
 		<id     property="roleId"       column="role_id"        />
 		<result property="roleName"     column="role_name"      />
@@ -44,9 +44,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="dataScope"     column="data_scope"    />
 		<result property="status"       column="role_status"    />
 	</resultMap>
-	
+
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		    left join sys_user_role ur on u.user_id = ur.user_id
 		    left join sys_role r on r.role_id = ur.role_id
     </sql>
-    
+
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
@@ -80,29 +80,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
-	
+
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
 		where u.user_name = #{userName}
 	</select>
-	
+
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
 		where u.user_id = #{userId}
 	</select>
-	
+
 	<select id="checkUserNameUnique" parameterType="String" resultType="int">
 		select count(1) from sys_user where user_name = #{userName} limit 1
 	</select>
-	
+
 	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} limit 1
 	</select>
-	
+
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} limit 1
 	</select>
-	
+
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
  			<if test="userId != null and userId != 0">user_id,</if>
@@ -134,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			sysdate()
  		)
 	</insert>
-	
+
 	<update id="updateUser" parameterType="SysUser">
  		update sys_user
  		<set>
@@ -155,33 +155,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		</set>
  		where user_id = #{userId}
 	</update>
-	
+
 	<update id="updateUserStatus" parameterType="SysUser">
  		update sys_user set status = #{status} where user_id = #{userId}
 	</update>
-	
+
 	<update id="updateUserAvatar" parameterType="SysUser">
  		update sys_user set avatar = #{avatar} where user_name = #{userName}
 	</update>
-	
+
 	<update id="resetUserPwd" parameterType="SysUser">
  		update sys_user set password = #{password} where user_name = #{userName}
 	</update>
-	
+
 	<delete id="deleteUserById" parameterType="Long">
 		update sys_user set del_flag = '2' where user_id = #{userId}
  	</delete>
- 	
+
  	<delete id="deleteUserByIds" parameterType="Long">
  		update sys_user set del_flag = '2' where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}
-        </foreach> 
+        </foreach>
  	</delete>
 
 	<select id="selectTransactorByDeptId" parameterType="Long" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
 		where u.dept_id = #{deptId} AND r.role_key = "transactor";
 	</select>
-	
-</mapper> 
\ No newline at end of file
+
+</mapper>

precision-effect-system/src/main/resources/mapper/system/TBorrowingApplyForMapper.xml

+<?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.zehong.system.mapper.TBorrowingApplyForMapper">
+
+    <resultMap type="TBorrowingApplyFor" id="TBorrowingApplyForResult">
+        <result property="borrowing"    column="borrowing"    />
+        <result property="feeName"    column="fee_name"    />
+        <result property="borrowingDeptId"    column="borrowing_dept_id"    />
+        <result property="handledByUserId"    column="handled_by_user_id"    />
+        <result property="applicationDescription"    column="application_description"    />
+        <result property="userId"    column="user_id"    />
+        <result property="totalWords"    column="total_words"    />
+        <result property="totalFigures"    column="total_figures"    />
+        <result property="approvedUserId"    column="approved_user_id"    />
+        <result property="registrationDate"    column="registration_date"    />
+        <result property="remark"    column="remark"    />
+        <result property="attachmentUrl"    column="attachment_url"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="approvalStatus"    column="approval_status"    />
+
+    </resultMap>
+
+    <sql id="selectTBorrowingApplyForVo">
+        select borrowing, fee_name, borrowing_dept_id, handled_by_user_id, application_description, user_id, total_words, total_figures, approved_user_id, registration_date, remark, attachment_url, is_del, create_time, update_time,approval_status from t_borrowing_apply_for
+    </sql>
+
+    <select id="selectTBorrowingApplyForList" parameterType="TBorrowingApplyFor" resultMap="TBorrowingApplyForResult">
+        SELECT a.*,b.nick_name handledByUserIdName,c.nick_name userIdName,d.nick_name ApprovedUserIdName FROM t_borrowing_apply_for a
+        left join sys_user b on  a.handled_by_user_id=b.user_id
+        left join sys_user c on  a.user_id=c.user_id
+        left join sys_user d on  a.approved_user_id=d.user_id
+        <where>
+            <if test="feeName != null  and feeName != ''"> and a.fee_name like concat('%', #{feeName}, '%')</if>
+            <if test="borrowingDeptId != null "> and a.borrowing_dept_id = #{borrowingDeptId}</if>
+            <if test="handledByUserId != null "> and a.handled_by_user_id = #{handledByUserId}</if>
+            <if test="applicationDescription != null  and applicationDescription != ''"> and a.application_description = #{applicationDescription}</if>
+            <if test="userId != null "> and a.user_id = #{userId}</if>
+            <if test="totalWords != null  and totalWords != ''"> and a.total_words = #{totalWords}</if>
+            <if test="totalFigures != null "> and a.total_figures = #{totalFigures}</if>
+            <if test="approvedUserId != null "> and a.approved_user_id = #{approvedUserId}</if>
+            <if test="registrationDate != null "> and a.registration_date = #{registrationDate}</if>
+            <if test="attachmentUrl != null  and attachmentUrl != ''"> and a.attachment_url = #{attachmentUrl}</if>
+            <if test="isDel != null  and isDel != ''"> and a.is_del = #{isDel}</if>
+        </where>
+        order by a.borrowing desc
+    </select>
+
+    <select id="selectTBorrowingApplyForById" parameterType="Long" resultMap="TBorrowingApplyForResult">
+        <include refid="selectTBorrowingApplyForVo"/>
+        where borrowing = #{borrowing}
+    </select>
+
+
+    <insert id="insertTBorrowingApplyFor" parameterType="TBorrowingApplyFor">
+        insert into t_borrowing_apply_for
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="borrowing != null">borrowing,</if>
+            <if test="feeName != null">fee_name,</if>
+            <if test="borrowingDeptId != null">borrowing_dept_id,</if>
+            <if test="handledByUserId != null">handled_by_user_id,</if>
+            <if test="applicationDescription != null">application_description,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="totalWords != null">total_words,</if>
+            <if test="totalFigures != null">total_figures,</if>
+            <if test="approvedUserId != null">approved_user_id,</if>
+            <if test="registrationDate != null">registration_date,</if>
+            <if test="remark != null">remark,</if>
+            <if test="attachmentUrl != null">attachment_url,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="borrowing != null">#{borrowing},</if>
+            <if test="feeName != null">#{feeName},</if>
+            <if test="borrowingDeptId != null">#{borrowingDeptId},</if>
+            <if test="handledByUserId != null">#{handledByUserId},</if>
+            <if test="applicationDescription != null">#{applicationDescription},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="totalWords != null">#{totalWords},</if>
+            <if test="totalFigures != null">#{totalFigures},</if>
+            <if test="approvedUserId != null">#{approvedUserId},</if>
+            <if test="registrationDate != null">#{registrationDate},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="attachmentUrl != null">#{attachmentUrl},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTBorrowingApplyFor" parameterType="TBorrowingApplyFor">
+        update t_borrowing_apply_for
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="feeName != null">fee_name = #{feeName},</if>
+            <if test="borrowingDeptId != null">borrowing_dept_id = #{borrowingDeptId},</if>
+            <if test="handledByUserId != null">handled_by_user_id = #{handledByUserId},</if>
+            <if test="applicationDescription != null">application_description = #{applicationDescription},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="totalWords != null">total_words = #{totalWords},</if>
+            <if test="totalFigures != null">total_figures = #{totalFigures},</if>
+            <if test="approvedUserId != null">approved_user_id = #{approvedUserId},</if>
+            <if test="registrationDate != null">registration_date = #{registrationDate},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="attachmentUrl != null">attachment_url = #{attachmentUrl},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="approvalStatus != null">approval_status = #{approvalStatus},</if>
+        </trim>
+        where borrowing = #{borrowing}
+    </update>
+
+    <delete id="deleteTBorrowingApplyForById" parameterType="Long">
+        delete from t_borrowing_apply_for where borrowing = #{borrowing}
+    </delete>
+
+    <delete id="deleteTBorrowingApplyForByIds" parameterType="String">
+        delete from t_borrowing_apply_for where borrowing in
+        <foreach item="borrowing" collection="array" open="(" separator="," close=")">
+            #{borrowing}
+        </foreach>
+    </delete>
+
+    <!--查询部门余额是否足够-->
+    <select id="selectTacc" resultType="java.lang.Integer">
+        select count(account_id) from t_account where  dept_id=#{borrowingDeptId} and able_amount >= #{totalFigures}
+    </select>
+
+    <!--修改部门余额-->
+    <update id="deletebBalance">
+        update t_account set able_amount= able_amount- #{totalFigures} where dept_id=#{borrowingDeptId}
+    </update>
+</mapper>

precision-effect-web/src/api/system/for.js

+import request from '@/utils/request'
+
+// 查询借支申请列表
+export function listFor(query) {
+  return request({
+    url: '/system/for/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询借支申请详细
+export function getFor(borrowing) {
+  return request({
+    url: '/system/for/' + borrowing,
+    method: 'get'
+  })
+}
+
+// 新增借支申请
+export function addFor(data) {
+  return request({
+    url: '/system/for',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改借支申请
+export function updateFor(data) {
+  return request({
+    url: '/system/for',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除借支申请
+export function delFor(borrowing) {
+  return request({
+    url: '/system/for/' + borrowing,
+    method: 'delete'
+  })
+}
+
+// 导出借支申请
+export function exportFor(query) {
+  return request({
+    url: '/system/for/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file