Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
671b4a1c 由 张雷
选项

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

2 个父辈 e74b1760 e74bb74e
全部展开
内嵌 并排
正在显示 19 个修改的文件 包含 521 行增加 和 37 行删除
sk-module-biz/src/main/java/com/skua/modules/erp/controller/ErpSettlementController.java
......@@ -89,8 +89,8 @@ public class ErpSettlementController {
result.error500("请选择记录进行结算");
return result;
}
List<ErpSettlementVO> settlementVOList = erpSettlementService.supplierSettlement(JSUtils.quoteEach(ids,","));
//校验供应商
List<ErpSettlementVO> settlementVOList = erpSettlementService.checkSettlementBySupplier(JSUtils.quoteEach(ids,","));
if(settlementVOList==null || settlementVOList.isEmpty()) {
result.error500("根据供应商与合同号未找到实体");
return result;
......@@ -102,7 +102,7 @@ public class ErpSettlementController {
erpSettlementVO = settlementVO;
erpSettlementVO.setSettlementType("0");
if(supplierName.length() >0 ) supplierName+=",";
supplierName += settlementVO.getSupplierName();
supplierName += ConvertUtils.getString(settlementVO.getSupplierName(),"");
contractCode += settlementVO.getContractCode();
}
}
......@@ -135,7 +135,7 @@ public class ErpSettlementController {
return result;
}
List<ErpSettlementVO> settlementVOList = erpSettlementService.waterDepartSettlement(JSUtils.quoteEach(ids,","));
List<ErpSettlementVO> settlementVOList = erpSettlementService.checkSettlementByWaterDepart(JSUtils.quoteEach(ids,","));
if(settlementVOList==null || settlementVOList.isEmpty()) {
result.error500("根据部门与合同号未找到实体");
return result;
......
sk-module-biz/src/main/java/com/skua/modules/erp/entity/ErpProblem.java 0 → 100644
package com.skua.modules.erp.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import com.skua.core.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 数据问题上报
*/
@Data
@TableName("erp_problem")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="erp_problem对象", description="数据问题上报")
public class ErpProblem {
/**id*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "id")
private String id;
/**所属厂站*/
@Excel(name = "所属厂站", width = 15)
@ApiModelProperty(value = "所属厂站")
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
private String departId;
/**问题描述*/
@Excel(name = "问题描述", width = 15)
@ApiModelProperty(value = "问题描述")
private String problemContent;
/**功能名称*/
@Excel(name = "功能名称", width = 15)
@ApiModelProperty(value = "功能名称")
private String functionName;
/**问题类型*/
@Excel(name = "问题类型", width = 15)
@ApiModelProperty(value = "问题类型")
@Dict(dicCode = "erp_problem_type")
private String problemType;
/**问题截图*/
@Excel(name = "问题截图", width = 15)
@ApiModelProperty(value = "问题截图")
private String problemPic;
/**动态截图*/
@Excel(name = "动态截图", width = 15)
@ApiModelProperty(value = "动态截图")
private String problemExtPic;
/**上报人*/
@Excel(name = "上报人", width = 15)
@ApiModelProperty(value = "上报人")
@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
private String reportUserId;
/**上报时间*/
@ApiModelProperty(value = "上报时间")
private Date reportDate;
/**处理状态(0：未提交，1:已提交，2退回，3已处理，4 关闭)*/
@Excel(name = "处理状态(0：未提交，1:待处理，2退回，3已处理，4 关闭)", width = 15)
@ApiModelProperty(value = "处理状态(0：未提交，1:待处理，2退回，3已处理，4 关闭)")
@Dict(dicCode = "erp_problem_handle_status")
private Integer handleStatus;
/**审批意见*/
@Excel(name = "审批意见", width = 15)
@ApiModelProperty(value = "审批意见")
private String approveMessage;
@ApiModelProperty(value = "复核原因")
private String reviewReason ;
/**处理人*/
@Excel(name = "处理人", width = 15)
@ApiModelProperty(value = "处理人")
private String handleUser;
/**处理时间*/
@Excel(name = "处理时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "处理时间")
private Date handleTime;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String remark;
/**创建人Id*/
@Excel(name = "创建人Id", width = 15)
@ApiModelProperty(value = "创建人Id")
private String createBy;
/**创建时间*/
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**修改人Id*/
@Excel(name = "修改人Id", width = 15)
@ApiModelProperty(value = "修改人Id")
private String updateBy;
/**修改时间*/
@Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "修改时间")
private Date updateTime;
/**删除标识，1有效，0删除*/
@Excel(name = "删除标识，1有效，0删除", width = 15)
@ApiModelProperty(value = "删除标识，1有效，0删除")
private Integer delFlag;
}
sk-module-biz/src/main/java/com/skua/modules/erp/entity/ErpProblemDetail.java 0 → 100644
package com.skua.modules.erp.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import com.skua.core.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 数据问题上报详情
*/
@Data
@TableName("erp_problem_detail")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="erp_problem_detail对象", description="数据问题上报处理日志")
public class ErpProblemDetail {
/**id*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "id")
private String id;
/**问题编号*/
@Excel(name = "问题编号", width = 15)
@ApiModelProperty(value = "问题编号")
private String problemId;
/**处理人*/
@Excel(name = "处理人", width = 15)
@ApiModelProperty(value = "处理人")
@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
private String handleUserId;
/**处理人名称*/
@Excel(name = "处理人名称", width = 15)
@ApiModelProperty(value = "处理人名称")
private String handleUserName;
/**处理时间*/
@Excel(name = "处理时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "处理时间")
private Date handleTime;
/**处理状态(0：未提交，1:已提交，2退回，3已处理，4 关闭)*/
@Excel(name = "处理状态(2退回，3已处理，4 关闭)", width = 15)
@ApiModelProperty(value = "处理状态(2退回，3已处理，4 关闭)")
@Dict(dicCode = "erp_problem_detail_handle_status")
private Integer handleStatus;
/**处理截图*/
@Excel(name = "处理截图", width = 15)
@ApiModelProperty(value = "处理截图")
private String handlePic;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String remark;
/**创建人Id*/
@Excel(name = "创建人Id", width = 15)
@ApiModelProperty(value = "创建人Id")
private String createBy;
/**创建时间*/
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**修改人Id*/
@Excel(name = "修改人Id", width = 15)
@ApiModelProperty(value = "修改人Id")
private String updateBy;
/**修改时间*/
@Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "修改时间")
private Date updateTime;
@TableField(exist=false)
@ApiModelProperty(value = "驳回原因")
private String approveMessage;
}
sk-module-biz/src/main/java/com/skua/modules/erp/entity/ErpSettlement.java
......@@ -66,8 +66,8 @@ public class ErpSettlement {
@ApiModelProperty(value = "税额")
private String taxAmount;
/**价税合计*/
@Excel(name = "价税合计", width = 15)
@ApiModelProperty(value = "价税合计")
@Excel(name = "总价不含税", width = 15)
@ApiModelProperty(value = "总价不含税")
private String totalPriceTax;
/**签字状态(1-申请,2-验收签字,3-经理签字)*/
@Excel(name = "签字状态(1-申请,2-验收签字,3-经理签字)", width = 15)
......@@ -86,7 +86,6 @@ public class ErpSettlement {
@ApiModelProperty(value = "结算日期")
private String settlementTime;
/**申请人签字*/
@Excel(name = "申请人签字", width = 15)
@ApiModelProperty(value = "申请人签字")
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/ErpProblemDetailMapper.java 0 → 100644
package com.skua.modules.erp.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.skua.modules.erp.entity.ErpProblemDetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 数据问题上报详情
*/
public interface ErpProblemDetailMapper extends BaseMapper<ErpProblemDetail> {
void deleteByProblemId(@Param("problemId") String problemId);
List<ErpProblemDetail> queryByProblemId(@Param("problemId") String problemId);
}
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/ErpProblemMapper.java 0 → 100644
package com.skua.modules.erp.mapper;
import com.skua.modules.erp.entity.ErpProblem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 数据问题上报
*/
public interface ErpProblemMapper extends BaseMapper<ErpProblem> {
}
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/ErpSettlementMapper.java
......@@ -13,10 +13,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 药剂结算单详情
*/
public interface ErpSettlementMapper extends BaseMapper<ErpSettlement> {
//供应商结算
List<ErpSettlementVO> supplierSettlement(@Param("ids") String ids);
//水厂结算
List<ErpSettlementVO> waterDepartSettlement(@Param("ids")String ids);
//供应商结算--校验供应商
List<ErpSettlementVO> checkSettlementBySupplier(@Param("ids") String ids);
//水厂结算--校验水厂
List<ErpSettlementVO> checkSettlementByWaterDepart(@Param("ids")String ids);
// 根据入库单ids，获取【供应商】结算单详情
List<ErpSettlementItemVO> querySupplierSettlementByMaterialIds(@Param("ids") String materialIds);
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/ErpProblemDetailMapper.xml 0 → 100644
<?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="com.skua.modules.erp.mapper.ErpProblemDetailMapper">
<delete id="deleteByProblemId">
delete from erp_problem_detail where problem_id = #{problemId}
</delete>
<select id="queryByProblemId" resultType="com.skua.modules.erp.entity.ErpProblemDetail">
select * from erp_problem_detail where problem_id = #{problemId} order by create_time asc
</select>
</mapper>
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/ErpProblemMapper.xml 0 → 100644
<?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="com.skua.modules.erp.mapper.ErpProblemMapper">
</mapper>
\ No newline at end of file
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/ErpSettlementMapper.xml
......@@ -2,24 +2,21 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.skua.modules.erp.mapper.ErpSettlementMapper">
<!--根据ids获取：供应商结算单 -->
<select id="supplierSettlement" resultType="com.skua.modules.erp.vo.ErpSettlementVO">
select sm.supp_name 'supplierName', d.depart_name ,aaa.* from (
select pm.supplier_id ,pc.contract_code, mi.purchase_contract_id ,pc.project_name, mi.depart_id,
sum(mi.material_num) material_num, round(sum(pm.unit_price * mi.material_num),2) total_price,
round(sum(pm.unit_price * mi.material_num *(100 + pm.tax_amount) /100),2) total_price_tax
<select id="checkSettlementBySupplier" resultType="com.skua.modules.erp.vo.ErpSettlementVO">
select sm.supp_name 'supplierName' ,aaa.* from (
select pm.supplier_id ,pc.contract_code
from erp_material_in mi ,erp_purchase_contract pc , erp_purchase_material pm
where mi.audit_status = 3 and mi.purchase_contract_id = pc.id and pm.good_code = mi.good_code and pm.contract_id = mi.purchase_contract_id
and mi.id in (${ids})
group by pm.supplier_id ,pc.contract_code
)aaa
left join ajh_supplier_manage sm on aaa.supplier_id = sm.id
left join sys_depart d on aaa.depart_id = d.id
</select>
<!-- 根据入库单ids，获取供应商结算单详情-->
<select id="querySupplierSettlementByMaterialIds" resultType="com.skua.modules.erp.vo.ErpSettlementItemVO">
select sm.supp_name 'supplierName',d.depart_name, mf.jishu_file_path, mf.appearance_info, mf.matched_info ,mf.handle_msg,mf.sender_sign,mf.receiver_sign,
pc.contract_name,pc.contract_code,pc.project_name , mi.purchase_contract_id , pm.good_brand , pm.good_origin, pm.unit_price ,mi.material_num, pm.tax_amount ,round(pm.unit_price * mi.material_num,2) total_price,
round(pm.unit_price * mi.material_num *(100+pm.tax_amount) /100 ,2) total_price_tax,
round(pm.unit_price * mi.material_num *100 /(100+ ifnull(pm.tax_amount,0)) ,2) total_price_tax,
mi.arrive_time ,mi.remark,mi.sparepart_type,mi.sparepart_id,mi.sparepart_name,mi.sparepart_code,mi.specification, mi.measuring_unit,mi.good_code,mi.id 'material_in_id'
from erp_material_in mi
left join erp_purchase_contract pc on mi.purchase_contract_id = pc.id
......@@ -33,10 +30,9 @@
</select>
<!-- 根据ids获取：水厂结算单 -->
<select id="waterDepartSettlement" resultType="com.skua.modules.erp.vo.ErpSettlementVO">
<select id="checkSettlementByWaterDepart" resultType="com.skua.modules.erp.vo.ErpSettlementVO">
select d.depart_name ,aaa.* from (
select mi.depart_id ,dc.contract_code, mi.distribut_contract_id ,sum(mi.material_num) material_num, dc.contract_name 'project_name', round(sum(dm.distribut_price * mi.material_num),2) total_price,
round(sum(dm.distribut_price * mi.material_num *(100+dm.tax_amount) /100),2) total_price_tax
select mi.depart_id ,dc.contract_code
from erp_material_in mi ,erp_distribut_contract dc , erp_distribut_material dm
where mi.audit_status = 3 and mi.distribut_contract_id = dc.id and dm.good_code = mi.good_code and dm.contract_id = mi.distribut_contract_id
and mi.id in (${ids})
......@@ -47,8 +43,8 @@
<!-- 根据入库单ids，获取水厂结算单详情-->
<select id="queryWaterDepartSettlementByMaterialIds" resultType="com.skua.modules.erp.vo.ErpSettlementItemVO">
select d.depart_name, dc.contract_name ,dc.project_name, dc.contract_code, dm.distribut_price 'unit_price' , pm.good_brand , pm.good_origin, mf.jishu_file_path, mf.appearance_info, mf.matched_info ,mf.handle_msg,mf.sender_sign,mf.receiver_sign, dm.tax_amount ,
round(dm.distribut_price * mi.material_num,2) total_price,
round(dm.distribut_price * mi.material_num *(100+dm.tax_amount) /100,2) total_price_tax, mi.depart_id , mi.distribut_contract_id ,mi.purchase_contract_id, mi.material_num,
round(dm.distribut_price * mi.material_num,2) total_price, round(pm.distribut_price * mi.material_num *100 /(100+ ifnull(dm.tax_amount,0)) ,2) total_price_tax,
mi.depart_id , mi.distribut_contract_id ,mi.purchase_contract_id, mi.material_num,
mi.arrive_time ,mi.remark,mi.sparepart_type,mi.sparepart_id,mi.sparepart_name,mi.sparepart_code,mi.specification, mi.measuring_unit,mi.good_code,mi.id 'material_in_id'
from erp_material_in mi
left join erp_distribut_material dm on (dm.good_code = mi.good_code and dm.contract_id = mi.distribut_contract_id)
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/IErpProblemService.java 0 → 100644
package com.skua.modules.erp.service;
import com.skua.modules.erp.entity.ErpProblem;
import com.baomidou.mybatisplus.extension.service.IService;
import com.skua.modules.erp.vo.ErpProblemVO;
/**
* 数据问题上报
*/
public interface IErpProblemService extends IService<ErpProblem> {
/**
* 新增
* @param erpProblemVO
*/
void saveErpProblem(ErpProblemVO erpProblemVO);
/**
* 修改
* @param erpProblemVO
* @return
*/
boolean updateErpProblem(ErpProblemVO erpProblemVO);
/***
* 删除
* @param id
*/
void delById(String id);
/***
* 根据id获取记录
* @param id
* @return
*/
ErpProblemVO queryById(String id);
}
sk-module-biz/src/main/java/com/skua/modules/erp/service/IErpSettlementService.java
......@@ -38,10 +38,10 @@ public interface IErpSettlementService extends IService<ErpSettlement> {
// 根据入库单ids，获取【水厂】结算单详情
List<ErpSettlementItemVO> queryWaterDepartSettlementByMaterialIds( String materialInIds);
//供应商结算
List<ErpSettlementVO> supplierSettlement(String materialInIds);
//水厂结算
List<ErpSettlementVO> waterDepartSettlement(String materialInIds);
//供应商结算--校验供应商
List<ErpSettlementVO> checkSettlementBySupplier(String materialInIds);
//水厂结算--校验水厂
List<ErpSettlementVO> checkSettlementByWaterDepart(String materialInIds);
/***结算:修改 药剂入库结算状态*/
boolean updateMaterialInSettlementFlag(ErpSettlement erpSettlementEntity,String settlementFlag);
......
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/ErpProblemServiceImpl.java 0 → 100644
package com.skua.modules.erp.service.impl;
import com.skua.modules.erp.entity.ErpProblem;
import com.skua.modules.erp.entity.ErpProblemDetail;
import com.skua.modules.erp.mapper.ErpProblemDetailMapper;
import com.skua.modules.erp.mapper.ErpProblemMapper;
import com.skua.modules.erp.service.IErpProblemService;
import com.skua.modules.erp.vo.ErpProblemVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
/**
* 数据问题上报
*/
@Service
public class ErpProblemServiceImpl extends ServiceImpl<ErpProblemMapper, ErpProblem> implements IErpProblemService {
@Resource
private ErpProblemDetailMapper problemDetailMapper;
/**
* 新增
* @param erpProblemVO
*/
//@Transactional
public void saveErpProblem(ErpProblemVO erpProblemVO){
ErpProblem problem = new ErpProblem();
//BeanUtils.copyProperties(有值的对象, 要被赋值的对象);
BeanUtils.copyProperties(erpProblemVO, problem);
this.baseMapper.insert(problem);
erpProblemVO.setId(problem.getId());
if(erpProblemVO.getProblemDetailList() != null && !erpProblemVO.getProblemDetailList().isEmpty()){
for(ErpProblemDetail problemDetail : erpProblemVO.getProblemDetailList()){
problemDetail.setProblemId(problem.getId());
problemDetailMapper.insert(problemDetail);
}
}
}
/**
* 修改
* @param erpProblemVO
* @return
*/
//@Transactional
public boolean updateErpProblem(ErpProblemVO erpProblemVO){
ErpProblem problem = new ErpProblem();
//BeanUtils.copyProperties(有值的对象, 要被赋值的对象);
BeanUtils.copyProperties(erpProblemVO, problem);
problemDetailMapper.deleteByProblemId(erpProblemVO.getId());
// 删除后批量新增
Integer handleStatus = null;
Date handleTime = null;
String approveMessage = null;
if(erpProblemVO.getProblemDetailList() != null && !erpProblemVO.getProblemDetailList().isEmpty()){
for(ErpProblemDetail problemDetail : erpProblemVO.getProblemDetailList()){
problemDetail.setProblemId(problem.getId());
handleStatus = problemDetail.getHandleStatus();
handleTime = problemDetail.getHandleTime();
approveMessage = problemDetail.getApproveMessage();
problemDetailMapper.insert(problemDetail);
}
}
if(handleStatus != null ){
problem.setHandleStatus(handleStatus);
}
if(handleTime != null){
problem.setHandleTime(handleTime);
}
if(StringUtils.isNotEmpty(approveMessage)){
problem.setApproveMessage(approveMessage);
}
this.baseMapper.updateById(problem);
return true;
}
/***
* 根据id获取记录
* @param id
* @return
*/
public ErpProblemVO queryById(String id){
ErpProblem erpProblem = this.baseMapper.selectById(id);
ErpProblemVO problemVO = new ErpProblemVO();
//BeanUtils.copyProperties(有值的对象, 要被赋值的对象);
BeanUtils.copyProperties(erpProblem, problemVO);
List<ErpProblemDetail> problemDetailList = problemDetailMapper.queryByProblemId(id);
if(problemDetailList != null && !problemDetailList.isEmpty()){
problemVO.setProblemDetailList(problemDetailList);
}
return problemVO;
}
/***
* 删除
* @param id
*/
@Transactional
public void delById(String id){
problemDetailMapper.deleteByProblemId(id);
this.baseMapper.deleteById(id);
}
}
sk-module-biz/src/main/java/com/skua/modules/erp/service/impl/ErpSettlementServiceImpl.java
......@@ -138,12 +138,12 @@ public class ErpSettlementServiceImpl extends ServiceImpl<ErpSettlementMapper, E
}
//供应商结算
public List<ErpSettlementVO> supplierSettlement(String materialInIds){
return this.baseMapper.supplierSettlement( materialInIds );
public List<ErpSettlementVO> checkSettlementBySupplier(String materialInIds){
return this.baseMapper.checkSettlementBySupplier( materialInIds );
}
//水厂结算
public List<ErpSettlementVO> waterDepartSettlement(String materialInIds){
return this.baseMapper.waterDepartSettlement( materialInIds );
public List<ErpSettlementVO> checkSettlementByWaterDepart(String materialInIds){
return this.baseMapper.checkSettlementByWaterDepart( materialInIds );
}
......
sk-module-biz/src/main/java/com/skua/modules/erp/vo/ErpProblemVO.java 0 → 100644
package com.skua.modules.erp.vo;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import com.skua.modules.erp.entity.ErpProblemDetail;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 数据问题上报
*/
@Data
@ApiModel(value="erp_problem数据传输对象", description="数据问题上报")
public class ErpProblemVO {
/**id*/
@ApiModelProperty(value = "id")
private String id;
/**所属厂站*/
@Excel(name = "所属厂站", width = 15)
@ApiModelProperty(value = "所属厂站")
private String departId;
/**问题描述*/
@Excel(name = "问题描述", width = 15)
@ApiModelProperty(value = "问题描述")
private String problemContent;
/**功能名称*/
@Excel(name = "功能名称", width = 15)
@ApiModelProperty(value = "功能名称")
private String functionName;
/**问题类型*/
@Excel(name = "问题类型", width = 15)
@ApiModelProperty(value = "问题类型")
private String problemType;
/**问题截图*/
@Excel(name = "问题截图", width = 15)
@ApiModelProperty(value = "问题截图")
private String problemPic;
/**动态截图*/
@Excel(name = "动态截图", width = 15)
@ApiModelProperty(value = "动态截图")
private String problemExtPic;
/**上报人*/
@Excel(name = "上报人", width = 15)
@ApiModelProperty(value = "上报人")
private String reportUserId;
/**上报时间*/
@ApiModelProperty(value = "上报时间")
private Date reportDate;
/**处理状态(0：未提交，1:已提交，2退回，3已处理，4 关闭)*/
@Excel(name = "处理状态(0：未提交，1:已提交，2退回，3已处理，4 关闭)", width = 15)
@ApiModelProperty(value = "处理状态(0：未提交，1:已提交，2退回，3已处理，4 关闭)")
private Integer handleStatus;
/**审批意见*/
@Excel(name = "审批意见", width = 15)
@ApiModelProperty(value = "审批意见")
private String approveMessage;
/**处理人*/
@Excel(name = "处理人", width = 15)
@ApiModelProperty(value = "处理人")
private String handleUser;
/**处理时间*/
@Excel(name = "处理时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "处理时间")
private Date handleTime;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "处理日志集合")
private List<ErpProblemDetail> problemDetailList ;
}
sk-module-datafill/src/main/java/com/skua/modules/custom/service/impl/FCustomReportDatasetServiceImpl.java
......@@ -422,8 +422,8 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
JnhbReportData lastMonthData = getJnhbReportSumDataByResultNumber(departIds,dataVO.getLastMonthStartTime(),dataVO.getLastMonthEndTime());
JnhbReportData lastYearMonthData = getJnhbReportSumDataByResultNumber(departIds,dataVO.getLastYearMonthStartTime(),dataVO.getLastYearMonthEndTime());
//ResultNumberVO(tring name, String unit, String value, String valueTb, String valueHb)
reduceStatisticsList.add( new ResultNumberVO( "cod", "吨",nowMonthData.getCodxjl(),lastMonthData.getCodxjl(),lastYearMonthData.getCodxjl() ) );//COD消减量（吨） codxjl
reduceStatisticsList.add( new ResultNumberVO( "NH3-N","吨",nowMonthData.getAdxjl(),lastMonthData.getAdxjl(),lastYearMonthData.getAdxjl() ));//NH3-N消减量（吨）adxjl
reduceStatisticsList.add( new ResultNumberVO( "COD", "吨",nowMonthData.getCodxjl(),lastMonthData.getCodxjl(),lastYearMonthData.getCodxjl() ) );//COD消减量（吨） codxjl
reduceStatisticsList.add( new ResultNumberVO( "NH₃-N","吨",nowMonthData.getAdxjl(),lastMonthData.getAdxjl(),lastYearMonthData.getAdxjl() ));//NH3-N消减量（吨）adxjl
reduceStatisticsList.add( new ResultNumberVO( "TP","吨",nowMonthData.getTpxjl(),lastMonthData.getTpxjl(),lastYearMonthData.getTpxjl() ));//TP消减量（吨）tpxjl
reduceStatisticsList.add( new ResultNumberVO( "TN","吨",nowMonthData.getTnxjl(),lastMonthData.getTnxjl(),lastYearMonthData.getTnxjl() ));//TN消减量（吨）tnxjl
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/controller/WaterCountAnalysisNewController.java
......@@ -104,7 +104,6 @@ public class WaterCountAnalysisNewController {
/**
* 查询运行负荷率分析
*
* @return
*/
@AutoLog(value = "查询自来水消耗量")
......
sk-module-datafill/src/main/java/com/skua/modules/report/mapper/xml/FReportItemvMapper.xml
......@@ -166,9 +166,9 @@
</select>
<select id="getYhData" resultType="com.skua.modules.report.vo.DepartDrugResult">
SELECT
IFNULL(dh.yjdh,0) AS zyh,
IFNULL(dhtb.yjdh,0) AS zyh_tb,
IFNULL(dhhb.yjdh,0) AS zyh_hb
round(IFNULL(dh.yjdh,0)/10000,2) AS zyh,
round(IFNULL(dhtb.yjdh,0)/10000,2) AS zyh_tb,
round(IFNULL(dhhb.yjdh,0)/10000,2) AS zyh_hb
FROM
(
SELECT
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!