部门负责人借款列表

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBorrowController.java

@@ -2,9 +2,9 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.oa.domain.CmcProject;
 import com.ruoyi.oa.service.ICmcProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,9 +37,6 @@ public class CmcBorrowController extends BaseController
     @Autowired
     private ICmcBorrowService cmcBorrowService;
 
-    @Autowired
-    private ICmcProjectService cmcProjectService;
-
     /**
      * 查询cmc借款申请列表
      */
@@ -51,6 +48,23 @@ public class CmcBorrowController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 部门负责人查询cmc借款申请列表
+     */
+    @GetMapping("/listDeptQuery")
+    public TableDataInfo listDeptQuery()
+    {
+        CmcBorrow cmcBorrow = new CmcBorrow();
+        cmcBorrow.setApplyDept(getLoginUser().getDeptId());
+        List<CmcBorrow> list = cmcBorrowService.selectCmcBorrowList(cmcBorrow);
+        CmcBorrow borrow = new CmcBorrow();
+        borrow.setUndertakingDept(getLoginUser().getDeptId().toString());
+        List<CmcBorrow> list1 = cmcBorrowService.selectCmcBorrowList(borrow);
+        list.addAll(list1);
+        list.stream().distinct().collect(Collectors.toList());
+        return getDataTable(list);
+    }
+
     /**
      * 导出cmc借款申请列表
      */

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectCommentController.java

@@ -87,11 +87,14 @@ public class CmcProjectCommentController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcProjectComment cmcProjectComment)
     {
-        if (cmcProjectComment.getJyComment() != null) {
+        if (cmcProjectComment.getJyComment() != null && cmcProjectComment.getJyApprover() != null && cmcProjectComment.getJyApprovalTime() != null) {
             cmcProjectComment.setJyApprover(getLoginUser().getUserId());
             cmcProjectComment.setJyApprovalTime(new Date());
+            return toAjax(cmcProjectCommentService.insertCmcProjectComment(cmcProjectComment));
+        }
+        else {
+            return toAjax(cmcProjectCommentService.updateCmcProjectComment(cmcProjectComment));
         }
-        return toAjax(cmcProjectCommentService.insertCmcProjectComment(cmcProjectComment));
     }
 
     /**
@@ -101,11 +104,11 @@ public class CmcProjectCommentController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcProjectComment cmcProjectComment)
     {
-        if (cmcProjectComment.getManageComment() != null && cmcProjectComment.getScComment() == null) {
+        if (cmcProjectComment.getManageComment() != null && cmcProjectComment.getManageApprover() != null && cmcProjectComment.getManageApprovalTime() != null && cmcProjectComment.getScComment() == null) {
             cmcProjectComment.setManageApprover(getLoginUser().getUserId());
             cmcProjectComment.setManageApprovalTime(new Date());
         }
-        if (cmcProjectComment.getScComment() != null) {
+        if (cmcProjectComment.getScComment() != null && cmcProjectComment.getScApprover() != null && cmcProjectComment.getScApprovalTime() != null) {
             CmcProjectComment projectComment = cmcProjectCommentService.selectCmcProjectCommentByProjectId(cmcProjectComment.getProjectId());
             StringBuilder scApprover = new StringBuilder();
             if (projectComment.getScApprover() == null)

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -103,7 +103,8 @@ public class SysUserController extends BaseController
             List<Long> userPostList = postService.selectPostListByUserId(sysUser.getUserId());
             for (Long post : userPostList)
                 postName.append(postService.selectPostById(post).getPostName()).append("、");
-            sysUser.setPostNames(postName.substring(0, postName.length() - 1));
+            if (!postName.toString().equals(""))
+                sysUser.setPostNames(postName.substring(0, postName.length() - 1));
             sysUser.setUserId(sysUser.getUserId() - 1);
         }
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);

oa-back/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -57,7 +57,7 @@ public class SysUser extends BaseEntity
     private String password;
 
     /** 帐号状态（0正常 1停用） */
-    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+    @Excel(name = "帐号状态", readConverterExp = "0=在职,1=离职,2=退休,3=试用,4=返聘")
     private String status;
 
     /** 删除标志（0代表存在 2代表删除） */
@@ -107,11 +107,11 @@ public class SysUser extends BaseEntity
     private String updateReason;
 
     /** 入职时间 */
-    @Excel(name = "入职时间", width = 30, dateFormat = "yyyy-MM", type = Type.EXPORT)
+    @Excel(name = "入职时间", width = 30, dateFormat = "yyyy-MM-dd", type = Type.EXPORT)
     private Date entryDate;
 
     /** 出生时间 */
-    @Excel(name = "出生时间", width = 30, dateFormat = "yyyy-MM", type = Type.EXPORT)
+    @Excel(name = "出生时间", width = 30, dateFormat = "yyyy-MM-dd", type = Type.EXPORT)
     private Date birthday;
 
     /** 年龄 */

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcBorrowMapper.xml

@@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCmcBorrowVo"/>
         <where>  
             <if test="projectId != null  and projectId != ''"> and b.project_id = #{projectId}</if>
-            <if test="undertakingDept != null  and undertakingDept != ''"> and p.undertaking_dept = #{undertakingDept}</if>
+            <if test="undertakingDept != null  and undertakingDept != ''"> and find_in_set(#{undertakingDept}, p.undertaking_dept)</if>
             <if test="applyReason != null  and applyReason != ''"> and b.apply_reason = #{applyReason}</if>
             <if test="borrowUsage != null  and borrowUsage != ''"> and b.borrow_usage = #{borrowUsage}</if>
             <if test="applyDept != null  and applyDept != ''"> and b.apply_dept = #{applyDept}</if>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCarApprovalMapper.xml

@@ -117,7 +117,7 @@
             <if test="applier != null "> and ca.applier = #{applier}</if>
             <if test="useDept != null "> and ca.use_dept = #{useDept}</if>
             <if test="cars != null  and cars != ''"> and find_in_set(#{cars}, ca.cars)</if>
-            <if test="drivers != null  and drivers != ''"> and find_in_set(#{drivers}, ca.drivers})</if>
+            <if test="drivers != null  and drivers != ''"> and find_in_set(#{drivers}, ca.drivers)</if>
             <if test="projectId != null  and projectId != ''"> and ca.project_id = #{projectId}</if>
             <if test="applyReason != null  and applyReason != ''"> and ca.apply_reason = #{applyReason}</if>
             <if test="passengers != null "> and ca.passengers = #{passengers}</if>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcSettleMapper.xml

@@ -106,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="settleId != null  and settleId != ''"> and s.settle_id = #{settleId}</if>
             <if test="projectId != null"> and s.project_id = #{projectId}</if>
-            <if test="undertakingDept != null  and undertakingDept != ''"> and p.undertaking_dept = #{undertakingDept}</if>
+            <if test="undertakingDept != null  and undertakingDept != ''"> and find_in_set(#{undertakingDept}, p.undertaking_dept)</if>
             <if test="xmName != null"> and s.xm_name like concat('%', #{xmName}, '%')</if>
             <if test="workloadReport != null  and workloadReport != ''"> and s.workload_report = #{workloadReport}</if>
             <if test="reporter != null "> and s.reporter = #{reporter}</if>

oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -305,7 +305,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="graduateSchool != null">graduate_school = #{graduateSchool},</if>
 			<if test="major != null">major = #{major},</if>
 			<if test="degree != null">degree = #{degree},</if>
-			<if test="contractSign != null">contract_sign = #{contractSign},</if>
+			contract_sign = #{contractSign},
 			contract_expire = #{contractExpire},
 			<if test="homePlace != null">home_place = #{homePlace},</if>
  			update_time = sysdate()

oa-ui/src/api/oa/borrow/borrow.js

@@ -9,6 +9,15 @@ export function listBorrow(query) {
   })
 }
 
+// 部门负责人查询cmc借款申请列表
+export function listBorrowDeptQuery(query) {
+  return request({
+    url: '/oa/borrow/listDeptQuery',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询cmc借款申请详细
 export function getBorrow(borrowId) {
   return request({

oa-ui/src/views/oa/project/change.vue

@@ -138,7 +138,7 @@ export default {
     /** 查询cmc项目变更列表 */
     async getList() {
       this.loading = true;
-      if (this.deptId > 107 && this.deptId != 109) {
+      if (this.deptId > 106 && this.deptId != 109) {
         let response = await checkPermi(['oa:allproject:query'])
         if (response == false) {
           this.queryParams.undertakingDept = this.deptId
@@ -151,7 +151,7 @@ export default {
       });
     },
     remoteMethod(val) {
-      if (this.deptId > 107) {
+      if (this.deptId > 106) {
         this.queryParams.undertakingDept = this.deptId
       }
       this.queryParams.projectNumber = val;

oa-ui/src/views/oa/project/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-25 16:35:45
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-08-20 17:09:10
 -->
 <template>
   <div class="project-wrapper">
@@ -303,7 +303,7 @@ export default {
     // 查询项目列表
     async getList() {
       this.loading = true
-      if (this.deptId > 107 && this.deptId != 109) {
+      if (this.deptId > 106 && this.deptId != 109) {
         let response = await checkPermi(['oa:allproject:query'])
         if (response == false) {
           this.queryParams.undertakingDept = this.deptId