射洪城投
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
mitao
1 天以前 236fb6ff1f6a955db5f78560204e042e977e2167 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowAuditController.java


@@ -7,22 +7,89 @@


import com.ruoyi.common.core.domain.R;


import com.ruoyi.common.core.domain.entity.SysUser;


import com.ruoyi.common.core.domain.entity.TDept;


import com.ruoyi.common.core.domain.model.LoginUser;


import com.ruoyi.common.enums.BusinessType;


import com.ruoyi.framework.web.service.TokenService;


import com.ruoyi.system.dto.AddLeaveDTO;


import com.ruoyi.system.dto.AuditDTO;


import com.ruoyi.system.emums.ApprovalTypeEnum;


import com.ruoyi.system.model.*;


import com.ruoyi.system.model.AssetMain;


import com.ruoyi.system.model.AssetType;


import com.ruoyi.system.model.OaApproval;


import com.ruoyi.system.model.OaApprovalApplicationAdvertisement;


import com.ruoyi.system.model.OaApprovalApplicationAsset;


import com.ruoyi.system.model.OaApprovalApplicationAssetItem;


import com.ruoyi.system.model.OaApprovalApplicationAttendance;


import com.ruoyi.system.model.OaApprovalApplicationChange;


import com.ruoyi.system.model.OaApprovalApplicationContract;


import com.ruoyi.system.model.OaApprovalApplicationDispose;


import com.ruoyi.system.model.OaApprovalApplicationMoney;


import com.ruoyi.system.model.OaApprovalApplicationPayment;


import com.ruoyi.system.model.OaApprovalApplicationPurchase;


import com.ruoyi.system.model.OaApprovalApplicationReimbursement;


import com.ruoyi.system.model.OaApprovalApplicationReimbursementItem;


import com.ruoyi.system.model.OaApprovalApplicationStorage;


import com.ruoyi.system.model.OaApprovalApplications;


import com.ruoyi.system.model.OaApprovalFlowAudit;


import com.ruoyi.system.model.OaApprovalFlowNode;


import com.ruoyi.system.model.OaApprovalTodo;


import com.ruoyi.system.query.ApprovalDetailQuery;


import com.ruoyi.system.query.ApprovalTodoListQuery;


import com.ruoyi.system.service.*;


import com.ruoyi.system.vo.*;


import com.ruoyi.system.service.AssetMainService;


import com.ruoyi.system.service.AssetTypeService;


import com.ruoyi.system.service.ISysUserService;


import com.ruoyi.system.service.OaApprovalApplicationAdvertisementService;


import com.ruoyi.system.service.OaApprovalApplicationAssetItemService;


import com.ruoyi.system.service.OaApprovalApplicationAssetService;


import com.ruoyi.system.service.OaApprovalApplicationAttendanceService;


import com.ruoyi.system.service.OaApprovalApplicationChangeService;


import com.ruoyi.system.service.OaApprovalApplicationContactService;


import com.ruoyi.system.service.OaApprovalApplicationContractService;


import com.ruoyi.system.service.OaApprovalApplicationDisposeService;


import com.ruoyi.system.service.OaApprovalApplicationMoneyService;


import com.ruoyi.system.service.OaApprovalApplicationPaymentService;


import com.ruoyi.system.service.OaApprovalApplicationPurchaseItemService;


import com.ruoyi.system.service.OaApprovalApplicationPurchaseService;


import com.ruoyi.system.service.OaApprovalApplicationReimbursementItemService;


import com.ruoyi.system.service.OaApprovalApplicationReimbursementService;


import com.ruoyi.system.service.OaApprovalApplicationStorageAssetService;


import com.ruoyi.system.service.OaApprovalApplicationStorageService;


import com.ruoyi.system.service.OaApprovalApplicationsService;


import com.ruoyi.system.service.OaApprovalFlowAuditService;


import com.ruoyi.system.service.OaApprovalFlowNodeService;


import com.ruoyi.system.service.OaApprovalFlowService;


import com.ruoyi.system.service.OaApprovalService;


import com.ruoyi.system.service.OaApprovalTodoService;


import com.ruoyi.system.service.TDeptService;


import com.ruoyi.system.vo.AdvertisementDetailVO;


import com.ruoyi.system.vo.ApprovalFlowNodeListVO;


import com.ruoyi.system.vo.ApprovalTodoVO;


import com.ruoyi.system.vo.BackDetailVO;


import com.ruoyi.system.vo.BorrowDetailVO;


import com.ruoyi.system.vo.BusinessTripDetailVO;


import com.ruoyi.system.vo.ChangeDetailVO;


import com.ruoyi.system.vo.ContactDetailVO;


import com.ruoyi.system.vo.ContractDetailVO;


import com.ruoyi.system.vo.DisposeDetailVO;


import com.ruoyi.system.vo.GrabDetailVO;


import com.ruoyi.system.vo.GrabListVO;


import com.ruoyi.system.vo.LeaveDestroyDetailVO;


import com.ruoyi.system.vo.LeaveDetailVO;


import com.ruoyi.system.vo.MoneyDetailVO;


import com.ruoyi.system.vo.OutDetailVO;


import com.ruoyi.system.vo.PaymentDetailVO;


import com.ruoyi.system.vo.PurchaseDetailVO;


import com.ruoyi.system.vo.PurchaseListVO;


import com.ruoyi.system.vo.ReimbursementDetailVO;


import com.ruoyi.system.vo.StorageDetailVO;


import com.ruoyi.system.vo.StorageListVO;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import io.swagger.annotations.ApiParam;


import org.springframework.util.StringUtils;


import org.springframework.web.bind.annotation.*;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;




import javax.annotation.Resource;


import java.time.LocalDateTime;


@@ -74,6 +141,8 @@


    private OaApprovalApplicationMoneyService approvalApplicationMoneyService;


    @Resource


    private AssetMainService assetMainService;


    @Resource


    private OaApprovalApplicationStorageAssetService oaApprovalApplicationStorageAssetService;


    @Resource


    private OaApprovalApplicationReimbursementService approvalApplicationReimbursementService;


    @Resource


@@ -1076,6 +1145,10 @@


                    }


                    assetMainService.updateBatchById(assetMains);


                }


                //如果为资产入库审批，处理审批通过逻辑，创建该审批的资产信息


                if (approval.getApprovalCategory().equals(ApprovalTypeEnum.IN_STOCK.getCode())) {


                    assetMainService.saveAssetByApprovalApplicationId(approvalApplications.getId());


                }


            }else{


                // 生成下一个节点的待办事项


                for (int i = 0; i < approvalFlowNodes.size(); i++) {