采购订单生成bug修复

product
chuang 2 years ago
parent 153c131fbd
commit d35bd5147a

@ -30,10 +30,10 @@ public class ContractMobileController {
@PostMapping("/getList") @PostMapping("/getList")
@ApiOperation("合同档案列表") @ApiOperation("合同档案列表")
public ActionResult list(@RequestBody ContractMobilePagination contractMobilePagination) throws IOException { public ActionResult list(@RequestBody ContractMobilePagination contractMobilePagination) throws IOException {
List<ContractMobileEntity> list = contractMobileService.getList(contractMobilePagination); List<ContractMobileVO> list = contractMobileService.getList(contractMobilePagination);
List<ContractMobileListVO> listVO = JsonUtil.getJsonToList(list, ContractMobileListVO.class); // List<ContractMobileListVO> listVO = JsonUtil.getJsonToList(list, ContractMobileListVO.class);
PageListVO vo = new PageListVO(); PageListVO vo = new PageListVO();
vo.setList(listVO); vo.setList(list);
PaginationVO page = JsonUtil.getJsonToBean(contractMobilePagination, PaginationVO.class); PaginationVO page = JsonUtil.getJsonToBean(contractMobilePagination, PaginationVO.class);
vo.setPagination(page); vo.setPagination(page);
return ActionResult.success(vo); return ActionResult.success(vo);

@ -1,7 +1,15 @@
package jnpf.contractMobile.mapper; package jnpf.contractMobile.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.contractMobile.entity.ContractMobileEntity; import jnpf.contractMobile.entity.ContractMobileEntity;
import jnpf.contractMobile.model.contractMobile.ContractMobileVO;
import org.apache.ibatis.annotations.Param;
public interface ContractMobileMapper extends BaseMapper<ContractMobileEntity> { public interface ContractMobileMapper extends BaseMapper<ContractMobileEntity> {
IPage<ContractMobileVO> getMobileDate(@Param("page") IPage<ContractMobileVO> page,
@Param("ew") Wrapper<ContractMobileEntity> queryWrapper);
} }

@ -0,0 +1,172 @@
package jnpf.contractMobile.model.contractMobile;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Author: WangChuang
* @Date: 8/3/2023 11:10
* @Description //注释:
* @Version 1.0
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ContractMobileVO {
@TableField("CREATOR_USER_ID")
private String creatorUserId;
@TableField("CREATOR_USER_NAME")
private String creatorUserName;
@TableField("CREATOR_TIME")
private Date creatorTime;
@TableField("LAST_MODIFY_USER_ID")
private String lastModifyUserId;
@TableField("LAST_MODIFY_USER_NAME")
private String lastModifyUserName;
@TableField("LAST_MODIFY_TIME")
private Date lastModifyTime;
@TableField("DELETE_USER_ID")
private String deleteUserId;
@TableField("DELETE_USER_NAME")
private String deleteUserName;
@TableField("DELETE_TIME")
private Date deleteTime;
@TableField("DELETE_MARK")
private String deleteMark;
@TableField("ORGNIZE_ID")
private String orgnizeId;
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField("CONTRACT_CODE")
private String contractCode;
@TableField("CONTRACT_NAME")
private String contractName;
@TableField("CONTRACT_NO")
private String contractNo;
@TableField("CONTRACT_TYPE")
private String contractType;
@TableField("CLASSIFICATION")
private String classification;
@TableField("DECLARATION_DATE")
private Date declarationDate;
@TableField("CODE")
private String code;
@TableField("NAME")
private String cName;
@TableField("AMOUNT")
private BigDecimal amount;
@TableField("DEPT_CODE")
private String deptCode;
@TableField("DEPT_NAME")
private String deptName;
@TableField("STATUS")
private String status;
@TableField("BID_OPENING_DATE")
private Date bidOpeningDate;
@TableField("START_DATE")
private Date startDate;
@TableField("AUDIT_DATE")
private Date auditDate;
@TableField("COMPLETION_DATE")
private Date completionDate;
@TableField("CLOSING_DATE")
private Date closingDate;
@TableField("COLLECTION_CYCLE")
private Integer collectionCycle;
@TableField("SIGNING_DATE")
private Date signingDate;
@TableField("END_DATE")
private Date endDate;
@TableField("CURRENCY")
private String currency;
@TableField("ORGANIZATION")
private String organization;
@TableField("REMARK")
private String remark;
@TableField("APPROVAL")
private String approval;
@TableField("EXCHANGE_RATE")
private String exchangeRate;
@TableField("BANK_NO")
private String bankNo;
@TableField("TAX_NO")
private String taxNo;
/** 主键 **/
@JsonProperty("id")
private String id;
/** 客户名 **/
@JsonProperty("name")
private String supperName;
/** 合同进度 **/
private String schedule;
/** 合同数量 **/
@JsonProperty("num")
private BigDecimal num;
/** 销售数量 **/
private BigDecimal sellNum;
/** 贸易采购 **/
private BigDecimal purchaseNum;
/** 自加工 **/
private BigDecimal machineNum;
/** 委外 **/
private BigDecimal outsourceNum;
/** 倒运 **/
private BigDecimal cheapNum;
}

@ -5,12 +5,13 @@ import jnpf.contractMobile.entity.ContractItem0MobileEntity;
import jnpf.contractMobile.entity.ContractItem1MobileEntity; import jnpf.contractMobile.entity.ContractItem1MobileEntity;
import jnpf.contractMobile.entity.ContractMobileEntity; import jnpf.contractMobile.entity.ContractMobileEntity;
import jnpf.contractMobile.model.contractMobile.ContractMobilePagination; import jnpf.contractMobile.model.contractMobile.ContractMobilePagination;
import jnpf.contractMobile.model.contractMobile.ContractMobileVO;
import java.util.List; import java.util.List;
public interface ContractMobileService extends IService<ContractMobileEntity> { public interface ContractMobileService extends IService<ContractMobileEntity> {
List<ContractMobileEntity> getList(ContractMobilePagination contractMobilePagination); List<ContractMobileVO> getList(ContractMobilePagination contractMobilePagination);
ContractMobileEntity getInfo(String id); ContractMobileEntity getInfo(String id);

@ -9,6 +9,7 @@ import jnpf.contractMobile.entity.ContractItem1MobileEntity;
import jnpf.contractMobile.entity.ContractMobileEntity; import jnpf.contractMobile.entity.ContractMobileEntity;
import jnpf.contractMobile.mapper.ContractMobileMapper; import jnpf.contractMobile.mapper.ContractMobileMapper;
import jnpf.contractMobile.model.contractMobile.ContractMobilePagination; import jnpf.contractMobile.model.contractMobile.ContractMobilePagination;
import jnpf.contractMobile.model.contractMobile.ContractMobileVO;
import jnpf.contractMobile.service.ContractItem0MobileService; import jnpf.contractMobile.service.ContractItem0MobileService;
import jnpf.contractMobile.service.ContractItem1MobileService; import jnpf.contractMobile.service.ContractItem1MobileService;
import jnpf.contractMobile.service.ContractMobileService; import jnpf.contractMobile.service.ContractMobileService;
@ -17,6 +18,7 @@ import jnpf.util.UserProvider;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -25,8 +27,11 @@ public class ContractMobileServiceImpl extends ServiceImpl<ContractMobileMapper,
@Autowired @Autowired
private UserProvider userProvider; private UserProvider userProvider;
@Resource
private ContractMobileMapper contractMobileMapper;
@Override @Override
public List<ContractMobileEntity> getList(ContractMobilePagination contractMobilePagination) { public List<ContractMobileVO> getList(ContractMobilePagination contractMobilePagination) {
String userId = userProvider.get().getUserId(); String userId = userProvider.get().getUserId();
List<String> AllIdList = new ArrayList(); List<String> AllIdList = new ArrayList();
int total = 0; int total = 0;
@ -58,11 +63,12 @@ public class ContractMobileServiceImpl extends ServiceImpl<ContractMobileMapper,
// contractMQueryWrapper.lambda().like(ContractMEntity::getName, contractMPagination.getName()); // contractMQueryWrapper.lambda().like(ContractMEntity::getName, contractMPagination.getName());
// } // }
if ((total > 0 && AllIdList.size() > 0) || total == 0) { if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<ContractMobileEntity> page = new Page<>(contractMobilePagination.getCurrentPage(), contractMobilePagination.getPageSize()); Page<ContractMobileVO> page = new Page<>(contractMobilePagination.getCurrentPage(), contractMobilePagination.getPageSize());
IPage<ContractMobileEntity> userIPage = this.page(page, contractMobileQueryWrapper); IPage<ContractMobileVO> userIPage = contractMobileMapper.getMobileDate(page, contractMobileQueryWrapper);
// IPage<ContractMobileEntity> userIPage = this.page(page, contractMobileQueryWrapper);
return contractMobilePagination.setData(userIPage.getRecords(), userIPage.getTotal()); return contractMobilePagination.setData(userIPage.getRecords(), userIPage.getTotal());
} else { } else {
List<ContractMobileEntity> list = new ArrayList(); List<ContractMobileVO> list = new ArrayList();
return contractMobilePagination.setData(list, list.size()); return contractMobilePagination.setData(list, list.size());
} }
} }

@ -416,7 +416,7 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
// pdf模板 // pdf模板
Map map=orderMap; Map map=orderMap;
// //
map.put("title","济钢城市矿产科技有限公司"); map.put("title","济钢城市矿产科技有限公司采购订单");
map.put("name", "城市矿产再生资源事业部"); map.put("name", "城市矿产再生资源事业部");
List<HashMap<String,Object>> reportList = (List<HashMap<String,Object>>) map.get("reportList"); List<HashMap<String,Object>> reportList = (List<HashMap<String,Object>>) map.get("reportList");
if (reportList!=null){ if (reportList!=null){
@ -1095,8 +1095,8 @@ if (pMap!=null&&pMap.size()>0){
@Override @Override
public void getVehicle(List<HashMap<String, Object>> vehicleInfo, String templateFilePath) throws Exception { public void getVehicle(List<HashMap<String, Object>> vehicleInfo, String templateFilePath) throws Exception {
BufferedInputStream input = null; // BufferedInputStream input = null;
BufferedOutputStream out = null; // BufferedOutputStream out = null;
try{ try{
if (vehicleInfo!=null&&vehicleInfo.size()>0){ if (vehicleInfo!=null&&vehicleInfo.size()>0){
for (int i = 0; i < vehicleInfo.size(); i++) { for (int i = 0; i < vehicleInfo.size(); i++) {
@ -1120,28 +1120,29 @@ if (pMap!=null&&pMap.size()>0){
parentFile.mkdirs(); parentFile.mkdirs();
} }
// log.warn(templateFilePath+s1+"\\"+"vehicle\\"+ UUID.randomUUID().toString().replaceAll("-", "")+".png"); // log.warn(templateFilePath+s1+"\\"+"vehicle\\"+ UUID.randomUUID().toString().replaceAll("-", "")+".png");
if (vehicleImg.exists()){ //
input = new BufferedInputStream(new FileInputStream(vehicleImg)); FileCopy.copyFile(vehicleImg,templateFilePath+"vehicle\\"+s1+"\\");
out = new BufferedOutputStream(new FileOutputStream(outImg)); // input = new BufferedInputStream(new FileInputStream(vehicleImg));
byte[] bys = new byte[1024]; // out = new BufferedOutputStream(new FileOutputStream(outImg));
int len = 0; // byte[] bys = new byte[1024];
while ((len = input.read(bys)) != -1) // int len = 0;
{ // while ((len = input.read(bys)) != -1)
out.write(bys, 0, len); // {
} // out.write(bys, 0, len);
} // }
//
} }
} }
} }
} }
} }
}finally { }finally {
if (input!=null){ // if (input!=null){
input.close(); // input.close();
} // }
if (out!=null){ // if (out!=null){
out.close(); // out.close();
} // }
} }

@ -0,0 +1,122 @@
<?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.contractMobile.mapper.ContractMobileMapper">
<resultMap id="contractMobileDate" type="jnpf.contractMobile.model.contractMobile.ContractMobileVO">
<!-- 主键-->
<result column="id" property="id"/>
<!-- 合同编码-->
<result column="contractCode" property="contractCode"/>
<!-- 客户名-->
<result column="supperName" property="supperName"/>
<!-- 合同状态-->
<result column="status" property="status"/>
<!-- 合同进度-->
<result column="schedule" property="schedule"/>
<!-- 合同数量-->
<result column="contractNum" property="num"/>
<!-- 销售数量-->
<result column="sellNum" property="sellNum"/>
<!-- 贸易采购-->
<result column="purchaseNum" property="purchaseNum"/>
<!-- 自加工-->
<result column="machineNum" property="machineNum"/>
<!-- 委外-->
<result column="outsourceNum" property="outsourceNum"/>
<!-- 倒运-->
<result column="CREATOR_USER_ID" property="creatorUserId"/>
<result column="CREATOR_USER_NAME" property="creatorUserName"/>
<result column="CREATOR_TIME" property="creatorTime"/>
<result column="LAST_MODIFY_USER_ID" property="lastModifyUserId"/>
<result column="LAST_MODIFY_USER_NAME" property="lastModifyUserName"/>
<result column="LAST_MODIFY_TIME" property="lastModifyTime"/>
<result column="DELETE_USER_ID" property="deleteUserId"/>
<result column="DELETE_USER_NAME" property="deleteUserName"/>
<result column="DELETE_TIME" property="deleteTime"/>
<result column="DELETE_MARK" property="deleteMark"/>
<result column="ORGNIZE_ID" property="orgnizeId"/>
<result column="DEPARTMENT_ID" property="departmentId"/>
<result column="CONTRACT_CODE" property="contractCode"/>
<result column="CONTRACT_NAME" property="contractName"/>
<result column="CONTRACT_NO" property="contractNo"/>
<result column="CONTRACT_TYPE" property="contractType"/>
<result column="CLASSIFICATION" property="classification"/>
<result column="DECLARATION_DATE" property="declarationDate"/>
<result column="CODE" property="code"/>
<result column="name" property="cName"/>
<result column="AMOUNT" property="amount"/>
<result column="DEPT_CODE" property="deptCode"/>
<result column="DEPT_NAME" property="deptName"/>
<result column="BID_OPENING_DATE" property="bidOpeningDate"/>
<result column="START_DATE" property="startDate"/>
<result column="AUDIT_DATE" property="auditDate"/>
<result column="COMPLETION_DATE" property="completionDate"/>
<result column="CLOSING_DATE" property="closingDate"/>
<result column="COLLECTION_CYCLE" property="collectionCycle"/>
<result column="SIGNING_DATE" property="signingDate"/>
<result column="END_DATE" property="endDate"/>
<result column="CURRENCY" property="currency"/>
<result column="ORGANIZATION" property="organization"/>
<result column="REMARK" property="remark"/>
<result column="APPROVAL" property="approval"/>
<result column="EXCHANGE_RATE" property="exchangeRate"/>
<result column="BANK_NO" property="bankNo"/>
<result column="TAX_NO" property="taxNo"/>
</resultMap>
<select id="getMobileDate" resultMap="contractMobileDate">
SELECT
*
FROM
(
SELECT
a.*,
g.supplier_nm supperName,
concat(
round( IFNULL( IFNULL( SUM( b.settlement ), 0 )/ IFNULL( a.num, 0 ) * 100, 0 ), 2 ),
'%'
) schedule,
IFNULL( a.num, 0 ) contractNum,
IFNULL( SUM( b.settlement ), 0 ) sellNum,
IFNULL( SUM( c.settlement ), 0 ) purchaseNum,
IFNULL( SUM( d.settlement ), 0 ) machineNum,
IFNULL( SUM( e.settlement ), 0 ) outsourceNum,
IFNULL( SUM( f.settlement ), 0 ) cheapNum
FROM
jg_contract a
LEFT JOIN jg_poundlist b ON a.id = b.sales_id
AND b.sales_status != '99'
OR ISNULL( b.sales_status )
AND b.sales_status != '0'
OR ISNULL( b.sales_status )
AND b.pound_status = '0'
LEFT JOIN jg_poundlist c ON a.id = c.sales_id
AND c.pound_status = '0'
AND c.pound_type = '0'
AND c.purchase_status = '2'
OR c.purchase_status = '3'
LEFT JOIN jg_poundlist d ON a.id = d.sales_id
AND d.pound_status = '0'
AND d.pound_type = '1'
AND d.purchase_status = '2'
OR d.purchase_status = '3'
LEFT JOIN jg_poundlist e ON a.id = e.sales_id
AND e.pound_status = '0'
AND e.pound_type = '2'
AND e.purchase_status = '2'
OR e.purchase_status = '3'
LEFT JOIN jg_poundlist f ON a.id = f.sales_id
AND f.pound_status = '0'
AND f.pound_type = '3'
AND f.purchase_status = '2'
OR f.purchase_status = '3'
LEFT JOIN jg_customer g ON a.CODE = g.id
WHERE
a.contract_type = '1'
GROUP BY
a.id
) aaa ${ew.customSqlSegment}
</select>
</mapper>
Loading…
Cancel
Save