Merge remote-tracking branch 'origin/developer_bw' into developer_bw

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/StatisticsHomepageMapper.xml

@@ -4,10 +4,10 @@
 
     <select id="surveyStatusTotal" resultType="map">
         SELECT
-        SUM(CASE WHEN ps.process_status = '不通过' THEN 1 ELSE 0 END)AS '未通过',
-        SUM(CASE WHEN ps.process_status = '进行中' AND ps.business_status = '通过' AND next_node_name = '设计上传典型图库' THEN 1 ELSE 0 END)  AS '已完成(法务审核)',
-        SUM(CASE WHEN ps.process_status = '完成' THEN 1 ELSE 0 END)  AS completeTotal,
-        SUM(CASE WHEN ps.process_status = '进行中' AND (ps.business_status IS NULL OR ps.design_status IS NULL OR ps.technology_status IS NULL  or  ps.business_status = '' OR ps.design_status = '' OR ps.technology_status = '') THEN 1 ELSE 0 END)  AS '进行中(审核)'
+        IFNULL(SUM(CASE WHEN ps.process_status = '不通过' THEN 1 ELSE 0 END),0)AS '未通过',
+        IFNULL(SUM(CASE WHEN ps.process_status = '进行中' AND ps.business_status = '通过' AND next_node_name = '设计上传典型图库' THEN 1 ELSE 0 END),0)  AS '已完成(法务审核)',
+        IFNULL(SUM(CASE WHEN ps.process_status = '完成' THEN 1 ELSE 0 END),0)    AS completeTotal,
+        IFNULL(SUM(CASE WHEN ps.process_status = '进行中' AND (ps.business_status IS NULL OR ps.design_status IS NULL OR ps.technology_status IS NULL  or  ps.business_status = '' OR ps.design_status = '' OR ps.technology_status = '') THEN 1 ELSE 0 END),0)    AS '进行中(审核)'
         FROM
             hygf_power_station ps
                 LEFT JOIN

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/BwysServiceImpl.java

@@ -52,11 +52,11 @@ public class BwysServiceImpl implements IExportPageService {
             }
         }
         Map<String, Object> map = new HashMap<>();
-        map.put("basicGridNodes", basicGridNodes);
-        map.put("type", "1");
         if (Objects.nonNull(filters)) {
             map.putAll(filters);
         }
+        map.put("basicGridNodes", basicGridNodes);
+        map.put("type", "1");
         return businessFieldMapper.getBwysStationId(map);
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/DzbtgServiceImpl.java

@@ -19,10 +19,10 @@ public class DzbtgServiceImpl implements IExportPageService {
     @Override
     public List<String> getStationId(Map<String, Object> filters) {
         Map<String, Object> map = new HashMap<>();
-        map.put("processStatus", PowerStationProcessStateEnum.不通过.getName());
         if (Objects.nonNull(filters)) {
             map.putAll(filters);
         }
+        map.put("processStatus", PowerStationProcessStateEnum.不通过.getName());
         return businessFieldMapper.getDzStationIdByProcessStatus(map);
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/DzjxzServiceImpl.java

@@ -15,10 +15,10 @@ public class DzjxzServiceImpl implements IExportPageService {
     @Override
     public List<String> getStationId(Map<String, Object> filters) {
         Map<String, Object> map = new HashMap<>();
-        map.put("processStatus", PowerStationProcessStateEnum.进行中.getName());
         if (Objects.nonNull(filters)) {
             map.putAll(filters);
         }
+        map.put("processStatus", PowerStationProcessStateEnum.进行中.getName());
         return businessFieldMapper.getDzStationIdByProcessStatus(map);
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/DzwcServiceImpl.java

@@ -15,10 +15,10 @@ public class DzwcServiceImpl implements IExportPageService {
     @Override
     public List<String> getStationId(Map<String, Object> filters) {
         Map<String, Object> map = new HashMap<>();
-        map.put("processStatus", PowerStationProcessStateEnum.完成.getName());
         if (Objects.nonNull(filters)) {
             map.putAll(filters);
         }
+        map.put("processStatus", PowerStationProcessStateEnum.完成.getName());
         return businessFieldMapper.getDzStationIdByProcessStatus(map);
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/FhdfhServiceImpl.java

@@ -18,11 +18,11 @@ public class FhdfhServiceImpl implements IExportPageService {
     @Override
     public List<String> getStationId(Map<String, Object> filters) {
         Map<String, Object> map = new HashMap<>();
-        map.put("preparationMoneyState", "0");
         if (Objects.nonNull(filters)) {
             map.putAll(filters);
             map.put("regionalCompaniesSeq",filters.get("regionalcompaniesSeq"));
         }
+        map.put("preparationMoneyState", "0");
         return businessFieldMapper.getFhStationId(map);
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/FhyfhServiceImpl.java

@@ -17,11 +17,11 @@ public class FhyfhServiceImpl implements IExportPageService {
     @Override
     public List<String> getStationId(Map<String, Object> filters) {
         Map<String, Object> map = new HashMap<>();
-        map.put("preparationMoneyState", "1");
         if (Objects.nonNull(filters)) {
             map.putAll(filters);
             map.put("regionalCompaniesSeq",filters.get("regionalcompaniesSeq"));
         }
+        map.put("preparationMoneyState", "1");
         return businessFieldMapper.getFhStationId(map);
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/RzdfkServiceImpl.java

@@ -25,13 +25,13 @@ public class RzdfkServiceImpl implements IExportPageService {
         StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
         Map<String, Object> params = new HashMap<>();
+        if (Objects.nonNull(filters)) {
+            params.putAll(filters);
+        }
         String status = "审核通过";
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         Long sequenceNbr = reginParams.getCompany().getSequenceNbr();
         params.put("financingCompaniesSeq", String.valueOf(sequenceNbr));
-        if (Objects.nonNull(filters)) {
-            params.putAll(filters);
-        }
         params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : Arrays.asList(filters.get("status")));
         params.put("type", "2");
         return businessFieldMapper.getTrStationIdByStatus(params, amosOrgCodes);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/RzdshServiceImpl.java

@@ -25,13 +25,13 @@ public class RzdshServiceImpl implements IExportPageService {
         StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
         Map<String, Object> params = new HashMap<>();
+        if (Objects.nonNull(filters)) {
+            params.putAll(filters);
+        }
         String status="待融资审核";
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         Long sequenceNbr = reginParams.getCompany().getSequenceNbr();
         params.put("financingCompaniesSeq", String.valueOf(sequenceNbr));
-        if (Objects.nonNull(filters)) {
-            params.putAll(filters);
-        }
         params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : Arrays.asList(filters.get("status")));
         params.put("type", "2");
         return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/RzwtgServiceImpl.java

@@ -25,13 +25,13 @@ public class RzwtgServiceImpl implements IExportPageService {
         StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
         Map<String, Object> params = new HashMap<>();
+        if (Objects.nonNull(filters)) {
+            params.putAll(filters);
+        }
         String status="审核不通过,重新验收";
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         Long sequenceNbr = reginParams.getCompany().getSequenceNbr();
         params.put("financingCompaniesSeq", String.valueOf(sequenceNbr));
-        if (Objects.nonNull(filters)) {
-            params.putAll(filters);
-        }
         params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : Arrays.asList(filters.get("status")));
         params.put("type", "2");
         return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/RzyfkServiceImpl.java

@@ -25,13 +25,13 @@ public class RzyfkServiceImpl implements IExportPageService {
         StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
         Map<String, Object> params = new HashMap<>();
+        if (Objects.nonNull(filters)) {
+            params.putAll(filters);
+        }
         String status="已放款,放款完成";
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         Long sequenceNbr = reginParams.getCompany().getSequenceNbr();
         params.put("financingCompaniesSeq", String.valueOf(sequenceNbr));
-        if (Objects.nonNull(filters)) {
-            params.putAll(filters);
-        }
         params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : Arrays.asList(filters.get("status")));
         params.put("type", "2");
         return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/SgysServiceImpl.java

@@ -33,6 +33,9 @@ public class SgysServiceImpl implements IExportPageService {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         List<String> workOrderPowerStationNodes = new ArrayList<>();
         Map<String,Object> map =new HashMap<>();
+        if (Objects.nonNull(filters)) {
+            map.putAll(filters);
+        }
         List<Long> roleIds = new ArrayList<>();
         for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
             List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
@@ -54,9 +57,7 @@ public class SgysServiceImpl implements IExportPageService {
             roleIds.addAll(longs);
         }
         map.put("workOrderPowerStationNodes",workOrderPowerStationNodes);
-        if (Objects.nonNull(filters)) {
-            map.putAll(filters);
-        }
+        map.put("type","3");
         return businessFieldMapper.getSgysStationId(map);
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/TrdfkServiceImpl.java

@@ -23,10 +23,10 @@ public class TrdfkServiceImpl implements IExportPageService {
         StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
         Map<String, Object> params = new HashMap<>();
-        String status = "审核通过";
         if (Objects.nonNull(filters)) {
             params.putAll(filters);
         }
+        String status = "审核通过";
         params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : Arrays.asList(filters.get("status")));
         params.put("type", "1");
         return businessFieldMapper.getTrStationIdByStatus(params, amosOrgCodes);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/TrdtsServiceImpl.java

@@ -25,10 +25,10 @@ public class TrdtsServiceImpl implements IExportPageService {
         StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
         Map<String, Object> params = new HashMap<>();
-        String status="待推送";
         if (Objects.nonNull(filters)) {
             params.putAll(filters);
         }
+        String status="待推送";
         params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : Arrays.asList(filters.get("status")));
         params.put("type", "1");
         return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/TrwtgServiceImpl.java

@@ -23,10 +23,10 @@ public class TrwtgServiceImpl implements IExportPageService {
         StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
         Map<String, Object> params = new HashMap<>();
-        String status="审核不通过,重新验收";
         if (Objects.nonNull(filters)) {
             params.putAll(filters);
         }
+        String status="审核不通过,重新验收";
         params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : Arrays.asList(filters.get("status")));
         params.put("type", "1");
         return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/TryfkServiceImpl.java

@@ -23,10 +23,10 @@ public class TryfkServiceImpl implements IExportPageService {
         StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
         Map<String, Object> params = new HashMap<>();
-        String status="放款完成";
         if (Objects.nonNull(filters)) {
             params.putAll(filters);
         }
+        String status="放款完成";
         params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : Arrays.asList(filters.get("status")));
         params.put("type", "1");
         return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/TrytsServiceImpl.java

@@ -23,10 +23,10 @@ public class TrytsServiceImpl implements IExportPageService {
         StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
         Map<String, Object> params = new HashMap<>();
-        String status="待融资审核";
         if(Objects.nonNull(filters)){
             params.putAll(filters);
         }
+        String status="待融资审核";
         params.put("status", Objects.isNull(filters.get("status")) ? Arrays.asList(status.split(",")) : Arrays.asList(filters.get("status")));
         params.put("type", "1");
         return businessFieldMapper.getTrStationIdByStatus(params,amosOrgCodes);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/excel/impl/YsshServiceImpl.java

@@ -57,11 +57,11 @@ public class YsshServiceImpl implements IExportPageService {
             }
         }
         Map<String, Object> map = new HashMap<>();
-        map.put("basicGridNodes",basicGridNodes);
-        map.put("type","1");
         if(Objects.nonNull(filters)){
             map.putAll(filters);
         }
+        map.put("basicGridNodes",basicGridNodes);
+        map.put("type","1");
         return businessFieldMapper.getYsshStationId(map);
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BusinessFieldServiceImpl.java

@@ -94,7 +94,7 @@ public class BusinessFieldServiceImpl extends BaseService<BusinessFieldDto, Hygf
             headerStyle.setFillForegroundColor(IndexedColors.SKY_BLUE.getIndex()); // 背景色
             headerStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND); // 填充模式
             // 设置居中对齐
-            headerStyle.setAlignment(HorizontalAlignment.CENTER);
+            headerStyle.setAlignment(HorizontalAlignment.LEFT);
             headerStyle.setVerticalAlignment(VerticalAlignment.CENTER);
             // 设置表头每个单元格的样式
             for (int i = 0; i < headerRow.getPhysicalNumberOfCells(); i++) {