diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectReceiving.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectReceiving.java index d94ec792..f2306610 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectReceiving.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpProjectReceiving.java @@ -1,13 +1,12 @@ package org.dromara.oa.erp.domain; -import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.common.tenant.core.TenantEntity; import java.io.Serial; +import java.util.Date; /** * 项目收货确认对象 erp_project_receiving @@ -114,5 +113,10 @@ public class ErpProjectReceiving extends TenantEntity { @TableField("receiving_code") private String receivingCode; + /** + * 全部到货标识（0是1否） + */ + private String isAllReceiving; + } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectReceivingBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectReceivingBo.java index eb6e1f6a..fc0675fd 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectReceivingBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectReceivingBo.java @@ -1,20 +1,18 @@ package org.dromara.oa.erp.domain.bo; import cn.hutool.core.util.ObjectUtil; -import org.dromara.oa.erp.domain.ErpProjectReceiving; -import org.dromara.common.mybatis.core.domain.BaseEntity; - import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.oa.erp.domain.ErpProjectReceiving; +import org.dromara.workflow.api.domain.RemoteFlowInstanceBizExt; import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.Objects; -import org.dromara.workflow.api.domain.RemoteFlowInstanceBizExt; - /** * 项目收货确认业务对象 erp_project_receiving * @@ -81,6 +79,11 @@ public class ErpProjectReceivingBo extends BaseEntity { */ private String remark; + /** + * 全部到货标识（0是1否） + */ + private String isAllReceiving; + /** * 流程编码 */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectReceivingVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectReceivingVo.java index c6141959..8cb32793 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectReceivingVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectReceivingVo.java @@ -1,14 +1,12 @@ package org.dromara.oa.erp.domain.vo; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.oa.erp.domain.ErpProjectReceiving; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import org.dromara.oa.erp.domain.ErpProjectReceiving; import java.io.Serial; import java.io.Serializable; @@ -126,5 +124,12 @@ public class ErpProjectReceivingVo implements Serializable { @ExcelProperty(value = "收货确认编号") private String receivingCode; + /** + * 全部到货标识（0是1否） + */ + @ExcelProperty(value = "全部到货标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "is_all_receiving") + private String isAllReceiving; + } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReceivingServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReceivingServiceImpl.java index 53bc28e5..db965346 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReceivingServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectReceivingServiceImpl.java @@ -104,6 +104,7 @@ public class ErpProjectReceivingServiceImpl implements IErpProjectReceivingServi .eq(bo.getManagerId() != null, ErpProjectReceiving::getManagerId, bo.getManagerId()) .eq(bo.getArrivalDate() != null, ErpProjectReceiving::getArrivalDate, bo.getArrivalDate()) .eq(StringUtils.isNotBlank(bo.getOssId()), ErpProjectReceiving::getOssId, bo.getOssId()) + .eq(StringUtils.isNotBlank(bo.getIsAllReceiving()), ErpProjectReceiving::getIsAllReceiving, bo.getIsAllReceiving()) .eq(bo.getChargeId() != null, ErpProjectReceiving::getChargeId, bo.getChargeId()) .eq(bo.getDeputyId() != null, ErpProjectReceiving::getDeputyId, bo.getDeputyId()); if (params != null) { diff --git a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectReceivingMapper.xml b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectReceivingMapper.xml index b2503650..6a975351 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectReceivingMapper.xml +++ b/ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectReceivingMapper.xml @@ -20,12 +20,13 @@ + select t.receiving_id, t.tenant_id, t.project_id, t.project_code, t.project_name, t.manager_id, u1.nick_name as projectManagerName, t.arrival_date, t.oss_id, t.receiving_code, - t.charge_id, u3.nick_name as chargeName, t.deputy_id, u4.nick_name as deputyName, t.remark, t.receiving_status, t.flow_status, t.del_flag, t.create_dept, t.create_by, t.create_time, t.update_by, t.update_time + t.charge_id, u3.nick_name as chargeName, t.deputy_id, u4.nick_name as deputyName, t.remark, t.receiving_status, t.flow_status, t.is_all_receiving, t.del_flag, t.create_dept, t.create_by, t.create_time, t.update_by, t.update_time from erp_project_receiving t left join sys_user u1 on t.manager_id = u1.user_id left join sys_user u3 on t.charge_id = u3.user_id @@ -49,7 +50,7 @@ select t.receiving_id, t.tenant_id, t.project_id, t.project_code, t.project_name, t.manager_id, u1.nick_name as projectManagerName, t.arrival_date, t.oss_id, t.receiving_code, - t.charge_id, u3.nick_name as chargeName, t.deputy_id, u4.nick_name as deputyName, t.remark, t.receiving_status, t.flow_status, t.del_flag, t.create_dept, t.create_by, t.create_time, t.update_by, t.update_time + t.charge_id, u3.nick_name as chargeName, t.deputy_id, u4.nick_name as deputyName, t.remark, t.receiving_status, t.flow_status, t.is_all_receiving, t.del_flag, t.create_dept, t.create_by, t.create_time, t.update_by, t.update_time from erp_project_receiving t left join sys_user u1 on t.manager_id = u1.user_id left join sys_user u3 on t.charge_id = u3.user_id @@ -103,6 +104,8 @@ remark, + is_all_receiving, + del_flag, create_dept, @@ -141,6 +144,8 @@ #{item.remark}, + #{item.isAllReceiving}, + #{item.delFlag}, #{item.createDept}, @@ -195,6 +200,9 @@ remark = #{item.remark}, + + is_all_receiving = #{item.isAllReceiving}, + del_flag = #{item.delFlag},