Merge remote-tracking branch 'origin/wb' into qa

cjl

2023-10-07 9e50775009199ee04ac7bbd67fb0ef91b195c701

Merge remote-tracking branch 'origin/wb' into qa

 screen-api/src/main/java/com/moral/api/entity/AllocationExtension.java

@@ -38,6 +38,11 @@
    private Integer extensionNum;

    /**
     * 延期前天数
     */
    private Integer extensionOldNum;

    /**
     * 延期理由
     */
    private String remake;

 screen-api/src/main/java/com/moral/api/service/AllocationService.java

@@ -25,8 +25,17 @@

    void updateAll(AllocationUpdateCond allocationUpdateCond);

    /**
     *  列表数据权限 0无权 空值，管理员
     * @return
     */
    List<Integer> unitResult();

    /**
     * 区域权限 是否是区域管理员 1，超级管理员2区域管理员0普通权限
     * 验证是否出现审批按钮
     * @return
     */
    Integer unitAreaCode();

    Map<String, Object> selectUnitView(Map<String,Object> map);
@@ -41,14 +50,38 @@
     */
    AllocationExt extOne(Integer id);

    /**
     * 单个详情
     * @param id
     * @return
     */
     AllocationExt oneAllocation(Integer id);

    /**
     * 整改
     * @param changeCond
     */
    void changeAllocation(AllocationChangeCond changeCond);

    /**
     * 审批
     * @param checkCond
     */
    void checkAllocation(AllocationCheckCond checkCond);

    /**
     * 删除
     * @param id
     * @return
     */
    boolean removeById(Integer id);

    /**
     * 作废
     * @param id
     * @param invalidReason
     * @return
     */
    boolean invalidResult (Integer id,String invalidReason);

    /**
@@ -58,5 +91,10 @@
     */
    List<AllocationListExt> extList(AllocationListCond allocationListCond);

    /**
     * 延期申请
     * @param allocationExtensionAddCond
     * @return
     */
    boolean applyFor (AllocationExtensionAddCond allocationExtensionAddCond);
}

 screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java

@@ -602,6 +602,7 @@
        }
        AllocationExtension allocationExtension = allocationExtensionAddCond.convert();
        allocationExtension.setState(AllocationExtensionApproveEnum.APPLYING.value);
        allocationExtension.setExtensionOldNum(allocationExt.getChangeDay());
        allocationExtensionService.save(allocationExtension);
        fileTableService.upDateResult(allocationExtensionAddCond.getFileList(),allocationExtension.getId(), FileTableEnum.ALLOCATION_EXTENSION.value);
        return true;

 screen-api/src/main/resources/mapper/AllocationExtensionMapper.xml

@@ -7,6 +7,7 @@
        <id column="id" property="id" />
        <result column="allocation_id" property="allocationId" />
        <result column="extension_num" property="extensionNum" />
        <result column="extension_old_num" property="extensionOldNum" />
        <result column="remake" property="remake" />
        <result column="state" property="state" />
        <result column="invalid_reason" property="invalidReason" />
@@ -14,12 +15,12 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, allocation_id, extension_num, remake, state, is_del, is_invalid, invalid_reason, create_id, create_name, create_time, update_id, update_name, update_time
        id, allocation_id, extension_num, remake, state, is_del, is_invalid, invalid_reason, create_id, create_name, create_time, update_id, update_name, update_time,extension_old_num
    </sql>

    <!-- 通用查询结果列 -->
    <sql id="AllocationExtension_Column_List">
        allocationextension.id, allocationextension.allocation_id, allocationextension.extension_num, allocationextension.remake, allocationextension.state, allocationextension.is_del, allocationextension.is_invalid, allocationextension.invalid_reason, allocationextension.create_id, allocationextension.create_name, allocationextension.create_time, allocationextension.update_id, allocationextension.update_name, allocationextension.update_time
        allocationextension.id, allocationextension.allocation_id, allocationextension.extension_num, allocationextension.remake, allocationextension.state, allocationextension.is_del, allocationextension.is_invalid, allocationextension.invalid_reason, allocationextension.create_id, allocationextension.create_name, allocationextension.create_time, allocationextension.update_id, allocationextension.update_name, allocationextension.update_time,allocationextension.extension_old_num
    </sql>