Merge remote-tracking branch 'origin/main'

yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/AuthenticateController.java

@@ -60,9 +60,20 @@ public class AuthenticateController {
         return recordService.getRecordPage(recordPageReqVO);
     }
 
-    @PostMapping("/create")
+    /**
+     * 新增鉴定申请
+     * @param createReqVO
+     * @return
+     */
+    @PostMapping("/create/apply")
+    @Operation(summary = "创建档案鉴定申请")
+    @PreAuthorize("@ss.hasPermission('archives:authenticate:create')")
+    public CommonResult<Long> createApply(@Valid @RequestBody AuthenticateCreateReqVO createReqVO) {
+        return success(authenticateService.createApply(createReqVO));
+    }
     @Operation(summary = "创建档案鉴定历史")
     @PreAuthorize("@ss.hasPermission('archives:authenticate:create')")
+    @PostMapping("/create")
     public CommonResult<Long> createAuthenticate(@Valid @RequestBody AuthenticateCreateReqVO createReqVO) {
         return success(authenticateService.createAuthenticate(createReqVO));
     }

yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticateBaseVO.java

@@ -63,4 +63,7 @@ public class AuthenticateBaseVO {
     @Schema(description = "备注", example = "你猜")
     private String remark;
 
+    @Schema(description = "鉴定结果", example = "鉴定结果")
+    private String result;
+
 }

yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/controller/admin/authenticate/vo/AuthenticateExcelVO.java

@@ -66,4 +66,7 @@ public class AuthenticateExcelVO {
     @ExcelProperty("备注")
     private String remark;
 
+    @ExcelProperty("鉴定结果")
+    private String result;
+
 }

yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/authenticate/AuthenticateService.java

@@ -67,4 +67,10 @@ public interface AuthenticateService {
      */
     List<AuthenticateDO> getAuthenticateList(AuthenticateExportReqVO exportReqVO);
 
+    /**
+     * 创建档案鉴定申请
+     * @param createReqVO
+     * @return
+     */
+    Long createApply(AuthenticateCreateReqVO createReqVO);
 }

yudao-module-archives/yudao-module-archives-biz/src/main/java/cn/iocoder/yudao/module/archives/service/authenticate/AuthenticateServiceImpl.java

@@ -1,7 +1,15 @@
 package cn.iocoder.yudao.module.archives.service.authenticate;
 
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.archives.dal.dataobject.record.RecordDO;
+import cn.iocoder.yudao.module.archives.dal.mysql.record.RecordMapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import org.apache.poi.hssf.record.Record;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import java.util.*;
@@ -27,6 +35,9 @@ public class AuthenticateServiceImpl implements AuthenticateService {
     @Resource
     private AuthenticateMapper authenticateMapper;
 
+    @Resource
+    private RecordMapper recordMapper;
+
     @Override
     public Long createAuthenticate(AuthenticateCreateReqVO createReqVO) {
         // 插入
@@ -79,4 +90,24 @@ public class AuthenticateServiceImpl implements AuthenticateService {
         return authenticateMapper.selectList(exportReqVO);
     }
 
+    /**
+     * 新增鉴定申请
+     * @param createReqVO
+     * @return
+     */
+    @Override
+    @Transactional
+    public Long createApply(AuthenticateCreateReqVO createReqVO) {
+        AuthenticateDO authenticate = AuthenticateConvert.INSTANCE.convert(createReqVO);
+        //修改档案状态为已鉴定
+        RecordDO recordDO = new RecordDO();
+        LambdaUpdateWrapper<RecordDO> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.set(RecordDO::getIdentifyStatus,1).eq(RecordDO::getId,createReqVO.getRecordId());
+        recordMapper.update(recordDO,wrapper);
+
+        //新增鉴定申请记录
+        authenticateMapper.insert(authenticate);
+        return authenticate.getId();
+    }
+
 }