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

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/AcceptanceCheckMapper.java

@@ -18,4 +18,8 @@ import java.util.Map;
 public interface AcceptanceCheckMapper extends BaseMapper<AcceptanceCheck> {
     @UserEmpower(field ={"hph.regional_companies_code"} ,dealerField={"hph.developer_code","hph.regional_companies_code","hph.developer_user_id"},fieldConditions ={"in","in","in"} ,relationship="and")
     List<AcceptanceCheckDto> selectPageList(@Param("map")Map<String, Object> map);
+
+    List<Map<String, Object>> getYsCreateTime();
+
+    List<Map<String, Object>> getYsEndTime();
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/BasicGridRecordMapper.java

@@ -3,6 +3,9 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
 import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 并网验收节点 Mapper 接口
  *
@@ -11,4 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface BasicGridRecordMapper extends BaseMapper<BasicGridRecord> {
 
+    List<Map<String, Object>> getBwCreateTime();
+
+    List<Map<String, Object>> getBwEndTime();
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/HouseholdContractMapper.java

@@ -26,4 +26,6 @@ public interface HouseholdContractMapper extends BaseMapper<HouseholdContract> {
     String getHygfCommercialScale(String peasantHouseholdNumber);
 
     List<Map<String,String>> getHygfCommercialScaleList(@Param("list") List<String> peasantHouseholdNumberList);
+
+    List<Map<String, Object>> getDzhtqyEndTime();
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PowerStationMapper.java

@@ -2,12 +2,12 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
-import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStation;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Mapper 接口
@@ -24,4 +24,12 @@ public interface PowerStationMapper extends BaseMapper<PowerStation> {
 			@Param("province") String province);
 
 	String getInstanceIdByhouseId(String peasantHouseholdId);
+
+	List<Map<String, Object>> getKcCreateTime();
+
+	List<Map<String, Object>> getKcEndTime();
+
+	List<Map<String, Object>> getSjCreateTime();
+
+	List<Map<String, Object>> getSjEndTime();
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/WorkOrderPowerStationMapper.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrderPowerStation;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 施工派工单电站 Mapper 接口
@@ -17,4 +18,7 @@ public interface WorkOrderPowerStationMapper extends BaseMapper<WorkOrderPowerSt
 
     List<PeasantHousehold> selectPeasantHousehold(@Param("sequenceNbr") Long sequenceNbr,@Param("ownersName") String ownersName);
 
+    List<Map<String, Object>> getSgCreateTime();
+
+    List<Map<String, Object>> getSgEndTime();
 }

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

@@ -83,4 +83,23 @@
         </where>
         ORDER BY hbga.sequence_nbr desc
     </select>
+
+    <select id="getYsEndTime" resultType="java.util.Map">
+        SELECT SEQUENCE_NBR as sequenceNbr,rec_date AS time
+        FROM hygf_acceptance_check
+        WHERE acceptance_check_status='3'
+    </select>
+
+    <select id="getYsCreateTime" resultType="java.util.Map">
+        SELECT
+        PROC_INST_ID_ AS processInstanceId,
+        MIN( START_TIME_ ) AS time
+        FROM
+        act_hi_taskinst aht
+        WHERE
+        EXISTS ( SELECT 1 FROM hygf_acceptance_check hac WHERE hac.instance_Id = aht.PROC_INST_ID_  and aht.NAME_='验收提交' )
+        GROUP BY
+        PROC_INST_ID_
+    </select>
+
 </mapper>

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

@@ -2,4 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridRecordMapper">
 
+
+    <select id="getBwEndTime" resultType="java.util.Map">
+        SELECT SEQUENCE_NBR AS sequenceNbr,rec_date as time
+        FROM hygf_basic_grid_record
+        WHERE grid_status='3'
+    </select>
+
+    <select id="getBwCreateTime" resultType="java.util.Map">
+        SELECT haga.peasant_household_id as peasantHouseholdId, a.time
+        FROM hygf_basic_grid_acceptance haga
+        LEFT JOIN (
+        SELECT
+        PROC_INST_ID_ AS processInstanceId,
+        MIN( START_TIME_ ) AS time
+        FROM
+        act_hi_taskinst aht
+        WHERE
+        EXISTS ( SELECT 1 FROM hygf_basic_grid_acceptance hbga WHERE hbga.instance_id = aht.PROC_INST_ID_  and aht.NAME_='并网登记提交' )
+        GROUP BY
+        PROC_INST_ID_
+        )a ON a.processInstanceId=haga.instance_id
+    </select>
 </mapper>

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

@@ -71,4 +71,10 @@
         #{peasantHouseholdNumber}
         </foreach>
     </select>
+
+    <select id="getDzhtqyEndTime" resultType="java.util.Map">
+        SELECT sequence_nbr as sequenceNbr ,rec_date as time
+        FROM hygf_household_contract
+        WHERE status='双方已签署'
+    </select>
 </mapper>

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

@@ -288,6 +288,7 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
         FROM
         hygf_household_contract
         <where>
+            status!='已作废'
             <if test="list != null and list.size()>0">
                 AND peasant_household_id IN
                 <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">

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

@@ -42,4 +42,52 @@
     <select id="getInstanceIdByhouseId" resultType="java.lang.String">
         select process_instance_id From hygf_power_station where peasant_household_id  = #{peasantHouseholdId}
     </select>
+
+    <select id="getKcCreateTime" resultType="java.util.Map">
+        SELECT
+        PROC_INST_ID_ AS processInstanceId,
+        MIN( TIME_ ) AS time
+        FROM
+        act_hi_detail ahd
+        WHERE
+        EXISTS ( SELECT 1 FROM hygf_power_station hps WHERE hps.process_instance_id = ahd.PROC_INST_ID_ )
+        GROUP BY
+        PROC_INST_ID_
+    </select>
+
+    <select id="getKcEndTime" resultType="java.util.Map">
+        SELECT
+        PROC_INST_ID_ AS processInstanceId,
+        MAX( END_TIME_ ) AS time
+        FROM
+        act_hi_taskinst aht
+        WHERE
+        EXISTS ( SELECT 1 FROM hygf_power_station hps WHERE hps.process_instance_id = aht.PROC_INST_ID_ and hps.business_status='通过' and aht.NAME_='法务审核' )
+        GROUP BY
+        PROC_INST_ID_
+    </select>
+
+    <select id="getSjCreateTime" resultType="java.util.Map">
+        SELECT
+        PROC_INST_ID_ AS processInstanceId,
+        MIN( START_TIME_ ) AS time
+        FROM
+        act_hi_taskinst aht
+        WHERE
+        EXISTS ( SELECT 1 FROM hygf_power_station hps WHERE hps.process_instance_id = aht.PROC_INST_ID_  and aht.NAME_='设计上传典型图库' )
+        GROUP BY
+        PROC_INST_ID_
+    </select>
+
+    <select id="getSjEndTime" resultType="java.util.Map">
+        SELECT
+        PROC_INST_ID_ AS processInstanceId,
+        MAX( END_TIME_ ) AS time
+        FROM
+        act_hi_taskinst aht
+        WHERE
+        EXISTS ( SELECT 1 FROM hygf_power_station hps WHERE hps.process_instance_id = aht.PROC_INST_ID_  and hps.process_status='完成' and aht.NAME_='设计图纸审核' )
+        GROUP BY
+        PROC_INST_ID_
+    </select>
 </mapper>

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

@@ -18,6 +18,16 @@
 
     </select>
 
+    <select id="getSgCreateTime" resultType="java.util.Map">
+        SELECT SEQUENCE_NBR AS workOrderId,planned_start_date as time
+        FROM hygf_work_order
+    </select>
+
+    <select id="getSgEndTime" resultType="java.util.Map">
+        SELECT SEQUENCE_NBR AS sequenceNbr,rec_date as time
+        FROM hygf_work_order_power_station
+        WHERE power_station_construction_status='已完工'
+    </select>
 
 
 </mapper>

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

@@ -172,10 +172,12 @@ public class PowerStationStatisticsServiceImpl {
 
             // 将毫秒差转换为小时、分钟和秒
             long diffInSeconds = diffInMillis / 1000;
-            long hours = diffInSeconds / 3600;
+            // 计算天、小时、分钟和秒
+            long days = diffInSeconds / 86400; // 1天 = 86400秒
+            long hours = (diffInSeconds % 86400) / 3600;
             long minutes = (diffInSeconds % 3600) / 60;
             long seconds = diffInSeconds % 60;
-            return hours + "小时" + minutes + "分" + seconds + "秒";
+            return days + "天" + hours + "小时" + minutes + "分" + seconds + "秒";
         }
         return null;
     }

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.qiyuesuo.sdk.v2.SdkClient;
 import com.qiyuesuo.sdk.v2.bean.*;
 import com.qiyuesuo.sdk.v2.bean.vo.DocumentUrlVO;
@@ -14,10 +16,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * @description:
@@ -334,4 +341,34 @@ public class QiyuesuoServiceImpl {
 		return url;
 	}
 
+	public Map<Long,Contract> getContractMap(){
+		List<Contract> list =new ArrayList<>();
+		Integer pageNo = 0;
+		try {
+			do {
+				SdkClient sdkClient = new SdkClient(serverUrl, accessKey, accessSecret);
+				ContractListRequest contractListRequest = new ContractListRequest();
+				contractListRequest.setSelectOffset(pageNo*1000);
+				String response = sdkClient.service(contractListRequest);
+				SdkResponse<ContractListResult> responseObj = JSONUtils.toQysResponse(response, ContractListResult.class);
+				if (responseObj.getCode() == 0) {
+					ContractListResult result = responseObj.getResult();
+					list.addAll(result.getList());
+					//处理其他页数的数据
+					Integer selectOffset =(pageNo+1)*1000;
+					if (result.getTotalCount() <= selectOffset){
+						break;
+					} else {
+						pageNo++;
+					}
+				} else {
+					logger.error("请求失败，错误码:{}，错误信息:{}", responseObj.getCode(), responseObj.getMessage());
+				}
+			}while (true);
+		} catch (Exception e) {
+			logger.error(e.getMessage(),e);
+		}
+		return list.stream().collect(Collectors.toMap(Contract::getId, Function.identity(), (existing, replacement) -> existing));
+	}
+
 }