bug修改

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcButieController.java

@@ -85,7 +85,7 @@ public class SzxcButieController extends BaseController
         SysDept sysDept = deptService.selectDeptById(szxcButie.getDeptId());
         SysDept parentDept = deptService.selectDeptById(sysDept.getParentId());
         szxcButie.setAuditDeptid(parentDept.getDeptId());
-        szxcButie.setAuditName(parentDept.getDeptName());
+        szxcButie.setAuditDept(parentDept.getDeptName());
         return toAjax(szxcButieService.insertSzxcButie(szxcButie));
     }
 

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcVisitRecardController.java

@@ -84,7 +84,7 @@ public class SzxcVisitRecardController extends BaseController
         SysDept sysDept = deptService.selectDeptById(szxcVisitRecard.getDeptId());
         SysDept parentDept = deptService.selectDeptById(sysDept.getParentId());
         szxcVisitRecard.setAuditDeptid(parentDept.getDeptId());
-        szxcVisitRecard.setAuditName(parentDept.getDeptName());
+        szxcVisitRecard.setAuditDept(parentDept.getDeptName());
         return toAjax(szxcVisitRecardService.insertSzxcVisitRecard(szxcVisitRecard));
     }
 

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWishManageController.java

@@ -9,9 +9,12 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.szxc.domain.SzxcWishManage;
+import com.ruoyi.szxc.domain.SzxcXyAuditRecard;
 import com.ruoyi.szxc.service.ISzxcWishManageService;
+import com.ruoyi.szxc.service.ISzxcXyAuditRecardService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -32,6 +35,9 @@ public class SzxcWishManageController extends BaseController
     private ISzxcWishManageService szxcWishManageService;
     @Resource
     private ISysDeptService deptService;
+    @Autowired
+    private ISzxcXyAuditRecardService szxcXyAuditRecardService;
+
     /**
      * 查询心愿管理列表
      */
@@ -99,6 +105,26 @@ public class SzxcWishManageController extends BaseController
         return toAjax(szxcWishManageService.updateSzxcWishManage(szxcWishManage));
     }
 
+    /**
+     * todo 审核心愿管理  (当前未使用，前端先调用修改心愿接口，成功后调用的审核记录新增接口)
+     */
+    @PreAuthorize("@ss.hasPermi('szxc:wish:audit')")
+    @Log(title = "心愿管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/audit")
+    @Transactional
+    public AjaxResult audit(@RequestBody SzxcWishManage szxcWishManage)
+    {
+        //同时新增审核记录
+        SzxcXyAuditRecard szxcXyAuditRecard = new SzxcXyAuditRecard();
+        szxcXyAuditRecard.setAuditDept(szxcWishManage.getAuditDept());
+        szxcXyAuditRecard.setAuditName(szxcWishManage.getAuditName());
+        szxcXyAuditRecard.setAuditReason(szxcWishManage.getAuditReason());
+        szxcXyAuditRecard.setAuditResult(szxcWishManage.getAuditResult());
+        szxcXyAuditRecard.setJlId(szxcWishManage.getId());
+        szxcXyAuditRecardService.insertSzxcXyAuditRecard(szxcXyAuditRecard);
+        return toAjax(szxcWishManageService.updateSzxcWishManage(szxcWishManage));
+    }
+
     /**
      * 删除心愿管理
      */

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcWorkRecardController.java

@@ -84,7 +84,7 @@ public class SzxcWorkRecardController extends BaseController
         SysDept sysDept = deptService.selectDeptById(szxcWorkRecard.getDeptId());
         SysDept parentDept = deptService.selectDeptById(sysDept.getParentId());
         szxcWorkRecard.setAuditDeptid(parentDept.getDeptId());
-        szxcWorkRecard.setAuditName(parentDept.getDeptName());
+        szxcWorkRecard.setAuditDept(parentDept.getDeptName());
         return toAjax(szxcWorkRecardService.insertSzxcWorkRecard(szxcWorkRecard));
     }
 

ruoyi-szxc/src/main/java/com/ruoyi/szxc/controller/SzxcXcRecardController.java

@@ -85,7 +85,7 @@ public class SzxcXcRecardController extends BaseController
         SysDept sysDept = deptService.selectDeptById(szxcXcRecard.getDeptId());
         SysDept parentDept = deptService.selectDeptById(sysDept.getParentId());
         szxcXcRecard.setAuditDeptid(parentDept.getDeptId());
-        szxcXcRecard.setAuditName(parentDept.getDeptName());
+        szxcXcRecard.setAuditDept(parentDept.getDeptName());
         return toAjax(szxcXcRecardService.insertSzxcXcRecard(szxcXcRecard));
     }
 

ruoyi-szxc/src/main/java/com/ruoyi/szxc/domain/SzxcButie.java

@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 补贴管理对象 szxc_butie
  *
  * @author hs
- * @date 2024-04-15
+ * @date 2024-04-17
  */
 public class SzxcButie extends BaseEntity
 {
@@ -58,6 +58,14 @@ public class SzxcButie extends BaseEntity
     @Excel(name = "备注")
     private String shRemark;
 
+    /** 审核部门id */
+    @Excel(name = "审核部门id")
+    private Long auditDeptid;
+
+    /** 审核部门 */
+    @Excel(name = "审核部门")
+    private String auditDept;
+
     /** 审核人 */
     @Excel(name = "审核人")
     private String auditName;
@@ -70,10 +78,6 @@ public class SzxcButie extends BaseEntity
     @Excel(name = "审核原由")
     private String auditReason;
 
-    /** 审核部门id */
-    @Excel(name = "审核部门id")
-    private Long auditDeptid;
-
     /** 部门id */
     @Excel(name = "部门id")
     private Long deptId;
@@ -185,6 +189,24 @@ public class SzxcButie extends BaseEntity
     {
         return shRemark;
     }
+    public void setAuditDeptid(Long auditDeptid)
+    {
+        this.auditDeptid = auditDeptid;
+    }
+
+    public Long getAuditDeptid()
+    {
+        return auditDeptid;
+    }
+    public void setAuditDept(String auditDept)
+    {
+        this.auditDept = auditDept;
+    }
+
+    public String getAuditDept()
+    {
+        return auditDept;
+    }
     public void setAuditName(String auditName)
     {
         this.auditName = auditName;
@@ -212,15 +234,6 @@ public class SzxcButie extends BaseEntity
     {
         return auditReason;
     }
-    public void setAuditDeptid(Long auditDeptid)
-    {
-        this.auditDeptid = auditDeptid;
-    }
-
-    public Long getAuditDeptid()
-    {
-        return auditDeptid;
-    }
     public void setDeptId(Long deptId)
     {
         this.deptId = deptId;
@@ -263,10 +276,11 @@ public class SzxcButie extends BaseEntity
                 .append("content", getContent())
                 .append("zfStatus", getZfStatus())
                 .append("shRemark", getShRemark())
+                .append("auditDeptid", getAuditDeptid())
+                .append("auditDept", getAuditDept())
                 .append("auditName", getAuditName())
                 .append("auditResult", getAuditResult())
                 .append("auditReason", getAuditReason())
-                .append("auditDeptid", getAuditDeptid())
                 .append("createBy", getCreateBy())
                 .append("createTime", getCreateTime())
                 .append("updateBy", getUpdateBy())

ruoyi-szxc/src/main/resources/mapper/szxc/SzxcButieMapper.xml

@@ -16,10 +16,11 @@
         <result property="content"    column="content"    />
         <result property="zfStatus"    column="zf_status"    />
         <result property="shRemark"    column="sh_remark"    />
+        <result property="auditDeptid"    column="audit_deptid"    />
+        <result property="auditDept"    column="audit_dept"    />
         <result property="auditName"    column="audit_name"    />
         <result property="auditResult"    column="audit_result"    />
         <result property="auditReason"    column="audit_reason"    />
-        <result property="auditDeptid"    column="audit_deptid"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -30,7 +31,7 @@
     </resultMap>
 
     <sql id="selectSzxcButieVo">
-        select id, type, xm_title, xm_id, year, money, jm_id, name, content, zf_status, sh_remark, audit_name, audit_result, audit_reason, audit_deptid, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_butie
+        select id, type, xm_title, xm_id, year, money, jm_id, name, content, zf_status, sh_remark, audit_deptid, audit_dept, audit_name, audit_result, audit_reason, create_by, create_time, update_by, update_time, dept_id, dept_name, user_id from szxc_butie
     </sql>
 
     <select id="selectSzxcButieList" parameterType="SzxcButie" resultMap="SzxcButieResult">
@@ -46,11 +47,12 @@
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="zfStatus != null  and zfStatus != ''"> and zf_status = #{zfStatus}</if>
             <if test="shRemark != null  and shRemark != ''"> and sh_remark = #{shRemark}</if>
+            <if test="auditDeptid != null "> and audit_deptid = #{auditDeptid}</if>
+            <if test="auditDept != null  and auditDept != ''"> and audit_dept = #{auditDept}</if>
             <if test="auditName != null  and auditName != ''"> and audit_name like concat('%', #{auditName}, '%')</if>
             <if test="auditResult != null  and auditResult != ''"> and audit_result = #{auditResult}</if>
             <if test="auditReason != null  and auditReason != ''"> and audit_reason = #{auditReason}</if>
-            <if test="auditDeptid != null "> and audit_deptid = #{auditDeptid}</if>
+           <!-- <if test="deptId != null "> and dept_id = #{deptId}</if>-->
-            <!--<if test="deptId != null "> and dept_id = #{deptId}</if>-->
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <!--数据范围过滤-->
@@ -78,10 +80,11 @@
             <if test="content != null">content,</if>
             <if test="zfStatus != null">zf_status,</if>
             <if test="shRemark != null">sh_remark,</if>
+            <if test="auditDeptid != null">audit_deptid,</if>
+            <if test="auditDept != null">audit_dept,</if>
             <if test="auditName != null">audit_name,</if>
             <if test="auditResult != null">audit_result,</if>
             <if test="auditReason != null">audit_reason,</if>
-            <if test="auditDeptid != null">audit_deptid,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -101,10 +104,11 @@
             <if test="content != null">#{content},</if>
             <if test="zfStatus != null">#{zfStatus},</if>
             <if test="shRemark != null">#{shRemark},</if>
+            <if test="auditDeptid != null">#{auditDeptid},</if>
+            <if test="auditDept != null">#{auditDept},</if>
             <if test="auditName != null">#{auditName},</if>
             <if test="auditResult != null">#{auditResult},</if>
             <if test="auditReason != null">#{auditReason},</if>
-            <if test="auditDeptid != null">#{auditDeptid},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -128,10 +132,11 @@
             <if test="content != null">content = #{content},</if>
             <if test="zfStatus != null">zf_status = #{zfStatus},</if>
             <if test="shRemark != null">sh_remark = #{shRemark},</if>
+            <if test="auditDeptid != null">audit_deptid = #{auditDeptid},</if>
+            <if test="auditDept != null">audit_dept = #{auditDept},</if>
             <if test="auditName != null">audit_name = #{auditName},</if>
             <if test="auditResult != null">audit_result = #{auditResult},</if>
             <if test="auditReason != null">audit_reason = #{auditReason},</if>
-            <if test="auditDeptid != null">audit_deptid = #{auditDeptid},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>