yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复BUG

Browse Source
product
chuang 2 years ago
parent b93eaecf1f
commit 5ba38df484
8 changed files with 332 additions and 46 deletions
Show Stats Download Patch File Download Diff File

18
SC-boot/linkage-scm/src/main/java/jnpf/mobilePort/controller/MobilePortController.java
Unescape View File

@ -1,10 +1,10 @@
package jnpf.mobilePort.controller;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jnpf.base.ActionResult;
import jnpf.contractfile.model.contractfile.ContractFileListQueryModel;
import jnpf.paymentdoc.service.PaymentdocService;
import jnpf.purchaseorder.entity.PurchaseorderitemEntity;
import jnpf.purchaseorder.service.PurchaseorderitemService;
import jnpf.util.JsonUtil;
@ -16,7 +16,6 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@Slf4j
@ -28,6 +27,9 @@ public class MobilePortController {
@Resource
private PurchaseorderitemService purchaseorderitemService;
@Resource
private PaymentdocService paymentdocService;
/**
@ -44,6 +46,18 @@ public class MobilePortController {
purchaseorderitemService.getPdfInfo(purchaseorderitemEntity,response);
}
/**
*
* @param response
* @param id 付款申请表id
* @throws Exception
*/
@GetMapping(value = "/getPaymentDocPdf/{id}", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void getPaymentDocPdf(HttpServletResponse response,@PathVariable("id") String id) {
String idd="410787543580384837";
paymentdocService.getPaymentDocPdf(idd);
}
/**

8
SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/mapper/PaymentdocMapper.java
Unescape View File

@ -1,8 +1,12 @@
package jnpf.paymentdoc.mapper;
import jnpf.paymentdoc.entity.PaymentdocEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.paymentdoc.entity.PaymentdocEntity;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
*
@ -14,4 +18,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface PaymentdocMapper extends BaseMapper<PaymentdocEntity> {
List<Map<String, Object>> getPaymentDocNodeInfo(@Param("id") String id);
}

14
SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/PaymentdocService.java
Unescape View File

@ -1,15 +1,13 @@
package jnpf.paymentdoc.service;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.paymentdoc.entity.PaymentdocEntity;
import jnpf.paymentdoc.entity.PaymentdocItem0Entity;
import jnpf.paymentdoc.service.PaymentdocItem0Service;
import jnpf.paymentdoc.entity.PaymentdocItem1Entity;
import jnpf.paymentdoc.service.PaymentdocItem1Service;
import jnpf.paymentdoc.entity.PaymentdocItem2Entity;
import jnpf.paymentdoc.service.PaymentdocItem2Service;
import jnpf.paymentdoc.entity.PaymentdocEntity;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.paymentdoc.model.paymentdoc.PaymentdocPagination;
import java.util.*;
import java.util.List;
/**
*
* paymentdoc
@ -40,4 +38,6 @@ public interface PaymentdocService extends IService<PaymentdocEntity> {
List<PaymentdocItem2Entity> GetPaymentdocItem2List(String id);
//列表子表数据方法
void getPaymentDocPdf(String id);
}

106
SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java
Unescape View File

@ -1,39 +1,46 @@
package jnpf.paymentdoc.service.impl;
import jnpf.paymentdoc.entity.*;
import jnpf.paymentdoc.mapper.PaymentdocMapper;
import jnpf.paymentdoc.service.*;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.config.ConfigValueUtil;
import jnpf.mobilePort.utils.ExportPdf;
import jnpf.mobilePort.utils.MultipartFileDto;
import jnpf.paymentdoc.entity.PaymentdocEntity;
import jnpf.paymentdoc.entity.PaymentdocItem0Entity;
import jnpf.paymentdoc.entity.PaymentdocItem1Entity;
import jnpf.paymentdoc.entity.PaymentdocItem2Entity;
import jnpf.paymentdoc.mapper.PaymentdocMapper;
import jnpf.paymentdoc.model.paymentdoc.PaymentdocPagination;
import jnpf.paymentdoc.service.PaymentdocItem0Service;
import jnpf.paymentdoc.service.PaymentdocItem1Service;
import jnpf.paymentdoc.service.PaymentdocItem2Service;
import jnpf.paymentdoc.service.PaymentdocService;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.permission.service.AuthorizeService;
import jnpf.supplier.entity.SupplierEntity;
import jnpf.supplier.service.SupplierService;
import jnpf.util.RandomUtil;
import java.math.BigDecimal;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.paymentdoc.model.paymentdoc.PaymentdocPagination;
import jnpf.util.ServletUtil;
import jnpf.util.StringUtil;
import jnpf.util.UserProvider;
import lombok.Cleanup;
import org.apache.http.entity.ContentType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import jnpf.permission.service.AuthorizeService;
import cn.hutool.core.util.ObjectUtil;
import javax.annotation.Resource;
import java.io.*;
import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import java.util.*;
/**
*
* paymentdoc
@ -64,6 +71,9 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
@Autowired
private SupplierService supplierService;
@Resource
private PaymentdocMapper paymentdocMapper;
@Override
@ -352,6 +362,48 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
return paymentdocItem2Service.list(queryWrapper);
}
@Resource
private ConfigValueUtil configValueUtil;
@Override
public void getPaymentDocPdf(String id) {
List<PaymentdocItem2Entity> item2Entities = this.GetPaymentdocItem2List(id);
List<Map<String, Object>> paymentDocNodeInfo = paymentdocMapper.getPaymentDocNodeInfo(id);
String templateFilePath = configValueUtil.getTemplateFilePath() ;
HashMap<String, Object> map = new HashMap<>();
byte[] bytes = null;
ByteArrayOutputStream out = null;
ExportPdf exportPdf = new ExportPdf();
// word模板
try {
out = exportPdf.createPdf(map, "paymentDoc.ftl", "/templates/export");
} catch (Exception e) {
throw new RuntimeException(e);
}
bytes = out.toByteArray();
String fileName = "2023年3月30日.pdf";
// fileName = URLEncoder.encode(fileName, "utf-8");
// 存在本地文件中
MultipartFile file = null;
try {
@Cleanup InputStream inputStream = new ByteArrayInputStream(bytes);
file = new MultipartFileDto(ContentType.APPLICATION_OCTET_STREAM.toString(), inputStream);
// FileUtil.upFile(file, templateFilePath+"/wc/", fileName);
File f = new File(templateFilePath, fileName);
//将上传的文件存储到指定位置
file.transferTo(f);
} catch (IOException e) {
throw new RuntimeException(e);
}
log.warn("pdf文件生成成功！");
}
//列表子表数据方法
}

1
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
Unescape View File

@ -1497,6 +1497,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
vehicleEntity.setDrivername(model.getDriverName());
}
vehicleMapper.insert(vehicleEntity);
model.setVehicleId(aLong.toString());
// model.setCauseError("车牌号不存在！请添加车辆信息在尝试添加！");
// errList.add(model);
// ints.add(i);

7
SC-boot/linkage-scm/src/main/resources/PaymentdocMapper.xml
Unescape View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.paymentdoc.mapper.PaymentdocMapper">
</mapper>

27
SC-boot/linkage-scm/src/main/resources/mapper/paymentdoc/PaymentdocMapper.xml
Unescape View File

@ -1,7 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.mapper.PaymentdocMapper">
<mapper namespace="jnpf.paymentdoc.mapper.PaymentdocMapper">
<select id="getPaymentDocNodeInfo" parameterType="String" resultMap="getPaymentDocNodeInfoMap">
SELECT
CONCAT( b.F_Account, '/', b.F_RealName ) realName,
a.F_NodeName nodeName,
a.F_HandleOpinion handleOpinion,
a.F_HandleTime handleTime
FROM
`flow_taskoperatorrecord` a
LEFT JOIN base_user b ON a.F_HandleId = b.F_Account
WHERE
a.F_TaskId = #{id}
ORDER BY
a.F_HandleTime
</select>
<resultMap id="getPaymentDocNodeInfoMap" type="map">
<!--审核人员-->
<result property="realName" column="realName"/>
<!--审核节点-->
<result property="nodeName" column="nodeName"/>
<!--审核意见-->
<result property="handleOpinion" column="handleOpinion"/>
<!--节点时间-->
<result property="handleTime" column="handleTime"/>
</resultMap>
</mapper>

197
SC-boot/linkage-scm/src/main/resources/templates/export/paymentDoc.ftl
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save