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

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/InformationQueryClient.java

@@ -97,7 +97,7 @@ public interface InformationQueryClient {
     void insert(@RequestBody InformationQuery iq);
 
     @PostMapping(API_PREFIX+"/getInfoByWbsId")
-    InformationQuery getInfoByWbsId(@RequestParam Long wbsId);
+    InformationQuery getInfoByWbsId(@RequestParam Long wbsId,@RequestParam Integer classify);
 
     @PostMapping(API_PREFIX+"/updateInformationQuery1")
     void update(@RequestBody  InformationQuery iq);

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/InformationQueryClientImpl.java

@@ -127,10 +127,11 @@ public class InformationQueryClientImpl implements InformationQueryClient {
     }
 
     @Override
-    public InformationQuery getInfoByWbsId(Long wbsId) {
-        return informationQueryMapper.selectOne(new QueryWrapper<InformationQuery>().eq("wbs_id",wbsId));
+    public InformationQuery getInfoByWbsId(Long wbsId,Integer classify) {
+        return informationQueryMapper.selectOne(new QueryWrapper<InformationQuery>().eq("wbs_id",wbsId).eq("classify",classify));
     }
 
+
     @Override
     public void update(InformationQuery iq) {
         informationQueryMapper.updateById(iq);

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

@@ -864,6 +864,7 @@ public class ExcelTabController extends BladeController {
         //这句代码在正式环境要加上
 
         if (Func.isNotEmpty(dataInfo) && dataInfo.getTabType() != null && dataInfo.getTabType() != 100L) {
+            int x=0;
             for (int i = 1; i < 6; i++) {
                 Element tr = trs.get(i);
                 Elements tds = tr.select("td");
@@ -873,8 +874,9 @@ public class ExcelTabController extends BladeController {
                     if (style.indexOf("font-size") >= 0) {
                         int fontsize = Integer.parseInt(style.substring(style.indexOf("font-size:") + 10, style.indexOf(".0pt")));
                         if (isWater) {
-                            if (StringUtils.isNotEmpty(data.text()) && fontsize >= 12) {
+                            if (StringUtils.isNotEmpty(data.text()) && fontsize >= 12&&x<=0) {
                                 trs.get(i - 1).select("td").get(0).text(projectInfo.getProjectName());
+                                x=x+1;
                             }
                         } else {
                             if (StringUtils.isNotEmpty(data.text()) && fontsize >= 14) {
@@ -4451,7 +4453,7 @@ public class ExcelTabController extends BladeController {
             WbsTreeContract wbsTreeContract = jdbcTemplate.queryForObject(sql, new BeanPropertyRowMapper<>(WbsTreeContract.class));
             if (ObjectUtil.isNotEmpty(wbsTreeContract.getNodeClass())) {
                 if (wbsTreeContract.getNodeClass().equals(Integer.valueOf(2))) {
-                    InformationQuery iq = informationQueryClient.getInfoByWbsId(wbsTreeContract.getPKeyId());
+                    InformationQuery iq = informationQueryClient.getInfoByWbsId(wbsTreeContract.getPKeyId(),classify);
                     if (iq == null) {
                         iq = new InformationQuery();
                         iq.setId(SnowFlakeUtil.getId());

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

@@ -53,6 +53,7 @@ import org.springblade.manager.service.ITableFileService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 import java.rmi.ServerException;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -137,7 +138,10 @@ public class TableFileController extends BladeController {
                 wbsTreeContractService.update(updateWrapper);
                 WbsTreeContract wbsTreeContract = wbsTreeContractService.getBaseMapper().selectOne(new QueryWrapper<WbsTreeContract>().eq("p_key_id", tableFile.getTabId()));
                 if(wbsTreeContract.getNodeClass().equals(Integer.valueOf(2))){
-                    InformationQuery infoByWbsId = informationQueryClient.getInfoByWbsId(Long.valueOf(tableFile.getTabId()));
+                    Integer classify =
+                            Arrays.asList("1", "2", "3").contains(wbsTreeContract.getTableOwner()) ? 1 :
+                                    Arrays.asList("4", "5", "6").contains(wbsTreeContract.getTableOwner()) ? 2 : 1;
+                    InformationQuery infoByWbsId = informationQueryClient.getInfoByWbsId(Long.valueOf(tableFile.getTabId()),classify);
                     if(ObjectUtil.isNotEmpty(infoByWbsId)){
                         String sql="DELETE FROM u_information_query WHERE id="+infoByWbsId.getId();
                         jdbcTemplate.execute(sql);

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

@@ -1368,6 +1368,7 @@ public class ExecutorMeter extends FormulaExecutor {
                              certificate.setCurrentPeriodEndPay(rebateIncentiveAdvPay.getEndPay());
                              certificate.setCurrentPeriodPay(rebateIncentiveAdvPay.getCurrentPay());
                              certificate.setPreviousPeriodEndPay(rebateIncentiveAdvPay.getPreviousPay());
+                             certificate.setInvertState(BigDecimal.valueOf(-1));
                          }else if("违约罚金".equals(certificate.getChapterSeq())){
                              certificate.setCurrentPeriodPay(ic.getCurrentPeriodPay());
                              ic.setPreviousPeriodEndPay(icPre.getCurrentPeriodEndPay());

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

@@ -174,6 +174,7 @@ public class ServicePlanServiceImpl extends BaseServiceImpl<ServicePlanMapper, S
             Boolean isWater = false;
             // 添加标题显示
             Elements trs = table.select("tr");
+            int x=0;
             for (int i = 1; i < 6; i++) {
                 Element tr = trs.get(i);
                 Elements tds = tr.select("td");
@@ -193,7 +194,7 @@ public class ServicePlanServiceImpl extends BaseServiceImpl<ServicePlanMapper, S
                                 element = trs.get(i - 1).select("td").get(0);
                             }
                         }
-                        if (element != null && Func.isNotEmpty(element)) {
+                        if (element != null && Func.isNotEmpty(element)&&x<=0) {
                             //
                             Elements allElements = element.children();
                             if (allElements.size() >= 1) {
@@ -202,9 +203,11 @@ public class ServicePlanServiceImpl extends BaseServiceImpl<ServicePlanMapper, S
                                     element.text(defText);
                                 } else {
                                     element.text(projectInfo.getProjectName());
+                                    x+=1;
                                 }
                             } else {
                                 element.text(projectInfo.getProjectName());
+                                x+=1;
                             }
                         }
                     }