diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 15c26da..642f1aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -73,7 +73,7 @@ /** * 分包方编号 */ - String SUBCONTRACTOR_PREFIX = "fbf"; + String SUBCONTRACTOR_PREFIX = "wsjg"; String SUBCONTRACT_REVIEW_PREFIX = "fbpsb"; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index 15c26da..642f1aa 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -73,7 +73,7 @@ /** * 分包方编号 */ - String SUBCONTRACTOR_PREFIX = "fbf"; + String SUBCONTRACTOR_PREFIX = "wsjg"; String SUBCONTRACT_REVIEW_PREFIX = "fbpsb"; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java index 9bddb75..559465a 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java @@ -6,13 +6,18 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.casic.missiles.dto.ExportDTO; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.enums.ApprovalStatusEnum; +import com.casic.missiles.enums.plan.SampleStatusEnum; +import com.casic.missiles.model.plan.SampleStatueUpdate; import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.mapper.subcontract.SubcontractOrderMapper; +import com.casic.missiles.model.subcontract.SubcontractOrderRelation; import com.casic.missiles.model.subcontract.Subcontractor; import com.casic.missiles.service.impl.CommonApprovalServiceImpl; +import com.casic.missiles.service.listeners.register.PrintFileRegister; import com.casic.missiles.service.subcontract.ISubcontractOrderRelationService; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import com.casic.missiles.service.subcontract.ISubcontractorService; @@ -21,10 +26,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletResponse; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; +import java.util.Map; import static com.casic.missiles.enums.PrefixCodeEnum.SUBCONTRACT_ORDER_PREFIX; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.EXPORT_TEMPLATE; +import static com.casic.missiles.enums.PrintFileModuleNameEnum.SUB_CONTRACT_ORDER; import static com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum.SUBCONTRACT_ORDER_BEAN_NAME; /** @@ -136,7 +147,7 @@ queryWrapper.like("order_no", queryForm.getOrderNo()); } if (StrUtil.isNotEmpty(queryForm.getSubcontractorCompanyName())) { - String sql = String.format("(select id from eqpt_subcontractor where id = subcontractor_id and company_name like '%%%s%%')",queryForm.getSubcontractorCompanyName()); + String sql = String.format("(select id from eqpt_subcontractor where id = subcontractor_id and company_name like '%%%s%%')",queryForm.getSubcontractorCompanyName()); queryWrapper.exists(sql); } if (StrUtil.isNotEmpty(queryForm.getCreateUserName())) {