Merge remote-tracking branch 'origin/master'

mitao

2 天以前 652db871507244a5838fc6b36d9b9771b527ad61

Merge remote-tracking branch 'origin/master'

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalApplicationsController.java

@@ -412,9 +412,10 @@
        approvalApplicationReimbursementService.save(oaApprovalApplicationReimbursement);
        BigDecimal total = new BigDecimal(0);
        List<OaApprovalApplicationReimbursementItem> oaApprovalApplicationReimbursementItems = new ArrayList<>();
        for (OaApprovalApplicationReimbursementItem oaApprovalApplicationReimbursementItem : oaApprovalApplicationReimbursementItems) {
            oaApprovalApplicationReimbursementItem.setApprovalApplicationId(oaApprovalApplicationReimbursement.getId());
        for (OaApprovalApplicationReimbursementItem oaApprovalApplicationReimbursementItem : dto.getItems()) {
            oaApprovalApplicationReimbursementItem.setApprovalApplicationId(oaApprovalApplications.getId());
            total = total.add(oaApprovalApplicationReimbursementItem.getAmount());
            oaApprovalApplicationReimbursementItems.add(oaApprovalApplicationReimbursementItem);
        }
        oaApprovalApplicationReimbursement.setReimbursementAmount(total);
        approvalApplicationReimbursementService.updateById(oaApprovalApplicationReimbursement);

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java

@@ -259,7 +259,7 @@
                case 12:
                    OaApprovalApplicationReimbursement oaApprovalApplicationReimbursement = approvalApplicationReimbursementMap.get(approvalApplication.getId());
                    if (oaApprovalApplicationReimbursement!=null){

                        approvalTodoVO.setType(oaApprovalApplicationReimbursement.getType());
                        approvalTodoVO.setAmount(oaApprovalApplicationReimbursement.getReimbursementAmount());
                    }
                    break;
@@ -632,7 +632,6 @@
    @ApiOperation(value = "资产入库审批详情")
    @GetMapping(value = "/detailInStock")
    public R<StorageDetailVO> detailInStock(@ApiParam("申请单d")Integer id) {
        
        OaApprovalApplications approvalApplications = approvalApplicationsService.getById(id);
        OaApprovalApplicationStorage approvalApplicationStorage = approvalApplicationStorageService.lambdaQuery()
                .eq(OaApprovalApplicationStorage::getApprovalApplicationId, approvalApplications.getId())

 ruoyi-system/src/main/java/com/ruoyi/system/vo/ApprovalTodoVO.java

@@ -51,6 +51,8 @@

    @ApiModelProperty(value = "处置方式 0-报废，1-报损，2-捐赠(资产处置)")
    private Integer disposeType;
    @ApiModelProperty(value = "报销类型 0-差旅招待交通费，1-企业日常采购，2-房租水电日常，3-聚餐团建，4-其他")
    private Integer type;
    @ApiModelProperty(value = "更改方(资产变更)")
    private String ownershipDeptName;
    @ApiModelProperty(value = "领用物品（资产领用）")

 ruoyi-system/src/main/java/com/ruoyi/system/vo/StorageListVO.java

@@ -19,7 +19,7 @@
    @ApiModelProperty(value = "规格型号")
    private String specificationModel;
    @ApiModelProperty(value = "资产类型")
    private String assetTypeName;
    private String category;
    @ApiModelProperty(value = "计量单位")
    private String measurementUnit;


 ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationStorageMapper.xml

@@ -48,19 +48,18 @@
        ORDER BY oas.storage_time DESC, oas.id DESC
    </select>
    <select id="pageList" resultType="com.ruoyi.system.vo.StorageListVO">
        select t1.*,t2.type_name    as assetTypeName,
        select t1.*,t2.type_name    as assetTypeName,t4.dept_name as ownershipDeptName,
               case
                   when t1.use_dept_id is not null and t1.use_dept_id != '' then t3.dept_name
                   when t1.address is not null and t1.address != '' then t1.address
                   when t1.warehouse_name is not null and t1.warehouse_name != '' then t1.warehouse_name
                   else null
                   end as useName


               from oa_approval_application_storage_asset t1
                             left join asset_type t2 on t2.id = t1.asset_type_id
                             left join t_dept t3 on t3.id = t1.ownership_dept_id
        where t1.approval_application_id = #{query.approvalApplicationId}
                             left join t_dept t3 on t3.id = t1.use_dept_id
                             left join t_dept t4 on t4.id = t1.ownership_dept_id
        where t1.approval_application_id = #{query.id}
        order by t1.create_time  desc



 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -172,7 +172,9 @@
        select u.user_id AS userId, u.dept_id AS deptId, u.user_name AS userName, u.nick_name AS nickName, u.email AS email, u.avatar AS avatar,
               u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp,u.code,
               u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack
        ,d.dept_name AS deptName
        from sys_user u
        left join t_dept d on u.dept_id = d.id
        WHERE u.del_flag = 0
    </select>
    <select id="selectCount" resultType="java.lang.Integer">