diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryService.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryService.java index 74490d5..7f8ef46 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryService.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/category/service/CategoryService.java @@ -1,5 +1,6 @@ package net.lab1024.sa.admin.module.business.category.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.google.common.collect.Lists; import net.lab1024.sa.admin.module.business.category.dao.CategoryDao; import net.lab1024.sa.admin.module.business.category.domain.dto.CategorySimpleDTO; @@ -210,6 +211,6 @@ public class CategoryService { } public List getAllCategory() { - return categoryDao.selectList(null); + return categoryDao.selectList(new LambdaQueryWrapper().eq(CategoryEntity::getDeletedFlag,0)); } } diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/service/GoodsService.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/service/GoodsService.java index 8ced63d..2afa5d0 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/service/GoodsService.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/business/goods/service/GoodsService.java @@ -2,6 +2,7 @@ package net.lab1024.sa.admin.module.business.goods.service; import cn.idev.excel.FastExcel; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import net.lab1024.sa.admin.module.business.category.constant.CategoryTypeEnum; @@ -64,7 +65,7 @@ public class GoodsService { private DictService dictService; public List getAllGoods() { - return goodsDao.selectList(null); + return goodsDao.selectList(new LambdaQueryWrapper().eq(GoodsEntity::getDeletedFlag,0)); } /** diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/controller/ServiceApplicationsController.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/controller/ServiceApplicationsController.java index 26110aa..e5c3974 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/controller/ServiceApplicationsController.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/controller/ServiceApplicationsController.java @@ -52,7 +52,12 @@ public class ServiceApplicationsController { public ResponseDTO update(@RequestBody @Valid ServiceApplicationsUpdateForm updateForm) { return serviceApplicationsService.update(updateForm); } - + @Operation(summary = "审核 @author wzh") + @PostMapping("/serviceApplications/review") + @SaCheckPermission("serviceApplications:review") + public ResponseDTO review(@RequestBody @Valid ServiceApplicationsUpdateForm updateForm) { + return serviceApplicationsService.review(updateForm); + } @Operation(summary = "批量提交 @author wzh") @PostMapping("/serviceApplications/batchSubmit") @SaCheckPermission("serviceApplications:batchSubmit") @@ -60,13 +65,20 @@ public class ServiceApplicationsController { return serviceApplicationsService.batchSubmit(idList); } - @Operation(summary = "提交 @author wzh") + @Operation(summary = "编辑时提交 @author wzh") @GetMapping("/serviceApplications/submit/{applicationId}") @SaCheckPermission("serviceApplications:submit") public ResponseDTO submit(@PathVariable Integer applicationId) { return serviceApplicationsService.submit(applicationId); } + @Operation(summary = "新增时提交 @author wzh") + @PostMapping("/serviceApplications/addSubmit") + @SaCheckPermission("serviceApplications:addSubmit") + public ResponseDTO addSubmit(@RequestBody @Valid ServiceApplicationsAddForm addForm) { + return serviceApplicationsService.addSubmit(addForm); + } + @Operation(summary = "批量删除 @author wzh") @PostMapping("/serviceApplications/batchDelete") @SaCheckPermission("serviceApplications:delete") diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/entity/ServiceApplicationsEntity.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/entity/ServiceApplicationsEntity.java index ca91b3b..abdfced 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/entity/ServiceApplicationsEntity.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/entity/ServiceApplicationsEntity.java @@ -25,17 +25,17 @@ public class ServiceApplicationsEntity { * 申报ID */ @TableId(type = IdType.AUTO) - private Integer applicationId; + private Long applicationId; /** * 申报律师ID */ - private Integer userId; + private Long userId; /** * 律所ID */ - private Integer firmId; + private Long firmId; /** * 服务开始时间 @@ -50,7 +50,7 @@ public class ServiceApplicationsEntity { /** * 服务时长（小时） */ - private BigDecimal serviceDuration; + private Double serviceDuration; /** * 受益人数 @@ -162,11 +162,11 @@ public class ServiceApplicationsEntity { /** * 活动类别 */ - private String activityCategoryId; + private Long activityCategoryId; /** * 活动名称 */ - private String activityNameId; + private Long activityNameId; /** * 附件id diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsAddForm.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsAddForm.java index f06c942..4e0b8bb 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsAddForm.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsAddForm.java @@ -17,7 +17,7 @@ import lombok.Data; @Data public class ServiceApplicationsAddForm { - + private Long applicationId; @Schema(description = "申报律师", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "申报律师 不能为空") private Integer userId; diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsUpdateForm.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsUpdateForm.java index 1c730f7..c657dc6 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsUpdateForm.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/domain/form/ServiceApplicationsUpdateForm.java @@ -13,11 +13,13 @@ import lombok.Data; */ @Data -public class ServiceApplicationsUpdateForm { +public class ServiceApplicationsUpdateForm{ @Schema(description = "申报ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "申报ID 不能为空") private Integer applicationId; + @Schema(description = "律所审核状态") + private Integer firmAuditStatus; } \ No newline at end of file diff --git a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java index 35ec67a..1144794 100644 --- a/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java +++ b/yun-admin/src/main/java/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.java @@ -43,6 +43,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import java.io.IOException; import java.util.ArrayList; import java.time.LocalDateTime; @@ -85,10 +86,18 @@ public class ServiceApplicationsService { if (!CollectionUtils.isEmpty(list)) { //翻译单位名称和用户名称 list.forEach(item -> { - item.setDepartmentName(departmentService.queryByFirmId(item.getFirmId()).getDepartmentName()); // Fixed method call - item.setUserName(employeeService.queryById(item.getUserId()).getActualName()); - item.setActivityCategory(categoryService.queryById(item.getActivityCategoryId()).getCategoryName()); - item.setActivityName(goodsService.queryById(item.getActivityNameId()).getGoodsName()); + if (item.getFirmId() != null) { + item.setDepartmentName(departmentService.queryByFirmId(item.getFirmId()).getDepartmentName()); + } + if (item.getUserId() != null){ + item.setUserName(employeeService.queryById(item.getUserId()).getActualName()); + } + if (item.getActivityCategoryId() != null) { + item.setActivityCategory(categoryService.queryById(item.getActivityCategoryId()).getCategoryName()); + } + if (item.getActivityNameId() != null) { + item.setActivityName(goodsService.queryById(item.getActivityNameId()).getGoodsName()); + } }); } return SmartPageUtil.convert2PageResult(page, list); @@ -221,7 +230,18 @@ public class ServiceApplicationsService { } ServiceApplicationsEntity entity = SmartBeanUtil.copy(form, ServiceApplicationsEntity.class); - + if (form.getUserId() != null) { + entity.setUserId(Long.valueOf(form.getUserId())); + } + if (form.getFirmId() != null) { + entity.setFirmId(Long.valueOf(form.getFirmId())); + } + if (form.getActivityCategoryId() != null) { + entity.setActivityCategoryId(Long.valueOf(form.getActivityCategoryId())); + } + if (form.getActivityNameId() != null) { + entity.setActivityNameId(Long.valueOf(form.getActivityNameId())); + } return entity; } @@ -247,7 +267,7 @@ public class ServiceApplicationsService { exampleVO.setServiceDuration(8.0); exampleVO.setOrganizerName("北京市司法局"); exampleVO.setOrganizerContact("李主任"); - exampleVO.setOrganizerPhone("010-12345678"); + exampleVO.setOrganizerPhone("18710238495"); exampleVO.setServiceContent("提供免费法律咨询服务"); templateList.add(exampleVO); @@ -320,7 +340,26 @@ public class ServiceApplicationsService { serviceApplicationsDao.batchSubmit(idList, ReviewEnum.APPROVAL.getValue()); return ResponseDTO.ok(); } - + + public ResponseDTO addSubmit(@Valid ServiceApplicationsAddForm addForm) { + ServiceApplicationsEntity serviceApplicationsEntity = SmartBeanUtil.copy(addForm, ServiceApplicationsEntity.class); + serviceApplicationsEntity.setRecordStatus(ReviewEnum.APPROVAL.getValue()); + if (null == addForm.getApplicationId()){ + serviceApplicationsDao.insert(serviceApplicationsEntity); + }else { + serviceApplicationsDao.updateById(serviceApplicationsEntity); + } + + return ResponseDTO.ok(); + } + + public ResponseDTO review(@Valid ServiceApplicationsUpdateForm updateForm) { + ServiceApplicationsEntity serviceApplicationsEntity = serviceApplicationsDao.selectById(updateForm.getApplicationId()); + serviceApplicationsEntity.setFirmAuditStatus(updateForm.getFirmAuditStatus()); + serviceApplicationsDao.updateById(serviceApplicationsEntity); + return ResponseDTO.ok(); + } + /** * Excel下拉列表处理器 */ diff --git a/yun-admin/target/classes/net/lab1024/sa/admin/module/service/controller/ServiceApplicationsController.class b/yun-admin/target/classes/net/lab1024/sa/admin/module/service/controller/ServiceApplicationsController.class index 9b109b3..2317ade 100644 Binary files a/yun-admin/target/classes/net/lab1024/sa/admin/module/service/controller/ServiceApplicationsController.class and b/yun-admin/target/classes/net/lab1024/sa/admin/module/service/controller/ServiceApplicationsController.class differ diff --git a/yun-admin/target/classes/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService$DropdownSheetWriteHandler.class b/yun-admin/target/classes/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService$DropdownSheetWriteHandler.class index cd01b58..5ee384f 100644 Binary files a/yun-admin/target/classes/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService$DropdownSheetWriteHandler.class and b/yun-admin/target/classes/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService$DropdownSheetWriteHandler.class differ diff --git a/yun-admin/target/classes/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.class b/yun-admin/target/classes/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.class index ba6ee03..f8709d2 100644 Binary files a/yun-admin/target/classes/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.class and b/yun-admin/target/classes/net/lab1024/sa/admin/module/service/service/ServiceApplicationsService.class differ