分包合同和项目追踪相关代码修改

zjugis-business/src/main/java/com/zjugis/business/bean/dto/ContractApplyDto.java

@@ -1,6 +1,7 @@
 package com.zjugis.business.bean.dto;
 
 import com.zjugis.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.Set;
@@ -23,6 +24,8 @@ public class ContractApplyDto extends PageParam {
 
     private String userId;
 
+    @Schema(description = "报销人部门")
+    private String deptId;
 
     private String year;
 

zjugis-business/src/main/java/com/zjugis/business/bean/entity/ProjectTracking.java

@@ -94,4 +94,15 @@ public class ProjectTracking extends BaseEntity {
      */
     private String bz;
 
+
+    /**
+     * 是否进场(0:是;1:否)
+     */
+    private Integer sfjc;
+
+    /**
+     * 中标金额
+     */
+    private BigDecimal zbje;
+
 }

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

@@ -73,4 +73,11 @@ public class ProjectTrackingRequest {
 
     @Schema(description = "备注")
     private String bz;
+
+    @Schema(description = "是否进场(0:是;1:否)")
+    @NotNull(message = "是否进场不能为空")
+    private Integer sfjc;
+
+    @Schema(description = "中标金额")
+    private BigDecimal zbje;
 }

zjugis-business/src/main/java/com/zjugis/business/bean/response/ProjectTrackingResp.java

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 /**
  * @Author 陈俊
@@ -41,6 +42,9 @@ public class ProjectTrackingResp {
     @Schema(description = "行政区代码")
     private String xzqdm;
 
+    @Schema(description = "行政区名称")
+    private String xzqmc;
+
     @Schema(description = "状态")
     private String zt;
 
@@ -49,4 +53,13 @@ public class ProjectTrackingResp {
 
     @Schema(description = "备注")
     private String bz;
+
+    @Schema(description = "更新时间")
+    private LocalDateTime latestModifyTime;
+
+    @Schema(description = "是否进场(0:是;1:否)")
+    private Integer sfjc;
+
+    @Schema(description = "中标金额")
+    private BigDecimal zbje;
 }

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

@@ -32,6 +32,7 @@ public interface ProjectTrackingMapper extends BaseMapperX<ProjectTracking> {
                 .and(wq -> wq.like(ProjectTracking::getVisibleUserIds, SecurityFrameworkUtils.getLoginUserId())
                         .or()
                         .eq(ProjectTracking::getGzryId, SecurityFrameworkUtils.getLoginUserId()))
+                .orderByAsc(ProjectTracking::getXzqdm)
                 .orderByDesc(ProjectTracking::getCreateTime));
     }
 
@@ -44,6 +45,8 @@ public interface ProjectTrackingMapper extends BaseMapperX<ProjectTracking> {
                 .and(wq -> wq.like(ProjectTracking::getVisibleUserIds, SecurityFrameworkUtils.getLoginUserId())
                         .or()
                         .eq(ProjectTracking::getGzryId, SecurityFrameworkUtils.getLoginUserId()))
+                .orderByAsc(ProjectTracking::getXzqdm)
+                .orderByDesc(ProjectTracking::getCreateTime)
         );
     }
 }

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

@@ -14,6 +14,7 @@ import com.zjugis.business.bean.response.SumResponse;
 import com.zjugis.business.constants.ContractApplyConstants;
 import com.zjugis.business.constants.FlowStatusConstants;
 import com.zjugis.business.mapper.ContractApplyMapper;
+import com.zjugis.business.service.CommonService;
 import com.zjugis.business.service.ContractApplyService;
 import com.zjugis.business.service.ContractService;
 import com.zjugis.framework.common.exception.ServiceException;
@@ -29,6 +30,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Set;
 
 import static com.zjugis.business.constants.ResponseStatusEnum.WORKFLOW_ERROR;
 
@@ -51,9 +53,13 @@ public class ContractApplyServiceImpl implements ContractApplyService {
     private AdminUserApi adminUserApi;
     @Autowired
     private WorkflowClient workflowClient;
+    @Autowired
+    private CommonService commonService;
 
     @Override
     public Page<ContractApplyResp> page(ContractApplyDto contractApplyDto) {
+        Set<String> deptIds = commonService.getDeptCondition(contractApplyDto.getDeptId());
+        contractApplyDto.setDeptIds(deptIds);
         Page<ContractApply> page = new Page<>(contractApplyDto.getPageNo(),contractApplyDto.getPageSize());
         return contractApplyMapper.page(page,contractApplyDto);
     }

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

@@ -238,6 +238,9 @@ public class ProjectReportServiceImpl implements ProjectReportService {
     @Override
     public Integer getCheckNum() {
         ProjectReportPeriod currentReportPeriod = projectReportPeriodService.getCurrentReportPeriod();
+        if(currentReportPeriod==null){
+            return null;
+        }
         List<ProjectReport> checkList = projectReportMapper.getCheckList(SecurityFrameworkUtils.getLoginUserId(), currentReportPeriod.getId());
         return checkList.size();
     }

zjugis-business/src/main/resources/mapper/oracle/ContractApplyMapper.xml

@@ -33,6 +33,12 @@
             <if test="params != null and params.userId != null  and params.userId != ''">
                 AND t.APPLY_WORKER_ID = #{params.userId}
             </if>
+            <if test="params != null  and params.deptIds != null  and params.deptIds.size > 0">
+                AND t2.ZRBM_ID in
+                <foreach collection="params.deptIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         ORDER BY t.APPLY_DATE DESC
     </select>