fix: 出差和请假审批新增开始与结束日期

gongchunyi

18 小时以前 198aa691b194e504c2051968c76f914bb0550f2a

fix: 出差和请假审批新增开始与结束日期

 src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java

@@ -613,6 +613,8 @@
        BeanUtils.copyProperties(approveGetAndUpdateVo, approve);
        approve.setApproveUserIds(approveGetAndUpdateVo.getApproveUserIds());
        approve.setApproveReason(approveGetAndUpdateVo.getApproveReason());
        approve.setStartDate(approveGetAndUpdateVo.getStartDate());
        approve.setEndDate(approveGetAndUpdateVo.getEndDate());
        SysUser sysUser = sysUserMapper.selectUserById(approveGetAndUpdateVo.getApproveUser());
        String[] split = approveGetAndUpdateVo.getApproveUserIds().split(",");
        if (split.length == 0) {

 src/main/resources/mapper/approve/ApproveProcessMapper.xml

@@ -20,12 +20,14 @@
            <result property="tenantId" column="tenant_id" />
            <result property="approveType" column="approve_type" />
            <result property="approveRemark" column="approve_remark" />
            <result property="startDate" column="start_date" />
            <result property="endDate" column="end_date" />
    </resultMap>

    <sql id="Base_Column_List">
        id,approve_id,approve_user,approve_dept_id,approve_dept_name,approve_user_ids,
        approve_user_names,approve_reason,approve_time,approve_over_time,approve_status,
        approve_delete,tenant_id,approve_type,approve_remark
        approve_delete,tenant_id,approve_type,approve_remark,start_date,end_date
    </sql>

    <select id="listPage" resultType="com.ruoyi.approve.pojo.ApproveProcess">