Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud into dev-跟进用户调整

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/DeptTypeEnum.java

@@ -10,6 +10,7 @@ import lombok.Getter;
 @Getter
 public enum DeptTypeEnum {
 
+   HEAD_COMPANY("HEAD_COMPANY", "总公司"),
    COMPANY("COMPANY", "公司"),
    SALE_DEPT("SALE_DEPT", "销售部门"),
    DEVELOPMENT_DEPT("DEVELOPMENT_DEPT", "开发部门"),

yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java

@@ -62,6 +62,7 @@ public interface ErrorCodeConstants {
     ErrorCode OA_CONTRACT_INVOICE_AMOUNT_LACK = new ErrorCode(1_009_001_125, "该合同的开票余额不足！");
     ErrorCode OA_PAYMENT_NOT_EXISTS = new ErrorCode(1_009_001_126, "付款申请不存在");
     ErrorCode OA_RECEIPT_NOT_EXISTS = new ErrorCode(1_009_001_127, "回款申请不存在");
+    ErrorCode OA_PAYMENT_FILES_NOT_NULL = new ErrorCode(1_009_001_128, "后补发票不能为空！");
 
     // ========== 流程模型 1-009-002-000 ==========
     ErrorCode MODEL_KEY_EXISTS = new ErrorCode(1_009_002_000, "已经存在流程标识为【{}】的流程");

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessCcController.java

@@ -103,7 +103,7 @@ public class BpmProcessCcController {
                     .collect(Collectors.joining("、")));
             // 设置公司名称
             data.setCompanyName(data.getCompanyDeptId().stream()
-                    .map(item -> deptMap.get(item).getName())
+                    .map(item -> deptMap.get(item) != null ? deptMap.get(item).getName() : "")
                     .collect(Collectors.joining("、")));
         });
         return success(respVOPageResult);

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAPaymentController.java

@@ -1,37 +1,32 @@
 package cn.iocoder.yudao.module.bpm.controller.admin.oa;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.iocoder.yudao.framework.common.enums.DeptTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.contract.BpmOAContractPageReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.payment.*;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.contract.BpmOAContractRespVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.payment.BpmOAPaymentCreateReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.payment.BpmOAPaymentPageReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.payment.BpmOAPaymentRespVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.payment.FactoryDetailVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAPaymentDO;
 import cn.iocoder.yudao.module.bpm.service.oa.BpmOAPaymentService;
-import cn.iocoder.yudao.module.system.api.bank.BankApi;
-import cn.iocoder.yudao.module.system.api.bank.dto.BankRespDTO;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
-import cn.iocoder.yudao.module.system.api.project.ProjectApi;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.project.dto.ProjectDTO;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.util.Strings;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 /**
@@ -50,14 +45,11 @@ public class BpmOAPaymentController {
     private BpmOAPaymentService paymentService;
 
     @Resource
-    private ProjectApi projectApi;
+    private AdminUserApi userApi;
 
     @Resource
     private DeptApi deptApi;
 
-    @Resource
-    private BankApi bankApi;
-
     @PostMapping("/create")
     @Operation(summary = "创建付款申请")
     public CommonResult<Long> createPayment(@Valid @RequestBody BpmOAPaymentCreateReqVO createReqVO) {
@@ -71,44 +63,7 @@ public class BpmOAPaymentController {
     public CommonResult<BpmOAPaymentRespVO> getPayment(@RequestParam("id") Long id) {
 
         BpmOAPaymentDO payment = paymentService.getPayment(id);
-        BpmOAPaymentRespVO respVO = BeanUtils.toBean(payment, BpmOAPaymentRespVO.class);
+        BpmOAPaymentRespVO respVO = paymentService.convertPayment(payment);
-        if (respVO != null) {
-
-            // 获取部门信息Map
-            List<Long> deptIds = new ArrayList<>();
-            if (CollectionUtil.isNotEmpty(respVO.getFactoryDetail())) {
-                deptIds.addAll(convertList(respVO.getFactoryDetail(), FactoryDetailVO::getDeptId));
-            }else {
-                deptIds.add(payment.getDeptId());
-            }
-            deptIds.add(payment.getPaymentCompany());
-            Map<Long, DeptRespDTO> dtoMap = deptApi.getDeptMap(new HashSet<>(deptIds));
-
-            // 设置部门名称
-            respVO.setDeptName(dtoMap.get(payment.getDeptId()) != null ? dtoMap.get(payment.getDeptId()).getName() : null);
-            // 设置付款公司名称
-            respVO.setPaymentCompanyName(dtoMap.get(payment.getPaymentCompany()).getName());
-            // 设置工厂名称
-            respVO.getFactoryDetail().forEach(item -> {
-                item.setFactoryName(dtoMap.get(item.getDeptId()).getName());
-            });
-
-            if (StringUtils.isNotEmpty(payment.getProjectNo())) {
-                // 获取项目信息
-                ProjectDTO project = projectApi.getProject(payment.getProjectNo()).getCheckedData();
-                // 设置项目名称
-                respVO.setProjectName(project.getName());
-            }
-
-            if (payment.getBankId() != null) {
-                // 获取银行卡信息
-                BankRespDTO bankResp = bankApi.getBank(payment.getBankId()).getCheckedData();
-                // 设置银行卡信息
-                respVO.setBankName(bankResp.getBankName());
-                respVO.setBankNo(bankResp.getBankNo());
-                respVO.setNickname(bankResp.getNickname());
-            }
-        }
 
         return success(respVO);
     }
@@ -119,43 +74,7 @@ public class BpmOAPaymentController {
     public CommonResult<BpmOAPaymentRespVO> getByProcessInstanceId(@RequestParam("processInstanceId") String processInstanceId) {
 
         BpmOAPaymentDO payment = paymentService.getByProcessInstanceId(processInstanceId);
-        BpmOAPaymentRespVO respVO = BeanUtils.toBean(payment, BpmOAPaymentRespVO.class);
+        BpmOAPaymentRespVO respVO = paymentService.convertPayment(payment);
-        if (respVO != null) {
-            // 获取部门信息Map
-            List<Long> deptIds = new ArrayList<>();
-            if (CollectionUtil.isNotEmpty(respVO.getFactoryDetail())) {
-                deptIds.addAll(convertList(respVO.getFactoryDetail(), FactoryDetailVO::getDeptId));
-            }else {
-                deptIds.add(payment.getDeptId());
-            }
-            deptIds.add(payment.getPaymentCompany());
-            Map<Long, DeptRespDTO> dtoMap = deptApi.getDeptMap(new HashSet<>(deptIds));
-
-            // 设置部门名称
-            respVO.setDeptName(dtoMap.get(payment.getDeptId()) != null ? dtoMap.get(payment.getDeptId()).getName() : null);
-            // 设置付款公司名称
-            respVO.setPaymentCompanyName(dtoMap.get(payment.getPaymentCompany()).getName());
-            // 设置工厂名称
-            respVO.getFactoryDetail().forEach(item -> {
-                item.setFactoryName(dtoMap.get(item.getDeptId()).getName());
-            });
-
-            if (payment.getProjectNo() != null) {
-                // 获取项目信息
-                ProjectDTO project = projectApi.getProject(payment.getProjectNo()).getCheckedData();
-                // 设置项目名称
-                respVO.setProjectName(project.getName());
-            }
-
-            if (payment.getBankId() != null) {
-                // 获取银行卡信息
-                BankRespDTO bankResp = bankApi.getBank(payment.getBankId()).getCheckedData();
-                // 设置银行卡信息
-                respVO.setBankName(bankResp.getBankName());
-                respVO.setBankNo(bankResp.getBankNo());
-                respVO.setNickname(bankResp.getNickname());
-            }
-        }
 
         return success(respVO);
     }
@@ -172,6 +91,80 @@ public class BpmOAPaymentController {
     @Operation(summary = "获得 后补票的付款申请分页列表")
     public CommonResult<PageResult<BpmOAPaymentRespVO>> getPage(@Valid BpmOAPaymentPageReqVO pageReqVO) {
 
-        return success(paymentService.getPaymentPage(pageReqVO));
+        // 获取所有 财务部门信息
+        List<DeptRespDTO> deptRespDTOS = deptApi.getDeptListByType(DeptTypeEnum.FINANCE_DEPT.getValue()).getCheckedData();
+        // 筛选 所属总公司的财务部门
+        List<DeptRespDTO> dto = deptApi.getDeptListByType(DeptTypeEnum.HEAD_COMPANY.getValue()).getCheckedData();
+        Long headCompanyId = dto.get(0).getId();
+        deptRespDTOS = deptRespDTOS.stream()
+                .filter(item -> item.getFlag().contains(headCompanyId.toString()))
+                .collect(Collectors.toList());
+
+        // 获取财务部门下 所有用户信息
+        List<AdminUserRespDTO> userRespDTOS = userApi.getUserListByDeptIds(convertSet(deptRespDTOS, DeptRespDTO::getId)).getCheckedData();
+        List<Long> userIds = convertList(userRespDTOS, AdminUserRespDTO::getId);
+
+        // 判断当前登录用户是否属于财务部
+        pageReqVO.setIsMy(!userIds.contains(getLoginUserId()));
+
+        PageResult<BpmOAPaymentRespVO> pageResult = BeanUtils.toBean(paymentService.getPaymentPage(pageReqVO, getLoginUserId()), BpmOAPaymentRespVO.class);
+        if (CollUtil.isNotEmpty(pageResult.getList())) {
+
+            // 获取发起人用户信息
+            Set<Long> startUserIds = convertSet(pageResult.getList(), BpmOAPaymentRespVO::getUserId);
+            Map<Long, AdminUserRespDTO> userMap = userApi.getUserMap(startUserIds);
+
+            // 获取部门信息Map
+            List<Long> deptIds = new ArrayList<>();
+            // 获取工厂详情
+            List<List<FactoryDetailVO>> factoryDetailList = convertList(pageResult.getList(), BpmOAPaymentRespVO::getFactoryDetail);
+            List<FactoryDetailVO> factoryDetailVOS = factoryDetailList.stream().flatMap(List::stream).collect(Collectors.toList());
+            if (CollectionUtil.isNotEmpty(factoryDetailVOS)) {
+                deptIds.addAll(convertList(factoryDetailVOS, FactoryDetailVO::getDeptId));
+            }else {
+                deptIds.addAll(convertList(pageResult.getList(), BpmOAPaymentRespVO::getDeptId));
+            }
+            // 添加公司集合
+            deptIds.addAll(convertList(pageResult.getList(), BpmOAPaymentRespVO::getPaymentCompany));
+            Map<Long, DeptRespDTO> dtoMap = deptApi.getDeptMap(new HashSet<>(deptIds));
+
+            pageResult.getList().forEach(item -> {
+                item.setUserName(userMap.get(item.getUserId()).getNickname());
+                // 设置部门名称
+                item.setDeptName(dtoMap.get(item.getDeptId()) != null ? dtoMap.get(item.getDeptId()).getName() : null);
+                // 设置付款公司名称
+                item.setPaymentCompanyName(dtoMap.get(item.getPaymentCompany()).getName());
+                // 设置工厂名称
+                item.getFactoryDetail().forEach(detail -> {
+                    detail.setFactoryName(dtoMap.get(detail.getDeptId()).getName());
+                });
+            });
+        }
+
+        return success(pageResult);
+    }
+
+    @PutMapping("update-files")
+    @Operation(summary = "继续上传附件")
+    public CommonResult<Boolean> updateFiles(@Valid @RequestBody BpmOAPaymentUpdateReqVO updateReqVO) {
+        paymentService.updateFiles(updateReqVO);
+        return success(true);
+    }
+
+    @PutMapping("update-status")
+    @Operation(summary = "修改付款申请的补票状态")
+    public CommonResult<Boolean> updateStatus(@Valid @RequestBody BpmOAPaymentUpdateReqVO updateReqVO) {
+        paymentService.updateStatus(updateReqVO);
+        return success(true);
+    }
+
+    @PutMapping("/delete-files")
+    @Operation(summary = "删除后补附件")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @Parameter(name = "url", description = "url", required = true, example = "1024")
+    public CommonResult<Boolean> deleteUser(@RequestParam("id") Long id,
+                                            @RequestParam("url") String url) {
+        paymentService.deleteFiles(id, url);
+        return success(true);
     }
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/payment/BpmOAPaymentCreateReqVO.java

@@ -63,6 +63,9 @@ public class BpmOAPaymentCreateReqVO {
     @Schema(description = "后补票批注", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String annotations;
 
+    @Schema(description = "补票状态 | 0待补票 1已补票 2已确认", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    private Integer status;
+
     @Schema(description = "父级审批编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Long parentId;
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/payment/BpmOAPaymentPageReqVO.java

@@ -6,6 +6,9 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 付款申请分页 Request VO")
 @Data
@@ -16,4 +19,11 @@ public class BpmOAPaymentPageReqVO extends PageParam {
 
     @Schema(description = "补票状态 | 0待补票 1已补票 2已确认")
     private Integer status;
+
+    @Schema(description = "是否我的申请")
+    private Boolean isMy;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String[] createTime;
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/payment/BpmOAPaymentRespVO.java

@@ -19,6 +19,12 @@ import java.util.List;
 @ToString(callSuper = true)
 public class BpmOAPaymentRespVO extends BpmOABaseRespVO {
 
+    @Schema(description = "申请人编号")
+    private Long userId;
+
+    @Schema(description = "申请人名称")
+    private String userName;
+
     @Schema(description = "申请事由")
     private String reason;
 
@@ -79,6 +85,9 @@ public class BpmOAPaymentRespVO extends BpmOABaseRespVO {
     @Schema(description = "后补票批注", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String annotations;
 
+    @Schema(description = "补票状态 | 0待补票 1已补票 2已确认", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    private Integer status;
+
     @Schema(description = "父级审批编号")
     private Long parentId;
 
@@ -87,4 +96,7 @@ public class BpmOAPaymentRespVO extends BpmOABaseRespVO {
 
     @Schema(description = "上传文件")
     private List<UploadUserFile> fileItems;
+
+    @Schema(description = "后补文件")
+    private List<UploadUserFile> laterFileItems;
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/payment/BpmOAPaymentUpdateReqVO.java

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.payment;
+
+import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 付款申请 创建 Request VO
+ *
+ * @author 符溶馨
+ */
+@Schema(description = "管理后台 - 付款申请创建 Request VO")
+@Data
+public class BpmOAPaymentUpdateReqVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long id;
+
+    @Schema(description = "后补票批注", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    private String annotations;
+
+    @Schema(description = "补票状态 | 0待补票 1已补票 2重新补票 3已确认", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    private Integer status;
+
+    @Schema(description = "上传文件", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List<UploadUserFile> fileItems;
+}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/print/BpmOAPrintDataRespVO.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.print;
 
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.cash.BpmOACashRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.payment.BpmOAPaymentRespVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.reimbursement.BpmOAReimbursementRespVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -14,12 +16,18 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-public class BpmOAReimbursementPrintDataRespVO extends BpmOABaseRespVO {
+public class BpmOAPrintDataRespVO extends BpmOABaseRespVO {
 
-    @Schema(description = "报销业务数据", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "报销业务数据")
     private BpmOAReimbursementRespVO bpmOAReimbursementRespVO ;
 
-    @Schema(description = "流程审批节点信息【包含人员签名地址】", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "现金支出业务数据")
+    private BpmOACashRespVO bpmOACashRespVO;
+
+    @Schema(description = "付款业务数据")
+    private BpmOAPaymentRespVO bpmOAPaymentRespVO;
+
+    @Schema(description = "流程审批节点信息【包含人员签名地址】")
     List<BpmTaskRespVO> processTasks ;
 
     /**

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/print/BpmProcessInstancePrintDataRespVO.java

@@ -15,9 +15,9 @@ public class BpmProcessInstancePrintDataRespVO {
     @Schema(description = "流程标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "oa_reimbursement")
     private String key;
 
-    @Schema(description = "报销业务打印数据", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "业务打印数据", requiredMode = Schema.RequiredMode.REQUIRED)
-    private BpmOAReimbursementPrintDataRespVO bpmOAReimbursementPrintDataRespVO ;
+    private BpmOAPrintDataRespVO printDataRespVO ;
 
-    @Schema(description = "现金支出业务打印数据", requiredMode = Schema.RequiredMode.REQUIRED)
+//    @Schema(description = "现金支出业务打印数据", requiredMode = Schema.RequiredMode.REQUIRED)
-    private BpmOACashPrintDataRespVO bpmOACashPrintDataRespVO;
+//    private BpmOACashPrintDataRespVO bpmOACashPrintDataRespVO;
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOAPaymentDO.java

@@ -112,6 +112,11 @@ public class BpmOAPaymentDO extends BaseDO {
      */
     private String annotations;
 
+    /**
+     * 补票状态 | 0待补票 1已补票 2重新补票 3已确认
+     */
+    private Integer status;
+
     /**
      * 父级审批
      */
@@ -135,4 +140,10 @@ public class BpmOAPaymentDO extends BaseDO {
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
     private List<UploadUserFile> fileItems ;
+
+    /**
+     * 后补附件基本信息
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<UploadUserFile> laterFileItems;
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOAPaymentMapper.java

@@ -1,8 +1,12 @@
 package cn.iocoder.yudao.module.bpm.dal.mysql.oa;
 
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.payment.BpmOAPaymentPageReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.payment.BpmOAPaymentRespVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAPaymentDO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,4 +16,16 @@ import java.util.List;
 public interface BpmOAPaymentMapper extends BaseMapperX<BpmOAPaymentDO> {
 
     List<BpmOAPaymentRespVO> selectPaymentList(@Param("type") Integer type);
+
+    default PageResult<BpmOAPaymentDO> selectTicketsPage(BpmOAPaymentPageReqVO pageReqVO, Long userId) {
+
+        return selectPage(pageReqVO, new LambdaQueryWrapperX<BpmOAPaymentDO>()
+                .eq(BpmOAPaymentDO::getResult, BpmProcessInstanceResultEnum.APPROVE.getResult())
+                .eq(BpmOAPaymentDO::getIsTickets, 1)
+                .eqIfPresent(BpmOAPaymentDO::getStatus, pageReqVO.getStatus())
+                .betweenIfPresent(BpmOAPaymentDO::getCreateTime, pageReqVO.getCreateTime())
+                .eq(pageReqVO.getIsMy(), BpmOAPaymentDO::getUserId, userId)
+                .orderByAsc(BpmOAPaymentDO::getStatus)
+                .orderByDesc(BpmOAPaymentDO::getId));
+    }
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmTaskExtMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmConstants;
 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -100,6 +101,7 @@ public interface BpmTaskExtMapper extends BaseMapperX<BpmTaskExtDO> {
                 .eq(StringUtils.isNotEmpty(pageVO.getName()), BpmProcessInstanceExtDO::getName, pageVO.getName()));
         queryWrapperX.likeRight(BpmProcessInstanceExtDO::getProcessDefinitionId, "oa_");
         queryWrapperX.eq(BpmTaskExtDO::getAssigneeUserId, userId);
+        queryWrapperX.ne(BpmTaskExtDO::getReason, BpmConstants.AUTO_APPRAVAL);
         queryWrapperX.betweenIfPresent(BpmTaskExtDO::getCreateTime, pageVO.getCreateTime());
         queryWrapperX.orderByDesc(BpmTaskExtDO::getEndTime);
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAPaymentService.java

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.payment.BpmOAPaymentCreateReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.payment.BpmOAPaymentPageReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.payment.BpmOAPaymentRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.payment.BpmOAPaymentUpdateReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAPaymentDO;
 
 import javax.validation.Valid;
@@ -51,8 +52,31 @@ public interface BpmOAPaymentService {
 
     /**
      * 获得 后补票的付款申请分页列表
+     *
      * @param pageReqVO   分页条件
+     * @param userId      用户编号
      * @return 付款申请分页列表
      */
-    PageResult<BpmOAPaymentRespVO> getPaymentPage(BpmOAPaymentPageReqVO pageReqVO);
+    PageResult<BpmOAPaymentDO> getPaymentPage(BpmOAPaymentPageReqVO pageReqVO, Long userId);
+
+    /**
+     * 更新付款申请附件
+     * @param updateReqVO 更新信息
+     */
+    void updateFiles(BpmOAPaymentUpdateReqVO updateReqVO);
+
+    /**
+     * 更新付款申请补票状态
+     * @param updateReqVO 更新信息
+     */
+    void updateStatus(BpmOAPaymentUpdateReqVO updateReqVO);
+
+    /**
+     * 删除后补附件信息
+     * @param id 编号
+     * @param url utl
+     */
+    void deleteFiles(Long id, String url);
+
+    BpmOAPaymentRespVO convertPayment(BpmOAPaymentDO payment);
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAPaymentServiceImpl.java

@@ -1,36 +1,40 @@
 package cn.iocoder.yudao.module.bpm.service.oa;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.payment.BpmOAPaymentCreateReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.payment.*;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.payment.BpmOAPaymentPageReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.payment.BpmOAPaymentRespVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.financialpayment.FinancialPaymentDO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAPaymentDO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAReimbursementItemDO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
 import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOAPaymentMapper;
 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
 import cn.iocoder.yudao.module.bpm.service.financialpayment.FinancialPaymentService;
 import cn.iocoder.yudao.module.bpm.service.task.BpmHistoryProcessInstanceService;
 import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
+import cn.iocoder.yudao.module.system.api.bank.BankApi;
+import cn.iocoder.yudao.module.system.api.bank.dto.BankRespDTO;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import cn.iocoder.yudao.module.system.api.project.ProjectApi;
+import cn.iocoder.yudao.module.system.api.project.dto.ProjectDTO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_PAYMENT_FILES_NOT_NULL;
 import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_PAYMENT_NOT_EXISTS;
 
 /**
@@ -62,12 +66,24 @@ public class BpmOAPaymentServiceImpl extends BpmOABaseService implements BpmOAPa
     @Resource
     private AdminUserApi userApi;
 
+    @Resource
+    private DeptApi deptApi;
+
+    @Resource
+    private BankApi bankApi;
+
+    @Resource
+    private ProjectApi projectApi;
+
     @Override
     public Long createPayment(Long userId, BpmOAPaymentCreateReqVO createReqVO) {
 
         //插入OA 付款申请
         BpmOAPaymentDO paymentDO = BeanUtils.toBean(createReqVO, BpmOAPaymentDO.class).setUserId(userId)
                 .setResult(BpmProcessInstanceResultEnum.PROCESS.getResult());
+        if (createReqVO.getIsTickets() == 1) {
+            paymentDO.setStatus(0); // 设置补票状态 为待补票
+        }
         paymentMapper.insert(paymentDO);
 
         // 发起 BPM 流程
@@ -145,9 +161,103 @@ public class BpmOAPaymentServiceImpl extends BpmOABaseService implements BpmOAPa
     }
 
     @Override
-    public PageResult<BpmOAPaymentRespVO> getPaymentPage(BpmOAPaymentPageReqVO pageReqVO) {
+    public PageResult<BpmOAPaymentDO> getPaymentPage(BpmOAPaymentPageReqVO pageReqVO, Long userId) {
 
-        return null;
+        return paymentMapper.selectTicketsPage(pageReqVO, userId);
+    }
+
+    @Override
+    public void updateFiles(BpmOAPaymentUpdateReqVO updateReqVO) {
+        // 校验付款申请是否存在
+        BpmOAPaymentDO paymentDO = validateLeaveExists(updateReqVO.getId());
+
+        //这里的逻辑，如果fileItems不为空，且有数据，那么说明是上传了附件的，则需要更工作流文件表对应的实例Id
+        if (CollUtil.isNotEmpty(updateReqVO.getFileItems())) {
+            uploadBpmFileProcessInstanceId(paymentDO.getProcessInstanceId(), updateReqVO.getFileItems()) ;
+        }else {
+            throw exception(OA_PAYMENT_FILES_NOT_NULL);
+        }
+
+        // 更新附件
+        paymentMapper.updateById(new BpmOAPaymentDO()
+                .setId(paymentDO.getId())
+                .setLaterFileItems(updateReqVO.getFileItems())
+                .setStatus(updateReqVO.getStatus()));
+    }
+
+    @Override
+    public void updateStatus(BpmOAPaymentUpdateReqVO updateReqVO) {
+        // 校验付款申请是否存在
+        BpmOAPaymentDO paymentDO = validateLeaveExists(updateReqVO.getId());
+
+        BpmOAPaymentDO update = BeanUtils.toBean(updateReqVO, BpmOAPaymentDO.class);
+        if (update.getStatus() == 3) {
+            List<UploadUserFile> fileItems = paymentDO.getFileItems() == null ? new ArrayList<>() : paymentDO.getFileItems();
+            fileItems.addAll(paymentDO.getLaterFileItems());
+            update.setFileItems(fileItems);
+        }
+
+        paymentMapper.updateById(update);
+    }
+
+    @Override
+    public void deleteFiles(Long id, String url) {
+
+        // 校验付款申请是否存在
+        BpmOAPaymentDO paymentDO = validateLeaveExists(id);
+
+        List<UploadUserFile> fileItems = paymentDO.getLaterFileItems();
+        if (CollUtil.isNotEmpty(fileItems)) {
+            fileItems.removeIf(item -> item.getUrl().equals(url));
+
+            paymentMapper.updateById(new BpmOAPaymentDO()
+                    .setId(id)
+                    .setLaterFileItems(fileItems));
+        }
+    }
+
+    @Override
+    public BpmOAPaymentRespVO convertPayment(BpmOAPaymentDO payment) {
+
+        BpmOAPaymentRespVO respVO = BeanUtils.toBean(payment, BpmOAPaymentRespVO.class);
+        if (respVO != null) {
+
+            // 获取部门信息Map
+            List<Long> deptIds = new ArrayList<>();
+            if (CollectionUtil.isNotEmpty(respVO.getFactoryDetail())) {
+                deptIds.addAll(convertList(respVO.getFactoryDetail(), FactoryDetailVO::getDeptId));
+            }else {
+                deptIds.add(payment.getDeptId());
+            }
+            deptIds.add(payment.getPaymentCompany());
+            Map<Long, DeptRespDTO> dtoMap = deptApi.getDeptMap(new HashSet<>(deptIds));
+
+            // 设置部门名称
+            respVO.setDeptName(dtoMap.get(payment.getDeptId()) != null ? dtoMap.get(payment.getDeptId()).getName() : null);
+            // 设置付款公司名称
+            respVO.setPaymentCompanyName(dtoMap.get(payment.getPaymentCompany()).getName());
+            // 设置工厂名称
+            respVO.getFactoryDetail().forEach(item -> {
+                item.setFactoryName(dtoMap.get(item.getDeptId()).getName());
+            });
+
+            if (StringUtils.isNotEmpty(payment.getProjectNo())) {
+                // 获取项目信息
+                ProjectDTO project = projectApi.getProject(payment.getProjectNo()).getCheckedData();
+                // 设置项目名称
+                respVO.setProjectName(project.getName());
+            }
+
+            if (payment.getBankId() != null) {
+                // 获取银行卡信息
+                BankRespDTO bankResp = bankApi.getBank(payment.getBankId()).getCheckedData();
+                // 设置银行卡信息
+                respVO.setBankName(bankResp.getBankName());
+                respVO.setBankNo(bankResp.getBankNo());
+                respVO.setNickname(bankResp.getNickname());
+            }
+        }
+        return respVO;
     }
 
     private BpmOAPaymentDO validateLeaveExists(Long id) {

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASalaryService.java

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.salary.BpmOASalaryCrea
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASalaryDO;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 薪资付款申请 Service 接口
@@ -13,7 +14,7 @@ import javax.validation.Valid;
 public interface BpmOASalaryService {
 
     /**
-     * 创建用章申请
+     * 创建薪资付款申请
      *
      * @param userId 用户编号
      * @param createReqVO 创建信息
@@ -22,7 +23,7 @@ public interface BpmOASalaryService {
     Long createSalary(Long userId, @Valid BpmOASalaryCreateReqVO createReqVO);
 
     /**
-     * 更新用章申请的状态
+     * 更新薪资付款申请的状态
      *
      * @param id 编号
      * @param result 结果
@@ -30,17 +31,24 @@ public interface BpmOASalaryService {
     void updateSalaryResult(Long id, Integer result);
 
     /**
-     * 获得用章申请
+     * 获得薪资付款申请
      *
      * @param id 编号
-     * @return 用章申请
+     * @return 薪资付款申请
      */
     BpmOASalaryDO getSalary(Long id);
 
     /**
-     * 获得指定的用章申请
+     * 获得指定的薪资付款申请
      * @param processInstanceId 流程实例编号
-     * @return 用章申请
+     * @return 薪资付款申请
      */
     BpmOASalaryDO getByProcessInstanceId(String processInstanceId);
+
+    /**
+     * 获得指定的薪资付款申请
+     * @param processInstanceIds 流程实例编号
+     * @return 薪资付款申请
+     */
+    List<BpmOASalaryDO> getListByProcessInstanceIds(List<String> processInstanceIds);
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOASalaryServiceImpl.java

@@ -107,4 +107,10 @@ public class BpmOASalaryServiceImpl extends BpmOABaseService implements BpmOASal
 
         return salaryMapper.selectOne(BpmOASalaryDO::getProcessInstanceId, processInstanceId);
     }
+
+    @Override
+    public List<BpmOASalaryDO> getListByProcessInstanceIds(List<String> processInstanceIds) {
+
+        return salaryMapper.selectList(BpmOASalaryDO::getProcessInstanceId, processInstanceIds);
+    }
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java

@@ -17,6 +17,7 @@ import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceMyPageReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*;
 import cn.iocoder.yudao.module.bpm.convert.task.BpmTaskConvert;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASalaryDO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO;
 import cn.iocoder.yudao.module.bpm.dal.mysql.task.BpmProcessInstanceExtMapper;
@@ -25,6 +26,7 @@ import cn.iocoder.yudao.module.bpm.enums.task.*;
 import cn.iocoder.yudao.module.bpm.service.definition.BpmModelService;
 import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
 import cn.iocoder.yudao.module.bpm.service.message.BpmMessageService;
+import cn.iocoder.yudao.module.bpm.service.oa.BpmOASalaryService;
 import cn.iocoder.yudao.module.bpm.service.task.dto.ProcessInstanceVariablesDTO;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
@@ -106,6 +108,9 @@ public class BpmTaskServiceImpl implements BpmTaskService {
     @Resource
     private BpmProcessInstanceExtMapper processInstanceExtMapper;
 
+    @Resource
+    private BpmOASalaryService salaryService;
+
     @Override
     public PageResult<BpmTaskCCPageItemRespVO> getCCTaskPage(Long userId, BpmTaskDonePageReqVO pageVO) {
         // 查询被抄送的Task
@@ -194,6 +199,32 @@ public class BpmTaskServiceImpl implements BpmTaskService {
 
         Page<BpmTaskTodoPageRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
         IPage<BpmTaskTodoPageRespVO> pageResp = taskExtMapper.selectTodoTaskPage(page, pageReqVO, userId);
+
+        /*
+                临时处理，列表中薪资付款 展示具体公司名称问题
+                begin
+         */
+        // 获取所有薪资付款的流程实例
+        List<String> processInstanceIds = pageResp.getRecords().stream()
+                .filter(item -> item.getProcessDefinitionId().contains("oa_salary"))
+                .map(BpmTaskTodoPageRespVO::getProcessInstanceId)
+                .collect(Collectors.toList());
+
+        // 获取薪资付款列表
+        List<BpmOASalaryDO> salaryDOS = salaryService.getListByProcessInstanceIds(processInstanceIds);
+        Map<String, Long> salaryDeptMap = salaryDOS.stream()
+                .collect(Collectors.toMap(BpmOASalaryDO::getProcessInstanceId, BpmOASalaryDO::getCompanyDeptId));
+        // 获取付款部门信息
+        Map<Long, DeptRespDTO> dtoMap = deptApi.getDeptMap(convertSet(salaryDOS, BpmOASalaryDO::getCompanyDeptId));
+        pageResp.getRecords().forEach(item -> {
+            if (salaryDeptMap.containsKey(item.getProcessInstanceId())) {
+                item.setStartUserNickname(item.getStartUserNickname() +
+                        "(" +
+                        dtoMap.get(salaryDeptMap.get(item.getProcessInstanceId())).getName() +
+                        ")");
+            }
+        });
+
         return new PageResult<>(pageResp.getRecords(), pageResp.getTotal());
     }
 
@@ -202,7 +233,9 @@ public class BpmTaskServiceImpl implements BpmTaskService {
 
         // 判断搜索条件是否选择用户
         List<Long> userIds = null;
-        if (pageVO.getDeptId() != null) {
+        if (pageVO.getUserId() != null) {
+            userIds = Collections.singletonList(pageVO.getUserId());
+        }else if (pageVO.getDeptId() != null) {
 
             List<AdminUserRespDTO> users = adminUserApi.getUserByDeptIdAll(pageVO.getDeptId()).getCheckedData();
             userIds = users.stream().map(AdminUserRespDTO::getId).collect(Collectors.toList());
@@ -217,8 +250,31 @@ public class BpmTaskServiceImpl implements BpmTaskService {
             // 获得 User Map
             Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(startUserIds);
 
+            /*
+                临时处理，列表中薪资付款 展示具体公司名称问题
+                begin
+             */
+            // 获取所有薪资付款的流程实例
+            List<String> processInstanceIds = pageResult.getList().stream()
+                    .filter(item -> item.getProcessDefinitionId().contains("oa_salary"))
+                    .map(BpmTaskDonePageRespVO::getProcessInstanceId)
+                    .collect(Collectors.toList());
+
+            // 获取薪资付款列表
+            List<BpmOASalaryDO> salaryDOS = salaryService.getListByProcessInstanceIds(processInstanceIds);
+            Map<String, Long> salaryDeptMap = salaryDOS.stream()
+                    .collect(Collectors.toMap(BpmOASalaryDO::getProcessInstanceId, BpmOASalaryDO::getCompanyDeptId));
+            // 获取付款部门信息
+            Map<Long, DeptRespDTO> dtoMap = deptApi.getDeptMap(convertSet(salaryDOS, BpmOASalaryDO::getCompanyDeptId));
+
             pageResult.getList().forEach(item -> {
                 item.setStartUserNickname(userMap.get(item.getStartUserId()).getNickname());
+                if (salaryDeptMap.containsKey(item.getProcessInstanceId())) {
+                    item.setStartUserNickname(item.getStartUserNickname() +
+                            "(" +
+                            dtoMap.get(salaryDeptMap.get(item.getProcessInstanceId())).getName() +
+                            ")");
+                }
             });
         }
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/mapper/oa/BpmOAProcureMapper.xml

@@ -30,7 +30,7 @@
         AND a.pay_flag = 0
         AND a.deleted = 0
     	<if	test="type != null">
-			AND a.procure_type = #{type}
+			AND (a.procure_type = #{type} or a.procure_type = 3)
 		</if>
     </select>
 </mapper>

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java

@@ -132,7 +132,7 @@ public class DeptApiImpl implements DeptApi {
     @Override
     @DataPermission(enable = false)
     public CommonResult<List<DeptRespDTO>> getCompanyDept() {
-        List<DeptDO> deptDOS = deptService.getCompanyDept();
+        List<DeptDO> deptDOS = deptService.getCompanyDept(2);
         return success(BeanUtils.toBean(deptDOS, DeptRespDTO.class));
     }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/bank/UserBankController.java

@@ -7,7 +7,9 @@ import cn.iocoder.yudao.module.system.controller.admin.bank.vo.UserBankPageReqVO
 import cn.iocoder.yudao.module.system.controller.admin.bank.vo.UserBankRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.bank.vo.UserBankSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.bank.BankDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.service.bank.UserBankService;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -18,6 +20,10 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@@ -31,6 +37,9 @@ public class UserBankController {
     @Resource
     private UserBankService userBankService;
 
+    @Resource
+    private AdminUserService userService;
+
     @PostMapping("/create")
     @Operation(summary = "创建银行卡信息")
     @PreAuthorize("@ss.hasPermission('system:user-bank:create')")
@@ -107,15 +116,33 @@ public class UserBankController {
     @PreAuthorize("@ss.hasPermission('system:user-bank:query')")
     public CommonResult<PageResult<UserBankRespVO>> getUserBankPage(@Valid UserBankPageReqVO pageReqVO) {
 
-        PageResult<BankDO> pageResult = new PageResult<BankDO>();
         List<Long> bankIds = userBankService.getBankIds(getLoginUserId());
-        if (!bankIds.isEmpty()) {
+        if (bankIds.isEmpty()) {
 
-            pageResult = userBankService.getBankPageIn(pageReqVO, bankIds);
+            return success(PageResult.empty());
         }
 
+        PageResult<BankDO> pageResult = userBankService.getBankPageIn(pageReqVO, bankIds);
 
-        return success(BeanUtils.toBean(pageResult, UserBankRespVO.class));
+        // 获取创建者信息
+        Set<Long> userIds = pageResult.getList().stream()
+                .filter(Objects::nonNull)
+                .map(BankDO::getCreator)
+                .map(Long::valueOf)
+                .collect(Collectors.toSet());
+        List<AdminUserDO> userDOS = userService.getUserList(userIds);
+        Map<String, AdminUserDO> userMap = userDOS.stream()
+                .collect(Collectors.toMap(user ->
+                                String.valueOf(user.getId()), // 将 Long 类型的 id 转换为 String 类型
+                                v -> v));
+
+        PageResult<UserBankRespVO> respResult = BeanUtils.toBean(pageResult, UserBankRespVO.class);
+        respResult.getList().forEach(item -> {
+            // 设置创建者名称
+            item.setCreateName(userMap.get(item.getCreator()) != null ? userMap.get(item.getCreator()).getNickname() : "");
+        });
+
+        return success(respResult);
     }
 
     @GetMapping("/list")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/bank/vo/UserBankRespVO.java

@@ -35,4 +35,10 @@ public class UserBankRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "创建人", example = "1")
+    private String creator;
+
+    @Schema(description = "创建人名称", example = "赵六")
+    private String createName;
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java

@@ -271,9 +271,10 @@ public class DeptController {
 
     @GetMapping("/getCompanyDept")
     @Operation(summary = "获取部门类型为公司的部门信息")
+    @Parameter(name = "method", description = "查询类型 | 1全部 2真实公司 3隐藏公司")
     @DataPermission(enable = false)
-    public CommonResult<List<DeptSimpleRespVO>> getCompanyDept() {
+    public CommonResult<List<DeptSimpleRespVO>> getCompanyDept(@RequestParam(name = "method", required = false, defaultValue = "2") Integer method) {
-        List<DeptDO> list = deptService.getCompanyDept();
+        List<DeptDO> list = deptService.getCompanyDept(method);
 
         return success(BeanUtils.toBean(list, DeptSimpleRespVO.class));
     }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/punchrecord/AttendancePunchRecordController.java

@@ -75,7 +75,7 @@ public class AttendancePunchRecordController {
 
     @GetMapping("/getMissingCardRecord")
     @Operation(summary = "获得本月用户缺卡记录")
-    @PreAuthorize("@ss.hasPermission('attendance:punch-record:query')")
+//    @PreAuthorize("@ss.hasPermission('attendance:punch-record:query')")
     public CommonResult<List<AttendancePunchRecordRespVO>> getPunchRecord() {
 
         // 获取当前用户已申请的补卡记录

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java

@@ -40,10 +40,12 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
 import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.TASK_OPERATE_FAIL_USER_NO_DEPT;
 
 @Tag(name = "管理后台 - 用户")
 @RestController
@@ -332,6 +334,23 @@ public class UserController {
         return success(pageResult);
     }
 
+    @GetMapping("/getUserStatus")
+    @Operation(summary = "获得当前登录用户是否属于工厂人员")
+    @PreAuthorize("@ss.hasPermission('system:user:query')")
+    public CommonResult<Boolean> getUserStatus() {
+
+        DeptDO deptDO = deptService.getDept(userService.getUser(getLoginUserId()).getDeptId());
+        if (deptDO == null) {
+            return error(TASK_OPERATE_FAIL_USER_NO_DEPT);
+        }
+
+        if (deptDO.getFactoryId() == null) {
+            return success(false);
+        }else {
+            return success(true);
+        }
+    }
+
     @GetMapping("/export")
     @Operation(summary = "导出用户")
     @PreAuthorize("@ss.hasPermission('system:user:export')")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java

@@ -178,7 +178,7 @@ public class LogInstanceController {
     public CommonResult<List<DeptRespVO>> getReadCompanyDept() {
 
         // 获得公司编号列表
-        List<DeptDO> companyDeptDOs = deptService.getCompanyDept();
+        List<DeptDO> companyDeptDOs = deptService.getCompanyDept(2);
 
         // 获得用户角色
         List<RoleDO> userRoles = roleService.getRoleListFromCache(permissionService.getUserRoleIdListByUserId(getLoginUserId()));

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/bank/UserBankServiceImpl.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.service.bank;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.bank.vo.UserBankPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.bank.vo.UserBankSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.bank.BankDO;
@@ -45,7 +46,9 @@ public class UserBankServiceImpl implements UserBankService {
     public Long createBank(UserBankSaveReqVO createReqVO) {
 
         //校验银行卡号是否已存在
-        Long count = bankMapper.selectCount(BankDO::getBankNo, createReqVO.getBankNo());
+        Long count = bankMapper.selectCount(new LambdaQueryWrapperX<BankDO>()
+                .eq(BankDO::getBankNo, createReqVO.getBankNo())
+                .eq(BankDO::getNickname, createReqVO.getNickname()));
         if (count > 0L) {
             throw exception(BANK_EXISTS);
         }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java

@@ -138,7 +138,7 @@ public interface DeptService {
      *
      * @return 部门信息列表
      */
-    List<DeptDO> getCompanyDept();
+    List<DeptDO> getCompanyDept(Integer method);
 
     /**
      * 获取所有工厂部门

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java

@@ -330,12 +330,16 @@ public class DeptServiceImpl implements DeptService {
 
     @Override
     @DataPermission(enable = false)
-    public List<DeptDO> getCompanyDept() {
+    public List<DeptDO> getCompanyDept(Integer method) {
 
         return deptMapper.selectList(new LambdaQueryWrapperX<DeptDO>()
+                .eq(method == 2, DeptDO::getVirtuallyStatus, 0)
+                .eq(method == 3, DeptDO::getVirtuallyStatus, 1)
+                .eq(DeptDO::getStatus, CommonStatusEnum.ENABLE.getStatus())
                 .eq(DeptDO::getType, DeptTypeEnum.COMPANY.getValue())
-                .eq(DeptDO::getVirtuallyStatus, 0)
+                .or()
-                .eq(DeptDO::getStatus, CommonStatusEnum.ENABLE.getStatus()));
+                .eq(DeptDO::getType, DeptTypeEnum.HEAD_COMPANY.getValue()));
+
     }
 
     @Override

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/project/ProjectServiceImpl.java

@@ -80,9 +80,9 @@ public class ProjectServiceImpl implements ProjectService {
     @Override
     public List<ProjectDO> getMyProject(Long userId) {
         return projectMapper.selectList(new LambdaQueryWrapperX<ProjectDO>()
-                .eq(ProjectDO::getDirectorUserId, userId)
+//                .eq(ProjectDO::getDirectorUserId, userId)
-                .or()
+//                .or()
-                .like(ProjectDO::getStaff, userId)
+//                .like(ProjectDO::getStaff, userId)
                 .eq(ProjectDO::getStatus, 1));
     }
 

zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.smartfactory.service.factoryinfo;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+import cn.iocoder.yudao.framework.common.enums.DeptTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.ip.core.Area;
@@ -68,9 +69,11 @@ public class FactoryInfoServiceImpl implements FactoryInfoService {
             DeptRespDTO deptRespDTO = new DeptRespDTO();
             deptRespDTO.setFactoryId(factoryInfo.getId());
             deptRespDTO.setName(createReqVO.getShortName());
-            deptRespDTO.setParentId(130L);  //这里设置上级部门为 生产部
+            deptRespDTO.setParentId(169L);  //这里设置上级部门为 生产部
             deptRespDTO.setLeaderUserId(createReqVO.getLeaderUserId());
             deptRespDTO.setStatus(CommonStatusEnum.ENABLE.getStatus());
+            deptRespDTO.setType(DeptTypeEnum.PRODUCTION_DEPT.getValue());
+            deptRespDTO.setVirtuallyStatus(0);
             deptApi.createDept(deptRespDTO);
         }