Merge branch 'dev' of http://219.151.181.73:3000/zhuwei/bladex into dev

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -170,8 +170,8 @@ public class ArchivesAutoController extends BladeController {
 			ids.add(nodeId+"");
 		}
 	    List<ArchivesAutoVO5> list=	archivesAutoService.selectArchivesAutoFileFormDownload(projectId,contractId,ids);
-		//String templatePath="/mnt/sdc/Users/hongchuangyanfa/Desktop/excel/archiveTemplate.xlsx";
-		String templatePath="C:\\Users\\hc01\\Desktop\\archiveTemplate.xlsx";
+		String templatePath="/mnt/sdc/Users/hongchuangyanfa/Desktop/excel/archiveTemplate.xlsx";
+		//String templatePath="C:\\Users\\hc01\\Desktop\\archiveTemplate.xlsx";
 		InputStream templateStream = new FileInputStream(new File(templatePath));
 		org.apache.poi.ss.usermodel.Workbook workbook = WorkbookFactory.create(templateStream);
 		Sheet sheet = workbook.getSheetAt(0);
@@ -183,7 +183,7 @@ public class ArchivesAutoController extends BladeController {
 			// 填充各列数据
 			row.createCell(0).setCellValue(i + 1); // 序号
 			row.createCell(1).setCellValue(StringUtils.isNotEmpty(vo1.getFileNumber())?vo1.getFileNumber():""); // 档号
-			row.createCell(2).setCellValue(StringUtils.isNotEmpty(vo1.getStorageTimeValue())?vo1.getStorageTimeValue():""); // 案卷题名
+			row.createCell(2).setCellValue(StringUtils.isNotEmpty(vo1.getName())?vo1.getName():""); // 案卷题名
 			row.createCell(3).setCellValue(StringUtils.isNotEmpty(vo1.getStorageTimeValue())?vo1.getStorageTimeValue():""); // 保管期限
 			row.createCell(4).setCellValue(vo1.getPageN()+""); // 总页数
 			row.createCell(5).setCellValue(StringUtils.isNotEmpty(vo1.getUnit())?vo1.getUnit():""); // 立卷单位
@@ -198,7 +198,7 @@ public class ArchivesAutoController extends BladeController {
 		String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.toString())
 				.replaceAll("\\+", "%20");
 		return ResponseEntity.ok()
-				.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename*=UTF-8''" + encodedFileName)
+				.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename*=" + encodedFileName)
 				.contentType(MediaType.APPLICATION_OCTET_STREAM)
 				.contentLength(resource.contentLength())
 				.body(resource);

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.java

@@ -235,5 +235,5 @@ public interface ArchivesAutoMapper extends BaseMapper<ArchivesAuto> {
 	void deleteIsElementFileByProjectId(@Param("projectId") Long projectId);
 
 	void deleteIsElementFileByNode(@Param("projectId") Long projectId,@Param("ancestors") String ancestors,@Param("nodeId") String nodeId);
-	List<ArchivesAutoVO5> selectArchivesAutoFileFormDownload(@Param("projectId") Long projectId, @Param("contractId") Long contractId, @Param("ids") List<String> ids);
+	List<ArchivesAutoVO5> selectArchivesAutoFileFormDownload(@Param("projectId") Long projectId,  @Param("ids") List<String> ids);
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -1548,10 +1548,10 @@
         SUBSTRING_INDEX(uaa.file_number, '_', 1), SUBSTRING_INDEX(uaa.file_number, '_', -1) + 0 ,uaa.create_time asc
     </select>
     <select id="selectArchivesAutoFileFormDownload" resultType="org.springblade.archive.vo.ArchivesAutoVO5">
-        select u.id,u.file_number,u.name,u.storageTime,u.page_n,u.unit,u.remark from u_archives_auto u LEFT JOIN m_archive_tree_contract m ON u.node_id = m.id where u.is_deleted = 0 and u.project_id = #{vo.projectId} and u.is_archive=1
-        <if test="vo.nodeIds != null and vo.nodeIds != ''">
+        select u.id,u.file_number,u.name,u.storage_time,u.page_n,u.unit,u.remark from u_archives_auto u LEFT JOIN m_archive_tree_contract m ON u.node_id = m.id where u.is_deleted = 0 and u.project_id = #{projectId} and u.is_archive=1
+        <if test="ids != null and ids != ''">
             and u.node_id in
-            <foreach collection="vo.nodeIdArray" item="nodeId" open="(" separator="," close=")">
+            <foreach collection="ids" item="nodeId" open="(" separator="," close=")">
                 #{nodeId}
             </foreach>
         </if>

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -1602,7 +1602,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 
 	@Override
 	public List<ArchivesAutoVO5> selectArchivesAutoFileFormDownload(Long projectId, Long contractId, List<String> ids) {
-		List<ArchivesAutoVO5> list = this.baseMapper.selectArchivesAutoFileFormDownload(projectId, contractId, ids);
+		List<ArchivesAutoVO5> list = this.baseMapper.selectArchivesAutoFileFormDownload(projectId, ids);
 		List<DictBiz> sheetSourceList1 = this.iDictBizClient.getList("storage_period", "notRoot").getData();
 		list.forEach(vos -> {
 			if (StringUtils.isNotEmpty(vos.getStorageTime())) {

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

@@ -681,12 +681,12 @@ public class TrialDetectionController extends BladeController {
         if (vo.getRecordNo() == null) {
             Map<String, String> map = trialNumberRuleService.getTrialNumber(projectId, contractId, 4, nodeId, true);
             vo.setRecordNo(map.get("trialNumber"));
-            vo.setRecordAutoNumber(map.get("trialAutoNumber"));
+            vo.setRecordAutoNumber(map.get("autoIncrementNumber"));
         }
         if (vo.getReportNo() == null) {
             Map<String, String> map = trialNumberRuleService.getTrialNumber(projectId, contractId, 5, nodeId, true);
             vo.setReportNo(map.get("trialNumber"));
-            vo.setReportAutoNumber(map.get("trialAutoNumber"));
+            vo.setReportAutoNumber(map.get("autoIncrementNumber"));
         }
         List<TrialSeleInspectionRecordInfoDTO.StandardVo> mapList = jdbcTemplate.query("SELECT id,name from u_wbs_private_standard WHERE type = 2 and is_deleted = 0  and private_id = " + nodeId,
                 new BeanPropertyRowMapper<>(TrialSeleInspectionRecordInfoDTO.StandardVo.class));

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialNumberRuleServiceImpl.java

@@ -90,6 +90,7 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
              rules = baseMapper.selectList(Wrappers.<TrialNumberRule>query().lambda().eq(TrialNumberRule::getContractId, contractId).eq(TrialNumberRule::getType, type).eq(TrialNumberRule::getStatus,2).orderByAsc(TrialNumberRule::getSort));
         }
         boolean flag=true;
+        boolean flag1=true;
         int i=1;
         do {
             for (TrialNumberRule rule : rules) {
@@ -151,9 +152,12 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
                                 return null;
                             }
                         });
-                        if(StringUtils.isEmpty(maxNumber)){
+                        if(StringUtils.isEmpty(maxNumber)&&i==1){
                             autoIncrementNumber=rule.getData();
                         }else {
+                            if(maxNumber==null){
+                                maxNumber=rule.getData();
+                            }
                             autoIncrementNumber=incrementFormattedNumberWithCheck(maxNumber,i);
                         }
 //
@@ -203,11 +207,11 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
                 }
             }
             if(isSaveRedis){
-                flag=checkTrialNumberIsExist(trialNumber.toString(),type,contractId);
-                i++;
-                if(!flag){
-                    trialNumber.setLength(0);
-                }
+                    flag=checkTrialNumberIsExist(trialNumber.toString(),type,contractId);
+                    i++;
+                    if(!flag){
+                        trialNumber.setLength(0);
+                    }
             }
         }while (!flag);
         map.put("trialNumber",trialNumber.toString());

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

@@ -4816,21 +4816,23 @@ public class ExcelTabController extends BladeController {
             List<WbsTreeContract> wbsTreeContractList = entry.getValue();
             for (WbsTreeContract contract : wbsTreeContractList) {
                 Map<String, Object> dataInfo = excelTabService.getBussDataInfo(contract.getPKeyId(), 0, true);
-                InputStream inputStreamByUrl = FileUtils.getInputStreamByUrl(contract.getHtmlUrl());
-                String htmlString = IoUtil.readToString(inputStreamByUrl);
-                Document doc = Jsoup.parse(htmlString);
-                Elements dateElements = doc.select("el-date-picker");
-                if(!dateElements.isEmpty()){
-                    Boolean dateFlag=true;
-                    for (Element element : dateElements) {
-                        String keyname = element.attr("keyname");
-                        if(!dataInfo.containsKey(keyname)||(StringUtils.isEmpty(dataInfo.get(keyname).toString()))){
-                            dateFlag=false;
-                            break;
+                if(dataInfo!=null){
+                    InputStream inputStreamByUrl = FileUtils.getInputStreamByUrl(contract.getHtmlUrl());
+                    String htmlString = IoUtil.readToString(inputStreamByUrl);
+                    Document doc = Jsoup.parse(htmlString);
+                    Elements dateElements = doc.select("el-date-picker");
+                    if(!dateElements.isEmpty()){
+                        Boolean dateFlag=true;
+                        for (Element element : dateElements) {
+                            String keyname = element.attr("keyname");
+                            if(!dataInfo.containsKey(keyname)||(StringUtils.isEmpty(dataInfo.get(keyname).toString()))){
+                                dateFlag=false;
+                                break;
+                            }
+                        }
+                        if(!dateFlag){
+                            wbsTreeContractMapper.update(contract,new LambdaUpdateWrapper<WbsTreeContract>().eq(WbsTreeContract::getPKeyId,contract.getPKeyId()).set(WbsTreeContract::getDateIsComplete,2));
                         }
-                    }
-                    if(!dateFlag){
-                        wbsTreeContractMapper.update(contract,new LambdaUpdateWrapper<WbsTreeContract>().eq(WbsTreeContract::getPKeyId,contract.getPKeyId()).set(WbsTreeContract::getDateIsComplete,2));
                     }
                 }
             }

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

@@ -981,8 +981,8 @@
         <if test="contractId!=null and contractId!=''">
           and  contract_id=#{contractId}
         </if>
-        and is_deleted=0 and is_buss_show !=2 and init_table_name !=null and html_url !=null and LENGTH(init_table_name) > 10 and LENGTH(html_url) > 10
-        and p_id !=null
+        and is_deleted=0 and is_buss_show !=2 and init_table_name is not null and html_url is not null and LENGTH(init_table_name) > 10 and LENGTH(html_url) > 10
+        and p_id is not null
     </select>
 
 </mapper>