Skip to content

A
amos-boot-zx-biz
Commit 315b430a authored by 朱晨阳's avatar 朱晨阳
Browse files
Options

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

parents de4a093d d81c534c
Hide whitespace changes
Inline Side-by-side
Showing with 155 additions and 32 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PreparationMoneyDto.java
View file @ 315b430a
......@@ -2,12 +2,14 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoneyLog;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* 发货单
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PreparationMoney.java
View file @ 315b430a
......@@ -12,6 +12,7 @@ import lombok.experimental.Accessors;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* 发货单
......@@ -153,11 +154,16 @@ public class PreparationMoney extends BaseEntity {
@TableField(exist = false)
private List<HygfReplenishment> files;
@TableField(exist = false)
private List<Map> replenishmentFile; //补货单
@TableField(exist = false)
private String instanceId; //发货单流水
//订单状态
@TableField("order_status")
private String orderStatus;
@TableField(exist = false)
private String delFile;
@TableField(exist = false)
private String arrFile;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PreparationMoneyMapper.java
View file @ 315b430a
......@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationMoneyDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.PreparationPageDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
......@@ -39,5 +40,5 @@ public interface PreparationMoneyMapper extends BaseMapper<PreparationMoney> {
@Param(value = "projectAddress") String projectAddress,
@Param(value = "startTime") String startTime,
@Param(value = "endTime") String endTime);
PreparationMoney selectPreparationMoneyInfo(@Param(value = "peasantHouseholdId") String peasantHouseholdId);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PreparationMoneyMapper.xml
View file @ 315b430a
......@@ -112,4 +112,16 @@ LEFT JOIN hygf_document_station on hygf_document_station.station_id=hygf_peasan
) b
</select>
<select id="selectPreparationMoneyInfo" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney">
SELECT
*,
delivery_file as delFile,
arrival_file as arrFile
FROM
`hygf_preparation_money` pm
LEFT JOIN hygf_document_station ds ON ds.preparation_money_id = pm.sequence_nbr
WHERE
ds.station_id = #{peasantHouseholdId}
</select>
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/StatisticsHomepageMapper.xml
View file @ 315b430a
......@@ -112,7 +112,7 @@
<select id="preparationMoneyTotal" resultType="map">
SELECT
SUM( CASE WHEN preparation_money_state = '待发货' or preparation_money_state = '暂存发货'or preparation_money_state = '待补货' THEN 1 ELSE 0 END ) AS '待发货',
SUM( CASE WHEN preparation_money_state = '备货完成' THEN 1 ELSE 0 END ) AS '已收货',
SUM( CASE WHEN preparation_money_state = '备货完成' or preparation_money_state = '已收货' THEN 1 ELSE 0 END ) AS '已收货',
SUM( CASE WHEN preparation_money_state = '待收货' THEN 1 ELSE 0 END ) AS '已发货'
FROM
hygf_peasant_household
......@@ -138,13 +138,13 @@
<select id="workOrderTotal" resultType="map">
SELECT
count(*) AS total,
(CASE WHEN power_station_construction_status = '待施工' THEN '派工发料'
(CASE
WHEN power_station_construction_status = '未通过' THEN '未通过'
WHEN power_station_construction_status = '施工中' or power_station_construction_status = '待登记' THEN '施工资料已上传'
WHEN power_station_construction_status = '待审核' and work_order_power_station_node IS NULL THEN '完工登记'
WHEN power_station_construction_status = '待审核' and work_order_power_station_node ='area' THEN '完工自审'
WHEN power_station_construction_status = '施工中' or power_station_construction_status = '待施工' THEN '施工资料上传'
WHEN power_station_construction_status = '待登记' THEN '完工登记'
WHEN power_station_construction_status = '待审核' and work_order_power_station_node is null THEN '完工自审'
WHEN power_station_construction_status = '已完工' THEN '已完成'
WHEN power_station_construction_status = '待审核' and work_order_power_station_node in ('engineering','design') THEN '审核中'
WHEN power_station_construction_status = '待审核' and work_order_power_station_node in ('engineering','design','area') THEN '审核中'
ELSE power_station_construction_status END )
AS statusText,
ROUND(COALESCE(SUM(ei.real_scale), 0), 2) AS realScale FROM
......@@ -270,7 +270,7 @@
'待放款'
WHEN info.`status` = '待融资审核' THEN
'待审核'
WHEN info.`status` = '审核不通过' THEN
WHEN info.`status` = '审核不通过' or info.`status` = '重新验收' THEN
'未通过'
WHEN info.`status` = '放款完成' THEN
'放款完成' ELSE '待推送'
......@@ -391,8 +391,8 @@
'' AS kcjxzrl,
SUM(CASE WHEN ps.process_status = '完成' THEN 1 ELSE 0 END) AS kcywc,
ROUND(COALESCE(SUM(CASE WHEN ps.process_status = '完成' THEN ei.real_scale ELSE 0 END)/1000, 0), 2) AS kcywcrl,
SUM(CASE WHEN ph.preparation_money_state = '备货完成' THEN 1 ELSE 0 END) AS bhywc,
ROUND(COALESCE(SUM(CASE WHEN ph.preparation_money_state = '备货完成' THEN ei.real_scale ELSE 0 END)/1000, 0), 2) AS bhywcrl,
SUM(CASE WHEN ph.preparation_money_state = '备货完成' or ph.preparation_money_state = '已收货'THEN 1 ELSE 0 END) AS bhywc,
ROUND(COALESCE(SUM(CASE WHEN ph.preparation_money_state = '备货完成'or ph.preparation_money_state = '已收货' THEN ei.real_scale ELSE 0 END)/1000, 0), 2) AS bhywcrl,
SUM(CASE WHEN ph.preparation_money_state = '待发货' or ph.preparation_money_state = '暂存发货'or ph.preparation_money_state = '待补货' THEN 1 ELSE 0 END ) AS bhwtg,
'' AS bhjxzrl,
SUM(CASE WHEN ph.preparation_money_state = '待收货' THEN 1 ELSE 0 END) AS bhjxz,
......@@ -611,8 +611,8 @@
<select id="statisticsPreparationMoney" resultType="map">
SELECT
IFNULL(SUM( CASE WHEN preparation_money_state = '待发货' or preparation_money_state = '暂存发货' or preparation_money_state = '待补货' THEN 1 ELSE 0 END ), 0 ) AS dfh,
IFNULL(SUM( CASE WHEN preparation_money_state = '备货完成' THEN 1 ELSE 0 END ), 0 ) AS ysh,
IFNULL(SUM( CASE WHEN preparation_money_state = '备货完成' THEN ei.real_scale ELSE 0 END ), 0 ) AS yshrl,
IFNULL(SUM( CASE WHEN preparation_money_state = '备货完成' or preparation_money_state = '已收货'THEN 1 ELSE 0 END ), 0 ) AS ysh,
IFNULL(SUM( CASE WHEN preparation_money_state = '备货完成' or preparation_money_state = '已收货'THEN ei.real_scale ELSE 0 END ), 0 ) AS yshrl,
IFNULL(SUM( CASE WHEN preparation_money_state = '待收货' THEN 1 ELSE 0 END ), 0 ) AS yfh
FROM
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/CommonServiceImpl.java
View file @ 315b430a
......@@ -3,9 +3,12 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapBuilder;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.google.common.net.HttpHeaders;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
......@@ -44,6 +47,7 @@ import org.springframework.core.io.Resource;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.utils.Bean;
import javax.servlet.ServletOutputStream;
......@@ -106,6 +110,16 @@ public class CommonServiceImpl {
@Autowired
ConstructionRecordsMapper constructionRecordsMapper;
@Autowired
PreparationMoneyServiceImpl preparationMoneyService;
@Autowired
PreparationMoneyMapper preparationMoneyMapper;
@Autowired
private HygfReplenishmentMapper hygfReplenishmentMapper;
@Autowired
PreparationMoneyLogMapper preparationMoneyLogMapper;
@Autowired
HygfPreparationMoneyAuditingMapper preparationMoneyAuditingMapper;
@Autowired
ConstructionGirdRecordsMapper constructionGirdRecordsMapper;
@Autowired
ConstructionAcceptanceRecordsMapper constructionAcceptanceRecordsMapper;
......@@ -555,6 +569,47 @@ public class CommonServiceImpl {
for (String peasantHouseholdId : peasantHouseholdIds) {
SurveyInfoAllDto returnDto = surveyInformationServiceImpl.querySurveyInfo(surveyInformationId, peasantHouseholdId, processInstanceId, null);
fileName = returnDto.getSurveyInformation().getOwnersName();
//客户优化项 补充发货信息
PreparationMoney preparationMoneyDto = preparationMoneyMapper.selectPreparationMoneyInfo(peasantHouseholdId);
String preparationMoneyInstanceId = null;
if (null != preparationMoneyDto){
preparationMoneyDto.setDeliveryFile(null != preparationMoneyDto.getDelFile()?JSONArray.parseArray(preparationMoneyDto.getDelFile()):null);
preparationMoneyDto.setArrivalFile(null != preparationMoneyDto.getArrFile()?JSONArray.parseArray(preparationMoneyDto.getArrFile()):null);
LambdaUpdateWrapper<PreparationMoneyLog> q1 = new LambdaUpdateWrapper<>();
q1.eq(PreparationMoneyLog::getPreparationMoneyId, preparationMoneyDto.getSequenceNbr());
q1.orderByAsc(PreparationMoneyLog::getExecutionTime);
List<PreparationMoneyLog> preparationMoneyLogs = preparationMoneyLogMapper.selectList(q1);
if (!Objects.isNull(preparationMoneyLogs)){
preparationMoneyDto.setPreparationMoneyLog(preparationMoneyLogs);
}
LambdaUpdateWrapper<HygfPreparationMoneyAuditing> q2 = new LambdaUpdateWrapper<>();
q2.eq(HygfPreparationMoneyAuditing::getPreparationMoneyId, preparationMoneyDto.getSequenceNbr());
q2.orderByAsc(HygfPreparationMoneyAuditing::getRecDate);
q2.last("limit 1");
HygfPreparationMoneyAuditing hygfPreparationMoneyAuditing = preparationMoneyAuditingMapper.selectOne(q2);
if (null != hygfPreparationMoneyAuditing){
preparationMoneyInstanceId = hygfPreparationMoneyAuditing.getInstanceId();
}
//查询补货单
LambdaQueryWrapper<HygfReplenishment> files = new LambdaQueryWrapper<>();
files.eq(HygfReplenishment::getPreparationMoneyId,preparationMoneyDto.getSequenceNbr());
files.orderByDesc(BaseEntity::getRecDate);
List<HygfReplenishment> hygfReplenishments = hygfReplenishmentMapper.selectList(files);
List<Map> hygfReplenishmentFiles = new ArrayList<>();
if (CollectionUtil.isNotEmpty(hygfReplenishments)){
for (HygfReplenishment hygfReplenishment : hygfReplenishments) {
hygfReplenishmentFiles.addAll(hygfReplenishment.getFile());
}
preparationMoneyDto.setReplenishmentFile(hygfReplenishmentFiles);
}
}
if (!redisKey.contains(",")){
redisUtils.set(redisKey, MapBuilder.<String, Object>create()
.put("value", currentBili).build());
......@@ -566,6 +621,7 @@ public class CommonServiceImpl {
List<ConstructionRecords> workOrderStationWorkLog = new ArrayList<>();
List<ConstructionGirdRecords> basicGridWorkLog = new ArrayList<>();
List<LinkedHashMap> financingWorkLog = new ArrayList<>();
List<LinkedHashMap> preparationMoneyLog = new ArrayList<>();
List<ConstructionAcceptanceRecords> accptWorkLog = new ArrayList<>();
workOrderStationWorkLog = this.getConstructionRecords(returnDto.getPowerStationEngineeringInfo().getWorkOrderPowerStationId(),returnDto.getPowerStationEngineeringInfo().getWorkOrderId());
accptWorkLog = this.getConstructionRecordsAcc(peasantHouseholdId);
......@@ -574,6 +630,7 @@ public class CommonServiceImpl {
try {
powerStationWorkLog = this.getWorkLog(powerStationInstanceId);
financingWorkLog = this.getWorkLog(financingInstanceId);
preparationMoneyLog = this.getWorkLog(preparationMoneyInstanceId);
}catch (Exception e){
e.printStackTrace();
......@@ -624,32 +681,42 @@ public class CommonServiceImpl {
Sheet secondSheet6 = workbook.getSheetAt(6);
fillSheet(secondSheet6, returnDto.getPowerStationEngineeringInfo());
Sheet secondSheet10 = workbook.getSheetAt(7);
fillSheet(secondSheet10, returnDto.getPowerStationConstructionData());
Sheet secondSheet7 = workbook.getSheetAt(7);
fillSheet(secondSheet7, preparationMoneyDto);
Sheet secondSheet7 = workbook.getSheetAt(8);
fillSheet(secondSheet7, returnDto.getHygfOnGrid());
Sheet secondSheet8 = workbook.getSheetAt(8);
fillSheet(secondSheet8, returnDto.getPowerStationConstructionData());
Sheet secondSheet8 = workbook.getSheetAt(9);
fillSheet(secondSheet8, returnDto.getWorkOrder());
Sheet secondSheet9 = workbook.getSheetAt(9);
fillSheet(secondSheet9, returnDto.getHygfOnGrid());
Sheet secondSheet9 = workbook.getSheetAt(10);
fillSheet(secondSheet9, returnDto.getAcceptanceCheck());
Sheet secondSheet10 = workbook.getSheetAt(10);
fillSheet(secondSheet10, returnDto.getWorkOrder());
Sheet secondSheet11 = workbook.getSheetAt(11);
fillSheet(secondSheet11, powerStationWorkLog);
fillSheet(secondSheet11, returnDto.getAcceptanceCheck());
Sheet secondSheet12 = workbook.getSheetAt(12);
fillSheet(secondSheet12, workOrderStationWorkLog);
fillSheet(secondSheet12, powerStationWorkLog);
Sheet secondSheet13 = workbook.getSheetAt(13);
fillSheet(secondSheet13, basicGridWorkLog);
if (CollectionUtil.isNotEmpty(preparationMoneyLog)){
fillSheet(secondSheet13, preparationMoneyLog);
}else if (CollectionUtil.isNotEmpty(preparationMoneyLog)){
fillSheet(secondSheet13, preparationMoneyDto != null?preparationMoneyDto.getPreparationMoneyLog():null);
}
Sheet secondSheet14 = workbook.getSheetAt(14);
fillSheet(secondSheet14, accptWorkLog);
fillSheet(secondSheet14, workOrderStationWorkLog);
Sheet secondSheet15 = workbook.getSheetAt(15);
fillSheet(secondSheet15, financingWorkLog);
fillSheet(secondSheet15, basicGridWorkLog);
Sheet secondSheet16 = workbook.getSheetAt(16);
fillSheet(secondSheet16, accptWorkLog);
Sheet secondSheet17 = workbook.getSheetAt(17);
fillSheet(secondSheet17, financingWorkLog);
// 写入到新的Excel文件中
try (FileOutputStream fos = new FileOutputStream(outputPath)) {
workbook.write(fos);
......@@ -718,6 +785,20 @@ public class CommonServiceImpl {
}));
futures.add(executorService.submit(() -> {
try {
downloadAndZipImages(preparationMoneyDto,"发货信息附件",tempDir,urlPath);
if (!finalRedisKey.contains(",")){
Map<String, Object> map = (Map<String, Object>) redisUtils.get(finalRedisKey);
Integer currentNum = (Integer) map.get("value")+7;
redisUtils.set(finalRedisKey, MapBuilder.<String, Object>create()
.put("value", currentNum).build());
}
} catch (IOException e) {
e.printStackTrace();
}
}));
futures.add(executorService.submit(() -> {
try {
downloadAndZipImages(returnDto.getDesignInformation(),"设计信息附件",tempDir,urlPath);
if (!finalRedisKey.contains(",")){
Map<String, Object> map = (Map<String, Object>) redisUtils.get(finalRedisKey);
......@@ -1266,6 +1347,29 @@ public class CommonServiceImpl {
}
}
if (sheet.getSheetName().contains("发货操作流水")) {
int startRowNum = 1;
if (null !=data){
int headerRow = startRowNum + 1; // 表头所在的行
int headerOneRow = startRowNum; // 表头所在的行
int dataStartRow = startRowNum+2; // 数据开始的行
startRowNum= dataStartRow +1;
// if ((data ){
// 假设表头内容如下：
String headerOne = "发货操作流水";
String[] headersNames = {"审核节点","审核人","审核时间", "审核状态", "审核意见"};
String[] headers = {"taskName","operator", "operateDate", "approvalStatue", "approvalSuggestion"};
documentSpecialProcessing(sheet,headerRow,headerOneRow,dataStartRow,headersNames,headers,headerOne, (List<Map<String, Object>>) data);
// }else {
//
//
// }
}
}
if (sheet.getSheetName().contains("审核记录")) {
int startRowNum = 1;
if (null !=data){
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java
View file @ 315b430a
......@@ -99,8 +99,6 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
private HygfReplenishmentMapper hygfReplenishmentMapper;
@Autowired
private WorkflowFeignClient workflowFeignClient;
@Autowired
private CommonServiceImpl commonService;
private static final String regionRedis = "app_region_redis";
// private static final String PROCESSKEY = "DeliveryManagement";
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/StatisticsHomepageServiceImpl.java
View file @ 315b430a
......@@ -106,7 +106,7 @@ public class StatisticsHomepageServiceImpl {
List<String> surveKeys = new ArrayList<>(Arrays.asList("未通过","未勘察","已完成(法务审核)","进行中(审核)"));
List<String> contractKeys = new ArrayList<>(Arrays.asList("双方已签署","农户已签署","未签署","已作废"));
List<String> workOrder = new ArrayList<>(Arrays.asList("派工发料","未通过","施工资料已上传","完工登记","完工自审","审核中","已完成","整改待审核" ,"待整改"));
List<String> workOrder = new ArrayList<>(Arrays.asList("未通过","施工资料上传","完工登记","完工自审","审核中","已完成","整改待审核" ,"待整改"));
List<String> preparationMoneyKeys = new ArrayList<>(Arrays.asList("待发货","已收货","已发货"));
List<String> desionKeys = new ArrayList<>(Arrays.asList("施工图已上传","典设图已上传"));
List<String> gridKeys = new ArrayList<>(Arrays.asList("待登记","审核中","已完成","未通过","整改待审核" ,"待整改"));
......@@ -274,13 +274,13 @@ public class StatisticsHomepageServiceImpl {
if ("放款完成".equals(map.get("statusText"))) {
disbursementMoney += (double)map.get("disbursementMoney");
}
if ("待推送".equals(map.get("statusText"))) {
if ("未通过".equals(map.get("statusText"))) {
trtotal += (long) map.get("total");
trrealScale += (double) map.get("realScale");
iterator2.remove();
}
}
maps.add(MapBuilder.<String, Object>create().put("statusText","待推送").put("total",trtotal).put("realScale",new BigDecimal(trrealScale).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()).build());
maps.add(MapBuilder.<String, Object>create().put("statusText","未通过").put("total",trtotal).put("realScale",new BigDecimal(trrealScale).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()).build());
differenceValue(maps,financingKeys);
resultMap.put("financing",maps);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment