zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 优化过鱼设施填报逻辑

Browse Source
This commit is contained in:
tangwei 2026-04-22 13:45:53 +08:00
parent 10946f8476
commit d040297adb
6 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/com/yfd/platform/config/SwaggerConfig.java
View File

@ -54,4 +54,6 @@ public class SwaggerConfig {
.packagesToScan("com.yfd.platform.env.controller") .packagesToScan("com.yfd.platform.env.controller")
.build(); .build();
} }
} }

21
backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java
View File

@ -78,7 +78,7 @@ public class FishDraftDataController {
@GetMapping("/getByApprovalId") @GetMapping("/getByApprovalId")
@Operation(summary = "根据审批批次ID查询") @Operation(summary = "根据审批批次ID查询")
public ResponseResult getByApprovalId(@RequestParam Long approvalId) { public ResponseResult getByApprovalId(@RequestParam String approvalId) {
List<FishDraftData> list = fishDraftDataService.getByApprovalId(approvalId); List<FishDraftData> list = fishDraftDataService.getByApprovalId(approvalId);
return ResponseResult.successData(list); return ResponseResult.successData(list);
} }
@ -113,7 +113,7 @@ public class FishDraftDataController {
@PostMapping("/removeDraft") @PostMapping("/removeDraft")
@Operation(summary = "删除草稿（软删除）") @Operation(summary = "删除草稿（软删除）")
public ResponseResult removeDraft(@RequestParam Long id, public ResponseResult removeDraft(@RequestParam String id,
@RequestParam String operatorId) { @RequestParam String operatorId) {
boolean result = fishDraftDataService.removeDraft(id, operatorId); boolean result = fishDraftDataService.removeDraft(id, operatorId);
return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败");
@ -121,7 +121,7 @@ public class FishDraftDataController {
@PostMapping("/submitDraft") @PostMapping("/submitDraft")
@Operation(summary = "提交草稿") @Operation(summary = "提交草稿")
public ResponseResult submitDraft(@RequestParam Long id, public ResponseResult submitDraft(@RequestParam String id,
@RequestParam String operatorId) { @RequestParam String operatorId) {
boolean result = fishDraftDataService.submitDraft(id, operatorId); boolean result = fishDraftDataService.submitDraft(id, operatorId);
return result ? ResponseResult.success("提交成功") : ResponseResult.error("提交失败"); return result ? ResponseResult.success("提交成功") : ResponseResult.error("提交失败");
@ -129,7 +129,7 @@ public class FishDraftDataController {
@PostMapping("/submitDrafts") @PostMapping("/submitDrafts")
@Operation(summary = "批量提交草稿") @Operation(summary = "批量提交草稿")
public ResponseResult submitDrafts(@RequestBody List<Long> ids, public ResponseResult submitDrafts(@RequestBody List<String> ids,
@RequestParam String operatorId) { @RequestParam String operatorId) {
boolean result = fishDraftDataService.submitDrafts(ids, operatorId); boolean result = fishDraftDataService.submitDrafts(ids, operatorId);
return result ? ResponseResult.success("提交成功") : ResponseResult.error("提交失败"); return result ? ResponseResult.success("提交成功") : ResponseResult.error("提交失败");
@ -137,14 +137,14 @@ public class FishDraftDataController {
@PostMapping("/lockDraft") @PostMapping("/lockDraft")
@Operation(summary = "锁定草稿") @Operation(summary = "锁定草稿")
public ResponseResult lockDraft(@RequestParam Long id) { public ResponseResult lockDraft(@RequestParam String id) {
boolean result = fishDraftDataService.lockDraft(id); boolean result = fishDraftDataService.lockDraft(id);
return result ? ResponseResult.success("锁定成功") : ResponseResult.error("锁定失败"); return result ? ResponseResult.success("锁定成功") : ResponseResult.error("锁定失败");
} }
@PostMapping("/unlockDraft") @PostMapping("/unlockDraft")
@Operation(summary = "解锁草稿") @Operation(summary = "解锁草稿")
public ResponseResult unlockDraft(@RequestParam Long id) { public ResponseResult unlockDraft(@RequestParam String id) {
boolean result = fishDraftDataService.unlockDraft(id); boolean result = fishDraftDataService.unlockDraft(id);
return result ? ResponseResult.success("解锁成功") : ResponseResult.error("解锁失败"); return result ? ResponseResult.success("解锁成功") : ResponseResult.error("解锁失败");
} }
@ -165,11 +165,18 @@ public class FishDraftDataController {
@PostMapping("/delete") @PostMapping("/delete")
@Operation(summary = "删除过鱼数据") @Operation(summary = "删除过鱼数据")
public ResponseResult delete(@RequestParam Long id) { public ResponseResult delete(@RequestParam String id) {
boolean result = fishDraftDataService.removeById(id); boolean result = fishDraftDataService.removeById(id);
return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败");
} }
@PostMapping("/batchDelete")
@Operation(summary = "批量删除过鱼数据")
public ResponseResult batchDelete(@RequestBody List<String> ids) {
boolean result = fishDraftDataService.removeByIds(ids);
return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败");
}
@PostMapping("/importExcel") @PostMapping("/importExcel")
@Operation(summary = "导入Excel过鱼数据") @Operation(summary = "导入Excel过鱼数据")
public ResponseResult importExcel(@RequestParam("file") MultipartFile file, public ResponseResult importExcel(@RequestParam("file") MultipartFile file,

3
backend/src/main/java/com/yfd/platform/data/domain/FishDraftData.java
View File

@ -34,6 +34,7 @@ public class FishDraftData implements Serializable {
/** /**
* 所属基地编码 * 所属基地编码
*/ */
@TableField(exist = false)
private String baseId; private String baseId;
/** /**
@ -130,7 +131,7 @@ public class FishDraftData implements Serializable {
/** /**
* 水温 * 水温
*/ */
@TableField(exist = false) // @TableField(exist = false)
private BigDecimal wt; private BigDecimal wt;

2
backend/src/main/java/com/yfd/platform/data/mapper/FishDraftDataMapper.java
View File

@ -18,7 +18,7 @@ public interface FishDraftDataMapper extends BaseMapper<FishDraftData> {
* 根据审批批次ID查询草稿数据 * 根据审批批次ID查询草稿数据
*/ */
@Select("SELECT * FROM FISH_DRAFT_DATA WHERE APPROVAL_ID = #{approvalId} ORDER BY TM DESC") @Select("SELECT * FROM FISH_DRAFT_DATA WHERE APPROVAL_ID = #{approvalId} ORDER BY TM DESC")
List<FishDraftData> selectByApprovalId(@Param("approvalId") Long approvalId); List<FishDraftData> selectByApprovalId(@Param("approvalId") String approvalId);
/** /**
* 根据状态查询草稿数据 * 根据状态查询草稿数据

12
backend/src/main/java/com/yfd/platform/data/service/IFishDraftDataService.java
View File

@ -21,7 +21,7 @@ public interface IFishDraftDataService extends IService<FishDraftData> {
/** /**
* 根据审批批次ID查询 * 根据审批批次ID查询
*/ */
List<FishDraftData> getByApprovalId(Long approvalId); List<FishDraftData> getByApprovalId(String approvalId);
/** /**
* 根据状态查询 * 根据状态查询
@ -46,25 +46,25 @@ public interface IFishDraftDataService extends IService<FishDraftData> {
/** /**
* 删除草稿（软删除） * 删除草稿（软删除）
*/ */
boolean removeDraft(Long id, String operatorId); boolean removeDraft(String id, String operatorId);
/** /**
* 提交草稿 * 提交草稿
*/ */
boolean submitDraft(Long id, String operatorId); boolean submitDraft(String id, String operatorId);
/** /**
* 批量提交草稿 * 批量提交草稿
*/ */
boolean submitDrafts(List<Long> ids, String operatorId); boolean submitDrafts(List<String> ids, String operatorId);
/** /**
* 锁定草稿 * 锁定草稿
*/ */
boolean lockDraft(Long id); boolean lockDraft(String id);
/** /**
* 解锁草稿 * 解锁草稿
*/ */
boolean unlockDraft(Long id); boolean unlockDraft(String id);
} }

14
backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java
View File

@ -44,7 +44,7 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
} }
@Override @Override
public List<FishDraftData> getByApprovalId(Long approvalId) { public List<FishDraftData> getByApprovalId(String approvalId) {
return fishDraftDataMapper.selectByApprovalId(approvalId); return fishDraftDataMapper.selectByApprovalId(approvalId);
} }
@ -83,7 +83,7 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean removeDraft(Long id, String operatorId) { public boolean removeDraft(String id, String operatorId) {
FishDraftData fishDraftData = this.getById(id); FishDraftData fishDraftData = this.getById(id);
if (fishDraftData == null || fishDraftData.getLockFlag() == 1) { if (fishDraftData == null || fishDraftData.getLockFlag() == 1) {
return false; return false;
@ -97,7 +97,7 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean submitDraft(Long id, String operatorId) { public boolean submitDraft(String id, String operatorId) {
FishDraftData fishDraftData = this.getById(id); FishDraftData fishDraftData = this.getById(id);
if (fishDraftData == null || fishDraftData.getLockFlag() == 1) { if (fishDraftData == null || fishDraftData.getLockFlag() == 1) {
return false; return false;
@ -110,8 +110,8 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean submitDrafts(List<Long> ids, String operatorId) { public boolean submitDrafts(List<String> ids, String operatorId) {
for (Long id : ids) { for (String id : ids) {
FishDraftData fishDraftData = this.getById(id); FishDraftData fishDraftData = this.getById(id);
if (fishDraftData != null && fishDraftData.getLockFlag() == 0) { if (fishDraftData != null && fishDraftData.getLockFlag() == 0) {
fishDraftData.setStatus("SUBMITTED"); fishDraftData.setStatus("SUBMITTED");
@ -125,7 +125,7 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean lockDraft(Long id) { public boolean lockDraft(String id) {
FishDraftData fishDraftData = this.getById(id); FishDraftData fishDraftData = this.getById(id);
if (fishDraftData == null) { if (fishDraftData == null) {
return false; return false;
@ -137,7 +137,7 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean unlockDraft(Long id) { public boolean unlockDraft(String id) {
FishDraftData fishDraftData = this.getById(id); FishDraftData fishDraftData = this.getById(id);
if (fishDraftData == null) { if (fishDraftData == null) {
return false; return false;