提交代码

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/InformationQuery.java

@@ -101,4 +101,10 @@ public class InformationQuery extends BaseEntity {
     @ApiModelProperty("数据源类型，1原生，2数字化")
     private Integer sourceType;
 
+    @ApiModelProperty("合并后的PDF")
+    private String pdfUrl;
+
+    @ApiModelProperty("电签的PDF")
+    private String eVisaPdfUrl;
+
 }

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ManagerHomePageVO.java

@@ -26,6 +26,9 @@ public class ManagerHomePageVO {
     @ApiModelProperty("项目章数量集合")
     private List<SingPfx> pfxList = new ArrayList<>();
 
+    @ApiModelProperty("证书总数")
+    private Integer pfxAmount;
+
     /**
      * 当前用户待办工单
      */

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -504,7 +504,7 @@ public class InformationWriteQueryController extends BladeController {
 			this.setRootNodeName(parentId, childList);
 			if(childList != null && childList.size() == 1){
 				//需要向下展开
-				this.foreachQueryChildNode(childList, childList.get(0).getContractIdRelation(), 1);
+				this.foreachQueryChildNode(childList, contractId, childList.get(0).getContractIdRelation());
 			}
 			if(StringUtils.isEmpty(contractIdRelation) && "0".equals(parentId)){
 				//给个顶点
@@ -526,7 +526,7 @@ public class InformationWriteQueryController extends BladeController {
 				result = this.wbsTreeContractClient.queryContractWbsTreeByContractIdAndType(contractId, 1, parentId);
 				//判断当前节点下是不是只有一个子节点
 				if(result != null && result.size() == 1){
-					this.foreachQueryChildNode(result, contractId, contractInfo.getContractType());
+					this.foreachQueryChildNode(result, contractId);
 				}
 			}
 		}
@@ -559,6 +559,24 @@ public class InformationWriteQueryController extends BladeController {
 		return R.data(result);
 	}
 
+	/**
+	 * 监理查询下级节点
+	 */
+	private void foreachQueryChildNode(List<WbsTreeContractTreeVOS> result, String contractId, String contractIdRelation){
+		result.forEach(vos -> {
+			//查询子节点
+			List<WbsTreeContractTreeVOS> childList = this.wbsTreeContractClient.lazyTree(Long.parseLong(vos.getPrimaryKeyId()), contractId, contractIdRelation, 2);
+			if(childList != null && childList.size() == 1){
+				this.foreachQueryChildNode(childList, contractId, contractIdRelation);
+			}
+			//判断当前节点是否被标记为首件
+			TreeContractFirst first = this.treeContractFirstService.getOne(Wrappers.<TreeContractFirst>lambdaQuery().eq(TreeContractFirst::getIsDeleted, 0).eq(TreeContractFirst::getWbsNodeId, vos.getId()));
+			vos.setIsFirst(first != null);
+
+			vos.setChildren(childList);
+		});
+	}
+
 	/**
 	 * 循环处理节点颜色
 	 */
@@ -593,18 +611,15 @@ public class InformationWriteQueryController extends BladeController {
 	 * 如果子节点只有一个，则进一步查询该子节点的下级节点
 	 * @param result 子节点集合
 	 */
-	private void foreachQueryChildNode(List<WbsTreeContractTreeVOS> result, String contractId, Integer initialContractType){
+	private void foreachQueryChildNode(List<WbsTreeContractTreeVOS> result, String contractId){
 		result.forEach(vos -> {
-			String id = new Integer("2").equals(initialContractType) ? vos.getPrimaryKeyId() : vos.getId();
-			String primaryKeyId = new Integer("2").equals(initialContractType) ? vos.getId() : vos.getPrimaryKeyId();
-
-			List<WbsTreeContractTreeVOS> child = this.wbsTreeContractClient.queryContractWbsTreeByContractIdAndType(contractId, 1, id);
+			List<WbsTreeContractTreeVOS> child = this.wbsTreeContractClient.queryContractWbsTreeByContractIdAndType(contractId, 1, vos.getId());
 			if(child != null && child.size() == 1){
 				//如果子节点还是只有一个，则进一步向下查询
-				this.foreachQueryChildNode(child, contractId, initialContractType);
+				this.foreachQueryChildNode(child, contractId);
 			}
 			//判断当前节点是否被标记为首件
-			TreeContractFirst first = this.treeContractFirstService.getOne(Wrappers.<TreeContractFirst>lambdaQuery().eq(TreeContractFirst::getIsDeleted, 0).eq(TreeContractFirst::getWbsNodeId, primaryKeyId));
+			TreeContractFirst first = this.treeContractFirstService.getOne(Wrappers.<TreeContractFirst>lambdaQuery().eq(TreeContractFirst::getIsDeleted, 0).eq(TreeContractFirst::getWbsNodeId, vos.getPrimaryKeyId()));
 			vos.setIsFirst(first != null);
 
 			vos.setChildren(child);

blade-service/blade-business/src/main/java/org/springblade/business/controller/MaterialProgressController.java

@@ -105,6 +105,8 @@ public class MaterialProgressController extends BladeController {
     }
 
     private void countAmount(List<WbsTreeContractTreeVOS> nodeResult, List<QueryProcessDataVO> queryDataResult, String contractId, MaterialProgressVO reVO){
+        //获取合同段信息
+        ContractInfo contract = this.contractClient.getContractById(Long.parseLong(contractId));
         nodeResult.forEach(node -> {
             //施工台账
             int standingBookNotAmount = 0, standingBookEndAmount = 0;
@@ -155,7 +157,7 @@ public class MaterialProgressController extends BladeController {
             List<WbsTreeContract> childList = this.wbsTreeContractClient.queryChildByParentId(nodes, "");
 
             //设置参数
-            reVO.setTreeMaterialProgressList(node.getTitle(), node.getId(), node.getPrimaryKeyId(), contractId, standingBookNotAmount, standingBookEndAmount,
+            reVO.setTreeMaterialProgressList("0".equals(node.getParentId()) ? contract.getContractName() : node.getTitle(), node.getId(), node.getPrimaryKeyId(), contractId, standingBookNotAmount, standingBookEndAmount,
                     processNotSubmitAmount.get(), processNotTaskAmount.get(), processAwaitAmount.get(), processApprovalAmount.get(),
                     workStartNotSubmitAmount.get(), workStartNotTaskAmount.get(), workStartAwaitAmount.get(), workStartApprovalAmount.get(),
                     evaluationNotSubmitAmount.get(), evaluationNotTaskAmount.get(), evaluationAwaitAmount.get(), evaluationApprovalAmount.get(),
@@ -208,7 +210,22 @@ public class MaterialProgressController extends BladeController {
                     }
                 }
                 if(countTypeList.size() > 0){
+                    //判断数量
+                    AtomicInteger imageAmount = new AtomicInteger();
+                    AtomicInteger videoAmount = new AtomicInteger();
+                    countTypeList.forEach(type -> {
+                        switch (type) {
+                            case 1:
+                                videoAmount.getAndIncrement();
+                                break;
+                            case 2:
+                                imageAmount.getAndIncrement();
+                                break;
+                        }
+                    });
+                    reVO.setContractImageClassificationList(countTypeList.size(), imageAmount.get(), videoAmount.get());
 
+                    return R.data(reVO);
                 }
             }
         } else {

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -28,6 +28,8 @@
         <result column="report_number" property="reportNumber"/>
         <result column="completion_status" property="completionStatus"/>
         <result column="source_type" property="sourceType"/>
+        <result column="pdf_url" property="pdfUrl"/>
+        <result column="e_visa_pdf_url" property="eVisaPdfUrl"/>
     </resultMap>
 
     <resultMap id="queryProcessDataMap" type="org.springblade.business.vo.QueryProcessDataVO">
@@ -102,6 +104,8 @@
             query.status,
             query.report_number,
             query.file_user_id_and_name
+            query.pdf_url,
+            query.e_visa_pdf_url
         from
         (
             select
@@ -112,7 +116,9 @@
                 status,
                 report_number,
                 file_user_id_and_name,
-                date_format(create_time,'%Y-%m-%d') as createTimes
+                date_format(create_time,'%Y-%m-%d') as createTimes,
+                pdf_url,
+                e_visa_pdf_url
             from u_information_query
             where
                 is_deleted = 0

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ManagerHomePageController.java

@@ -67,7 +67,7 @@ public class ManagerHomePageController extends BladeController {
         //返回参数
         ManagerHomePageVO reVO = new ManagerHomePageVO();
 
-        List<SingPfxManagementVO> result = this.signPfxFileService.singPfxManagementPage(Condition.getPage(query), new SingPfxManagementVO(1, 6000)).getRecords();
+        List<SingPfxManagementVO> result = this.signPfxFileService.singPfxManagementPage(Condition.getPage(query), new SingPfxManagementVO(1, 6000), "alias").getRecords();
         if(result != null && result.size() > 0){
             //过滤掉企业证书和个人证书数量都为0的项目
             result.removeIf(vo -> (StringUtils.isEmpty(vo.getEnterpriseCount()) || "0".equals(vo.getEnterpriseCount()))
@@ -75,6 +75,8 @@ public class ManagerHomePageController extends BladeController {
             //设置参数
             result.forEach(vo -> reVO.setPfxList(vo.getProjectName(), vo.getEnterpriseCount(), vo.getPersonalCount()));
 
+
+
         }
         return R.data(reVO);
     }
@@ -265,7 +267,7 @@ public class ManagerHomePageController extends BladeController {
         ManagerHomePageVO resultVO = new ManagerHomePageVO();
         try{
             //获取所有待办工单
-            List<BusinessUserOpinionVO> result = this.opinionUserClient.queryBusinessUserOpinionList(current, size);
+            List<BusinessUserOpinionVO> result = this.opinionUserClient.queryBusinessUserOpinionListAll(current, size);
             //删除掉已经办结的
             result.removeIf(BusinessUserOpinionVO::getIsCurrent);
             //拼接数据

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/SignPfxFileController.java

@@ -324,7 +324,7 @@ public class SignPfxFileController extends BladeController {
 		query.setSize(vo.getSize());
 		query.setCurrent(vo.getCurrent());
 
-		return R.data(this.signPfxFileService.singPfxManagementPage(Condition.getPage(query), vo));
+		return R.data(this.signPfxFileService.singPfxManagementPage(Condition.getPage(query), vo, ""));
 	}
 
 	/**

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/WbsTreeContractClientImpl.java

@@ -67,8 +67,8 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
         vos.forEach(voData -> {
             voData.setLeaf(new Integer("6").equals(voData.getDeptCategory()));
             //检查是否有下级
-            List<WbsTreeContractTreeVO> childs = this.contractInfoService.queryContractWbsTreeByContractIdAndType(voData.getContractIdRelation(), voData.getWbsType(), voData.getKey());
-            voData.setExsitChild(childs == null || childs.size() == 0);
+            long count = this.wbsTreeContractService.count(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getParentId, voData.getPrimaryKeyId()).eq(WbsTreeContract::getContractId, voData.getContractIdRelation()).eq(WbsTreeContract::getWbsType, 1));
+            voData.setExsitChild(count == 0);
         });
 
         return vos;

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ProjectInfoMapper.java

@@ -36,7 +36,7 @@ public interface ProjectInfoMapper extends BaseMapper<ProjectInfo> {
 
 	List<ProjectUserAmountVO> queryProjectUserAmount();
 
-	List<SingPfxManagementVO> singPfxManagementPage(@Param("current") Long current, @Param("size") Integer size, @Param("vo") SingPfxManagementVO vo);
+	List<SingPfxManagementVO> singPfxManagementPage(@Param("current") Long current, @Param("size") Integer size, @Param("vo") SingPfxManagementVO vo, @Param("alias") String alias);
 
 	List<ProjectInfo> selectProjectList(@Param("projectIds") List<String> projectIds);
 

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ProjectInfoMapper.xml

@@ -61,7 +61,14 @@
     <select id="singPfxManagementPage" resultMap="singPfxManagementResultMap">
         select
             pi.id,
-            pi.project_name,
+            <choose>
+                <when test="alias != null and alias != ''">
+                    pi.project_alias AS project_name
+                </when>
+                <otherwise>
+                    pi.project_name AS project_name
+                </otherwise>
+            </choose>,
             (select id from m_contract_info where is_deleted = 0 and p_id = pi.id limit 1) AS contractId
         from m_project_info AS pi where pi.is_deleted = 0
         <if test="vo.projectId != null">

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IProjectInfoService.java

@@ -33,7 +33,7 @@ public interface IProjectInfoService extends BaseService<ProjectInfo> {
 
 	List<ProjectUserAmountVO> queryProjectUserAmount();
 
-	List<SingPfxManagementVO> singPfxManagementPage(SingPfxManagementVO vo);
+	List<SingPfxManagementVO> singPfxManagementPage(SingPfxManagementVO vo, String alias);
 
 	List<ProjectInfo> selectProjectList(List<String> projectIds);
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/ISignPfxFileService.java

@@ -33,7 +33,7 @@ import java.util.List;
  */
 public interface ISignPfxFileService extends BaseService<SignPfxFile> {
 
-	IPage<SingPfxManagementVO> singPfxManagementPage(IPage<SingPfxManagementVO> page, SingPfxManagementVO vo);
+	IPage<SingPfxManagementVO> singPfxManagementPage(IPage<SingPfxManagementVO> page, SingPfxManagementVO vo, String alias);
 
 	/**
 	 * 注册

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ProjectInfoServiceImpl.java

@@ -53,9 +53,9 @@ public class ProjectInfoServiceImpl extends BaseServiceImpl<ProjectInfoMapper, P
     }
 
     @Override
-    public List<SingPfxManagementVO> singPfxManagementPage(SingPfxManagementVO vo) {
+    public List<SingPfxManagementVO> singPfxManagementPage(SingPfxManagementVO vo, String alias) {
         long current = (vo.getCurrent() - 1L) * vo.getSize();
-        List<SingPfxManagementVO> result = this.baseMapper.singPfxManagementPage(current, vo.getSize(), vo);
+        List<SingPfxManagementVO> result = this.baseMapper.singPfxManagementPage(current, vo.getSize(), vo, alias);
 
         result.forEach(vos -> {
             //查询个人签章

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/SignPfxFileServiceImpl.java

@@ -67,9 +67,9 @@ public class SignPfxFileServiceImpl extends BaseServiceImpl<SignPfxFileMapper, S
 	private final EVisaClient eVisaClient;
 
 	@Override
-	public IPage<SingPfxManagementVO> singPfxManagementPage(IPage<SingPfxManagementVO> page, SingPfxManagementVO vo) {
+	public IPage<SingPfxManagementVO> singPfxManagementPage(IPage<SingPfxManagementVO> page, SingPfxManagementVO vo, String alias) {
 		//获取项目列表
-		List<SingPfxManagementVO> voResult = this.projectInfoService.singPfxManagementPage(vo);
+		List<SingPfxManagementVO> voResult = this.projectInfoService.singPfxManagementPage(vo, alias);
 		//获取项目列表总数
 		long count = this.projectInfoService.count(Wrappers.<ProjectInfo>lambdaQuery().eq(ProjectInfo::getIsDeleted, 0));
 		page.setTotal(count);