提交

src/main/java/cn/ezhizao/project/business/order/service/impl/BizArchiveInputServiceImpl.java

@@ -315,7 +315,7 @@ public class BizArchiveInputServiceImpl extends ServiceImpl<BizArchiveInputMappe
     @Override
     public boolean save(BizArchiveInput bizArchiveInput) {
         // 判断是否重复订单号
-        if(this.query().eq("contract_no", bizArchiveInput.getContractNo()).ne("id", bizArchiveInput.getId() == null ? 0L :bizArchiveInput.getId()).count() > 0) throw new ServiceException("订单号不能重复", HttpStatus.ERROR);
+        if(bizArchiveInput.getFromId().equals(0L) && this.query().eq("from_id", 0L).eq("contract_no", bizArchiveInput.getContractNo()).ne("id", bizArchiveInput.getId() == null ? 0L :bizArchiveInput.getId()).count() > 0) throw new ServiceException("订单号不能重复", HttpStatus.ERROR);
 
         boolean saveStatus = super.save(bizArchiveInput);
         List<BizArchiveInputDetail> bizArchiveInputDetails = bizArchiveInput.getDetails();
@@ -348,7 +348,7 @@ public class BizArchiveInputServiceImpl extends ServiceImpl<BizArchiveInputMappe
     @Override
     public boolean updateById(BizArchiveInput bizArchiveInput) {
         // 判断是否重复订单号
-        if(this.query().eq("contract_no", bizArchiveInput.getContractNo()).ne("id", bizArchiveInput.getId() == null ? 0L :bizArchiveInput.getId()).count() > 0) throw new ServiceException("订单号不能重复", HttpStatus.ERROR);
+        if(this.query().eq("contract_no", bizArchiveInput.getContractNo()).eq("from_id", 0L).ne("id", bizArchiveInput.getId() == null ? 0L :bizArchiveInput.getId()).count() > 0) throw new ServiceException("订单号不能重复", HttpStatus.ERROR);
 
         boolean saveStatus = super.updateById(bizArchiveInput);
         List<BizArchiveInputDetail> bizArchiveInputDetails = bizArchiveInput.getDetails();

src/main/java/cn/ezhizao/project/business/workOrder/domain/BizWorkOrder.java

@@ -93,10 +93,10 @@ public class BizWorkOrder extends BaseEntity {
     private Long taskTypeDetailId;
 
     @TableField(exist = false)
-    @Excel(name = "任务详情", sort = 6)
+//    @Excel(name = "任务详情", sort = 6)
     private String taskTypeDetailName;
 
-    @Excel(name = "是否延续")
+    @Excel(name = "是否延续", sort = 6,readConverterExp = "1=是,2=否")
     @ApiModelProperty(value = "是否延续")
     private Integer isContinue;