From 9f9313591c872ec726ea1ee67ae29f848cbcf7f3 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Mon, 20 Apr 2026 10:20:45 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml | 1 + .../java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml | 2 +- .../org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml | 2 +- .../java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml | 2 +- .../springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml | 2 +- .../springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml | 2 +- .../springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml | 2 +- .../erpdata/service/impl/ErpMesRbWoServiceImpl.java | 3 +++ 8 files changed, 10 insertions(+), 6 deletions(-) diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml index d26ce303..3b92f5f6 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPacturnrecordMapper.xml @@ -29,6 +29,7 @@ FROM dba_mgr.v_mes_rb_pacturnrecord a + a.processlinedesc like '%4%' AND a.cdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml index 0184851c..c49191de 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPkMapper.xml @@ -40,7 +40,7 @@ FROM dba_mgr.v_mes_rb_pk a - 1=1 + a.processlinedesc like '%4%' AND a.newlevdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml index 7850dcb8..db434488 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbPurtosoMapper.xml @@ -24,7 +24,7 @@ a.warctlr,a.lewdept,a.prtudeptcode,a.newlevname,a.newlevdate from dba_mgr.V_MES_RB_PURTOSO a - 1=1 + a.processlinedesc like '%4%' AND a.newlevdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml index 8fde9329..97e69538 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSjsoMapper.xml @@ -29,7 +29,7 @@ FROM dba_mgr.v_mes_rb_sjso a - 1=1 + a.processlinedesc like '%4%' AND a.newlevdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml index c55d7d3f..879bc7d3 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelrecwxMapper.xml @@ -39,7 +39,7 @@ FROM dba_mgr.v_mes_rb_sodelrecwx a - 1=1 + a.processlinedesc like '%4%' AND a.newlevdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml index 15fb625f..18b68a69 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbSodelreczgMapper.xml @@ -39,7 +39,7 @@ FROM dba_mgr.v_mes_rb_sodelreczg a - 1=1 + a.processlinedesc like '%4%' AND a.newlevdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml index e613f411..508e1b24 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpMesRbWxpromotionMapper.xml @@ -28,7 +28,7 @@ FROM dba_mgr.v_mes_rb_wxpromotion a - 1=1 + a.processlinedesc like '%4%' AND a.newlevdate ]]> TO_DATE(#{newlevdateMax}, 'YYYY-MM-DD HH24:MI:SS') diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java index 524b231b..e7c3e6f2 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java @@ -430,6 +430,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { YieldOrder yieldOrder=new YieldOrder(); yieldOrder.setSiteWork(true); yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_SJ); + yieldOrder.setYpMemo("烧结转工单"); yieldOrder.setManualIncrease(false); yieldOrder.setYoCode(mesRbtoso.getSono());//生产单号 yieldOrder.setYpCode(mesRbtoso.getWono()); @@ -572,6 +573,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { YieldOrder yieldOrder=new YieldOrder(); yieldOrder.setSiteWork(false); yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB); + yieldOrder.setYpMemo("外协转工单"); yieldOrder.setManualIncrease(false); yieldOrder.setYoCode(mesRbSodelrecwx.getSono());//生产单号 yieldOrder.setYpCode(mesRbSodelrecwx.getWono()); @@ -732,6 +734,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { YieldOrder yieldOrder=new YieldOrder(); yieldOrder.setSiteWork(true); yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB); + yieldOrder.setYpMemo("配套转工单"); yieldOrder.setYoCode(mesRbPk.getWono());//生产单号 yieldOrder.setYpCode(mesRbPk.getWono()); yieldOrder.setBatchNo(mesRbPk.getSplcode());//批次号 From 9e06d0798851478a92bec16871445d46b579b080 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Mon, 20 Apr 2026 10:29:38 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/desk/order/mapper/YieldPlanMapper.xml | 1 + .../org/springblade/erpdata/mapper/ErpPartoplinkFirseqMapper.xml | 1 + .../springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java | 1 + 3 files changed, 3 insertions(+) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml index 57d45df8..df1ea8db 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldPlanMapper.xml @@ -26,6 +26,7 @@ AND status = #{entity.status} + ORDER BY RELEASE_DATE DESC diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java index 524b231b..5c4e76e6 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java @@ -164,6 +164,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { yieldPlan.setProductIdent(mesRbWo.getPrtlotno()); yieldPlan.setYpQty(Long.valueOf(Math.round(Double.parseDouble(mesRbWo.getWoporqty())))); //直接取erp数据不查询mes + log.info("qyl:同步生产计划零件信息:{}:{}:{}",mesRbWo.getPrtarea(),mesRbWo.getPrtdesc(),mesRbWo.getProcesslinedesc()); yieldPlan.setYpArea(mesRbWo.getPrtarea()); yieldPlan.setPartName(mesRbWo.getPrtdesc()); yieldPlan.setPrimaryCraft(mesRbWo.getProcesslinedesc()); From 0155f6f1d3f7a4d44881f6731b9fbc265969c2b5 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Mon, 20 Apr 2026 10:33:16 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8C=E6=AD=A5=E9=9B=B6=E4=BB=B6=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/YieldOrderServiceImpl.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java index 24c3ee3c..463dce52 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java @@ -92,6 +92,8 @@ public class YieldOrderServiceImpl extends BaseServiceImpl Date: Mon, 20 Apr 2026 11:05:27 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8C=E6=AD=A5=E9=9B=B6=E4=BB=B6=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/order/service/impl/YieldOrderServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java index 463dce52..414faff3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java @@ -92,7 +92,6 @@ public class YieldOrderServiceImpl extends BaseServiceImpl Date: Mon, 20 Apr 2026 11:14:10 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8C=E6=AD=A5=E9=9B=B6=E4=BB=B6=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/YieldOrderServiceImpl.java | 70 ++++++++++++------- 1 file changed, 46 insertions(+), 24 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java index 414faff3..68fa9b6b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java @@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springblade.common.constant.CommonConstant; @@ -37,7 +36,10 @@ import org.springblade.desk.order.constant.YieldOrderConst; import org.springblade.desk.order.mapper.MoldDemandMapper; import org.springblade.desk.order.mapper.YieldOrderMapper; import org.springblade.desk.order.mapper.YieldPlanMapper; -import org.springblade.desk.order.pojo.entity.*; +import org.springblade.desk.order.pojo.entity.MoldDemand; +import org.springblade.desk.order.pojo.entity.YieldOrder; +import org.springblade.desk.order.pojo.entity.YieldOrderCraft; +import org.springblade.desk.order.pojo.entity.YieldPlan; import org.springblade.desk.order.pojo.enums.MoldDemandEnum; import org.springblade.desk.order.pojo.enums.YieldOrderEnum; import org.springblade.desk.order.pojo.vo.LineMemoVo; @@ -48,7 +50,9 @@ import org.springblade.desk.produce.mapper.WorkOrderMapper; import org.springblade.desk.produce.pojo.entity.WorkOrder; import org.springblade.erpdata.feign.IErpYieldOrderClient; import org.springblade.scheduling.pojo.entity.QualityGradeEntity; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -66,32 +70,55 @@ import java.util.stream.Collectors; * * @author BladeX */ -@RequiredArgsConstructor @Slf4j @Service public class YieldOrderServiceImpl extends BaseServiceImpl implements IYieldOrderService { - private final IYieldOrderCraftService yieldOrderCraftService; + @Autowired + private IYieldOrderCraftService yieldOrderCraftService; - private final IDsPartService dsPartService; + @Autowired + private IDsPartService dsPartService; - private final IDsCraftService dsCraftService; - private final IDsProcessService dsProcessService; - private final WorkOrderMapper workOrderMapper; + @Autowired + private IDsCraftService dsCraftService; - private final YieldPlanMapper yieldPlanMapper; + @Autowired + private IDsProcessService dsProcessService; - private final IErpYieldOrderClient yieldOrderClient; - private final IPrYieldOrderService yieldOrderService; + @Autowired + private WorkOrderMapper workOrderMapper; - private final IQualityGradeService qualityGradeService; + @Autowired + private YieldPlanMapper yieldPlanMapper; - private final IDsPartRelationService partRelationService; - private final IDsPartVersionService partVersionService; - private final MoldDemandMapper moldDemandMapper; - private final IPlateGoodsRecordService plateGoodsRecordService; - private final IWorkCenterService workCenterService; + @Autowired + private IErpYieldOrderClient yieldOrderClient; + @Autowired + private IPrYieldOrderService yieldOrderService; + + @Autowired + private IQualityGradeService qualityGradeService; + + @Autowired + private IDsPartRelationService partRelationService; + + @Autowired + private IDsPartVersionService partVersionService; + + @Autowired + private MoldDemandMapper moldDemandMapper; + + @Autowired + private IPlateGoodsRecordService plateGoodsRecordService; + + @Autowired + private IWorkCenterService workCenterService; + + @Lazy + @Autowired + private IDsTaskingService dsTaskingService; @Value("${business.oldMes.url}") private String oldMesUrl; @@ -1280,12 +1307,7 @@ public class YieldOrderServiceImpl extends BaseServiceImpl Date: Mon, 20 Apr 2026 14:29:22 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/order/pojo/entity/YieldOrder.java | 9 +++++++++ .../desk/order/mapper/YieldOrderMapper.xml | 15 +++++++++++++-- .../order/service/impl/YieldOrderServiceImpl.java | 5 ++++- .../impl/FmProjectMilestoneServiceImpl.java | 1 + .../scheduling/mapper/YieldOrderMapper.xml | 4 +++- 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java index e015e969..88dffb08 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java @@ -481,4 +481,13 @@ public class YieldOrder extends BaseEntity { @JsonSerialize(nullsUsing = NullSerializer.class) private Double quota2; + @TableField(exist = false) + private String releaseDateStart; + + @TableField(exist = false) + private String releaseDateEnd; + + @TableField(exist = false) + private String receiveUserName; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml index 4ebd27c2..fdc6fd98 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml @@ -17,9 +17,10 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java index 68fa9b6b..76f67441 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java @@ -531,10 +531,13 @@ public class YieldOrderServiceImpl extends BaseServiceImpl and batch_no LIKE CONCAT('%', CONCAT(#{yieldOrder.batchNo}, '%')) - and yo_code LIKE CONCAT('%', CONCAT(#{yieldOrder.yoCode}, '%')) @@ -87,6 +86,9 @@ and work_center_id = #{yieldOrder.workCenterId} + + and card_no LIKE CONCAT('%', CONCAT(#{yieldOrder.cardNo}, '%')) + order by receive_time desc From fdc6140d0c80a0fe8dd8de6e5afb01005a3e447a Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Mon, 20 Apr 2026 16:29:52 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/order/mapper/YieldOrderMapper.xml | 2 +- .../process/mapper/ProjectMilestoneMapper.xml | 41 ++++++++++++++++++- .../process/pojo/vo/FmProjectMilestoneVO.java | 24 +++++++++++ 3 files changed, 64 insertions(+), 3 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml index fdc6fd98..5db7ab0f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml @@ -65,7 +65,7 @@ AND release_date = ]]> to_date(concat(#{entity.releaseDateStart},' 00:00:00'),'YYYY-MM-DD HH24:MI:SS') - AND release_date to_date(concat(#{entity.releaseDateStart},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS') + AND release_date to_date(concat(#{entity.releaseDateEnd},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS') order by release_date desc diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectMilestoneMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectMilestoneMapper.xml index f8c2b096..fa79fb56 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectMilestoneMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectMilestoneMapper.xml @@ -37,8 +37,45 @@ - + SELECT + a.*, + b.pa_code, + b.project_name, + b.project_head, + b.approval_status, + b.project_start_time, + b.project_desired_end + FROM + FM_PROJECT_MILESTONE a + LEFT JOIN FM_PROJECT_APPLICATION b ON a.pa_id = b.id + + a.is_deleted = 0 + + and b.PA_CODE LIKE CONCAT('%', CONCAT(#{fmProjectMilestone.paCode}, '%')) + + + and b.project_name LIKE CONCAT('%', CONCAT(#{fmProjectMilestone.projectName}, '%')) + + + and a.milestone_plan LIKE CONCAT('%', CONCAT(#{fmProjectMilestone.milestonePlan}, '%')) + + + and a.execute_type LIKE CONCAT('%', CONCAT(#{fmProjectMilestone.executeType}, '%')) + + + and a.check_result LIKE CONCAT('%', CONCAT(#{fmProjectMilestone.checkResult}, '%')) + + + and a.grade LIKE CONCAT('%', CONCAT(#{fmProjectMilestone.grade}, '%')) + + + AND a.milestone_node = ]]> to_date(concat(#{fmProjectMilestone.milestoneNodeStart},' 00:00:00'),'YYYY-MM-DD HH24:MI:SS') + + + AND a.milestone_node to_date(concat(#{fmProjectMilestone.milestoneNodeEnd},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS') + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java index 8dd61ffc..4f12c9aa 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java @@ -25,11 +25,15 @@ */ package org.springblade.desk.process.pojo.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.desk.process.pojo.entity.FmProjectMilestoneEntity; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; +import java.util.Date; /** * 项目里程碑 视图实体类 @@ -43,4 +47,24 @@ public class FmProjectMilestoneVO extends FmProjectMilestoneEntity { @Serial private static final long serialVersionUID = 1L; + private String paCode; + + private String projectName; + + private String projectHead; + + private String approveStatus; + + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + private Date projectStartTime; + + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + private Date projcetDesireEnd; + + private String milestoneNodeStart; + + private String milestoneNodeEnd; + } From c6a2da0c33ba7c8494bdde61955e28fdc9b4e9d5 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Mon, 20 Apr 2026 16:54:39 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/desk/process/mapper/ProjectMilestoneMapper.xml | 1 + .../desk/process/pojo/entity/FmProjectMilestoneEntity.java | 2 +- .../springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectMilestoneMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectMilestoneMapper.xml index fa79fb56..e184ae67 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectMilestoneMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectMilestoneMapper.xml @@ -76,6 +76,7 @@ AND a.milestone_node to_date(concat(#{fmProjectMilestone.milestoneNodeEnd},' 23:59:59'),'YYYY-MM-DD HH24:MI:SS') + order by a.update_time desc diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectMilestoneEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectMilestoneEntity.java index e6970b06..49c7bacc 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectMilestoneEntity.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectMilestoneEntity.java @@ -141,7 +141,7 @@ public class FmProjectMilestoneEntity extends BaseEntity { * 核查结果 */ @Schema(description = "核查结果") - private Short checkResult=0; + private Short checkResult; /** * 核查人 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java index 4f12c9aa..115e3a30 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java @@ -53,7 +53,7 @@ public class FmProjectMilestoneVO extends FmProjectMilestoneEntity { private String projectHead; - private String approveStatus; + private String approvalStatus; @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) From 3ae9ea58011d4dda48f3692a665ecedc5e9c99f7 Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Mon, 20 Apr 2026 17:04:09 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java index 115e3a30..f3f37c10 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java @@ -61,7 +61,7 @@ public class FmProjectMilestoneVO extends FmProjectMilestoneEntity { @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) - private Date projcetDesireEnd; + private Date projcetDesiredEnd; private String milestoneNodeStart; From e02d8eee0fb9c64c77bd5af5b823ff0edc34babf Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Mon, 20 Apr 2026 17:15:49 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java index f3f37c10..b65a2426 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java @@ -61,7 +61,7 @@ public class FmProjectMilestoneVO extends FmProjectMilestoneEntity { @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) - private Date projcetDesiredEnd; + private Date projectDesiredEnd; private String milestoneNodeStart;