Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-business/src/main/java/com/zjugis/business/bean/request/ProjectReportPassListRequest.java

@@ -0,0 +1,23 @@
+package com.zjugis.business.bean.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @Author 陈俊
+ * @Date 2024/9/5 9:18
+ * @Version 1.0
+ */
+@Schema(description = "项目 - 审核通过列表查询 Request VO")
+@Data
+public class ProjectReportPassListRequest {
+
+    @Schema(description = "项目名称")
+    private String xmmc;
+
+    @Schema(description = "项目编号")
+    private String xmbh;
+
+    @Schema(description = "项目经理")
+    private String xmjl;
+}

zjugis-business/src/main/java/com/zjugis/business/controller/ProjectReportController.java

@@ -1,10 +1,7 @@
 package com.zjugis.business.controller;
 
 import com.zjugis.business.bean.entity.ProjectReport;
-import com.zjugis.business.bean.request.ProjectReportAuditBatchPassRequest;
-import com.zjugis.business.bean.request.ProjectReportAuditPassRequest;
-import com.zjugis.business.bean.request.ProjectReportAuditRejectRequest;
-import com.zjugis.business.bean.request.ProjectReportRequest;
+import com.zjugis.business.bean.request.*;
 import com.zjugis.business.bean.response.ProjectReportResp;
 import com.zjugis.business.converter.projectreport.ProjectReportConvert;
 import com.zjugis.business.flow.commoncost.controller.vo.CommonCostUpdateReqVO;
@@ -82,8 +79,8 @@ public class ProjectReportController {
      */
     @GetMapping("/projectReport/list-pass")
     @Operation(summary = "项目产值填报审核通过列表")
-    public CommonResult<List<ProjectReportResp>> passList() {
-        return CommonResult.success(projectReportService.getPassList());
+    public CommonResult<List<ProjectReportResp>> passList(ProjectReportPassListRequest reqVO) {
+        return CommonResult.success(projectReportService.getPassList(reqVO));
     }
 
     @PostMapping("/projectReport/save")

zjugis-business/src/main/java/com/zjugis/business/mapper/ProjectReportMapper.java

@@ -1,6 +1,7 @@
 package com.zjugis.business.mapper;
 
 import com.zjugis.business.bean.entity.ProjectReport;
+import com.zjugis.business.bean.request.ProjectReportPassListRequest;
 import com.zjugis.business.enums.ProjectReportStatusEnum;
 import com.zjugis.framework.mybatis.core.mapper.BaseMapperX;
 import com.zjugis.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -29,58 +30,66 @@ public interface ProjectReportMapper extends BaseMapperX<ProjectReport> {
 
     /**
      * 通过期号和项目ID查询填报记录
+     *
      * @param projectId
      * @param periodId
      * @return
      */
-    default ProjectReport selectByProjectIdAndPeriodId(String projectId, String periodId){
-        return selectOne(new LambdaQueryWrapperX<ProjectReport>().eq(ProjectReport::getProjectId,projectId).eq(ProjectReport::getPeriodId,periodId));
+    default ProjectReport selectByProjectIdAndPeriodId(String projectId, String periodId) {
+        return selectOne(new LambdaQueryWrapperX<ProjectReport>().eq(ProjectReport::getProjectId, projectId).eq(ProjectReport::getPeriodId, periodId));
     }
 
     /**
      * 获取审核列表
+     *
      * @param loginUserId
      * @param periodId
      * @return
      */
-    default List<ProjectReport> getCheckList(String loginUserId, String periodId){
+    default List<ProjectReport> getCheckList(String loginUserId, String periodId) {
         return selectList(new LambdaQueryWrapperX<ProjectReport>()
                 .eq(ProjectReport::getReportStatus, ProjectReportStatusEnum.AUDIT.getValue())
-                .eq(ProjectReport::getReportAuditorId,loginUserId)
-                .eq(ProjectReport::getPeriodId,periodId));
+                .eq(ProjectReport::getReportAuditorId, loginUserId)
+                .eq(ProjectReport::getPeriodId, periodId));
     }
 
     /**
      * 获取审核通过列表
+     *
      * @param projectIds
      * @param periodId
      * @return
      */
-    default List<ProjectReport> getPassList(Set<String> projectIds, String periodId){
+    default List<ProjectReport> getPassList(Set<String> projectIds, String periodId, ProjectReportPassListRequest reqVO) {
         return selectList(new LambdaQueryWrapperX<ProjectReport>()
-                .inIfPresent(ProjectReport::getProjectId,projectIds)
-                .eq(ProjectReport::getPeriodId,periodId)
+                .inIfPresent(ProjectReport::getProjectId, projectIds)
+                .likeIfPresent(ProjectReport::getXmbh, reqVO.getXmbh())
+                .likeIfPresent(ProjectReport::getXmmc, reqVO.getXmmc())
+                .likeIfPresent(ProjectReport::getXmjl, reqVO.getXmjl())
+                .eq(ProjectReport::getPeriodId, periodId)
                 .isNotNull(ProjectReport::getPassProgress));
     }
 
     /**
      * 获取全部审核通过列表
+     *
      * @param periodId
      * @return
      */
-    default List<ProjectReport> getAllPassList(String periodId){
+    default List<ProjectReport> getAllPassList(String periodId) {
         return selectList(new LambdaQueryWrapperX<ProjectReport>()
                 .isNotNull(ProjectReport::getPassProgress)
-                .eq(ProjectReport::getPeriodId,periodId));
+                .eq(ProjectReport::getPeriodId, periodId));
     }
 
     /**
      * 通过ID列表寻找记录
+     *
      * @param reportIds
      * @return
      */
-    default List<ProjectReport> getListByIds(Set<String> reportIds){
+    default List<ProjectReport> getListByIds(Set<String> reportIds) {
         return selectList(new LambdaQueryWrapperX<ProjectReport>()
-                .in(ProjectReport::getId,reportIds));
+                .in(ProjectReport::getId, reportIds));
     }
 }

zjugis-business/src/main/java/com/zjugis/business/service/ProjectReportService.java

@@ -4,6 +4,7 @@ import com.zjugis.business.bean.entity.ProjectReport;
 import com.zjugis.business.bean.request.ProjectReportAuditBatchPassRequest;
 import com.zjugis.business.bean.request.ProjectReportAuditPassRequest;
 import com.zjugis.business.bean.request.ProjectReportAuditRejectRequest;
+import com.zjugis.business.bean.request.ProjectReportPassListRequest;
 import com.zjugis.business.bean.response.ProjectReportResp;
 
 import java.util.List;
@@ -62,7 +63,7 @@ public interface ProjectReportService {
      *
      * @return
      */
-    List<ProjectReportResp> getPassList();
+    List<ProjectReportResp> getPassList(ProjectReportPassListRequest reqVO);
 
     /**
      * 项目产值填报审核批量通过

zjugis-business/src/main/java/com/zjugis/business/service/impl/ProjectReportServiceImpl.java

@@ -9,6 +9,7 @@ import com.zjugis.business.bean.entity.ProjectReportPeriod;
 import com.zjugis.business.bean.request.ProjectReportAuditBatchPassRequest;
 import com.zjugis.business.bean.request.ProjectReportAuditPassRequest;
 import com.zjugis.business.bean.request.ProjectReportAuditRejectRequest;
+import com.zjugis.business.bean.request.ProjectReportPassListRequest;
 import com.zjugis.business.bean.response.ProjectReportResp;
 import com.zjugis.business.converter.projectreport.ProjectReportConvert;
 import com.zjugis.business.enums.ProjectReportStatusEnum;
@@ -200,11 +201,11 @@ public class ProjectReportServiceImpl implements ProjectReportService {
     }
 
     @Override
-    public List<ProjectReportResp> getPassList() {
+    public List<ProjectReportResp> getPassList(ProjectReportPassListRequest reqVO) {
         ProjectReportPeriod recentlyReportPeriod = projectReportPeriodService.getRecentlyReportPeriod();
         List<Project> projects = projectService.selectByPermission();
         Set<String> projectIds = convertSet(projects, Project::getId);
-        List<ProjectReport> passList = projectReportMapper.getPassList(projectIds, recentlyReportPeriod.getId());
+        List<ProjectReport> passList = projectReportMapper.getPassList(projectIds, recentlyReportPeriod.getId(),reqVO);
         return ProjectReportConvert.INSTANCE.convertList01(passList);
     }
 

zjugis-business/src/main/java/com/zjugis/business/service/impl/ProjectServiceImpl.java

@@ -252,6 +252,9 @@ public class ProjectServiceImpl implements ProjectService {
         BigDecimal receivableAmount = new BigDecimal("0");
         BigDecimal contractBalance = new BigDecimal("0");
         for (ProjectAmount projectAmount : projectAmounts) {
+            if (projectAmount.getVirtualAmount()==null){
+                continue;
+            }
             contractAmount = contractAmount.add(projectAmount.getVirtualAmount());
             receivableAmount = receivableAmount.add(projectAmount.getReceivableAmount());
             contractBalance = contractBalance.add(projectAmount.getContractBalance());
@@ -333,6 +336,9 @@ public class ProjectServiceImpl implements ProjectService {
         child.setXmzt(parent.getXmzt());
         child.setFlowStatus(FlowStatusConstants.FLOW_CHILD);
         child.setLxsj(LocalDate.now());
+        child.setHyId(parent.getHyId());
+        child.setXsryId(parent.getXsryId());
+        child.setXsry(parent.getXsry());
         int res = projectMapper.insert(child);
         if(res > 0){
             contractService.updateChildContract(child);

zjugis-business/src/main/resources/templates/FlowContractInvoice/js/apply.js

@@ -158,6 +158,40 @@
             all({success: false});
             return;
         }
+        let allInvoiceAmount = 0;
+        for (let key of Object.keys(postData)) {
+            let mealName = postData[key];
+            if (key.startsWith("Contract")) {
+                allInvoiceAmount += Number(mealName.invoiceAmount);
+            }
+        }
+        if(contractInvoiceList.length>1){
+            if(Number(postData.contractInvoice.invoiceAmount) != Number(allInvoiceAmount)){
+                all({success: false, errorMsg: "开票金额与所有项目开票金额之和不相等!"});
+                return;
+            }
+        }
+        for (let key of Object.keys(postData)) {
+            let mealName = postData[key];
+            if (key.startsWith("Contract")) {
+                z.ui.ajax({
+                    url: z.ui.comm.getEntranceUrl("/contract-invoice-relation"),
+                    type: 'put',
+                    contentType: 'application/json',
+                    data: JSON.stringify({
+                        'id': mealName.id,
+                        'returnAmount': mealName.returnAmount,
+                        'invoiceAmount': mealName.invoiceAmount
+                    }),
+                    success: function (res) {
+
+                    },
+                    error: function () {
+
+                    }
+                })
+            }
+        }
         z.ui.ajax({
             url: z.ui.comm.getEntranceUrl("/flow/invoice/update"),
             data: z.ui.form.childStringify(postData),

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/controller/admin/staff/vo/records/RecordsBaseVO.java

@@ -310,4 +310,9 @@ public class RecordsBaseVO {
      * 司龄
      */
     private Integer sl;
+
+    /**
+     * 籍贯
+     */
+    private String jg;
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/dal/dataobject/staff/StaffRecordSDO.java

@@ -315,5 +315,10 @@ public class StaffRecordSDO extends BaseDO {
      */
     private LocalDateTime bysj;
 
+    /**
+     * 籍贯
+     */
+    private String jg;
+
 
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/staff/RecordsServiceImpl.java

@@ -484,7 +484,7 @@ public class RecordsServiceImpl implements RecordsService {
         }
 
 
-        //钉钉邀请
+        //钉钉邀请  根据部门id查询部门名称
         StaffDTO staff = new StaffDTO();
         staff.setNickname(staffRecordSDO.getNickname());
         staff.setMobile(staffRecordSDO.getMobilePhone());