ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetStatisticsController.java
@@ -241,6 +241,7 @@ if (StringUtils.hasLength(query.getNameOrCode())){ // 查询出资产名称或者资产编号符合条件的code List<Integer> assetMainIds = assetMainService.lambdaQuery() .eq(AssetMain::getAssetTypeId,8) .and(wrapper -> wrapper.like(AssetMain::getAssetName, query.getNameOrCode()) .or() .like(AssetMain::getAssetCode, query.getNameOrCode())) ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DrDisplacementController.java
@@ -2,10 +2,7 @@ import org.springframework.web.bind.annotation.RequestMapping; <<<<<<< HEAD ======= >>>>>>> origin/master import org.springframework.web.bind.annotation.RestController; /** @@ -25,7 +22,3 @@ public class DrDisplacementController { } <<<<<<< HEAD ======= >>>>>>> origin/master ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalController.java
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; /** * <p> @@ -38,6 +39,11 @@ public R<PageInfo<ApprovalVO>> pageList(@RequestBody ApprovalListQuery query) { return R.ok( oaApprovalService.pageList(query)); } @ApiOperation("流程设计不分页列表") @PostMapping("/listAll") public R<List<OaApproval>> listAll() { return R.ok( oaApprovalService.list()); } @ApiOperation(value = "启用禁用") @GetMapping(value = "/updateStatus") public R updateStatus(Integer id ) { ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalFlowAuditController.java
@@ -172,6 +172,7 @@ List<OaApprovalApplications> approvalApplications = approvalApplicationsService.lambdaQuery().in(OaApprovalApplications::getId, applicationIds).list(); for (OaApprovalApplications approvalApplication : approvalApplications) { ApprovalTodoVO approvalTodoVO = new ApprovalTodoVO(); approvalTodoVO.setReason(approvalApplication.getReason()); approvalTodoVO.setApprovalStatus(approvalApplication.getApprovalStatus()); approvalTodoVO.setApplicationReason(approvalApplication.getApplicationReason()); approvalTodoVO.setApprovalCategory(approvalMap.get(approvalApplication.getApprovalId()).getApprovalCategory()); @@ -373,6 +374,7 @@ List<OaApprovalApplications> approvalApplications = approvalApplicationsService.lambdaQuery().in(OaApprovalApplications::getId, applicationIds).list(); for (OaApprovalApplications approvalApplication : approvalApplications) { ApprovalTodoVO approvalTodoVO = new ApprovalTodoVO(); approvalTodoVO.setReason(approvalApplication.getReason()); approvalTodoVO.setApprovalStatus(approvalApplication.getApprovalStatus()); approvalTodoVO.setApplicationReason(approvalApplication.getApplicationReason()); approvalTodoVO.setApprovalCategory(approvalMap.get(approvalApplication.getApprovalId()).getApprovalCategory()); @@ -544,6 +546,7 @@ if (dto.getApprovalStatus() == 0) { // 中断审批流程 approvalApplications.setApprovalStatus(3); approvalApplications.setReason(dto.getReason()); approvalApplicationsService.updateById(approvalApplications); // 删除除当前审批人该申请单的未处理的所有待办 approvalTodoService.remove(new LambdaQueryWrapper<OaApprovalTodo>() @@ -659,7 +662,7 @@ private void saveAssetRecord(Integer type, String approvalType,List<Integer> assetMainIds) { List<AssetInventoryRecord> res = new ArrayList<>(); Map<Integer, Integer> warehouseMap = assetMainService.list().stream().collect(Collectors.toMap(AssetMain::getId, AssetMain::getWarehouseId)); Map<Integer, Integer> warehouseMap = assetMainService.lambdaQuery().isNotNull(AssetMain::getWarehouseId).list().stream().collect(Collectors.toMap(AssetMain::getId, AssetMain::getWarehouseId)); for (Integer assetMainId : assetMainIds) { AssetInventoryRecord assetInventoryRecord = new AssetInventoryRecord(); assetInventoryRecord.setAssetMainId(assetMainId); ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/AssetRepairRecordAddDTO.java
@@ -29,7 +29,7 @@ private String title; @ApiModelProperty(value = "维护资产类型ID", required = true) @NotBlank(message = "维护资产类型ID不能为空") @NotNull(message = "维护资产类型ID不能为空") private Integer assetTypeId; @ApiModelProperty(value = "当前维修状态：0-维修中，1-无需维修，2-维修完成", required = true) ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplications.java
@@ -86,6 +86,10 @@ @TableField("create_by") private String createBy; @ApiModelProperty(value = "审批不通过原因") @TableField("reason") private String reason; @ApiModelProperty(value = "更新时间") @TableField("update_time") private LocalDateTime updateTime; ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OaApprovalApplicationsServiceImpl.java
@@ -60,7 +60,7 @@ // 查询当天已生成的申请单号数量 Long count = this.lambdaQuery() .likeRight(OaApprovalApplications::getApplicationCode, prefix) .likeLeft(OaApprovalApplications::getApplicationCode, prefix) .ge(OaApprovalApplications::getCreateTime, LocalDate.now().atStartOfDay()) .lt(OaApprovalApplications::getCreateTime, LocalDate.now().plusDays(1).atStartOfDay()) .count(); ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -318,6 +318,7 @@ insertUserRole(userId, roleIds); } /** * 修改用户状态 * ruoyi-system/src/main/java/com/ruoyi/system/vo/ApprovalTodoVO.java
@@ -65,6 +65,8 @@ private String content; @ApiModelProperty(value = "项目名称") private String projectName; @ApiModelProperty(value = "审批驳回原因") private String reason; @ApiModelProperty(value = "审批状态 0-草稿，1-待审批，2-审批通过，3-审批拒绝 ，4-已撤回") private Integer approvalStatus;
@@ -33,7 +33,7 @@ <if test="query.userId != null "> and applicant_user_id like concat('%',#{query.userId},'%') </if> order by application_date desc order by create_time desc </select> </mapper> ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -406,7 +406,7 @@ <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if> <if test="userName != null and userName != ''">user_name = #{userName},</if> <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if> <if test="position != null and position != ''">nick_name = #{position},</if> <if test="position != null and position != ''">`position` = #{position},</if> <if test="positionTime != null">position_time = #{positionTime},</if> <if test="idCard != null and idCard != ''">id_card = #{idCard},</if> <if test="organization != null and organization != ''">organization = #{organization},</if>
