业务模块接口测试，代码修复

ruoyi-admin/src/main/resources/application-druid.yml

@@ -18,9 +18,11 @@ spring:
                 # 从数据源开关/默认关闭       增加--多数据源
                 enabled: true
 #                url: jdbc:oracle:thin:@//192.168.77.136:1521/xe
-                url: jdbc:oracle:thin:@192.168.77.136:1521:xe
+                url: jdbc:oracle:thin:@localhost:1521:orcl
                 driverClassName: oracle.jdbc.OracleDriver
-                username: dcuc
+#                username: dcuc
+#                password: 123
+                username: c##dcuc
                 password: 123
             # 初始连接数
             initialSize: 5

ruoyi-admin/src/main/resources/application.yml

@@ -7,7 +7,10 @@ ruoyi:
   # 版权年份
   copyrightYear: 2024
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: /Users/fangtasyj/Desktop/HHWY   # 测试路径
+  # linux测试路径
+  # profile: /Users/fangtasyj/Desktop/HHWY
+  # windows测试路径
+  profile: D:/ruoyi/upload
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证

ruoyi-zzb/src/main/java/com/ruoyi/zzb/dbjz/domain/DbjzApplyInfo.java

@@ -53,12 +53,12 @@ public class DbjzApplyInfo {
     @TableField(fill = FieldFill.INSERT)
     private String approveStatusName;
 
-    @TableField(fill = FieldFill.INSERT)
+    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
-    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @TableField(value = "UPDATE_TIME", fill = FieldFill.INSERT_UPDATE)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;

ruoyi-zzb/src/main/java/com/ruoyi/zzb/dbjz/service/DbjzService.java

@@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Slf4j
@@ -147,6 +148,7 @@ public class DbjzService {
         dbjzApplyInfoDTO.setApproveStatusCode(optFlag);
         String optDesc = "1".equals(optFlag)? "同意":"驳回";
         dbjzApplyInfoDTO.setApproveStatusName(optDesc);
+        dbjzApplyInfoDTO.setUpdateTime(new Date());
         int updateRows = dbjzApplyInfoMapper.update(dbjzApplyInfoDTO, updateWrapper);
         if(updateRows > 0){
             log.info("【大病救助】申请信息已审批  申请单ID：{}，审批操作描述：{}", applyFormId, optDesc);
@@ -156,7 +158,7 @@ public class DbjzService {
             baseApproveInfo.setApplyFormId(applyFormId);
             QueryWrapper<DbjzApplyInfo> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("APPLY_FORM_ID", applyFormId);
-            DbjzApplyInfo dbjzApplyInfo = dbjzApplyInfoMapper.selectById(applyFormId);
+            DbjzApplyInfo dbjzApplyInfo = dbjzApplyInfoMapper.selectOne(queryWrapper);
             baseApproveInfo.setCreateUserId(dbjzApplyInfo.getCreateUserId());
             baseApproveInfo.setCreateUserName(dbjzApplyInfo.getCreateUserName());
             baseApproveInfo.setCreateUserPoliceNo(dbjzApplyInfo.getCreateUserPoliceNo());
@@ -234,7 +236,7 @@ public class DbjzService {
         String applyFormId = dbjzApplyInfo.getApplyFormId();
         QueryWrapper<DbjzApplyInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("APPLY_FORM_ID", applyFormId);
-        DbjzApplyInfo dbDbjzApplyInfo = dbjzApplyInfoMapper.selectById(applyFormId);
+        DbjzApplyInfo dbDbjzApplyInfo = dbjzApplyInfoMapper.selectOne(queryWrapper);
         // 如果当前申请信息对象dbjzApplyInfo的申请单ID在数据库中不存在（前端生成），代表是新增操作
         if(dbDbjzApplyInfo == null){
             // 设置当前登录的用户信息
@@ -254,6 +256,7 @@ public class DbjzService {
             // 根据申请单ID和dbjzApplyInfo对象中的当前属性值去修改当前申请记录
             UpdateWrapper<DbjzApplyInfo> updateWrapper = new UpdateWrapper<>();
             updateWrapper.eq("APPLY_FORM_ID", applyFormId);
+            dbjzApplyInfo.setUpdateTime(new Date());
             int updateRows = dbjzApplyInfoMapper.update(dbjzApplyInfo, updateWrapper);
             if(updateRows > 0){
                 log.info("【大病救助】申请信息修改成功  申请单ID：{}", applyFormId);

ruoyi-zzb/src/main/java/com/ruoyi/zzb/hybz/controller/HybzController.java

@@ -31,7 +31,7 @@ public class HybzController {
      * @param
      * @return
      */
-    @PostMapping("/saveOrUpdate")
+    /*@PostMapping("/saveOrUpdate")
     public JSONObject saveOrUpdate(HybzApplyInfo hybzApplyInfo, HybzFileSetDTO hybzFileSetDTO){
         try {
             // 文件上传路径
@@ -56,7 +56,7 @@ public class HybzController {
             log.error("【会员保障】申请信息保存/修改失败", e);
             return RspResult.error("【会员保障】申请信息保存/修改失败 - " + e.getMessage());
         }
-    }
+    }*/
 
     @PostMapping("/approve")
     public JSONObject approve(@RequestBody JSONObject reqBody){

ruoyi-zzb/src/main/java/com/ruoyi/zzb/hybz/service/HybzService.java

@@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Slf4j
@@ -155,6 +156,7 @@ public class HybzService {
         hybzApplyInfoDTO.setApproveStatusCode(optFlag);
         String optDesc = "1".equals(optFlag) ? "同意" : "驳回";
         hybzApplyInfoDTO.setApproveStatusName(optDesc);
+        hybzApplyInfoDTO.setUpdateTime(new Date());
         int updateRows = hybzApplyInfoMapper.update(hybzApplyInfoDTO, updateWrapper);
         if (updateRows > 0) {
             log.info("【住院慰问】申请信息已审批  申请单ID：{}，审批操作描述：{}", applyFormId, optDesc);
@@ -164,7 +166,7 @@ public class HybzService {
             baseApproveInfo.setApplyFormId(applyFormId);
             QueryWrapper<HybzApplyInfo> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("APPLY_FORM_ID", applyFormId);
-            HybzApplyInfo hybzApplyInfo = hybzApplyInfoMapper.selectById(applyFormId);
+            HybzApplyInfo hybzApplyInfo = hybzApplyInfoMapper.selectOne(queryWrapper);
             baseApproveInfo.setCreateUserId(hybzApplyInfo.getCreateUserId());
             baseApproveInfo.setCreateUserName(hybzApplyInfo.getCreateUserName());
             baseApproveInfo.setCreateUserPoliceNo(hybzApplyInfo.getCreateUserPoliceNo());
@@ -263,6 +265,7 @@ public class HybzService {
             // 根据申请单ID和hybzApplyInfo对象中的当前属性值去修改当前申请记录
             UpdateWrapper<HybzApplyInfo> updateWrapper = new UpdateWrapper<>();
             updateWrapper.eq("APPLY_FORM_ID", applyFormId);
+            hybzApplyInfo.setUpdateTime(new Date());
             int updateRows = hybzApplyInfoMapper.update(hybzApplyInfo, updateWrapper);
             if(updateRows > 0){
                 log.info("【会员保障】申请信息修改成功  申请单ID：{}", applyFormId);

ruoyi-zzb/src/main/java/com/ruoyi/zzb/zyww/service/ZywwService.java

@@ -176,6 +176,7 @@ public class ZywwService {
             // 根据申请单ID和zywwApplyInfo对象中的当前属性值去修改当前申请记录
             UpdateWrapper<ZywwApplyInfo> updateWrapper = new UpdateWrapper<>();
             updateWrapper.eq("APPLY_FORM_ID", applyFormId);
+            zywwApplyInfo.setUpdateTime(new Date());
             int updateRows = zywwApplyInfoMapper.update(zywwApplyInfo, updateWrapper);
             if(updateRows > 0){
                 log.info("【住院慰问】申请信息修改成功  申请单ID：{}", applyFormId);